diff --git a/cobalt/renderer/rasterizer/skia/skia/skia_sources.gni b/cobalt/renderer/rasterizer/skia/skia/skia_sources.gni
index 6c5bfaab729f4..9e4cd871bd14a 100644
--- a/cobalt/renderer/rasterizer/skia/skia/skia_sources.gni
+++ b/cobalt/renderer/rasterizer/skia/skia/skia_sources.gni
@@ -119,6 +119,8 @@ sksl_sources = [
   "//third_party/skia/include/sksl/SkSLDebugTrace.h",
   "//third_party/skia/src/sksl/SkSLAnalysis.cpp",
   "//third_party/skia/src/sksl/SkSLAnalysis.h",
+  "//third_party/skia/src/sksl/SkSLBuiltinMap.cpp",
+  "//third_party/skia/src/sksl/SkSLBuiltinMap.h",
   "//third_party/skia/src/sksl/SkSLBuiltinTypes.cpp",
   "//third_party/skia/src/sksl/SkSLBuiltinTypes.h",
   "//third_party/skia/src/sksl/SkSLCompiler.cpp",
@@ -132,8 +134,6 @@ sksl_sources = [
   "//third_party/skia/src/sksl/SkSLErrorReporter.cpp",
   "//third_party/skia/src/sksl/SkSLInliner.cpp",
   "//third_party/skia/src/sksl/SkSLInliner.h",
-  "//third_party/skia/src/sksl/SkSLIntrinsicMap.cpp",
-  "//third_party/skia/src/sksl/SkSLIntrinsicMap.h",
   "//third_party/skia/src/sksl/SkSLLexer.cpp",
   "//third_party/skia/src/sksl/SkSLLexer.h",
   "//third_party/skia/src/sksl/SkSLMangler.cpp",
@@ -156,6 +156,7 @@ sksl_sources = [
   "//third_party/skia/src/sksl/SkSLUtil.h",
   "//third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp",
+  "//third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLIsConstantExpression.cpp",
   "//third_party/skia/src/sksl/analysis/SkSLProgramUsage.cpp",
@@ -173,8 +174,6 @@ sksl_sources = [
   "//third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h",
   "//third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp",
   "//third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h",
-  "//third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp",
-  "//third_party/skia/src/sksl/codegen/SkVMDebugTrace.h",
   "//third_party/skia/src/sksl/dsl/DSLBlock.cpp",
   "//third_party/skia/src/sksl/dsl/DSLCase.cpp",
   "//third_party/skia/src/sksl/dsl/DSLCore.cpp",
@@ -259,6 +258,8 @@ sksl_sources = [
   "//third_party/skia/src/sksl/ir/SkSLVariable.h",
   "//third_party/skia/src/sksl/ir/SkSLVariableReference.cpp",
   "//third_party/skia/src/sksl/ir/SkSLVariableReference.h",
+  "//third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp",
+  "//third_party/skia/src/sksl/tracing/SkVMDebugTrace.h",
   "//third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp",
   "//third_party/skia/src/sksl/transform/SkSLEliminateDeadFunctions.cpp",
   "//third_party/skia/src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp",
diff --git a/cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.cc b/cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.cc
index c26dd35897511..119cc0d492f73 100644
--- a/cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.cc
+++ b/cobalt/renderer/rasterizer/skia/skia/src/ports/SkTypeface_cobalt.cc
@@ -70,9 +70,9 @@ std::unique_ptr<SkFontData> SkTypeface_Cobalt::onMakeFontData() const {
   if (!stream) {
     return nullptr;
   }
-  return std::make_unique<SkFontData>(std::move(stream), index,
-                                      computed_variation_position_.data(),
-                                      computed_variation_position_.count());
+  return std::make_unique<SkFontData>(
+      std::move(stream), index, 0, computed_variation_position_.data(),
+      computed_variation_position_.count(), nullptr, 0);
 }
 
 SkTypeface_CobaltStream::SkTypeface_CobaltStream(
diff --git a/third_party/skia/.bazelrc b/third_party/skia/.bazelrc
index 5c05251320778..0145ad3c16c90 100644
--- a/third_party/skia/.bazelrc
+++ b/third_party/skia/.bazelrc
@@ -17,6 +17,10 @@ build --flag_alias=with_gl_standard=//bazel/common_config_settings:with_gl_stand
 
 build --flag_alias=with_icu=//bazel/common_config_settings:use_icu
 build --flag_alias=with_no_icu=no//bazel/common_config_settings:use_icu
+build --flag_alias=disable_tracing=//bazel/common_config_settings:disable_tracing
+build --flag_alias=enable_tracing=no//bazel/common_config_settings:disable_tracing
+build --flag_alias=disable_effect_serialization=//bazel/common_config_settings:disable_effect_serialization
+build --flag_alias=enable_effect_serialization=no//bazel/common_config_settings:disable_effect_serialization
 
 # CanvasKit flags
 build --flag_alias=ck_enable_fonts=//modules/canvaskit:enable_fonts
diff --git a/third_party/skia/.bazelversion b/third_party/skia/.bazelversion
index 5dd683793257a..28cbf7c0aae3b 100644
--- a/third_party/skia/.bazelversion
+++ b/third_party/skia/.bazelversion
@@ -1 +1 @@
-6.0.0-pre.20211025.1
\ No newline at end of file
+5.0.0
\ No newline at end of file
diff --git a/third_party/skia/AUTHORS b/third_party/skia/AUTHORS
index 1511502e97d79..dd01e8b2989aa 100755
--- a/third_party/skia/AUTHORS
+++ b/third_party/skia/AUTHORS
@@ -74,6 +74,7 @@ JetBrains <*@jetbrains.com>
 Vibe Inc <*@vibe.us>
 Scene Group Ltd. <*@scenegroup.co>
 LG Electronics <*@lge.com>
+Shekhar Dutta <sherlockdoyle1904@gmail.com>
 
 # Trusted service accounts.
 Recipe roller SA <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
diff --git a/third_party/skia/BUILD.bazel b/third_party/skia/BUILD.bazel
index 0a71c1d3e6bf3..8157279b35a55 100644
--- a/third_party/skia/BUILD.bazel
+++ b/third_party/skia/BUILD.bazel
@@ -5,21 +5,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 
 package(default_visibility = ["//:__subpackages__"])
 
-cc_test(
-    name = "bazel_test",
-    size = "small",
-    srcs = [
-        "//experimental/bazel_test:srcs",
-        "//include/config:hdrs",
-        "//include/core:hdrs",
-        "//src/ports:skdebug",
-    ],
-    deps = [
-        "//third_party:libpng",
-        "//third_party:musl_compat",
-    ],
-)
-
 selects.config_setting_group(
     name = "needs_jpeg",
     match_any = [
@@ -102,50 +87,5 @@ cc_library(
     deps = CORE_DEPS,
 )
 
-cc_library(
-    name = "hash_and_encode",
-    testonly = True,
-    srcs = [
-        "//tools:cmdline",
-        "//tools:hash_and_encode",
-    ],
-    deps = [
-        ":skia-core",
-        "//third_party:libpng",
-    ],
-)
-
-cc_library(
-    name = "gms",
-    testonly = True,
-    srcs = [
-        "//gm:gms",
-        "//gm:srcs",
-        "//tools:srcs",
-    ],
-    hdrs = [
-        "//gm:hdrs",
-    ],
-    textual_hdrs = ["//tools:txts"],
-    deps = [":skia-core"],
-)
-
-cc_library(
-    name = "tests",
-    testonly = True,
-    srcs = [
-        "//tests:srcs",
-        "//tools:srcs",
-    ],
-    hdrs = [
-        "//tests:hdrs",
-    ],
-    local_defines = [
-        "GR_TEST_UTILS",
-    ],
-    textual_hdrs = ["//tools:txts"],
-    deps = [":skia-core"],
-)
-
 # gazelle:prefix go.skia.org/skia
 gazelle(name = "gazelle")
diff --git a/third_party/skia/BUILD.gn b/third_party/skia/BUILD.gn
index 22f94f0227280..dc81d8c1b4217 100644
--- a/third_party/skia/BUILD.gn
+++ b/third_party/skia/BUILD.gn
@@ -7,6 +7,7 @@ import("gn/flutter_defines.gni")
 import("gn/fuchsia_defines.gni")
 import("gn/shared_sources.gni")
 import("gn/skia.gni")
+import("gn/toolchain/wasm.gni")
 
 if (is_fuchsia) {
   import("//build/fuchsia/sdk.gni")
@@ -47,6 +48,9 @@ config("skia_public") {
   if (is_fuchsia) {
     defines += fuchsia_defines
   }
+  if (is_wasm) {
+    defines += wasm_defines
+  }
   if (skia_gl_standard == "gles") {
     defines += [ "SK_ASSUME_GL_ES=1" ]
   } else if (skia_gl_standard == "gl") {
@@ -84,7 +88,7 @@ config("skia_private") {
       "SK_GAMMA_CONTRAST=0.0",
     ]
   }
-  if (is_skia_dev_build) {
+  if (is_skia_dev_build && !is_wasm) {
     defines += [
       "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
       "GR_TEST_UTILS=1",
@@ -643,30 +647,33 @@ if (skia_compile_sksl_tests) {
       "src/core/SkStream.cpp",
       "src/core/SkString.cpp",
       "src/core/SkStringUtils.cpp",
-      "src/core/SkStringView.cpp",
       "src/core/SkThreadID.cpp",
       "src/core/SkUtils.cpp",
       "src/core/SkVM.cpp",
       "src/gpu/GrMemoryPool.cpp",
-      "src/gpu/GrShaderUtils.cpp",
       "src/ports/SkMemory_malloc.cpp",
       "src/ports/SkOSFile_stdio.cpp",
       "src/sksl/SkSLMain.cpp",
       "src/utils/SkJSON.cpp",
       "src/utils/SkJSONWriter.cpp",
       "src/utils/SkParse.cpp",
+      "src/utils/SkShaderUtils.cpp",
       "src/utils/SkUTF.cpp",
+      "src/utils/SkVMVisualizer.cpp",
     ]
+    libs = []
     if (is_win) {
       sources += [ "src/ports/SkOSFile_win.cpp" ]
     } else {
       sources += [ "src/ports/SkOSFile_posix.cpp" ]
+      libs += [ "dl" ]
     }
     sources += skia_sksl_sources
     sources += skia_sksl_gpu_sources
     include_dirs = [ "." ]
     deps = [
       ":run_sksllex",
+      ":skvm_jit",
       "//third_party/externals/spirv-tools:spvtools",
       "//third_party/externals/spirv-tools:spvtools_val",
       "//third_party/spirv-cross:spirv_cross",
@@ -1051,6 +1058,14 @@ optional("jpeg_encode") {
   ]
 }
 
+optional("jpegxl_decode") {
+  enabled = skia_use_libjxl_decode
+  public_defines = [ "SK_CODEC_DECODES_JPEGXL" ]
+
+  deps = [ "//third_party/libjxl" ]
+  sources = [ "src/codec/SkJpegxlCodec.cpp" ]
+}
+
 optional("ndk_images") {
   enabled = skia_use_ndk_images
   public_defines = [ "SK_ENABLE_NDK_IMAGES" ]
@@ -1079,6 +1094,9 @@ optional("graphite") {
     }
     frameworks += [ "Metal.framework" ]
     frameworks += [ "Foundation.framework" ]
+    if (is_ios) {
+      frameworks += [ "UIKit.framework" ]
+    }
   }
 }
 
@@ -1279,6 +1297,7 @@ skia_component("skia") {
     ":hsw",
     ":jpeg_decode",
     ":jpeg_encode",
+    ":jpegxl_decode",
     ":ndk_images",
     ":none",
     ":png_decode",
@@ -1527,6 +1546,10 @@ group("modules") {
     "modules/skshaper",
     "modules/svg",
   ]
+
+  if (is_wasm) {
+    deps += [ "modules/canvaskit" ]
+  }
 }
 
 group("experimental") {
@@ -1612,11 +1635,11 @@ if (skia_enable_tools) {
     }
   }
 
-  config("cpp14") {
+  config("cpp17") {
     if (is_win) {
-      cflags_cc = [ "/std:c++14" ]
+      cflags_cc = [ "/std:c++17" ]
     } else {
-      cflags_cc = [ "-std=c++14" ]
+      cflags_cc = [ "-std=c++17" ]
     }
   }
 
@@ -1624,7 +1647,7 @@ if (skia_enable_tools) {
     sources = [ "tools/public_headers_warnings_check.cpp" ]
     configs = [
       ":our_vulkan_headers",
-      ":cpp14",
+      ":cpp17",
     ]
     if (defined(skia_header_target_default_configs)) {
       configs += skia_header_target_default_configs
@@ -1788,9 +1811,7 @@ if (skia_enable_tools) {
       }
     }
 
-    # We need the GLTestContext on Vulkan-only builds for the persistent GL context workaround in
-    # in GrContextFactory. This only matters for OSes that can run Vulkan.
-    if ((skia_use_gl || skia_use_vulkan) && target_cpu != "wasm") {
+    if (skia_use_gl && target_cpu != "wasm") {
       if (is_android || skia_use_egl) {
         sources += [ "tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp" ]
         libs += [ "EGL" ]
@@ -2093,15 +2114,6 @@ if (skia_enable_tools) {
     ]
   }
 
-  test_lib("experimental_xform") {
-    sources = [
-      "experimental/xform/SkShape.cpp",
-      "experimental/xform/SkXform.cpp",
-      "experimental/xform/XContext.cpp",
-    ]
-    deps = [ ":skia" ]
-  }
-
   if (is_linux || is_mac) {
     if (skia_enable_skottie) {
       test_app("skottie_tool") {
@@ -2113,11 +2125,6 @@ if (skia_enable_tools) {
     }
   }
 
-  test_app("make_skqp_model") {
-    sources = [ "tools/skqp/make_skqp_model.cpp" ]
-    deps = [ ":skia" ]
-  }
-
   import("gn/samples.gni")
   test_lib("samples") {
     sources = samples_sources
@@ -2432,19 +2439,6 @@ if (skia_enable_tools) {
     ]
   }
 
-  test_app("pathops_unittest") {
-    sources = pathops_tests_sources + [
-                rebase_path("tests/skia_test.cpp"),
-                rebase_path("tests/Test.cpp"),
-              ]
-    deps = [
-      ":flags",
-      ":gpu_tool_utils",
-      ":skia",
-      ":tool_utils",
-    ]
-  }
-
   test_app("dump_record") {
     sources = [ "tools/dump_record.cpp" ]
     deps = [
@@ -2479,12 +2473,9 @@ if (skia_enable_tools) {
       check_includes = false
       testonly = true
       public_configs = [ ":skia_private" ]
-      defines =
-          [ "SK_SKQP_GLOBAL_ERROR_TOLERANCE=$skia_skqp_global_error_tolerance" ]
       sources = [
         "dm/DMGpuTestProcs.cpp",
         "tools/skqp/src/skqp.cpp",
-        "tools/skqp/src/skqp_model.cpp",
       ]
       deps = [
         ":gm",
@@ -2499,14 +2490,6 @@ if (skia_enable_tools) {
       lib_dirs = []
       deps = [ ":skqp_lib" ]
     }
-    test_app("jitter_gms") {
-      sources = [ "tools/skqp/jitter_gms.cpp" ]
-      deps = [
-        ":gm",
-        ":skia",
-        ":skqp_lib",
-      ]
-    }
   }
   if (is_fuchsia) {
     # Build a package repository for skqp on Fuchsia.
@@ -2810,6 +2793,8 @@ if (skia_enable_tools) {
         "tools/viewer/SampleSlide.h",
         "tools/viewer/SkRiveSlide.cpp",
         "tools/viewer/SkRiveSlide.h",
+        "tools/viewer/SkSLDebuggerSlide.cpp",
+        "tools/viewer/SkSLDebuggerSlide.h",
         "tools/viewer/SkSLSlide.cpp",
         "tools/viewer/SkSLSlide.h",
         "tools/viewer/SkottieSlide.cpp",
@@ -2849,10 +2834,6 @@ if (skia_enable_tools) {
         "modules/svg",
         "//third_party/imgui",
       ]
-      if (skia_use_experimental_xform) {
-        deps += [ ":experimental_xform" ]
-        sources += [ "gm/xform.cpp" ]
-      }
       if (skia_use_vulkan) {
         deps += [
           "//third_party/externals/spirv-tools:spvtools",
@@ -2974,7 +2955,7 @@ if (skia_enable_tools) {
   group("modules_testonly") {
     testonly = true
     deps = []
-    if (target_cpu == "wasm") {
+    if (is_wasm) {
       deps += [ "modules/canvaskit:viewer_wasm" ]
     }
   }
@@ -3184,7 +3165,7 @@ if (skia_enable_tools) {
       deps = []
     }
 
-    if (skia_use_gl) {
+    if (skia_enable_gpu) {
       libfuzzer_app("api_mock_gpu_canvas") {
         include_dirs = [
           "tools",
diff --git a/third_party/skia/DEPS b/third_party/skia/DEPS
index cf65f240c1762..d272f2aa20051 100644
--- a/third_party/skia/DEPS
+++ b/third_party/skia/DEPS
@@ -6,32 +6,35 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling different
   # dependencies without interference from each other.
-  'sk_tool_revision': 'git_revision:47e2b5077062ef0ae7a32239ca7cea1abf8cc1a2',
+  'sk_tool_revision': 'git_revision:0056074ae4f8d12d03946b968daea6a73943017f',
 }
 
 deps = {
   "buildtools"                            : "https://chromium.googlesource.com/chromium/src/buildtools.git@b138e6ce86ae843c42a1a08f37903207bebcca75",
-  "third_party/externals/angle2"          : "https://chromium.googlesource.com/angle/angle.git@0e291f60ccbfd1deddad6f98159417c7d7f524b3",
+  "third_party/externals/angle2"          : "https://chromium.googlesource.com/angle/angle.git@e5045587752d091991ec9a19646e973a7f99da02",
   "third_party/externals/brotli"          : "https://skia.googlesource.com/external/github.com/google/brotli.git@e61745a6b7add50d380cfd7d3883dd6c62fc2c71",
   "third_party/externals/d3d12allocator"  : "https://skia.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/D3D12MemoryAllocator.git@169895d529dfce00390a20e69c2f516066fe7a3b",
   # Dawn requires jinja2 and markupsafe for the code generator, tint for SPIRV compilation, and abseil for string formatting.
   # When the Dawn revision is updated these should be updated from the Dawn DEPS as well.
-  "third_party/externals/dawn"            : "https://dawn.googlesource.com/dawn.git@264f239259c558ff30e2992a6875a7b7c154bf48",
+  "third_party/externals/dawn"            : "https://dawn.googlesource.com/dawn.git@6cc74dce933e6164dc5b2d3bf2cc4d1c8e2e4f2b",
   "third_party/externals/jinja2"          : "https://chromium.googlesource.com/chromium/src/third_party/jinja2@ee69aa00ee8536f61db6a451f3858745cf587de6",
   "third_party/externals/markupsafe"      : "https://chromium.googlesource.com/chromium/src/third_party/markupsafe@0944e71f4b2cb9a871bcbe353f95e889b64a611a",
-  "third_party/externals/tint"            : "https://dawn.googlesource.com/tint@a8c202b8e779b7ddc7edf8bf2fac9534d521fa64",
+  "third_party/externals/tint"            : "https://dawn.googlesource.com/tint@afb02e8ec7cd8214034136b1290ebe800f217d72",
   "third_party/externals/abseil-cpp"      : "https://chromium.googlesource.com/chromium/src/third_party/abseil-cpp@789af048b388657987c59d4da406859034fe310f",
   "third_party/externals/dng_sdk"         : "https://android.googlesource.com/platform/external/dng_sdk.git@c8d0c9b1d16bfda56f15165d39e0ffa360a11123",
   "third_party/externals/egl-registry"    : "https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry@a0bca08de07c7d7651047bedc0b653cfaaa4f2ae",
+  "third_party/externals/emsdk"           : "https://skia.googlesource.com/external/github.com/emscripten-core/emsdk.git@fc645b7626ebf86530dbd82fbece74d457e7ae07",
   "third_party/externals/expat"           : "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git@a28238bdeebc087071777001245df1876a11f5ee",
-  "third_party/externals/freetype"        : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@cff026d41599945498044d2f4dcc0e610ffb6929",
-  "third_party/externals/harfbuzz"        : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@3160789701463bcd822c26010da4de33c92c85d9",
+  "third_party/externals/freetype"        : "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git@5e9caaee7885cbc82f9f821bbec7f6c86f25b33a",
+  "third_party/externals/harfbuzz"        : "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git@a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
+  "third_party/externals/highway"         : "https://chromium.googlesource.com/external/github.com/google/highway.git@424360251cdcfc314cfc528f53c872ecd63af0f0",
   "third_party/externals/icu"             : "https://chromium.googlesource.com/chromium/deps/icu.git@a0718d4f121727e30b8d52c7a189ebf5ab52421f",
   "third_party/externals/imgui"           : "https://skia.googlesource.com/external/github.com/ocornut/imgui.git@55d35d8387c15bf0cfd71861df67af8cfbda7456",
   "third_party/externals/libgifcodec"     : "https://skia.googlesource.com/libgifcodec@fd59fa92a0c86788dcdd84d091e1ce81eda06a77",
-  "third_party/externals/libjpeg-turbo"   : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@24e310554f07c0fdb8ee52e3e708e4f3e9eb6e20",
+  "third_party/externals/libjpeg-turbo"   : "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@02959c3ee17abacfd1339ec22ea93301292ffd56",
+  "third_party/externals/libjxl"          : "https://chromium.googlesource.com/external/gitlab.com/wg1/jpeg-xl.git@a205468bc5d3a353fb15dae2398a101dff52f2d3",
   "third_party/externals/libpng"          : "https://skia.googlesource.com/third_party/libpng.git@386707c6d19b974ca2e3db7f5c61873813c6fe44",
-  "third_party/externals/libwebp"         : "https://chromium.googlesource.com/webm/libwebp.git@9ce5843dbabcfd3f7c39ec7ceba9cbeb213cbfdf",
+  "third_party/externals/libwebp"         : "https://chromium.googlesource.com/webm/libwebp.git@69c7f16111ec582bf1e7cb4d0d4f8d127e28a715",
   "third_party/externals/microhttpd"      : "https://android.googlesource.com/platform/external/libmicrohttpd@748945ec6f1c67b7efc934ab0808e1d32f2fb98d",
   "third_party/externals/oboe"            : "https://chromium.googlesource.com/external/github.com/google/oboe.git@b02a12d1dd821118763debec6b83d00a8a0ee419",
   "third_party/externals/opengl-registry" : "https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry@14b80ebeab022b2c78f84a573f01028c96075553",
@@ -40,13 +43,13 @@ deps = {
   "third_party/externals/spirv-cross"     : "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross@0e2880ab990e79ce6cc8c79c219feda42d98b1e8",
   "third_party/externals/spirv-headers"   : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git@814e728b30ddd0f4509233099a3ad96fd4318c07",
   "third_party/externals/spirv-tools"     : "https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git@4b092d2ab81854e61632bdd1e658907f0071c37e",
-  "third_party/externals/swiftshader"     : "https://swiftshader.googlesource.com/SwiftShader@a4232c15e287a38b93d2a55bd1d7894cb4effac3",
+  "third_party/externals/swiftshader"     : "https://swiftshader.googlesource.com/SwiftShader@4228bb95b5b56f6b0f9ded5c7910bbe773a4c9d2",
   #"third_party/externals/v8"              : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
   "third_party/externals/wuffs"           : "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git@600cd96cf47788ee3a74b40a6028b035c9fd6a61",
   "third_party/externals/zlib"            : "https://chromium.googlesource.com/chromium/src/third_party/zlib@c876c8f87101c5a75f6014b0f832499afeb65b73",
 
   "../src": {
-    "url": "https://chromium.googlesource.com/chromium/src.git@4fa82a541d87a2da48b74c2e33f5d97b0a8c1783",
+    "url": "https://chromium.googlesource.com/chromium/src.git@8fa4c936281662f1ad1c97ffece6000052108b6a",
     "condition": "checkout_chromium",
   },
 
diff --git a/third_party/skia/METADATA b/third_party/skia/METADATA
index 8795c447f0cfd..e11fc17e36ed1 100644
--- a/third_party/skia/METADATA
+++ b/third_party/skia/METADATA
@@ -9,13 +9,13 @@ description:
 third_party {
   identifier {
     type: "ChromiumVersion"
-    value: "98.0.4758.141"  # from https://chromereleases.googleblog.com/2022/03/extended-stable-channel-update-for_25.html
+    value: "100.0.4896.143"  # from https://chromereleases.googleblog.com/2022/04/extended-stable-channel-update-for.html
   }
   identifier {
     type: "Git"
     value: "https://chromium.googlesource.com/skia.git"
-    version: "615322e97b5d9cac54aae62a0f4f73475ce7bef6"
-    # from https://chromium.googlesource.com/chromium/src/+/98.0.4758.141/DEPS#242
+    version: "b524f580859d367e51591d8b5c16485d022844cb"
+    # from https://chromium.googlesource.com/chromium/src/+/100.0.4896.143/DEPS#256
   }
   last_upgrade_date {
     year: 2024
diff --git a/third_party/skia/RELEASE_NOTES.txt b/third_party/skia/RELEASE_NOTES.txt
index b463afc653bc9..f27912348abe4 100644
--- a/third_party/skia/RELEASE_NOTES.txt
+++ b/third_party/skia/RELEASE_NOTES.txt
@@ -2,6 +2,43 @@ Skia Graphics Release Notes
 
 This file includes a list of high level updates for each milestone release.
 
+Milestone 100
+-------------
+  * Skia now requires C++17 and the corresponding standard library (or newer).
+  * Skia on iOS now requires iOS 11 to build; earlier versions of iOS do not support C++17.
+  * The skstd::string_view and skstd::optional Skia classes have been replaced with the C++17 native
+    std::string_view and std::optional.
+  * Added SkSurface::resolveMSAA api to force Skia to resolve MSAA draws. Useful for when
+    Skia wraps a client's texture as the resolve target.
+  * All of the `makeShader` functions associated with `SkRuntimeEffect` no longer take an
+    `isOpaque` parameter. These functions will now make a best effort to determine if your
+    shader always produces opaque output, and optimize accordingly. If you definitely want your
+    shader to produce opaque output, do so in the shader's SkSL code. This can be done by adjusting
+    any `return` statement in your shader with a swizzle: `return color.rgb1;`.
+    https://review.skia.org/506462
+
+* * *
+
+Milestone 99
+------------
+  * Added two new intrinsic functions to SkSL for use in runtime effects:
+      vec3 toLinearSrgb(vec3 color)
+      vec3 fromLinearSrgb(vec3 color)
+    These convert RGB color values between the working color space (the color space of the
+    destination surface) and a known, fixed color space. `toLinearSrgb` converts a color to the
+    sRGB color gamut, with a linear transfer function. `fromLinearSrgb` converts a color from that
+    same color space. These are helpful for effects that need to work in a specific color space, or
+    want to apply effects (like lighting) that work best in a linear color space.
+    Note that if the destination surface has no color space (color space is `nullptr`), these
+    intrinsics will do no conversion, and return the input color unchanged.
+    https://review.skia.org/481416
+  * Added a new variant of SkImageFilters::RuntimeShader that supports multiple child nodes.
+    https://review.skia.org/489536
+  * Add the ability to specifiy palette overrides in SkFontArguments. Implemented
+    for the FreeType-backed SkFontMgrs.
+
+* * *
+
 Milestone 98
 ------------
   * The following functions and methods are not defined in SkSurface when SK_SUPPORT_GPU is 0:
@@ -31,6 +68,7 @@ Milestone 98
         will return nullptr.
   * Removed SkCanvas::markCTM and SkCanvas::findMarkedCTM. These were created to be used with other
     features that have since been deleted, so they served no purpose.
+  * Added limited JPEGXL support.
 
 * * *
 
diff --git a/third_party/skia/WORKSPACE.bazel b/third_party/skia/WORKSPACE.bazel
index 054c487a4925c..25a69f2428ea9 100644
--- a/third_party/skia/WORKSPACE.bazel
+++ b/third_party/skia/WORKSPACE.bazel
@@ -6,9 +6,12 @@ load("//toolchain:build_toolchain.bzl", "build_cpp_toolchain")
 # See https://github.com/emscripten-core/emsdk/tree/85d27a4a2a60d591613a305b14ae438c2bb3ce11/bazel#setup-instructions
 http_archive(
     name = "emsdk",
-    sha256 = "457fa96d4d60867743df7f7e241c9852a3eb7fdbf3091eac7a5712ddc0a5221d",
-    strip_prefix = "emsdk-2.0.32/bazel",
-    url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/2.0.32.tar.gz",
+    sha256 = "7dc13d967705582e11ff62ae143425dbc63c38372f1a1b14f0cb681fda413714",
+    strip_prefix = "emsdk-3.1.4/bazel",
+    urls = [
+        "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.4.tar.gz",
+        "https://storage.googleapis.com/skia-world-readable/bazel/7dc13d967705582e11ff62ae143425dbc63c38372f1a1b14f0cb681fda413714.tar.gz",
+    ],
 )
 
 load("@emsdk//:deps.bzl", emsdk_deps = "deps")
@@ -17,27 +20,19 @@ emsdk_deps()
 
 load("@emsdk//:emscripten_deps.bzl", emsdk_emscripten_deps = "emscripten_deps")
 
-# Use older version to work around https://github.com/emscripten-core/emscripten/issues/15528
-emsdk_emscripten_deps(emscripten_version = "2.0.13")
+emsdk_emscripten_deps(emscripten_version = "3.1.4")
 
 build_cpp_toolchain(
-    # Meant to run on amd64 linux and compile for amd64 linux using musl as the c library.
-    name = "clang_linux_amd64_musl",
-    # From https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz.sha256
-    clang_prefix = "clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04/",
-    clang_sha256 = "2c2fb857af97f41a5032e9ecadf7f78d3eff389a5cd3c9ec620d24f134ceb3c8",
-    clang_url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz",
-    # From https://packages.debian.org/bullseye/amd64/musl-dev/download
-    musl_dev_sha256 = "b017792ad6ba3650b4889238c73cd19c1d6b0e39ca8319cdd3ad9e16374e614e",
-    musl_dev_url = "http://ftp.debian.org/debian/pool/main/m/musl/musl-dev_1.2.2-1_amd64.deb",
+    # Meant to run on amd64 linux and compile for amd64 linux.
+    name = "clang_linux_amd64",
 )
 
 http_archive(
     name = "bazel_skylib",
     sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
     urls = [
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
         "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
     ],
 )
 
@@ -48,7 +43,10 @@ bazel_skylib_workspace()
 http_archive(
     name = "rules_python",
     sha256 = "cd6730ed53a002c56ce4e2f396ba3b3be262fd7cb68339f0377a45e8227fe332",
-    url = "https://github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz",
+        "https://github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz",
+    ],
 )
 
 #######################################################################################
diff --git a/third_party/skia/bazel/BUILD.bazel b/third_party/skia/bazel/BUILD.bazel
index 1a3e5b347c464..cb463bf1b4f97 100644
--- a/third_party/skia/bazel/BUILD.bazel
+++ b/third_party/skia/bazel/BUILD.bazel
@@ -10,6 +10,18 @@ GENERAL_DEFINES = ["SK_HAS_ANDROID_CODEC"] + select({
     "//conditions:default": [
         "SK_RELEASE",
     ],
+}) + select({
+    "//bazel/common_config_settings:disable_tracing_true": ["SK_DISABLE_TRACING"],
+    "//conditions:default": [],
+}) + select({
+    "//bazel/common_config_settings:disable_effect_serialization_true": ["SK_DISABLE_EFFECT_DESERIALIZATION"],
+    "//conditions:default": [],
+}) + select({
+    "//bazel/common_config_settings:is_skia_dev_build_true": [
+        "GR_TEST_UTILS=1",
+        "SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=1",
+    ],
+    "//conditions:default": [],
 })
 
 GPU_DEFINES = select({
@@ -50,6 +62,7 @@ CODEC_DEFINES = select_multi(
             "SK_CODEC_DECODES_JPEG",
         ],
         "//bazel/common_config_settings:webp_decode_codec": ["SK_CODEC_DECODES_WEBP"],
+        "//bazel/common_config_settings:webp_encode_codec": ["SK_ENCODE_WEBP"],
     },
     default = [],
 )
@@ -59,6 +72,8 @@ PLATFORM_DEFINES = select({
         # working around https://github.com/emscripten-core/emscripten/issues/10072
         "SK_FORCE_8_BYTE_ALIGNMENT",
         "SK_DISABLE_LEGACY_SHADERCONTEXT",
+        "SK_DISABLE_AAA",  # This saves about 57KB of code size, uncompressed
+        "SK_NO_COMMAND_BUFFER",  # not a feature CK needs.
     ],
     "//conditions:default": [],
 })
diff --git a/third_party/skia/bazel/Makefile b/third_party/skia/bazel/Makefile
index 9b0a4c6909f5c..c3101b1f9746d 100644
--- a/third_party/skia/bazel/Makefile
+++ b/third_party/skia/bazel/Makefile
@@ -1,10 +1,23 @@
+# This target should be run when new files are added or includes changed.
 generate:
-	bazel build @org_skia_go_infra//bazel/gazelle:gazelle_cpp
+	bazelisk build @org_skia_go_infra//bazel/gazelle:gazelle_cpp
 	cd .. && bazel-bin/external/org_skia_go_infra/bazel/gazelle/gazelle_cpp_/gazelle_cpp update \
 		--third_party_file_map="third_party/file_map_for_bazel.json" \
-		include src tools \
+		include src tools gm tests \
 		modules/skshaper modules/svg modules/skresources modules/skparagraph modules/skunicode \
-		experimental/bazel_test
+		modules/skottie modules/skresources modules/sksg experimental/ffmpeg \
+		modules/particles \
+		experimental/bazel_test experimental/graphite example
 
+# This target should be run after the go.mod file is updated (e.g. version rolls or new updates)
 gazelle_update_repo:
-	cd .. && bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=go_repositories.bzl%go_repositories
+	cd .. && bazelisk run //:gazelle -- update-repos -from_file=go.mod -to_macro=go_repositories.bzl%go_repositories
+
+# Run this target to test all known working Bazel builds
+known_good_builds:
+	bazelisk build //experimental/bazel_test/... --config=clang
+	bazelisk run //experimental/bazel_test:bazel_test_exe --config=clang
+	bazelisk build //:skia_core --config=clang --sandbox_base=/dev/shm
+	bazelisk build //src/sksl/lex:sksllex --config=clang --sandbox_base=/dev/shm
+	bazelisk build //tools/skdiff --config=clang --sandbox_base=/dev/shm
+	bazelisk build //example:hello_world --config=clang --sandbox_base=/dev/shm
diff --git a/third_party/skia/bazel/cc_binary_with_flags.bzl b/third_party/skia/bazel/cc_binary_with_flags.bzl
index 96253c755448a..8b2263a4126ba 100644
--- a/third_party/skia/bazel/cc_binary_with_flags.bzl
+++ b/third_party/skia/bazel/cc_binary_with_flags.bzl
@@ -8,6 +8,7 @@ It is based off of https://github.com/bazelbuild/examples/tree/main/rules/starla
 
 _bool_flags = [
     "//bazel/common_config_settings:use_icu",
+    "//bazel/common_config_settings:is_skia_dev_build",
 ]
 
 _string_flags = [
@@ -113,20 +114,17 @@ transition_rule = rule(
     executable = True,
 )
 
-def cc_binary_with_flags(name, cc_binary_name = "", set_flags = {}, **kwargs):
+def cc_binary_with_flags(name, set_flags = {}, **kwargs):
     """Builds a cc_binary as if set_flags were set on the CLI.
 
     Args:
         name: string, the name for the rule that is the binary, but with the flags changed via
             a transition. Any dependents should use this name.
-        cc_binary_name: string, the name of the binary created (not the name of the transition
-            rule). The default is the name with "_native_binary" as a suffix.
         set_flags: dictionary of string to list of strings. The keys should be the name of the
             flag, and the values should be the desired valid settings for that flag.
         **kwargs: Any flags that a cc_binary normally takes.
     """
-    if not cc_binary_name:
-        cc_binary_name = name + "_native_binary"
+    cc_binary_name = name + "_native_binary"
     transition_rule(
         name = name,
         actual_binary = ":%s" % cc_binary_name,
diff --git a/third_party/skia/bazel/common_config_settings/BUILD.bazel b/third_party/skia/bazel/common_config_settings/BUILD.bazel
index ecac73d53811b..2d04413e88997 100644
--- a/third_party/skia/bazel/common_config_settings/BUILD.bazel
+++ b/third_party/skia/bazel/common_config_settings/BUILD.bazel
@@ -97,17 +97,35 @@ string_flag_with_values(
     default = "empty_fontmgr_factory",
     flag_name = "fontmgr_factory",
     values = [
-        "empty_fontmgr_factory",
+        # Makes the default SkFontMgr load fonts from a hard-coded directory on disk.
+        "custom_directory_fontmgr_factory",
+        # Makes the default SkFontMgr load fonts from an SkEmbeddedResource that has been compiled
+        # into the binary, e.g. with //tools/embed_resources.py
         "custom_embedded_fontmgr_factory",
+        # Makes the default SkFontMgr return empty fonts (e.g. SkTypeface_Empty). This is typically
+        # used when someone wants to make their own custom SkFontMgr objects, but does not want the
+        # default SkFontMgr to do anything (e.g. force usage of the custom one).
+        "custom_empty_fontmgr_factory",
+        # Makes the default SkFontMgr return null. Typically used when font support is not desired.
+        "empty_fontmgr_factory",
     ],
 )
 
+# These flags need only be set if additional functionality beyond the fontmgr_factory flag is
+# required. For example, the setting fontmgr_factory to custom_embedded_fontmgr_factory does not
+# require setting include_fontmgr to custom_embedded_fontmgr, because those sources and settings
+# will already be compiled in due to the _factory flag.
 string_flag_with_values(
     flag_name = "include_fontmgr",
     multiple = True,
     values = [
+        # Allows the construction of an SkFontMgr that loads files from a programmatically
+        # defined directory on disk.
         "custom_directory_fontmgr",
+        # Allows the construction of an SkFontMgr which can load fonts from an SkEmbeddedResource
+        # or from another source of raw bytes.
         "custom_embedded_fontmgr",
+        # Allows the construction of an SkFontMgr which returns empty fonts.
         "custom_empty_fontmgr",
     ],
 )
@@ -147,3 +165,18 @@ bool_flag(
     default = False,
     flag_name = "use_icu",
 )
+
+bool_flag(
+    default = False,
+    flag_name = "disable_tracing",
+)
+
+bool_flag(
+    default = False,
+    flag_name = "disable_effect_serialization",
+)
+
+bool_flag(
+    default = False,
+    flag_name = "is_skia_dev_build",
+)
diff --git a/third_party/skia/bazel/gcs_mirror/gcs_mirror.go b/third_party/skia/bazel/gcs_mirror/gcs_mirror.go
new file mode 100644
index 0000000000000..dda38deaf2d10
--- /dev/null
+++ b/third_party/skia/bazel/gcs_mirror/gcs_mirror.go
@@ -0,0 +1,157 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This executable downloads, verifies, and uploads a given file to the Skia infra Bazel mirror.
+// Users should have gsutil installed, on the PATH and authenticated.
+// There are two modes of use:
+//   - Specify a single file via --url and --sha256.
+//   - Copy a JSON array of objects (or Starlark list of dictionaries) via standard in.
+// This should only need to be called when we add new dependencies or update existing ones. Calling
+// it with already archived files should be fine - the mirror is a CAS, so the update should be a
+// no-op. The files will be uploaded to the mirror with some metadata about where they came from.
+package main
+
+import (
+	"crypto/sha256"
+	"encoding/hex"
+	"flag"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+
+	"github.com/flynn/json5"
+
+	"go.skia.org/infra/go/skerr"
+)
+
+const (
+	gcsBucketAndPrefix = "gs://skia-world-readable/bazel/"
+)
+
+func main() {
+	var (
+		url           = flag.String("url", "", "The single url to mirror. --sha256 must be set.")
+		sha256Hash    = flag.String("sha256", "", "The sha256sum of the url to mirror. --url must also be set.")
+		jsonFromStdin = flag.Bool("json", false, "If set, read JSON from stdin that consists of a list of objects.")
+	)
+	flag.Parse()
+
+	if (*url != "" && *sha256Hash == "") || (*url == "" && *sha256Hash != "") {
+		flag.Usage()
+		fatalf("Must set both of or non of --url and --sha256")
+	} else if *url == "" && *sha256Hash == "" && !*jsonFromStdin {
+		fatalf("Must specify --url and --sha256 or --json")
+	}
+
+	workDir, err := os.MkdirTemp("", "bazel_gcs")
+	if err != nil {
+		fatalf("Could not make temp directory: %s", err)
+	}
+
+	if *jsonFromStdin {
+		fmt.Println("Waiting for input on std in. Use Ctrl+D (EOF) when done copying and pasting the array.")
+		b, err := io.ReadAll(os.Stdin)
+		if err != nil {
+			fatalf("Error while reading from stdin: %s", err)
+		}
+		if err := processJSON(workDir, b); err != nil {
+			fatalf("Could not process data from stdin: %s", err)
+		}
+	} else {
+		if err := processOne(workDir, *url, *sha256Hash); err != nil {
+			fatalf("Error while processing entry: %s", err)
+		}
+	}
+}
+
+type urlEntry struct {
+	SHA256 string `json:"sha256"`
+	URL    string `json:"url"`
+}
+
+func processJSON(workDir string, b []byte) error {
+	// We generally will be copying a list from Bazel files, written with Starlark (i.e. Pythonish).
+	// As a result, we need to turn the almost valid JSON array of objects into actually valid JSON.
+	// It is easier to just do string replacing rather than going line by line to remove the
+	// troublesome comments.
+	cleaned := fixStarlarkComments(b)
+	var entries []urlEntry
+	if err := json5.Unmarshal([]byte(cleaned), &entries); err != nil {
+		return skerr.Wrapf(err, "unmarshalling JSON")
+	}
+	for _, entry := range entries {
+		if err := processOne(workDir, entry.URL, entry.SHA256); err != nil {
+			return skerr.Wrapf(err, "while processing entry: %+v", entry)
+		}
+	}
+	return nil
+}
+
+// fixStarlarkComments replaces the Starlark comment symbol (#) with a JSON comment symbol (//).
+func fixStarlarkComments(b []byte) string {
+	return strings.ReplaceAll(string(b), "#", "//")
+}
+
+func processOne(workDir, url, hash string) error {
+	suf := getSuffix(url)
+	if suf == "" {
+		return skerr.Fmt("%s is not a supported file type", url)
+	}
+	fmt.Printf("Downloading and verifying %s...\n", url)
+	res, err := http.Get(url)
+	if err != nil {
+		return skerr.Wrapf(err, "downloading %s", url)
+	}
+	contents, err := io.ReadAll(res.Body)
+	if err != nil {
+		return skerr.Wrapf(err, "reading %s", url)
+	}
+	if err := res.Body.Close(); err != nil {
+		return skerr.Wrapf(err, "after reading %s", url)
+	}
+	// Verify
+	h := sha256.Sum256(contents)
+	if actual := hex.EncodeToString(h[:]); actual != hash {
+		return skerr.Fmt("Invalid hash of %s. %s != %s", url, actual, hash)
+	}
+	fmt.Printf("Uploading %s to GCS...\n", url)
+	// Write to disk so gsutil can access it
+	tmpFile := filepath.Join(workDir, hash+suf)
+	if err := os.WriteFile(tmpFile, contents, 0644); err != nil {
+		return skerr.Wrapf(err, "writing %d bytes to %s", len(contents), tmpFile)
+	}
+	// Upload using gsutil (which is assumed to be properly authed)
+	cmd := exec.Command("gsutil",
+		// Add custom metadata so we can figure out what the unrecognizable file name was created
+		// from. Custom metadata values must start with x-goog-meta-
+		"-h", "x-goog-meta-original-url:"+url,
+		"cp", tmpFile, gcsBucketAndPrefix+hash+suf)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return skerr.Wrapf(cmd.Run(), "uploading %s to GCS", tmpFile)
+}
+
+var supportedSuffixes = []string{".tar.gz", ".tar.xz", ".deb"}
+
+// getSuffix returns the filetype suffix of the file if it is in the list of supported suffixes.
+// Otherwise, it returns empty string.
+func getSuffix(url string) string {
+	for _, suf := range supportedSuffixes {
+		if strings.HasSuffix(url, suf) {
+			return suf
+		}
+	}
+	return ""
+}
+
+func fatalf(format string, args ...interface{}) {
+	// Ensure there is a newline at the end of the fatal message.
+	format = strings.TrimSuffix(format, "\n") + "\n"
+	fmt.Printf(format, args...)
+	os.Exit(1)
+}
diff --git a/third_party/skia/bench/BlendmodeBench.cpp b/third_party/skia/bench/BlendmodeBench.cpp
index cc33422f5f90f..a7ee164c454f5 100644
--- a/third_party/skia/bench/BlendmodeBench.cpp
+++ b/third_party/skia/bench/BlendmodeBench.cpp
@@ -94,10 +94,6 @@ class XfermodeBench : public Benchmark {
         }
     }
 
-    bool isSuitableFor(Backend backend) override {
-        return backend == kRaster_Backend;
-    }
-
 private:
     SkBlendMode fBlendMode;
     SkString    fName;
diff --git a/third_party/skia/bench/FontCacheBench.cpp b/third_party/skia/bench/FontCacheBench.cpp
index 5d8966e0f7895..b38eee18d68b8 100644
--- a/third_party/skia/bench/FontCacheBench.cpp
+++ b/third_party/skia/bench/FontCacheBench.cpp
@@ -101,8 +101,8 @@ static void dump_array(const uint16_t array[], int count) {
 class FontCacheEfficiency : public Benchmark {
 public:
     FontCacheEfficiency()  {
-        if (false) dump_array(nullptr, 0);
-        if (false) rotr(0, 0);
+        if ((false)) dump_array(nullptr, 0);
+        if ((false)) rotr(0, 0);
     }
 
 protected:
diff --git a/third_party/skia/bench/GlyphQuadFillBench.cpp b/third_party/skia/bench/GlyphQuadFillBench.cpp
index 31fdc7c2b4c1e..760a53e3f77c4 100644
--- a/third_party/skia/bench/GlyphQuadFillBench.cpp
+++ b/third_party/skia/bench/GlyphQuadFillBench.cpp
@@ -51,17 +51,16 @@ class DirectMaskGlyphVertexFillBenchmark : public Benchmark {
         const SkPoint drawOrigin = glyphRunList.origin();
         drawMatrix.preTranslate(drawOrigin.x(), drawOrigin.y());
         GrSDFTControl control{false, props.isUseDeviceIndependentFonts(), 256, 256};
-        fBlob = GrTextBlob::Make(glyphRunList, paint, drawMatrix, control, &painter);
+        fBlob = GrTextBlob::Make(glyphRunList, paint, drawMatrix, false, control, &painter);
 
-        SkASSERT(!fBlob->subRunList().isEmpty());
-        GrAtlasSubRun* subRun = fBlob->subRunList().front().testingOnly_atlasSubRun();
+        const GrAtlasSubRun* subRun = fBlob->testingOnlyFirstSubRun();
         SkASSERT(subRun);
         subRun->testingOnly_packedGlyphIDToGrGlyph(&fCache);
         fVertices.reset(new char[subRun->vertexStride(drawMatrix) * subRun->glyphCount() * 4]);
     }
 
     void onDraw(int loops, SkCanvas* canvas) override {
-        GrAtlasSubRun* subRun = fBlob->subRunList().front().testingOnly_atlasSubRun();
+        const GrAtlasSubRun* subRun = fBlob->testingOnlyFirstSubRun();
         SkASSERT(subRun);
 
         SkIRect clip = SkIRect::MakeEmpty();
diff --git a/third_party/skia/bench/GrResourceCacheBench.cpp b/third_party/skia/bench/GrResourceCacheBench.cpp
index dc2fef8601cd6..c2383a293997b 100644
--- a/third_party/skia/bench/GrResourceCacheBench.cpp
+++ b/third_party/skia/bench/GrResourceCacheBench.cpp
@@ -26,9 +26,9 @@ class BenchResource : public GrGpuResource {
         this->registerWithCache(SkBudgeted::kYes);
     }
 
-    static void ComputeKey(int i, int keyData32Count, GrUniqueKey* key) {
-        static GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(key, kDomain, keyData32Count);
+    static void ComputeKey(int i, int keyData32Count, skgpu::UniqueKey* key) {
+        static skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+        skgpu::UniqueKey::Builder builder(key, kDomain, keyData32Count);
         for (int j = 0; j < keyData32Count; ++j) {
             builder[j] = i + j;
         }
@@ -42,7 +42,7 @@ class BenchResource : public GrGpuResource {
 
 static void populate_cache(GrGpu* gpu, int resourceCount, int keyData32Count) {
     for (int i = 0; i < resourceCount; ++i) {
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         BenchResource::ComputeKey(i, keyData32Count, &key);
         GrGpuResource* resource = new BenchResource(gpu);
         resource->resourcePriv().setUniqueKey(key);
@@ -141,7 +141,7 @@ class GrResourceCacheBenchFind : public Benchmark {
         SkASSERT(CACHE_SIZE_COUNT == cache->getResourceCount());
         for (int i = 0; i < loops; ++i) {
             for (int k = 0; k < CACHE_SIZE_COUNT; ++k) {
-                GrUniqueKey key;
+                skgpu::UniqueKey key;
                 BenchResource::ComputeKey(k, fKeyData32Count, &key);
                 sk_sp<GrGpuResource> resource(cache->findAndRefUniqueResource(key));
                 SkASSERT(resource);
diff --git a/third_party/skia/bench/MathBench.cpp b/third_party/skia/bench/MathBench.cpp
index 33660b23cf15f..d005719929202 100644
--- a/third_party/skia/bench/MathBench.cpp
+++ b/third_party/skia/bench/MathBench.cpp
@@ -295,7 +295,7 @@ class IsFiniteBench : public Benchmark {
             for (int j = 0; j < loops; ++j) {
                 for (int i = 0; i < N - 4; ++i) {
                     const SkRect* r = reinterpret_cast<const SkRect*>(&data[i]);
-                    if (false) { // avoid bit rot, suppress warning
+                    if ((false)) { // avoid bit rot, suppress warning
                         isFinite(*r);
                     }
                     counter += r->isFinite();
diff --git a/third_party/skia/bench/SkGlyphCacheBench.cpp b/third_party/skia/bench/SkGlyphCacheBench.cpp
index d5351c1dd6346..2127f1a0f4a76 100644
--- a/third_party/skia/bench/SkGlyphCacheBench.cpp
+++ b/third_party/skia/bench/SkGlyphCacheBench.cpp
@@ -11,7 +11,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkGraphics.h"
 #include "include/core/SkTypeface.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkStrikeSpec.h"
 #include "src/core/SkTLazy.h"
 #include "src/core/SkTaskGroup.h"
@@ -147,7 +147,7 @@ class DiscardableManager : public SkStrikeServer::DiscardableHandleManager,
         return id <= fLastDeletedHandleId;
     }
 
-    void notifyCacheMiss(SkStrikeClient::CacheMissType type) override {
+    void notifyCacheMiss(SkStrikeClient::CacheMissType type, int fontSize) override {
         SkAutoMutexExclusive l(fMutex);
 
         fCacheMissCount[type]++;
diff --git a/third_party/skia/bench/SkSLBench.cpp b/third_party/skia/bench/SkSLBench.cpp
index 7275290646202..f150446b7989d 100644
--- a/third_party/skia/bench/SkSLBench.cpp
+++ b/third_party/skia/bench/SkSLBench.cpp
@@ -53,8 +53,8 @@ class SkSLCompileBench : public Benchmark {
         SkUNREACHABLE;
     }
 
-    SkSLCompileBench(SkSL::String name, const char* src, bool optimize, Output output)
-        : fName(SkSL::String("sksl_") + (optimize ? "" : "unoptimized_") + output_string(output) +
+    SkSLCompileBench(std::string name, const char* src, bool optimize, Output output)
+        : fName(std::string("sksl_") + (optimize ? "" : "unoptimized_") + output_string(output) +
                 name)
         , fSrc(src)
         , fCaps(GrContextOptions(), GrMockOptions())
@@ -85,9 +85,9 @@ class SkSLCompileBench : public Benchmark {
             if (fCompiler.errorCount()) {
                 SK_ABORT("shader compilation failed: %s\n", fCompiler.errorText().c_str());
             }
-            SkSL::String result;
+            std::string result;
             switch (fOutput) {
-                case Output::kNone: break;
+                case Output::kNone:  break;
                 case Output::kGLSL:  SkAssertResult(fCompiler.toGLSL(*program,  &result)); break;
                 case Output::kMetal: SkAssertResult(fCompiler.toMetal(*program, &result)); break;
                 case Output::kSPIRV: SkAssertResult(fCompiler.toSPIRV(*program, &result)); break;
@@ -96,8 +96,8 @@ class SkSLCompileBench : public Benchmark {
     }
 
 private:
-    SkSL::String fName;
-    SkSL::String fSrc;
+    std::string fName;
+    std::string fSrc;
     GrMockCaps fCaps;
     SkSL::Compiler fCompiler;
     SkSL::Program::Settings fSettings;
diff --git a/third_party/skia/bench/TessellateBench.cpp b/third_party/skia/bench/TessellateBench.cpp
index f0dddd2b8ac59..f195e45e1bb52 100644
--- a/third_party/skia/bench/TessellateBench.cpp
+++ b/third_party/skia/bench/TessellateBench.cpp
@@ -139,7 +139,7 @@ static const SkMatrix gAlmostIdentity = SkMatrix::MakeAll(
 DEF_PATH_TESS_BENCH(GrPathCurveTessellator, make_cubic_path(8), SkMatrix::I()) {
     SkArenaAlloc arena(1024);
     GrPipeline noVaryingsPipeline(GrScissorTest::kDisabled, SkBlendMode::kSrcOver,
-                                  GrSwizzle::RGBA());
+                                  skgpu::Swizzle::RGBA());
     auto tess = PathCurveTessellator::Make(&arena,
                                            fTarget->caps().shaderCaps()->infinitySupport());
     tess->prepare(fTarget.get(),
@@ -153,7 +153,7 @@ DEF_PATH_TESS_BENCH(GrPathCurveTessellator, make_cubic_path(8), SkMatrix::I()) {
 DEF_PATH_TESS_BENCH(GrPathWedgeTessellator, make_cubic_path(8), SkMatrix::I()) {
     SkArenaAlloc arena(1024);
     GrPipeline noVaryingsPipeline(GrScissorTest::kDisabled, SkBlendMode::kSrcOver,
-                                  GrSwizzle::RGBA());
+                                  skgpu::Swizzle::RGBA());
     auto tess = PathWedgeTessellator::Make(&arena,
                                            fTarget->caps().shaderCaps()->infinitySupport());
     tess->prepare(fTarget.get(),
@@ -231,10 +231,14 @@ DEF_PATH_TESS_BENCH(wangs_formula_conic_log2, make_conic_path(), SkMatrix::I())
 DEF_PATH_TESS_BENCH(middle_out_triangulation,
                     ToolUtils::make_star(SkRect::MakeWH(500, 500), kNumCubicsInChalkboard),
                     SkMatrix::I()) {
+    // Conservative estimate of triangulation (see PathStencilCoverOp)
+    const int maxVerts =
+            3 * (PathTessellator::MaxCombinedFanEdgesInPathDrawList(kNumCubicsInChalkboard) - 2);
+
     sk_sp<const GrBuffer> buffer;
     int baseVertex;
-    VertexWriter vertexWriter = static_cast<SkPoint*>(fTarget->makeVertexSpace(
-            sizeof(SkPoint), kNumCubicsInChalkboard, &buffer, &baseVertex));
+    VertexWriter vertexWriter = fTarget->makeVertexWriter(
+            sizeof(SkPoint), maxVerts, &buffer, &baseVertex);
     AffineMatrix m(gAlmostIdentity);
     for (PathMiddleOutFanIter it(fPath); !it.done();) {
         for (auto [p0, p1, p2] : it.nextStack()) {
diff --git a/third_party/skia/bench/VertexColorSpaceBench.cpp b/third_party/skia/bench/VertexColorSpaceBench.cpp
index 4ec5bb4092c34..9b08b973c4fc2 100644
--- a/third_party/skia/bench/VertexColorSpaceBench.cpp
+++ b/third_party/skia/bench/VertexColorSpaceBench.cpp
@@ -15,6 +15,7 @@
 #include "src/gpu/GrGeometryProcessor.h"
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -65,7 +66,7 @@ class GP : public GrGeometryProcessor {
                 varyingHandler->emitAttributes(gp);
 
                 // Setup color
-                GrGLSLVarying varying(kHalf4_GrSLType);
+                GrGLSLVarying varying(SkSLType::kHalf4);
                 varyingHandler->addVarying("color", &varying);
                 vertBuilder->codeAppendf("half4 color = %s;", gp.fInColor.name());
 
@@ -94,7 +95,7 @@ class GP : public GrGeometryProcessor {
         return std::make_unique<Impl>();
     }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override {
         b->add32(fMode);
         b->add32(GrColorSpaceXform::XformKey(fColorSpaceXform.get()));
     }
@@ -104,20 +105,20 @@ class GP : public GrGeometryProcessor {
             : INHERITED(kVertexColorSpaceBenchGP_ClassID)
             , fMode(mode)
             , fColorSpaceXform(std::move(colorSpaceXform)) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         switch (fMode) {
             case kBaseline_Mode:
             case kShader_Mode:
-                fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
+                fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4};
                 break;
             case kFloat_Mode:
-                fInColor = {"inColor", kFloat4_GrVertexAttribType, kHalf4_GrSLType};
+                fInColor = {"inColor", kFloat4_GrVertexAttribType, SkSLType::kHalf4};
                 break;
             case kHalf_Mode:
-                fInColor = {"inColor", kHalf4_GrVertexAttribType, kHalf4_GrSLType};
+                fInColor = {"inColor", kHalf4_GrVertexAttribType, SkSLType::kHalf4};
                 break;
         }
-        this->setVertexAttributes(&fInPosition, 2);
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 2);
     }
 
     Mode fMode;
diff --git a/third_party/skia/bench/nanobench.cpp b/third_party/skia/bench/nanobench.cpp
index d61e0263ef9fb..f890fdff5f59c 100644
--- a/third_party/skia/bench/nanobench.cpp
+++ b/third_party/skia/bench/nanobench.cpp
@@ -30,16 +30,15 @@
 #include "include/core/SkString.h"
 #include "include/core/SkSurface.h"
 #include "include/core/SkTime.h"
-#include "include/private/SkTOptional.h"
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/core/SkLeanWindows.h"
 #include "src/core/SkOSFile.h"
 #include "src/core/SkTaskGroup.h"
 #include "src/core/SkTraceEvent.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/utils/SkJSONWriter.h"
 #include "src/utils/SkOSPath.h"
+#include "src/utils/SkShaderUtils.h"
 #include "tools/AutoreleasePool.h"
 #include "tools/CrashHandler.h"
 #include "tools/MSKPPlayer.h"
@@ -62,8 +61,9 @@
 #endif
 
 #include <cinttypes>
-#include <stdlib.h>
 #include <memory>
+#include <optional>
+#include <stdlib.h>
 #include <thread>
 
 extern bool gSkForceRasterPipelineBlitter;
@@ -445,11 +445,11 @@ static int setup_gpu_bench(Target* target, Benchmark* bench, int maxGpuFrameLag)
 #define kBogusContextType GrContextFactory::kGL_ContextType
 #define kBogusContextOverrides GrContextFactory::ContextOverrides::kNone
 
-static skstd::optional<Config> create_config(const SkCommandLineConfig* config) {
+static std::optional<Config> create_config(const SkCommandLineConfig* config) {
     if (const auto* gpuConfig = config->asConfigGpu()) {
         if (!FLAGS_gpu) {
             SkDebugf("Skipping config '%s' as requested.\n", config->getTag().c_str());
-            return skstd::nullopt;
+            return std::nullopt;
         }
 
         const auto ctxType = gpuConfig->getContextType();
@@ -458,7 +458,7 @@ static skstd::optional<Config> create_config(const SkCommandLineConfig* config)
         const auto colorType = gpuConfig->getColorType();
         if (gpuConfig->getSurfType() != SkCommandLineConfigGpu::SurfType::kDefault) {
             SkDebugf("This tool only supports the default surface type.");
-            return skstd::nullopt;
+            return std::nullopt;
         }
 
         GrContextFactory factory(grContextOpts);
@@ -470,11 +470,11 @@ static skstd::optional<Config> create_config(const SkCommandLineConfig* config)
                 SkDebugf("Configuration '%s' sample count %d is not a supported sample count.\n",
                          config->getTag().c_str(),
                          sampleCount);
-                return skstd::nullopt;
+                return std::nullopt;
             }
         } else {
             SkDebugf("No context was available matching config '%s'.\n", config->getTag().c_str());
-            return skstd::nullopt;
+            return std::nullopt;
         }
 
         return Config{gpuConfig->getTag(),
@@ -492,7 +492,7 @@ static skstd::optional<Config> create_config(const SkCommandLineConfig* config)
     if (config->getBackend().equals(name)) {                                            \
         if (!FLAGS_cpu) {                                                               \
             SkDebugf("Skipping config '%s' as requested.\n", config->getTag().c_str()); \
-            return skstd::nullopt;                                                      \
+            return std::nullopt;                                                      \
         }                                                                               \
         return Config{SkString(name),                                                   \
                       Benchmark::backend,                                               \
@@ -518,7 +518,7 @@ static skstd::optional<Config> create_config(const SkCommandLineConfig* config)
 #undef CPU_CONFIG
 
     SkDebugf("Unknown config '%s'.\n", config->getTag().c_str());
-    return skstd::nullopt;
+    return std::nullopt;
 }
 
 // Append all configs that are enabled and supported.
@@ -526,7 +526,7 @@ void create_configs(SkTArray<Config>* configs) {
     SkCommandLineConfigArray array;
     ParseConfigs(FLAGS_config, &array);
     for (int i = 0; i < array.count(); ++i) {
-        if (skstd::optional<Config> config = create_config(array[i].get())) {
+        if (std::optional<Config> config = create_config(array[i].get())) {
             configs->push_back(*config);
         }
     }
@@ -1161,7 +1161,7 @@ class NanobenchShaderErrorHandler : public GrContextOptions::ShaderErrorHandler
     void compileError(const char* shader, const char* errors) override {
         // Nanobench should abort if any shader can't compile. Failure is much better than
         // reporting meaningless performance metrics.
-        SkSL::String message = GrShaderUtils::BuildShaderErrorMessage(shader, errors);
+        std::string message = SkShaderUtils::BuildShaderErrorMessage(shader, errors);
         SK_ABORT("\n%s", message.c_str());
     }
 };
@@ -1229,7 +1229,9 @@ int main(int argc, char** argv) {
     }
 
     const double overhead = estimate_timer_overhead();
-    SkDebugf("Timer overhead: %s\n", HUMANIZE(overhead));
+    if (!FLAGS_quiet && !FLAGS_csv) {
+        SkDebugf("Timer overhead: %s\n", HUMANIZE(overhead));
+    }
 
     SkTArray<double> samples;
 
@@ -1238,6 +1240,8 @@ int main(int argc, char** argv) {
     } else if (FLAGS_quiet) {
         SkDebugf("! -> high variance, ? -> moderate variance\n");
         SkDebugf("    micros   \tbench\n");
+    } else if (FLAGS_csv) {
+        SkDebugf("min,median,mean,max,stddev,config,bench\n");
     } else if (FLAGS_ms) {
         SkDebugf("curr/maxrss\tloops\tmin\tmedian\tmean\tmax\tstddev\tsamples\tconfig\tbench\n");
     } else {
@@ -1437,10 +1441,9 @@ int main(int argc, char** argv) {
                          , bench->getUniqueName()
                          );
             } else {
-                const char* format = "%4d/%-4dMB\t%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\t%s\n";
                 const double stddev_percent =
                     sk_ieee_double_divide(100 * sqrt(stats.var), stats.mean);
-                SkDebugf(format
+                SkDebugf("%4d/%-4dMB\t%d\t%s\t%s\t%s\t%s\t%.0f%%\t%s\t%s\t%s\n"
                         , sk_tools::getCurrResidentSetSizeMB()
                         , sk_tools::getMaxResidentSetSizeMB()
                         , loops
diff --git a/third_party/skia/bin/activate-emsdk b/third_party/skia/bin/activate-emsdk
new file mode 100755
index 0000000000000..30a13aa31b030
--- /dev/null
+++ b/third_party/skia/bin/activate-emsdk
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+# Copyright 2022 Google LLC
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import subprocess
+import sys
+
+EMSDK_ROOT = os.path.join('third_party', 'externals', 'emsdk')
+
+EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py')
+
+EMSDK_VERSION = '3.1.3'
+
+def main():
+    try:
+        subprocess.check_call([sys.executable, EMSDK_PATH, 'install', EMSDK_VERSION])
+    except subprocess.CalledProcessError:
+        print ('Failed to install emsdk')
+        return 1
+    try:
+        subprocess.check_call([sys.executable, EMSDK_PATH, 'activate', EMSDK_VERSION])
+    except subprocess.CalledProcessError:
+        print ('Failed to activate emsdk')
+        return 1
+
+
+if __name__ == '__main__':
+  sys.exit(main())
\ No newline at end of file
diff --git a/third_party/skia/demos.skia.org/.gitignore b/third_party/skia/demos.skia.org/.gitignore
new file mode 100644
index 0000000000000..378eac25d3117
--- /dev/null
+++ b/third_party/skia/demos.skia.org/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/third_party/skia/demos.skia.org/Makefile b/third_party/skia/demos.skia.org/Makefile
index d3242d61e1a4a..51499cd6a309d 100644
--- a/third_party/skia/demos.skia.org/Makefile
+++ b/third_party/skia/demos.skia.org/Makefile
@@ -1,4 +1,6 @@
 .PHONY: local
 local:
 	echo "Go check out http://localhost:8123/demos/hello_world/index.html"
-	python2 -m SimpleHTTPServer 8123
+	rm -f build
+	ln -s ../modules/canvaskit/build build
+	python3 -m http.server 8123
diff --git a/third_party/skia/demos.skia.org/demos/image_sampling/index.html b/third_party/skia/demos.skia.org/demos/image_sampling/index.html
index 919bb34421f53..6626630a3695d 100644
--- a/third_party/skia/demos.skia.org/demos/image_sampling/index.html
+++ b/third_party/skia/demos.skia.org/demos/image_sampling/index.html
@@ -117,14 +117,14 @@ <h1>Custom Image Upscaling</h1>
 
         // Upper left, draw image using an algorithm (written in SkSL) between nearest neighbor and
         // linear interpolation with no smoothing.
-        paint.setShader(effect.makeShaderWithChildren([m, 0], true, [imageShader], null));
+        paint.setShader(effect.makeShaderWithChildren([m, 0], [imageShader], null));
         canvas.drawRect(CanvasKit.LTRBRect(0, 0, 4, 4), paint);
 
         // Lower left, draw image using an algorithm (written in SkSL) between nearest neighbor and
         // linear interpolation with smoothing enabled.
         canvas.save();
         canvas.translate(0, 4.1);
-        paint.setShader(effect.makeShaderWithChildren([m, 1], true, [imageShader], null));
+        paint.setShader(effect.makeShaderWithChildren([m, 1], [imageShader], null));
         canvas.drawRect(CanvasKit.LTRBRect(0, 0, 4, 4), paint);
         canvas.restore();
 
diff --git a/third_party/skia/demos.skia.org/demos/spreadsheet/index.html b/third_party/skia/demos.skia.org/demos/spreadsheet/index.html
new file mode 100644
index 0000000000000..0a5ce275437af
--- /dev/null
+++ b/third_party/skia/demos.skia.org/demos/spreadsheet/index.html
@@ -0,0 +1,252 @@
+<!DOCTYPE html>
+<title>Spreadsheet Demo</title>
+<meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<script type="text/javascript" src="https://unpkg.com/canvaskit-wasm@0.33.0/bin/full/canvaskit.js"></script>
+
+<style>
+  body {
+      background-color: black;
+  }
+  h1 {
+      color: white;
+  }
+  .hidden {
+      display: none;
+  }
+</style>
+
+<body>
+  <h1>Large canvas with many numbers, like a spreadsheet</h1>
+  <select id="numbers_impl">
+    <option value="fillText">&lt;canvas&gt; fillText</option>
+    <option value="drawGlyphs">CK drawGlyphs (tuned)</option>
+    <option value="drawText">CK drawText (naive)</option>
+  </select>
+
+  <canvas id=ck_canvas width=3840 height=2160 class="hidden"></canvas>
+  <canvas id=canvas_2d width=3840 height=2160></canvas>
+</body>
+
+<script type="text/javascript" charset="utf-8">
+  const ckLoaded = CanvasKitInit({ locateFile: (file) => 'https://unpkg.com/canvaskit-wasm@0.33.0/bin/full/' + file });
+
+  // This is the dimensions of a 4k screen.
+  const WIDTH = 3840, HEIGHT = 2160;
+  const ROWS = 144;
+  const ROW_HEIGHT = 15;
+  const COLS = 77;
+  const COL_WIDTH = 50;
+  const canvas2DEle = document.getElementById('canvas_2d');
+  const ckEle = document.getElementById('ck_canvas');
+
+  ckLoaded.then((CanvasKit) => {
+    const canvas2dCtx = canvas2DEle.getContext('2d');
+    const surface = CanvasKit.MakeCanvasSurface('ck_canvas');
+    if (!surface) {
+      throw 'Could not make surface';
+    }
+
+    const colorPaints = {
+      "grey": CanvasKit.Color(76, 76, 76),
+      "black": CanvasKit.BLACK,
+      "white": CanvasKit.WHITE,
+      "springGreen": CanvasKit.Color(0, 255, 127),
+      "tomato": CanvasKit.Color(255, 99, 71),
+    };
+    for (const name in colorPaints) {
+      const color = colorPaints[name];
+      const paint = new CanvasKit.Paint();
+      paint.setColor(color);
+      colorPaints[name] = paint;
+    }
+
+    const data = [];
+    for (let row = 0; row < ROWS; row++) {
+      data[row] = [];
+      for (let col = 0; col < COLS; col++) {
+        data[row][col] = Math.random() * Math.PI;
+      }
+    }
+
+    // Maybe use https://storage.googleapis.com/skia-cdn/google-web-fonts/NotoSans-Regular.ttf
+    const textFont = new CanvasKit.Font(null, 12);
+
+    const choice = document.getElementById("numbers_impl");
+
+    let frames = [];
+    const framesToMeasure = 10;
+    choice.addEventListener("change", () => {
+      frames = [];
+      if (choice.selectedIndex === 0) {
+        canvas2DEle.classList.remove('hidden');
+        ckEle.classList.add('hidden');
+      } else {
+        canvas2DEle.classList.add('hidden');
+        ckEle.classList.remove('hidden');
+      }
+    })
+    function drawFrame(canvas) {
+      if (frames && frames.length === framesToMeasure) {
+        // It is important to measure frame to frame time to account for the time spent by the
+        // GPU after our flush calls.
+        const deltas = [];
+        for (let i = 0; i< frames.length-1;i++) {
+          deltas.push(frames[i+1] - frames[i]);
+        }
+        console.log(`First ${framesToMeasure} frames`, deltas);
+        console.log((frames[framesToMeasure-1] - frames[0]) / framesToMeasure);
+        frames = null;
+      } else if (frames) {
+        frames.push(performance.now());
+      }
+
+      if (choice.selectedIndex === 2) {
+        canvas.clear(CanvasKit.BLACK);
+        drawTextImpl(canvas);
+      } else if (choice.selectedIndex === 1) {
+        canvas.clear(CanvasKit.BLACK);
+        drawGlyphsImpl(canvas);
+      } else {
+        fillTextImpl(canvas2dCtx);
+      }
+
+      surface.requestAnimationFrame(drawFrame)
+    }
+
+    function drawTextImpl(canvas) {
+      const timer = performance.now() / 10000;
+      for (let row = 0; row < ROWS; row++) {
+        if (row % 2) {
+          canvas.drawRect(CanvasKit.XYWHRect(0, row * ROW_HEIGHT + 2, WIDTH, ROW_HEIGHT), colorPaints["grey"]);
+        }
+        for (let col = 0; col < COLS; col++) {
+          let n = Math.abs(Math.sin(timer + data[row][col]));
+          let useWhiteFont = true;
+          if (n < 0.05) {
+            canvas.drawRect(CanvasKit.XYWHRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT), colorPaints["tomato"]);
+            useWhiteFont = false;
+          } else if (n > 0.95) {
+            canvas.drawRect(CanvasKit.XYWHRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT), colorPaints["springGreen"]);
+            useWhiteFont = false;
+          }
+          const str = n.toFixed(4);
+          canvas.drawText(str, col * COL_WIDTH, row * ROW_HEIGHT,
+            useWhiteFont ? colorPaints["white"] : colorPaints["black"], textFont);
+        }
+      }
+    }
+
+    //====================================================================================
+    const alphabet = "0.123456789 ";
+    const glyphIDs = textFont.getGlyphIDs(alphabet);
+    // These are all 7 with current font and size
+    const advances = textFont.getGlyphWidths(glyphIDs);
+
+
+    const charsPerDataPoint = 6; // leading 0, period, 4 decimal places
+    const glyphIDsMObj = CanvasKit.MallocGlyphIDs(ROWS * COLS * charsPerDataPoint);
+    let wasmGlyphIDArr = glyphIDsMObj.toTypedArray();
+    const glyphLocationsMObj = CanvasKit.Malloc(Float32Array, glyphIDsMObj.length * 2);
+    let wasmGlyphLocations = glyphLocationsMObj.toTypedArray();
+
+    function dataToGlyphs(n, outputBuffer, offset) {
+      const s = n.toFixed(4);
+      outputBuffer[offset] = glyphIDs[0]; // Always a leading 0
+      outputBuffer[offset+1] = glyphIDs[1]; // Always a decimal place
+      for (let i = 2; i< charsPerDataPoint; i++) {
+        outputBuffer[offset+i] = glyphIDs[alphabet.indexOf(s[i])];
+      }
+    }
+    const spaceIndex = alphabet.length - 1;
+    function blankOut(outputBuffer, offset) {
+      for (let i = 0; i< charsPerDataPoint; i++) {
+        outputBuffer[offset+i] = glyphIDs[spaceIndex];
+      }
+    }
+
+    for (let row = 0; row < ROWS; row++) {
+      for (let col = 0; col < COLS; col++) {
+        for (let i = 0; i < charsPerDataPoint; i++) {
+          const offset = (col + row * COLS) * charsPerDataPoint * 2;
+          wasmGlyphLocations[offset + i * 2] = col * COL_WIDTH + i * advances[0];
+          wasmGlyphLocations[offset + i * 2 + 1] = row * ROW_HEIGHT;
+        }
+      }
+    }
+
+    const greyGlyphIDsMObj = CanvasKit.MallocGlyphIDs(charsPerDataPoint);
+
+    function drawGlyphsImpl(canvas) {
+      wasmGlyphIDArr = glyphIDsMObj.toTypedArray();
+      let wasmGreyGlyphIDsArr = greyGlyphIDsMObj.toTypedArray();
+
+      const timer = performance.now() / 10000;
+      for (let row = 0; row < ROWS; row++) {
+        if (row % 2) {
+          canvas.drawRect(CanvasKit.XYWHRect(0, row * ROW_HEIGHT + 2, WIDTH, ROW_HEIGHT), colorPaints["grey"]);
+        }
+        for (let col = 0; col < COLS; col++) {
+          const n = Math.abs(Math.sin(timer + data[row][col]));
+          let useWhiteFont = true;
+          if (n < 0.05) {
+            canvas.drawRect(CanvasKit.XYWHRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT), colorPaints["tomato"]);
+            useWhiteFont = false;
+          } else if (n > 0.95) {
+            canvas.drawRect(CanvasKit.XYWHRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT), colorPaints["springGreen"]);
+            useWhiteFont = false;
+          }
+
+          const offset = (col + row * COLS) * charsPerDataPoint;
+          if (useWhiteFont) {
+            dataToGlyphs(n, wasmGlyphIDArr, offset);
+          } else {
+            blankOut(wasmGlyphIDArr, offset);
+            dataToGlyphs(n, wasmGreyGlyphIDsArr, 0);
+            canvas.drawGlyphs(wasmGreyGlyphIDsArr,
+              glyphLocationsMObj.subarray(offset*2, (offset + charsPerDataPoint) * 2),
+              0, 0, textFont, colorPaints["grey"]
+            );
+          }
+        }
+      }
+      canvas.drawGlyphs(wasmGlyphIDArr, glyphLocationsMObj, 0, 0, textFont, colorPaints["white"]);
+    }
+
+    function fillTextImpl(ctx) {
+      ctx.font = '12px monospace';
+      ctx.fillStyle = 'black';
+      ctx.fillRect(0, 0, WIDTH, HEIGHT);
+      const timer = performance.now() / 10000;
+      for (let row = 0; row < ROWS; row++) {
+        if (row % 2) {
+          ctx.fillStyle = 'rgb(76,76,76)';
+          ctx.fillRect(0, row * ROW_HEIGHT + 2, WIDTH, ROW_HEIGHT);
+        }
+        for (let col = 0; col < COLS; col++) {
+          let n = Math.abs(Math.sin(timer + data[row][col]));
+          let useWhiteFont = true;
+          if (n < 0.05) {
+            ctx.fillStyle = 'rgb(255, 99, 71)';
+            ctx.fillRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT);
+            useWhiteFont = false;
+          } else if (n > 0.95) {
+            ctx.fillStyle = 'rgb(0, 255, 127)';
+            ctx.fillRect(col * COL_WIDTH - 2, (row - 1) * ROW_HEIGHT + 2, COL_WIDTH, ROW_HEIGHT);
+            useWhiteFont = false;
+          }
+          const str = n.toFixed(4);
+          if (useWhiteFont) {
+            ctx.fillStyle = 'white';
+          } else {
+            ctx.fillStyle = 'black';
+          }
+          ctx.fillText(str, col * COL_WIDTH, row * ROW_HEIGHT);
+        }
+      }
+    }
+
+    surface.requestAnimationFrame(drawFrame);
+  });
+</script>
\ No newline at end of file
diff --git a/third_party/skia/demos.skia.org/demos/textures/index.html b/third_party/skia/demos.skia.org/demos/textures/index.html
index e539b6aa6df8c..0a1f9b6e0c2a4 100644
--- a/third_party/skia/demos.skia.org/demos/textures/index.html
+++ b/third_party/skia/demos.skia.org/demos/textures/index.html
@@ -24,7 +24,7 @@ <h1>User Defined Textures</h1>
 
   <canvas id=draw width=500 height=500></canvas>
 
-  <img id="sourceImage" src="/demo/textures/testimg.png">
+  <img id="sourceImage" src="/demos/textures/testimg.png">
 	<video id="sourceVideo" autoplay muted></video>
 </body>
 
@@ -62,21 +62,22 @@ <h1>User Defined Textures</h1>
       throw 'Could not make surface';
     }
     const paint = new CanvasKit.Paint();
+    // This image will have its underlying texture re-used once per frame.
+    const img = surface.makeImageFromTextureSource(srcEle);
 
-    // This example creates a new texture, loads it into an image, and then deletes the image
-    // (which should delete the texture automatically).
     let lastTS = Date.now();
     function drawFrame(canvas) {
       const now = Date.now();
       canvas.rotate(10 * (now - lastTS) / 1000, 250, 250);
       lastTS = now;
-      const img = surface.makeImageFromTextureSource(srcEle);
+      // Re-use the image's underlying texture, but replace the contents of the old texture
+      // with the contents of srcEle
+      surface.updateTextureFromSource(img, srcEle);
       canvas.clear(CanvasKit.Color(200, 200, 200));
       canvas.drawImage(img, 5, 5, paint);
-      img && img.delete();
       surface.requestAnimationFrame(drawFrame);
     }
     surface.requestAnimationFrame(drawFrame);
   });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/third_party/skia/demos.skia.org/demos/up_scaling/index.html b/third_party/skia/demos.skia.org/demos/up_scaling/index.html
index dd1bbf703f17d..c2f3f7fa55220 100644
--- a/third_party/skia/demos.skia.org/demos/up_scaling/index.html
+++ b/third_party/skia/demos.skia.org/demos/up_scaling/index.html
@@ -111,7 +111,7 @@ <h1>Custom Image Upscaling</h1>
   draw_one_pass = function(canvas, y, scale) {
       canvas.save();
       canvas.scale(scale, 1.0);
-      shader_paint.setShader(effect.makeShaderWithChildren([Math.round(scale)], true, [imageShader], null));
+      shader_paint.setShader(effect.makeShaderWithChildren([Math.round(scale)], [imageShader], null));
       canvas.drawRect([0, 0, size, y], shader_paint);
       canvas.restore();
   }
diff --git a/third_party/skia/dm/DM.cpp b/third_party/skia/dm/DM.cpp
index c2bef2eda058e..03a70c33e3d38 100644
--- a/third_party/skia/dm/DM.cpp
+++ b/third_party/skia/dm/DM.cpp
@@ -175,32 +175,46 @@ int RuntimeCheckErrorFunc(int errorType, const char* filename, int linenumber,
 
 using namespace DM;
 using sk_gpu_test::GrContextFactory;
-using sk_gpu_test::GLTestContext;
 using sk_gpu_test::ContextInfo;
+#ifdef SK_GL
+using sk_gpu_test::GLTestContext;
+#endif
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
 static FILE* gVLog;
 
-template <typename... Args>
-static void vlog(const char* fmt, Args&&... args) {
+static void vlog(const char* fmt, ...) SK_PRINTF_LIKE(1, 2);
+
+static void vlog(const char* fmt, ...) {
     if (gVLog) {
-        fprintf(gVLog, fmt, args...);
+        va_list args;
+        va_start(args, fmt);
+        vfprintf(gVLog, fmt, args);
         fflush(gVLog);
+        va_end(args);
     }
 }
 
-template <typename... Args>
-static void info(const char* fmt, Args&&... args) {
-    vlog(fmt, args...);
-    if (!FLAGS_quiet) {
-        printf(fmt, args...);
+static void info(const char* fmt, ...) SK_PRINTF_LIKE(1, 2);
+
+static void info(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+
+    if (gVLog) {
+        va_list vlogArgs;
+        va_copy(vlogArgs, args);
+        vfprintf(gVLog, fmt, vlogArgs);
+        fflush(gVLog);
+        va_end(vlogArgs);
     }
-}
-static void info(const char* fmt) {
+
     if (!FLAGS_quiet) {
-        printf("%s", fmt);  // Clang warns printf(fmt) is insecure.
+        vprintf(fmt, args);
     }
+
+    va_end(args);
 }
 
 static SkTArray<SkString>* gFailures = new SkTArray<SkString>;
@@ -300,7 +314,7 @@ static void find_culprit() {
         SkAutoSpinlock lock(*gMutex);
 
         const DWORD code = e->ExceptionRecord->ExceptionCode;
-        info("\nCaught exception %u", code);
+        info("\nCaught exception %lu", code);
         for (const auto& exception : kExceptions) {
             if (exception.code == code) {
                 info(" %s", exception.name);
@@ -974,7 +988,7 @@ static Sink* create_sink(const GrContextOptions& grCtxOptions, const SkCommandLi
 #define SINK(t, sink, ...) if (config->getBackend().equals(t)) return new sink(__VA_ARGS__)
 
     if (FLAGS_cpu) {
-        SINK("g8",          RasterSink, kGray_8_SkColorType);
+        SINK("r8",          RasterSink, kR8_unorm_SkColorType);
         SINK("565",         RasterSink, kRGB_565_SkColorType);
         SINK("4444",        RasterSink, kARGB_4444_SkColorType);
         SINK("8888",        RasterSink, kN32_SkColorType);
diff --git a/third_party/skia/dm/DMGpuTestProcs.cpp b/third_party/skia/dm/DMGpuTestProcs.cpp
index e8ea03bb7e2c2..9f6efe570c8ba 100644
--- a/third_party/skia/dm/DMGpuTestProcs.cpp
+++ b/third_party/skia/dm/DMGpuTestProcs.cpp
@@ -15,9 +15,12 @@
 #endif
 
 using sk_gpu_test::GrContextFactory;
-using sk_gpu_test::GLTestContext;
 using sk_gpu_test::ContextInfo;
 
+#ifdef SK_GL
+using sk_gpu_test::GLTestContext;
+#endif
+
 namespace skiatest {
 
 bool IsGLContextType(sk_gpu_test::GrContextFactory::ContextType type) {
@@ -94,7 +97,7 @@ void RunWithGraphiteTestContexts(GraphiteTestFn* test, Reporter* reporter) {
         return;
     }
 
-    (*test)(reporter, context.get());
+    (*test)(reporter, context);
 }
 
 } // namespace graphite
diff --git a/third_party/skia/dm/DMSrcSink.cpp b/third_party/skia/dm/DMSrcSink.cpp
index cd338aa5b5aa9..d450070172450 100644
--- a/third_party/skia/dm/DMSrcSink.cpp
+++ b/third_party/skia/dm/DMSrcSink.cpp
@@ -84,6 +84,8 @@
 #include "experimental/graphite/include/Recorder.h"
 #include "experimental/graphite/include/Recording.h"
 #include "experimental/graphite/include/SkStuff.h"
+// TODO: Remove this src include once we figure out public readPixels call for Graphite.
+#include "experimental/graphite/src/Surface_Graphite.h"
 #include "tools/graphite/ContextFactory.h"
 #include "tools/graphite/GraphiteTestContext.h"
 #endif
@@ -996,7 +998,9 @@ Result ImageGenSrc::draw(GrDirectContext*, SkCanvas* canvas) const {
             status = Result::Status::Skip;
         }
 #endif
-        return Result(status, "Image generator could not getPixels() for %s\n", fPath.c_str());
+        return Result(
+                status,
+                SkStringPrintf("Image generator could not getPixels() for %s\n", fPath.c_str()));
     }
 
     set_bitmap_color_space(&decodeInfo);
@@ -1462,7 +1466,7 @@ static Result compare_bitmaps(const SkBitmap& reference, const SkBitmap& bitmap)
             errString.append("\nActual image failed to encode: ");
             errString.append(encoded);
         }
-        return Result::Fatal(errString);
+        return Result(Result::Status::Fatal, errString);
     }
     return Result::Ok();
 }
@@ -2157,12 +2161,15 @@ Result GraphiteSink::draw(const Src& src,
 
     skiatest::graphite::ContextFactory factory;
     auto [_, context] = factory.getContextInfo(fContextType);
+    if (!context) {
+        return Result::Fatal("Could not create a context.");
+    }
 
     if (fTestPrecompile) {
-        precompile(context.get());
+        precompile(context);
     }
 
-    sk_sp<skgpu::Recorder> recorder = context->createRecorder();
+    std::unique_ptr<skgpu::Recorder> recorder = context->makeRecorder();
     if (!recorder) {
         return Result::Fatal("Could not create a recorder.");
     }
@@ -2170,7 +2177,7 @@ Result GraphiteSink::draw(const Src& src,
     dst->allocPixels(ii);
 
     {
-        sk_sp<SkSurface> surface = MakeGraphite(recorder, ii);
+        sk_sp<SkSurface> surface = MakeGraphite(recorder.get(), ii);
         if (!surface) {
             return Result::Fatal("Could not create a surface.");
         }
@@ -2179,7 +2186,16 @@ Result GraphiteSink::draw(const Src& src,
             return result;
         }
 
-        if (!surface->readPixels(*dst, 0, 0)) {
+        // For now we cast and call directly into Surface. Once we have a been idea of
+        // what the public API for synchronous graphite readPixels we can update this call to use
+        // that instead.
+        SkPixmap pm;
+        if (!dst->peekPixels(&pm) ||
+            !static_cast<skgpu::Surface*>(surface.get())->onReadPixels(context,
+                                                                       recorder.get(),
+                                                                       pm,
+                                                                       0,
+                                                                       0)) {
             return Result::Fatal("Could not readback from surface.");
         }
     }
@@ -2361,7 +2377,7 @@ Result ViaRuntimeBlend::draw(const Src& src,
 
     protected:
         bool onFilter(SkPaint& paint) const override {
-            if (skstd::optional<SkBlendMode> mode = paint.asBlendMode()) {
+            if (std::optional<SkBlendMode> mode = paint.asBlendMode()) {
                 paint.setBlender(GetRuntimeBlendForBlendMode(*mode));
             }
             return true;
diff --git a/third_party/skia/dm/DMSrcSink.h b/third_party/skia/dm/DMSrcSink.h
index 78b0433ec54ef..da234b1dbf972 100644
--- a/third_party/skia/dm/DMSrcSink.h
+++ b/third_party/skia/dm/DMSrcSink.h
@@ -42,26 +42,32 @@ typedef ImplicitString Path;
 class Result {
 public:
     enum class Status : int { Ok, Fatal, Skip };
-    Result(Status status, const SkString& s) : fMsg(s), fStatus(status) {}
-    Result(Status status, const char* s) : fMsg(s), fStatus(status) {}
-    template <typename... Args> Result (Status status, const char* s, Args... args)
-        : fMsg(SkStringPrintf(s, args...)), fStatus(status) {}
+
+    Result(Status status, SkString msg) : fMsg(std::move(msg)), fStatus(status) {}
 
     Result(const Result&)            = default;
     Result& operator=(const Result&) = default;
 
-    static Result Ok() { return Result(Status::Ok, nullptr); }
+    static Result Ok() { return Result{Status::Ok, {}}; }
+
+    static Result Fatal(const char* fmt, ...) SK_PRINTF_LIKE(1, 2) {
+        SkString msg;
+        va_list args;
+        va_start(args, fmt);
+        msg.printVAList(fmt, args);
+        va_end(args);
 
-    static Result Fatal(const SkString& s) { return Result(Status::Fatal, s); }
-    static Result Fatal(const char* s) { return Result(Status::Fatal, s); }
-    template <typename... Args> static Result Fatal(const char* s, Args... args) {
-        return Result(Status::Fatal, s, args...);
+        return Result{Status::Fatal, std::move(msg)};
     }
 
-    static Result Skip(const SkString& s) { return Result(Status::Skip, s); }
-    static Result Skip(const char* s) { return Result(Status::Skip, s); }
-    template <typename... Args> static Result Skip(const char* s, Args... args) {
-        return Result(Status::Skip, s, args...);
+    static Result Skip(const char* fmt, ...) SK_PRINTF_LIKE(1, 2) {
+        SkString msg;
+        va_list args;
+        va_start(args, fmt);
+        msg.printVAList(fmt, args);
+        va_end(args);
+
+        return Result{Status::Skip, std::move(msg)};
     }
 
     bool isOk() { return fStatus == Status::Ok; }
@@ -588,6 +594,7 @@ class GraphiteSink : public Sink {
     GraphiteSink(const SkCommandLineConfigGraphite*);
 
     Result draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
+    bool serial() const override { return true; }
     const char* fileExtension() const override { return "png"; }
     SinkFlags flags() const override { return SinkFlags{ SinkFlags::kGPU, SinkFlags::kDirect }; }
 
diff --git a/third_party/skia/docker/Makefile b/third_party/skia/docker/Makefile
index 3039c005f1d9f..1400e081e29ce 100644
--- a/third_party/skia/docker/Makefile
+++ b/third_party/skia/docker/Makefile
@@ -10,4 +10,4 @@ CMAKE_VERSION=3.13.4_v4
 push-cmake-release:
 	docker build --no-cache --tag cmake-release ./cmake-release
 	docker tag cmake-release gcr.io/skia-public/cmake-release:${CMAKE_VERSION}
-	docker push gcr.io/skia-public/cmake-release:${CMAKE_VERSION}
\ No newline at end of file
+	docker push gcr.io/skia-public/cmake-release:${CMAKE_VERSION}
diff --git a/third_party/skia/docker/skia-build-tools/Dockerfile b/third_party/skia/docker/skia-build-tools/Dockerfile
index ea3417fd9c116..9c0e927816ec8 100644
--- a/third_party/skia/docker/skia-build-tools/Dockerfile
+++ b/third_party/skia/docker/skia-build-tools/Dockerfile
@@ -1,7 +1,8 @@
 # Dockerfile for building an image with all the tools needed to checkout and build Skia.
-FROM launcher.gcr.io/google/clang-debian9 AS build
-RUN apt-get update && apt-get upgrade -y && apt-get install -y \
+FROM launcher.gcr.io/google/debian11 AS build
+RUN apt update && apt dist-upgrade -y && apt install -y \
   git \
+  clang \
   python \
   curl \
   build-essential \
diff --git a/third_party/skia/docker/skia-release/Dockerfile b/third_party/skia/docker/skia-release/Dockerfile
index c2c545e2ba5a2..173fd391bcc04 100644
--- a/third_party/skia/docker/skia-release/Dockerfile
+++ b/third_party/skia/docker/skia-release/Dockerfile
@@ -58,4 +58,9 @@ RUN cd /tmp/skia/skia \
   && ./bin/gn gen out/Static \
   && git rev-parse HEAD > VERSION \
   && /tmp/depot_tools/ninja -C out/Static \
-  && chown -R skia:skia .
+  && chown -R skia:skia . \
+  # obj is readable only by the skia user. It needs additional
+  # permissions to be accessible for CI (see https://review.skia.org/487217).
+  && chmod 755 -R out/Static/obj \
+  # Cleanup .git directories because they are not needed and take up space.
+  && find . -name .git -print0 | xargs -0 rm -rf
diff --git a/third_party/skia/docker/skia-wasm-release/Dockerfile b/third_party/skia/docker/skia-wasm-release/Dockerfile
index 6c45b5e97d590..454807542ba2f 100644
--- a/third_party/skia/docker/skia-wasm-release/Dockerfile
+++ b/third_party/skia/docker/skia-wasm-release/Dockerfile
@@ -38,7 +38,8 @@ RUN if [ ! -z "${PATCH_REF}" ] ; then cd /tmp/skia/skia \
 
 RUN cd /tmp/skia/skia \
   && gclient sync \
-  && ./bin/fetch-gn
+  && ./bin/fetch-gn \
+  && ./bin/activate-emsdk
 
 # PathKit should be in /tmp/skia/skia/out/pathkit/
 RUN /tmp/skia/skia/modules/pathkit/compile.sh
diff --git a/third_party/skia/docs/examples/SKIA_LOGO.cpp b/third_party/skia/docs/examples/SKIA_LOGO.cpp
index f6679465b2bdb..ce7127acadea6 100644
--- a/third_party/skia/docs/examples/SKIA_LOGO.cpp
+++ b/third_party/skia/docs/examples/SKIA_LOGO.cpp
@@ -86,7 +86,7 @@ void draw(SkCanvas* canvas) {
 
     // line
     const SkPoint pts[2] = {{160, 290}, {341, 290}};
-    p.setShader(SkGradientShader::MakeLinear(pts, lineColors, NULL, 2, SkTileMode::kClamp));
+    p.setShader(SkGradientShader::MakeLinear(pts, lineColors, nullptr, 2, SkTileMode::kClamp));
     if (true) {
         SkRRect rrect;
         rrect.setRectXY({138, 291, 341, 300}, 25.0, 5.0);
diff --git a/third_party/skia/docs/examples/SKIA_LOGO_ANIMATE.cpp b/third_party/skia/docs/examples/SKIA_LOGO_ANIMATE.cpp
index 63e167e38e7e3..e3c8d54c21b37 100644
--- a/third_party/skia/docs/examples/SKIA_LOGO_ANIMATE.cpp
+++ b/third_party/skia/docs/examples/SKIA_LOGO_ANIMATE.cpp
@@ -101,7 +101,7 @@ void draw(SkCanvas* canvas) {
     // line
     const SkPoint pts[2] = {{160, 290}, {341, 290}};
     p.setShader(SkGradientShader::MakeLinear(
-            pts, lineColors, NULL, 2, SkTileMode::kClamp));
+            pts, lineColors, nullptr, 2, SkTileMode::kClamp));
     if (true) {
         SkRRect rrectClip;
         rrectClip.setRectXY({138, 291, 138 + pos*(341-138), 300}, 25.0, 5.0);
diff --git a/third_party/skia/docs/examples/SKIA_LOGO_svg.cpp b/third_party/skia/docs/examples/SKIA_LOGO_svg.cpp
index fe3cb5b6b273f..8076777172460 100644
--- a/third_party/skia/docs/examples/SKIA_LOGO_svg.cpp
+++ b/third_party/skia/docs/examples/SKIA_LOGO_svg.cpp
@@ -53,7 +53,7 @@ void draw(SkCanvas* canvas) {
 
     const SkPoint pts[2] = {{160, 290}, {341, 290}};
     p.setShader(SkGradientShader::MakeLinear(
-            pts, lineColors, NULL, 2, SkTileMode::kClamp));
+            pts, lineColors, nullptr, 2, SkTileMode::kClamp));
     SkRRect rrect;
     rrect.setRectXY({138, 291, 341, 300}, 25.0, 5.0);
     canvas->drawRRect(rrect, p);
diff --git a/third_party/skia/docs/examples/not_path_gradient.cpp b/third_party/skia/docs/examples/not_path_gradient.cpp
index 30f9f6e06c237..37684d3935ded 100644
--- a/third_party/skia/docs/examples/not_path_gradient.cpp
+++ b/third_party/skia/docs/examples/not_path_gradient.cpp
@@ -20,8 +20,8 @@ void draw(SkCanvas* canvas) {
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(10);
     SkColor colors[2] = {SkColorSetRGB(0xEA, 0xD2, 0xAC), SkColorSetRGB(0x42, 0x81, 0xA4)};
-    paint.setShader(
-            SkGradientShader::MakeLinear(points, colors, NULL, 2, SkTileMode::kClamp, 0, NULL));
+    paint.setShader(SkGradientShader::MakeLinear(
+            points, colors, nullptr, 2, SkTileMode::kClamp, 0, nullptr));
     paint.setAntiAlias(true);
     canvas->clear(SK_ColorWHITE);
     SkPath path(star());
diff --git a/third_party/skia/docs/examples/picture_shader.cpp b/third_party/skia/docs/examples/picture_shader.cpp
index 3d0cd40a8cef5..ed615e4df9038 100644
--- a/third_party/skia/docs/examples/picture_shader.cpp
+++ b/third_party/skia/docs/examples/picture_shader.cpp
@@ -29,7 +29,7 @@ void draw_wheel(SkCanvas* c) {
                                     SK_ColorBLUE, SK_ColorMAGENTA, SK_ColorRED};
     SkMatrix rot;
     rot.setRotate(90.0f);
-    p.setShader(SkGradientShader::MakeSweep(0, 0, sweep_colors, NULL,
+    p.setShader(SkGradientShader::MakeSweep(0, 0, sweep_colors, nullptr,
                                             SK_ARRAY_COUNT(sweep_colors), 0, &rot));
     p.setStrokeWidth(0.05f * scale);
     p.setStyle(SkPaint::kStroke_Style);
diff --git a/third_party/skia/docs/examples/shader.cpp b/third_party/skia/docs/examples/shader.cpp
index 4d0a0b9ef5e9d..b7970f18baff2 100644
--- a/third_party/skia/docs/examples/shader.cpp
+++ b/third_party/skia/docs/examples/shader.cpp
@@ -18,8 +18,8 @@ void draw(SkCanvas* canvas) {
     paint.setPathEffect(SkDiscretePathEffect::Make(10.0f, 4.0f));
     SkPoint points[2] = {SkPoint::Make(0.0f, 0.0f), SkPoint::Make(256.0f, 256.0f)};
     SkColor colors[2] = {SkColorSetRGB(66, 133, 244), SkColorSetRGB(15, 157, 88)};
-    paint.setShader(
-            SkGradientShader::MakeLinear(points, colors, NULL, 2, SkTileMode::kClamp, 0, NULL));
+    paint.setShader(SkGradientShader::MakeLinear(
+            points, colors, nullptr, 2, SkTileMode::kClamp, 0, nullptr));
     paint.setAntiAlias(true);
     canvas->clear(SK_ColorWHITE);
     SkPath path(star());
diff --git a/third_party/skia/docs/examples/skpaint_compose.cpp b/third_party/skia/docs/examples/skpaint_compose.cpp
index 88192d35a4399..6f624c427790d 100644
--- a/third_party/skia/docs/examples/skpaint_compose.cpp
+++ b/third_party/skia/docs/examples/skpaint_compose.cpp
@@ -7,9 +7,9 @@ void draw(SkCanvas* canvas) {
     SkPaint paint;
     paint.setShader(SkShaders::Blend(
             SkBlendMode::kDifference,
-            SkGradientShader::MakeRadial(SkPoint::Make(128.0f, 128.0f), 180.0f, colors, NULL, 2,
-                                         SkTileMode::kClamp, 0, NULL),
-            SkPerlinNoiseShader::MakeTurbulence(0.025f, 0.025f, 2, 0.0f, NULL)));
+            SkGradientShader::MakeRadial(SkPoint::Make(128.0f, 128.0f), 180.0f, colors, nullptr, 2,
+                                         SkTileMode::kClamp, 0, nullptr),
+            SkPerlinNoiseShader::MakeTurbulence(0.025f, 0.025f, 2, 0.0f, nullptr)));
     canvas->drawPaint(paint);
 }
 }  // END FIDDLE
diff --git a/third_party/skia/docs/examples/unexpected_setAlphaType.cpp b/third_party/skia/docs/examples/unexpected_setAlphaType.cpp
index 8c3daf229881e..a87701779e978 100644
--- a/third_party/skia/docs/examples/unexpected_setAlphaType.cpp
+++ b/third_party/skia/docs/examples/unexpected_setAlphaType.cpp
@@ -36,6 +36,7 @@ static const char* colortype_name(SkColorType ct) {
         case kR16G16_unorm_SkColorType:       return "R16G16_unorm";
         case kR16G16_float_SkColorType:       return "R16G16_float";
         case kR16G16B16A16_unorm_SkColorType: return "R16G16B16A16_unorm";
+        case kR8_unorm_SkColorType:           return "R8_unorm";
     }
     SkASSERT(false);
     return "unexpected colortype";
diff --git a/third_party/skia/example/BUILD.bazel b/third_party/skia/example/BUILD.bazel
new file mode 100644
index 0000000000000..165223c38fc08
--- /dev/null
+++ b/third_party/skia/example/BUILD.bazel
@@ -0,0 +1,65 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+load("//bazel:cc_binary_with_flags.bzl", "cc_binary_with_flags")
+
+cc_binary_with_flags(
+    name = "hello_world",
+    srcs = [
+        "//example:HelloWorld_src",
+    ],
+    linkopts = [
+        "-lX11",
+        "-lxcb",
+        "-lXau",
+        "-lXdmcp",
+        "-lGL",
+    ],
+    # These flags are defined in //bazel/common_config_settings/BUILD.bazel
+    set_flags = {
+        # Use the GL backend with the normal GL standard (as opposed to WebGL or GLES)
+        "gpu_backend": [
+            "gl_backend",
+        ],
+        "with_gl_standard": [
+            "gl_standard",
+        ],
+        # Load fonts from the standard system directory (e.g. "/usr/share/fonts/")
+        # as defined in //src/ports/SkFontMgr_custom_directory_factory.cpp
+        "fontmgr_factory": [
+            "custom_directory_fontmgr_factory",
+        ],
+    },
+    deps = [
+        "//:skia_core",
+        "//src/utils:json_srcs",
+        "//tools/sk_app",
+    ],
+)
+
+# Everything below this line is autogenerated by gazelle using the C++ plugin built here:
+# https://github.com/google/skia-buildbot/tree/main/bazel/gazelle/cpp
+# These can be regenerated (if needed) by navigating to //bazel and running `make generate`
+# =========================================================================================
+
+generated_cc_atom(
+    name = "HelloWorld_hdr",
+    hdrs = ["HelloWorld.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//tools/sk_app:Application_hdr",
+        "//tools/sk_app:Window_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "HelloWorld_src",
+    srcs = ["HelloWorld.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":HelloWorld_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
diff --git a/third_party/skia/example/HelloWorld.cpp b/third_party/skia/example/HelloWorld.cpp
index f61978246f49b..c947e7b12a2f7 100644
--- a/third_party/skia/example/HelloWorld.cpp
+++ b/third_party/skia/example/HelloWorld.cpp
@@ -88,7 +88,7 @@ void HelloWorld::onPaint(SkSurface* surface) {
     paint.setColor(SK_ColorBLACK);
 
     canvas->save();
-    static const char message[] = "Hello World";
+    static const char message[] = "Hello World ";
 
     // Translate and rotate
     canvas->translate(300, 300);
@@ -105,7 +105,7 @@ void HelloWorld::onPaint(SkSurface* surface) {
 }
 
 void HelloWorld::onIdle() {
-    // Just re-paint continously
+    // Just re-paint continuously
     fWindow->inval();
 }
 
diff --git a/third_party/skia/experimental/bazel_test/BUILD.bazel b/third_party/skia/experimental/bazel_test/BUILD.bazel
index aaed3f8f17d47..1b777efec0f0e 100644
--- a/third_party/skia/experimental/bazel_test/BUILD.bazel
+++ b/third_party/skia/experimental/bazel_test/BUILD.bazel
@@ -7,7 +7,6 @@ cc_binary(
     visibility = ["//:__subpackages__"],
     deps = [
         ":bazel_test_src",
-        "//third_party:musl_compat",
     ] + select({
         "@platforms//os:windows": ["//src/ports:SkDebug_win_src"],
         "@platforms//os:android": ["//src/ports:SkDebug_android_src"],
diff --git a/third_party/skia/experimental/ffmpeg/BUILD.bazel b/third_party/skia/experimental/ffmpeg/BUILD.bazel
new file mode 100644
index 0000000000000..7acb83617eded
--- /dev/null
+++ b/third_party/skia/experimental/ffmpeg/BUILD.bazel
@@ -0,0 +1,46 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SkVideoDecoder_hdr",
+    hdrs = ["SkVideoDecoder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkImage_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkVideoDecoder_src",
+    srcs = ["SkVideoDecoder.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkVideoDecoder_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkYUVAPixmaps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVideoEncoder_hdr",
+    hdrs = ["SkVideoEncoder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkImage_hdr",
+        "//include/core:SkStream_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVideoEncoder_src",
+    srcs = ["SkVideoEncoder.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkVideoEncoder_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/core:SkYUVMath_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/include/BUILD.bazel b/third_party/skia/experimental/graphite/include/BUILD.bazel
new file mode 100644
index 0000000000000..1d6eccf672e98
--- /dev/null
+++ b/third_party/skia/experimental/graphite/include/BUILD.bazel
@@ -0,0 +1,74 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "BackendTexture_hdr",
+    hdrs = ["BackendTexture.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GraphiteTypes_hdr",
+        ":TextureInfo_hdr",
+        "//experimental/graphite/include/mtl:MtlTypes_hdr",
+        "//include/core:SkSize_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Context_hdr",
+    hdrs = ["Context.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GraphiteTypes_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/private:SkNoncopyable_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GraphiteTypes_hdr",
+    hdrs = ["GraphiteTypes.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkVx_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Recorder_hdr",
+    hdrs = ["Recorder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:SingleOwner_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Recording_hdr",
+    hdrs = ["Recording.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkStuff_hdr",
+    hdrs = ["SkStuff.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureInfo_hdr",
+    hdrs = ["TextureInfo.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GraphiteTypes_hdr",
+        "//experimental/graphite/include/private:MtlTypesPriv_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/include/Context.h b/third_party/skia/experimental/graphite/include/Context.h
index 33c88a9b894ee..ba3cc3762ab6b 100644
--- a/third_party/skia/experimental/graphite/include/Context.h
+++ b/third_party/skia/experimental/graphite/include/Context.h
@@ -13,6 +13,7 @@
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkShader.h"
 #include "include/core/SkTileMode.h"
+#include "include/private/SkNoncopyable.h"
 
 #include "experimental/graphite/include/GraphiteTypes.h"
 
@@ -20,6 +21,7 @@ namespace skgpu {
 
 class BackendTexture;
 class ContextPriv;
+class GlobalCache;
 class Gpu;
 class Recorder;
 class Recording;
@@ -51,17 +53,22 @@ struct PaintCombo {
     std::vector<SkBlendMode> fBlendModes;
 };
 
-class Context final : public SkRefCnt {
+class Context final {
 public:
-    ~Context() override;
+    Context(const Context&) = delete;
+    Context(Context&&) = delete;
+    Context& operator=(const Context&) = delete;
+    Context& operator=(Context&&) = delete;
+
+    ~Context();
 
 #ifdef SK_METAL
-    static sk_sp<Context> MakeMetal(const skgpu::mtl::BackendContext&);
+    static std::unique_ptr<Context> MakeMetal(const skgpu::mtl::BackendContext&);
 #endif
 
     BackendApi backend() const { return fBackend; }
 
-    sk_sp<Recorder> createRecorder();
+    std::unique_ptr<Recorder> makeRecorder();
 
     void insertRecording(std::unique_ptr<Recording>);
     void submit(SyncToCpu = SyncToCpu::kNo);
@@ -101,6 +108,7 @@ class Context final : public SkRefCnt {
 
     std::vector<std::unique_ptr<Recording>> fRecordings;
     sk_sp<Gpu> fGpu;
+    sk_sp<GlobalCache> fGlobalCache;
     BackendApi fBackend;
 };
 
diff --git a/third_party/skia/experimental/graphite/include/Recorder.h b/third_party/skia/experimental/graphite/include/Recorder.h
index f1e948f113ad9..0b6d85a25fbfb 100644
--- a/third_party/skia/experimental/graphite/include/Recorder.h
+++ b/third_party/skia/experimental/graphite/include/Recorder.h
@@ -8,37 +8,85 @@
 #ifndef skgpu_Recorder_DEFINED
 #define skgpu_Recorder_DEFINED
 
-#include "experimental/graphite/src/TaskGraph.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/SingleOwner.h"
+
+#include <vector>
 
 namespace skgpu {
 
-class Context;
+class Caps;
+class Device;
 class DrawBufferManager;
+class GlobalCache;
+class Gpu;
+class RecorderPriv;
 class Recording;
+class ResourceProvider;
+class Task;
+class TaskGraph;
 class UniformCache;
 
-class Recorder final : public SkRefCnt {
+class Recorder final {
 public:
-    ~Recorder() override;
-
-    void add(sk_sp<Task>);
+    Recorder(const Recorder&) = delete;
+    Recorder(Recorder&&) = delete;
+    Recorder& operator=(const Recorder&) = delete;
+    Recorder& operator=(Recorder&&) = delete;
 
-    Context* context() const;
-    UniformCache* uniformCache();
-    DrawBufferManager* drawBufferManager();
+    ~Recorder();
 
     std::unique_ptr<Recording> snap();
 
-protected:
+    // Provides access to functions that aren't part of the public API.
+    RecorderPriv priv();
+    const RecorderPriv priv() const;  // NOLINT(readability-const-return-type)
+
+#if GR_TEST_UTILS
+    bool deviceIsRegistered(Device*);
+#endif
+
 private:
     friend class Context; // For ctor
-    Recorder(sk_sp<Context>);
+    friend class Device; // For registering and deregistering Devices;
+    friend class RecorderPriv; // for ctor and hidden methods
+
+    Recorder(sk_sp<Gpu>, sk_sp<GlobalCache>);
 
-    sk_sp<Context> fContext;
-    TaskGraph fGraph;
+    SingleOwner* singleOwner() const { return &fSingleOwner; }
+
+    // We keep track of all Devices that are connected to a Recorder. This allows the client to
+    // safely delete an SkSurface or a Recorder in any order. If the client deletes the Recorder
+    // we need to notify all Devices that the Recorder is no longer valid. If we delete the
+    // SkSurface/Device first we will flush all the Device's into the Recorder before deregistering
+    // it from the Recorder.
+    //
+    // We do not need to take a ref on the Device since the Device will flush and deregister itself
+    // in its dtor. There is no other need for the Recorder to know about the Device after this
+    // point.
+    //
+    // Note: We could probably get by with only registering Devices directly connected to
+    // SkSurfaces. All other one off Devices will be created in a controlled scope where the
+    // Recorder should still be valid by the time they need to flush their work when the Device is
+    // deleted. We would have to make sure we safely handle cases where a client calls saveLayer
+    // then either deletes the SkSurface or Recorder before calling restore. For simplicity we just
+    // register every device for now, but if we see extra overhead in pushing back the extra
+    // pointers, we can look into only registering SkSurface Devices.
+    void registerDevice(Device*);
+    void deregisterDevice(const Device*);
+
+    sk_sp<Gpu> fGpu;
+    std::unique_ptr<ResourceProvider> fResourceProvider;
+
+    std::unique_ptr<TaskGraph> fGraph;
     std::unique_ptr<UniformCache> fUniformCache;
     std::unique_ptr<DrawBufferManager> fDrawBufferManager;
+    std::vector<Device*> fTrackedDevices;
+
+    // In debug builds we guard against improper thread handling
+    // This guard is passed to the ResourceCache.
+    // TODO: Should we also pass this to Device, DrawContext, and similar classes?
+    mutable SingleOwner fSingleOwner;
 };
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/include/SkStuff.h b/third_party/skia/experimental/graphite/include/SkStuff.h
index 6f25531cba188..eb6d70a9acfa9 100644
--- a/third_party/skia/experimental/graphite/include/SkStuff.h
+++ b/third_party/skia/experimental/graphite/include/SkStuff.h
@@ -8,16 +8,39 @@
 #ifndef SkStuff_DEFINED
 #define SkStuff_DEFINED
 
+#include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
 
-struct SkImageInfo;
 class SkSurface;
+class SkSurfaceProps;
 
 namespace skgpu {
+    class BackendTexture;
     class Recorder;
 }
 
 // TODO: Should be in SkSurface.h
-sk_sp<SkSurface> MakeGraphite(sk_sp<skgpu::Recorder>, const SkImageInfo&);
+sk_sp<SkSurface> MakeGraphite(skgpu::Recorder*, const SkImageInfo&);
+
+/**
+ * Wraps a GPU-backed texture into SkSurface. Depending on the backend gpu API, the caller may be
+ * required to ensure the texture is valid for the lifetime of returned SkSurface. The required
+ * lifetimes for the specific apis are:
+ *     Metal: Skia will call retain on the underlying MTLTexture so the caller can drop it once this
+ *            call returns.
+ *
+ * SkSurface is returned if all parameters are valid. BackendTexture is valid if its format agrees
+ * with colorSpace and context; for instance, if backendTexture has an sRGB configuration, then
+ * context must support sRGB, and colorSpace must be present. Further, backendTexture width and
+ * height must not exceed context capabilities, and the context must be able to support back-end
+ * textures.
+ *
+ * If SK_ENABLE_GRAPHITE is not defined, this has no effect and returns nullptr.
+ */
+sk_sp<SkSurface> MakeGraphiteFromBackendTexture(skgpu::Recorder*,
+                                                const skgpu::BackendTexture&,
+                                                SkColorType colorType,
+                                                sk_sp<SkColorSpace> colorSpace,
+                                                const SkSurfaceProps* props);
 
 #endif // SkStuff_DEFINED
diff --git a/third_party/skia/experimental/graphite/include/mtl/BUILD.bazel b/third_party/skia/experimental/graphite/include/mtl/BUILD.bazel
new file mode 100644
index 0000000000000..54821e4d68278
--- /dev/null
+++ b/third_party/skia/experimental/graphite/include/mtl/BUILD.bazel
@@ -0,0 +1,15 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "MtlBackendContext_hdr",
+    hdrs = ["MtlBackendContext.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":MtlTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "MtlTypes_hdr",
+    hdrs = ["MtlTypes.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/ports:SkCFObject_hdr"],
+)
diff --git a/third_party/skia/experimental/graphite/include/private/BUILD.bazel b/third_party/skia/experimental/graphite/include/private/BUILD.bazel
new file mode 100644
index 0000000000000..46dc0b70b0e44
--- /dev/null
+++ b/third_party/skia/experimental/graphite/include/private/BUILD.bazel
@@ -0,0 +1,11 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "MtlTypesPriv_hdr",
+    hdrs = ["MtlTypesPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:GraphiteTypes_hdr",
+        "//experimental/graphite/include/mtl:MtlTypes_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/src/Attribute.h b/third_party/skia/experimental/graphite/src/Attribute.h
index 26ca90bd605f4..f929eb7bb8c25 100644
--- a/third_party/skia/experimental/graphite/src/Attribute.h
+++ b/third_party/skia/experimental/graphite/src/Attribute.h
@@ -9,6 +9,7 @@
 #define skgpu_Attribute_DEFINED
 
 #include "experimental/graphite/src/DrawTypes.h"
+#include "src/core/SkSLTypeShared.h"
 
 namespace skgpu {
 
@@ -18,19 +19,19 @@ class Attribute {
     constexpr Attribute() = default;
     constexpr Attribute(const char* name,
                         VertexAttribType cpuType,
-                        SLType gpuType)
+                        SkSLType gpuType)
             : fName(name), fCPUType(cpuType), fGPUType(gpuType) {
-        SkASSERT(name && gpuType != SLType::kVoid);
+        SkASSERT(name && gpuType != SkSLType::kVoid);
     }
     constexpr Attribute(const Attribute&) = default;
 
     Attribute& operator=(const Attribute&) = default;
 
-    constexpr bool isInitialized() const { return fGPUType != SLType::kVoid; }
+    constexpr bool isInitialized() const { return fGPUType != SkSLType::kVoid; }
 
     constexpr const char*      name()    const { return fName; }
     constexpr VertexAttribType cpuType() const { return fCPUType; }
-    constexpr SLType           gpuType() const { return fGPUType; }
+    constexpr SkSLType         gpuType() const { return fGPUType; }
 
     constexpr size_t size()       const { return VertexAttribTypeSize(fCPUType); }
     constexpr size_t sizeAlign4() const { return SkAlign4(this->size()); }
@@ -38,7 +39,7 @@ class Attribute {
 private:
     const char* fName = nullptr;
     VertexAttribType fCPUType = VertexAttribType::kFloat;
-    SLType fGPUType = SLType::kVoid;
+    SkSLType fGPUType = SkSLType::kVoid;
 };
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/BUILD.bazel b/third_party/skia/experimental/graphite/src/BUILD.bazel
new file mode 100644
index 0000000000000..ea757157b8a61
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/BUILD.bazel
@@ -0,0 +1,946 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "Attribute_hdr",
+    hdrs = ["Attribute.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        "//src/core:SkSLTypeShared_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BackendTexture_src",
+    srcs = ["BackendTexture.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:BackendTexture_hdr"],
+)
+
+generated_cc_atom(
+    name = "Buffer_hdr",
+    hdrs = ["Buffer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceTypes_hdr",
+        ":Resource_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Buffer_src",
+    srcs = ["Buffer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Buffer_hdr"],
+)
+
+generated_cc_atom(
+    name = "Caps_hdr",
+    hdrs = ["Caps.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceTypes_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/gpu:ResourceKey_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Caps_src",
+    srcs = ["Caps.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Caps_hdr",
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//src/sksl:SkSLUtil_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CommandBuffer_hdr",
+    hdrs = ["CommandBuffer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        ":DrawWriter_hdr",
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CommandBuffer_src",
+    srcs = ["CommandBuffer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":CommandBuffer_hdr",
+        ":GraphicsPipeline_hdr",
+        ":Sampler_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+        "//src/core:SkTraceEvent_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ContextPriv_hdr",
+    hdrs = ["ContextPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:Context_hdr"],
+)
+
+generated_cc_atom(
+    name = "ContextPriv_src",
+    srcs = ["ContextPriv.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ContextPriv_hdr",
+        ":Gpu_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ContextUtils_hdr",
+    hdrs = ["ContextUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Context_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ContextUtils_src",
+    srcs = ["ContextUtils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ContextPriv_hdr",
+        ":ContextUtils_hdr",
+        ":DrawTypes_hdr",
+        ":PaintParams_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/private:SkUniquePaintParamsID_hdr",
+        "//src/core:SkBlenderBase_hdr",
+        "//src/core:SkKeyHelpers_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//src/core:SkUniform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Context_src",
+    srcs = ["Context.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":GlobalCache_hdr",
+        ":Gpu_hdr",
+        ":GraphicsPipelineDesc_hdr",
+        ":Renderer_hdr",
+        ":ResourceProvider_hdr",
+        "//experimental/graphite/include:BackendTexture_hdr",
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:Recording_hdr",
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//experimental/graphite/src/mtl:MtlTrampoline_hdr",
+        "//include/core:SkPathTypes_hdr",
+        "//src/core:SkKeyHelpers_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CopyTask_hdr",
+    hdrs = ["CopyTask.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Task_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CopyTask_src",
+    srcs = ["CopyTask.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":CommandBuffer_hdr",
+        ":CopyTask_hdr",
+        ":Texture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Device_hdr",
+    hdrs = ["Device.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawOrder_hdr",
+        ":EnumBitMask_hdr",
+        "//experimental/graphite/src/geom:Rect_hdr",
+        "//src/core:SkDevice_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Device_src",
+    srcs = ["Device.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":Caps_hdr",
+        ":ContextPriv_hdr",
+        ":CopyTask_hdr",
+        ":Device_hdr",
+        ":DrawContext_hdr",
+        ":DrawList_hdr",
+        ":Gpu_hdr",
+        ":Log_hdr",
+        ":RecorderPriv_hdr",
+        ":ResourceProvider_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:Recording_hdr",
+        "//experimental/graphite/include:SkStuff_hdr",
+        "//experimental/graphite/src/geom:BoundsManager_hdr",
+        "//experimental/graphite/src/geom:IntersectionTree_hdr",
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//experimental/graphite/src/geom:Transform_graphite_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//src/core:SkConvertPixels_hdr",
+        "//src/core:SkMatrixPriv_hdr",
+        "//src/core:SkPaintPriv_hdr",
+        "//src/core:SkSpecialImage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawBufferManager_hdr",
+    hdrs = ["DrawBufferManager.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/gpu:BufferWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawBufferManager_src",
+    srcs = ["DrawBufferManager.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":CommandBuffer_hdr",
+        ":DrawBufferManager_hdr",
+        ":ResourceProvider_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawContext_hdr",
+    hdrs = ["DrawContext.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawList_hdr",
+        ":DrawOrder_hdr",
+        ":DrawTypes_hdr",
+        ":UploadTask_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawContext_src",
+    srcs = ["DrawContext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":ContextPriv_hdr",
+        ":DrawContext_hdr",
+        ":DrawList_hdr",
+        ":DrawPass_hdr",
+        ":Gpu_hdr",
+        ":RecorderPriv_hdr",
+        ":RenderPassTask_hdr",
+        ":ResourceTypes_hdr",
+        ":TextureProxy_hdr",
+        ":UploadTask_hdr",
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/src/geom:BoundsManager_hdr",
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/private:SkColorData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawList_hdr",
+    hdrs = ["DrawList.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawOrder_hdr",
+        ":PaintParams_hdr",
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//experimental/graphite/src/geom:Transform_graphite_hdr",
+        "//include/core:SkPaint_hdr",
+        "//src/core:SkTBlockList_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawList_src",
+    srcs = ["DrawList.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawList_hdr",
+        ":Renderer_hdr",
+        "//src/gpu:BufferWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawOrder_hdr",
+    hdrs = ["DrawOrder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "DrawPass_hdr",
+    hdrs = ["DrawPass.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        ":GraphicsPipelineDesc_hdr",
+        ":ResourceTypes_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/core:SkTBlockList_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawPass_src",
+    srcs = ["DrawPass.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":ContextPriv_hdr",
+        ":ContextUtils_hdr",
+        ":DrawBufferManager_hdr",
+        ":DrawContext_hdr",
+        ":DrawList_hdr",
+        ":DrawPass_hdr",
+        ":DrawWriter_hdr",
+        ":GlobalCache_hdr",
+        ":GraphicsPipelineDesc_hdr",
+        ":GraphicsPipeline_hdr",
+        ":RecorderPriv_hdr",
+        ":Renderer_hdr",
+        ":ResourceProvider_hdr",
+        ":TextureProxy_hdr",
+        ":UniformCache_hdr",
+        ":UniformManager_hdr",
+        "//experimental/graphite/include:GraphiteTypes_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/src/geom:BoundsManager_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/core:SkTBlockList_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//src/gpu:BufferWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawTypes_hdr",
+    hdrs = ["DrawTypes.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:GraphiteTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "DrawWriter_hdr",
+    hdrs = ["DrawWriter.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        "//src/gpu:BufferWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawWriter_src",
+    srcs = ["DrawWriter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawBufferManager_hdr",
+        ":DrawWriter_hdr",
+        "//src/gpu:BufferWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "EnumBitMask_hdr",
+    hdrs = ["EnumBitMask.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:GraphiteTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "GpuWorkSubmission_hdr",
+    hdrs = ["GpuWorkSubmission.h"],
+    visibility = ["//:__subpackages__"],
+)
+
+generated_cc_atom(
+    name = "Gpu_hdr",
+    hdrs = ["Gpu.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:GraphiteTypes_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/private:SkDeque_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Gpu_src",
+    srcs = ["Gpu.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":GpuWorkSubmission_hdr",
+        ":Gpu_hdr",
+        ":Log_hdr",
+        ":ResourceProvider_hdr",
+        "//experimental/graphite/include:BackendTexture_hdr",
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GraphicsPipelineDesc_hdr",
+    hdrs = ["GraphicsPipelineDesc.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Attribute_hdr",
+        ":DrawTypes_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkOpts_spi_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkUniquePaintParamsID_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GraphicsPipelineDesc_src",
+    srcs = ["GraphicsPipelineDesc.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":GraphicsPipelineDesc_hdr"],
+)
+
+generated_cc_atom(
+    name = "GraphicsPipeline_hdr",
+    hdrs = ["GraphicsPipeline.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Resource_hdr"],
+)
+
+generated_cc_atom(
+    name = "GraphicsPipeline_src",
+    srcs = ["GraphicsPipeline.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":GraphicsPipeline_hdr"],
+)
+
+generated_cc_atom(
+    name = "Image_Graphite_hdr",
+    hdrs = ["Image_Graphite.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//src/image:SkImage_Base_hdr"],
+)
+
+generated_cc_atom(
+    name = "Image_Graphite_src",
+    srcs = ["Image_Graphite.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Image_Graphite_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProgramCache_src",
+    srcs = ["ProgramCache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":ProgramCache_hdr"],
+)
+
+generated_cc_atom(
+    name = "Recorder_src",
+    srcs = ["Recorder.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":ContextPriv_hdr",
+        ":Device_hdr",
+        ":DrawBufferManager_hdr",
+        ":GlobalCache_hdr",
+        ":Gpu_hdr",
+        ":ResourceProvider_hdr",
+        ":TaskGraph_hdr",
+        ":UniformCache_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:Recording_hdr",
+        "//src/core:SkUniformData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Recording_src",
+    srcs = ["Recording.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CommandBuffer_hdr",
+        "//experimental/graphite/include:Recording_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RenderPassTask_hdr",
+    hdrs = ["RenderPassTask.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CommandBuffer_hdr",
+        ":Task_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RenderPassTask_src",
+    srcs = ["RenderPassTask.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CommandBuffer_hdr",
+        ":ContextPriv_hdr",
+        ":DrawPass_hdr",
+        ":Log_hdr",
+        ":RenderPassTask_hdr",
+        ":ResourceProvider_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Renderer_hdr",
+    hdrs = ["Renderer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Attribute_hdr",
+        ":DrawTypes_hdr",
+        ":EnumBitMask_hdr",
+        ":ResourceTypes_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkUniform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceProvider_hdr",
+    hdrs = ["ResourceProvider.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CommandBuffer_hdr",
+        ":GraphicsPipelineDesc_hdr",
+        ":ResourceCache_hdr",
+        ":ResourceTypes_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//src/core:SkLRUCache_hdr",
+        "//src/gpu:ResourceKey_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceProvider_src",
+    srcs = ["ResourceProvider.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":ContextPriv_hdr",
+        ":GlobalCache_hdr",
+        ":Gpu_hdr",
+        ":GraphicsPipeline_hdr",
+        ":ResourceProvider_hdr",
+        ":Sampler_hdr",
+        ":Texture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceTypes_hdr",
+    hdrs = ["ResourceTypes.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":EnumBitMask_hdr",
+        "//experimental/graphite/include:GraphiteTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkStuff_src",
+    srcs = ["SkStuff.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Caps_hdr",
+        ":ContextPriv_hdr",
+        ":Device_hdr",
+        ":Gpu_hdr",
+        ":RecorderPriv_hdr",
+        ":ResourceProvider_hdr",
+        ":Surface_Graphite_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+        "//experimental/graphite/include:BackendTexture_hdr",
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:SkStuff_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Surface_Graphite_hdr",
+    hdrs = ["Surface_Graphite.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//src/image:SkSurface_Base_hdr"],
+)
+
+generated_cc_atom(
+    name = "Surface_Graphite_src",
+    srcs = ["Surface_Graphite.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Device_hdr",
+        ":Image_Graphite_hdr",
+        ":Surface_Graphite_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:SkStuff_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TaskGraph_hdr",
+    hdrs = ["TaskGraph.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Task_hdr"],
+)
+
+generated_cc_atom(
+    name = "TaskGraph_src",
+    srcs = ["TaskGraph.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":TaskGraph_hdr"],
+)
+
+generated_cc_atom(
+    name = "Task_hdr",
+    hdrs = ["Task.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "Task_src",
+    srcs = ["Task.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Task_hdr"],
+)
+
+generated_cc_atom(
+    name = "TextureInfo_src",
+    srcs = ["TextureInfo.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:TextureInfo_hdr"],
+)
+
+generated_cc_atom(
+    name = "TextureProxy_hdr",
+    hdrs = ["TextureProxy.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureProxy_src",
+    srcs = ["TextureProxy.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceProvider_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Texture_hdr",
+    hdrs = ["Texture.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceTypes_hdr",
+        ":Resource_hdr",
+        "//experimental/graphite/include:TextureInfo_hdr",
+        "//include/core:SkSize_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Texture_src",
+    srcs = ["Texture.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Texture_hdr"],
+)
+
+generated_cc_atom(
+    name = "UniformCache_hdr",
+    hdrs = ["UniformCache.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "UniformCache_src",
+    srcs = ["UniformCache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":UniformCache_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/core:SkUniformData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UniformManager_hdr",
+    hdrs = ["UniformManager.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkSpan_hdr",
+        "//src/core:SkSLTypeShared_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UniformManager_src",
+    srcs = ["UniformManager.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawTypes_hdr",
+        ":UniformManager_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/private:SkHalf_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkUniform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PaintParams_hdr",
+    hdrs = ["PaintParams.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PaintParams_src",
+    srcs = ["PaintParams.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PaintParams_hdr",
+        "//include/core:SkShader_hdr",
+        "//src/core:SkBlenderBase_hdr",
+        "//src/core:SkKeyHelpers_hdr",
+        "//src/core:SkPaintParamsKey_hdr",
+        "//src/shaders:SkShaderBase_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Resource_hdr",
+    hdrs = ["Resource.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceTypes_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Resource_src",
+    srcs = ["Resource.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Resource_hdr"],
+)
+
+generated_cc_atom(
+    name = "Log_hdr",
+    hdrs = ["Log.h"],
+    visibility = ["//:__subpackages__"],
+)
+
+generated_cc_atom(
+    name = "Sampler_hdr",
+    hdrs = ["Sampler.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Resource_hdr"],
+)
+
+generated_cc_atom(
+    name = "Sampler_src",
+    srcs = ["Sampler.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Sampler_hdr"],
+)
+
+generated_cc_atom(
+    name = "GlobalCache_hdr",
+    hdrs = ["GlobalCache.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "GlobalCache_src",
+    srcs = ["GlobalCache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GlobalCache_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GraphiteResourceKey_hdr",
+    hdrs = ["GraphiteResourceKey.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceTypes_hdr",
+        "//src/gpu:ResourceKey_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GraphiteResourceKey_src",
+    srcs = ["GraphiteResourceKey.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":GraphiteResourceKey_hdr"],
+)
+
+generated_cc_atom(
+    name = "RecorderPriv_hdr",
+    hdrs = ["RecorderPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:Recorder_hdr"],
+)
+
+generated_cc_atom(
+    name = "RecorderPriv_src",
+    srcs = ["RecorderPriv.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Gpu_hdr",
+        ":RecorderPriv_hdr",
+        ":TaskGraph_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceCache_hdr",
+    hdrs = ["ResourceCache.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Resource_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTHash_hdr",
+        "//src/core:SkTDPQueue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceCache_src",
+    srcs = ["ResourceCache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceCache_hdr",
+        ":Resource_hdr",
+        "//include/private:SingleOwner_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UploadTask_hdr",
+    hdrs = ["UploadTask.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Task_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UploadTask_src",
+    srcs = ["UploadTask.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Buffer_hdr",
+        ":Caps_hdr",
+        ":CommandBuffer_hdr",
+        ":Log_hdr",
+        ":RecorderPriv_hdr",
+        ":ResourceProvider_hdr",
+        ":TextureProxy_hdr",
+        ":Texture_hdr",
+        ":UploadTask_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//src/core:SkConvertPixels_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/src/Buffer.h b/third_party/skia/experimental/graphite/src/Buffer.h
index c7d35afe7ed59..a109aed310267 100644
--- a/third_party/skia/experimental/graphite/src/Buffer.h
+++ b/third_party/skia/experimental/graphite/src/Buffer.h
@@ -8,12 +8,12 @@
 #ifndef skgpu_Buffer_DEFINED
 #define skgpu_Buffer_DEFINED
 
+#include "experimental/graphite/src/Resource.h"
 #include "experimental/graphite/src/ResourceTypes.h"
-#include "include/core/SkRefCnt.h"
 
 namespace skgpu {
 
-class Buffer : public SkRefCnt {
+class Buffer : public Resource {
 public:
     size_t size() const { return fSize; }
 
@@ -23,8 +23,8 @@ class Buffer : public SkRefCnt {
     bool isMapped() const { return fMapPtr; }
 
 protected:
-    Buffer(size_t size, BufferType type, PrioritizeGpuReads prioritizeGpuReads)
-        : fSize(size), fType(type), fPrioritizeGpuReads(prioritizeGpuReads) {}
+    Buffer(const Gpu* gpu, size_t size, BufferType type, PrioritizeGpuReads prioritizeGpuReads)
+        : Resource(gpu), fSize(size), fType(type), fPrioritizeGpuReads(prioritizeGpuReads) {}
 
     void* fMapPtr = nullptr;
 
diff --git a/third_party/skia/experimental/graphite/src/Caps.cpp b/third_party/skia/experimental/graphite/src/Caps.cpp
index b7bf144c84d37..ae67912fbb777 100644
--- a/third_party/skia/experimental/graphite/src/Caps.cpp
+++ b/third_party/skia/experimental/graphite/src/Caps.cpp
@@ -6,6 +6,8 @@
  */
 
 #include "experimental/graphite/src/Caps.h"
+
+#include "experimental/graphite/include/TextureInfo.h"
 #include "src/sksl/SkSLUtil.h"
 
 namespace skgpu {
@@ -13,6 +15,13 @@ namespace skgpu {
 Caps::Caps() {}
 Caps::~Caps() {}
 
+bool Caps::isTexturable(const TextureInfo& info) const {
+    if (info.numSamples() > 1) {
+        return false;
+    }
+    return this->onIsTexturable(info);
+}
+
 bool Caps::areColorTypeAndTextureInfoCompatible(SkColorType type, const TextureInfo& info) const {
     if (type == kUnknown_SkColorType) {
         return false;
diff --git a/third_party/skia/experimental/graphite/src/Caps.h b/third_party/skia/experimental/graphite/src/Caps.h
index af77655e7f93f..c7d7c608c98bf 100644
--- a/third_party/skia/experimental/graphite/src/Caps.h
+++ b/third_party/skia/experimental/graphite/src/Caps.h
@@ -11,6 +11,7 @@
 #include "experimental/graphite/src/ResourceTypes.h"
 #include "include/core/SkImageInfo.h"
 #include "include/core/SkRefCnt.h"
+#include "src/gpu/ResourceKey.h"
 
 namespace SkSL {
 struct ShaderCaps;
@@ -18,6 +19,9 @@ struct ShaderCaps;
 
 namespace skgpu {
 
+class GraphicsPipelineDesc;
+class GraphiteResourceKey;
+struct RenderPassDesc;
 class TextureInfo;
 
 class Caps : public SkRefCnt {
@@ -39,17 +43,32 @@ class Caps : public SkRefCnt {
                                                           uint32_t sampleCount,
                                                           Protected) const = 0;
 
+    virtual UniqueKey makeGraphicsPipelineKey(const GraphicsPipelineDesc&,
+                                              const RenderPassDesc&) const = 0;
+
     bool areColorTypeAndTextureInfoCompatible(SkColorType, const TextureInfo&) const;
 
-    virtual bool isTexturable(const TextureInfo&) const = 0;
+    bool isTexturable(const TextureInfo&) const;
     virtual bool isRenderable(const TextureInfo&) const = 0;
 
     int maxTextureSize() const { return fMaxTextureSize; }
 
+    virtual void buildKeyForTexture(SkISize dimensions,
+                                    const TextureInfo&,
+                                    ResourceType,
+                                    Shareable,
+                                    GraphiteResourceKey*) const = 0;
+
     // Returns the required alignment in bytes for the offset into a uniform buffer when binding it
     // to a draw.
     size_t requiredUniformBufferAlignment() const { return fRequiredUniformBufferAlignment; }
 
+    // Returns the alignment in bytes for the offset into a Buffer when using it
+    // to transfer to or from a Texture with the given bytes per pixel.
+    virtual size_t getTransferBufferAlignment(size_t bytesPerPixel) const = 0;
+
+    bool clampToBorderSupport() const { return fClampToBorderSupport; }
+
 protected:
     Caps();
 
@@ -58,7 +77,10 @@ class Caps : public SkRefCnt {
 
     std::unique_ptr<SkSL::ShaderCaps> fShaderCaps;
 
+    bool fClampToBorderSupport = true;
+
 private:
+    virtual bool onIsTexturable(const TextureInfo&) const = 0;
     virtual bool onAreColorTypeAndTextureInfoCompatible(SkColorType, const TextureInfo&) const = 0;
 };
 
diff --git a/third_party/skia/experimental/graphite/src/CommandBuffer.cpp b/third_party/skia/experimental/graphite/src/CommandBuffer.cpp
index b00f9e06e3fbe..460934d6becb5 100644
--- a/third_party/skia/experimental/graphite/src/CommandBuffer.cpp
+++ b/third_party/skia/experimental/graphite/src/CommandBuffer.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkTraceEvent.h"
 
 #include "experimental/graphite/src/Buffer.h"
+#include "experimental/graphite/src/Sampler.h"
 #include "experimental/graphite/src/Texture.h"
 #include "experimental/graphite/src/TextureProxy.h"
 
@@ -18,18 +19,28 @@ namespace skgpu {
 
 CommandBuffer::CommandBuffer() {}
 
+CommandBuffer::~CommandBuffer() {
+    this->releaseResources();
+}
+
 void CommandBuffer::releaseResources() {
     TRACE_EVENT0("skia.gpu", TRACE_FUNC);
 
     fTrackedResources.reset();
 }
 
-void CommandBuffer::beginRenderPass(const RenderPassDesc& renderPassDesc,
+void CommandBuffer::trackResource(sk_sp<Resource> resource) {
+    fTrackedResources.push_back(std::move(resource));
+}
+
+bool CommandBuffer::beginRenderPass(const RenderPassDesc& renderPassDesc,
                                     sk_sp<Texture> colorTexture,
                                     sk_sp<Texture> resolveTexture,
                                     sk_sp<Texture> depthStencilTexture) {
-    this->onBeginRenderPass(renderPassDesc, colorTexture.get(), resolveTexture.get(),
-                            depthStencilTexture.get());
+    if (!this->onBeginRenderPass(renderPassDesc, colorTexture.get(), resolveTexture.get(),
+                                 depthStencilTexture.get())) {
+        return false;
+    }
 
     if (colorTexture) {
         this->trackResource(std::move(colorTexture));
@@ -47,6 +58,8 @@ void CommandBuffer::beginRenderPass(const RenderPassDesc& renderPassDesc,
         fHasWork = true;
     }
 #endif
+
+    return true;
 }
 
 void CommandBuffer::bindGraphicsPipeline(sk_sp<GraphicsPipeline> graphicsPipeline) {
@@ -88,29 +101,61 @@ void CommandBuffer::bindDrawBuffers(BindBufferInfo vertices,
     this->bindIndexBuffer(sk_ref_sp(indices.fBuffer), indices.fOffset);
 }
 
-static bool check_max_blit_width(int widthInPixels) {
-    if (widthInPixels > 32767) {
-        SkASSERT(false); // surfaces should not be this wide anyway
-        return false;
+void CommandBuffer::bindTextures(const TextureBindEntry* entries, int count) {
+    this->onBindTextures(entries, count);
+    for (int i = 0; i < count; ++i) {
+        SkASSERT(entries[i].fTexture);
+        this->trackResource(entries[i].fTexture);
     }
-    return true;
 }
 
-void CommandBuffer::copyTextureToBuffer(sk_sp<skgpu::Texture> texture,
+void CommandBuffer::bindSamplers(const SamplerBindEntry* entries, int count) {
+    this->onBindSamplers(entries, count);
+    for (int i = 0; i < count; ++i) {
+        SkASSERT(entries[i].fSampler);
+        this->trackResource(entries[i].fSampler);
+    }
+}
+
+bool CommandBuffer::copyTextureToBuffer(sk_sp<skgpu::Texture> texture,
                                         SkIRect srcRect,
                                         sk_sp<skgpu::Buffer> buffer,
                                         size_t bufferOffset,
                                         size_t bufferRowBytes) {
-    if (!check_max_blit_width(srcRect.width())) {
-        return;
-    }
+    SkASSERT(texture);
+    SkASSERT(buffer);
 
-    this->onCopyTextureToBuffer(texture.get(), srcRect, buffer.get(), bufferOffset, bufferRowBytes);
+    if (!this->onCopyTextureToBuffer(texture.get(), srcRect, buffer.get(), bufferOffset,
+                                     bufferRowBytes)) {
+        return false;
+    }
 
     this->trackResource(std::move(texture));
     this->trackResource(std::move(buffer));
 
     SkDEBUGCODE(fHasWork = true;)
+
+    return true;
+}
+
+bool CommandBuffer::copyBufferToTexture(sk_sp<skgpu::Buffer> buffer,
+                                        sk_sp<skgpu::Texture> texture,
+                                        const BufferTextureCopyData* copyData,
+                                        int count) {
+    SkASSERT(buffer);
+    SkASSERT(texture);
+    SkASSERT(count > 0 && copyData);
+
+    if (!this->onCopyBufferToTexture(buffer.get(), texture.get(), copyData, count)) {
+        return false;
+    }
+
+    this->trackResource(std::move(buffer));
+    this->trackResource(std::move(texture));
+
+    SkDEBUGCODE(fHasWork = true;)
+
+    return true;
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/CommandBuffer.h b/third_party/skia/experimental/graphite/src/CommandBuffer.h
index ccc0f4c647faf..8b889ff89a145 100644
--- a/third_party/skia/experimental/graphite/src/CommandBuffer.h
+++ b/third_party/skia/experimental/graphite/src/CommandBuffer.h
@@ -22,6 +22,8 @@ namespace skgpu {
 class Buffer;
 class Gpu;
 class GraphicsPipeline;
+class Resource;
+class Sampler;
 class Texture;
 class TextureProxy;
 
@@ -55,21 +57,25 @@ struct RenderPassDesc {
     // * input attachments
 };
 
+// specifies a single region for copying, either from buffer to texture, or vice versa
+struct BufferTextureCopyData {
+    size_t fBufferOffset;
+    size_t fBufferRowBytes;
+    SkIRect fRect;
+    unsigned int fMipLevel;
+};
+
 class CommandBuffer : public SkRefCnt, private DrawDispatcher {
 public:
-    ~CommandBuffer() override {
-        this->releaseResources();
-    }
+    ~CommandBuffer() override;
 
 #ifdef SK_DEBUG
     bool hasWork() { return fHasWork; }
 #endif
 
-    void trackResource(sk_sp<SkRefCnt> resource) {
-        fTrackedResources.push_back(std::move(resource));
-    }
+    void trackResource(sk_sp<Resource> resource);
 
-    void beginRenderPass(const RenderPassDesc&,
+    bool beginRenderPass(const RenderPassDesc&,
                          sk_sp<Texture> colorTexture,
                          sk_sp<Texture> resolveTexture,
                          sk_sp<Texture> depthStencilTexture);
@@ -85,6 +91,18 @@ class CommandBuffer : public SkRefCnt, private DrawDispatcher {
                          BindBufferInfo instances,
                          BindBufferInfo indices) final;
 
+    struct TextureBindEntry {
+        sk_sp<Texture> fTexture;
+        unsigned int   fBindIndex;
+    };
+    void bindTextures(const TextureBindEntry* entries, int count);
+
+    struct SamplerBindEntry {
+        sk_sp<Sampler> fSampler;
+        unsigned int   fBindIndex;
+    };
+    void bindSamplers(const SamplerBindEntry* entries, int count);
+
     // TODO: do we want to handle multiple scissor rects and viewports?
     void setScissor(unsigned int left, unsigned int top, unsigned int width, unsigned int height) {
         this->onSetScissor(left, top, width, height);
@@ -129,11 +147,15 @@ class CommandBuffer : public SkRefCnt, private DrawDispatcher {
     //---------------------------------------------------------------
     // Can only be used outside renderpasses
     //---------------------------------------------------------------
-    void copyTextureToBuffer(sk_sp<Texture>,
+    bool copyTextureToBuffer(sk_sp<Texture>,
                              SkIRect srcRect,
                              sk_sp<Buffer>,
                              size_t bufferOffset,
                              size_t bufferRowBytes);
+    bool copyBufferToTexture(sk_sp<Buffer>,
+                             sk_sp<Texture>,
+                             const BufferTextureCopyData*,
+                             int count);
 
 protected:
     CommandBuffer();
@@ -148,7 +170,7 @@ class CommandBuffer : public SkRefCnt, private DrawDispatcher {
                            sk_sp<Buffer> instanceBuffer, size_t instanceOffset);
     void bindIndexBuffer(sk_sp<Buffer> indexBuffer, size_t bufferOffset);
 
-    virtual void onBeginRenderPass(const RenderPassDesc&,
+    virtual bool onBeginRenderPass(const RenderPassDesc&,
                                    const Texture* colorTexture,
                                    const Texture* resolveTexture,
                                    const Texture* depthStencilTexture) = 0;
@@ -159,6 +181,9 @@ class CommandBuffer : public SkRefCnt, private DrawDispatcher {
                                      const Buffer* instanceBuffer, size_t instanceOffset) = 0;
     virtual void onBindIndexBuffer(const Buffer* indexBuffer, size_t bufferOffset) = 0;
 
+    virtual void onBindTextures(const TextureBindEntry* entries, int count) = 0;
+    virtual void onBindSamplers(const SamplerBindEntry* entries, int count) = 0;
+
     virtual void onSetScissor(unsigned int left, unsigned int top,
                               unsigned int width, unsigned int height) = 0;
     virtual void onSetViewport(float x, float y, float width, float height,
@@ -175,18 +200,22 @@ class CommandBuffer : public SkRefCnt, private DrawDispatcher {
                                         unsigned int indexCount, unsigned int baseVertex,
                                         unsigned int baseInstance, unsigned int instanceCount) = 0;
 
-    virtual void onCopyTextureToBuffer(const Texture*,
+    virtual bool onCopyTextureToBuffer(const Texture*,
                                        SkIRect srcRect,
                                        const Buffer*,
                                        size_t bufferOffset,
                                        size_t bufferRowBytes) = 0;
+    virtual bool onCopyBufferToTexture(const Buffer*,
+                                       const Texture*,
+                                       const BufferTextureCopyData*,
+                                       int count) = 0;
 
 #ifdef SK_DEBUG
     bool fHasWork = false;
 #endif
 
     inline static constexpr int kInitialTrackedResourcesCount = 32;
-    SkSTArray<kInitialTrackedResourcesCount, sk_sp<SkRefCnt>> fTrackedResources;
+    SkSTArray<kInitialTrackedResourcesCount, sk_sp<Resource>> fTrackedResources;
 };
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/Context.cpp b/third_party/skia/experimental/graphite/src/Context.cpp
index 14323e803247d..01aaedefb8a4a 100644
--- a/third_party/skia/experimental/graphite/src/Context.cpp
+++ b/third_party/skia/experimental/graphite/src/Context.cpp
@@ -13,10 +13,14 @@
 #include "experimental/graphite/include/TextureInfo.h"
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
-#include "experimental/graphite/src/ContextUtils.h"
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/Gpu.h"
 #include "experimental/graphite/src/GraphicsPipelineDesc.h"
 #include "experimental/graphite/src/Renderer.h"
+#include "experimental/graphite/src/ResourceProvider.h"
+#include "include/core/SkPathTypes.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkShaderCodeDictionary.h"
 
 #ifdef SK_METAL
 #include "experimental/graphite/src/mtl/MtlTrampoline.h"
@@ -24,22 +28,26 @@
 
 namespace skgpu {
 
-Context::Context(sk_sp<Gpu> gpu, BackendApi backend) : fGpu(std::move(gpu)), fBackend(backend) {}
+Context::Context(sk_sp<Gpu> gpu, BackendApi backend)
+        : fGpu(std::move(gpu))
+        , fGlobalCache(sk_make_sp<GlobalCache>())
+        , fBackend(backend) {
+}
 Context::~Context() {}
 
 #ifdef SK_METAL
-sk_sp<Context> Context::MakeMetal(const mtl::BackendContext& backendContext) {
+std::unique_ptr<Context> Context::MakeMetal(const mtl::BackendContext& backendContext) {
     sk_sp<Gpu> gpu = mtl::Trampoline::MakeGpu(backendContext);
     if (!gpu) {
         return nullptr;
     }
 
-    return sk_sp<Context>(new Context(std::move(gpu), BackendApi::kMetal));
+    return std::unique_ptr<Context>(new Context(std::move(gpu), BackendApi::kMetal));
 }
 #endif
 
-sk_sp<Recorder> Context::createRecorder() {
-    return sk_sp<Recorder>(new Recorder(sk_ref_sp(this)));
+std::unique_ptr<Recorder> Context::makeRecorder() {
+    return std::unique_ptr<Recorder>(new Recorder(fGpu, fGlobalCache));
 }
 
 void Context::insertRecording(std::unique_ptr<Recording> recording) {
@@ -58,17 +66,30 @@ void Context::submit(SyncToCpu syncToCpu) {
 }
 
 void Context::preCompile(const PaintCombo& paintCombo) {
+    static const Renderer* kRenderers[] = {
+            &Renderer::StencilAndFillPath(SkPathFillType::kWinding),
+            &Renderer::StencilAndFillPath(SkPathFillType::kEvenOdd),
+            &Renderer::StencilAndFillPath(SkPathFillType::kInverseWinding),
+            &Renderer::StencilAndFillPath(SkPathFillType::kInverseEvenOdd)
+    };
+
+    SkShaderCodeDictionary* dict = fGlobalCache->shaderCodeDictionary();
+
     for (auto bm: paintCombo.fBlendModes) {
         for (auto& shaderCombo: paintCombo.fShaders) {
             for (auto shaderType: shaderCombo.fTypes) {
                 for (auto tm: shaderCombo.fTileModes) {
-                    Combination c {shaderType, tm, bm};
+                    std::unique_ptr<SkPaintParamsKey> key = CreateKey(dict, SkBackend::kGraphite,
+                                                                      shaderType, tm, bm);
+                    auto entry = dict->findOrCreate(std::move(key));
 
                     GraphicsPipelineDesc desc;
 
-                    for (const Renderer* r : {&Renderer::StencilAndFillPath()}) {
+                    for (const Renderer* r : kRenderers) {
                         for (auto&& s : r->steps()) {
-                            desc.setProgram(s, c);
+                            if (s->performsShading()) {
+                                desc.setProgram(s, entry->uniqueID());
+                            }
                             // TODO: Combine with renderpass description set to generate full
                             // GraphicsPipeline and MSL program. Cache that compiled pipeline on
                             // the resource provider in a map from desc -> pipeline so that any
@@ -79,6 +100,8 @@ void Context::preCompile(const PaintCombo& paintCombo) {
             }
         }
     }
+    // TODO: Iterate over the renderers and make descriptions for the steps that don't perform
+    // shading, and just use ShaderType::kNone.
 }
 
 BackendTexture Context::createBackendTexture(SkISize dimensions, const TextureInfo& info) {
diff --git a/third_party/skia/experimental/graphite/src/ContextPriv.cpp b/third_party/skia/experimental/graphite/src/ContextPriv.cpp
index c347c2cc5334b..b695ecd7a347f 100644
--- a/third_party/skia/experimental/graphite/src/ContextPriv.cpp
+++ b/third_party/skia/experimental/graphite/src/ContextPriv.cpp
@@ -7,6 +7,7 @@
 
 #include "experimental/graphite/src/ContextPriv.h"
 
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/Gpu.h"
 
 namespace skgpu {
@@ -19,9 +20,8 @@ const Gpu* ContextPriv::gpu() const {
     return fContext->fGpu.get();
 }
 
-ResourceProvider* ContextPriv::resourceProvider() {
-    return this->gpu()->resourceProvider();
+SkShaderCodeDictionary* ContextPriv::shaderCodeDictionary() {
+    return fContext->fGlobalCache->shaderCodeDictionary();
 }
 
-
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/ContextPriv.h b/third_party/skia/experimental/graphite/src/ContextPriv.h
index bbb9737aa2a23..70f1a3b2689dd 100644
--- a/third_party/skia/experimental/graphite/src/ContextPriv.h
+++ b/third_party/skia/experimental/graphite/src/ContextPriv.h
@@ -10,8 +10,11 @@
 
 #include "experimental/graphite/include/Context.h"
 
+class SkShaderCodeDictionary;
+
 namespace skgpu {
 
+class GlobalCache;
 class Gpu;
 class ResourceProvider;
 
@@ -23,15 +26,13 @@ class ContextPriv {
     Gpu* gpu();
     const Gpu* gpu() const;
 
-    ResourceProvider* resourceProvider();
+    SkShaderCodeDictionary* shaderCodeDictionary();
 
 private:
     friend class Context; // to construct/copy this type.
 
     explicit ContextPriv(Context* context) : fContext(context) {}
 
-    // Required until C++17 copy elision
-    ContextPriv(const ContextPriv&) = default;
     ContextPriv& operator=(const ContextPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/experimental/graphite/src/ContextUtils.cpp b/third_party/skia/experimental/graphite/src/ContextUtils.cpp
index ccbb048a074b3..ddea44d614cc5 100644
--- a/third_party/skia/experimental/graphite/src/ContextUtils.cpp
+++ b/third_party/skia/experimental/graphite/src/ContextUtils.cpp
@@ -8,320 +8,33 @@
 #include "experimental/graphite/src/ContextUtils.h"
 
 #include <string>
-#include "experimental/graphite/src/DrawList.h" // TODO: split PaintParams out into their own header
+#include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/DrawTypes.h"
-#include "experimental/graphite/src/Uniform.h"
-#include "experimental/graphite/src/UniformManager.h"
+#include "experimental/graphite/src/PaintParams.h"
 #include "include/core/SkPaint.h"
+#include "include/private/SkUniquePaintParamsID.h"
+#include "src/core/SkBlenderBase.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkShaderCodeDictionary.h"
+#include "src/core/SkUniform.h"
+#include "src/core/SkUniformData.h"
 
 namespace skgpu {
 
-namespace {
+std::tuple<SkUniquePaintParamsID, std::unique_ptr<SkUniformBlock>> ExtractPaintData(
+        SkShaderCodeDictionary* dict,
+        const PaintParams& p) {
 
-// TODO: For the sprint we only support 4 stops in the gradients
-static constexpr int kMaxStops = 4;
-// TODO: For the sprint we unify all the gradient uniforms into a standard set of 6:
-//   kMaxStops colors
-//   kMaxStops offsets
-//   2 points
-//   2 radii
-static constexpr int kNumGradientUniforms = 6;
-static constexpr Uniform kGradientUniforms[kNumGradientUniforms] {
-        {"colors",   SLType::kHalf4 , kMaxStops },
-        {"offsets",  SLType::kFloat, kMaxStops },
-        {"point0",   SLType::kFloat2 },
-        {"point1",   SLType::kFloat2 },
-        {"radius0",  SLType::kFloat },
-        {"radius1",  SLType::kFloat },
-};
+    SkPaintParamsKeyBuilder builder(dict);
+    std::unique_ptr<SkUniformBlock> block = std::make_unique<SkUniformBlock>();
 
-static constexpr int kNumSolidUniforms = 1;
-static constexpr Uniform kSolidUniforms[kNumSolidUniforms] {
-        {"color",  SLType::kFloat4 }
-};
+    p.toKey(dict, SkBackend::kGraphite, &builder, block.get());
 
-static const char* kGradientSkSL =
-        // TODO: This should use local coords
-        "float2 pos = sk_FragCoord.xy;\n"
-        "float2 delta = point1 - point0;\n"
-        "float2 pt = pos - point0;\n"
-        "float t = dot(pt, delta) / dot(delta, delta);\n"
-        "float4 result = colors[0];\n"
-        "result = mix(result, colors[1],\n"
-        "             clamp((t-offsets[0])/(offsets[1]-offsets[0]),\n"
-        "                   0, 1));\n"
-        "result = mix(result, colors[2],\n"
-        "             clamp((t-offsets[1])/(offsets[2]-offsets[1]),\n"
-        "                   0, 1));\n"
-        "result = mix(result, colors[3],\n"
-        "             clamp((t-offsets[2])/(offsets[3]-offsets[2]),\n"
-        "             0, 1));\n"
-        "outColor = half4(result);\n";
+    std::unique_ptr<SkPaintParamsKey> key = builder.snap();
 
-static const char* kSolidColorSkSL = "    outColor = half4(color);\n";
+    auto entry = dict->findOrCreate(std::move(key));
 
-// TODO: kNone is for depth-only draws, so should actually have a fragment output type
-// that only defines a [[depth]] attribute but no color calculation.
-static const char* kNoneSkSL = "outColor = half4(0.0, 0.0, 1.0, 1.0);\n";
-
-sk_sp<UniformData> make_gradient_uniform_data_common(const void* srcs[kNumGradientUniforms]) {
-    UniformManager mgr(Layout::kMetal);
-
-    // TODO: Given that, for the sprint, we always know the uniforms we could cache 'dataSize'
-    // for each layout and skip the first call.
-    size_t dataSize = mgr.writeUniforms(SkSpan<const Uniform>(kGradientUniforms,
-                                                              kNumGradientUniforms),
-                                        nullptr, nullptr, nullptr);
-
-    sk_sp<UniformData> result = UniformData::Make(kNumGradientUniforms,
-                                                  kGradientUniforms,
-                                                  dataSize);
-
-    mgr.writeUniforms(SkSpan<const Uniform>(kGradientUniforms, kNumGradientUniforms),
-                      srcs, result->offsets(), result->data());
-    return result;
-}
-
-sk_sp<UniformData> make_linear_gradient_uniform_data(SkPoint startPoint,
-                                                     SkPoint endPoint,
-                                                     SkColor4f colors[kMaxStops],
-                                                     float offsets[kMaxStops]) {
-    float unusedRadii[2] = { 0.0f, 0.0f };
-    const void* srcs[kNumGradientUniforms] = {
-            colors,
-            offsets,
-            &startPoint,
-            &endPoint,
-            &unusedRadii[0],
-            &unusedRadii[1],
-    };
-
-    return make_gradient_uniform_data_common(srcs);
-};
-
-sk_sp<UniformData> make_radial_gradient_uniform_data(SkPoint point,
-                                                     float radius,
-                                                     SkColor4f colors[kMaxStops],
-                                                     float offsets[kMaxStops]) {
-    SkPoint unusedPoint = {0.0f, 0.0f};
-    float unusedRadius = 0.0f;
-
-    const void* srcs[kNumGradientUniforms] = {
-            colors,
-            offsets,
-            &point,
-            &unusedPoint,
-            &radius,
-            &unusedRadius,
-    };
-
-    return make_gradient_uniform_data_common(srcs);
-};
-
-sk_sp<UniformData> make_sweep_gradient_uniform_data(SkPoint point,
-                                                    SkColor4f colors[kMaxStops],
-                                                    float offsets[kMaxStops]) {
-    SkPoint unusedPoint = {0.0f, 0.0f};
-    float unusedRadii[2] = {0.0f, 0.0f};
-
-    const void* srcs[kNumGradientUniforms] = {
-            colors,
-            offsets,
-            &point,
-            &unusedPoint,
-            &unusedRadii[0],
-            &unusedRadii[1],
-    };
-
-    return make_gradient_uniform_data_common(srcs);
-};
-
-sk_sp<UniformData> make_conical_gradient_uniform_data(SkPoint point0,
-                                                      SkPoint point1,
-                                                      float radius0,
-                                                      float radius1,
-                                                      SkColor4f colors[kMaxStops],
-                                                      float offsets[kMaxStops]) {
-
-    const void* srcs[kNumGradientUniforms] = {
-            colors,
-            offsets,
-            &point0,
-            &point1,
-            &radius0,
-            &radius1,
-    };
-
-    return make_gradient_uniform_data_common(srcs);
-};
-
-void to_color4fs(int numColors, SkColor colors[kMaxStops], SkColor4f color4fs[kMaxStops]) {
-    SkASSERT(numColors >= 2 && numColors <= kMaxStops);
-
-    int i;
-    for (i = 0; i < numColors; ++i) {
-        color4fs[i] = SkColor4f::FromColor(colors[i]);
-    }
-    for ( ; i < kMaxStops; ++i) {
-        color4fs[i] = color4fs[numColors-1];
-    }
-}
-
-void expand_stops(int numStops, float offsets[kMaxStops]) {
-    SkASSERT(numStops >= 2 && numStops <= kMaxStops);
-
-    for (int i = numStops ; i < kMaxStops; ++i) {
-        offsets[i] = offsets[numStops-1];
-    }
-}
-
-sk_sp<UniformData> make_solid_uniform_data(SkColor4f color) {
-    UniformManager mgr(Layout::kMetal);
-
-    size_t dataSize = mgr.writeUniforms(SkSpan<const Uniform>(kSolidUniforms, kNumSolidUniforms),
-                                        nullptr, nullptr, nullptr);
-
-    sk_sp<UniformData> result = UniformData::Make(kNumSolidUniforms, kSolidUniforms, dataSize);
-
-    const void* srcs[kNumSolidUniforms] = { &color };
-
-    mgr.writeUniforms(SkSpan<const Uniform>(kSolidUniforms, kNumSolidUniforms),
-                      srcs, result->offsets(), result->data());
-    return result;
-}
-
-} // anonymous namespace
-
-sk_sp<UniformData> UniformData::Make(int count,
-                                     const Uniform* uniforms,
-                                     size_t dataSize) {
-    // TODO: the offsets and data should just be allocated right after UniformData in an arena
-    uint32_t* offsets = new uint32_t[count];
-    char* data = new char[dataSize];
-
-    return sk_sp<UniformData>(new UniformData(count, uniforms, offsets, data, dataSize));
-}
-
-std::tuple<Combination, sk_sp<UniformData>> ExtractCombo(const PaintParams& p) {
-    Combination result;
-    sk_sp<UniformData> uniforms;
-
-    if (auto s = p.shader()) {
-        SkColor colors[kMaxStops];
-        SkColor4f color4fs[kMaxStops];
-        float offsets[kMaxStops];
-        SkShader::GradientInfo gradInfo;
-
-        gradInfo.fColorCount = kMaxStops;
-        gradInfo.fColors = colors;
-        gradInfo.fColorOffsets = offsets;
-
-        SkShader::GradientType type = s->asAGradient(&gradInfo);
-        if (gradInfo.fColorCount > kMaxStops) {
-            type = SkShader::GradientType::kNone_GradientType;
-        }
-
-        switch (type) {
-            case SkShader::kLinear_GradientType: {
-                to_color4fs(gradInfo.fColorCount, colors, color4fs);
-                expand_stops(gradInfo.fColorCount, offsets);
-
-                result.fShaderType = ShaderCombo::ShaderType::kLinearGradient;
-                result.fTileMode = gradInfo.fTileMode;
-
-                uniforms = make_linear_gradient_uniform_data(gradInfo.fPoint[0],
-                                                             gradInfo.fPoint[1],
-                                                             color4fs,
-                                                             offsets);
-            } break;
-            case SkShader::kRadial_GradientType: {
-                to_color4fs(gradInfo.fColorCount, colors, color4fs);
-                expand_stops(gradInfo.fColorCount, offsets);
-
-                result.fShaderType = ShaderCombo::ShaderType::kRadialGradient;
-                result.fTileMode = gradInfo.fTileMode;
-
-                uniforms =  make_radial_gradient_uniform_data(gradInfo.fPoint[0],
-                                                              gradInfo.fRadius[0],
-                                                              color4fs,
-                                                              offsets);
-            } break;
-            case SkShader::kSweep_GradientType:
-                to_color4fs(gradInfo.fColorCount, colors, color4fs);
-                expand_stops(gradInfo.fColorCount, offsets);
-
-                result.fShaderType = ShaderCombo::ShaderType::kSweepGradient;
-                result.fTileMode = gradInfo.fTileMode;
-
-                uniforms = make_sweep_gradient_uniform_data(gradInfo.fPoint[0],
-                                                            color4fs,
-                                                            offsets);
-                break;
-            case SkShader::GradientType::kConical_GradientType:
-                to_color4fs(gradInfo.fColorCount, colors, color4fs);
-                expand_stops(gradInfo.fColorCount, offsets);
-
-                result.fShaderType = ShaderCombo::ShaderType::kConicalGradient;
-                result.fTileMode = gradInfo.fTileMode;
-
-                uniforms = make_conical_gradient_uniform_data(gradInfo.fPoint[0],
-                                                              gradInfo.fPoint[1],
-                                                              gradInfo.fRadius[0],
-                                                              gradInfo.fRadius[1],
-                                                              color4fs,
-                                                              offsets);
-                break;
-            case SkShader::GradientType::kColor_GradientType:
-                // TODO: The solid color gradient type should use its color, not
-                // the paint color
-            case SkShader::GradientType::kNone_GradientType:
-            default:
-                result.fShaderType = ShaderCombo::ShaderType::kSolidColor;
-                result.fTileMode = SkTileMode::kClamp;
-
-                uniforms = make_solid_uniform_data(p.color());
-                break;
-        }
-    } else {
-        // Solid colored paint
-        result.fShaderType = ShaderCombo::ShaderType::kSolidColor;
-        result.fTileMode = SkTileMode::kClamp;
-
-        uniforms = make_solid_uniform_data(p.color());
-    }
-
-    result.fBlendMode = p.blendMode();
-    return { result, std::move(uniforms) };
-}
-
-SkSpan<const Uniform> GetUniforms(ShaderCombo::ShaderType shaderType) {
-    switch (shaderType) {
-        case ShaderCombo::ShaderType::kNone:
-            return {nullptr, 0};
-        case ShaderCombo::ShaderType::kLinearGradient:
-            return SkMakeSpan(kGradientUniforms, kNumGradientUniforms);
-        case ShaderCombo::ShaderType::kRadialGradient:
-        case ShaderCombo::ShaderType::kSweepGradient:
-        case ShaderCombo::ShaderType::kConicalGradient:
-        case ShaderCombo::ShaderType::kSolidColor:
-        default:
-            return SkMakeSpan(kSolidUniforms, kNumSolidUniforms);
-    }
-}
-
-const char* GetShaderSkSL(ShaderCombo::ShaderType shaderType) {
-    switch (shaderType) {
-        case ShaderCombo::ShaderType::kNone:
-            return kNoneSkSL;
-        case ShaderCombo::ShaderType::kLinearGradient:
-            return kGradientSkSL;
-        case ShaderCombo::ShaderType::kRadialGradient:
-        case ShaderCombo::ShaderType::kSweepGradient:
-        case ShaderCombo::ShaderType::kConicalGradient:
-        case ShaderCombo::ShaderType::kSolidColor:
-        default:
-            return kSolidColorSkSL;
-    }
+    return { entry->uniqueID(), std::move(block) };
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/ContextUtils.h b/third_party/skia/experimental/graphite/src/ContextUtils.h
index b5c863e34cff6..443e0e178163b 100644
--- a/third_party/skia/experimental/graphite/src/ContextUtils.h
+++ b/third_party/skia/experimental/graphite/src/ContextUtils.h
@@ -10,90 +10,21 @@
 
 #include "experimental/graphite/include/Context.h"
 #include "include/core/SkBlendMode.h"
-#include "include/core/SkRefCnt.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTileMode.h"
 
+enum class CodeSnippetID : uint8_t;
+class SkShaderCodeDictionary;
+class SkUniform;
+class SkUniformBlock;
+class SkUniquePaintParamsID;
+
 namespace skgpu {
 
 class PaintParams;
-class Uniform;
-
-// A single, fully specified combination resulting from a PaintCombo (i.e., it corresponds to a
-// specific skgpu::PaintParams object (a subset of SkPaint))
-struct Combination {
-    bool operator==(const Combination& other) const {
-        return fShaderType == other.fShaderType &&
-               fTileMode == other.fTileMode &&
-               fBlendMode == other.fBlendMode;
-    }
-
-    uint32_t key() const {
-        return (static_cast<int>(fShaderType) << 9) | // 6 values  -> 3 bits
-               (static_cast<int>(fTileMode)   << 7) | // 4 values  -> 2 bits
-               (static_cast<int>(fBlendMode)  << 2);  // 29 values -> 5 bits
-    }
-
-    ShaderCombo::ShaderType fShaderType = ShaderCombo::ShaderType::kNone;
-    // Tile mode and blend mode are ignored if shader type is kNone; tile mode is ignored if
-    // shader type is kSolidColor.
-    SkTileMode fTileMode = SkTileMode::kClamp;
-    SkBlendMode fBlendMode = SkBlendMode::kSrc;
-};
-
-class UniformData : public SkRefCnt {
-public:
-
-    // TODO: should we require a name (e.g., "gradient_uniforms") for each uniform block so
-    // we can better name the Metal FS uniform struct?
-    static sk_sp<UniformData> Make(int count,
-                                   const Uniform* uniforms,
-                                   size_t dataSize);
-
-    ~UniformData() override {
-        // TODO: fOffsets and fData should just be allocated right after UniformData in an arena
-        delete [] fOffsets;
-        delete [] fData;
-    }
-
-    int count() const { return fCount; }
-    const Uniform* uniforms() const { return fUniforms; }
-    uint32_t* offsets() { return fOffsets; }
-    uint32_t offset(int index) {
-        SkASSERT(index >= 0 && index < fCount);
-        return fOffsets[index];
-    }
-    char* data() { return fData; }
-    size_t dataSize() const { return fDataSize; }
-
-private:
-    UniformData(int count,
-                const Uniform* uniforms,
-                uint32_t* offsets,
-                char* data,
-                size_t dataSize)
-            : fCount(count)
-            , fUniforms(uniforms)
-            , fOffsets(offsets)
-            , fData(data)
-            , fDataSize(dataSize) {
-    }
-
-    const int fCount;
-    const Uniform* fUniforms;
-    uint32_t* fOffsets; // offset of each uniform in 'fData'
-    char* fData;
-    const size_t fDataSize;
-};
-
-std::tuple<Combination, sk_sp<UniformData>> ExtractCombo(const PaintParams&);
-SkSpan<const Uniform> GetUniforms(ShaderCombo::ShaderType);
 
-// TODO: Temporary way to get at SkSL snippet for handling the given shader type, which will be
-// embedded in the fragment function's body. It has access to the vertex output via a "interpolated"
-// variable, and must have a statement that writes to a float4 "out.color". Its uniforms (as defined
-// by GetUniforms(type)) are available as a variable named "uniforms".
-const char* GetShaderSkSL(ShaderCombo::ShaderType);
+std::tuple<SkUniquePaintParamsID, std::unique_ptr<SkUniformBlock>> ExtractPaintData(
+        SkShaderCodeDictionary*, const PaintParams&);
 
 } // namespace skgpu
 
diff --git a/third_party/skia/experimental/graphite/src/CopyTask.cpp b/third_party/skia/experimental/graphite/src/CopyTask.cpp
index 4da0bc8835614..46823d44c5321 100644
--- a/third_party/skia/experimental/graphite/src/CopyTask.cpp
+++ b/third_party/skia/experimental/graphite/src/CopyTask.cpp
@@ -48,4 +48,3 @@ void CopyTextureToBufferTask::addCommands(ResourceProvider*, CommandBuffer* comm
 }
 
 } // namespace skgpu
-
diff --git a/third_party/skia/experimental/graphite/src/Device.cpp b/third_party/skia/experimental/graphite/src/Device.cpp
index f2a0cfd7e3aa8..abe9098a1f867 100644
--- a/third_party/skia/experimental/graphite/src/Device.cpp
+++ b/third_party/skia/experimental/graphite/src/Device.cpp
@@ -18,10 +18,13 @@
 #include "experimental/graphite/src/DrawContext.h"
 #include "experimental/graphite/src/DrawList.h"
 #include "experimental/graphite/src/Gpu.h"
+#include "experimental/graphite/src/Log.h"
+#include "experimental/graphite/src/RecorderPriv.h"
 #include "experimental/graphite/src/ResourceProvider.h"
 #include "experimental/graphite/src/Texture.h"
 #include "experimental/graphite/src/TextureProxy.h"
 #include "experimental/graphite/src/geom/BoundsManager.h"
+#include "experimental/graphite/src/geom/IntersectionTree.h"
 #include "experimental/graphite/src/geom/Shape.h"
 #include "experimental/graphite/src/geom/Transform_graphite.h"
 
@@ -34,47 +37,145 @@
 #include "src/core/SkPaintPriv.h"
 #include "src/core/SkSpecialImage.h"
 
+#include <unordered_map>
+#include <vector>
+
 namespace skgpu {
 
 namespace {
 
 static const SkStrokeRec kFillStyle(SkStrokeRec::kFill_InitStyle);
 
-bool is_opaque(const PaintParams& paint) {
-    // TODO: implement this
-    return false;
+bool paint_depends_on_dst(const PaintParams& paintParams) {
+    std::optional<SkBlendMode> bm = paintParams.asBlendMode();
+    if (!bm.has_value()) {
+        return true;
+    }
+
+    if (bm.value() == SkBlendMode::kSrc || bm.value() == SkBlendMode::kClear) {
+        // src and clear blending never depends on dst
+        return false;
+    } else if (bm.value() == SkBlendMode::kSrcOver) {
+        // src-over does not depend on dst if src is opaque (a = 1)
+        // TODO: This will get more complicated when PaintParams has color filters and blenders
+        return !paintParams.color().isOpaque() ||
+               (paintParams.shader() && !paintParams.shader()->isOpaque());
+    } else {
+        // TODO: Are their other modes that don't depend on dst that can be trivially detected?
+        return true;
+    }
 }
 
 } // anonymous namespace
 
-sk_sp<Device> Device::Make(sk_sp<Recorder> recorder, const SkImageInfo& ii) {
-    const Gpu* gpu = recorder->context()->priv().gpu();
-    auto textureInfo = gpu->caps()->getDefaultSampledTextureInfo(ii.colorType(), /*levelCount=*/1,
-                                                                 Protected::kNo, Renderable::kYes);
-    auto target = sk_sp<TextureProxy>(new TextureProxy(ii.dimensions(), textureInfo));
-    sk_sp<DrawContext> dc = DrawContext::Make(target,
-                                              ii.refColorSpace(),
-                                              ii.colorType(),
-                                              ii.alphaType());
+/**
+ * IntersectionTreeSet controls multiple IntersectionTrees to organize all add rectangles into
+ * disjoint sets. For a given CompressedPaintersOrder and bounds, it returns the smallest
+ * DisjointStencilIndex that guarantees the bounds are disjoint from all other draws that use the
+ * same painters order and stencil index.
+ */
+class Device::IntersectionTreeSet {
+public:
+    IntersectionTreeSet() = default;
+
+    DisjointStencilIndex add(CompressedPaintersOrder drawOrder, Rect rect) {
+        auto& trees = fTrees[drawOrder];
+        DisjointStencilIndex stencil = DrawOrder::kUnassigned.next();
+        for (auto&& tree : trees) {
+            if (tree->add(rect)) {
+                return stencil;
+            }
+            stencil = stencil.next(); // advance to the next tree's index
+        }
+
+        // If here, no existing intersection tree can hold the rect so add a new one
+        IntersectionTree* newTree = this->makeTree();
+        SkAssertResult(newTree->add(rect));
+        trees.push_back(newTree);
+        return stencil;
+    }
+
+    void reset() {
+        fTrees.clear();
+        fTreeStore.reset();
+    }
+
+private:
+    struct Hash {
+        size_t operator()(const CompressedPaintersOrder& o) const noexcept { return o.bits(); }
+    };
+
+    IntersectionTree* makeTree() {
+        return fTreeStore.make<IntersectionTree>();
+    }
+
+    // Each compressed painters order defines a barrier around draws so each order's set of draws
+    // are independent, even if they may intersect. Within each order, the list of trees holds the
+    // IntersectionTrees representing each disjoint set.
+    // TODO: This organization of trees is logically convenient but may need to be optimized based
+    // on real world data (e.g. how sparse is the map, how long is each vector of trees,...)
+    std::unordered_map<CompressedPaintersOrder, std::vector<IntersectionTree*>, Hash> fTrees;
+    SkSTArenaAllocWithReset<4 * sizeof(IntersectionTree)> fTreeStore;
+};
+
+sk_sp<Device> Device::Make(Recorder* recorder, const SkImageInfo& ii) {
+    if (!recorder) {
+        return nullptr;
+    }
+    auto textureInfo = recorder->priv().caps()->getDefaultSampledTextureInfo(ii.colorType(),
+                                                                             /*levelCount=*/1,
+                                                                             Protected::kNo,
+                                                                             Renderable::kYes);
+    sk_sp<TextureProxy> target(new TextureProxy(ii.dimensions(), textureInfo));
+    return Make(recorder,
+                std::move(target),
+                ii.refColorSpace(),
+                ii.colorType(),
+                ii.alphaType());
+}
+
+sk_sp<Device> Device::Make(Recorder* recorder,
+                           sk_sp<TextureProxy> target,
+                           sk_sp<SkColorSpace> colorSpace,
+                           SkColorType colorType,
+                           SkAlphaType alphaType) {
+    if (!recorder) {
+        return nullptr;
+    }
+
+    sk_sp<DrawContext> dc = DrawContext::Make(std::move(target),
+                                              std::move(colorSpace),
+                                              colorType,
+                                              alphaType);
     if (!dc) {
         return nullptr;
     }
 
-    return sk_sp<Device>(new Device(std::move(recorder), std::move(dc)));
+    return sk_sp<Device>(new Device(recorder, std::move(dc)));
 }
 
-Device::Device(sk_sp<Recorder> recorder, sk_sp<DrawContext> dc)
+Device::Device(Recorder* recorder, sk_sp<DrawContext> dc)
         : SkBaseDevice(dc->imageInfo(), SkSurfaceProps())
-        , fRecorder(std::move(recorder))
+        , fRecorder(recorder)
         , fDC(std::move(dc))
         , fColorDepthBoundsManager(std::make_unique<NaiveBoundsManager>())
+        , fDisjointStencilSet(std::make_unique<IntersectionTreeSet>())
         , fCurrentDepth(DrawOrder::kClearDepth)
-        , fMaxStencilIndex(DrawOrder::kUnassigned)
         , fDrawsOverlap(false) {
     SkASSERT(SkToBool(fDC) && SkToBool(fRecorder));
+    fRecorder->registerDevice(this);
 }
 
-Device::~Device() = default;
+Device::~Device() {
+    if (fRecorder) {
+        this->flushPendingWorkToRecorder();
+        fRecorder->deregisterDevice(this);
+    }
+}
+
+void Device::abandonRecorder() {
+    fRecorder = nullptr;
+}
 
 SkBaseDevice* Device::onCreateDevice(const CreateInfo& info, const SkPaint*) {
     // TODO: Inspect the paint and create info to determine if there's anything that has to be
@@ -88,16 +189,24 @@ sk_sp<SkSurface> Device::makeSurface(const SkImageInfo& ii, const SkSurfaceProps
 }
 
 bool Device::onReadPixels(const SkPixmap& pm, int x, int y) {
+    // We have no access to a context to do a read pixels here.
+    return false;
+}
+
+bool Device::readPixels(Context* context,
+                        Recorder* recorder,
+                        const SkPixmap& pm,
+                        int x,
+                        int y) {
     // TODO: Support more formats that we can read back into
     if (pm.colorType() != kRGBA_8888_SkColorType) {
         return false;
     }
 
-    auto context = fRecorder->context();
-    auto resourceProvider = context->priv().resourceProvider();
+    ResourceProvider* resourceProvider = recorder->priv().resourceProvider();
 
     TextureProxy* srcProxy = fDC->target();
-    if(!srcProxy->instantiate(resourceProvider)) {
+    if (!srcProxy->instantiate(resourceProvider)) {
         return false;
     }
     sk_sp<Texture> srcTexture = srcProxy->refTexture();
@@ -124,7 +233,7 @@ bool Device::onReadPixels(const SkPixmap& pm, int x, int y) {
     }
 
     this->flushPendingWorkToRecorder();
-    fRecorder->add(std::move(task));
+    fRecorder->priv().add(std::move(task));
 
     // TODO: Can snapping ever fail?
     context->insertRecording(fRecorder->snap());
@@ -137,6 +246,12 @@ bool Device::onReadPixels(const SkPixmap& pm, int x, int y) {
     return true;
 }
 
+bool Device::onWritePixels(const SkPixmap& pm, int x, int y) {
+    this->flushPendingWorkToRecorder();
+
+    return fDC->writePixels(fRecorder, pm, {x, y});
+}
+
 SkIRect Device::onDevClipBounds() const {
     auto target = fDC->target();
     return SkIRect::MakeSize(target->dimensions());
@@ -221,8 +336,7 @@ void Device::drawShape(const Shape& shape,
     Transform localToDevice(this->localToDevice44());
     if (!localToDevice.valid()) {
         // If the transform is not invertible or not finite then drawing isn't well defined.
-        // TBD: This warning should go through the general purpose graphite logging system
-        SkDebugf("[graphite] WARNING - Skipping draw with non-invertible/non-finite transform.\n");
+        SKGPU_LOG_W("Skipping draw with non-invertible/non-finite transform.");
         return;
     }
 
@@ -241,8 +355,7 @@ void Device::drawShape(const Shape& shape,
             this->drawShape(Shape(dst), paint, newStyle, flags | DrawFlags::kIgnorePathEffect);
             return;
         } else {
-            // TBD: This warning should go through the general purpose graphite logging system
-            SkDebugf("[graphite] WARNING - Path effect failed to apply, drawing original path.\n");
+            SKGPU_LOG_W("Path effect failed to apply, drawing original path.");
             this->drawShape(shape, paint, style, flags | DrawFlags::kIgnorePathEffect);
             return;
         }
@@ -282,12 +395,15 @@ void Device::drawShape(const Shape& shape,
     // order to blend correctly. We always query the most recent draw (even when opaque) because it
     // also lets Device easily track whether or not there are any overlapping draws.
     PaintParams shading{paint};
-    const bool opaque = is_opaque(shading);
+    const bool dependsOnDst = paint_depends_on_dst(shading);
     CompressedPaintersOrder prevDraw =
             fColorDepthBoundsManager->getMostRecentDraw(clip.drawBounds());
-    if (!opaque) {
+    if (dependsOnDst) {
         order.dependsOnPaintersOrder(prevDraw);
     }
+    // TODO: if the chosen Renderer for a draw uses coverage AA, then it cannot be considered opaque
+    // regardless of what the PaintParams would do, but we won't know that until after the Renderer
+    // has been selected for the draw.
 
     if (styleType == SkStrokeRec::kStroke_Style ||
         styleType == SkStrokeRec::kHairline_Style ||
@@ -305,13 +421,16 @@ void Device::drawShape(const Shape& shape,
         // if (shape.convex()) {
         //     fDC->fillConvexPath(localToDevice, shape, clip, order, &shading);
         // } else {
-            order.dependsOnStencil(fMaxStencilIndex.next());
+            DisjointStencilIndex setIndex = fDisjointStencilSet->add(order.paintOrder(),
+                                                                     clip.drawBounds());
+            order.dependsOnStencil(setIndex);
             fDC->stencilAndFillPath(localToDevice, shape, clip, order, &shading);
         // }
     }
 
     // Record the painters order and depth used for this draw
-    const bool fullyOpaque = opaque && shape.isRect() &&
+    const bool fullyOpaque = !dependsOnDst &&
+                             shape.isRect() &&
                              localToDevice.type() <= Transform::Type::kRectStaysRect;
     fColorDepthBoundsManager->recordDraw(shape.bounds(),
                                          order.paintOrder(),
@@ -319,9 +438,6 @@ void Device::drawShape(const Shape& shape,
                                          fullyOpaque);
 
     fCurrentDepth = order.depth();
-    if (order.stencilIndex() != DrawOrder::kUnassigned) {
-        fMaxStencilIndex = std::max(fMaxStencilIndex, order.stencilIndex());
-    }
     fDrawsOverlap |= (prevDraw != DrawOrder::kNoIntersection);
 }
 
@@ -354,15 +470,30 @@ std::pair<Clip, CompressedPaintersOrder> Device::applyClipToDraw(const Transform
 }
 
 void Device::flushPendingWorkToRecorder() {
+    SkASSERT(fRecorder);
+
     // TODO: we may need to further split this function up since device->device drawList and
     // DrawPass stealing will need to share some of the same logic w/o becoming a Task.
 
+    auto uploadTask = fDC->snapUploadTask(fRecorder);
+    if (uploadTask) {
+        fRecorder->priv().add(std::move(uploadTask));
+    }
+
     // TODO: iterate the clip stack and issue a depth-only draw for every clip element that has
     // a non-empty usage bounds, using that bounds as the scissor.
-    auto drawTask = fDC->snapRenderPassTask(fRecorder.get(), fColorDepthBoundsManager.get());
+    auto drawTask = fDC->snapRenderPassTask(fRecorder, fColorDepthBoundsManager.get());
     if (drawTask) {
-        fRecorder->add(std::move(drawTask));
+        fRecorder->priv().add(std::move(drawTask));
     }
+
+    // Reset accumulated state tracking since everything that it referred to has been moved into
+    // an immutable DrawPass.
+    fColorDepthBoundsManager->reset();
+    fDisjointStencilSet->reset();
+    fCurrentDepth = DrawOrder::kClearDepth;
+    // NOTE: fDrawsOverlap is not reset here because that is a persistent property of everything
+    // drawn into the Device, and not just the currently accumulating pass.
 }
 
 bool Device::needsFlushBeforeDraw(int numNewDraws) const {
diff --git a/third_party/skia/experimental/graphite/src/Device.h b/third_party/skia/experimental/graphite/src/Device.h
index b2a22c80dc70c..19111cf9d436b 100644
--- a/third_party/skia/experimental/graphite/src/Device.h
+++ b/third_party/skia/experimental/graphite/src/Device.h
@@ -24,17 +24,34 @@ class Context;
 class DrawContext;
 class Recorder;
 class Shape;
+class TextureProxy;
 class Transform;
 
 class Device final : public SkBaseDevice  {
 public:
     ~Device() override;
 
-    static sk_sp<Device> Make(sk_sp<Recorder>, const SkImageInfo&);
+    static sk_sp<Device> Make(Recorder*, const SkImageInfo&);
+    static sk_sp<Device> Make(Recorder*,
+                              sk_sp<TextureProxy>,
+                              sk_sp<SkColorSpace>,
+                              SkColorType,
+                              SkAlphaType);
 
-    sk_sp<Recorder> refRecorder() { return fRecorder; }
+    Recorder* recorder() { return fRecorder; }
+    // This call is triggered from the Recorder on its registered Devices. It is typically called
+    // when the Recorder is abandoned or deleted.
+    void abandonRecorder();
+
+    // Ensures clip elements are drawn that will clip previous draw calls, snaps all pending work
+    // from the DrawContext as a RenderPassTask and records it in the Device's recorder.
+    void flushPendingWorkToRecorder();
+
+    bool readPixels(Context*, Recorder*, const SkPixmap& dst, int x, int y);
+
+private:
+    class IntersectionTreeSet;
 
-protected:
     // Clipping
     void onSave() override {}
     void onRestore() override {}
@@ -76,7 +93,7 @@ class Device final : public SkBaseDevice  {
     void onClipRegion(const SkRegion& deviceRgn, SkClipOp) override {}
     void onReplaceClip(const SkIRect& rect) override {}
 
-    bool onWritePixels(const SkPixmap&, int x, int y) override { return false; }
+    bool onWritePixels(const SkPixmap&, int x, int y) override;
 
     // TODO: This will likely be implemented with the same primitive building block that drawRect
     // and drawRRect will rely on.
@@ -99,10 +116,11 @@ class Device final : public SkBaseDevice  {
     void drawAtlas(const SkRSXform[], const SkRect[], const SkColor[], int count, sk_sp<SkBlender>,
                    const SkPaint&) override {}
 
-    void drawDrawable(SkDrawable*, const SkMatrix*, SkCanvas*) override {}
+    void drawDrawable(SkCanvas*, SkDrawable*, const SkMatrix*) override {}
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override {}
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override {}
     void drawShadow(const SkPath&, const SkDrawShadowRec&) override {}
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override {}
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override {}
 
     void drawDevice(SkBaseDevice*, const SkSamplingOptions&, const SkPaint&) override {}
     void drawSpecial(SkSpecialImage*, const SkMatrix& localToDevice,
@@ -112,7 +130,6 @@ class Device final : public SkBaseDevice  {
     sk_sp<SkSpecialImage> makeSpecial(const SkImage*) override;
     sk_sp<SkSpecialImage> snapSpecial(const SkIRect& subset, bool forceCopy = false) override;
 
-private:
     // DrawFlags alters the effects used by drawShape.
     enum class DrawFlags : unsigned {
         kNone             = 0b00,
@@ -129,7 +146,7 @@ class Device final : public SkBaseDevice  {
     };
     SKGPU_DECL_MASK_OPS_FRIENDS(DrawFlags);
 
-    Device(sk_sp<Recorder>, sk_sp<DrawContext>);
+    Device(Recorder*, sk_sp<DrawContext>);
 
     // Handles applying path effects, mask filters, stroke-and-fill styles, and hairlines.
     // Ignores geometric style on the paint in favor of explicitly provided SkStrokeRec and flags.
@@ -150,25 +167,19 @@ class Device final : public SkBaseDevice  {
     std::pair<Clip, CompressedPaintersOrder>
     applyClipToDraw(const Transform&, const Shape&, const SkStrokeRec&, PaintersDepth z);
 
-    // Ensures clip elements are drawn that will clip previous draw calls, snaps all pending work
-    // from the DrawContext as a RenderPassTask and records it in the Device's recorder.
-    void flushPendingWorkToRecorder();
-
     bool needsFlushBeforeDraw(int numNewDraws) const;
 
-    sk_sp<Recorder> fRecorder;
+    Recorder* fRecorder;
     sk_sp<DrawContext> fDC;
 
     // Tracks accumulated intersections for ordering dependent use of the color and depth attachment
     // (i.e. depth-based clipping, and transparent blending)
     std::unique_ptr<BoundsManager> fColorDepthBoundsManager;
+    // Tracks disjoint stencil indices for all recordered draws
+    std::unique_ptr<IntersectionTreeSet> fDisjointStencilSet;
 
     // The max depth value sent to the DrawContext, incremented so each draw has a unique value.
     PaintersDepth fCurrentDepth;
-    // TODO: Temporary way to assign stencil IDs for draws, but since each draw gets its own
-    // value, it prevents the ability for draw steps to be re-arranged into blocks of stencil then
-    // covers. However, it does ensure stenciling is correct until we wire up the intersection tree
-    DisjointStencilIndex fMaxStencilIndex;
 
     bool fDrawsOverlap;
 };
diff --git a/third_party/skia/experimental/graphite/src/DrawBufferManager.cpp b/third_party/skia/experimental/graphite/src/DrawBufferManager.cpp
index ca344b4fd8ac8..477715b531bf3 100644
--- a/third_party/skia/experimental/graphite/src/DrawBufferManager.cpp
+++ b/third_party/skia/experimental/graphite/src/DrawBufferManager.cpp
@@ -46,10 +46,7 @@ static bool can_fit(size_t requestedSize,
 
 std::tuple<VertexWriter, BindBufferInfo> DrawBufferManager::getVertexWriter(size_t requiredBytes) {
     if (!requiredBytes) {
-        BindBufferInfo bindInfo;
-        bindInfo.fBuffer = nullptr;
-        bindInfo.fOffset = 0;
-        return {VertexWriter(nullptr), bindInfo};
+        return {VertexWriter(), BindBufferInfo()};
     }
     if (fCurrentVertexBuffer &&
         !can_fit(requiredBytes, fCurrentVertexBuffer.get(), fVertexOffset, /*alignment=*/1)) {
@@ -70,15 +67,12 @@ std::tuple<VertexWriter, BindBufferInfo> DrawBufferManager::getVertexWriter(size
     bindInfo.fBuffer = fCurrentVertexBuffer.get();
     bindInfo.fOffset = fVertexOffset;
     fVertexOffset += requiredBytes;
-    return {VertexWriter(map_offset(bindInfo)), bindInfo};
+    return {VertexWriter(map_offset(bindInfo), requiredBytes), bindInfo};
 }
 
 std::tuple<IndexWriter, BindBufferInfo> DrawBufferManager::getIndexWriter(size_t requiredBytes) {
     if (!requiredBytes) {
-        BindBufferInfo bindInfo;
-        bindInfo.fBuffer = nullptr;
-        bindInfo.fOffset = 0;
-        return {IndexWriter(nullptr), bindInfo};
+        return {IndexWriter(), BindBufferInfo()};
     }
     if (fCurrentIndexBuffer &&
         !can_fit(requiredBytes, fCurrentIndexBuffer.get(), fIndexOffset, /*alignment=*/1)) {
@@ -99,16 +93,13 @@ std::tuple<IndexWriter, BindBufferInfo> DrawBufferManager::getIndexWriter(size_t
     bindInfo.fBuffer = fCurrentIndexBuffer.get();
     bindInfo.fOffset = fIndexOffset;
     fIndexOffset += requiredBytes;
-    return {IndexWriter(map_offset(bindInfo)), bindInfo};
+    return {IndexWriter(map_offset(bindInfo), requiredBytes), bindInfo};
 }
 
 std::tuple<UniformWriter, BindBufferInfo> DrawBufferManager::getUniformWriter(
         size_t requiredBytes) {
     if (!requiredBytes) {
-        BindBufferInfo bindInfo;
-        bindInfo.fBuffer = nullptr;
-        bindInfo.fOffset = 0;
-        return {UniformWriter(nullptr), bindInfo};
+        return {UniformWriter(), BindBufferInfo()};
     }
     if (fCurrentUniformBuffer &&
         !can_fit(requiredBytes,
@@ -133,7 +124,7 @@ std::tuple<UniformWriter, BindBufferInfo> DrawBufferManager::getUniformWriter(
     bindInfo.fBuffer = fCurrentUniformBuffer.get();
     bindInfo.fOffset = fUniformOffset;
     fUniformOffset += requiredBytes;
-    return {UniformWriter(map_offset(bindInfo)), bindInfo};
+    return {UniformWriter(map_offset(bindInfo), requiredBytes), bindInfo};
 }
 
 void DrawBufferManager::transferToCommandBuffer(CommandBuffer* commandBuffer) {
diff --git a/third_party/skia/experimental/graphite/src/DrawContext.cpp b/third_party/skia/experimental/graphite/src/DrawContext.cpp
index fba406c669020..46b8110737672 100644
--- a/third_party/skia/experimental/graphite/src/DrawContext.cpp
+++ b/third_party/skia/experimental/graphite/src/DrawContext.cpp
@@ -7,19 +7,23 @@
 
 #include "experimental/graphite/src/DrawContext.h"
 
+#include "include/core/SkPixmap.h"
 #include "include/private/SkColorData.h"
 
 #include "experimental/graphite/include/Context.h"
 #include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/src/Buffer.h"
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
 #include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/DrawList.h"
 #include "experimental/graphite/src/DrawPass.h"
 #include "experimental/graphite/src/Gpu.h"
+#include "experimental/graphite/src/RecorderPriv.h"
 #include "experimental/graphite/src/RenderPassTask.h"
 #include "experimental/graphite/src/ResourceTypes.h"
 #include "experimental/graphite/src/TextureProxy.h"
+#include "experimental/graphite/src/UploadTask.h"
 #include "experimental/graphite/src/geom/BoundsManager.h"
 #include "experimental/graphite/src/geom/Shape.h"
 
@@ -44,7 +48,8 @@ sk_sp<DrawContext> DrawContext::Make(sk_sp<TextureProxy> target,
 DrawContext::DrawContext(sk_sp<TextureProxy> target, const SkImageInfo& ii)
         : fTarget(std::move(target))
         , fImageInfo(ii)
-        , fPendingDraws(std::make_unique<DrawList>()) {
+        , fPendingDraws(std::make_unique<DrawList>())
+        , fPendingUploads(std::make_unique<UploadList>()) {
     // TBD - Will probably want DrawLists (and its internal commands) to come from an arena
     // that the DC manages.
 }
@@ -94,6 +99,52 @@ void DrawContext::clear(const SkColor4f& clearColor) {
     fDrawPasses.clear();
 }
 
+//
+// TODO: The other draw-recording APIs in DrawContext are relatively simple, just storing state
+// from the caller's decision making. If possible we should consider moving the more complex logic
+// somewhere above DrawContext and have this be much simpler.
+bool DrawContext::writePixels(Recorder* recorder, const SkPixmap& src, SkIPoint dstPoint) {
+    // TODO: add mipmap support for createBackendTexture
+
+    // Our caller should have clipped to the bounds of the surface already.
+    SkASSERT(SkIRect::MakeSize(fTarget->dimensions()).contains(
+            SkIRect::MakePtSize(dstPoint, src.dimensions())));
+
+    if (!recorder) {
+        return false;
+    }
+
+    if (src.colorType() == kUnknown_SkColorType) {
+        return false;
+    }
+
+    // TODO: check for readOnly or framebufferOnly target and return false if so
+
+    const Caps* caps = recorder->priv().caps();
+
+    // TODO: canvas2DFastPath?
+    // TODO: check that surface supports writePixels
+    // TODO: handle writePixels as draw if needed (e.g., canvas2DFastPath || !supportsWritePixels)
+
+    // TODO: check for flips and conversions and either handle here or pass info to appendUpload
+
+    // for now, until conversions are supported
+    if (!caps->areColorTypeAndTextureInfoCompatible(src.colorType(),
+                                                    fTarget->textureInfo())) {
+        return false;
+    }
+
+    std::vector<MipLevel> levels;
+    levels.push_back({src.addr(), src.rowBytes()});
+
+    SkIRect dstRect = SkIRect::MakePtSize(dstPoint, src.dimensions());
+    return fPendingUploads->appendUpload(recorder,
+                                         fTarget,
+                                         src.colorType(),
+                                         levels,
+                                         dstRect);
+}
+
 void DrawContext::snapDrawPass(Recorder* recorder, const BoundsManager* occlusionCuller) {
     if (fPendingDraws->drawCount() == 0) {
         return;
@@ -126,13 +177,16 @@ sk_sp<Task> DrawContext::snapRenderPassTask(Recorder* recorder,
     desc.fClearColor = drawPass->clearColor();
 
     if (drawPass->depthStencilFlags() != DepthStencilFlags::kNone) {
-        const Caps* caps = recorder->context()->priv().gpu()->caps();
+        const Caps* caps = recorder->priv().caps();
         desc.fDepthStencilAttachment.fTextureInfo =
                 caps->getDefaultDepthStencilTextureInfo(drawPass->depthStencilFlags(),
                                                         1 /*sampleCount*/, // TODO: MSAA
                                                         Protected::kNo);
-        // TODO: handle clears
-        desc.fDepthStencilAttachment.fLoadOp = LoadOp::kDiscard;
+        // Always clear the depth and stencil to 0 at the start of a DrawPass, but discard at the
+        // end since their contents do not affect the next frame.
+        desc.fDepthStencilAttachment.fLoadOp = LoadOp::kClear;
+        desc.fClearDepth = 0.f;
+        desc.fClearStencil = 0;
         desc.fDepthStencilAttachment.fStoreOp = StoreOp::kDiscard;
     }
 
@@ -140,4 +194,16 @@ sk_sp<Task> DrawContext::snapRenderPassTask(Recorder* recorder,
     return RenderPassTask::Make(std::move(fDrawPasses), desc, std::move(targetProxy));
 }
 
+sk_sp<Task> DrawContext::snapUploadTask(Recorder* recorder) {
+    if (!fPendingUploads) {
+        return nullptr;
+    }
+
+    sk_sp<Task> uploadTask = UploadTask::Make(fPendingUploads.get());
+
+    fPendingUploads = std::make_unique<UploadList>();
+
+    return uploadTask;
+}
+
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/DrawContext.h b/third_party/skia/experimental/graphite/src/DrawContext.h
index 2ac3c3fc12e31..31ca03cde0b2c 100644
--- a/third_party/skia/experimental/graphite/src/DrawContext.h
+++ b/third_party/skia/experimental/graphite/src/DrawContext.h
@@ -14,9 +14,12 @@
 #include "experimental/graphite/src/DrawList.h"
 #include "experimental/graphite/src/DrawOrder.h"
 #include "experimental/graphite/src/DrawTypes.h"
+#include "experimental/graphite/src/UploadTask.h"
 
 #include <vector>
 
+class SkPixmap;
+
 namespace skgpu {
 
 class BoundsManager;
@@ -70,6 +73,10 @@ class DrawContext final : public SkRefCnt {
                     DrawOrder order,
                     const PaintParams* paint);
 
+    bool writePixels(Recorder* recorder,
+                     const SkPixmap& src,
+                     SkIPoint dstPt);
+
     // Ends the current DrawList being accumulated by the SDC, converting it into an optimized and
     // immutable DrawPass. The DrawPass will be ordered after any other snapped DrawPasses or
     // appended DrawPasses from a child SDC. A new DrawList is started to record subsequent drawing
@@ -92,6 +99,15 @@ class DrawContext final : public SkRefCnt {
     // Returns null if there are no pending commands or draw passes to move into a task.
     sk_sp<Task> snapRenderPassTask(Recorder*, const BoundsManager* occlusionCuller);
 
+    // Ends the current UploadList if needed, and moves the accumulated Uploads into an UploadTask
+    // that can be drawn and depended on. The caller is responsible for configuring the returned
+    // Tasks's dependencies.
+    //
+    // Returns null if there are no pending uploads to move into a task.
+    //
+    // TODO: see if we can merge transfers into this
+    sk_sp<Task> snapUploadTask(Recorder*);
+
 private:
     DrawContext(sk_sp<TextureProxy>, const SkImageInfo&);
 
@@ -106,7 +122,7 @@ class DrawContext final : public SkRefCnt {
     StoreOp fPendingStoreOp = StoreOp::kStore;
     std::array<float, 4> fPendingClearColor = { 0, 0, 0, 0 };
 
-    // Stores previously snapped DrawPasses of this SDC, or inlined child SDCs whose content
+    // Stores previously snapped DrawPasses of this DC, or inlined child DCs whose content
     // couldn't have been copied directly to fPendingDraws. While each DrawPass is immutable, the
     // list of DrawPasses is not final until there is an external dependency on the SDC's content
     // that requires it to be resolved as its own render pass (vs. inlining the SDC's passes into a
@@ -115,6 +131,10 @@ class DrawContext final : public SkRefCnt {
     // consecutive DrawPasses to the same target are stored in a DrawPassChain. A DrawContext with
     // multiple DrawPassChains is then clearly accumulating subpasses across multiple targets.
     std::vector<std::unique_ptr<DrawPass>> fDrawPasses;
+
+    // Stores the most immediately recorded uploads into Textures. This list is mutable and
+    // can be appended to, or have its commands rewritten if they are inlined into a parent DC.
+    std::unique_ptr<UploadList> fPendingUploads;
 };
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/DrawList.cpp b/third_party/skia/experimental/graphite/src/DrawList.cpp
index e69928bacdec5..a42e166b9746c 100644
--- a/third_party/skia/experimental/graphite/src/DrawList.cpp
+++ b/third_party/skia/experimental/graphite/src/DrawList.cpp
@@ -8,29 +8,10 @@
 #include "experimental/graphite/src/DrawList.h"
 
 #include "experimental/graphite/src/Renderer.h"
-#include "include/core/SkShader.h"
 #include "src/gpu/BufferWriter.h"
 
 namespace skgpu {
 
-PaintParams::PaintParams(const SkColor4f& color,
-                         SkBlendMode blendMode,
-                         sk_sp<SkShader> shader)
-        : fColor(color)
-        , fBlendMode(blendMode)
-        , fShader(std::move(shader)) {}
-
-PaintParams::PaintParams(const SkPaint& paint)
-        : fColor(paint.getColor4f())
-        , fBlendMode(paint.getBlendMode_or(SkBlendMode::kSrcOver))
-        , fShader(paint.refShader()) {}
-
-PaintParams::PaintParams(const PaintParams& other) = default;
-PaintParams::~PaintParams() = default;
-PaintParams& PaintParams::operator=(const PaintParams& other) = default;
-
-sk_sp<SkShader> PaintParams::refShader() const { return fShader; }
-
 const Transform& DrawList::deduplicateTransform(const Transform& localToDevice) {
     // TODO: This is a pretty simple deduplication strategy and doesn't take advantage of the stack
     // knowledge that Device has.
@@ -47,10 +28,11 @@ void DrawList::stencilAndFillPath(const Transform& localToDevice,
                                   const PaintParams* paint) {
     SkASSERT(localToDevice.valid());
     SkASSERT(!shape.isEmpty() && !clip.drawBounds().isEmptyNegativeOrNaN());
-    fDraws.push_back({Renderer::StencilAndFillPath(),
-                      this->deduplicateTransform(localToDevice),
+
+    const Renderer& renderer = Renderer::StencilAndFillPath(shape.fillType());
+    fDraws.push_back({renderer, this->deduplicateTransform(localToDevice),
                       shape, clip, ordering, paint, nullptr});
-    fRenderStepCount += Renderer::StencilAndFillPath().numRenderSteps();
+    fRenderStepCount += renderer.numRenderSteps();
 }
 
 void DrawList::fillConvexPath(const Transform& localToDevice,
diff --git a/third_party/skia/experimental/graphite/src/DrawList.h b/third_party/skia/experimental/graphite/src/DrawList.h
index f0d2144ba50d0..8024d741bd1be 100644
--- a/third_party/skia/experimental/graphite/src/DrawList.h
+++ b/third_party/skia/experimental/graphite/src/DrawList.h
@@ -8,16 +8,16 @@
 #ifndef skgpu_DrawList_DEFINED
 #define skgpu_DrawList_DEFINED
 
-#include "include/core/SkColor.h"
 #include "include/core/SkPaint.h"
-#include "include/private/SkTOptional.h"
 #include "src/core/SkTBlockList.h"
 
 #include "experimental/graphite/src/DrawOrder.h"
+#include "experimental/graphite/src/PaintParams.h"
 #include "experimental/graphite/src/geom/Shape.h"
 #include "experimental/graphite/src/geom/Transform_graphite.h"
 
 #include <limits>
+#include <optional>
 
 class SkPath;
 class SkShader;
@@ -27,35 +27,6 @@ namespace skgpu {
 
 class Renderer;
 
-// TBD: If occlusion culling is eliminated as a phase, we can easily move the paint conversion
-// back to Device when the command is recorded (similar to SkPaint -> GrPaint), and then
-// PaintParams is not required as an intermediate representation.
-// NOTE: Only represents the shading state of an SkPaint. Style and complex effects (mask filters,
-// image filters, path effects) must be handled higher up. AA is not tracked since everything is
-// assumed to be anti-aliased.
-class PaintParams {
-public:
-    PaintParams(const SkColor4f& color, SkBlendMode, sk_sp<SkShader>);
-    explicit PaintParams(const SkPaint& paint);
-
-    PaintParams(const PaintParams&);
-    ~PaintParams();
-
-    PaintParams& operator=(const PaintParams&);
-
-    SkColor4f color() const { return fColor; }
-    SkBlendMode blendMode() const { return fBlendMode; }
-    SkShader* shader() const { return fShader.get(); }
-    sk_sp<SkShader> refShader() const;
-
-private:
-    SkColor4f       fColor;
-    SkBlendMode     fBlendMode;
-    sk_sp<SkShader> fShader; // For now only use SkShader::asAGradient() when converting to GPU
-    // TODO: Will also store ColorFilter, custom Blender, dither, and any extra shader from an
-    // active clipShader().
-};
-
 // NOTE: Only represents the stroke or hairline styles; stroke-and-fill must be handled higher up.
 class StrokeParams {
 public:
@@ -201,8 +172,8 @@ class DrawList {
         Clip      fClip;
         DrawOrder fOrder;
 
-        skstd::optional<PaintParams>  fPaintParams; // Not present implies depth-only draw
-        skstd::optional<StrokeParams> fStrokeParams; // Not present implies fill
+        std::optional<PaintParams>  fPaintParams; // Not present implies depth-only draw
+        std::optional<StrokeParams> fStrokeParams; // Not present implies fill
 
         Draw(const Renderer& renderer, const Transform& transform, const Shape& shape,
              const Clip& clip, DrawOrder order, const PaintParams* paint,
@@ -212,8 +183,8 @@ class DrawList {
                 , fShape(shape)
                 , fClip(clip)
                 , fOrder(order)
-                , fPaintParams(paint ? skstd::optional<PaintParams>(*paint) : skstd::nullopt)
-                , fStrokeParams(stroke ? skstd::optional<StrokeParams>(*stroke) : skstd::nullopt) {}
+                , fPaintParams(paint ? std::optional<PaintParams>(*paint) : std::nullopt)
+                , fStrokeParams(stroke ? std::optional<StrokeParams>(*stroke) : std::nullopt) {}
     };
 
     // The returned Transform reference remains valid for the lifetime of the DrawList.
diff --git a/third_party/skia/experimental/graphite/src/DrawPass.cpp b/third_party/skia/experimental/graphite/src/DrawPass.cpp
index a7f34d8c22cdb..becebff52352b 100644
--- a/third_party/skia/experimental/graphite/src/DrawPass.cpp
+++ b/third_party/skia/experimental/graphite/src/DrawPass.cpp
@@ -16,8 +16,10 @@
 #include "experimental/graphite/src/DrawContext.h"
 #include "experimental/graphite/src/DrawList.h"
 #include "experimental/graphite/src/DrawWriter.h"
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/GraphicsPipeline.h"
 #include "experimental/graphite/src/GraphicsPipelineDesc.h"
+#include "experimental/graphite/src/RecorderPriv.h"
 #include "experimental/graphite/src/Renderer.h"
 #include "experimental/graphite/src/ResourceProvider.h"
 #include "experimental/graphite/src/TextureProxy.h"
@@ -27,7 +29,7 @@
 
 #include "src/core/SkMathPriv.h"
 #include "src/core/SkTBlockList.h"
-#include "src/core/SkUtils.h"
+#include "src/core/SkUniformData.h"
 #include "src/gpu/BufferWriter.h"
 
 #include <algorithm>
@@ -35,6 +37,17 @@
 
 namespace skgpu {
 
+// Helper to manage packed fields within a uint64_t
+template <uint64_t Bits, uint64_t Offset>
+struct Bitfield {
+    static constexpr uint64_t kMask = ((uint64_t) 1 << Bits) - 1;
+    static constexpr uint64_t kOffset = Offset;
+    static constexpr uint64_t kBits = Bits;
+
+    static uint32_t get(uint64_t v) { return static_cast<uint32_t>((v >> kOffset) & kMask); }
+    static uint64_t set(uint32_t v) { return (v & kMask) << kOffset; }
+};
+
 /**
  * Each Draw in a DrawList might be processed by multiple RenderSteps (determined by the Draw's
  * Renderer), which can be sorted independently. Each (step, draw) pair produces its own SortKey.
@@ -65,55 +78,55 @@ class DrawPass::SortKey {
             uint32_t pipelineIndex,
             uint32_t geomUniformIndex,
             uint32_t shadingUniformIndex)
-        : fPipelineKey{draw->fOrder.paintOrder().bits(),
-                       draw->fOrder.stencilIndex().bits(),
-                       static_cast<uint32_t>(renderStep),
-                       pipelineIndex}
-        , fUniformKey{geomUniformIndex, shadingUniformIndex}
+        : fPipelineKey(ColorDepthOrderField::set(draw->fOrder.paintOrder().bits()) |
+                       StencilIndexField::set(draw->fOrder.stencilIndex().bits())  |
+                       RenderStepField::set(static_cast<uint32_t>(renderStep))     |
+                       PipelineField::set(pipelineIndex))
+        , fUniformKey(GeometryUniformField::set(geomUniformIndex) |
+                      ShadingUniformField::set(shadingUniformIndex))
         , fDraw(draw) {
         SkASSERT(renderStep <= draw->fRenderer.numRenderSteps());
     }
 
     bool operator<(const SortKey& k) const {
-        uint64_t k1 = this->pipelineKey();
-        uint64_t k2 = k.pipelineKey();
-        return k1 < k2 || (k1 == k2 && this->uniformKey() < k.uniformKey());
+        return fPipelineKey < k.fPipelineKey ||
+               (fPipelineKey == k.fPipelineKey && fUniformKey < k.fUniformKey);
     }
 
-    const DrawList::Draw* draw() const { return fDraw; }
-    uint32_t pipeline() const { return fPipelineKey.fPipeline; }
     const RenderStep& renderStep() const {
-        return *fDraw->fRenderer.steps()[fPipelineKey.fRenderStep];
+        return *fDraw->fRenderer.steps()[RenderStepField::get(fPipelineKey)];
     }
 
-    uint32_t geometryUniforms() const { return fUniformKey.fGeometryIndex; }
-    uint32_t shadingUniforms() const { return fUniformKey.fShadingIndex; }
-
-private:
-    // Fields are ordered from most-significant to lowest when sorting by 128-bit value.
-    struct {
-        uint32_t fColorDepthOrder : 16; // sizeof(CompressedPaintersOrder)
-        uint32_t fStencilOrder    : 16; // sizeof(DisjointStencilIndex)
-        uint32_t fRenderStep      : 2;  // bits >= log2(Renderer::kMaxRenderSteps)
-        uint32_t fPipeline        : 30; // bits >= log2(max steps * DrawList::kMaxDraws)
-    } fPipelineKey; // NOTE: named for bit-punning, can't take address of a bit-field
-
-    uint64_t pipelineKey() const { return sk_bit_cast<uint64_t>(fPipelineKey); }
+    const DrawList::Draw* draw() const { return fDraw; }
 
-    struct {
-        uint32_t fGeometryIndex; // bits >= log2(max steps * max draw count)
-        uint32_t fShadingIndex;  //  ""
-    } fUniformKey;
+    uint32_t pipeline()          const { return PipelineField::get(fPipelineKey);       }
+    uint32_t geometryUniforms()  const { return GeometryUniformField::get(fUniformKey); }
+    uint32_t shadingUniforms()   const { return ShadingUniformField::get(fUniformKey);  }
 
-    uint64_t uniformKey() const { return sk_bit_cast<uint64_t>(fUniformKey); }
+private:
+    // Fields are ordered from most-significant to least when sorting by 128-bit value.
+    // NOTE: We don't use bit fields because field ordering is implementation defined and we need
+    // to sort consistently.
+    using ColorDepthOrderField = Bitfield<16, 48>; // sizeof(CompressedPaintersOrder)
+    using StencilIndexField    = Bitfield<16, 32>; // sizeof(DisjointStencilIndex)
+    using RenderStepField      = Bitfield<2,  30>; // bits >= log2(Renderer::kMaxRenderSteps)
+    using PipelineField        = Bitfield<30, 0>;  // bits >= log2(max steps*DrawList::kMaxDraws)
+    uint64_t fPipelineKey;
+
+    using GeometryUniformField = Bitfield<32, 32>; // bits >= log2(max steps * max draw count)
+    using ShadingUniformField  = Bitfield<32, 0>;  //  ""
+    uint64_t fUniformKey;
 
     // Backpointer to the draw that produced the sort key
     const DrawList::Draw* fDraw;
 
-    static_assert(16 >= sizeof(CompressedPaintersOrder));
-    static_assert(16 >= sizeof(DisjointStencilIndex));
-    static_assert(2  >= SkNextLog2_portable(Renderer::kMaxRenderSteps));
-    static_assert(30 >= SkNextLog2_portable(Renderer::kMaxRenderSteps * DrawList::kMaxDraws));
+    static_assert(ColorDepthOrderField::kBits >= sizeof(CompressedPaintersOrder));
+    static_assert(StencilIndexField::kBits    >= sizeof(DisjointStencilIndex));
+    static_assert(RenderStepField::kBits      >= SkNextLog2_portable(Renderer::kMaxRenderSteps));
+    static_assert(PipelineField::kBits        >=
+                        SkNextLog2_portable(Renderer::kMaxRenderSteps * DrawList::kMaxDraws));
+    static_assert(GeometryUniformField::kBits >= PipelineField::kBits);
+    static_assert(ShadingUniformField::kBits  >= PipelineField::kBits);
 };
 
 class DrawPass::Drawer final : public DrawDispatcher {
@@ -164,16 +177,21 @@ class UniformBindingCache {
     UniformBindingCache(DrawBufferManager* bufferMgr, UniformCache* cache)
             : fBufferMgr(bufferMgr), fCache(cache) {}
 
-    uint32_t addUniforms(sk_sp<UniformData> data) {
-        if (!data) {
+    uint32_t addUniforms(std::unique_ptr<SkUniformBlock> uniformBlock) {
+        if (!uniformBlock || uniformBlock->empty()) {
             return UniformCache::kInvalidUniformID;
         }
 
-        uint32_t index = fCache->insert(data);
+        uint32_t index = fCache->insert(std::move(uniformBlock));
         if (fBindings.find(index) == fBindings.end()) {
+            SkUniformBlock* tmp = fCache->lookup(index);
             // First time encountering this data, so upload to the GPU
-            auto [writer, bufferInfo] = fBufferMgr->getUniformWriter(data->dataSize());
-            writer.write(data->data(), data->dataSize());
+            size_t totalDataSize = tmp->totalSize();
+            auto [writer, bufferInfo] = fBufferMgr->getUniformWriter(totalDataSize);
+            for (auto& u : *tmp) {
+                writer.write(u->data(), u->dataSize());
+            }
+
             fBindings.insert({index, bufferInfo});
         }
 
@@ -255,10 +273,10 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
 
     Rect passBounds = Rect::InfiniteInverted();
 
-    DrawBufferManager* bufferMgr = recorder->drawBufferManager();
+    DrawBufferManager* bufferMgr = recorder->priv().drawBufferManager();
     UniformCache geometryUniforms;
     UniformBindingCache geometryUniformBindings(bufferMgr, &geometryUniforms);
-    UniformBindingCache shadingUniformBindings(bufferMgr, recorder->uniformCache());
+    UniformBindingCache shadingUniformBindings(bufferMgr, recorder->priv().uniformCache());
 
     std::unordered_map<const GraphicsPipelineDesc*, uint32_t, Hash, Eq> pipelineDescToIndex;
 
@@ -274,34 +292,41 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
         // If we have two different descriptors, such that the uniforms from the PaintParams can be
         // bound independently of those used by the rest of the RenderStep, then we can upload now
         // and remember the location for re-use on any RenderStep that does shading.
-        Combination shader;
-        sk_sp<UniformData> shadingUniforms = nullptr;
+        SkUniquePaintParamsID shaderID;
+        std::unique_ptr<SkUniformBlock> shadingUniforms;
         uint32_t shadingIndex = UniformCache::kInvalidUniformID;
         if (draw.fPaintParams.has_value()) {
-            std::tie(shader, shadingUniforms) = ExtractCombo(draw.fPaintParams.value());
-            shadingIndex = shadingUniformBindings.addUniforms(shadingUniforms);
+            SkShaderCodeDictionary* dict =
+                    recorder->priv().resourceProvider()->shaderCodeDictionary();
+            std::tie(shaderID, shadingUniforms) = ExtractPaintData(dict, draw.fPaintParams.value());
+            shadingIndex = shadingUniformBindings.addUniforms(std::move(shadingUniforms));
         } // else depth-only
 
         for (int stepIndex = 0; stepIndex < draw.fRenderer.numRenderSteps(); ++stepIndex) {
             const RenderStep* const step = draw.fRenderer.steps()[stepIndex];
             const bool performsShading = draw.fPaintParams.has_value() && step->performsShading();
 
-            Combination stepShader;
+            SkUniquePaintParamsID stepShaderID;
             uint32_t stepShadingIndex = UniformCache::kInvalidUniformID;
             if (performsShading) {
-                stepShader = shader;
+                stepShaderID = shaderID;
                 stepShadingIndex = shadingIndex;
             } // else depth-only draw or stencil-only step of renderer so no shading is needed
 
             uint32_t geometryIndex = UniformCache::kInvalidUniformID;
             if (step->numUniforms() > 0) {
                 // TODO: Get layout from the GPU
+                auto uniforms = step->writeUniforms(Layout::kMetal,
+                                                    draw.fClip.scissor(),
+                                                    draw.fTransform,
+                                                    draw.fShape);
+
                 geometryIndex = geometryUniformBindings.addUniforms(
-                        step->writeUniforms(Layout::kMetal, draw.fTransform, draw.fShape));
+                        std::make_unique<SkUniformBlock>(std::move(uniforms)));
             }
 
             GraphicsPipelineDesc desc;
-            desc.setProgram(step, stepShader);
+            desc.setProgram(step, stepShaderID);
             uint32_t pipelineIndex = 0;
             auto pipelineLookup = pipelineDescToIndex.find(&desc);
             if (pipelineLookup == pipelineDescToIndex.end()) {
@@ -391,7 +416,7 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
             }
         }
 
-        renderStep.writeVertices(&drawWriter, draw.fTransform, draw.fShape);
+        renderStep.writeVertices(&drawWriter, draw.fClip.scissor(), draw.fTransform, draw.fShape);
     }
     // Finish recording draw calls for any collected data at the end of the loop
     drawWriter.flush();
@@ -402,7 +427,9 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
     return drawPass;
 }
 
-void DrawPass::addCommands(CommandBuffer* buffer, ResourceProvider* resourceProvider) const {
+void DrawPass::addCommands(ResourceProvider* resourceProvider,
+                           CommandBuffer* buffer,
+                           const RenderPassDesc& renderPassDesc) const {
     // TODO: Validate RenderPass state against DrawPass's target and requirements?
     // Generate actual GraphicsPipeline objects combining the target-level properties and each of
     // the GraphicsPipelineDesc's referenced in this DrawPass.
@@ -410,8 +437,9 @@ void DrawPass::addCommands(CommandBuffer* buffer, ResourceProvider* resourceProv
     // Use a vector instead of SkTBlockList for the full pipelines so that random access is fast.
     std::vector<sk_sp<GraphicsPipeline>> fullPipelines;
     fullPipelines.reserve(fPipelineDescs.count());
-    for (const GraphicsPipelineDesc& desc : fPipelineDescs.items()) {
-        fullPipelines.push_back(resourceProvider->findOrCreateGraphicsPipeline(desc));
+    for (const GraphicsPipelineDesc& pipelineDesc : fPipelineDescs.items()) {
+        fullPipelines.push_back(resourceProvider->findOrCreateGraphicsPipeline(pipelineDesc,
+                                                                               renderPassDesc));
     }
 
     // Set viewport to the entire texture for now (eventually, we may have logically smaller bounds
diff --git a/third_party/skia/experimental/graphite/src/DrawPass.h b/third_party/skia/experimental/graphite/src/DrawPass.h
index 067927087ef34..d1d109abbb618 100644
--- a/third_party/skia/experimental/graphite/src/DrawPass.h
+++ b/third_party/skia/experimental/graphite/src/DrawPass.h
@@ -24,6 +24,7 @@ class BoundsManager;
 class CommandBuffer;
 class DrawList;
 class Recorder;
+struct RenderPassDesc;
 class ResourceProvider;
 class TextureProxy;
 enum class UniformSlot;
@@ -76,7 +77,7 @@ class DrawPass {
 
     // Transform this DrawPass into commands issued to the CommandBuffer. Assumes that the buffer
     // has already begun a correctly configured render pass matching this pass's target.
-    void addCommands(CommandBuffer* buffer, ResourceProvider*) const;
+    void addCommands(ResourceProvider*, CommandBuffer*, const RenderPassDesc&) const;
 
 private:
     class SortKey;
diff --git a/third_party/skia/experimental/graphite/src/DrawTypes.h b/third_party/skia/experimental/graphite/src/DrawTypes.h
index 3c043b1ca41fc..2a6497d224edc 100644
--- a/third_party/skia/experimental/graphite/src/DrawTypes.h
+++ b/third_party/skia/experimental/graphite/src/DrawTypes.h
@@ -14,56 +14,6 @@ namespace skgpu {
 
 class Buffer;
 
-/**
- * Types of shader-language-specific boxed variables we can create.
- */
-enum class SLType {
-    kVoid,
-    kBool,
-    kBool2,
-    kBool3,
-    kBool4,
-    kShort,
-    kShort2,
-    kShort3,
-    kShort4,
-    kUShort,
-    kUShort2,
-    kUShort3,
-    kUShort4,
-    kFloat,
-    kFloat2,
-    kFloat3,
-    kFloat4,
-    kFloat2x2,
-    kFloat3x3,
-    kFloat4x4,
-    kHalf,
-    kHalf2,
-    kHalf3,
-    kHalf4,
-    kHalf2x2,
-    kHalf3x3,
-    kHalf4x4,
-    kInt,
-    kInt2,
-    kInt3,
-    kInt4,
-    kUInt,
-    kUInt2,
-    kUInt3,
-    kUInt4,
-    kTexture2DSampler,
-    kTextureExternalSampler,
-    kTexture2DRectSampler,
-    kTexture2D,
-    kSampler,
-    kInput,
-
-    kLast = kInput
-};
-static const int kSLTypeCount = static_cast<int>(SLType::kLast) + 1;
-
 enum class CType : unsigned {
     // Any float/half, vector of floats/half, or matrices of floats/halfs are a tightly
     // packed array of floats. Similarly, any bool/shorts/ints are a tightly packed array
@@ -260,6 +210,20 @@ static constexpr int kStencilOpCount = 1 + (int)StencilOp::kDecClamp;
 struct DepthStencilSettings {
     // Per-face settings for stencil
     struct Face {
+        constexpr Face() = default;
+        constexpr Face(StencilOp stencilFail,
+                       StencilOp depthFail,
+                       StencilOp dsPass,
+                       CompareOp compare,
+                       uint32_t readMask,
+                       uint32_t writeMask)
+                : fStencilFailOp(stencilFail)
+                , fDepthFailOp(depthFail)
+                , fDepthStencilPassOp(dsPass)
+                , fCompareOp(compare)
+                , fReadMask(readMask)
+                , fWriteMask(writeMask) {}
+
         StencilOp fStencilFailOp = StencilOp::kKeep;
         StencilOp fDepthFailOp = StencilOp::kKeep;
         StencilOp fDepthStencilPassOp = StencilOp::kKeep;
@@ -267,7 +231,7 @@ struct DepthStencilSettings {
         uint32_t fReadMask = 0xffffffff;
         uint32_t fWriteMask = 0xffffffff;
 
-        bool operator==(const Face& that) const {
+        constexpr bool operator==(const Face& that) const {
             return this->fStencilFailOp == that.fStencilFailOp &&
                    this->fDepthFailOp == that.fDepthFailOp &&
                    this->fDepthStencilPassOp == that.fDepthStencilPassOp &&
@@ -277,7 +241,23 @@ struct DepthStencilSettings {
         }
     };
 
-    bool operator==(const DepthStencilSettings& that) const {
+    constexpr DepthStencilSettings() = default;
+    constexpr DepthStencilSettings(Face front,
+                                   Face back,
+                                   uint32_t stencilRef,
+                                   bool stencilTest,
+                                   CompareOp depthCompare,
+                                   bool depthTest,
+                                   bool depthWrite)
+            : fFrontStencil(front)
+            , fBackStencil(back)
+            , fStencilReferenceValue(stencilRef)
+            , fDepthCompareOp(depthCompare)
+            , fStencilTestEnabled(stencilTest)
+            , fDepthTestEnabled(depthTest)
+            , fDepthWriteEnabled(depthWrite) {}
+
+    constexpr bool operator==(const DepthStencilSettings& that) const {
         return this->fFrontStencil == that.fFrontStencil &&
                this->fBackStencil == that.fBackStencil &&
                this->fStencilReferenceValue == that.fStencilReferenceValue &&
diff --git a/third_party/skia/experimental/graphite/src/DrawWriter.cpp b/third_party/skia/experimental/graphite/src/DrawWriter.cpp
index 5da16658b607f..84f612e46b99a 100644
--- a/third_party/skia/experimental/graphite/src/DrawWriter.cpp
+++ b/third_party/skia/experimental/graphite/src/DrawWriter.cpp
@@ -24,141 +24,113 @@ DrawWriter::DrawWriter(DrawDispatcher* dispatcher,
         , fManager(bufferManager)
         , fPrimitiveType(primitiveType)
         , fVertexStride(vertexStride)
-        , fInstanceStride(instanceStride) {
+        , fInstanceStride(instanceStride)
+        , fVertices()
+        , fIndices()
+        , fInstances()
+        , fTemplateCount(0)
+        , fPendingCount(0)
+        , fPendingBase(0)
+        , fPendingBufferBinds(true) {
     SkASSERT(dispatcher && bufferManager);
 }
 
-void DrawWriter::setTemplateInternal(BindBufferInfo vertices,
-                                     BindBufferInfo indices,
-                                     unsigned int count,
-                                     bool drawPendingVertices) {
-    SkASSERT(!vertices || fVertexStride > 0);
-    if (vertices != fFixedVertexBuffer ||
-        indices != fFixedIndexBuffer ||
-        count != fFixedVertexCount) {
-        // Issue any accumulated data that referred to the old template.
-        if (drawPendingVertices) {
-            this->drawPendingVertices();
+void DrawWriter::setTemplate(BindBufferInfo vertices,
+                             BindBufferInfo indices,
+                             BindBufferInfo instances,
+                             unsigned int templateCount) {
+    if (vertices != fVertices || instances != fInstances || fIndices != indices) {
+        if (fPendingCount > 0) {
+            this->flush();
         }
 
-        fFixedBuffersDirty = true;
+        bool willAppendVertices = templateCount == 0;
+        bool isAppendingVertices = fTemplateCount == 0;
+        if (willAppendVertices != isAppendingVertices ||
+            (isAppendingVertices && fVertices != vertices) ||
+            (!isAppendingVertices && fInstances != instances)) {
+            // The buffer binding target for appended data is changing, so reset the base offset
+            fPendingBase = 0;
+        }
+
+        fVertices = vertices;
+        fInstances = instances;
+        fIndices = indices;
+
+        fTemplateCount = templateCount;
 
-        fFixedVertexBuffer = vertices;
-        fFixedIndexBuffer = indices;
-        fFixedVertexCount = count;
+        fPendingBufferBinds = true;
+    } else if (templateCount != fTemplateCount) {
+        if (fPendingCount > 0) {
+            this->flush();
+        }
+        if ((templateCount == 0) != (fTemplateCount == 0)) {
+            // Switching from appending vertices to instances, or vice versa, so the pending
+            // base vertex for appended data is invalid
+            fPendingBase = 0;
+        }
+        fTemplateCount = templateCount;
     }
+
+    SkASSERT(fVertices      == vertices);
+    SkASSERT(fInstances     == instances);
+    SkASSERT(fIndices       == indices);
+    SkASSERT(fTemplateCount == templateCount);
 }
 
-void DrawWriter::drawInternal(BindBufferInfo instances,
-                              unsigned int base,
-                              unsigned int instanceCount) {
-    // Draw calls that are only 1 instance and have no extra instance data get routed to
-    // the simpler draw APIs.
-    // TODO: Is there any benefit to this? Does it help hint to drivers? Avoid more bugs?
-    // Or should we always call drawInstanced and drawIndexedInstanced?
-    const bool useNonInstancedDraw =
-            !SkToBool(instances) && base == 0 && instanceCount == 1;
-    SkASSERT(!useNonInstancedDraw || fInstanceStride == 0);
-
-    // Issue new buffer binds only as necessary
-    // TODO: Should this instead be the responsibility of the CB or DrawDispatcher to remember
-    // what was last bound?
-    if (fFixedBuffersDirty || instances != fLastInstanceBuffer) {
-        fDispatcher->bindDrawBuffers(fFixedVertexBuffer, instances, fFixedIndexBuffer);
-        fFixedBuffersDirty = false;
-        fLastInstanceBuffer = instances;
+void DrawWriter::flush() {
+    if (fPendingCount == 0) {
+        return;
+    }
+    if (fPendingBufferBinds) {
+        fDispatcher->bindDrawBuffers(fVertices, fInstances, fIndices);
+        fPendingBufferBinds = false;
     }
 
-    if (useNonInstancedDraw) {
-        if (fFixedIndexBuffer) {
-            // Should only get here from a direct draw, in which case base should be 0 and any
-            // offset needs to be embedded in the BindBufferInfo by caller.
-            SkASSERT(base == 0);
-            fDispatcher->drawIndexed(fPrimitiveType, 0, fFixedVertexCount, 0);
+    if (fTemplateCount) {
+        // Instanced drawing
+        if (fIndices) {
+            fDispatcher->drawIndexedInstanced(fPrimitiveType, 0, fTemplateCount, 0,
+                                              fPendingBase, fPendingCount);
         } else {
-            // 'base' offsets accumulated vertex data from another DrawWriter across a state change.
-            fDispatcher->draw(fPrimitiveType, base, fFixedVertexCount);
+            fDispatcher->drawInstanced(fPrimitiveType, 0, fTemplateCount,
+                                       fPendingBase, fPendingCount);
         }
     } else {
-        // 'base' offsets accumulated instance data (or is 0 for a direct instanced draw). It is
-        // assumed that any base vertex and index have been folded into the BindBufferInfos already.
-        if (fFixedIndexBuffer) {
-            fDispatcher->drawIndexedInstanced(fPrimitiveType, 0, fFixedVertexCount, 0,
-                                              base, instanceCount);
+        SkASSERT(!fInstances);
+        if (fIndices) {
+            fDispatcher->drawIndexed(fPrimitiveType, 0, fPendingCount, fPendingBase);
         } else {
-            fDispatcher->drawInstanced(fPrimitiveType, 0, fFixedVertexCount, base, instanceCount);
+            fDispatcher->draw(fPrimitiveType, fPendingBase, fPendingCount);
         }
     }
-}
-
-void DrawWriter::drawPendingVertices() {
-    if (fPendingCount > 0) {
-        if (fPendingMode == VertexMode::kInstances) {
-            // This uses instanced draws, so 'base' will be interpreted in instance units.
-            this->drawInternal(fPendingAttrs, fPendingBaseVertex, fPendingCount);
-        } else {
-            // This triggers a non-instanced draw call so 'base' passed to drawInternal is
-            // interpreted in vertex units.
-            this->setTemplateInternal(fPendingAttrs, {}, fPendingCount, /*drawPending=*/false);
-            this->drawInternal({}, fPendingBaseVertex, 1);
-        }
 
-        fPendingCount = 0;
-        fPendingBaseVertex = 0;
-        fPendingAttrs = {};
-    }
+    fPendingBase += fPendingCount;
+    fPendingCount = 0;
 }
 
-VertexWriter DrawWriter::appendData(VertexMode mode, size_t stride, unsigned int count) {
-    if (fPendingMode != mode) {
-        // Switched between accumulating vertices and instances, so issue draws for the old data.
-        this->drawPendingVertices();
-        fPendingMode = mode;
-    }
+VertexWriter DrawWriter::Appender::append(unsigned int count,
+                                          size_t stride,
+                                          BindBufferInfo& target) {
+    SkASSERT(&target == &fWriter.fInstances || &target == &fWriter.fVertices);
+    SkASSERT(this == fWriter.fAppender);
 
-    auto [writer, nextChunk] = fManager->getVertexWriter(count * stride);
+    auto [writer, nextChunk] = fWriter.fManager->getVertexWriter(count * stride);
     // Check if next chunk's data is contiguous with what's previously been appended
-    if (nextChunk.fBuffer == fPendingAttrs.fBuffer &&
-        fPendingAttrs.fOffset + (fPendingBaseVertex + fPendingCount) * stride
-                == nextChunk.fOffset) {
-        // It is, so the next chunk's vertices that will be written can be folded into the next draw
-        fPendingCount += count;
-    } else {
-        // Alignment mismatch, or the old buffer filled up
-        this->drawPendingVertices();
-        fPendingCount = count;
-        fPendingBaseVertex = 0;
-        fPendingAttrs = nextChunk;
+    if (nextChunk.fBuffer != target.fBuffer ||
+        nextChunk.fOffset !=
+                target.fOffset + (fWriter.fPendingBase + fWriter.fPendingCount) * stride) {
+        // Alignment mismatch, or the old buffer filled up, so must update the bindings
+        fWriter.flush();
+        target = nextChunk;
+
+        fWriter.fPendingBase = 0;
+        fWriter.fPendingBufferBinds = true;
     }
 
-    return std::move(writer);
-}
-
-void DrawWriter::newDynamicState() {
-    // Remember where we left off after we draw, since drawPendingVertices() resets all pending data
-    BindBufferInfo base = fPendingAttrs;
-    unsigned int baseVertex = fPendingBaseVertex + fPendingCount;
-    // Draw anything that used the previous dynamic state
-    this->drawPendingVertices();
+    fWriter.fPendingCount += count;
 
-    fPendingAttrs = base;
-    fPendingBaseVertex = baseVertex;
-}
-
-void DrawWriter::newPipelineState(PrimitiveType type,
-                                  size_t vertexStride,
-                                  size_t instanceStride) {
-    // Draw anything that used the previous pipeline
-    this->drawPendingVertices();
-
-    // For simplicity, if there's a new pipeline, just forget about any previous buffer bindings,
-    // in which case the new writer only needs to use the dispatcher and buffer manager.
-    this->setTemplateInternal({}, {}, 0, false);
-    fLastInstanceBuffer = {};
-
-    fPrimitiveType = type;
-    fVertexStride = vertexStride;
-    fInstanceStride = instanceStride;
+    return std::move(writer);
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/DrawWriter.h b/third_party/skia/experimental/graphite/src/DrawWriter.h
index 4d6a4e81907ef..f7272dde6526f 100644
--- a/third_party/skia/experimental/graphite/src/DrawWriter.h
+++ b/third_party/skia/experimental/graphite/src/DrawWriter.h
@@ -28,33 +28,32 @@ class DrawDispatcher; // Forward declaration, handles virtual dispatch of binds/
  * modifications. See the listing below for how to append dynamic data or draw with existing buffers
  *
  * CommandBuffer::draw(vertices)
- *  - dynamic vertex data     -> DrawWriter::appendVertices(n)
- *  - fixed vertex data       -> DrawWriter::draw(vertices, {}, vertexCount)
+ *  - dynamic vertex data     -> DrawWriter::Vertices(writer) verts;
+ *                               verts.append(n) << ...;
+ *  - fixed vertex data       -> writer.draw(vertices, {}, vertexCount)
  *
  * CommandBuffer::drawIndexed(vertices, indices)
  *  - dynamic vertex data     -> unsupported
- *  - fixed vertex,index data -> DrawWriter::draw(vertices, indices, indexCount)
+ *  - fixed vertex,index data -> writer.drawIndexed(vertices, indices, indexCount)
  *
  * CommandBuffer::drawInstances(vertices, instances)
  *  - dynamic instance data + fixed vertex data        ->
- *          DrawWriter::setInstanceTemplate(vertices, {}, vertexCount) then
- *          DrawWriter::appendInstances(n)
+ *        DrawWriter::Instances instances(writer, vertices, {}, vertexCount);
+ *        instances.append(n) << ...;
  *  - fixed vertex and instance data                   ->
- *          DrawWriter::setInstanceTemplate(vertices, {}, vertexCount) then
- *          DrawWriter::drawInstanced(instances, instanceCount)
+ *        writer.drawInstanced(vertices, vertexCount, instances, instanceCount)
  *
  * CommandBuffer::drawIndexedInstanced(vertices, indices, instances)
  *  - dynamic instance data + fixed vertex, index data ->
- *          DrawWriter::setInstanceTemplate(vertices, indices, indexCount) then
- *          DrawWriter::appendInstances(n)
+ *        DrawWriter::Instances instances(writer, vertices, indices, indexCount);
+ *        instances.append(n) << ...;
  *  - fixed vertex, index, and instance data           ->
- *          DrawWriter::setInstanceTemplate(vertices, indices, indexCount) then
- *          DrawWriter::drawInstanced(instances, instanceCount)
+ *        writer.drawIndexedInstanced(vertices, indices, indexCount, instances, instanceCount)
  */
 class DrawWriter {
 public:
-    // NOTE: This constructor creates a writer that has 0 vertex and instance stride, so can only
-    // be used to draw triangles with pipelines that rely solely on the vertex and instance ID.
+    // NOTE: This constructor creates a writer that defaults 0 vertex and instance stride, so
+    // 'newPipelineState()' must be called once the pipeline properties are known before it's used.
     DrawWriter(DrawDispatcher*, DrawBufferManager*);
 
     DrawWriter(DrawDispatcher*, DrawBufferManager*,
@@ -69,126 +68,116 @@ class DrawWriter {
 
     DrawBufferManager* bufferManager() { return fManager; }
 
-    // Notify the DrawWriter that dynamic state that does not affect the pipeline needs to be
-    // changed. This issues draw calls for pending vertex/instance data that referred to the old
-    // state, so this must be called *before* changing the dynamic state.
-    //
-    // This preserves the last bound buffers and accounts for any offsets using the base vertex or
-    // base instance passed to draw calls to avoid re-binding buffers unnecessarily.
-    void newDynamicState();
+    // Issue draw calls for any pending vertex and instance data collected by the writer.
+    // Use either flush() or newDynamicState() based on context and readability.
+    void flush();
+    void newDynamicState() { this->flush(); }
 
     // Notify the DrawWriter that a new pipeline needs to be bound, providing the primitive type and
     // attribute strides of that pipeline. This issues draw calls for pending data that relied on
     // the old pipeline, so this must be called *before* binding the new pipeline.
-    void newPipelineState(PrimitiveType type, size_t vertexStride, size_t instanceStride);
+    void newPipelineState(PrimitiveType type, size_t vertexStride, size_t instanceStride) {
+        this->flush();
+        fPrimitiveType = type;
+        fVertexStride = vertexStride;
+        fInstanceStride = instanceStride;
 
-    // Issue draw calls for any pending vertex and instance data collected by the writer.
-    void flush() { this->drawPendingVertices(); }
+        // NOTE: resetting pending base is sufficient to redo bindings for vertex/instance data that
+        // is later appended but doesn't invalidate bindings for fixed buffers that might not need
+        // to change between pipelines.
+        fPendingBase = 0;
+        SkASSERT(fPendingCount == 0);
+    }
 
     // Collects new vertex data for a call to CommandBuffer::draw(). Automatically accumulates
     // vertex data into a buffer, issuing draw and bind calls as needed when a new buffer is
-    // required, so that it is seamless to the caller.
+    // required, so that it is seamless to the caller. The draws do not use instances or indices.
     //
-    // Since this accumulates vertex data (and does not use instances or indices), this overrides
-    // the instance template when finally drawn.
+    // Usage (assuming writer has already had 'newPipelineState()' called with correct strides):
+    //    DrawWriter::Vertices verts{writer};
+    //    verts.append(n) << x << y << ...;
     //
     // This should not be used when the vertex stride is 0.
-    VertexWriter appendVertices(unsigned int numVertices) {
-        SkASSERT(fVertexStride > 0);
-        return this->appendData(VertexMode::kVertices, fVertexStride, numVertices);
-    }
+    class Vertices;
 
     // Collects new instance data for a call to CommandBuffer::drawInstanced() or
-    // drawIndexedInstanced(). The specific draw call that's issued depends on the buffers passed to
-    // setInstanceTemplate(). If the template has a non-null index buffer, the eventual draw calls
-    // correspond to drawindexedInstanced(), otherwise to drawInstanced().
-    //
-    // Like appendVertices(), this automatically manages an internal instance buffer and merges
+    // drawIndexedInstanced(). The specific draw call that's issued depends on if a non-null index
+    // buffer is provided for the template. Like DrawWriter::Vertices, this automatically merges
     // the appended data into as few buffer binds and draw calls as possible, while remaining
     // seamless to the caller.
     //
-    // This requires that an instance template be specified before appending instance data. However,
-    // the fixed vertex buffer can be null (or have a stride of 0) if the vertex shader only relies
-    // on the vertex ID and no other per-vertex data.
+    // Usage for drawInstanced (assuming writer has correct strides):
+    //    DrawWriter::Instances instances{writer, fixedVerts, {}, fixedVertexCount};
+    //    instances.append(n) << foo << bar << ...;
     //
-    // This should not be used when the instance stride is 0.
-    VertexWriter appendInstances(unsigned int numInstances) {
-        SkASSERT(fInstanceStride > 0);
-        return this->appendData(VertexMode::kInstances, fInstanceStride, numInstances);
-    }
-
-    // Set the fixed vertex and index buffers referenced when appending instance data or calling
-    // drawIndexed(). 'count' is the number of vertices in the template, which is either the
-    // vertex count (when 'indices' has a null buffer), or the index count when 'indices' are
-    // provided.
-    void setInstanceTemplate(BindBufferInfo vertices, BindBufferInfo indices, unsigned int count) {
-        this->setTemplateInternal(vertices, indices, count, /*drawPending=*/true);
-    }
+    // Usage for drawIndexedInstanced:
+    //    DrawWriter::Instances instances{writer, fixedVerts, fixedIndices, fixedIndexCount};
+    //    instances.append(n) << foo << bar << ...;
+    //
+    // This should not be used when the instance stride is 0. However, the fixed vertex buffer can
+    // be null (or have a stride of 0) if the vertex shader only relies on the vertex ID and no
+    // other per-vertex data.
+    class Instances;
 
-    // Issues a draw with fully specified data. This can be used when all instance data has already
+    // Issues a draws with fully specified data. This can be used when all instance data has already
     // been written to known buffers, or when the vertex shader only depends on the vertex or
-    // instance IDs.
-    //
-    // The specific draw call issued depends on the buffers set via 'setInstanceTemplate' and the
-    // 'instances' parameter. If the template has a non-null index buffer, it will use
-    // drawIndexedInstanced(), otherwise it will use drawInstanced().
+    // instance IDs. To keep things simple, these helpers do not accept parameters for base vertices
+    // or instances; if needed, this can be accounted for in the BindBufferInfos provided.
     //
     // This will not merge with any already appended instance or vertex data, pending data is issued
     // in its own draw call first.
-    void drawInstanced(BindBufferInfo instances, unsigned int count) {
-        this->drawPendingVertices();
-        this->drawInternal(instances, 0, count);
+    void draw(BindBufferInfo vertices, unsigned int vertexCount) {
+        this->bindAndFlush(vertices, {}, {}, 0, vertexCount);
     }
-
-    // Issues a non-instanced draw call with existing, fully specified data. The specific draw call
-    // depends on the buffers passed to this function. If a non-null index buffer is specified, it
-    // will use drawIndexed(), otherwise it will use the vertex-only draw().
-    //
-    // This will not merge with any existing appended instance or vertex data, which will issue it
-    // own draw call. This overrides what was last set for the instance template.
-    void draw(BindBufferInfo vertices, BindBufferInfo indices, unsigned int count) {
-        this->setInstanceTemplate(vertices, indices, count); // will draw pending if needed
-        this->drawInstanced({}, 1);
+    void drawIndexed(BindBufferInfo vertices, BindBufferInfo indices, unsigned int indexCount) {
+        this->bindAndFlush(vertices, indices, {}, 0, indexCount);
+    }
+    void drawInstanced(BindBufferInfo vertices, unsigned int vertexCount,
+                       BindBufferInfo instances, unsigned int instanceCount) {
+        this->bindAndFlush(vertices, {}, instances, vertexCount, instanceCount);
+    }
+    void drawIndexedInstanced(BindBufferInfo vertices, BindBufferInfo indices,
+                              unsigned int indexCount, BindBufferInfo instances,
+                              unsigned int instanceCount) {
+        this->bindAndFlush(vertices, indices, instances, indexCount, instanceCount);
     }
 
 private:
-    enum class VertexMode : unsigned {
-        kVertices, kInstances
-    };
-
     // Both of these pointers must outlive the DrawWriter.
     DrawDispatcher*    fDispatcher;
     DrawBufferManager* fManager;
 
-    // Must be constructed to match the pipeline that's bound
+    // Pipeline state matching currently bound pipeline
     PrimitiveType fPrimitiveType;
     size_t fVertexStride;
     size_t fInstanceStride;
 
-    // State tracking appended vertices or instances
-    VertexMode     fPendingMode       = VertexMode::kVertices;
-    unsigned int   fPendingCount      = 0; // vertex or instance count depending on mode
-    unsigned int   fPendingBaseVertex = 0; // or instance
-    BindBufferInfo fPendingAttrs      = {};
-
-    // State to track the instance template that is re-used across drawn instances. These are not
-    // yet bound if fFixedBuffersDirty is true. Non-instanced draw buffers (e.g. draw() and
-    // drawIndexed()) are treated as drawing one instance, with no extra instance attributes.
-    BindBufferInfo fFixedVertexBuffer = {};
-    BindBufferInfo fFixedIndexBuffer  = {};
-    unsigned int   fFixedVertexCount  = 0; // or index count if fFixedIndexBuffer is non-null
-
-    bool fFixedBuffersDirty = true;
-
-    // Will either be 'fPendingAttrData' or the arg last passed to drawInstanced(), since it may
-    // change even if the fixed vertex and index buffers have not.
-    BindBufferInfo fLastInstanceBuffer = {};
-
-    VertexWriter appendData(VertexMode mode, size_t stride, unsigned int count);
-    void setTemplateInternal(BindBufferInfo vertices, BindBufferInfo indices,
-                             unsigned int count, bool drawPending);
-    void drawInternal(BindBufferInfo instances, unsigned int base, unsigned int instanceCount);
-    void drawPendingVertices();
+    /// Draw buffer binding state for pending draws
+    BindBufferInfo fVertices;
+    BindBufferInfo fIndices;
+    BindBufferInfo fInstances;
+    // Vertex/index count for [pseudo]-instanced rendering:
+    // == 0 is vertex-only drawing; > 0 is regular instanced drawing
+    unsigned int fTemplateCount;
+
+    unsigned int fPendingCount; // # of vertices or instances (depending on mode) to be drawn
+    unsigned int fPendingBase; // vertex/instance offset (depending on mode) applied to buffer
+    bool fPendingBufferBinds; // true if {fVertices,fIndices,fInstances} has changed since last draw
+
+    void setTemplate(BindBufferInfo vertices, BindBufferInfo indices, BindBufferInfo instances,
+                     unsigned int templateCount);
+    void bindAndFlush(BindBufferInfo vertices, BindBufferInfo indices, BindBufferInfo instances,
+                      unsigned int templateCount, unsigned int drawCount) {
+        this->setTemplate(vertices, indices, instances, templateCount);
+        fPendingBase = 0;
+        fPendingCount = drawCount;
+        this->flush();
+    }
+
+    // RAII - Sets the DrawWriter's template and marks the writer in append mode (disabling direct
+    // draws until the Appender is destructed).
+    class Appender;
+    SkDEBUGCODE(const Appender* fAppender = nullptr;)
 };
 
 // Mirrors the CommandBuffer API, since a DrawWriter is meant to aggregate and then map onto
@@ -214,6 +203,54 @@ class DrawDispatcher {
                                       unsigned int instanceCount) = 0;
 };
 
+// Appender implementations for DrawWriter that set the template on creation and provide a
+// template-specific API to accumulate vertex/instance data.
+class DrawWriter::Appender {
+public:
+    Appender(DrawWriter& w) : fWriter(w) {
+        SkASSERT(!w.fAppender);
+        SkDEBUGCODE(w.fAppender = this;)
+    }
+
+    ~Appender() {
+        SkASSERT(fWriter.fAppender == this);
+        SkDEBUGCODE(fWriter.fAppender = nullptr;)
+    }
+
+protected:
+    DrawWriter& fWriter;
+
+    VertexWriter append(unsigned int count, size_t stride, BindBufferInfo& target);
+};
+
+class DrawWriter::Vertices : private DrawWriter::Appender {
+public:
+    Vertices(DrawWriter& w) : Appender(w) {
+        SkASSERT(w.fVertexStride > 0);
+        w.setTemplate(w.fVertices, {}, {}, 0);
+    }
+
+    VertexWriter append(unsigned int count) {
+        return this->Appender::append(count, fWriter.fVertexStride, fWriter.fVertices);
+    }
+};
+
+class DrawWriter::Instances : private DrawWriter::Appender {
+public:
+    Instances(DrawWriter& w,
+              BindBufferInfo vertices,
+              BindBufferInfo indices,
+              unsigned int vertexCount)
+            : Appender(w) {
+        SkASSERT(w.fInstanceStride > 0);
+        w.setTemplate(vertices, indices, w.fInstances, vertexCount);
+    }
+
+    VertexWriter append(unsigned int count) {
+        return this->Appender::append(count, fWriter.fInstanceStride, fWriter.fInstances);
+    }
+};
+
 } // namespace skgpu
 
 #endif // skgpu_DrawWriter_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/GlobalCache.cpp b/third_party/skia/experimental/graphite/src/GlobalCache.cpp
new file mode 100644
index 0000000000000..9950f44980e54
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/GlobalCache.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/GlobalCache.h"
+
+#include "src/core/SkShaderCodeDictionary.h"
+
+namespace skgpu {
+
+GlobalCache::GlobalCache() : fShaderCodeDictionary(std::make_unique<SkShaderCodeDictionary>()) {}
+
+GlobalCache::~GlobalCache() {};
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/GlobalCache.h b/third_party/skia/experimental/graphite/src/GlobalCache.h
new file mode 100644
index 0000000000000..1d977cac77128
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/GlobalCache.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_GlobalCache_DEFINED
+#define skgpu_GlobalCache_DEFINED
+
+#include "include/core/SkRefCnt.h"
+
+class SkShaderCodeDictionary;
+
+namespace skgpu {
+
+// TODO: This class needs to be thread safe. In the current version there is no thread safety and
+// we need to go back and add protection around access to any of its memebers.
+class GlobalCache : public SkRefCnt {
+public:
+    GlobalCache();
+    ~GlobalCache() override;
+
+    SkShaderCodeDictionary* shaderCodeDictionary() const { return fShaderCodeDictionary.get(); }
+
+private:
+    std::unique_ptr<SkShaderCodeDictionary> fShaderCodeDictionary;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_GlobalCache_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/Gpu.cpp b/third_party/skia/experimental/graphite/src/Gpu.cpp
index 41120f11d778a..6a1ebd3b7c45b 100644
--- a/third_party/skia/experimental/graphite/src/Gpu.cpp
+++ b/third_party/skia/experimental/graphite/src/Gpu.cpp
@@ -12,6 +12,7 @@
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
 #include "experimental/graphite/src/GpuWorkSubmission.h"
+#include "experimental/graphite/src/Log.h"
 #include "experimental/graphite/src/ResourceProvider.h"
 #include "src/sksl/SkSLCompiler.h"
 
@@ -36,7 +37,6 @@ Gpu::~Gpu() {
     // TODO: destroyResources instead?
     // TODO: how do we handle command buffers that haven't been submitted yet?
     this->checkForFinishedWork(SyncToCpu::kYes);
-    fResourceProvider.reset();
 }
 
 void Gpu::initCompiler() {
@@ -52,7 +52,11 @@ bool Gpu::submit(sk_sp<CommandBuffer> commandBuffer) {
         return false;
     }
 
-    SkDEBUGCODE(if (!commandBuffer->hasWork()) SkDebugf("Submitting empty command buffer!\n");)
+#ifdef SK_DEBUG
+    if (!commandBuffer->hasWork()) {
+        SKGPU_LOG_W("Submitting empty command buffer!");
+    }
+#endif
 
     return this->onSubmit(std::move(commandBuffer));
 }
diff --git a/third_party/skia/experimental/graphite/src/Gpu.h b/third_party/skia/experimental/graphite/src/Gpu.h
index 9750bb3ef12a1..004be6716e669 100644
--- a/third_party/skia/experimental/graphite/src/Gpu.h
+++ b/third_party/skia/experimental/graphite/src/Gpu.h
@@ -23,10 +23,16 @@ namespace skgpu {
 class BackendTexture;
 class Caps;
 class CommandBuffer;
+class GlobalCache;
 class GpuWorkSubmission;
 class ResourceProvider;
+class SingleOwner;
 class TextureInfo;
 
+// TODO: Figure out if we need to fission Gpu into parts that are needed by a Recorder and parts
+// that are needed only by the Context. In general the Recorder part of Gpu should not be stateful
+// as it will be shared and used by all Recorders. We also don't need calls like submit on the
+// Recorders.
 class Gpu : public SkRefCnt {
 public:
     ~Gpu() override;
@@ -39,7 +45,8 @@ class Gpu : public SkRefCnt {
 
     SkSL::Compiler* shaderCompiler() const { return fCompiler.get(); }
 
-    ResourceProvider* resourceProvider() const { return fResourceProvider.get(); }
+    virtual std::unique_ptr<ResourceProvider> makeResourceProvider(sk_sp<GlobalCache>,
+                                                                   SingleOwner*) const = 0;
 
     bool submit(sk_sp<CommandBuffer>);
     void checkForFinishedWork(SyncToCpu);
@@ -58,8 +65,6 @@ class Gpu : public SkRefCnt {
     // Subclass must call this to initialize compiler in its constructor.
     void initCompiler();
 
-    std::unique_ptr<ResourceProvider> fResourceProvider;
-
     using OutstandingSubmission = std::unique_ptr<GpuWorkSubmission>;
     SkDeque fOutstandingSubmissions;
 
diff --git a/third_party/skia/experimental/graphite/src/GraphicsPipeline.cpp b/third_party/skia/experimental/graphite/src/GraphicsPipeline.cpp
index 1e5064325d33e..03afb0cb8bede 100644
--- a/third_party/skia/experimental/graphite/src/GraphicsPipeline.cpp
+++ b/third_party/skia/experimental/graphite/src/GraphicsPipeline.cpp
@@ -9,7 +9,7 @@
 
 namespace skgpu {
 
-GraphicsPipeline::GraphicsPipeline() {
+GraphicsPipeline::GraphicsPipeline(const Gpu* gpu) : Resource(gpu) {
 }
 
 GraphicsPipeline::~GraphicsPipeline() {
diff --git a/third_party/skia/experimental/graphite/src/GraphicsPipeline.h b/third_party/skia/experimental/graphite/src/GraphicsPipeline.h
index 3480d00a05f2f..41d35e669b821 100644
--- a/third_party/skia/experimental/graphite/src/GraphicsPipeline.h
+++ b/third_party/skia/experimental/graphite/src/GraphicsPipeline.h
@@ -8,7 +8,7 @@
 #ifndef skgpu_GraphicsPipeline_DEFINED
 #define skgpu_GraphicsPipeline_DEFINED
 
-#include "include/core/SkRefCnt.h"
+#include "experimental/graphite/src/Resource.h"
 
 namespace skgpu {
 
@@ -22,12 +22,12 @@ namespace skgpu {
  * A GraphicsPipeline is created from the combination of a GraphicsPipelineDesc (representing draw
  * specific configuration) and a RenderPassDesc (representing the target of the draw).
  */
-class GraphicsPipeline : public SkRefCnt {
+class GraphicsPipeline : public Resource {
 public:
     ~GraphicsPipeline() override;
 
 protected:
-    GraphicsPipeline();
+    GraphicsPipeline(const Gpu*);
 
 private:
 };
diff --git a/third_party/skia/experimental/graphite/src/GraphicsPipelineDesc.h b/third_party/skia/experimental/graphite/src/GraphicsPipelineDesc.h
index 6b900b071cde2..1cd368bc7e7a9 100644
--- a/third_party/skia/experimental/graphite/src/GraphicsPipelineDesc.h
+++ b/third_party/skia/experimental/graphite/src/GraphicsPipelineDesc.h
@@ -11,11 +11,11 @@
 #include "include/core/SkTypes.h"
 
 #include "experimental/graphite/src/Attribute.h"
-#include "experimental/graphite/src/ContextUtils.h"
 #include "experimental/graphite/src/DrawTypes.h"
 #include "include/core/SkSpan.h"
 #include "include/private/SkOpts_spi.h"
 #include "include/private/SkTArray.h"
+#include "include/private/SkUniquePaintParamsID.h"
 
 #include <array>
 namespace skgpu {
@@ -43,17 +43,17 @@ class GraphicsPipelineDesc {
     // Describes the geometric portion of the pipeline's program and the pipeline's fixed state
     // (except for renderpass-level state that will never change between draws).
     const RenderStep* renderStep() const { return fRenderStep; }
-    // Key describing the color shading tree of the pipeline's program
-    Combination shaderCombo() const { return fCombination; }
+    // UniqueID of the required PaintParams
+    SkUniquePaintParamsID paintParamsID() const { return fUniqueID; }
 
-    void setProgram(const RenderStep* step, const Combination& shaderCombo) {
+    void setProgram(const RenderStep* step, SkUniquePaintParamsID uniqueID) {
         SkASSERT(step);
         fRenderStep = step;
-        fCombination = shaderCombo;
+        fUniqueID = uniqueID;
 
         uintptr_t addr = reinterpret_cast<uintptr_t>(fRenderStep);
         memcpy(fKey.data(), &addr, sizeof(uintptr_t));
-        fKey[kWords - 1] = shaderCombo.key();
+        fKey[kWords - 1] = fUniqueID.asUInt();
     }
 
     struct Hash {
@@ -80,11 +80,7 @@ class GraphicsPipelineDesc {
     // the GraphicsPipeline.
     const RenderStep* fRenderStep = nullptr;
 
-    // TODO: Right now the Combination is roughly the equivalent of the PaintBlob description, so
-    // eventually it won't be a fixed size, as it can eventually represent arbitrary shader trees.
-    // However, in that world, each PaintBlob structure will have a unique ID and a map from ID to
-    // blob, so the GraphicsPipelineDesc can be reduced to just storing RenderStep + unique ID int.
-    Combination fCombination;
+    SkUniquePaintParamsID fUniqueID;
 };
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/GraphiteResourceKey.cpp b/third_party/skia/experimental/graphite/src/GraphiteResourceKey.cpp
new file mode 100644
index 0000000000000..6846d5a0118b6
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/GraphiteResourceKey.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/GraphiteResourceKey.h"
+
+namespace skgpu {
+
+ResourceType GraphiteResourceKey::GenerateResourceType() {
+    static std::atomic<int32_t> nextType{ResourceKey::kInvalidDomain + 1};
+
+    int32_t type = nextType.fetch_add(1, std::memory_order_relaxed);
+    if (type > SkTo<int32_t>(UINT16_MAX)) {
+        SK_ABORT("Too many Graphite Resource Types");
+    }
+
+    return static_cast<ResourceType>(type);
+}
+
+} // namespace skgpu
+
diff --git a/third_party/skia/experimental/graphite/src/GraphiteResourceKey.h b/third_party/skia/experimental/graphite/src/GraphiteResourceKey.h
new file mode 100644
index 0000000000000..c525e5a6f1060
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/GraphiteResourceKey.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_GraphiteResourceKey_DEFINED
+#define skgpu_GraphiteResourceKey_DEFINED
+
+#include "experimental/graphite/src/ResourceTypes.h"
+#include "src/gpu/ResourceKey.h"
+
+namespace skgpu {
+
+class GraphiteResourceKey : public skgpu::ResourceKey {
+public:
+    /** Generate a unique ResourceType. */
+    static ResourceType GenerateResourceType();
+
+    /** Creates an invalid key. It must be initialized using a Builder object before use. */
+    GraphiteResourceKey() : fShareable(Shareable::kNo) {}
+
+    GraphiteResourceKey(const GraphiteResourceKey& that) { *this = that; }
+
+    /** reset() returns the key to the invalid state. */
+    using ResourceKey::reset;
+
+    using ResourceKey::isValid;
+
+    ResourceType resourceType() const { return this->domain(); }
+
+    Shareable shareable() const { return fShareable; }
+
+    GraphiteResourceKey& operator=(const GraphiteResourceKey& that) {
+        this->ResourceKey::operator=(that);
+        return *this;
+    }
+
+    bool operator==(const GraphiteResourceKey& that) const {
+        bool result = this->ResourceKey::operator==(that);
+        SkASSERT(result == (fShareable == that.fShareable));
+        return result;
+    }
+    bool operator!=(const GraphiteResourceKey& that) const {
+        return !(*this == that);
+    }
+
+    class Builder : public ResourceKey::Builder {
+    public:
+        Builder(GraphiteResourceKey* key, ResourceType type, int data32Count, Shareable shareable)
+                : ResourceKey::Builder(key, type, data32Count) {
+            key->fShareable = shareable;
+        }
+    };
+
+private:
+    Shareable fShareable;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_GraphiteResourceKey_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/Image_Graphite.h b/third_party/skia/experimental/graphite/src/Image_Graphite.h
index d81120c9ccceb..e44476838b45f 100644
--- a/third_party/skia/experimental/graphite/src/Image_Graphite.h
+++ b/third_party/skia/experimental/graphite/src/Image_Graphite.h
@@ -10,6 +10,8 @@
 
 #include "src/image/SkImage_Base.h"
 
+#include "experimental/graphite/src/TextureProxyView.h"
+
 namespace skgpu {
 
 class Image_Graphite final : public SkImage_Base {
@@ -65,6 +67,12 @@ class Image_Graphite final : public SkImage_Base {
             const SkMatrix&,
             const SkRect* subset,
             const SkRect* domain) const override;
+
+    std::tuple<TextureProxyView, SkColorType> onAsView(
+            Recorder*,
+            Mipmapped) const /*override*/ {
+        return {};
+    }
 #endif
 
 };
diff --git a/third_party/skia/experimental/graphite/src/Log.h b/third_party/skia/experimental/graphite/src/Log.h
new file mode 100644
index 0000000000000..a60e1ef47217e
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/Log.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_Log_DEFINED
+#define skgpu_Log_DEFINED
+
+namespace skgpu {
+enum class Priority : int {
+    kError = 0,
+    kWarning = 1,
+    kDebug = 2,
+};
+};  // namespace skgpu
+
+#if !defined(SKGPU_LOWEST_ACTIVE_PRIORITY)
+#ifdef SK_DEBUG
+    #define SKGPU_LOWEST_ACTIVE_PRIORITY Priority::kWarning
+#else
+    #define SKGPU_LOWEST_ACTIVE_PRIORITY Priority::kError
+#endif
+#endif
+#define SKGPU_LOG(priority, fmt, ...) \
+    do { \
+        if (priority <= SKGPU_LOWEST_ACTIVE_PRIORITY) { \
+            SkDebugf("[graphite] " fmt "\n", ##__VA_ARGS__); \
+        } \
+    } while (0)
+#define SKGPU_LOG_E(fmt, ...) SKGPU_LOG(skgpu::Priority::kError, "** ERROR ** " fmt, ##__VA_ARGS__)
+#define SKGPU_LOG_W(fmt, ...) SKGPU_LOG(skgpu::Priority::kWarning, "WARNING - " fmt, ##__VA_ARGS__)
+#define SKGPU_LOG_D(fmt, ...) SKGPU_LOG(skgpu::Priority::kDebug, fmt, ##__VA_ARGS__)
+
+#endif // skgpu_Log_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/PaintParams.cpp b/third_party/skia/experimental/graphite/src/PaintParams.cpp
new file mode 100644
index 0000000000000..0f06db7056fca
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/PaintParams.cpp
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/PaintParams.h"
+
+#include "include/core/SkShader.h"
+#include "src/core/SkBlenderBase.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkPaintParamsKey.h"
+#include "src/shaders/SkShaderBase.h"
+
+namespace skgpu {
+
+PaintParams::PaintParams(const SkColor4f& color,
+                         sk_sp<SkBlender> blender,
+                         sk_sp<SkShader> shader)
+        : fColor(color)
+        , fBlender(std::move(blender))
+        , fShader(std::move(shader)) {}
+
+PaintParams::PaintParams(const SkPaint& paint)
+        : fColor(paint.getColor4f())
+        , fBlender(paint.refBlender())
+        , fShader(paint.refShader()) {}
+
+PaintParams::PaintParams(const PaintParams& other) = default;
+PaintParams::~PaintParams() = default;
+PaintParams& PaintParams::operator=(const PaintParams& other) = default;
+
+std::optional<SkBlendMode> PaintParams::asBlendMode() const {
+    return fBlender ? as_BB(fBlender)->asBlendMode()
+                    : SkBlendMode::kSrcOver;
+}
+
+sk_sp<SkBlender> PaintParams::refBlender() const { return fBlender; }
+
+sk_sp<SkShader> PaintParams::refShader() const { return fShader; }
+
+void PaintParams::toKey(SkShaderCodeDictionary* dict,
+                        SkBackend backend,
+                        SkPaintParamsKeyBuilder* builder,
+                        SkUniformBlock* uniformBlock) const {
+
+    if (fShader) {
+        as_SB(fShader)->addToKey(dict, backend, builder, uniformBlock);
+    } else {
+        SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, fColor);
+    }
+
+    if (fBlender) {
+        as_BB(fBlender)->addToKey(dict, backend, builder, uniformBlock);
+    } else {
+        BlendModeBlock::AddToKey(dict, backend, builder, uniformBlock, SkBlendMode::kSrcOver);
+    }
+
+    SkASSERT(builder->sizeInBytes() > 0);
+}
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/PaintParams.h b/third_party/skia/experimental/graphite/src/PaintParams.h
new file mode 100644
index 0000000000000..2ddcedc864524
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/PaintParams.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_PaintParams_DEFINED
+#define skgpu_PaintParams_DEFINED
+
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+
+enum class SkBackend : uint8_t;
+class SkPaintParamsKeyBuilder;
+class SkShader;
+class SkShaderCodeDictionary;
+class SkUniformBlock;
+
+namespace skgpu {
+
+// TBD: If occlusion culling is eliminated as a phase, we can easily move the paint conversion
+// back to Device when the command is recorded (similar to SkPaint -> GrPaint), and then
+// PaintParams is not required as an intermediate representation.
+// NOTE: Only represents the shading state of an SkPaint. Style and complex effects (mask filters,
+// image filters, path effects) must be handled higher up. AA is not tracked since everything is
+// assumed to be anti-aliased.
+class PaintParams {
+public:
+    PaintParams(const SkColor4f& color, sk_sp<SkBlender>, sk_sp<SkShader>);
+    explicit PaintParams(const SkPaint&);
+
+    PaintParams(const PaintParams&);
+    ~PaintParams();
+
+    PaintParams& operator=(const PaintParams&);
+
+    SkColor4f color() const { return fColor; }
+
+    std::optional<SkBlendMode> asBlendMode() const;
+    SkBlender* blender() const { return fBlender.get(); }
+    sk_sp<SkBlender> refBlender() const;
+
+    SkShader* shader() const { return fShader.get(); }
+    sk_sp<SkShader> refShader() const;
+
+    void toKey(SkShaderCodeDictionary*,
+               SkBackend,
+               SkPaintParamsKeyBuilder*,
+               SkUniformBlock*) const;
+
+private:
+    SkColor4f        fColor;
+    sk_sp<SkBlender> fBlender; // A nullptr here means SrcOver blending
+    sk_sp<SkShader>  fShader; // For now only use SkShader::asAGradient() when converting to GPU
+    // TODO: Will also store ColorFilter, dither, and any extra shader from an
+    // active clipShader().
+};
+
+} // namespace skgpu
+
+#endif // skgpu_PaintParams_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/Recorder.cpp b/third_party/skia/experimental/graphite/src/Recorder.cpp
index 4f322958d0780..5aa59e0e7ce34 100644
--- a/third_party/skia/experimental/graphite/src/Recorder.cpp
+++ b/third_party/skia/experimental/graphite/src/Recorder.cpp
@@ -7,53 +7,80 @@
 
 #include "experimental/graphite/include/Recorder.h"
 
-#include "experimental/graphite/include/Context.h"
 #include "experimental/graphite/include/Recording.h"
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
 #include "experimental/graphite/src/ContextPriv.h"
+#include "experimental/graphite/src/Device.h"
 #include "experimental/graphite/src/DrawBufferManager.h"
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/Gpu.h"
 #include "experimental/graphite/src/ResourceProvider.h"
+#include "experimental/graphite/src/TaskGraph.h"
 #include "experimental/graphite/src/UniformCache.h"
+#include "src/core/SkUniformData.h"
 
 namespace skgpu {
 
-Recorder::Recorder(sk_sp<Context> context)
-        : fContext(std::move(context))
-        , fUniformCache(new UniformCache)
-        , fDrawBufferManager(new DrawBufferManager(
-                fContext->priv().gpu()->resourceProvider(),
-                fContext->priv().gpu()->caps()->requiredUniformBufferAlignment())) {
-}
-
-Recorder::~Recorder() {}
-
-Context* Recorder::context() const {
-    return fContext.get();
-}
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
 
-UniformCache* Recorder::uniformCache() {
-    return fUniformCache.get();
-}
+Recorder::Recorder(sk_sp<Gpu> gpu, sk_sp<GlobalCache> globalCache)
+        : fGpu(std::move(gpu))
+        , fGraph(new TaskGraph)
+        , fUniformCache(new UniformCache) {
 
-DrawBufferManager* Recorder::drawBufferManager() {
-    return fDrawBufferManager.get();
+    fResourceProvider = fGpu->makeResourceProvider(std::move(globalCache), this->singleOwner());
+    fDrawBufferManager.reset(new DrawBufferManager(fResourceProvider.get(),
+                                                   fGpu->caps()->requiredUniformBufferAlignment()));
+    SkASSERT(fResourceProvider);
 }
 
-void Recorder::add(sk_sp<Task> task) {
-    fGraph.add(std::move(task));
+Recorder::~Recorder() {
+    ASSERT_SINGLE_OWNER
+    for (auto& device : fTrackedDevices) {
+        device->abandonRecorder();
+    }
 }
 
 std::unique_ptr<Recording> Recorder::snap() {
-    auto gpu = fContext->priv().gpu();
-    auto commandBuffer = gpu->resourceProvider()->createCommandBuffer();
+    ASSERT_SINGLE_OWNER
+    for (auto& device : fTrackedDevices) {
+        device->flushPendingWorkToRecorder();
+    }
+
+    auto commandBuffer = fResourceProvider->createCommandBuffer();
 
-    fGraph.addCommands(gpu->resourceProvider(), commandBuffer.get());
+    fGraph->addCommands(fResourceProvider.get(), commandBuffer.get());
     fDrawBufferManager->transferToCommandBuffer(commandBuffer.get());
 
-    fGraph.reset();
+    fGraph->reset();
     return std::unique_ptr<Recording>(new Recording(std::move(commandBuffer)));
 }
 
+void Recorder::registerDevice(Device* device) {
+    ASSERT_SINGLE_OWNER
+    fTrackedDevices.push_back(device);
+}
+
+void Recorder::deregisterDevice(const Device* device) {
+    ASSERT_SINGLE_OWNER
+    for (auto it = fTrackedDevices.begin(); it != fTrackedDevices.end(); it++) {
+        if (*it == device) {
+            fTrackedDevices.erase(it);
+            return;
+        }
+    }
+}
+
+#if GR_TEST_UTILS
+bool Recorder::deviceIsRegistered(Device* device) {
+    for (auto& currentDevice : fTrackedDevices) {
+        if (device == currentDevice) {
+            return true;
+        }
+    }
+    return false;
+}
+#endif
+
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/RecorderPriv.cpp b/third_party/skia/experimental/graphite/src/RecorderPriv.cpp
new file mode 100644
index 0000000000000..74271b5ae64a3
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/RecorderPriv.cpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/RecorderPriv.h"
+
+#include "experimental/graphite/src/Gpu.h"
+#include "experimental/graphite/src/TaskGraph.h"
+
+namespace skgpu {
+
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fRecorder->singleOwner())
+
+ResourceProvider* RecorderPriv::resourceProvider() const {
+    return fRecorder->fResourceProvider.get();
+}
+
+UniformCache* RecorderPriv::uniformCache() const {
+    return fRecorder->fUniformCache.get();
+}
+
+const Caps* RecorderPriv::caps() const {
+    return fRecorder->fGpu->caps();
+}
+
+DrawBufferManager* RecorderPriv::drawBufferManager() const {
+    return fRecorder->fDrawBufferManager.get();
+}
+
+void RecorderPriv::add(sk_sp<Task> task) {
+    ASSERT_SINGLE_OWNER
+    fRecorder->fGraph->add(std::move(task));
+}
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/RecorderPriv.h b/third_party/skia/experimental/graphite/src/RecorderPriv.h
new file mode 100644
index 0000000000000..aa58e20ffbc30
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/RecorderPriv.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_RecorderPriv_DEFINED
+#define skgpu_RecorderPriv_DEFINED
+
+#include "experimental/graphite/include/Recorder.h"
+
+namespace skgpu {
+
+class RecorderPriv {
+public:
+    void add(sk_sp<Task>);
+
+    ResourceProvider* resourceProvider() const;
+    UniformCache* uniformCache() const;
+    DrawBufferManager* drawBufferManager() const;
+    const Caps* caps() const;
+
+private:
+    explicit RecorderPriv(Recorder* recorder) : fRecorder(recorder) {}
+    RecorderPriv& operator=(const RecorderPriv&) = delete;
+
+    // No taking addresses of this type.
+    const RecorderPriv* operator&() const = delete;
+    RecorderPriv* operator&() = delete;
+
+    Recorder* fRecorder;
+
+    friend class Recorder;  // to construct/copy this type.
+
+};
+
+inline RecorderPriv Recorder::priv() {
+    return RecorderPriv(this);
+}
+
+inline const RecorderPriv Recorder::priv() const {  // NOLINT(readability-const-return-type)
+    return RecorderPriv(const_cast<Recorder*>(this));
+}
+
+} // namespace skgpu
+
+#endif // skgpu_RecorderPriv_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/RenderPassTask.cpp b/third_party/skia/experimental/graphite/src/RenderPassTask.cpp
index 51d8d2113b9ae..fb6f176558496 100644
--- a/third_party/skia/experimental/graphite/src/RenderPassTask.cpp
+++ b/third_party/skia/experimental/graphite/src/RenderPassTask.cpp
@@ -8,7 +8,9 @@
 #include "experimental/graphite/src/RenderPassTask.h"
 
 #include "experimental/graphite/src/CommandBuffer.h"
+#include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/DrawPass.h"
+#include "experimental/graphite/src/Log.h"
 #include "experimental/graphite/src/ResourceProvider.h"
 #include "experimental/graphite/src/Texture.h"
 #include "experimental/graphite/src/TextureProxy.h"
@@ -43,9 +45,9 @@ void RenderPassTask::addCommands(ResourceProvider* resourceProvider, CommandBuff
     // Instantiate the target
     if (fTarget) {
         if (!fTarget->instantiate(resourceProvider)) {
-            SkDebugf("WARNING: given invalid texture proxy. Will not create renderpass!\n");
-            SkDebugf("Dimensions are (%d, %d).\n", fTarget->dimensions().width(),
-                     fTarget->dimensions().height());
+            SKGPU_LOG_W("Given invalid texture proxy. Will not create renderpass!");
+            SKGPU_LOG_W("Dimensions are (%d, %d).",
+                        fTarget->dimensions().width(), fTarget->dimensions().height());
             return;
         }
     }
@@ -58,16 +60,16 @@ void RenderPassTask::addCommands(ResourceProvider* resourceProvider, CommandBuff
         SkASSERT(depthStencilTexture);
     }
 
-    commandBuffer->beginRenderPass(fRenderPassDesc, fTarget->refTexture(), nullptr,
-                                   std::move(depthStencilTexture));
+    if (commandBuffer->beginRenderPass(fRenderPassDesc, fTarget->refTexture(), nullptr,
+                                       std::move(depthStencilTexture))) {
+        // Assuming one draw pass per renderpasstask for now
+        SkASSERT(fDrawPasses.size() == 1);
+        for (const auto& drawPass: fDrawPasses) {
+            drawPass->addCommands(resourceProvider, commandBuffer, fRenderPassDesc);
+        }
 
-    // Assuming one draw pass per renderpasstask for now
-    SkASSERT(fDrawPasses.size() == 1);
-    for (const auto& drawPass: fDrawPasses) {
-        drawPass->addCommands(commandBuffer, resourceProvider);
+        commandBuffer->endRenderPass();
     }
-
-    commandBuffer->endRenderPass();
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/RenderPassTask.h b/third_party/skia/experimental/graphite/src/RenderPassTask.h
index 1d5ba4e79832a..720dced987f9e 100644
--- a/third_party/skia/experimental/graphite/src/RenderPassTask.h
+++ b/third_party/skia/experimental/graphite/src/RenderPassTask.h
@@ -16,6 +16,7 @@
 namespace skgpu {
 
 class CommandBuffer;
+class Context;
 class DrawPass;
 class ResourceProvider;
 
diff --git a/third_party/skia/experimental/graphite/src/Renderer.h b/third_party/skia/experimental/graphite/src/Renderer.h
index bbf251236ecba..6c7e0953e4d7a 100644
--- a/third_party/skia/experimental/graphite/src/Renderer.h
+++ b/third_party/skia/experimental/graphite/src/Renderer.h
@@ -12,23 +12,26 @@
 #include "experimental/graphite/src/DrawTypes.h"
 #include "experimental/graphite/src/EnumBitMask.h"
 #include "experimental/graphite/src/ResourceTypes.h"
-#include "experimental/graphite/src/Uniform.h"
 
 #include "include/core/SkSpan.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
+#include "src/core/SkUniform.h"
 
 #include <array>
 #include <initializer_list>
 #include <vector>
 
+struct SkIRect;
+enum class SkPathFillType;
+class SkUniformData;
+
 namespace skgpu {
 
 class DrawWriter;
 class ResourceProvider;
 class Shape;
 class Transform;
-class UniformData;
 
 enum class Layout;
 
@@ -39,7 +42,10 @@ class RenderStep {
     // The DrawWriter is configured with the vertex and instance strides of the RenderStep, and its
     // primitive type. The recorded draws will be executed with a graphics pipeline compatible with
     // this RenderStep.
-    virtual void writeVertices(DrawWriter*, const Transform&, const Shape&) const = 0;
+    virtual void writeVertices(DrawWriter*,
+                               const SkIRect& bounds,
+                               const Transform&,
+                               const Shape&) const = 0;
 
     // Write out the uniform values (aligned for the layout). These values will be de-duplicated
     // across all draws using the RenderStep before uploading to the GPU, but it can be assumed the
@@ -50,9 +56,10 @@ class RenderStep {
     // nice if we could remember the offsets for the layout/gpu and reuse them across draws.
     // Similarly, it would be nice if this could write into reusable storage and then DrawPass or
     // UniformCache handles making an sk_sp if we need to assign a new unique ID to the uniform data
-    virtual sk_sp<UniformData> writeUniforms(Layout layout,
-                                             const Transform&,
-                                             const Shape&) const = 0;
+    virtual sk_sp<SkUniformData> writeUniforms(Layout layout,
+                                               const SkIRect& bounds,
+                                               const Transform&,
+                                               const Shape&) const = 0;
 
     virtual const char* name()      const = 0;
 
@@ -93,7 +100,7 @@ class RenderStep {
 
     // The uniforms of a RenderStep are bound to the kRenderStep slot, the rest of the pipeline
     // may still use uniforms bound to other slots.
-    SkSpan<const Uniform>   uniforms()           const { return SkMakeSpan(fUniforms);      }
+    SkSpan<const SkUniform> uniforms()           const { return SkMakeSpan(fUniforms);      }
     SkSpan<const Attribute> vertexAttributes()   const { return SkMakeSpan(fVertexAttrs);   }
     SkSpan<const Attribute> instanceAttributes() const { return SkMakeSpan(fInstanceAttrs); }
 
@@ -118,7 +125,7 @@ class RenderStep {
     // entire vertex layout of the pipeline. This is not allowed to change, so can be provided to
     // the RenderStep constructor by subclasses.
     RenderStep(Mask<Flags> flags,
-               std::initializer_list<Uniform> uniforms,
+               std::initializer_list<SkUniform> uniforms,
                PrimitiveType primitiveType,
                DepthStencilSettings depthStencilSettings,
                std::initializer_list<Attribute> vertexAttrs,
@@ -155,13 +162,14 @@ class RenderStep {
     // could just have this be std::array and keep all attributes inline with the RenderStep memory.
     // On the other hand, the attributes are only needed when creating a new pipeline so it's not
     // that performance sensitive.
-    std::vector<Uniform>   fUniforms;
+    std::vector<SkUniform> fUniforms;
     std::vector<Attribute> fVertexAttrs;
     std::vector<Attribute> fInstanceAttrs;
 
     size_t fVertexStride;   // derived from vertex attribute set
     size_t fInstanceStride; // derived from instance attribute set
 };
+SKGPU_MAKE_MASK_OPS(RenderStep::Flags);
 
 /**
  * The actual technique for rasterizing a high-level draw recorded in a DrawList is handled by a
@@ -183,8 +191,8 @@ class Renderer {
     // Graphite defines a limited set of renderers in order to increase likelihood of batching
     // across draw calls, and reduce the number of shader permutations required. These Renderers
     // are stateless singletons and remain alive for the entire program. Each Renderer corresponds
-    // to a specific recording function on DrawList.
-    static const Renderer& StencilAndFillPath();
+    // to a specific recording function on DrawList and fill type.
+    static const Renderer& StencilAndFillPath(SkPathFillType);
     // TODO: Not on the immediate sprint target, but show what needs to be added for DrawList's API
     // static const Renderer& FillConvexPath();
     // static const Renderer& StrokePath();
diff --git a/third_party/skia/experimental/graphite/src/Resource.cpp b/third_party/skia/experimental/graphite/src/Resource.cpp
new file mode 100644
index 0000000000000..49cf7b9f709dc
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/Resource.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/Resource.h"
+
+namespace skgpu {
+
+Resource::Resource(const Gpu* gpu) : fGpu(gpu), fUsageRefCnt(1), fCommandBufferRefCnt(0) {
+    // Normally the array index will always be set before the cache tries to read so there isn't
+    // a worry about this not being initialized. However, when we try to validate the cache in
+    // debug builds we may try to read a resources index before it has actually been set by the
+    // cache
+    SkDEBUGCODE(fCacheArrayIndex = -1);
+}
+
+Resource::~Resource() {
+    // The cache should have released or destroyed this resource.
+    SkASSERT(this->wasDestroyed());
+}
+
+void Resource::notifyARefIsZero(LastRemovedRef removedRef) const {
+    // TODO: Eventually we'll go through the cache to release the resource, but for now we just do
+    // this immediately.
+    SkASSERT(removedRef == LastRemovedRef::kUsageRef);
+    Resource* mutableThis = const_cast<Resource*>(this);
+    mutableThis->freeGpuData();
+}
+
+void Resource::freeGpuData() {
+    SkASSERT(fGpu);
+    this->onFreeGpuData();
+    fGpu = nullptr;
+    delete this;
+}
+
+} // namespace skgpu
+
diff --git a/third_party/skia/experimental/graphite/src/Resource.h b/third_party/skia/experimental/graphite/src/Resource.h
new file mode 100644
index 0000000000000..03613b562efe9
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/Resource.h
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_Resource_DEFINED
+#define skgpu_Resource_DEFINED
+
+#include "experimental/graphite/src/ResourceTypes.h"
+#include "include/core/SkTypes.h"
+
+#include <atomic>
+
+namespace skgpu {
+
+class Gpu;
+
+/**
+ * Base class for objects that can be kept in the ResourceCache.
+ */
+class Resource {
+public:
+    Resource(const Resource&) = delete;
+    Resource(Resource&&) = delete;
+    Resource& operator=(const Resource&) = delete;
+    Resource& operator=(Resource&&) = delete;
+
+    // Adds a usage ref to the resource. Named ref so we can easily manage usage refs with sk_sp.
+    void ref() const {
+        // Only the cache should be able to add the first usage ref to a resource.
+        SkASSERT(this->hasUsageRef());
+        // No barrier required.
+        (void)fUsageRefCnt.fetch_add(+1, std::memory_order_relaxed);
+    }
+
+    // Removes a usage ref from the resource
+    void unref() const {
+        SkASSERT(this->hasUsageRef());
+        // A release here acts in place of all releases we "should" have been doing in ref().
+        if (1 == fUsageRefCnt.fetch_add(-1, std::memory_order_acq_rel)) {
+            this->notifyARefIsZero(LastRemovedRef::kUsageRef);
+        }
+    }
+
+    // Adds a command buffer ref to the resource
+    void refCommandBuffer() const {
+        // No barrier required.
+        (void)fCommandBufferRefCnt.fetch_add(+1, std::memory_order_relaxed);
+    }
+
+    // Removes a command buffer ref from the resource
+    void unrefCommandBuffer() const {
+        SkASSERT(this->hasCommandBufferRef());
+        // A release here acts in place of all releases we "should" have been doing in ref().
+        if (1 == fCommandBufferRefCnt.fetch_add(-1, std::memory_order_acq_rel)) {
+            this->notifyARefIsZero(LastRemovedRef::kCommandBufferRef);
+        }
+    }
+
+    /**
+     * Tests whether a object has been abandoned or released. All objects will be in this state
+     * after their creating Context is destroyed or abandoned.
+     *
+     * @return true if the object has been released or abandoned,
+     *         false otherwise.
+     */
+    bool wasDestroyed() const { return fGpu == nullptr; }
+
+    int* accessCacheIndex()  const { return &fCacheArrayIndex; }
+
+    uint32_t timestamp() const { return fTimestamp; }
+    void setTimestamp(uint32_t ts) { fTimestamp = ts; }
+
+protected:
+    Resource(const Gpu*);
+    virtual ~Resource();
+
+    /** Overridden to free GPU resources in the backend API. */
+    virtual void onFreeGpuData() = 0;
+
+private:
+    bool hasUsageRef() const {
+        if (0 == fUsageRefCnt.load(std::memory_order_acquire)) {
+            // The acquire barrier is only really needed if we return true.  It
+            // prevents code conditioned on the result of hasUsageRef() from running until previous
+            // owners are all totally done calling unref().
+            return false;
+        }
+        return true;
+    }
+
+    bool hasCommandBufferRef() const {
+        if (0 == fCommandBufferRefCnt.load(std::memory_order_acquire)) {
+            // The acquire barrier is only really needed if we return true.  It
+            // prevents code conditioned on the result of hasCommandBufferRef() from running
+            // until previous owners are all totally done calling unrefCommandBuffer().
+            return false;
+        }
+        return true;
+    }
+
+    // Privileged method that allows going from ref count = 0 to ref count = 1.
+    void addInitialUsageRef() const {
+        SkASSERT(!this->hasUsageRef());
+        // No barrier required.
+        (void)fUsageRefCnt.fetch_add(+1, std::memory_order_relaxed);
+    }
+
+    void notifyARefIsZero(LastRemovedRef removedRef) const;
+
+    /**
+     * Frees the object in the underlying 3D API.
+     */
+    void freeGpuData();
+
+    // This is not ref'ed but abandon() or release() will be called before the Gpu object is
+    // destroyed. Those calls set will this to nullptr.
+    const Gpu* fGpu;
+
+    mutable std::atomic<int32_t> fUsageRefCnt;
+    mutable std::atomic<int32_t> fCommandBufferRefCnt;
+
+    // An index into a heap when this resource is purgeable or an array when not. This is maintained
+    // by the cache.
+    mutable int fCacheArrayIndex;
+    // This value reflects how recently this resource was accessed in the cache. This is maintained
+    // by the cache.
+    uint32_t fTimestamp;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_Resource_DEFINED
+
diff --git a/third_party/skia/experimental/graphite/src/ResourceCache.cpp b/third_party/skia/experimental/graphite/src/ResourceCache.cpp
new file mode 100644
index 0000000000000..7bd0344d73ab0
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/ResourceCache.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/ResourceCache.h"
+
+#include "experimental/graphite/src/Resource.h"
+#include "include/private/SingleOwner.h"
+
+namespace skgpu {
+
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fSingleOwner)
+
+ResourceCache::ResourceCache(SingleOwner* singleOwner) : fSingleOwner(singleOwner) {
+// TODO: Maybe when things start using ResourceCache, then like Ganesh the compiler won't complain
+// about not using fSingleOwner in Release builds and we can delete this.
+#ifndef SK_DEBUG
+    (void)fSingleOwner;
+#endif
+}
+
+void ResourceCache::insertResource(Resource* resource) {
+    ASSERT_SINGLE_OWNER
+    SkASSERT(resource);
+}
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/ResourceCache.h b/third_party/skia/experimental/graphite/src/ResourceCache.h
new file mode 100644
index 0000000000000..ac3e571665a01
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/ResourceCache.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_ResourceCache_DEFINED
+#define skgpu_ResourceCache_DEFINED
+
+#include "experimental/graphite/src/Resource.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTHash.h"
+#include "src/core/SkTDPQueue.h"
+
+namespace skgpu {
+
+class SingleOwner;
+
+class ResourceCache {
+public:
+    ResourceCache(SingleOwner*);
+
+    ResourceCache(const ResourceCache&) = delete;
+    ResourceCache(ResourceCache&&) = delete;
+    ResourceCache& operator=(const ResourceCache&) = delete;
+    ResourceCache& operator=(ResourceCache&&) = delete;
+
+    void insertResource(Resource*);
+
+private:
+    static bool CompareTimestamp(Resource* const& a, Resource* const& b) {
+        return a->timestamp() < b->timestamp();
+    }
+
+    static int* AccessResourceIndex(Resource* const& res) {
+        return res->accessCacheIndex();
+    }
+
+    using PurgeableQueue = SkTDPQueue<Resource*, CompareTimestamp, AccessResourceIndex>;
+    using ResourceArray = SkTDArray<Resource*>;
+
+    PurgeableQueue fPurgeableQueue;
+    ResourceArray fNonpurgeableResources;
+
+    SingleOwner* fSingleOwner = nullptr;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_ResourceCache_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/ResourceProvider.cpp b/third_party/skia/experimental/graphite/src/ResourceProvider.cpp
index e07b7b50f5a6a..fbf5b53d5897e 100644
--- a/third_party/skia/experimental/graphite/src/ResourceProvider.cpp
+++ b/third_party/skia/experimental/graphite/src/ResourceProvider.cpp
@@ -8,13 +8,23 @@
 #include "experimental/graphite/src/ResourceProvider.h"
 
 #include "experimental/graphite/src/Buffer.h"
+#include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
+#include "experimental/graphite/src/ContextPriv.h"
+#include "experimental/graphite/src/GlobalCache.h"
+#include "experimental/graphite/src/Gpu.h"
 #include "experimental/graphite/src/GraphicsPipeline.h"
+#include "experimental/graphite/src/Sampler.h"
 #include "experimental/graphite/src/Texture.h"
 
 namespace skgpu {
 
-ResourceProvider::ResourceProvider(const Gpu* gpu) : fGpu(gpu) {
+ResourceProvider::ResourceProvider(const Gpu* gpu,
+                                   sk_sp<GlobalCache> globalCache,
+                                   SingleOwner* singleOwner)
+        : fGpu(gpu)
+        , fResourceCache(singleOwner)
+        , fGlobalCache(std::move(globalCache)) {
     fGraphicsPipelineCache.reset(new GraphicsPipelineCache(this));
 }
 
@@ -23,8 +33,13 @@ ResourceProvider::~ResourceProvider() {
 }
 
 sk_sp<GraphicsPipeline> ResourceProvider::findOrCreateGraphicsPipeline(
-        const GraphicsPipelineDesc& desc) {
-    return fGraphicsPipelineCache->refPipeline(desc);
+        const GraphicsPipelineDesc& pipelineDesc,
+        const RenderPassDesc& renderPassDesc) {
+    return fGraphicsPipelineCache->refPipeline(fGpu->caps(), pipelineDesc, renderPassDesc);
+}
+
+SkShaderCodeDictionary* ResourceProvider::shaderCodeDictionary() const {
+    return fGlobalCache->shaderCodeDictionary();
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -48,15 +63,19 @@ void ResourceProvider::GraphicsPipelineCache::release() {
 }
 
 sk_sp<GraphicsPipeline> ResourceProvider::GraphicsPipelineCache::refPipeline(
-        const GraphicsPipelineDesc& desc) {
-    std::unique_ptr<Entry>* entry = fMap.find(desc);
+        const Caps* caps,
+        const GraphicsPipelineDesc& pipelineDesc,
+        const RenderPassDesc& renderPassDesc) {
+    UniqueKey pipelineKey = caps->makeGraphicsPipelineKey(pipelineDesc, renderPassDesc);
+
+	std::unique_ptr<Entry>* entry = fMap.find(pipelineKey);
 
     if (!entry) {
-        auto pipeline = fResourceProvider->onCreateGraphicsPipeline(desc);
+        auto pipeline = fResourceProvider->onCreateGraphicsPipeline(pipelineDesc, renderPassDesc);
         if (!pipeline) {
             return nullptr;
         }
-        entry = fMap.insert(desc, std::unique_ptr<Entry>(new Entry(std::move(pipeline))));
+        entry = fMap.insert(pipelineKey, std::unique_ptr<Entry>(new Entry(std::move(pipeline))));
     }
     return (*entry)->fPipeline;
 }
@@ -65,6 +84,12 @@ sk_sp<Texture> ResourceProvider::findOrCreateTexture(SkISize dimensions, const T
     return this->createTexture(dimensions, info);
 }
 
+sk_sp<Sampler> ResourceProvider::findOrCreateCompatibleSampler(const SkSamplingOptions& smplOptions,
+                                                               SkTileMode xTileMode,
+                                                               SkTileMode yTileMode) {
+    return this->createSampler(smplOptions, xTileMode, yTileMode);
+}
+
 sk_sp<Buffer> ResourceProvider::findOrCreateBuffer(size_t size,
                                                    BufferType type,
                                                    PrioritizeGpuReads prioritizeGpuReads) {
diff --git a/third_party/skia/experimental/graphite/src/ResourceProvider.h b/third_party/skia/experimental/graphite/src/ResourceProvider.h
index 954c9903071a3..46089f6f2402c 100644
--- a/third_party/skia/experimental/graphite/src/ResourceProvider.h
+++ b/third_party/skia/experimental/graphite/src/ResourceProvider.h
@@ -10,16 +10,25 @@
 
 #include "experimental/graphite/src/CommandBuffer.h"
 #include "experimental/graphite/src/GraphicsPipelineDesc.h"
+#include "experimental/graphite/src/ResourceCache.h"
 #include "experimental/graphite/src/ResourceTypes.h"
 #include "include/core/SkSize.h"
+#include "include/core/SkTileMode.h"
 #include "src/core/SkLRUCache.h"
+#include "src/gpu/ResourceKey.h"
+
+struct SkSamplingOptions;
+class SkShaderCodeDictionary;
 
 namespace skgpu {
 
 class BackendTexture;
 class Buffer;
+class Caps;
+class GlobalCache;
 class Gpu;
 class GraphicsPipeline;
+class Sampler;
 class Texture;
 class TextureInfo;
 
@@ -29,42 +38,62 @@ class ResourceProvider {
 
     virtual sk_sp<CommandBuffer> createCommandBuffer() = 0;
 
-    sk_sp<GraphicsPipeline> findOrCreateGraphicsPipeline(const GraphicsPipelineDesc&);
+    sk_sp<GraphicsPipeline> findOrCreateGraphicsPipeline(const GraphicsPipelineDesc&,
+                                                         const RenderPassDesc&);
 
     sk_sp<Texture> findOrCreateTexture(SkISize, const TextureInfo&);
     virtual sk_sp<Texture> createWrappedTexture(const BackendTexture&) = 0;
 
     sk_sp<Buffer> findOrCreateBuffer(size_t size, BufferType type, PrioritizeGpuReads);
 
+    sk_sp<Sampler> findOrCreateCompatibleSampler(const SkSamplingOptions&,
+                                                 SkTileMode xTileMode,
+                                                 SkTileMode yTileMode);
+
+    SkShaderCodeDictionary* shaderCodeDictionary() const;
+
 protected:
-    ResourceProvider(const Gpu* gpu);
+    ResourceProvider(const Gpu* gpu, sk_sp<GlobalCache>, SingleOwner* singleOwner);
 
     const Gpu* fGpu;
 
 private:
-    virtual sk_sp<GraphicsPipeline> onCreateGraphicsPipeline(const GraphicsPipelineDesc&) = 0;
+    virtual sk_sp<GraphicsPipeline> onCreateGraphicsPipeline(const GraphicsPipelineDesc&,
+                                                             const RenderPassDesc&) = 0;
     virtual sk_sp<Texture> createTexture(SkISize, const TextureInfo&) = 0;
     virtual sk_sp<Buffer> createBuffer(size_t size, BufferType type, PrioritizeGpuReads) = 0;
 
+    virtual sk_sp<Sampler> createSampler(const SkSamplingOptions&,
+                                         SkTileMode xTileMode,
+                                         SkTileMode yTileMode) = 0;
+
     class GraphicsPipelineCache {
     public:
         GraphicsPipelineCache(ResourceProvider* resourceProvider);
         ~GraphicsPipelineCache();
 
         void release();
-        sk_sp<GraphicsPipeline> refPipeline(const GraphicsPipelineDesc&);
+        sk_sp<GraphicsPipeline> refPipeline(const Caps* caps,
+                                            const GraphicsPipelineDesc&,
+                                            const RenderPassDesc&);
 
     private:
         struct Entry;
-
-        SkLRUCache<const GraphicsPipelineDesc,
-                   std::unique_ptr<Entry>,
-                   GraphicsPipelineDesc::Hash> fMap;
+        struct KeyHash {
+            uint32_t operator()(const UniqueKey& key) const {
+                return key.hash();
+            }
+        };
+        SkLRUCache<UniqueKey, std::unique_ptr<Entry>, KeyHash> fMap;
 
         ResourceProvider* fResourceProvider;
     };
 
+    ResourceCache fResourceCache;
+    sk_sp<GlobalCache> fGlobalCache;
+
     // Cache of GraphicsPipelines
+    // TODO: Move this onto GlobalCache
     std::unique_ptr<GraphicsPipelineCache> fGraphicsPipelineCache;
 };
 
diff --git a/third_party/skia/experimental/graphite/src/ResourceTypes.h b/third_party/skia/experimental/graphite/src/ResourceTypes.h
index 60a2c65c7c494..a3daf8287cd5c 100644
--- a/third_party/skia/experimental/graphite/src/ResourceTypes.h
+++ b/third_party/skia/experimental/graphite/src/ResourceTypes.h
@@ -56,6 +56,24 @@ enum class Ownership {
     kWrapped,
 };
 
+/** Uniquely identifies the type of resource that is cached with a GraphiteResourceKey. */
+using ResourceType = uint32_t;
+
+/**
+ * Can the resource be held by multiple users at the same time?
+ * For example, stencil buffers, pipelines, etc.
+ */
+enum class Shareable : bool {
+    kNo = false,
+    kYes = true,
+};
+
+/** This enum is used to notify the ResourceCache which type of ref just dropped to zero. */
+enum class LastRemovedRef {
+    kUsageRef,
+    kCommandBufferRef,
+};
+
 };  // namespace skgpu
 
 #endif // skgpu_ResourceTypes_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/Sampler.cpp b/third_party/skia/experimental/graphite/src/Sampler.cpp
new file mode 100644
index 0000000000000..2163bbb1404a8
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/Sampler.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/Sampler.h"
+
+namespace skgpu {
+
+Sampler::Sampler(const Gpu* gpu) : Resource(gpu) {}
+
+Sampler::~Sampler() {}
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/Sampler.h b/third_party/skia/experimental/graphite/src/Sampler.h
new file mode 100644
index 0000000000000..3b087c8ecdbae
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/Sampler.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_Sampler_DEFINED
+#define skgpu_Sampler_DEFINED
+
+#include "experimental/graphite/src/Resource.h"
+
+namespace skgpu {
+
+class Sampler : public Resource {
+public:
+    ~Sampler() override;
+
+protected:
+    Sampler(const Gpu*);
+
+private:
+};
+
+} // namepsace skgpu
+
+#endif // skgpu_Sampler_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/SkStuff.cpp b/third_party/skia/experimental/graphite/src/SkStuff.cpp
index 40dfdfc02c214..76a044658faaf 100644
--- a/third_party/skia/experimental/graphite/src/SkStuff.cpp
+++ b/third_party/skia/experimental/graphite/src/SkStuff.cpp
@@ -7,15 +7,79 @@
 
 #include "experimental/graphite/include/SkStuff.h"
 
+#include "experimental/graphite/include/BackendTexture.h"
+#include "experimental/graphite/include/Context.h"
 #include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/src/Caps.h"
+#include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/Device.h"
+#include "experimental/graphite/src/Gpu.h"
+#include "experimental/graphite/src/RecorderPriv.h"
+#include "experimental/graphite/src/ResourceProvider.h"
 #include "experimental/graphite/src/Surface_Graphite.h"
+#include "experimental/graphite/src/Texture.h"
+#include "experimental/graphite/src/TextureProxy.h"
 
-sk_sp<SkSurface> MakeGraphite(sk_sp<skgpu::Recorder> recorder, const SkImageInfo& ii) {
-    sk_sp<skgpu::Device> device = skgpu::Device::Make(std::move(recorder), ii);
+sk_sp<SkSurface> MakeGraphite(skgpu::Recorder* recorder, const SkImageInfo& ii) {
+    sk_sp<skgpu::Device> device = skgpu::Device::Make(recorder, ii);
     if (!device) {
         return nullptr;
     }
 
-    return sk_make_sp<skgpu::Surface_Graphite>(std::move(device));
+    return sk_make_sp<skgpu::Surface>(std::move(device));
+}
+
+static bool validate_backend_texture(const skgpu::Caps* caps,
+                                     const skgpu::BackendTexture& texture,
+                                     SkColorType ct) {
+    if (!texture.isValid()) {
+        return false;
+    }
+
+    const skgpu::TextureInfo& info = texture.info();
+    if (!caps->areColorTypeAndTextureInfoCompatible(ct, info)) {
+        return false;
+    }
+
+    if (!caps->isRenderable(info)) {
+        return false;
+    }
+    return true;
+}
+
+sk_sp<SkSurface> MakeGraphiteFromBackendTexture(skgpu::Recorder* recorder,
+                                                const skgpu::BackendTexture& beTexture,
+                                                SkColorType colorType,
+                                                sk_sp<SkColorSpace> colorSpace,
+                                                const SkSurfaceProps* props) {
+
+    if (!recorder) {
+        return nullptr;
+    }
+
+    if (!validate_backend_texture(recorder->priv().caps(),
+                                  beTexture,
+                                  colorType)) {
+        return nullptr;
+    }
+
+    sk_sp<skgpu::Texture> texture =
+            recorder->priv().resourceProvider()->createWrappedTexture(beTexture);
+
+    if (!texture) {
+        return nullptr;
+    }
+
+    sk_sp<skgpu::TextureProxy> proxy(new skgpu::TextureProxy(std::move(texture)));
+
+    sk_sp<skgpu::Device> device = skgpu::Device::Make(recorder,
+                                                      std::move(proxy),
+                                                      std::move(colorSpace),
+                                                      colorType,
+                                                      kPremul_SkAlphaType);
+    if (!device) {
+        return nullptr;
+    }
+
+    return sk_make_sp<skgpu::Surface>(std::move(device));
 }
diff --git a/third_party/skia/experimental/graphite/src/Surface_Graphite.cpp b/third_party/skia/experimental/graphite/src/Surface_Graphite.cpp
index e2a814b4b51fd..d0c33ced901d0 100644
--- a/third_party/skia/experimental/graphite/src/Surface_Graphite.cpp
+++ b/third_party/skia/experimental/graphite/src/Surface_Graphite.cpp
@@ -14,27 +14,38 @@
 
 namespace skgpu {
 
-Surface_Graphite::Surface_Graphite(sk_sp<Device> device)
+Surface::Surface(sk_sp<Device> device)
         : SkSurface_Base(device->width(), device->height(), &device->surfaceProps())
         , fDevice(std::move(device)) {
 }
 
-Surface_Graphite::~Surface_Graphite() {}
+Surface::~Surface() {}
 
-SkCanvas* Surface_Graphite::onNewCanvas() { return new SkCanvas(fDevice); }
+SkCanvas* Surface::onNewCanvas() { return new SkCanvas(fDevice); }
 
-sk_sp<SkSurface> Surface_Graphite::onNewSurface(const SkImageInfo& ii) {
-    return MakeGraphite(fDevice->refRecorder(), ii);
+sk_sp<SkSurface> Surface::onNewSurface(const SkImageInfo& ii) {
+    return MakeGraphite(fDevice->recorder(), ii);
 }
 
-sk_sp<SkImage> Surface_Graphite::onNewImageSnapshot(const SkIRect* subset) {
+sk_sp<SkImage> Surface::onNewImageSnapshot(const SkIRect* subset) {
     SkImageInfo ii = subset ? this->imageInfo().makeDimensions(subset->size())
                             : this->imageInfo();
 
     return sk_sp<Image_Graphite>(new Image_Graphite(ii));
 }
 
-void Surface_Graphite::onWritePixels(const SkPixmap&, int x, int y) {}
-bool Surface_Graphite::onCopyOnWrite(ContentChangeMode) { return true; }
+void Surface::onWritePixels(const SkPixmap& pixmap, int x, int y) {
+    fDevice->writePixels(pixmap, x, y);
+}
+
+bool Surface::onCopyOnWrite(ContentChangeMode) { return true; }
+
+bool Surface::onReadPixels(Context* context,
+                           Recorder* recorder,
+                           const SkPixmap& dst,
+                           int srcX,
+                           int srcY) {
+    return fDevice->readPixels(context, recorder, dst, srcX, srcY);
+}
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/Surface_Graphite.h b/third_party/skia/experimental/graphite/src/Surface_Graphite.h
index c26a311cc89e4..0faad2459f9af 100644
--- a/third_party/skia/experimental/graphite/src/Surface_Graphite.h
+++ b/third_party/skia/experimental/graphite/src/Surface_Graphite.h
@@ -12,18 +12,21 @@
 
 namespace skgpu {
 
+class Context;
 class Device;
+class Recorder;
 
-class Surface_Graphite final : public SkSurface_Base {
+class Surface final : public SkSurface_Base {
 public:
-    Surface_Graphite(sk_sp<Device>);
-    ~Surface_Graphite() override;
+    Surface(sk_sp<Device>);
+    ~Surface() override;
 
     SkCanvas* onNewCanvas() override;
     sk_sp<SkSurface> onNewSurface(const SkImageInfo&) override;
     sk_sp<SkImage> onNewImageSnapshot(const SkIRect* subset) override;
     void onWritePixels(const SkPixmap&, int x, int y) override;
     bool onCopyOnWrite(ContentChangeMode) override;
+    bool onReadPixels(Context*, Recorder*, const SkPixmap& dst, int srcX, int srcY);
 
 private:
     sk_sp<Device> fDevice;
diff --git a/third_party/skia/experimental/graphite/src/Texture.cpp b/third_party/skia/experimental/graphite/src/Texture.cpp
index 0f7a092de1b31..a9ac2951699cf 100644
--- a/third_party/skia/experimental/graphite/src/Texture.cpp
+++ b/third_party/skia/experimental/graphite/src/Texture.cpp
@@ -9,8 +9,8 @@
 
 namespace skgpu {
 
-Texture::Texture(SkISize dimensions, const TextureInfo& info, Ownership ownership)
-        : fDimensions(dimensions), fInfo(info), fOwnership(ownership) {}
+Texture::Texture(const Gpu* gpu, SkISize dimensions, const TextureInfo& info, Ownership ownership)
+        : Resource(gpu), fDimensions(dimensions), fInfo(info), fOwnership(ownership) {}
 
 Texture::~Texture() {}
 
diff --git a/third_party/skia/experimental/graphite/src/Texture.h b/third_party/skia/experimental/graphite/src/Texture.h
index 9a197f6681795..78242435881ae 100644
--- a/third_party/skia/experimental/graphite/src/Texture.h
+++ b/third_party/skia/experimental/graphite/src/Texture.h
@@ -9,13 +9,13 @@
 #define skgpu_Texture_DEFINED
 
 #include "experimental/graphite/include/TextureInfo.h"
+#include "experimental/graphite/src/Resource.h"
 #include "experimental/graphite/src/ResourceTypes.h"
-#include "include/core/SkRefCnt.h"
 #include "include/core/SkSize.h"
 
 namespace skgpu {
 
-class Texture : public SkRefCnt {
+class Texture : public Resource {
 public:
     ~Texture() override;
 
@@ -26,7 +26,7 @@ class Texture : public SkRefCnt {
     const TextureInfo& textureInfo() const { return fInfo; }
 
 protected:
-    Texture(SkISize dimensions, const TextureInfo& info, Ownership);
+    Texture(const Gpu*, SkISize dimensions, const TextureInfo& info, Ownership);
 
     Ownership ownership() const { return fOwnership; }
 
diff --git a/third_party/skia/experimental/graphite/src/TextureInfo.cpp b/third_party/skia/experimental/graphite/src/TextureInfo.cpp
index 5db2eabe0f008..3f56338ab7104 100644
--- a/third_party/skia/experimental/graphite/src/TextureInfo.cpp
+++ b/third_party/skia/experimental/graphite/src/TextureInfo.cpp
@@ -34,6 +34,9 @@ TextureInfo& TextureInfo::operator=(const TextureInfo& that) {
 }
 
 bool TextureInfo::operator==(const TextureInfo& that) const {
+    if (!this->isValid() && !that.isValid()) {
+        return true;
+    }
     if (!this->isValid() || !that.isValid()) {
         return false;
     }
diff --git a/third_party/skia/experimental/graphite/src/TextureProxy.cpp b/third_party/skia/experimental/graphite/src/TextureProxy.cpp
index 9e77456acc302..f71fc03cfe6c3 100644
--- a/third_party/skia/experimental/graphite/src/TextureProxy.cpp
+++ b/third_party/skia/experimental/graphite/src/TextureProxy.cpp
@@ -15,6 +15,11 @@ namespace skgpu {
 TextureProxy::TextureProxy(SkISize dimensions, const TextureInfo& info)
         : fDimensions(dimensions), fInfo(info) {}
 
+TextureProxy::TextureProxy(sk_sp<Texture> texture)
+        : fDimensions(texture->dimensions())
+        , fInfo(texture->textureInfo())
+        , fTexture(std::move(texture)) {}
+
 TextureProxy::~TextureProxy() {}
 
 bool TextureProxy::instantiate(ResourceProvider* resourceProvider) {
diff --git a/third_party/skia/experimental/graphite/src/TextureProxy.h b/third_party/skia/experimental/graphite/src/TextureProxy.h
index 2a740d6c6a6ae..a3d95e537c751 100644
--- a/third_party/skia/experimental/graphite/src/TextureProxy.h
+++ b/third_party/skia/experimental/graphite/src/TextureProxy.h
@@ -20,6 +20,7 @@ class Texture;
 class TextureProxy : public SkRefCnt {
 public:
     TextureProxy(SkISize dimensions, const TextureInfo& info);
+    TextureProxy(sk_sp<Texture>);
 
     ~TextureProxy() override;
 
diff --git a/third_party/skia/experimental/graphite/src/TextureProxyView.h b/third_party/skia/experimental/graphite/src/TextureProxyView.h
new file mode 100644
index 0000000000000..8978ee998cb0f
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/TextureProxyView.h
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_TextureProxyView_DEFINED
+#define skgpu_TextureProxyView_DEFINED
+
+#include "experimental/graphite/include/GraphiteTypes.h"
+#include "experimental/graphite/src/TextureProxy.h"
+#include "include/core/SkRefCnt.h"
+#include "src/gpu/Swizzle.h"
+
+namespace skgpu {
+
+class Recorder;
+
+class TextureProxyView {
+public:
+    TextureProxyView() = default;
+
+    TextureProxyView(sk_sp<TextureProxy> proxy, Swizzle swizzle)
+            : fProxy(std::move(proxy)), fSwizzle(swizzle) {}
+
+    // This entry point is used when we don't care about the swizzle.
+    explicit TextureProxyView(sk_sp<TextureProxy> proxy)
+            : fProxy(std::move(proxy)) {}
+
+    TextureProxyView(TextureProxyView&& view) = default;
+    TextureProxyView(const TextureProxyView&) = default;
+
+    explicit operator bool() const { return SkToBool(fProxy.get()); }
+
+    TextureProxyView& operator=(const TextureProxyView&) = default;
+    TextureProxyView& operator=(TextureProxyView&& view) = default;
+
+    bool operator==(const TextureProxyView& view) const {
+        return fProxy == view.fProxy &&
+               fSwizzle == view.fSwizzle;
+    }
+    bool operator!=(const TextureProxyView& other) const { return !(*this == other); }
+
+    int width() const { return this->proxy()->dimensions().width(); }
+    int height() const { return this->proxy()->dimensions().height(); }
+    SkISize dimensions() const { return this->proxy()->dimensions(); }
+
+    Mipmapped mipmapped() const {
+        if (const TextureProxy* proxy = this->proxy()) {
+            return proxy->mipmapped();
+        }
+        return Mipmapped::kNo;
+    }
+
+    TextureProxy* proxy() const { return fProxy.get(); }
+    sk_sp<TextureProxy> refProxy() const { return fProxy; }
+
+    Swizzle swizzle() const { return fSwizzle; }
+
+    void concatSwizzle(Swizzle swizzle) {
+        fSwizzle = skgpu::Swizzle::Concat(fSwizzle, swizzle);
+    }
+
+    TextureProxyView makeSwizzle(Swizzle swizzle) const & {
+        return {fProxy, Swizzle::Concat(fSwizzle, swizzle)};
+    }
+
+    TextureProxyView makeSwizzle(Swizzle swizzle) && {
+        return {std::move(fProxy), Swizzle::Concat(fSwizzle, swizzle)};
+    }
+
+    void reset() {
+        *this = {};
+    }
+
+    // Helper that copies a rect of a src view's proxy and then creates a view for the copy with
+    // the same swizzle as the src view.
+    static TextureProxyView Copy(Recorder* recorder,
+                                 TextureProxyView src,
+                                 Mipmapped mipMapped,
+                                 SkIRect srcRect,
+                                 SkBackingFit fit,
+                                 SkBudgeted budgeted) {
+        // TODO
+        return {};
+    }
+
+    static TextureProxyView Copy(Recorder* recorder,
+                                 TextureProxyView src,
+                                 Mipmapped mipMapped,
+                                 SkBackingFit fit,
+                                 SkBudgeted budgeted) {
+        return TextureProxyView::Copy(recorder, src, mipMapped,
+                                      SkIRect::MakeSize(src.proxy()->dimensions()),
+                                      fit, budgeted);
+    }
+
+    // This does not reset the swizzle, so the View can still be used to access those
+    // properties associated with the detached proxy.
+    sk_sp<TextureProxy> detachProxy() {
+        return std::move(fProxy);
+    }
+
+private:
+    sk_sp<TextureProxy> fProxy;
+    Swizzle fSwizzle;
+};
+
+} // namespace skgpu
+
+#endif
+
diff --git a/third_party/skia/experimental/graphite/src/UniformCache.cpp b/third_party/skia/experimental/graphite/src/UniformCache.cpp
index 87b0b8ce55f94..fd54f5c2ad2fd 100644
--- a/third_party/skia/experimental/graphite/src/UniformCache.cpp
+++ b/third_party/skia/experimental/graphite/src/UniformCache.cpp
@@ -7,68 +7,63 @@
 
 #include "experimental/graphite/src/UniformCache.h"
 
-#include "experimental/graphite/src/ContextUtils.h"
 #include "src/core/SkOpts.h"
+#include "src/core/SkUniformData.h"
 
 namespace skgpu {
 
-size_t UniformCache::Hash::operator()(UniformData* ud) const {
-    if (!ud) {
+size_t UniformCache::Hash::operator()(SkUniformBlock* ub) const {
+    if (!ub) {
         return 0;
     }
-    return SkOpts::hash_fn(ud->data(), ud->dataSize(), 0);
+
+    return ub->hash();
 }
 
-bool UniformCache::Eq::operator()(UniformData* a, UniformData* b) const {
+bool UniformCache::Eq::operator()(SkUniformBlock* a, SkUniformBlock* b) const {
     if (!a || !b) {
         return !a && !b;
     }
-    if (a->count() != b->count() ||
-        a->uniforms() != b->uniforms() ||
-        a->dataSize() != b->dataSize()) {
-        return false;
-    }
 
-    return !memcmp(a->data(), b->data(), a->dataSize()) &&
-           !memcmp(a->offsets(), b->offsets(), a->count()*sizeof(uint32_t));
+    return *a == *b;
 };
 
 UniformCache::UniformCache() {
     // kInvalidUniformID is reserved
     static_assert(kInvalidUniformID == 0);
-    fUniformData.push_back(nullptr);
-    fUniformDataIDs.insert({nullptr, 0});
+    fUniformBlock.push_back(nullptr);
+    fUniformBlockIDs.insert({nullptr, 0});
 }
 
 #ifdef SK_DEBUG
 void UniformCache::validate() const {
-    for (size_t i = 0; i < fUniformData.size(); ++i) {
-        auto kv = fUniformDataIDs.find(fUniformData[i].get());
-        SkASSERT(kv != fUniformDataIDs.end());
-        SkASSERT(kv->first == fUniformData[i].get());
+    for (size_t i = 0; i < fUniformBlock.size(); ++i) {
+        auto kv = fUniformBlockIDs.find(fUniformBlock[i].get());
+        SkASSERT(kv != fUniformBlockIDs.end());
+        SkASSERT(kv->first == fUniformBlock[i].get());
         SkASSERT(SkTo<uint32_t>(i) == kv->second);
     }
 }
 #endif
 
-uint32_t UniformCache::insert(sk_sp<UniformData> data) {
-    auto kv = fUniformDataIDs.find(data.get());
-    if (kv != fUniformDataIDs.end()) {
+uint32_t UniformCache::insert(std::unique_ptr<SkUniformBlock> block) {
+    auto kv = fUniformBlockIDs.find(block.get());
+    if (kv != fUniformBlockIDs.end()) {
         return kv->second;
     }
 
-    uint32_t id = SkTo<uint32_t>(fUniformData.size());
-    SkASSERT(data && id != kInvalidUniformID);
+    uint32_t id = SkTo<uint32_t>(fUniformBlock.size());
+    SkASSERT(block && id != kInvalidUniformID);
 
-    fUniformDataIDs.insert({data.get(), id});
-    fUniformData.push_back(std::move(data));
+    fUniformBlockIDs.insert({block.get(), id});
+    fUniformBlock.push_back(std::move(block));
     this->validate();
     return id;
 }
 
-sk_sp<UniformData> UniformCache::lookup(uint32_t uniqueID) {
-    SkASSERT(uniqueID < fUniformData.size());
-    return fUniformData[uniqueID];
+SkUniformBlock* UniformCache::lookup(uint32_t uniqueID) {
+    SkASSERT(uniqueID < fUniformBlock.size());
+    return fUniformBlock[uniqueID].get();
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/UniformCache.h b/third_party/skia/experimental/graphite/src/UniformCache.h
index 6aa4ae9b15e3f..351e54e2e0d7e 100644
--- a/third_party/skia/experimental/graphite/src/UniformCache.h
+++ b/third_party/skia/experimental/graphite/src/UniformCache.h
@@ -13,9 +13,10 @@
 #include <unordered_map>
 #include <vector>
 
+class SkUniformBlock;
+
 namespace skgpu {
 
-class UniformData;
 
 class UniformCache {
 public:
@@ -44,29 +45,29 @@ class UniformCache {
 
     // Add the block of uniform data to the cache and return a unique ID that corresponds to its
     // contents. If an identical block of data is already in the cache, that unique ID is returned.
-    uint32_t insert(sk_sp<UniformData>);
+    uint32_t insert(std::unique_ptr<SkUniformBlock>);
 
-    sk_sp<UniformData> lookup(uint32_t uniqueID);
+    SkUniformBlock* lookup(uint32_t uniqueID);
 
-    // The number of unique uniformdata objects in the cache
+    // The number of unique UniformBlock objects in the cache
     size_t count() const {
-        SkASSERT(fUniformData.size() == fUniformDataIDs.size() && fUniformData.size() > 0);
-        return fUniformData.size() - 1;
+        SkASSERT(fUniformBlock.size() == fUniformBlockIDs.size() && fUniformBlock.size() > 0);
+        return fUniformBlock.size() - 1;
     }
 
 private:
     struct Hash {
         // This hash operator de-references and hashes the data contents
-        size_t operator()(UniformData*) const;
+        size_t operator()(SkUniformBlock*) const;
     };
     struct Eq {
         // This equality operator de-references and compares the actual data contents
-        bool operator()(UniformData*, UniformData*) const;
+        bool operator()(SkUniformBlock*, SkUniformBlock*) const;
     };
 
-    // The UniformData's unique ID is only unique w/in a Recorder _not_ globally
-    std::unordered_map<UniformData*, uint32_t, Hash, Eq> fUniformDataIDs;
-    std::vector<sk_sp<UniformData>> fUniformData;
+    // The UniformBlock's unique ID is only unique w/in a Recorder _not_ globally
+    std::unordered_map<SkUniformBlock*, uint32_t, Hash, Eq> fUniformBlockIDs;
+    std::vector<std::unique_ptr<SkUniformBlock>> fUniformBlock;
 
 #ifdef SK_DEBUG
     void validate() const;
diff --git a/third_party/skia/experimental/graphite/src/UniformManager.cpp b/third_party/skia/experimental/graphite/src/UniformManager.cpp
index 0b1dd18da549e..342d4934cb726 100644
--- a/third_party/skia/experimental/graphite/src/UniformManager.cpp
+++ b/third_party/skia/experimental/graphite/src/UniformManager.cpp
@@ -6,9 +6,12 @@
  */
 
 #include "experimental/graphite/src/UniformManager.h"
+
+#include "experimental/graphite/src/DrawTypes.h"
 #include "include/core/SkMatrix.h"
 #include "include/private/SkHalf.h"
 #include "include/private/SkTemplates.h"
+#include "src/core/SkUniform.h"
 
 // ensure that these types are the sizes the uniform data is expecting
 static_assert(sizeof(int32_t) == 4);
@@ -70,7 +73,7 @@ struct Rules140 {
      * that for single (non-array) scalars or vectors we don't require a stride.
      */
     static constexpr size_t Stride(int count) {
-        SkASSERT(count >= 1 || count == Uniform::kNonArray);
+        SkASSERT(count >= 1 || count == SkUniform::kNonArray);
         static_assert(RowsOrVecLength >= 1 && RowsOrVecLength <= 4);
         static_assert(Cols >= 1 && Cols <= 4);
         if (Cols != 1) {
@@ -105,7 +108,7 @@ struct Rules140 {
 template<typename BaseType, int RowsOrVecLength = 1, int Cols = 1>
 struct Rules430 {
     static constexpr size_t Stride(int count) {
-        SkASSERT(count >= 1 || count == Uniform::kNonArray);
+        SkASSERT(count >= 1 || count == SkUniform::kNonArray);
         static_assert(RowsOrVecLength >= 1 && RowsOrVecLength <= 4);
         static_assert(Cols >= 1 && Cols <= 4);
 
@@ -129,7 +132,7 @@ struct Rules430 {
 template<typename BaseType, int RowsOrVecLength = 1, int Cols = 1>
 struct RulesMetal {
     static constexpr size_t Stride(int count) {
-        SkASSERT(count >= 1 || count == Uniform::kNonArray);
+        SkASSERT(count >= 1 || count == SkUniform::kNonArray);
         static_assert(RowsOrVecLength >= 1 && RowsOrVecLength <= 4);
         static_assert(Cols >= 1 && Cols <= 4);
         if (Cols != 1) {
@@ -173,7 +176,7 @@ class Writer {
     template <typename MemType, typename UniformType, int RowsOrVecLength = 1, int Cols = 1>
     static uint32_t Write(void *dst, int n, const MemType src[]) {
         size_t stride = Rules<UniformType, RowsOrVecLength, Cols>::Stride(n);
-        n = (n == Uniform::kNonArray) ? 1 : n;
+        n = (n == SkUniform::kNonArray) ? 1 : n;
         n *= Cols;
 
         if (dst) {
@@ -219,56 +222,56 @@ class Writer {
     }
 
 public:
-    static uint32_t WriteUniform(SLType type,
+    static uint32_t WriteUniform(SkSLType type,
                                  CType ctype,
                                  void *dest,
                                  int n,
                                  const void *src) {
-        SkASSERT(n >= 1 || n == Uniform::kNonArray);
+        SkASSERT(n >= 1 || n == SkUniform::kNonArray);
         switch (type) {
-            case SLType::kInt:
+            case SkSLType::kInt:
                 return Write<int32_t, int32_t>(dest, n, static_cast<const int32_t *>(src));
 
-            case SLType::kInt2:
+            case SkSLType::kInt2:
                 return Write<int32_t, int32_t, 2>(dest, n, static_cast<const int32_t *>(src));
 
-            case SLType::kInt3:
+            case SkSLType::kInt3:
                 return Write<int32_t, int32_t, 3>(dest, n, static_cast<const int32_t *>(src));
 
-            case SLType::kInt4:
+            case SkSLType::kInt4:
                 return Write<int32_t, int32_t, 4>(dest, n, static_cast<const int32_t *>(src));
 
-            case SLType::kHalf:
+            case SkSLType::kHalf:
                 return Write<float, SkHalf>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat:
+            case SkSLType::kFloat:
                 return Write<float, float>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kHalf2:
+            case SkSLType::kHalf2:
                 return Write<float, SkHalf, 2>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat2:
+            case SkSLType::kFloat2:
                 return Write<float, float, 2>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kHalf3:
+            case SkSLType::kHalf3:
                 return Write<float, SkHalf, 3>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat3:
+            case SkSLType::kFloat3:
                 return Write<float, float, 3>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kHalf4:
+            case SkSLType::kHalf4:
                 return Write<float, SkHalf, 4>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat4:
+            case SkSLType::kFloat4:
                 return Write<float, float, 4>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kHalf2x2:
+            case SkSLType::kHalf2x2:
                 return Write<float, SkHalf, 2, 2>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat2x2:
+            case SkSLType::kFloat2x2:
                 return Write<float, float, 2, 2>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kHalf3x3:
+            case SkSLType::kHalf3x3:
                 switch (ctype) {
                     case CType::kDefault:
                         return Write<float, SkHalf, 3, 3>(dest, n, static_cast<const float *>(src));
@@ -277,7 +280,7 @@ class Writer {
                 }
                 SkUNREACHABLE;
 
-            case SLType::kFloat3x3:
+            case SkSLType::kFloat3x3:
                 switch (ctype) {
                     case CType::kDefault:
                         return Write<float, float, 3, 3>(dest, n, static_cast<const float *>(src));
@@ -286,10 +289,10 @@ class Writer {
                 }
                 SkUNREACHABLE;
 
-            case SLType::kHalf4x4:
+            case SkSLType::kHalf4x4:
                 return Write<float, SkHalf, 4, 4>(dest, n, static_cast<const float *>(src));
 
-            case SLType::kFloat4x4:
+            case SkSLType::kFloat4x4:
                 return Write<float, float, 4, 4>(dest, n, static_cast<const float *>(src));
 
             default:
@@ -302,132 +305,132 @@ class Writer {
 // To determine whether a current offset is aligned, we can just 'and' the lowest bits with the
 // alignment mask. A value of 0 means aligned, any other value is how many bytes past alignment we
 // are. This works since all alignments are powers of 2. The mask is always (alignment - 1).
-static uint32_t sltype_to_alignment_mask(SLType type) {
+static uint32_t sksltype_to_alignment_mask(SkSLType type) {
     switch (type) {
-        case SLType::kInt:
-        case SLType::kUInt:
-        case SLType::kFloat:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
+        case SkSLType::kFloat:
             return 0x3;
-        case SLType::kInt2:
-        case SLType::kUInt2:
-        case SLType::kFloat2:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kFloat2:
             return 0x7;
-        case SLType::kInt3:
-        case SLType::kUInt3:
-        case SLType::kFloat3:
-        case SLType::kInt4:
-        case SLType::kUInt4:
-        case SLType::kFloat4:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kFloat3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kFloat4:
             return 0xF;
 
-        case SLType::kFloat2x2:
+        case SkSLType::kFloat2x2:
             return 0x7;
-        case SLType::kFloat3x3:
+        case SkSLType::kFloat3x3:
             return 0xF;
-        case SLType::kFloat4x4:
+        case SkSLType::kFloat4x4:
             return 0xF;
 
-        case SLType::kShort:
-        case SLType::kUShort:
-        case SLType::kHalf:
+        case SkSLType::kShort:
+        case SkSLType::kUShort:
+        case SkSLType::kHalf:
             return 0x1;
-        case SLType::kShort2:
-        case SLType::kUShort2:
-        case SLType::kHalf2:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
+        case SkSLType::kHalf2:
             return 0x3;
-        case SLType::kShort3:
-        case SLType::kShort4:
-        case SLType::kUShort3:
-        case SLType::kUShort4:
-        case SLType::kHalf3:
-        case SLType::kHalf4:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
             return 0x7;
 
-        case SLType::kHalf2x2:
+        case SkSLType::kHalf2x2:
             return 0x3;
-        case SLType::kHalf3x3:
+        case SkSLType::kHalf3x3:
             return 0x7;
-        case SLType::kHalf4x4:
+        case SkSLType::kHalf4x4:
             return 0x7;
 
         // This query is only valid for certain types.
-        case SLType::kVoid:
-        case SLType::kBool:
-        case SLType::kBool2:
-        case SLType::kBool3:
-        case SLType::kBool4:
-        case SLType::kTexture2DSampler:
-        case SLType::kTextureExternalSampler:
-        case SLType::kTexture2DRectSampler:
-        case SLType::kSampler:
-        case SLType::kTexture2D:
-        case SLType::kInput:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
 }
 
-/** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */
-inline uint32_t sltype_to_mtl_size(SLType type) {
+/** Returns the size in bytes taken up in Metal buffers for SkSLTypes. */
+inline uint32_t sksltype_to_mtl_size(SkSLType type) {
     switch (type) {
-        case SLType::kInt:
-        case SLType::kUInt:
-        case SLType::kFloat:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
+        case SkSLType::kFloat:
             return 4;
-        case SLType::kInt2:
-        case SLType::kUInt2:
-        case SLType::kFloat2:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kFloat2:
             return 8;
-        case SLType::kInt3:
-        case SLType::kUInt3:
-        case SLType::kFloat3:
-        case SLType::kInt4:
-        case SLType::kUInt4:
-        case SLType::kFloat4:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kFloat3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kFloat4:
             return 16;
 
-        case SLType::kFloat2x2:
+        case SkSLType::kFloat2x2:
             return 16;
-        case SLType::kFloat3x3:
+        case SkSLType::kFloat3x3:
             return 48;
-        case SLType::kFloat4x4:
+        case SkSLType::kFloat4x4:
             return 64;
 
-        case SLType::kShort:
-        case SLType::kUShort:
-        case SLType::kHalf:
+        case SkSLType::kShort:
+        case SkSLType::kUShort:
+        case SkSLType::kHalf:
             return 2;
-        case SLType::kShort2:
-        case SLType::kUShort2:
-        case SLType::kHalf2:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
+        case SkSLType::kHalf2:
             return 4;
-        case SLType::kShort3:
-        case SLType::kShort4:
-        case SLType::kUShort3:
-        case SLType::kUShort4:
-        case SLType::kHalf3:
-        case SLType::kHalf4:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
             return 8;
 
-        case SLType::kHalf2x2:
+        case SkSLType::kHalf2x2:
             return 8;
-        case SLType::kHalf3x3:
+        case SkSLType::kHalf3x3:
             return 24;
-        case SLType::kHalf4x4:
+        case SkSLType::kHalf4x4:
             return 32;
 
         // This query is only valid for certain types.
-        case SLType::kVoid:
-        case SLType::kBool:
-        case SLType::kBool2:
-        case SLType::kBool3:
-        case SLType::kBool4:
-        case SLType::kTexture2DSampler:
-        case SLType::kTextureExternalSampler:
-        case SLType::kTexture2DRectSampler:
-        case SLType::kSampler:
-        case SLType::kTexture2D:
-        case SLType::kInput:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
@@ -438,9 +441,9 @@ inline uint32_t sltype_to_mtl_size(SLType type) {
 // the new uniform, and currentOffset is updated to be the offset to the end of the new uniform.
 static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
                                        uint32_t* maxAlignment,
-                                       SLType type,
+                                       SkSLType type,
                                        int arrayCount) {
-    uint32_t alignmentMask = sltype_to_alignment_mask(type);
+    uint32_t alignmentMask = sksltype_to_alignment_mask(type);
     if (alignmentMask > *maxAlignment) {
         *maxAlignment = alignmentMask;
     }
@@ -451,37 +454,37 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
     uint32_t uniformOffset = *currentOffset + offsetDiff;
     SkASSERT(sizeof(float) == 4);
     if (arrayCount) {
-        *currentOffset = uniformOffset + sltype_to_mtl_size(type) * arrayCount;
+        *currentOffset = uniformOffset + sksltype_to_mtl_size(type) * arrayCount;
     } else {
-        *currentOffset = uniformOffset + sltype_to_mtl_size(type);
+        *currentOffset = uniformOffset + sksltype_to_mtl_size(type);
     }
     return uniformOffset;
 }
 #endif // SK_DEBUG
 
-SLType UniformManager::getUniformTypeForLayout(SLType type) {
+SkSLType UniformManager::getUniformTypeForLayout(SkSLType type) {
     if (fLayout != Layout::kMetal) {
         // GL/Vk expect uniforms in 32-bit precision. Convert lower-precision types to 32-bit.
         switch (type) {
-            case SLType::kShort:            return SLType::kInt;
-            case SLType::kUShort:           return SLType::kUInt;
-            case SLType::kHalf:             return SLType::kFloat;
+            case SkSLType::kShort:            return SkSLType::kInt;
+            case SkSLType::kUShort:           return SkSLType::kUInt;
+            case SkSLType::kHalf:             return SkSLType::kFloat;
 
-            case SLType::kShort2:           return SLType::kInt2;
-            case SLType::kUShort2:          return SLType::kUInt2;
-            case SLType::kHalf2:            return SLType::kFloat2;
+            case SkSLType::kShort2:           return SkSLType::kInt2;
+            case SkSLType::kUShort2:          return SkSLType::kUInt2;
+            case SkSLType::kHalf2:            return SkSLType::kFloat2;
 
-            case SLType::kShort3:           return SLType::kInt3;
-            case SLType::kUShort3:          return SLType::kUInt3;
-            case SLType::kHalf3:            return SLType::kFloat3;
+            case SkSLType::kShort3:           return SkSLType::kInt3;
+            case SkSLType::kUShort3:          return SkSLType::kUInt3;
+            case SkSLType::kHalf3:            return SkSLType::kFloat3;
 
-            case SLType::kShort4:           return SLType::kInt4;
-            case SLType::kUShort4:          return SLType::kUInt4;
-            case SLType::kHalf4:            return SLType::kFloat4;
+            case SkSLType::kShort4:           return SkSLType::kInt4;
+            case SkSLType::kUShort4:          return SkSLType::kUInt4;
+            case SkSLType::kHalf4:            return SkSLType::kFloat4;
 
-            case SLType::kHalf2x2:          return SLType::kFloat2x2;
-            case SLType::kHalf3x3:          return SLType::kFloat3x3;
-            case SLType::kHalf4x4:          return SLType::kFloat4x4;
+            case SkSLType::kHalf2x2:          return SkSLType::kFloat2x2;
+            case SkSLType::kHalf3x3:          return SkSLType::kFloat3x3;
+            case SkSLType::kHalf4x4:          return SkSLType::kFloat4x4;
 
             default:                        break;
         }
@@ -490,10 +493,10 @@ SLType UniformManager::getUniformTypeForLayout(SLType type) {
     return type;
 }
 
-uint32_t UniformManager::writeUniforms(SkSpan<const Uniform> uniforms,
+uint32_t UniformManager::writeUniforms(SkSpan<const SkUniform> uniforms,
                                        const void** srcs,
                                        uint32_t* offsets,
-                                       void *dst) {
+                                       char *dst) {
     decltype(&Writer<Rules140>::WriteUniform) write;
     switch (fLayout) {
         case Layout::kStd140:
@@ -515,8 +518,8 @@ uint32_t UniformManager::writeUniforms(SkSpan<const Uniform> uniforms,
     uint32_t offset = 0;
 
     for (int i = 0; i < (int) uniforms.size(); ++i) {
-        const Uniform& u = uniforms[i];
-        SLType uniformType = this->getUniformTypeForLayout(u.type());
+        const SkUniform& u = uniforms[i];
+        SkSLType uniformType = this->getUniformTypeForLayout(u.type());
 
 #ifdef SK_DEBUG
         uint32_t debugOffset = get_ubo_aligned_offset(&curUBOOffset,
@@ -527,7 +530,7 @@ uint32_t UniformManager::writeUniforms(SkSpan<const Uniform> uniforms,
 
         uint32_t bytesWritten = write(uniformType,
                                       CType::kDefault,
-                                      dst,
+                                      dst ? &dst[offset] : nullptr,
                                       u.count(),
                                       srcs ? srcs[i] : nullptr);
         SkASSERT(debugOffset == offset);
diff --git a/third_party/skia/experimental/graphite/src/UniformManager.h b/third_party/skia/experimental/graphite/src/UniformManager.h
index 76ec4e50db138..86c9fbc0b7f4e 100644
--- a/third_party/skia/experimental/graphite/src/UniformManager.h
+++ b/third_party/skia/experimental/graphite/src/UniformManager.h
@@ -8,9 +8,10 @@
 #ifndef skgpu_UniformManager_DEFINED
 #define skgpu_UniformManager_DEFINED
 
-#include "experimental/graphite/src/DrawTypes.h"
-#include "experimental/graphite/src/Uniform.h"
 #include "include/core/SkSpan.h"
+#include "src/core/SkSLTypeShared.h"
+
+class SkUniform;
 
 namespace skgpu {
 
@@ -33,13 +34,13 @@ class UniformManager {
      *   // allocate dst and offsets memory
      *   writeUniforms(definitions, src, offsets, dst);
      */
-    uint32_t writeUniforms(SkSpan<const Uniform> definitions,
+    uint32_t writeUniforms(SkSpan<const SkUniform> definitions,
                            const void** srcs,
                            uint32_t* offsets,
-                           void *dst);
+                           char *dst);
 
 private:
-    SLType getUniformTypeForLayout(SLType type);
+    SkSLType getUniformTypeForLayout(SkSLType type);
 
     Layout fLayout;
 };
diff --git a/third_party/skia/experimental/graphite/src/UploadTask.cpp b/third_party/skia/experimental/graphite/src/UploadTask.cpp
new file mode 100644
index 0000000000000..5e2629f9d039c
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/UploadTask.cpp
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/UploadTask.h"
+
+#include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/src/Buffer.h"
+#include "experimental/graphite/src/Caps.h"
+#include "experimental/graphite/src/CommandBuffer.h"
+#include "experimental/graphite/src/Log.h"
+#include "experimental/graphite/src/RecorderPriv.h"
+#include "experimental/graphite/src/ResourceProvider.h"
+#include "experimental/graphite/src/Texture.h"
+#include "experimental/graphite/src/TextureProxy.h"
+#include "src/core/SkConvertPixels.h"
+
+namespace skgpu {
+
+void UploadCommand::addCommand(ResourceProvider* resourceProvider,
+                               CommandBuffer* commandBuffer) const {
+    if (!fTextureProxy) {
+        SKGPU_LOG_E("No texture proxy specified for UploadTask");
+        return;
+    }
+    if (!fTextureProxy->instantiate(resourceProvider)) {
+        SKGPU_LOG_E("Could not instantiate texture proxy for UploadTask!");
+        return;
+    }
+
+    commandBuffer->copyBufferToTexture(std::move(fBuffer),
+                                       fTextureProxy->refTexture(),
+                                       fCopyData.data(),
+                                       fCopyData.size());
+}
+
+//---------------------------------------------------------------------------
+
+size_t compute_combined_buffer_size(int mipLevelCount,
+                                    size_t bytesPerPixel,
+                                    size_t minTransferBufferAlignment,
+                                    const SkISize& baseDimensions,
+                                    SkTArray<size_t>* individualMipOffsets) {
+    SkASSERT(individualMipOffsets && !individualMipOffsets->count());
+    SkASSERT(mipLevelCount >= 1);
+
+    individualMipOffsets->push_back(0);
+
+    size_t combinedBufferSize = baseDimensions.width() * bytesPerPixel * baseDimensions.height();
+    SkISize levelDimensions = baseDimensions;
+
+    for (int currentMipLevel = 1; currentMipLevel < mipLevelCount; ++currentMipLevel) {
+        levelDimensions = {std::max(1, levelDimensions.width() /2),
+                           std::max(1, levelDimensions.height()/2)};
+
+        size_t trimmedSize = levelDimensions.area() * bytesPerPixel;
+        combinedBufferSize = SkAlignTo(combinedBufferSize, minTransferBufferAlignment);
+        SkASSERT((0 == combinedBufferSize % 4) && (0 == combinedBufferSize % bytesPerPixel));
+
+        individualMipOffsets->push_back(combinedBufferSize);
+        combinedBufferSize += trimmedSize;
+    }
+
+    SkASSERT(individualMipOffsets->count() == mipLevelCount);
+    return combinedBufferSize;
+}
+
+bool UploadList::appendUpload(Recorder* recorder,
+                              sk_sp<TextureProxy> textureProxy,
+                              SkColorType dataColorType,
+                              const std::vector<MipLevel>& levels,
+                              const SkIRect& dstRect) {
+    const Caps* caps = recorder->priv().caps();
+    SkASSERT(caps->isTexturable(textureProxy->textureInfo()));
+
+    unsigned int mipLevelCount = levels.size();
+    // The assumption is either that we have no mipmaps, or that our rect is the entire texture
+    SkASSERT(mipLevelCount == 1 || dstRect == SkIRect::MakeSize(textureProxy->dimensions()));
+
+    // We assume that if the texture has mip levels, we either upload to all the levels or just the
+    // first.
+    SkASSERT(mipLevelCount == 1 || mipLevelCount == textureProxy->textureInfo().numMipLevels());
+
+    if (dstRect.isEmpty()) {
+        return false;
+    }
+
+    SkASSERT(caps->areColorTypeAndTextureInfoCompatible(dataColorType,
+                                                        textureProxy->textureInfo()));
+
+    if (mipLevelCount == 1 && !levels[0].fPixels) {
+        return true;   // no data to upload
+    }
+
+    for (unsigned int i = 0; i < mipLevelCount; ++i) {
+        // We do not allow any gaps in the mip data
+        if (!levels[i].fPixels) {
+            return false;
+        }
+    }
+
+    size_t bpp = SkColorTypeBytesPerPixel(dataColorType);
+    size_t minAlignment = caps->getTransferBufferAlignment(bpp);
+    SkTArray<size_t> individualMipOffsets(mipLevelCount);
+    size_t combinedBufferSize = compute_combined_buffer_size(mipLevelCount, bpp, minAlignment,
+                                                             dstRect.size(), &individualMipOffsets);
+    SkASSERT(combinedBufferSize);
+
+    // TODO: get staging buffer or {void* offset, sk_sp<Buffer> buffer} pair.
+    ResourceProvider* resourceProvider = recorder->priv().resourceProvider();
+    sk_sp<Buffer> buffer = resourceProvider->findOrCreateBuffer(combinedBufferSize,
+                                                                BufferType::kXferCpuToGpu,
+                                                                PrioritizeGpuReads::kNo);
+
+    std::vector<BufferTextureCopyData> copyData(mipLevelCount);
+
+    if (!buffer) {
+        return false;
+    }
+    char* bufferData = (char*) buffer->map(); // TODO: get from staging buffer instead
+    size_t baseOffset = 0;
+
+    int currentWidth = dstRect.width();
+    int currentHeight = dstRect.height();
+    for (unsigned int currentMipLevel = 0; currentMipLevel < mipLevelCount; currentMipLevel++) {
+        const size_t trimRowBytes = currentWidth * bpp;
+        const size_t rowBytes = levels[currentMipLevel].fRowBytes;
+
+        // copy data into the buffer, skipping any trailing bytes
+        char* dst = bufferData + individualMipOffsets[currentMipLevel];
+        const char* src = (const char*)levels[currentMipLevel].fPixels;
+        SkRectMemcpy(dst, trimRowBytes, src, rowBytes, trimRowBytes, currentHeight);
+
+        copyData[currentMipLevel].fBufferOffset =
+                baseOffset + individualMipOffsets[currentMipLevel];
+        copyData[currentMipLevel].fBufferRowBytes = trimRowBytes;
+        copyData[currentMipLevel].fRect = {
+            dstRect.left(), dstRect.top(), // TODO: can we recompute this for mips?
+            dstRect.left() + currentWidth, dstRect.top() + currentHeight
+        };
+        copyData[currentMipLevel].fMipLevel = currentMipLevel;
+
+        currentWidth = std::max(1, currentWidth/2);
+        currentHeight = std::max(1, currentHeight/2);
+    }
+
+    buffer->unmap();
+
+    fCommands.push_back({std::move(buffer), std::move(textureProxy), std::move(copyData)});
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+
+sk_sp<UploadTask> UploadTask::Make(UploadList* uploadList) {
+    return sk_sp<UploadTask>(new UploadTask(std::move(uploadList->fCommands)));
+}
+
+UploadTask::UploadTask(std::vector<UploadCommand> commands) : fCommands(std::move(commands)) {}
+
+UploadTask::~UploadTask() {}
+
+void UploadTask::addCommands(ResourceProvider* resourceProvider,
+                             CommandBuffer* commandBuffer) {
+    for (unsigned int i = 0; i < fCommands.size(); ++i) {
+        fCommands[i].addCommand(resourceProvider, commandBuffer);
+    }
+}
+
+} // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/UploadTask.h b/third_party/skia/experimental/graphite/src/UploadTask.h
new file mode 100644
index 0000000000000..0804f4f1172b5
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/UploadTask.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_UploadTask_DEFINED
+#define skgpu_UploadTask_DEFINED
+
+#include "experimental/graphite/src/Task.h"
+
+#include <vector>
+
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+
+namespace skgpu {
+
+class Buffer;
+struct BufferTextureCopyData;
+class CommandBuffer;
+class Recorder;
+class ResourceProvider;
+class TextureProxy;
+
+struct MipLevel {
+    const void* fPixels = nullptr;
+    size_t fRowBytes = 0;
+};
+
+/**
+ * An UploadCommand represents a single set of uploads from a buffer to texture that
+ * can be processed in a single command.
+ */
+struct UploadCommand {
+    void addCommand(ResourceProvider*, CommandBuffer*) const;
+
+    sk_sp<Buffer> fBuffer;
+    sk_sp<TextureProxy> fTextureProxy;
+    std::vector<BufferTextureCopyData> fCopyData;
+};
+
+
+/**
+ * An UploadList is a mutable collection of UploadCommands.
+ *
+ * Currently commands are accumulated in order and processed in the same order. Dependency
+ * management is expected to be handled by the TaskGraph.
+ *
+ * When an upload is appended to the list its data will be copied to a Buffer in
+ * preparation for a deferred upload.
+ */
+class UploadList {
+public:
+    bool appendUpload(Recorder*,
+                      sk_sp<TextureProxy> targetProxy,
+                      SkColorType colorType,
+                      const std::vector<MipLevel>& levels,
+                      const SkIRect& dstRect);
+
+private:
+    friend class UploadTask;
+
+    std::vector<UploadCommand> fCommands;
+};
+
+/*
+ * An UploadTask is a immutable collection of UploadCommands.
+ *
+ * When adding commands to the commandBuffer the texture proxies in those
+ * commands will be instantiated and the copy command added.
+ */
+class UploadTask final : public Task {
+public:
+    static sk_sp<UploadTask> Make(UploadList*);
+
+    ~UploadTask() override;
+
+    void addCommands(ResourceProvider*, CommandBuffer*) override;
+
+private:
+    UploadTask(std::vector<UploadCommand>);
+
+    std::vector<UploadCommand> fCommands;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_UploadTask_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/geom/BUILD.bazel b/third_party/skia/experimental/graphite/src/geom/BUILD.bazel
new file mode 100644
index 0000000000000..3172287dae989
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/geom/BUILD.bazel
@@ -0,0 +1,93 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "BoundsManager_hdr",
+    hdrs = ["BoundsManager.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Rect_hdr",
+        "//experimental/graphite/src:DrawOrder_hdr",
+        "//src/core:SkTBlockList_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IntersectionTree_hdr",
+    hdrs = ["IntersectionTree.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Rect_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IntersectionTree_src",
+    srcs = ["IntersectionTree.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":IntersectionTree_hdr",
+        "//include/private:SkTPin_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Rect_hdr",
+    hdrs = ["Rect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":VectorTypes_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Shape_hdr",
+    hdrs = ["Shape.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Rect_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Shape_src",
+    srcs = ["Shape.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Shape_hdr",
+        "//src/core:SkPathPriv_hdr",
+        "//src/core:SkRRectPriv_hdr",
+        "//src/utils:SkPolyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Transform_graphite_hdr",
+    hdrs = ["Transform_graphite.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkM44_hdr"],
+)
+
+generated_cc_atom(
+    name = "Transform_src",
+    srcs = ["Transform.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Rect_hdr",
+        ":Transform_graphite_hdr",
+        ":VectorTypes_hdr",
+        "//src/core:SkMatrixPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VectorTypes_hdr",
+    hdrs = ["VectorTypes.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/include:GraphiteTypes_hdr"],
+)
diff --git a/third_party/skia/experimental/graphite/src/geom/BoundsManager.h b/third_party/skia/experimental/graphite/src/geom/BoundsManager.h
index 867a04b99090d..9211ee0ac7092 100644
--- a/third_party/skia/experimental/graphite/src/geom/BoundsManager.h
+++ b/third_party/skia/experimental/graphite/src/geom/BoundsManager.h
@@ -40,6 +40,8 @@ class BoundsManager {
                             CompressedPaintersOrder order,
                             PaintersDepth z,
                             bool fullyOpaque=false) = 0;
+
+    virtual void reset() = 0;
 };
 
 // TODO: Select one most-effective BoundsManager implementation, make it the only option, and remove
@@ -64,6 +66,10 @@ class NaiveBoundsManager final : public BoundsManager {
         }
     }
 
+    void reset() override {
+        fLatestDraw = CompressedPaintersOrder::First();
+    }
+
 private:
     CompressedPaintersOrder fLatestDraw = CompressedPaintersOrder::First();
 };
@@ -99,6 +105,10 @@ class BruteForceBoundsManager : public BoundsManager {
         fRects.push_back({bounds, order, z, fullyOpaque});
     }
 
+    void reset() override {
+        fRects.reset();
+    }
+
 private:
     struct Record {
         Rect fBounds;
diff --git a/third_party/skia/experimental/graphite/src/geom/IntersectionTree.h b/third_party/skia/experimental/graphite/src/geom/IntersectionTree.h
index 028bda0dc9f82..a10034df1e1e9 100644
--- a/third_party/skia/experimental/graphite/src/geom/IntersectionTree.h
+++ b/third_party/skia/experimental/graphite/src/geom/IntersectionTree.h
@@ -13,10 +13,12 @@
 
 namespace skgpu {
 
-// Maintains a collection of non-overlapping rectangles.
-//
-// add() either adds the given rect to the collection, or returns false if it intersected with a
-// rect already in the collection.
+/**
+ * Maintains a collection of non-overlapping rectangles.
+ *
+ * add() either adds the given rect to the collection, or returns false if it intersected with a
+ * rect already in the collection.
+ */
 class IntersectionTree {
 public:
     IntersectionTree();
@@ -57,7 +59,6 @@ class IntersectionTree {
     Node* fRoot;
 };
 
-
 } // namespace skgpu
 
 #endif // skgpu_geom_IntersectionTree_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/geom/Transform.cpp b/third_party/skia/experimental/graphite/src/geom/Transform.cpp
index cab0b1d0f17fc..27687d27c98e0 100644
--- a/third_party/skia/experimental/graphite/src/geom/Transform.cpp
+++ b/third_party/skia/experimental/graphite/src/geom/Transform.cpp
@@ -8,6 +8,7 @@
 #include "experimental/graphite/src/geom/Transform_graphite.h"
 
 #include "experimental/graphite/src/geom/Rect.h"
+#include "experimental/graphite/src/geom/VectorTypes.h"
 #include "src/core/SkMatrixPriv.h"
 
 namespace skgpu {
@@ -45,4 +46,25 @@ bool Transform::operator==(const Transform& t) const {
 Rect Transform::mapRect(const Rect& rect) const { return map_rect(fM, rect); }
 Rect Transform::inverseMapRect(const Rect& rect) const { return map_rect(fInvM, rect); }
 
+void Transform::mapPoints(const Rect& localRect, SkV4 deviceOut[4]) const {
+    SkV2 localCorners[4] = {{localRect.left(),  localRect.top()},
+                            {localRect.right(), localRect.top()},
+                            {localRect.right(), localRect.bot()},
+                            {localRect.left(),  localRect.bot()}};
+    this->mapPoints(localCorners, deviceOut, 4);
+}
+
+void Transform::mapPoints(const SkV2* localIn, SkV4* deviceOut, int count) const {
+    // TODO: These maybe should go into SkM44, since bulk point mapping seems generally useful
+    float4 c0 = float4::Load(SkMatrixPriv::M44ColMajor(fM) + 0);
+    float4 c1 = float4::Load(SkMatrixPriv::M44ColMajor(fM) + 4);
+    // skip c2 since localIn's z is assumed to be 0
+    float4 c3 = float4::Load(SkMatrixPriv::M44ColMajor(fM) + 12);
+
+    for (int i = 0; i < count; ++i) {
+        float4 p = c0 * localIn[i].x + c1 * localIn[i].y /* + c2*0.f */ + c3 /* *1.f */;
+        p.store(deviceOut + i);
+    }
+}
+
 } // namespace skgpu
diff --git a/third_party/skia/experimental/graphite/src/geom/Transform_graphite.h b/third_party/skia/experimental/graphite/src/geom/Transform_graphite.h
index 8b576815401dc..6cdc3acb3b082 100644
--- a/third_party/skia/experimental/graphite/src/geom/Transform_graphite.h
+++ b/third_party/skia/experimental/graphite/src/geom/Transform_graphite.h
@@ -63,6 +63,9 @@ class Transform {
     Rect mapRect(const Rect& rect) const;
     Rect inverseMapRect(const Rect& rect) const;
 
+    void mapPoints(const Rect& localRect, SkV4 deviceOut[4]) const;
+    void mapPoints(const SkV2* localIn, SkV4* deviceOut, int count) const;
+
 private:
     SkM44 fM;
     SkM44 fInvM; // M^-1
diff --git a/third_party/skia/experimental/graphite/src/mtl/BUILD.bazel b/third_party/skia/experimental/graphite/src/mtl/BUILD.bazel
new file mode 100644
index 0000000000000..b9904aec3cc4e
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/mtl/BUILD.bazel
@@ -0,0 +1,130 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "MtlBlitCommandEncoder_hdr",
+    hdrs = ["MtlBlitCommandEncoder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:Resource_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlBuffer_hdr",
+    hdrs = ["MtlBuffer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include/mtl:MtlTypes_hdr",
+        "//experimental/graphite/src:Buffer_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlCaps_hdr",
+    hdrs = ["MtlCaps.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//experimental/graphite/src:Caps_hdr"],
+)
+
+generated_cc_atom(
+    name = "MtlCommandBuffer_hdr",
+    hdrs = ["MtlCommandBuffer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:CommandBuffer_hdr",
+        "//experimental/graphite/src:GpuWorkSubmission_hdr",
+        "//experimental/graphite/src:Log_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlGpu_hdr",
+    hdrs = ["MtlGpu.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":MtlCaps_hdr",
+        "//experimental/graphite/include/mtl:MtlBackendContext_hdr",
+        "//experimental/graphite/src:Gpu_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlGraphicsPipeline_hdr",
+    hdrs = ["MtlGraphicsPipeline.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:GraphicsPipeline_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlRenderCommandEncoder_hdr",
+    hdrs = ["MtlRenderCommandEncoder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:Resource_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlResourceProvider_hdr",
+    hdrs = ["MtlResourceProvider.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:DrawTypes_hdr",
+        "//experimental/graphite/src:ResourceProvider_hdr",
+        "//include/private:SkTHash_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlTexture_hdr",
+    hdrs = ["MtlTexture.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:Texture_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlTrampoline_hdr",
+    hdrs = ["MtlTrampoline.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "MtlUtils_hdr",
+    hdrs = ["MtlUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:ResourceTypes_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/ports:SkCFObject_hdr",
+        "//src/sksl/ir:SkSLProgram_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MtlSampler_hdr",
+    hdrs = ["MtlSampler.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:Sampler_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/ports:SkCFObject_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlBlitCommandEncoder.h b/third_party/skia/experimental/graphite/src/mtl/MtlBlitCommandEncoder.h
index fdc38cc7a95a7..92dac6f22cc0e 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlBlitCommandEncoder.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlBlitCommandEncoder.h
@@ -8,6 +8,7 @@
 #ifndef skgpu_MtlBlitCommandEncoder_DEFINED
 #define skgpu_MtlBlitCommandEncoder_DEFINED
 
+#include "experimental/graphite/src/Resource.h"
 #include "include/core/SkRect.h"
 #include "include/core/SkRefCnt.h"
 #include "include/ports/SkCFObject.h"
@@ -19,13 +20,14 @@ namespace skgpu::mtl {
 /**
  * Wraps a MTLBlitCommandEncoder object
  */
-class BlitCommandEncoder : public SkRefCnt {
+class BlitCommandEncoder : public Resource {
 public:
-    static sk_sp<BlitCommandEncoder> Make(id<MTLCommandBuffer> commandBuffer) {
+    static sk_sp<BlitCommandEncoder> Make(const skgpu::Gpu* gpu,
+                                          id<MTLCommandBuffer> commandBuffer) {
         // Adding a retain here to keep our own ref separate from the autorelease pool
         sk_cfp<id<MTLBlitCommandEncoder>> encoder =
                 sk_ret_cfp<id<MTLBlitCommandEncoder>>([commandBuffer blitCommandEncoder]);
-        return sk_sp<BlitCommandEncoder>(new BlitCommandEncoder(std::move(encoder)));
+        return sk_sp<BlitCommandEncoder>(new BlitCommandEncoder(gpu, std::move(encoder)));
     }
 
     void pushDebugGroup(NSString* string) {
@@ -56,13 +58,34 @@ class BlitCommandEncoder : public SkRefCnt {
                    destinationBytesPerImage: bufferRowBytes * srcRect.height()];
     }
 
+    void copyFromBuffer(id<MTLBuffer> buffer,
+                        size_t bufferOffset,
+                        size_t bufferRowBytes,
+                        id<MTLTexture> texture,
+                        SkIRect dstRect,
+                        unsigned int dstLevel) {
+        [(*fCommandEncoder) copyFromBuffer: buffer
+                              sourceOffset: bufferOffset
+                         sourceBytesPerRow: bufferRowBytes
+                       sourceBytesPerImage: bufferRowBytes * dstRect.height()
+                                sourceSize: MTLSizeMake(dstRect.width(), dstRect.height(), 1)
+                                 toTexture: texture
+                          destinationSlice: 0
+                          destinationLevel: dstLevel
+                         destinationOrigin: MTLOriginMake(dstRect.left(), dstRect.top(), 0)];
+    }
+
     void endEncoding() {
         [(*fCommandEncoder) endEncoding];
     }
 
 private:
-    BlitCommandEncoder(sk_cfp<id<MTLBlitCommandEncoder>> encoder)
-        : fCommandEncoder(std::move(encoder)) {}
+    BlitCommandEncoder(const skgpu::Gpu* gpu, sk_cfp<id<MTLBlitCommandEncoder>> encoder)
+        : Resource(gpu), fCommandEncoder(std::move(encoder)) {}
+
+    void onFreeGpuData() override {
+        fCommandEncoder.reset();
+    }
 
     sk_cfp<id<MTLBlitCommandEncoder>> fCommandEncoder;
 };
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h b/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h
index fd80cbca40351..330af9e029b7d 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.h
@@ -8,9 +8,9 @@
 #ifndef skgpu_MtlBuffer_DEFINED
 #define skgpu_MtlBuffer_DEFINED
 
-#include "experimental/graphite/src/Buffer.h"
-
 #include "experimental/graphite/include/mtl/MtlTypes.h"
+#include "experimental/graphite/src/Buffer.h"
+#include "include/core/SkRefCnt.h"
 
 #import <Metal/Metal.h>
 
@@ -25,11 +25,13 @@ class Buffer : public skgpu::Buffer {
     id<MTLBuffer> mtlBuffer() const { return fBuffer.get(); }
 
 private:
-    Buffer(size_t size, BufferType type, PrioritizeGpuReads, sk_cfp<id<MTLBuffer>>);
+    Buffer(const Gpu*, size_t size, BufferType type, PrioritizeGpuReads, sk_cfp<id<MTLBuffer>>);
 
     void onMap() override;
     void onUnmap() override;
 
+    void onFreeGpuData() override;
+
     sk_cfp<id<MTLBuffer>> fBuffer;
 };
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm b/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm
index 7d4c8bd3350ee..2264294823089 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlBuffer.mm
@@ -55,14 +55,15 @@
     (*buffer).label = kBufferTypeNames[(int)type];
 #endif
 
-    return sk_sp<Buffer>(new Buffer(size, type, prioritizeGpuReads, std::move(buffer)));
+    return sk_sp<Buffer>(new Buffer(gpu, size, type, prioritizeGpuReads, std::move(buffer)));
 }
 
-Buffer::Buffer(size_t size,
+Buffer::Buffer(const Gpu* gpu,
+               size_t size,
                BufferType type,
                PrioritizeGpuReads prioritizeGpuReads,
                sk_cfp<id<MTLBuffer>> buffer)
-        : skgpu::Buffer(size, type, prioritizeGpuReads)
+        : skgpu::Buffer(gpu, size, type, prioritizeGpuReads)
         , fBuffer(std::move(buffer)) {}
 
 void Buffer::onMap() {
@@ -87,5 +88,9 @@
     fMapPtr = nullptr;
 }
 
+void Buffer::onFreeGpuData() {
+    fBuffer.reset();
+}
+
 } // namespace skgpu::mtl
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlCaps.h b/third_party/skia/experimental/graphite/src/mtl/MtlCaps.h
index ba612fd451f81..7d070bde9f5e9 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlCaps.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlCaps.h
@@ -32,14 +32,22 @@ class Caps final : public skgpu::Caps {
                                                          uint32_t sampleCount,
                                                          Protected) const override;
 
+    UniqueKey makeGraphicsPipelineKey(const GraphicsPipelineDesc&,
+                                      const RenderPassDesc&) const override;
+
     bool isMac() const { return fGPUFamily == GPUFamily::kMac; }
     bool isApple()const  { return fGPUFamily == GPUFamily::kApple; }
 
     size_t getMinBufferAlignment() const { return this->isMac() ? 4 : 1; }
 
-    bool isTexturable(const skgpu::TextureInfo&) const override;
     bool isRenderable(const skgpu::TextureInfo&) const override;
 
+    void buildKeyForTexture(SkISize dimensions,
+                            const skgpu::TextureInfo&,
+                            ResourceType,
+                            Shareable,
+                            GraphiteResourceKey*) const override;
+
 private:
     void initGPUFamily(const id<MTLDevice>);
 
@@ -57,9 +65,13 @@ class Caps final : public skgpu::Caps {
 
     bool onAreColorTypeAndTextureInfoCompatible(SkColorType,
                                                 const skgpu::TextureInfo&) const override;
+
+    bool onIsTexturable(const skgpu::TextureInfo&) const override;
     bool isTexturable(MTLPixelFormat) const;
     bool isRenderable(MTLPixelFormat, uint32_t numSamples) const;
 
+    size_t getTransferBufferAlignment(size_t bytesPerPixel) const override;
+
     GPUFamily fGPUFamily;
     int fFamilyGroup;
 };
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlCaps.mm b/third_party/skia/experimental/graphite/src/mtl/MtlCaps.mm
index c4628830a73d5..a7145b4be761b 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlCaps.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlCaps.mm
@@ -9,6 +9,9 @@
 
 #include "experimental/graphite/include/TextureInfo.h"
 #include "experimental/graphite/include/mtl/MtlTypes.h"
+#include "experimental/graphite/src/CommandBuffer.h"
+#include "experimental/graphite/src/GraphicsPipelineDesc.h"
+#include "experimental/graphite/src/GraphiteResourceKey.h"
 #include "experimental/graphite/src/mtl/MtlUtils.h"
 #include "src/sksl/SkSLUtil.h"
 
@@ -227,6 +230,12 @@
     } else {
         fRequiredUniformBufferAlignment = 16;
     }
+
+    if (@available(macOS 10.12, ios 14.0, *)) {
+        fClampToBorderSupport = (this->isMac() || fFamilyGroup >= 7);
+    } else {
+        fClampToBorderSupport = false;
+    }
 }
 
 void Caps::initShaderCaps() {
@@ -311,18 +320,45 @@
     return info;
 }
 
-bool Caps::isTexturable(const skgpu::TextureInfo& info) const {
-    return info.mtlTextureSpec().fUsage & MTLTextureUsageShaderRead &&
-           this->isTexturable((MTLPixelFormat)info.mtlTextureSpec().fFormat);
+UniqueKey Caps::makeGraphicsPipelineKey(const GraphicsPipelineDesc& pipelineDesc,
+                                        const RenderPassDesc& renderPassDesc) const {
+    UniqueKey pipelineKey;
+    {
+        static const skgpu::UniqueKey::Domain kGraphicsPipelineDomain = UniqueKey::GenerateDomain();
+        SkSpan<const uint32_t> pipelineDescKey = pipelineDesc.asKey();
+        UniqueKey::Builder builder(&pipelineKey, kGraphicsPipelineDomain,
+                                   pipelineDescKey.size() + 1, "GraphicsPipeline");
+        // add graphicspipelinedesc key
+        for (unsigned int i = 0; i < pipelineDescKey.size(); ++i) {
+            builder[i] = pipelineDescKey[i];
+        }
+        // add renderpassdesc key
+        mtl::TextureInfo colorInfo, depthStencilInfo;
+        renderPassDesc.fColorAttachment.fTextureInfo.getMtlTextureInfo(&colorInfo);
+        renderPassDesc.fDepthStencilAttachment.fTextureInfo.getMtlTextureInfo(&depthStencilInfo);
+        SkASSERT(colorInfo.fFormat < 65535 && depthStencilInfo.fFormat < 65535);
+        uint32_t renderPassKey = colorInfo.fFormat << 16 | depthStencilInfo.fFormat;
+        builder[pipelineDescKey.size()] = renderPassKey;
+        builder.finish();
+    }
+
+    return pipelineKey;
 }
 
-bool Caps::isTexturable(MTLPixelFormat format) const {
-    // TODO: Fill out format table so that we can query all formats. For now we only support RGBA8
-    // which is supported everywhere.
-    if (format != MTLPixelFormatRGBA8Unorm) {
+bool Caps::onIsTexturable(const skgpu::TextureInfo& info) const {
+    if (!(info.mtlTextureSpec().fUsage & MTLTextureUsageShaderRead)) {
         return false;
     }
-    return true;
+    if (info.mtlTextureSpec().fFramebufferOnly) {
+        return false;
+    }
+    return this->isTexturable((MTLPixelFormat)info.mtlTextureSpec().fFormat);
+}
+
+bool Caps::isTexturable(MTLPixelFormat format) const {
+    // TODO: Fill out format table so that we can query all formats. For now we only support RGBA8
+    // and BGRA8 which is supported everywhere.
+    return format == MTLPixelFormatRGBA8Unorm || format == MTLPixelFormatBGRA8Unorm;
 }
 
 bool Caps::isRenderable(const skgpu::TextureInfo& info) const {
@@ -332,20 +368,95 @@
 
 bool Caps::isRenderable(MTLPixelFormat format, uint32_t numSamples) const {
     // TODO: Fill out format table so that we can query all formats. For now we only support RGBA8
-    // with a sampleCount of 1 which is supported everywhere.
-    if (format != MTLPixelFormatRGBA8Unorm || numSamples != 1) {
+    // and BGRA8 with a sampleCount of 1 which is supported everywhere.
+    if ((format != MTLPixelFormatRGBA8Unorm && format != MTLPixelFormatBGRA8Unorm) ||
+        numSamples != 1) {
         return false;
     }
     return true;
 }
 
-
 bool Caps::onAreColorTypeAndTextureInfoCompatible(SkColorType type,
                                                   const skgpu::TextureInfo& info) const {
     // TODO: Fill out format table so that we can query all formats. For now we only support RGBA8
-    // for both the color type and format.
-    return type == kRGBA_8888_SkColorType &&
-           info.mtlTextureSpec().fFormat == MTLPixelFormatRGBA8Unorm;
+    // or BGRA8 for both the color type and format.
+    return (type == kRGBA_8888_SkColorType &&
+            info.mtlTextureSpec().fFormat == MTLPixelFormatRGBA8Unorm) ||
+           (type == kBGRA_8888_SkColorType &&
+            info.mtlTextureSpec().fFormat == MTLPixelFormatBGRA8Unorm);
+}
+
+size_t Caps::getTransferBufferAlignment(size_t bytesPerPixel) const {
+    return std::max(bytesPerPixel, getMinBufferAlignment());
+}
+
+// There are only a few possible valid sample counts (1, 2, 4, 8, 16). So we can key on those 5
+// options instead of the actual sample value.
+uint32_t samples_to_key(uint32_t numSamples) {
+    switch (numSamples) {
+        case 1:
+            return 0;
+        case 2:
+            return 1;
+        case 4:
+            return 2;
+        case 8:
+            return 3;
+        case 16:
+            return 4;
+        default:
+            SkUNREACHABLE;
+    }
+}
+
+void Caps::buildKeyForTexture(SkISize dimensions,
+                              const skgpu::TextureInfo& info,
+                              ResourceType type,
+                              Shareable shareable,
+                              GraphiteResourceKey* key) const {
+    const TextureSpec& mtlSpec = info.mtlTextureSpec();
+
+    SkASSERT(!dimensions.isEmpty());
+
+    // A MTLPixelFormat is an NSUInteger type which is documented to be 32 bits in 32 bit
+    // applications and 64 bits in 64 bit applications. So it should fit in an uint64_t, but adding
+    // the assert heere to make sure.
+    static_assert(sizeof(MTLPixelFormat) <= sizeof(uint64_t));
+    SkASSERT(mtlSpec.fFormat != MTLPixelFormatInvalid);
+    uint64_t formatKey = static_cast<uint64_t>(mtlSpec.fFormat);
+
+    uint32_t samplesKey = samples_to_key(info.numSamples());
+    // We don't have to key the number of mip levels because it is inherit in the combination of
+    // isMipped and dimensions.
+    bool isMipped = info.numMipLevels() > 1;
+    Protected isProtected = info.isProtected();
+    bool isFBOnly = mtlSpec.fFramebufferOnly;
+
+    // Confirm all the below parts of the key can fit in a single uint32_t. The sum of the shift
+    // amounts in the asserts must be less than or equal to 32.
+    SkASSERT(samplesKey                         < (1u << 3));
+    SkASSERT(static_cast<uint32_t>(isMipped)    < (1u << 1));
+    SkASSERT(static_cast<uint32_t>(isProtected) < (1u << 1));
+    SkASSERT(mtlSpec.fUsage                     < (1u << 5));
+    SkASSERT(mtlSpec.fStorageMode               < (1u << 2));
+    SkASSERT(static_cast<uint32_t>(isFBOnly)    < (1u << 1));
+
+    // We need two uint32_ts for dimensions, 2 for format, and 1 for the rest of the key;
+    static int kNum32DataCnt = 2 + 2 + 1;
+
+    GraphiteResourceKey::Builder builder(key, type, kNum32DataCnt, shareable);
+
+    builder[0] = dimensions.width();
+    builder[1] = dimensions.height();
+    builder[2] = formatKey & 0xFFFFFFFF;
+    builder[3] = (formatKey >> 32) & 0xFFFFFFFF;
+    builder[4] = (samplesKey                                  << 0) |
+                 (static_cast<uint32_t>(isMipped)             << 3) |
+                 (static_cast<uint32_t>(isProtected)          << 4) |
+                 (static_cast<uint32_t>(mtlSpec.fUsage)       << 5) |
+                 (static_cast<uint32_t>(mtlSpec.fStorageMode) << 10)|
+                 (static_cast<uint32_t>(isFBOnly)             << 12);
+
 }
 
 } // namespace skgpu::mtl
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.h b/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.h
index 51a697a428935..11f822f6c1026 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.h
@@ -10,6 +10,7 @@
 
 #include "experimental/graphite/src/CommandBuffer.h"
 #include "experimental/graphite/src/GpuWorkSubmission.h"
+#include "experimental/graphite/src/Log.h"
 
 #include <memory>
 
@@ -40,8 +41,8 @@ class CommandBuffer final : public skgpu::CommandBuffer {
             [(*fCommandBuffer) waitUntilCompleted];
         }
         if (!this->isFinished()) {
-            SkDebugf("Unfinished command buffer status: %d\n",
-                     (int)(*fCommandBuffer).status);
+            SKGPU_LOG_E("Unfinished command buffer status: %d",
+                        (int)(*fCommandBuffer).status);
             SkASSERT(false);
         }
     }
@@ -50,7 +51,7 @@ class CommandBuffer final : public skgpu::CommandBuffer {
 private:
     CommandBuffer(sk_cfp<id<MTLCommandBuffer>> cmdBuffer, const Gpu* gpu);
 
-    void onBeginRenderPass(const RenderPassDesc&,
+    bool onBeginRenderPass(const RenderPassDesc&,
                            const skgpu::Texture* colorTexture,
                            const skgpu::Texture* resolveTexture,
                            const skgpu::Texture* depthStencilTexture) override;
@@ -62,6 +63,9 @@ class CommandBuffer final : public skgpu::CommandBuffer {
                              const skgpu::Buffer* instanceBuffer, size_t instanceOffset) override;
     void onBindIndexBuffer(const skgpu::Buffer* indexBuffer, size_t offset) override;
 
+    void onBindTextures(const TextureBindEntry* entries, int count) override;
+    void onBindSamplers(const SamplerBindEntry* entries, int count) override;
+
     void onSetScissor(unsigned int left, unsigned int top,
                       unsigned int width, unsigned int height) override;
     void onSetViewport(float x, float y, float width, float height,
@@ -78,11 +82,15 @@ class CommandBuffer final : public skgpu::CommandBuffer {
                                 unsigned int indexCount, unsigned int baseVertex,
                                 unsigned int baseInstance, unsigned int instanceCount) override;
 
-    void onCopyTextureToBuffer(const skgpu::Texture*,
+    bool onCopyTextureToBuffer(const skgpu::Texture*,
                                SkIRect srcRect,
                                const skgpu::Buffer*,
                                size_t bufferOffset,
                                size_t bufferRowBytes) override;
+    bool onCopyBufferToTexture(const skgpu::Buffer*,
+                               const skgpu::Texture*,
+                               const BufferTextureCopyData* copyData,
+                               int count) override;
 
     BlitCommandEncoder* getBlitCommandEncoder();
     void endBlitCommandEncoder();
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.mm b/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.mm
index 802878da28d8f..297d5e01e36b1 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlCommandBuffer.mm
@@ -7,6 +7,7 @@
 
 #include "experimental/graphite/src/mtl/MtlCommandBuffer.h"
 
+#include "experimental/graphite/src/Log.h"
 #include "experimental/graphite/src/TextureProxy.h"
 #include "experimental/graphite/src/mtl/MtlBlitCommandEncoder.h"
 #include "experimental/graphite/src/mtl/MtlBuffer.h"
@@ -14,6 +15,7 @@
 #include "experimental/graphite/src/mtl/MtlGpu.h"
 #include "experimental/graphite/src/mtl/MtlGraphicsPipeline.h"
 #include "experimental/graphite/src/mtl/MtlRenderCommandEncoder.h"
+#include "experimental/graphite/src/mtl/MtlSampler.h"
 #include "experimental/graphite/src/mtl/MtlTexture.h"
 #include "experimental/graphite/src/mtl/MtlUtils.h"
 
@@ -53,24 +55,35 @@
 bool CommandBuffer::commit() {
     SkASSERT(!fActiveRenderCommandEncoder);
     this->endBlitCommandEncoder();
+#ifdef SK_BUILD_FOR_IOS
+    if (IsAppInBackground()) {
+        NSLog(@"CommandBuffer: Tried to commit command buffer while in background.\n");
+        return false;
+    }
+#endif
     [(*fCommandBuffer) commit];
 
-    // TODO: better error reporting
     if ((*fCommandBuffer).status == MTLCommandBufferStatusError) {
         NSString* description = (*fCommandBuffer).error.localizedDescription;
         const char* errorString = [description UTF8String];
-        SkDebugf("Error submitting command buffer: %s\n", errorString);
+        SKGPU_LOG_E("Failure submitting command buffer: %s", errorString);
     }
 
     return ((*fCommandBuffer).status != MTLCommandBufferStatusError);
 }
 
-void CommandBuffer::onBeginRenderPass(const RenderPassDesc& renderPassDesc,
+bool CommandBuffer::onBeginRenderPass(const RenderPassDesc& renderPassDesc,
                                       const skgpu::Texture* colorTexture,
                                       const skgpu::Texture* resolveTexture,
                                       const skgpu::Texture* depthStencilTexture) {
     SkASSERT(!fActiveRenderCommandEncoder);
     this->endBlitCommandEncoder();
+#ifdef SK_BUILD_FOR_IOS
+    if (IsAppInBackground()) {
+        NSLog(@"CommandBuffer: tried to create MTLRenderCommandEncoder while in background.\n");
+        return false;
+    }
+#endif
 
     const static MTLLoadAction mtlLoadAction[] {
         MTLLoadActionLoad,
@@ -151,10 +164,13 @@
         SkASSERT(!depthStencilInfo.fTextureInfo.isValid());
     }
 
-    fActiveRenderCommandEncoder = RenderCommandEncoder::Make(fCommandBuffer.get(),
+    fActiveRenderCommandEncoder = RenderCommandEncoder::Make(fGpu,
+                                                             fCommandBuffer.get(),
                                                              descriptor.get());
 
     this->trackResource(fActiveRenderCommandEncoder);
+
+    return true;
 }
 
 void CommandBuffer::endRenderPass() {
@@ -167,8 +183,14 @@
     if (fActiveBlitCommandEncoder) {
         return fActiveBlitCommandEncoder.get();
     }
+#ifdef SK_BUILD_FOR_IOS
+    if (IsAppInBackground()) {
+        NSLog(@"CommandBuffer: tried to create MTLBlitCommandEncoder while in background.\n");
+        return nullptr;
+    }
+#endif
 
-    fActiveBlitCommandEncoder = BlitCommandEncoder::Make(fCommandBuffer.get());
+    fActiveBlitCommandEncoder = BlitCommandEncoder::Make(fGpu, fCommandBuffer.get());
 
     if (!fActiveBlitCommandEncoder) {
         return nullptr;
@@ -232,13 +254,15 @@
 
     if (vertexBuffer) {
         id<MTLBuffer> mtlBuffer = static_cast<const Buffer*>(vertexBuffer)->mtlBuffer();
-        SkASSERT((vertexOffset & 0xF) == 0);
+        // Metal requires buffer offsets to be aligned to the data type, which is at most 4 bytes
+        // since we use [[attribute]] to automatically unpack float components into SIMD arrays.
+        SkASSERT((vertexOffset & 0b11) == 0);
         fActiveRenderCommandEncoder->setVertexBuffer(mtlBuffer, vertexOffset,
                                                      GraphicsPipeline::kVertexBufferIndex);
     }
     if (instanceBuffer) {
         id<MTLBuffer> mtlBuffer = static_cast<const Buffer*>(instanceBuffer)->mtlBuffer();
-        SkASSERT((instanceOffset & 0xF) == 0);
+        SkASSERT((instanceOffset & 0b11) == 0);
         fActiveRenderCommandEncoder->setVertexBuffer(mtlBuffer, instanceOffset,
                                                      GraphicsPipeline::kInstanceBufferIndex);
     }
@@ -254,6 +278,22 @@
     }
 }
 
+void CommandBuffer::onBindTextures(const TextureBindEntry* entries, int count) {
+    for (int i = 0; i < count; ++i) {
+        SkASSERT(entries[i].fTexture);
+        id<MTLTexture> texture = ((Texture*)entries[i].fTexture.get())->mtlTexture();
+        fActiveRenderCommandEncoder->setFragmentTexture(texture, entries[i].fBindIndex);
+    }
+}
+
+void CommandBuffer::onBindSamplers(const SamplerBindEntry* entries, int count) {
+    for (int i = 0; i < count; ++i) {
+        SkASSERT(entries[i].fSampler);
+        id<MTLSamplerState> samplerState = ((Sampler*)entries[i].fSampler.get())->mtlSamplerState();
+        fActiveRenderCommandEncoder->setFragmentSamplerState(samplerState, entries[i].fBindIndex);
+    }
+}
+
 void CommandBuffer::onSetScissor(unsigned int left, unsigned int top,
                                  unsigned int width, unsigned int height) {
     SkASSERT(fActiveRenderCommandEncoder);
@@ -319,8 +359,8 @@ static MTLPrimitiveType graphite_to_mtl_primitive(PrimitiveType primitiveType) {
                                                            indexOffset, 1, baseVertex, 0);
 
     } else {
-        // TODO: Do nothing, fatal failure, or just the regular graphite error reporting overhaul?
-        SkDebugf("[graphite] WARNING - Skipping unsupported draw call.\n");
+        // TODO: Do nothing, fatal failure, or just the regular graphite error reporting?
+        SKGPU_LOG_E("Skipping unsupported draw call.");
     }
 }
 
@@ -349,22 +389,37 @@ static MTLPrimitiveType graphite_to_mtl_primitive(PrimitiveType primitiveType) {
                                                            indexOffset, instanceCount,
                                                            baseVertex, baseInstance);
     } else {
-        // TODO: Do nothing, fatal failure, or just the regular graphite error reporting overhaul?
-        SkDebugf("[graphite] WARNING - Skipping unsupported draw call.\n");
+        // TODO: Do nothing, fatal failure, or just the regular graphite error reporting?
+        SKGPU_LOG_W("Skipping unsupported draw call.");
+    }
+}
+
+static bool check_max_blit_width(int widthInPixels) {
+    if (widthInPixels > 32767) {
+        SkASSERT(false); // surfaces should not be this wide anyway
+        return false;
     }
+    return true;
 }
 
-void CommandBuffer::onCopyTextureToBuffer(const skgpu::Texture* texture,
+bool CommandBuffer::onCopyTextureToBuffer(const skgpu::Texture* texture,
                                           SkIRect srcRect,
                                           const skgpu::Buffer* buffer,
                                           size_t bufferOffset,
                                           size_t bufferRowBytes) {
     SkASSERT(!fActiveRenderCommandEncoder);
 
+    if (!check_max_blit_width(srcRect.width())) {
+        return false;
+    }
+
     id<MTLTexture> mtlTexture = static_cast<const Texture*>(texture)->mtlTexture();
     id<MTLBuffer> mtlBuffer = static_cast<const Buffer*>(buffer)->mtlBuffer();
 
     BlitCommandEncoder* blitCmdEncoder = this->getBlitCommandEncoder();
+    if (!blitCmdEncoder) {
+        return false;
+    }
 
 #ifdef SK_ENABLE_MTL_DEBUG_INFO
     blitCmdEncoder->pushDebugGroup(@"readOrTransferPixels");
@@ -380,6 +435,43 @@ static MTLPrimitiveType graphite_to_mtl_primitive(PrimitiveType primitiveType) {
 #ifdef SK_ENABLE_MTL_DEBUG_INFO
     blitCmdEncoder->popDebugGroup();
 #endif
+    return true;
+}
+
+bool CommandBuffer::onCopyBufferToTexture(const skgpu::Buffer* buffer,
+                                          const skgpu::Texture* texture,
+                                          const BufferTextureCopyData* copyData,
+                                          int count) {
+    SkASSERT(!fActiveRenderCommandEncoder);
+
+    id<MTLBuffer> mtlBuffer = static_cast<const Buffer*>(buffer)->mtlBuffer();
+    id<MTLTexture> mtlTexture = static_cast<const Texture*>(texture)->mtlTexture();
+
+    BlitCommandEncoder* blitCmdEncoder = this->getBlitCommandEncoder();
+    if (!blitCmdEncoder) {
+        return false;
+    }
+
+#ifdef SK_ENABLE_MTL_DEBUG_INFO
+    blitCmdEncoder->pushDebugGroup(@"uploadToTexture");
+#endif
+    for (int i = 0; i < count; ++i) {
+        if (!check_max_blit_width(copyData[i].fRect.width())) {
+            return false;
+        }
+
+        blitCmdEncoder->copyFromBuffer(mtlBuffer,
+                                       copyData[i].fBufferOffset,
+                                       copyData[i].fBufferRowBytes,
+                                       mtlTexture,
+                                       copyData[i].fRect,
+                                       copyData[i].fMipLevel);
+    }
+
+#ifdef SK_ENABLE_MTL_DEBUG_INFO
+    blitCmdEncoder->popDebugGroup();
+#endif
+    return true;
 }
 
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlGpu.h b/third_party/skia/experimental/graphite/src/mtl/MtlGpu.h
index 19cd403c27fb9..4fe93146f75b7 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlGpu.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlGpu.h
@@ -29,6 +29,9 @@ class Gpu final : public skgpu::Gpu {
 
     const Caps& mtlCaps() const { return static_cast<const Caps&>(*this->caps()); }
 
+    std::unique_ptr<skgpu::ResourceProvider> makeResourceProvider(
+            sk_sp<GlobalCache>, SingleOwner*) const override;
+
 private:
     Gpu(sk_cfp<id<MTLDevice>>, sk_cfp<id<MTLCommandQueue>>, sk_sp<const Caps>);
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlGpu.mm b/third_party/skia/experimental/graphite/src/mtl/MtlGpu.mm
index d1a6346f169a0..24e14eebe8b4d 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlGpu.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlGpu.mm
@@ -10,6 +10,8 @@
 #include "experimental/graphite/include/BackendTexture.h"
 #include "experimental/graphite/include/TextureInfo.h"
 #include "experimental/graphite/src/Caps.h"
+#include "experimental/graphite/src/GlobalCache.h"
+#include "experimental/graphite/src/Log.h"
 #include "experimental/graphite/src/mtl/MtlCommandBuffer.h"
 #include "experimental/graphite/src/mtl/MtlResourceProvider.h"
 #include "experimental/graphite/src/mtl/MtlTexture.h"
@@ -21,11 +23,11 @@
     if (@available(macOS 10.14, iOS 11.0, *)) {
         // no warning needed
     } else {
-        SkDebugf("*** Error ***: Skia's Graphite backend no longer supports this OS version.\n");
+        SKGPU_LOG_E("Skia's Graphite backend no longer supports this OS version.");
 #ifdef SK_BUILD_FOR_IOS
-        SkDebugf("Minimum supported version is iOS 11.0.\n");
+        SKGPU_LOG_E("Minimum supported version is iOS 11.0.");
 #else
-        SkDebugf("Minimum supported version is MacOS 10.14.\n");
+        SKGPU_LOG_E("Minimum supported version is MacOS 10.14.");
 #endif
         return nullptr;
     }
@@ -43,12 +45,18 @@
     , fDevice(std::move(device))
     , fQueue(std::move(queue)) {
     this->initCompiler();
-    fResourceProvider.reset(new ResourceProvider(this));
 }
 
 Gpu::~Gpu() {
 }
 
+std::unique_ptr<skgpu::ResourceProvider> Gpu::makeResourceProvider(
+        sk_sp<GlobalCache> globalCache, SingleOwner* singleOwner) const {
+    return std::unique_ptr<skgpu::ResourceProvider>(new ResourceProvider(this,
+                                                                         std::move(globalCache),
+                                                                         singleOwner));
+}
+
 class WorkSubmission final : public skgpu::GpuWorkSubmission {
 public:
     WorkSubmission(sk_sp<CommandBuffer> cmdBuffer)
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.h b/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.h
index c98a7afd67ffe..fa666fd0c8d0d 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.h
@@ -9,18 +9,23 @@
 #define skgpu_MtlGraphicsPipeline_DEFINED
 
 #include "experimental/graphite/src/GraphicsPipeline.h"
-
+#include "include/core/SkRefCnt.h"
 #include "include/ports/SkCFObject.h"
 #include <memory>
 
 #import <Metal/Metal.h>
 
+class SkShaderCodeDictionary;
+
 namespace skgpu {
+class Context;
 class GraphicsPipelineDesc;
+struct RenderPassDesc;
 } // namespace skgpu
 
 namespace skgpu::mtl {
 class Gpu;
+class ResourceProvider;
 
 class GraphicsPipeline final : public skgpu::GraphicsPipeline {
 public:
@@ -30,7 +35,10 @@ class GraphicsPipeline final : public skgpu::GraphicsPipeline {
     inline static constexpr unsigned int kVertexBufferIndex = 3;
     inline static constexpr unsigned int kInstanceBufferIndex = 4;
 
-    static sk_sp<GraphicsPipeline> Make(const Gpu*, const skgpu::GraphicsPipelineDesc&);
+    static sk_sp<GraphicsPipeline> Make(ResourceProvider*,
+                                        const Gpu*,
+                                        const skgpu::GraphicsPipelineDesc&,
+                                        const skgpu::RenderPassDesc&);
     ~GraphicsPipeline() override {}
 
     id<MTLRenderPipelineState> mtlPipelineState() const { return fPipelineState.get(); }
@@ -40,17 +48,21 @@ class GraphicsPipeline final : public skgpu::GraphicsPipeline {
     size_t instanceStride() const { return fInstanceStride; }
 
 private:
-    GraphicsPipeline(sk_cfp<id<MTLRenderPipelineState>> pso,
+    GraphicsPipeline(const skgpu::Gpu* gpu,
+                     sk_cfp<id<MTLRenderPipelineState>> pso,
                      id<MTLDepthStencilState> dss,
                      uint32_t refValue,
                      size_t vertexStride,
                      size_t instanceStride)
-        : fPipelineState(std::move(pso))
+        : skgpu::GraphicsPipeline(gpu)
+        , fPipelineState(std::move(pso))
         , fDepthStencilState(dss)
         , fStencilReferenceValue(refValue)
         , fVertexStride(vertexStride)
         , fInstanceStride(instanceStride) {}
 
+    void onFreeGpuData() override;
+
     sk_cfp<id<MTLRenderPipelineState>> fPipelineState;
     id<MTLDepthStencilState> fDepthStencilState;
     uint32_t fStencilReferenceValue;
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.mm b/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.mm
index 603e1dc11faf7..421f1d953ada9 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlGraphicsPipeline.mm
@@ -9,48 +9,56 @@
 
 #include "experimental/graphite/include/TextureInfo.h"
 #include "experimental/graphite/src/GraphicsPipelineDesc.h"
+#include "experimental/graphite/src/Log.h"
 #include "experimental/graphite/src/Renderer.h"
 #include "experimental/graphite/src/mtl/MtlGpu.h"
 #include "experimental/graphite/src/mtl/MtlResourceProvider.h"
 #include "experimental/graphite/src/mtl/MtlUtils.h"
 #include "include/core/SkSpan.h"
+#include "include/gpu/ShaderErrorHandler.h"
 #include "include/private/SkSLString.h"
+#include "src/core/SkShaderCodeDictionary.h"
 
 namespace skgpu::mtl {
 
 namespace {
 
-SkSL::String emit_SKSL_uniforms(int bufferID, const char* name, SkSpan<const Uniform> uniforms) {
-    SkSL::String result;
+std::string get_uniform_header(int bufferID, const char* name) {
+    std::string result;
 
-    result.appendf("layout (binding=%d) uniform %sUniforms {\n", bufferID, name);
+    SkSL::String::appendf(&result, "layout (binding=%d) uniform %sUniforms {\n", bufferID, name);
+
+    return result;
+}
+
+std::string get_uniforms(SkSpan<const SkUniform> uniforms, int* offset, int manglingSuffix) {
+    std::string result;
 
-    int offset = 0;
     for (auto u : uniforms) {
         int count = u.count() ? u.count() : 1;
         // TODO: this is sufficient for the sprint but should be changed to use SkSL's
         // machinery
-        result.appendf("    layout(offset=%d) ", offset);
+        SkSL::String::appendf(&result, "    layout(offset=%d) ", *offset);
         switch (u.type()) {
-            case SLType::kFloat4:
+            case SkSLType::kFloat4:
                 result.append("float4");
-                offset += 16 * count;
+                *offset += 16 * count;
                 break;
-            case SLType::kFloat2:
+            case SkSLType::kFloat2:
                 result.append("float2");
-                offset += 8 * count;
+                *offset += 8 * count;
                 break;
-            case SLType::kFloat:
+            case SkSLType::kFloat:
                 result.append("float");
-                offset += 4 * count;
+                *offset += 4 * count;
                 break;
-            case SLType::kFloat4x4:
+            case SkSLType::kFloat4x4:
                 result.append("float4x4");
-                offset += 64 * count;
+                *offset += 64 * count;
                 break;
-            case SLType::kHalf4:
+            case SkSLType::kHalf4:
                 result.append("half4");
-                offset += 8 * count;
+                *offset += 8 * count;
                 break;
             default:
                 SkASSERT(0);
@@ -58,6 +66,10 @@
 
         result.append(" ");
         result.append(u.name());
+        if (manglingSuffix >= 0) {
+            result.append("_");
+            result.append(std::to_string(manglingSuffix));
+        }
         if (u.count()) {
             result.append("[");
             result.append(std::to_string(u.count()));
@@ -65,38 +77,51 @@
         }
         result.append(";\n");
     }
+
+    return result;
+}
+
+std::string emit_SKSL_uniforms(int bufferID, const char* name, SkSpan<const SkUniform> uniforms) {
+    int offset = 0;
+
+    std::string result = get_uniform_header(bufferID, name);
+    result += get_uniforms(uniforms, &offset, -1);
     result.append("};\n\n");
+
     return result;
 }
 
-SkSL::String emit_SkSL_attributes(SkSpan<const Attribute> vertexAttrs,
-                                  SkSpan<const Attribute> instanceAttrs) {
-    SkSL::String result;
+std::string emit_SkSL_attributes(SkSpan<const Attribute> vertexAttrs,
+                                 SkSpan<const Attribute> instanceAttrs) {
+    std::string result;
 
     int attr = 0;
     auto add_attrs = [&](SkSpan<const Attribute> attrs) {
         for (auto a : attrs) {
             // TODO: this is sufficient for the sprint but should be changed to use SkSL's
             // machinery
-            result.appendf("    layout(location=%d) in ", attr++);
+            SkSL::String::appendf(&result, "    layout(location=%d) in ", attr++);
             switch (a.gpuType()) {
-                case SLType::kFloat4:
+                case SkSLType::kFloat4:
                     result.append("float4");
                     break;
-                case SLType::kFloat2:
+                case SkSLType::kFloat2:
                     result.append("float2");
                     break;
-                case SLType::kFloat:
+                case SkSLType::kFloat3:
+                    result.append("float3");
+                    break;
+                case SkSLType::kFloat:
                     result.append("float");
                     break;
-                case SLType::kHalf4:
+                case SkSLType::kHalf4:
                     result.append("half4");
                     break;
                 default:
                     SkASSERT(0);
             }
 
-            result.appendf(" %s;\n", a.name());
+            SkSL::String::appendf(&result, " %s;\n", a.name());
         }
     };
 
@@ -112,7 +137,7 @@
     return result;
 }
 
-SkSL::String get_sksl_vs(const GraphicsPipelineDesc& desc) {
+std::string get_sksl_vs(const GraphicsPipelineDesc& desc) {
     const RenderStep* step = desc.renderStep();
     // TODO: To more completely support end-to-end rendering, this will need to be updated so that
     // the RenderStep shader snippet can produce a device coord, a local coord, and depth.
@@ -123,7 +148,7 @@
     // produced by the RenderStep automatically.
 
     // Fixed program header
-    SkSL::String sksl =
+    std::string sksl =
         "layout (binding=0) uniform intrinsicUniforms {\n"
         "    layout(offset=0) float4 rtAdjust;\n"
         "};\n"
@@ -148,23 +173,24 @@
     return sksl;
 }
 
-SkSL::String get_sksl_fs(const GraphicsPipelineDesc& desc) {
-    SkSL::String sksl;
-
-    // Typedefs needed for painting
-    auto paintUniforms = GetUniforms(desc.shaderCombo().fShaderType);
-    if (!paintUniforms.empty()) {
-        sksl += emit_SKSL_uniforms(2, "FS", paintUniforms);
+std::string get_sksl_fs(SkShaderCodeDictionary* dict,
+                        const GraphicsPipelineDesc& desc,
+                        bool* writesColor) {
+    if (!desc.paintParamsID().isValid()) {
+        *writesColor = false;
+        return {};
     }
 
-    sksl += "layout(location = 0, index = 0) out half4 sk_FragColor;\n";
-    sksl += "void main() {\n"
-            "    half4 outColor;\n";
-    sksl += GetShaderSkSL(desc.shaderCombo().fShaderType);
-    sksl += "    sk_FragColor = outColor;\n"
-            "}\n";
+    SkShaderInfo shaderInfo;
 
-    return sksl;
+    dict->getShaderInfo(desc.paintParamsID(), &shaderInfo);
+
+    *writesColor = shaderInfo.writesColor();
+#if SK_SUPPORT_GPU
+    return shaderInfo.toSkSL();
+#else
+    return {};
+#endif
 }
 
 inline MTLVertexFormat attribute_type_to_mtlformat(VertexAttribType type) {
@@ -299,6 +325,30 @@ inline MTLVertexFormat attribute_type_to_mtlformat(VertexAttribType type) {
 
 } // anonymous namespace
 
+std::string GetMtlUniforms(int bufferID,
+                           const char* name,
+                           const std::vector<SkShaderInfo::SnippetEntry>& codeSnippets) {
+    size_t numUniforms = 0;
+    for (auto e : codeSnippets) {
+        numUniforms += e.fUniforms.size();
+    }
+
+    if (!numUniforms) {
+        return {};
+    }
+
+    int offset = 0;
+
+    std::string result = get_uniform_header(bufferID, name);
+    for (int i = 0; i < (int) codeSnippets.size(); ++i) {
+        result += get_uniforms(codeSnippets[i].fUniforms, &offset, i);
+    }
+    result.append("};\n\n");
+
+    return result;
+}
+
+
 enum ShaderType {
     kVertex_ShaderType = 0,
     kFragment_ShaderType = 1,
@@ -307,43 +357,52 @@ inline MTLVertexFormat attribute_type_to_mtlformat(VertexAttribType type) {
 };
 static const int kShaderTypeCount = kLast_ShaderType + 1;
 
-sk_sp<GraphicsPipeline> GraphicsPipeline::Make(const Gpu* gpu,
-                                               const skgpu::GraphicsPipelineDesc& desc) {
+sk_sp<GraphicsPipeline> GraphicsPipeline::Make(ResourceProvider* resourceProvider,
+                                               const Gpu* gpu,
+                                               const skgpu::GraphicsPipelineDesc& pipelineDesc,
+                                               const skgpu::RenderPassDesc& renderPassDesc) {
     sk_cfp<MTLRenderPipelineDescriptor*> psoDescriptor([[MTLRenderPipelineDescriptor alloc] init]);
 
-    SkSL::String msl[kShaderTypeCount];
+    std::string msl[kShaderTypeCount];
     SkSL::Program::Inputs inputs[kShaderTypeCount];
     SkSL::Program::Settings settings;
 
+    ShaderErrorHandler* errorHandler = DefaultShaderErrorHandler();
     if (!SkSLToMSL(gpu,
-                   get_sksl_vs(desc),
+                   get_sksl_vs(pipelineDesc),
                    SkSL::ProgramKind::kVertex,
                    settings,
                    &msl[kVertex_ShaderType],
-                   &inputs[kVertex_ShaderType])) {
+                   &inputs[kVertex_ShaderType],
+                   errorHandler)) {
         return nullptr;
     }
 
+    bool writesColor;
+    auto dict = resourceProvider->shaderCodeDictionary();
     if (!SkSLToMSL(gpu,
-                   get_sksl_fs(desc),
+                   get_sksl_fs(dict, pipelineDesc, &writesColor),
                    SkSL::ProgramKind::kFragment,
                    settings,
                    &msl[kFragment_ShaderType],
-                   &inputs[kFragment_ShaderType])) {
+                   &inputs[kFragment_ShaderType],
+                   errorHandler)) {
         return nullptr;
     }
 
     sk_cfp<id<MTLLibrary>> shaderLibraries[kShaderTypeCount];
 
     shaderLibraries[kVertex_ShaderType] = CompileShaderLibrary(gpu,
-                                                               msl[kVertex_ShaderType]);
+                                                               msl[kVertex_ShaderType],
+                                                               errorHandler);
     shaderLibraries[kFragment_ShaderType] = CompileShaderLibrary(gpu,
-                                                                 msl[kFragment_ShaderType]);
+                                                                 msl[kFragment_ShaderType],
+                                                                 errorHandler);
     if (!shaderLibraries[kVertex_ShaderType] || !shaderLibraries[kFragment_ShaderType]) {
         return nullptr;
     }
 
-    (*psoDescriptor).label = @(desc.renderStep()->name());
+    (*psoDescriptor).label = @(pipelineDesc.renderStep()->name());
 
     (*psoDescriptor).vertexFunction =
             [shaderLibraries[kVertex_ShaderType].get() newFunctionWithName: @"vertexMain"];
@@ -351,37 +410,32 @@ inline MTLVertexFormat attribute_type_to_mtlformat(VertexAttribType type) {
             [shaderLibraries[kFragment_ShaderType].get() newFunctionWithName: @"fragmentMain"];
 
     // TODO: I *think* this gets cleaned up by the pipelineDescriptor?
-    (*psoDescriptor).vertexDescriptor = create_vertex_descriptor(desc.renderStep());
+    (*psoDescriptor).vertexDescriptor = create_vertex_descriptor(pipelineDesc.renderStep());
 
     // TODO: I *think* this gets cleaned up by the pipelineDescriptor as well?
     auto mtlColorAttachment = [[MTLRenderPipelineColorAttachmentDescriptor alloc] init];
 
-    mtlColorAttachment.pixelFormat = MTLPixelFormatRGBA8Unorm;
+    mtl::TextureInfo mtlTexInfo;
+    renderPassDesc.fColorAttachment.fTextureInfo.getMtlTextureInfo(&mtlTexInfo);
+
+    mtlColorAttachment.pixelFormat = (MTLPixelFormat)mtlTexInfo.fFormat;
+
     mtlColorAttachment.blendingEnabled = FALSE;
-    mtlColorAttachment.writeMask = MTLColorWriteMaskAll;
+
+    mtlColorAttachment.writeMask = writesColor ? MTLColorWriteMaskAll : MTLColorWriteMaskNone;
 
     (*psoDescriptor).colorAttachments[0] = mtlColorAttachment;
 
-    Mask<DepthStencilFlags> depthStencilFlags = desc.renderStep()->depthStencilFlags();
-    if (depthStencilFlags != DepthStencilFlags::kNone) {
-        skgpu::TextureInfo texInfo =
-                gpu->caps()->getDefaultDepthStencilTextureInfo(depthStencilFlags,
-                                                               1 /*sampleCount*/, // TODO: MSAA
-                                                               Protected::kNo);
-        mtl::TextureInfo mtlTexInfo;
-        texInfo.getMtlTextureInfo(&mtlTexInfo);
-        if (depthStencilFlags & DepthStencilFlags::kStencil) {
-            (*psoDescriptor).stencilAttachmentPixelFormat = (MTLPixelFormat)mtlTexInfo.fFormat;
-        } else {
-            (*psoDescriptor).stencilAttachmentPixelFormat = MTLPixelFormatInvalid;
-        }
-        if (depthStencilFlags & DepthStencilFlags::kDepth) {
-            (*psoDescriptor).depthAttachmentPixelFormat = (MTLPixelFormat)mtlTexInfo.fFormat;
-        } else {
-            (*psoDescriptor).depthAttachmentPixelFormat = MTLPixelFormatInvalid;
-        }
+    renderPassDesc.fDepthStencilAttachment.fTextureInfo.getMtlTextureInfo(&mtlTexInfo);
+    MTLPixelFormat depthStencilFormat = (MTLPixelFormat)mtlTexInfo.fFormat;
+    if (FormatIsStencil(depthStencilFormat)) {
+        (*psoDescriptor).stencilAttachmentPixelFormat = depthStencilFormat;
     } else {
         (*psoDescriptor).stencilAttachmentPixelFormat = MTLPixelFormatInvalid;
+    }
+    if (FormatIsDepth(depthStencilFormat)) {
+        (*psoDescriptor).depthAttachmentPixelFormat = depthStencilFormat;
+    } else {
         (*psoDescriptor).depthAttachmentPixelFormat = MTLPixelFormatInvalid;
     }
 
@@ -390,21 +444,26 @@ inline MTLVertexFormat attribute_type_to_mtlformat(VertexAttribType type) {
             [gpu->device() newRenderPipelineStateWithDescriptor:psoDescriptor.get()
                                                           error:&error]);
     if (!pso) {
-        SkDebugf("Pipeline creation failure\n");
-        SkDebugf("Errors:\n%s", error.debugDescription.UTF8String);
+        SKGPU_LOG_E("Pipeline creation failure:\n%s", error.debugDescription.UTF8String);
         return nullptr;
     }
 
-    auto resourceProvider = (skgpu::mtl::ResourceProvider*) gpu->resourceProvider();
-    const DepthStencilSettings& depthStencilSettings = desc.renderStep()->depthStencilSettings();
+    const DepthStencilSettings& depthStencilSettings =
+            pipelineDesc.renderStep()->depthStencilSettings();
     id<MTLDepthStencilState> dss = resourceProvider->findOrCreateCompatibleDepthStencilState(
             depthStencilSettings);
 
-    return sk_sp<GraphicsPipeline>(new GraphicsPipeline(std::move(pso),
-                                                        dss,
-                                                        depthStencilSettings.fStencilReferenceValue,
-                                                        desc.renderStep()->vertexStride(),
-                                                        desc.renderStep()->instanceStride()));
+    return sk_sp<GraphicsPipeline>(
+            new GraphicsPipeline(gpu,
+                                 std::move(pso),
+                                 dss,
+                                 depthStencilSettings.fStencilReferenceValue,
+                                 pipelineDesc.renderStep()->vertexStride(),
+                                 pipelineDesc.renderStep()->instanceStride()));
+}
+
+void GraphicsPipeline::onFreeGpuData() {
+    fPipelineState.reset();
 }
 
 } // namespace skgpu::mtl
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h b/third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h
index 52a40462f5015..7e8edebf2884a 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlRenderCommandEncoder.h
@@ -8,6 +8,7 @@
 #ifndef skgpu_MtlRenderCommandEncoder_DEFINED
 #define skgpu_MtlRenderCommandEncoder_DEFINED
 
+#include "experimental/graphite/src/Resource.h"
 #include "include/core/SkRefCnt.h"
 #include "include/ports/SkCFObject.h"
 
@@ -18,14 +19,15 @@ namespace skgpu::mtl {
 /**
  * Wraps a MTLRenderCommandEncoder object and associated tracked state
  */
-class RenderCommandEncoder : public SkRefCnt {
+class RenderCommandEncoder : public Resource {
 public:
-    static sk_sp<RenderCommandEncoder> Make(id<MTLCommandBuffer> commandBuffer,
+    static sk_sp<RenderCommandEncoder> Make(const Gpu* gpu,
+                                            id<MTLCommandBuffer> commandBuffer,
                                             MTLRenderPassDescriptor* descriptor) {
         // Adding a retain here to keep our own ref separate from the autorelease pool
         sk_cfp<id<MTLRenderCommandEncoder>> encoder =
                  sk_ret_cfp([commandBuffer renderCommandEncoderWithDescriptor:descriptor]);
-        return sk_sp<RenderCommandEncoder>(new RenderCommandEncoder(std::move(encoder)));
+        return sk_sp<RenderCommandEncoder>(new RenderCommandEncoder(gpu, std::move(encoder)));
     }
 
     void setLabel(NSString* label) {
@@ -240,8 +242,12 @@ class RenderCommandEncoder : public SkRefCnt {
     }
 
 private:
-    RenderCommandEncoder(sk_cfp<id<MTLRenderCommandEncoder>> encoder)
-        : fCommandEncoder(std::move(encoder)) {}
+    RenderCommandEncoder(const Gpu* gpu, sk_cfp<id<MTLRenderCommandEncoder>> encoder)
+        : Resource(gpu), fCommandEncoder(std::move(encoder)) {}
+
+    void onFreeGpuData() override {
+        fCommandEncoder.reset();
+    }
 
     sk_cfp<id<MTLRenderCommandEncoder>> fCommandEncoder;
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.h b/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.h
index 3c6f359d30abe..bc19d3b8cd351 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.h
@@ -24,7 +24,7 @@ class Gpu;
 
 class ResourceProvider final : public skgpu::ResourceProvider {
 public:
-    ResourceProvider(const skgpu::Gpu* gpu);
+    ResourceProvider(const skgpu::Gpu* gpu, sk_sp<GlobalCache>, SingleOwner*);
     ~ResourceProvider() override {}
 
     sk_sp<skgpu::Texture> createWrappedTexture(const BackendTexture&) override;
@@ -36,10 +36,15 @@ class ResourceProvider final : public skgpu::ResourceProvider {
     const Gpu* mtlGpu();
 
     sk_sp<skgpu::CommandBuffer> createCommandBuffer() override;
-    sk_sp<skgpu::GraphicsPipeline> onCreateGraphicsPipeline(const GraphicsPipelineDesc&) override;
+    sk_sp<skgpu::GraphicsPipeline> onCreateGraphicsPipeline(const GraphicsPipelineDesc&,
+                                                            const RenderPassDesc&) override;
     sk_sp<skgpu::Texture> createTexture(SkISize, const skgpu::TextureInfo&) override;
     sk_sp<skgpu::Buffer> createBuffer(size_t size, BufferType type, PrioritizeGpuReads) override;
 
+    sk_sp<skgpu::Sampler> createSampler(const SkSamplingOptions&,
+                                        SkTileMode xTileMode,
+                                        SkTileMode yTileMode) override;
+
     SkTHashMap<DepthStencilSettings, sk_cfp<id<MTLDepthStencilState>>> fDepthStencilStates;
 };
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.mm b/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.mm
index 84c21eb1b126e..d8bc11a616603 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlResourceProvider.mm
@@ -8,19 +8,23 @@
 #include "experimental/graphite/src/mtl/MtlResourceProvider.h"
 
 #include "experimental/graphite/include/BackendTexture.h"
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/GraphicsPipelineDesc.h"
 #include "experimental/graphite/src/mtl/MtlBuffer.h"
 #include "experimental/graphite/src/mtl/MtlCommandBuffer.h"
 #include "experimental/graphite/src/mtl/MtlGpu.h"
 #include "experimental/graphite/src/mtl/MtlGraphicsPipeline.h"
+#include "experimental/graphite/src/mtl/MtlSampler.h"
 #include "experimental/graphite/src/mtl/MtlTexture.h"
 
 #import <Metal/Metal.h>
 
 namespace skgpu::mtl {
 
-ResourceProvider::ResourceProvider(const skgpu::Gpu* gpu)
-    : skgpu::ResourceProvider(gpu) {
+ResourceProvider::ResourceProvider(const skgpu::Gpu* gpu,
+                                   sk_sp<GlobalCache> globalCache,
+                                   SingleOwner* singleOwner)
+    : skgpu::ResourceProvider(gpu, std::move(globalCache), singleOwner) {
 }
 
 const Gpu* ResourceProvider::mtlGpu() {
@@ -32,8 +36,12 @@
 }
 
 sk_sp<skgpu::GraphicsPipeline> ResourceProvider::onCreateGraphicsPipeline(
-        const GraphicsPipelineDesc& desc) {
-    return GraphicsPipeline::Make(this->mtlGpu(), desc);
+        const GraphicsPipelineDesc& pipelineDesc,
+        const RenderPassDesc& renderPassDesc) {
+    return GraphicsPipeline::Make(this,
+                                  this->mtlGpu(),
+                                  pipelineDesc,
+                                  renderPassDesc);
 }
 
 sk_sp<skgpu::Texture> ResourceProvider::createTexture(SkISize dimensions,
@@ -47,7 +55,10 @@
         return nullptr;
     }
     sk_cfp<id<MTLTexture>> mtlTexture = sk_ret_cfp((id<MTLTexture>)mtlHandleTexture);
-    return Texture::MakeWrapped(texture.dimensions(), texture.info(), std::move(mtlTexture));
+    return Texture::MakeWrapped(this->mtlGpu(),
+                                texture.dimensions(),
+                                texture.info(),
+                                std::move(mtlTexture));
 }
 
 sk_sp<skgpu::Buffer> ResourceProvider::createBuffer(size_t size,
@@ -56,6 +67,12 @@
     return Buffer::Make(this->mtlGpu(), size, type, prioritizeGpuReads);
 }
 
+sk_sp<skgpu::Sampler> ResourceProvider::createSampler(const SkSamplingOptions& samplingOptions,
+                                                      SkTileMode xTileMode,
+                                                      SkTileMode yTileMode) {
+    return Sampler::Make(this->mtlGpu(), samplingOptions, xTileMode, yTileMode);
+}
+
 namespace {
 MTLCompareFunction compare_op_to_mtl(CompareOp op) {
     switch (op) {
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlSampler.h b/third_party/skia/experimental/graphite/src/mtl/MtlSampler.h
new file mode 100644
index 0000000000000..97f8cc22b135e
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlSampler.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_MtlSampler_DEFINED
+#define skgpu_MtlSampler_DEFINED
+
+#include "experimental/graphite/src/Sampler.h"
+
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTileMode.h"
+#include "include/ports/SkCFObject.h"
+
+#import <Metal/Metal.h>
+
+struct SkSamplingOptions;
+
+namespace skgpu::mtl {
+
+class Gpu;
+
+class Sampler : public skgpu::Sampler {
+public:
+    static sk_sp<Sampler> Make(const Gpu*,
+                               const SkSamplingOptions& samplingOptions,
+                               SkTileMode xTileMode,
+                               SkTileMode yTileMode);
+
+    ~Sampler() override {}
+
+    id<MTLSamplerState> mtlSamplerState() const { return fSamplerState.get(); }
+
+private:
+    Sampler(const Gpu* gpu,
+            sk_cfp<id<MTLSamplerState>>);
+
+    void onFreeGpuData() override;
+
+    sk_cfp<id<MTLSamplerState>> fSamplerState;
+};
+
+} // namepsace skgpu::mtl
+
+#endif // skgpu_MtlSampler_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlSampler.mm b/third_party/skia/experimental/graphite/src/mtl/MtlSampler.mm
new file mode 100644
index 0000000000000..ccb19b1271803
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlSampler.mm
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "experimental/graphite/src/mtl/MtlSampler.h"
+
+#include "experimental/graphite/src/mtl/MtlCaps.h"
+#include "experimental/graphite/src/mtl/MtlGpu.h"
+#include "include/core/SkSamplingOptions.h"
+
+namespace skgpu::mtl {
+
+Sampler::Sampler(const Gpu* gpu,
+                 sk_cfp<id<MTLSamplerState>> samplerState)
+        : skgpu::Sampler(gpu)
+        , fSamplerState(std::move(samplerState)) {}
+
+static inline MTLSamplerAddressMode tile_mode_to_mtl_sampler_address(SkTileMode tileMode,
+                                                                     const Caps& caps) {
+    switch (tileMode) {
+        case SkTileMode::kClamp:
+            return MTLSamplerAddressModeClampToEdge;
+        case SkTileMode::kRepeat:
+            return MTLSamplerAddressModeRepeat;
+        case SkTileMode::kMirror:
+            return MTLSamplerAddressModeMirrorRepeat;
+        case SkTileMode::kDecal:
+            // For this tilemode, we should have checked that clamp-to-border support exists.
+            // If it doesn't we should have fallen back to a shader instead.
+            // TODO: for textures with alpha, we could use ClampToZero if there's no
+            // ClampToBorderColor as they'll clamp to (0,0,0,0).
+            // Unfortunately textures without alpha end up clamping to (0,0,0,1).
+            if (@available(macOS 10.12, iOS 14.0, *)) {
+                SkASSERT(caps.clampToBorderSupport());
+                return MTLSamplerAddressModeClampToBorderColor;
+            } else {
+                SkASSERT(false);
+                return MTLSamplerAddressModeClampToZero;
+            }
+    }
+    SkUNREACHABLE;
+}
+
+sk_sp<Sampler> Sampler::Make(const Gpu* gpu,
+                             const SkSamplingOptions& samplingOptions,
+                             SkTileMode xTileMode,
+                             SkTileMode yTileMode) {
+    sk_cfp<MTLSamplerDescriptor*> desc([[MTLSamplerDescriptor alloc] init]);
+
+    MTLSamplerMinMagFilter minMagFilter = [&] {
+        switch (samplingOptions.filter) {
+            case SkFilterMode::kNearest: return MTLSamplerMinMagFilterNearest;
+            case SkFilterMode::kLinear:  return MTLSamplerMinMagFilterLinear;
+        }
+        SkUNREACHABLE;
+    }();
+
+    MTLSamplerMipFilter mipFilter = [&] {
+      switch (samplingOptions.mipmap) {
+          case SkMipmapMode::kNone:    return MTLSamplerMipFilterNotMipmapped;
+          case SkMipmapMode::kNearest: return MTLSamplerMipFilterNearest;
+          case SkMipmapMode::kLinear:  return MTLSamplerMipFilterLinear;
+      }
+      SkUNREACHABLE;
+    }();
+
+    auto samplerDesc = [[MTLSamplerDescriptor alloc] init];
+    samplerDesc.rAddressMode = MTLSamplerAddressModeClampToEdge;
+    samplerDesc.sAddressMode = tile_mode_to_mtl_sampler_address(xTileMode, gpu->mtlCaps());
+    samplerDesc.tAddressMode = tile_mode_to_mtl_sampler_address(yTileMode, gpu->mtlCaps());
+    samplerDesc.magFilter = minMagFilter;
+    samplerDesc.minFilter = minMagFilter;
+    samplerDesc.mipFilter = mipFilter;
+    samplerDesc.lodMinClamp = 0.0f;
+    samplerDesc.lodMaxClamp = FLT_MAX;  // default value according to docs.
+    samplerDesc.maxAnisotropy = 1.0f;
+    samplerDesc.normalizedCoordinates = true;
+    if (@available(macOS 10.11, iOS 9.0, *)) {
+        samplerDesc.compareFunction = MTLCompareFunctionNever;
+    }
+#ifdef SK_ENABLE_MTL_DEBUG_INFO
+    // TODO: add label?
+#endif
+
+    sk_cfp<id<MTLSamplerState>> sampler([gpu->device() newSamplerStateWithDescriptor:desc.get()]);
+    if (!sampler) {
+        return nullptr;
+    }
+    return sk_sp<Sampler>(new Sampler(gpu, std::move(sampler)));
+}
+
+void Sampler::onFreeGpuData() {
+    fSamplerState.reset();
+}
+
+} // namespace skgpu::mtl
+
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlTexture.h b/third_party/skia/experimental/graphite/src/mtl/MtlTexture.h
index 64880397c5c68..aee173236b9a0 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlTexture.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlTexture.h
@@ -9,6 +9,7 @@
 #define skgpu_MtlTexture_DEFINED
 
 #include "experimental/graphite/src/Texture.h"
+#include "include/core/SkRefCnt.h"
 
 #import <Metal/Metal.h>
 
@@ -22,11 +23,12 @@ class Texture : public skgpu::Texture {
                                                  SkISize dimensions,
                                                  const skgpu::TextureInfo&);
 
-    static sk_sp<Texture> Make(const Gpu* gpu,
+    static sk_sp<Texture> Make(const Gpu*,
                                SkISize dimensions,
                                const skgpu::TextureInfo&);
 
-    static sk_sp<Texture> MakeWrapped(SkISize dimensions,
+    static sk_sp<Texture> MakeWrapped(const Gpu*,
+                                      SkISize dimensions,
                                       const skgpu::TextureInfo&,
                                       sk_cfp<id<MTLTexture>>);
 
@@ -35,11 +37,14 @@ class Texture : public skgpu::Texture {
     id<MTLTexture> mtlTexture() const { return fTexture.get(); }
 
 private:
-    Texture(SkISize dimensions,
+    Texture(const Gpu* gpu,
+            SkISize dimensions,
             const skgpu::TextureInfo& info,
             sk_cfp<id<MTLTexture>>,
             Ownership);
 
+    void onFreeGpuData() override;
+
     sk_cfp<id<MTLTexture>> fTexture;
 };
 
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlTexture.mm b/third_party/skia/experimental/graphite/src/mtl/MtlTexture.mm
index 589cc77a91b71..2b3bdd0799688 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlTexture.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlTexture.mm
@@ -77,11 +77,12 @@
     return texture;
 }
 
-Texture::Texture(SkISize dimensions,
+Texture::Texture(const Gpu* gpu,
+                 SkISize dimensions,
                  const skgpu::TextureInfo& info,
                  sk_cfp<id<MTLTexture>> texture,
                  Ownership ownership)
-        : skgpu::Texture(dimensions, info, ownership)
+        : skgpu::Texture(gpu, dimensions, info, ownership)
         , fTexture(std::move(texture)) {}
 
 sk_sp<Texture> Texture::Make(const Gpu* gpu,
@@ -91,13 +92,26 @@
     if (!texture) {
         return nullptr;
     }
-    return sk_sp<Texture>(new Texture(dimensions, info, std::move(texture), Ownership::kOwned));
+    return sk_sp<Texture>(new Texture(gpu,
+                                      dimensions,
+                                      info,
+                                      std::move(texture),
+                                      Ownership::kOwned));
 }
 
-sk_sp<Texture> Texture::MakeWrapped(SkISize dimensions,
+sk_sp<Texture> Texture::MakeWrapped(const Gpu* gpu,
+                                    SkISize dimensions,
                                     const skgpu::TextureInfo& info,
                                     sk_cfp<id<MTLTexture>> texture) {
-    return sk_sp<Texture>(new Texture(dimensions, info, std::move(texture), Ownership::kWrapped));
+    return sk_sp<Texture>(new Texture(gpu,
+                                      dimensions,
+                                      info,
+                                      std::move(texture),
+                                      Ownership::kWrapped));
+}
+
+void Texture::onFreeGpuData() {
+    fTexture.reset();
 }
 
 } // namespace skgpu::mtl
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlUtils.h b/third_party/skia/experimental/graphite/src/mtl/MtlUtils.h
index 6b36117b4e993..b7387aff70088 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlUtils.h
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlUtils.h
@@ -15,11 +15,10 @@
 
 #import <Metal/Metal.h>
 
-namespace SkSL {
-class String;
-}
+namespace skgpu {
+class ShaderErrorHandler;
 
-namespace skgpu::mtl {
+namespace mtl {
 
 class Gpu;
 
@@ -35,15 +34,21 @@ MTLPixelFormat DepthStencilFlagsToFormat(Mask<DepthStencilFlags>);
  * Produces MSL code generated by SkSLC
  */
 bool SkSLToMSL(const Gpu* gpu,
-               const SkSL::String& sksl,
+               const std::string& sksl,
                SkSL::ProgramKind kind,
                const SkSL::Program::Settings& settings,
-               SkSL::String* msl,
-               SkSL::Program::Inputs* outInputs);
+               std::string* msl,
+               SkSL::Program::Inputs* outInputs,
+               ShaderErrorHandler* errorHandler);
 
 sk_cfp<id<MTLLibrary>> CompileShaderLibrary(const Gpu* gpu,
-                                            const SkSL::String& msl);
+                                            const std::string& msl,
+                                            ShaderErrorHandler* errorHandler);
 
+#ifdef SK_BUILD_FOR_IOS
+bool IsAppInBackground();
+#endif
 } // namespace skgpu::mtl
+} // namespace skgpu
 
 #endif // skgpu_MtlUtils_DEFINED
diff --git a/third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm b/third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
index 07a64152470b9..fc204d349b7d7 100644
--- a/third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
+++ b/third_party/skia/experimental/graphite/src/mtl/MtlUtils.mm
@@ -8,9 +8,15 @@
 #include "experimental/graphite/src/mtl/MtlUtils.h"
 
 #include "experimental/graphite/src/mtl/MtlGpu.h"
+#include "include/gpu/ShaderErrorHandler.h"
 #include "include/private/SkSLString.h"
 #include "src/core/SkTraceEvent.h"
 #include "src/sksl/SkSLCompiler.h"
+#include "src/utils/SkShaderUtils.h"
+
+#ifdef SK_BUILD_FOR_IOS
+#import <UIKit/UIApplication.h>
+#endif
 
 namespace skgpu::mtl {
 
@@ -47,6 +53,8 @@ MTLPixelFormat SkColorTypeToFormat(SkColorType colorType) {
     switch (colorType) {
         case kRGBA_8888_SkColorType:
             return MTLPixelFormatRGBA8Unorm;
+        case kBGRA_8888_SkColorType:
+            return MTLPixelFormatBGRA8Unorm;
         case kAlpha_8_SkColorType:
             return MTLPixelFormatR8Unorm;
         case kRGBA_F16_SkColorType:
@@ -77,43 +85,37 @@ MTLPixelFormat DepthStencilFlagsToFormat(Mask<DepthStencilFlags> mask) {
 static const bool gPrintSKSL = false;
 static const bool gPrintMSL = false;
 
-// TODO: add errorHandler support
-static void compile_error(const char* shaderSource, const char* errorText) {
-    SkDebugf("Shader compilation error\n"
-             "------------------------\n");
-    SkDebugf("%s", shaderSource);
-    SkDebugf("Errors:\n%s", errorText);
-}
-
 bool SkSLToMSL(const Gpu* gpu,
-               const SkSL::String& sksl,
+               const std::string& sksl,
                SkSL::ProgramKind programKind,
                const SkSL::Program::Settings& settings,
-               SkSL::String* msl,
-               SkSL::Program::Inputs* outInputs) {
-    const SkSL::String& src = sksl;
+               std::string* msl,
+               SkSL::Program::Inputs* outInputs,
+               ShaderErrorHandler* errorHandler) {
+#ifdef SK_DEBUG
+    std::string src = SkShaderUtils::PrettyPrint(sksl);
+#else
+    const std::string& src = sksl;
+#endif
     SkSL::Compiler* compiler = gpu->shaderCompiler();
     std::unique_ptr<SkSL::Program> program =
             gpu->shaderCompiler()->convertProgram(programKind,
                                                   src,
                                                   settings);
     if (!program || !compiler->toMetal(*program, msl)) {
-        compile_error(src.c_str(), compiler->errorText().c_str());
+        errorHandler->compileError(src.c_str(), compiler->errorText().c_str());
         return false;
     }
 
     if (gPrintSKSL || gPrintMSL) {
-        // TODO: add GrShaderUtils support
-        SkDebugf("------- Shader --------\n");
+        SkShaderUtils::PrintShaderBanner(programKind);
         if (gPrintSKSL) {
             SkDebugf("SKSL:\n");
-            // TODO: add GrShaderUtils support
-            SkDebugf("%s\n", sksl.c_str());
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(sksl));
         }
         if (gPrintMSL) {
             SkDebugf("MSL:\n");
-            // TODO: add GrShaderUtils support
-            SkDebugf("%s\n", msl->c_str());
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(*msl));
         }
     }
 
@@ -122,7 +124,8 @@ bool SkSLToMSL(const Gpu* gpu,
 }
 
 sk_cfp<id<MTLLibrary>> CompileShaderLibrary(const Gpu* gpu,
-                                            const SkSL::String& msl) {
+                                            const std::string& msl,
+                                            ShaderErrorHandler* errorHandler) {
     TRACE_EVENT0("skia.shaders", "driver_compile_shader");
     auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
                                                    length:msl.size()
@@ -145,11 +148,17 @@ bool SkSLToMSL(const Gpu* gpu,
                                                                        options:options
                                                                          error:&error]);
     if (!compiledLibrary) {
-        compile_error(msl.c_str(), error.debugDescription.UTF8String);
+        errorHandler->compileError(msl.c_str(), error.debugDescription.UTF8String);
         return nil;
     }
 
     return compiledLibrary;
 }
 
+#ifdef SK_BUILD_FOR_IOS
+bool IsAppInBackground() {
+    return [NSThread isMainThread] &&
+           ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground);
+}
+#endif
 } // namespace skgpu::mtl
diff --git a/third_party/skia/experimental/graphite/src/render/BUILD.bazel b/third_party/skia/experimental/graphite/src/render/BUILD.bazel
new file mode 100644
index 0000000000000..6a6180c53aad2
--- /dev/null
+++ b/third_party/skia/experimental/graphite/src/render/BUILD.bazel
@@ -0,0 +1,19 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "StencilAndFillPathRenderer_src",
+    srcs = ["StencilAndFillPathRenderer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:DrawWriter_hdr",
+        "//experimental/graphite/src:Renderer_hdr",
+        "//experimental/graphite/src:UniformManager_hdr",
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//experimental/graphite/src/geom:Transform_graphite_hdr",
+        "//include/core:SkPathTypes_hdr",
+        "//include/core:SkRect_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//src/gpu:BufferWriter_hdr",
+        "//src/gpu/tessellate:MiddleOutPolygonTriangulator_hdr",
+    ],
+)
diff --git a/third_party/skia/experimental/graphite/src/render/StencilAndFillPathRenderer.cpp b/third_party/skia/experimental/graphite/src/render/StencilAndFillPathRenderer.cpp
index 767ccbdae0a91..d1e5763787c38 100644
--- a/third_party/skia/experimental/graphite/src/render/StencilAndFillPathRenderer.cpp
+++ b/third_party/skia/experimental/graphite/src/render/StencilAndFillPathRenderer.cpp
@@ -7,34 +7,178 @@
 
 #include "experimental/graphite/src/Renderer.h"
 
-#include "experimental/graphite/src/ContextUtils.h"
 #include "experimental/graphite/src/DrawWriter.h"
 #include "experimental/graphite/src/UniformManager.h"
 #include "experimental/graphite/src/geom/Shape.h"
 #include "experimental/graphite/src/geom/Transform_graphite.h"
+#include "include/core/SkPathTypes.h"
+#include "include/core/SkRect.h"
+#include "src/core/SkUniformData.h"
 #include "src/gpu/BufferWriter.h"
+#include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h"
 
 namespace skgpu {
 
 namespace {
 
-// TODO: Hand off to csmartdalton, this should roughly correspond to the fStencilFanProgram and
-// simple triangulator shader stage of the skgpu::v1::PathStencilCoverOp
-/*
-class StencilFanRenderStep : public RenderStep {
+// TODO: These settings are actually shared by tessellating path renderers, so will be exposed later
+
+// Returns the stencil settings to use for a standard Redbook "stencil" pass.
+constexpr DepthStencilSettings fillrule_settings(bool evenOdd) {
+    // Increments clockwise triangles and decrements counterclockwise. Used for "winding" fill.
+    constexpr DepthStencilSettings::Face kIncCW = {
+        /*stencilFail=*/   StencilOp::kKeep,
+        /*depthFail=*/     StencilOp::kKeep,
+        /*dsPass=*/        StencilOp::kIncWrap,
+        /*stencilCompare=*/CompareOp::kAlways,
+        /*readMask=*/      0xffffffff,
+        /*writeMask=*/     0xffffffff
+    };
+    constexpr DepthStencilSettings::Face kDecCCW = {
+        /*stencilFail=*/   StencilOp::kKeep,
+        /*depthFail=*/     StencilOp::kKeep,
+        /*dsPass=*/        StencilOp::kDecWrap,
+        /*stencilCompare=*/CompareOp::kAlways,
+        /*readMask=*/      0xffffffff,
+        /*writeMask=*/     0xffffffff
+    };
+
+    // Toggles the bottom stencil bit. Used for "even-odd" fill.
+    constexpr DepthStencilSettings::Face kToggle = {
+        /*stencilFail=*/   StencilOp::kKeep,
+        /*depthFail=*/     StencilOp::kKeep,
+        /*dsPass=*/        StencilOp::kInvert,
+        /*stencilCompare=*/CompareOp::kAlways,
+        /*readMask=*/      0xffffffff,
+        /*writeMask=*/     0x00000001
+    };
+
+    // Always use ref = 0, disable depths, but still use greater depth test.
+    constexpr DepthStencilSettings kWindingFill = {
+        /*frontStencil=*/kIncCW,
+        /*backStencil=*/ kDecCCW,
+        /*refValue=*/    0,
+        /*stencilTest=*/ true,
+        /*depthCompare=*/CompareOp::kAlways, // kGreater once steps know the right depth value
+        /*depthTest=*/   true,
+        /*depthWrite=*/  false
+    };
+    constexpr DepthStencilSettings kEvenOddFill = {
+        /*frontStencil=*/kToggle,
+        /*backStencil=*/ kToggle,
+        /*refValue=*/    0,
+        /*stencilTest=*/ true,
+        /*depthCompare=*/CompareOp::kAlways, // kGreater once steps know the right depth value
+        /*depthTest=*/   true,
+        /*depthWrite=*/  false
+    };
+
+    return evenOdd ? kEvenOddFill : kWindingFill;
+}
+
+// Returns the stencil settings to use for a standard Redbook "fill" pass. Allows non-zero
+// stencil values to pass and write a color, and resets the stencil value back to zero; discards
+// immediately on stencil values of zero (or does the inverse of these operations when the path
+// requires filling everything else).
+constexpr DepthStencilSettings cover_settings(bool inverse) {
+    // Resets non-zero bits to 0, passes when not zero. We set depthFail to kZero because if we
+    // encounter that case, the kNotEqual=0 stencil test passed, so it does need to be set back to 0
+    // and the dsPass op won't be run. In practice, since the stencil steps will fail the same depth
+    // test, the stencil value will likely not be non-zero, but best to be explicit.
+    constexpr DepthStencilSettings::Face kNormal = {
+        /*stencilFail=*/   StencilOp::kKeep,
+        /*depthFail=*/     StencilOp::kZero,
+        /*dsPass=*/        StencilOp::kZero,
+        /*stencilCompare=*/CompareOp::kNotEqual,
+        /*readMask=*/      0xffffffff,
+        /*writeMask=*/     0xffffffff
+    };
+
+    // Resets non-zero bits to 0, passes when zero
+    constexpr DepthStencilSettings::Face kInverted = {
+        /*stencilFail=*/   StencilOp::kZero,
+        /*depthFail=*/     StencilOp::kKeep,
+        /*dsPass=*/        StencilOp::kKeep,
+        /*stencilCompare=*/CompareOp::kEqual,
+        /*readMask=*/      0xffffffff,
+        /*writeMask=*/     0xffffffff
+    };
+
+    // Always use ref = 0, enabled depth writes, and greater depth test, both
+    // front and back use the same stencil settings.
+    constexpr DepthStencilSettings kNormalDSS = {
+        /*frontStencil=*/kNormal,
+        /*frontStencil=*/kNormal,
+        /*refValue=*/    0,
+        /*stencilTest=*/ true,
+        /*depthCompare=*/CompareOp::kAlways, // kGreater once steps know the right depth value
+        /*depthTest=*/   true,
+        /*depthWrite=*/  true
+    };
+    constexpr DepthStencilSettings kInvertedDSS = {
+        /*frontStencil=*/kInverted,
+        /*backStencil=*/ kInverted,
+        /*refValue=*/    0,
+        /*stencilTest=*/ true,
+        /*depthCompare=*/CompareOp::kAlways, // kGreater once steps know the right depth value
+        /*depthTest=*/   true,
+        /*depthWrite=*/  true
+    };
+    return inverse ? kInvertedDSS : kNormalDSS;
+}
+
+class StencilFanRenderStep final : public RenderStep {
 public:
-    StencilFanRenderStep() {}
+    StencilFanRenderStep(bool evenOdd)
+            : RenderStep(Flags::kRequiresMSAA,
+                         /*uniforms=*/{},
+                         PrimitiveType::kTriangles,
+                         fillrule_settings(evenOdd),
+                         /*vertexAttrs=*/{{"position",
+                                           VertexAttribType::kFloat3,
+                                           SkSLType::kFloat3}},
+                         /*instanceAttrs=*/{}) {}
 
     ~StencilFanRenderStep() override {}
 
-    const char* name()            const override { return "stencil-fan"; }
-    bool        requiresStencil() const override { return true; }
-    bool        requiresMSAA()    const override { return true; }
-    bool        performsShading() const override { return false; }
+    const char* name() const override { return "stencil-fan"; }
 
-private:
+    const char* vertexSkSL() const override {
+        return "     float4 devPosition = float4(position.xy, 0.0, position.z);\n";
+    }
+
+    void writeVertices(DrawWriter* writer,
+                       const SkIRect& bounds,
+                       const Transform& localToDevice,
+                       const Shape& shape) const override {
+        // TODO: Have Shape provide a path-like iterator so we don't actually have to convert non
+        // paths to SkPath just to iterate their pts/verbs
+        SkPath path = shape.asPath();
+        DrawWriter::Vertices verts{*writer};
+        for (PathMiddleOutFanIter it(path); !it.done();) {
+            for (auto [p0, p1, p2] : it.nextStack()) {
+                // TODO: PathMiddleOutFanIter should use SkV2 instead of SkPoint?
+                SkV2 p[3] = {{p0.fX, p0.fY}, {p1.fX, p1.fY}, {p2.fX, p2.fY}};
+                SkV4 devPoints[3];
+                localToDevice.mapPoints(p, devPoints, 3);
+
+                // TODO: Support reserving maxTrianglesInFans*3 vertices outside the loop, with
+                // automatic returns of unused verts.
+                verts.append(3) << devPoints[0].x << devPoints[0].y << devPoints[0].w  // p0
+                                << devPoints[1].x << devPoints[1].y << devPoints[1].w  // p1
+                                << devPoints[2].x << devPoints[2].y << devPoints[2].w; // p2
+            }
+        }
+    }
+
+    sk_sp<SkUniformData> writeUniforms(Layout layout,
+                                       const SkIRect&,
+                                       const Transform&,
+                                       const Shape&) const override {
+        // Control points are pre-transformed to device space on the CPU, so no uniforms needed.
+        return nullptr;
+    }
 };
-*/
 
 // TODO: Hand off to csmartdalton, this should roughly correspond to the fStencilPathProgram stage
 // of skgpu::v1::PathStencilCoverOp using the PathCurveTessellator
@@ -60,68 +204,97 @@ class FillBoundsRenderStep final : public RenderStep {
 public:
     // TODO: Will need to add kRequiresStencil when we support specifying stencil settings and
     // the Renderer includes the stenciling step first.
-    FillBoundsRenderStep()
+    FillBoundsRenderStep(bool inverseFill)
             : RenderStep(Flags::kPerformsShading,
-                         /*uniforms=*/{{"localToDevice", SLType::kFloat4x4}},
-                         PrimitiveType::kTriangleStrip,
-                         DepthStencilSettings(),
-                         /*vertexAttrs=*/{{"position", VertexAttribType::kFloat2, SLType::kFloat2}},
-                         /*instanceAttrs=*/{}) {}
+                         /*uniforms=*/{},
+                         PrimitiveType::kTriangles,
+                         cover_settings(inverseFill),
+                         /*vertexAttrs=*/{{"position",
+                                           VertexAttribType::kFloat3,
+                                           SkSLType::kFloat3}},
+                         /*instanceAttrs=*/{})
+            , fInverseFill(inverseFill) {}
 
     ~FillBoundsRenderStep() override {}
 
     const char* name() const override { return "fill-bounds"; }
 
     const char* vertexSkSL() const override {
-        // TODO: RenderSteps should not worry about RTAdjust, but currently the mtl pipeline does
-        // account for it, so this geometry won't be in the right coordinate system yet.
-        return "     float4 devPosition = localToDevice * float4(position, 0.0, 1.0);\n";
+        return "     float4 devPosition = float4(position.xy, 0.0, position.z);\n";
     }
 
-    void writeVertices(DrawWriter* writer, const Transform&, const Shape& shape) const override {
-        // TODO: For now the transform is handled as a uniform so writeVertices ignores it, but
-        // for something as simple as the bounding box, CPU transformation might be best.
-        writer->appendVertices(4)
-               .writeQuad(VertexWriter::TriStripFromRect(shape.bounds().asSkRect()));
-        // Since we upload 4 dynamic verts as a triangle strip, we need to actually draw them
-        // otherwise the next writeVertices() call would get connected to our verts.
-        // TODO: Primitive restart? Just use indexed drawing? Just write 6 verts?
-        writer->flush();
+    void writeVertices(DrawWriter* writer,
+                       const SkIRect& bounds,
+                       const Transform& localToDevice,
+                       const Shape& shape) const override {
+        SkV4 devPoints[4]; // ordered TL, TR, BR, BL
+
+        if (fInverseFill) {
+            // TODO: When we handle local coords, we'd need to map these corners by the inverse.
+            devPoints[0] = {(float) bounds.fLeft,  (float) bounds.fTop,    0.f, 1.f};
+            devPoints[1] = {(float) bounds.fRight, (float) bounds.fTop,    0.f, 1.f};
+            devPoints[2] = {(float) bounds.fRight, (float) bounds.fBottom, 0.f, 1.f};
+            devPoints[3] = {(float) bounds.fLeft,  (float) bounds.fBottom, 0.f, 1.f};
+        } else {
+            localToDevice.mapPoints(shape.bounds(), devPoints);
+        }
+
+        DrawWriter::Vertices verts{*writer};
+        verts.append(6) << devPoints[0].x << devPoints[0].y << devPoints[0].w // TL
+                        << devPoints[3].x << devPoints[3].y << devPoints[3].w // BL
+                        << devPoints[1].x << devPoints[1].y << devPoints[1].w // TR
+                        << devPoints[1].x << devPoints[1].y << devPoints[1].w // TR
+                        << devPoints[3].x << devPoints[3].y << devPoints[3].w // BL
+                        << devPoints[2].x << devPoints[2].y << devPoints[2].w;// BR
     }
 
-    sk_sp<UniformData> writeUniforms(Layout layout,
-                                     const Transform& localToDevice,
-                                     const Shape&) const override {
-        // TODO: Given that a RenderStep has its own uniform binding slot, these offsets never
-        // change so we could cache them per layout.
-        UniformManager mgr(layout);
-        size_t dataSize = mgr.writeUniforms(this->uniforms(), nullptr, nullptr, nullptr);
-        sk_sp<UniformData> transformData = UniformData::Make((int) this->numUniforms(),
-                                                             this->uniforms().data(),
-                                                             dataSize);
-
-        const void* transform[1] = {&localToDevice.matrix()};
-        mgr.writeUniforms(this->uniforms(),
-                          transform,
-                          transformData->offsets(),
-                          transformData->data());
-        return transformData;
+    sk_sp<SkUniformData> writeUniforms(Layout layout,
+                                       const SkIRect&,
+                                       const Transform& localToDevice,
+                                       const Shape&) const override {
+        // Positions are pre-transformed on the CPU so no uniforms needed
+        return nullptr;
     }
+
+private:
+    const bool fInverseFill;
 };
 
 } // anonymous namespace
 
-const Renderer& Renderer::StencilAndFillPath() {
-    // TODO: Uncomment and include in kRenderer to draw flattened paths instead of bboxes
-    // static const StencilFanRenderStep kStencilFan;
-    // TODO: Uncomment and include in kRenderer to draw curved paths
-    // static const StencilCurvesRenderStep kStencilCurves;
-    // TODO: This could move into a header and be reused across renderers
-    static const FillBoundsRenderStep kCover;
-    static const Renderer kRenderer("stencil-and-fill",
-                                    /*&kStencilFan,*/ /*&kStencilCurves,*/ &kCover);
-
-    return kRenderer;
+const Renderer& Renderer::StencilAndFillPath(SkPathFillType fillType) {
+    // Because each fill type uses a different stencil settings, there is one Renderer per type.
+    // However, at each stage (stencil vs. cover), there are only two RenderSteps to branch on.
+    static const StencilFanRenderStep kWindingStencilFan{false};
+    static const StencilFanRenderStep kEvenOddStencilFan{true};
+    static const FillBoundsRenderStep kFill{false};
+    static const FillBoundsRenderStep kInverseFill{true};
+
+    // TODO: Uncomment and include the curve stenciling steps to draw curved paths
+    static const Renderer kWindingRenderer{"stencil-and-fill[winding]",
+                                           &kWindingStencilFan,
+                                           /*&kWindingStencilCurves,*/
+                                           &kFill};
+    static const Renderer kInverseWindingRenderer{"stencil-and-fill[inverse-winding]",
+                                                  &kWindingStencilFan,
+                                                  /*&kWindingStencilCurves,*/
+                                                  &kInverseFill};
+    static const Renderer kEvenOddRenderer{"stencil-and-fill[evenodd]",
+                                           &kEvenOddStencilFan,
+                                           /*&kEvenOddStencilCurves,*/
+                                           &kFill};
+    static const Renderer kInverseEvenOddRenderer{"stencil-and-fill[inverse-evenodd]",
+                                                  &kEvenOddStencilFan,
+                                                  /*&kEvenOddStencilCurves,*/
+                                                  &kInverseFill};
+
+    switch(fillType) {
+        case SkPathFillType::kWinding: return kWindingRenderer;
+        case SkPathFillType::kEvenOdd: return kEvenOddRenderer;
+        case SkPathFillType::kInverseWinding: return kInverseWindingRenderer;
+        case SkPathFillType::kInverseEvenOdd: return kInverseEvenOddRenderer;
+    }
+    SkUNREACHABLE;
 }
 
 } // namespace skgpu
diff --git a/third_party/skia/experimental/minimal_ios_mtl_skia_app/BUILD.gn b/third_party/skia/experimental/minimal_ios_mtl_skia_app/BUILD.gn
index 5589dbc36b829..84d722171d03b 100644
--- a/third_party/skia/experimental/minimal_ios_mtl_skia_app/BUILD.gn
+++ b/third_party/skia/experimental/minimal_ios_mtl_skia_app/BUILD.gn
@@ -15,7 +15,7 @@ if (is_ios && skia_use_metal && skia_enable_gpu) {
     ]
     deps = [ "../..:skia" ]
     cflags_objcc = [
-      "-std=c++14",
+      "-std=c++17",
       "-w",
     ]
     frameworks = [
diff --git a/third_party/skia/experimental/skottiekit/.gitignore b/third_party/skia/experimental/skottiekit/.gitignore
deleted file mode 100644
index e660fd93d3196..0000000000000
--- a/third_party/skia/experimental/skottiekit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bin/
diff --git a/third_party/skia/experimental/skottiekit/CHANGELOG.md b/third_party/skia/experimental/skottiekit/CHANGELOG.md
deleted file mode 100644
index 1c827cbf94613..0000000000000
--- a/third_party/skia/experimental/skottiekit/CHANGELOG.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# SkottieKit Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [0.1.1] 2020-07-27
-
-### Added
- - Include a non-empty font manager, to support loading custom fonts.
-
-## [0.1.0] 2020-07-21
-
-Beginning of changelog.
diff --git a/third_party/skia/experimental/skottiekit/Makefile b/third_party/skia/experimental/skottiekit/Makefile
deleted file mode 100644
index 452d16b41f82f..0000000000000
--- a/third_party/skia/experimental/skottiekit/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-debug: clean_examples
-	# Does an incremental build where possible.
-	./compile.sh debug
-	cp ../../out/skottiekit_debug/skottiekit.js       ./examples/bin
-	cp ../../out/skottiekit_debug/skottiekit.wasm     ./examples/bin
-	cp ../../out/skottiekit_debug/skottiekit.wasm.map ./examples/bin
-
-debug_cpu: clean_examples
-	# Does an incremental build where possible.
-	./compile.sh debug cpu
-	cp ../../out/skottiekit_debug/skottiekit.js       ./examples/bin
-	cp ../../out/skottiekit_debug/skottiekit.wasm     ./examples/bin
-	cp ../../out/skottiekit_debug/skottiekit.wasm.map ./examples/bin
-
-release: clean_examples
-	# Does an incremental build where possible.
-	./compile.sh
-	cp ../../out/skottiekit/skottiekit.js       ./examples/bin
-	cp ../../out/skottiekit/skottiekit.wasm     ./examples/bin
-
-release_cpu: clean_examples
-	# Does an incremental build where possible.
-	./compile.sh cpu
-	cp ../../out/skottiekit/skottiekit.js       ./examples/bin
-	cp ../../out/skottiekit/skottiekit.wasm     ./examples/bin
-
-release_full: clean_examples
-	# Does an incremental build where possible.
-	./compile.sh full-build
-	cp ../../out/skottiekit/skottiekit.js       ./examples/bin
-	cp ../../out/skottiekit/skottiekit.wasm     ./examples/bin
-
-npm: clean_npm
-	./compile.sh full-build
-	cp ../../out/skottiekit/skottiekit.js       ./skottiekit/bin
-	cp ../../out/skottiekit/skottiekit.wasm     ./skottiekit/bin
-
-clean_examples:
-	rm -f ./examples/bin/*
-	mkdir -p ./examples/bin
-
-clean_npm:
-	rm -f ./skottiekit/bin/*
-	mkdir -p ./skottiekit/bin
-
-serve:
-	echo "Go check out http://localhost:8001/"
-	cd examples && python3 python3 ../../../tools/serve_wasm.py
diff --git a/third_party/skia/experimental/skottiekit/compile.sh b/third_party/skia/experimental/skottiekit/compile.sh
deleted file mode 100755
index 51a5c1bb23a0a..0000000000000
--- a/third_party/skia/experimental/skottiekit/compile.sh
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/bin/bash
-# Copyright 2020 Google LLC
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-set -ex
-
-BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
-# This expects the environment variable EMSDK to be set
-if [[ ! -d $EMSDK ]]; then
-  cat >&2 << "EOF"
-Be sure to set the EMSDK environment variable to the location of Emscripten SDK:
-
-    https://emscripten.org/docs/getting_started/downloads.html
-EOF
-  exit 1
-fi
-
-# Navigate to SKIA_HOME from where this file is located.
-pushd $BASE_DIR/../..
-
-source $EMSDK/emsdk_env.sh
-EMCC=`which emcc`
-EMCXX=`which em++`
-EMAR=`which emar`
-
-RELEASE_CONF="-Oz --closure 1 --llvm-lto 1 -DSK_RELEASE --pre-js $BASE_DIR/release.js \
-              -DGR_GL_CHECK_ALLOC_WITH_GET_ERROR=0 -DSK_DISABLE_TRACING"
-EXTRA_CFLAGS="\"-DSK_RELEASE\", \"-DSK_DISABLE_TRACING\""
-IS_OFFICIAL_BUILD="true"
-
-if [[ $@ == *full-build* ]]; then
-  # Full Skottie with all bells and whistles.
-  BUILD_TYPE="full"
-  BUILD_CFG="\
-    skia_enable_fontmgr_custom_embedded=true \
-    skia_enable_fontmgr_custom_empty=false \
-    skia_use_freetype=true \
-    skia_use_libgifcodec=true \
-    skia_use_harfbuzz=true \
-    skia_use_icu=true \
-    skia_use_libpng_decode=true \
-    skia_use_wuffs=true \
-    skia_use_zlib=true \
-    \
-    skia_use_system_freetype2=false \
-    skia_use_system_harfbuzz=false \
-    skia_use_system_icu=false \
-    skia_use_system_libpng=false \
-    skia_use_system_zlib=false\
-  "
-else
-  # Smallest usable Skottie.
-  BUILD_TYPE="minimal"
-  BUILD_CFG="\
-    skia_enable_fontmgr_custom_embedded=false \
-    skia_enable_fontmgr_custom_empty=true \
-    skia_use_freetype=false \
-    skia_use_libgifcodec=false \
-    skia_use_harfbuzz=false \
-    skia_use_icu=false \
-    skia_use_libpng_decode=false \
-    skia_use_wuffs=false \
-    skia_use_zlib=false \
-  "
-fi
-
-if [[ $@ == *debug* ]]; then
-  echo "Building a *${BUILD_TYPE}* Debug build"
-  EXTRA_CFLAGS="\"-DSK_DEBUG\""
-  RELEASE_CONF="-O0 --js-opts 0 -s DEMANGLE_SUPPORT=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 -g4 \
-                --source-map-base /bin/ -DSK_DEBUG --pre-js $BASE_DIR/debug.js"
-  BUILD_DIR=${BUILD_DIR:="out/skottiekit_debug"}
-elif [[ $@ == *profiling* ]]; then
-  echo "Building a *${BUILD_TYPE}* build for profiling"
-  RELEASE_CONF+=" --profiling-funcs --closure 0"
-  BUILD_DIR=${BUILD_DIR:="out/skottiekit_profile"}
-else
-  BUILD_DIR=${BUILD_DIR:="out/skottiekit"}
-fi
-
-mkdir -p $BUILD_DIR
-# sometimes the .a files keep old symbols around - cleaning them out makes sure
-# we get a fresh build.
-rm -f $BUILD_DIR/*.a
-
-GN_GPU="skia_enable_gpu=true skia_gl_standard = \"webgl\""
-GN_GPU_FLAGS="\"-DSK_DISABLE_LEGACY_SHADERCONTEXT\","
-WASM_GPU="-lEGL -lGL -lGLESv2 -DSK_SUPPORT_GPU=1 -DSK_GL \
-          -DSK_DISABLE_LEGACY_SHADERCONTEXT --pre-js $BASE_DIR/cpu.js --pre-js $BASE_DIR/gpu.js\
-          -s USE_WEBGL2=1"
-if [[ $@ == *cpu* ]]; then
-  echo "Using the CPU backend instead of the GPU backend"
-  GN_GPU="skia_enable_gpu=false"
-  GN_GPU_FLAGS=""
-  WASM_GPU="-DSK_SUPPORT_GPU=0 --pre-js $BASE_DIR/cpu.js -s USE_WEBGL2=0"
-fi
-
-SKOTTIE_LIB="$BUILD_DIR/libskottie.a \
-             $BUILD_DIR/libsksg.a"
-
-
-MANAGED_SKOTTIE_BINDINGS="\
-  -DSK_INCLUDE_MANAGED_SKOTTIE=1 \
-  modules/skottie/utils/SkottieUtils.cpp"
-if [[ $@ == *no_managed_skottie* ]]; then
-  echo "Omitting managed Skottie"
-  MANAGED_SKOTTIE_BINDINGS="-DSK_INCLUDE_MANAGED_SKOTTIE=0"
-fi
-
-# Turn off exiting while we check for ninja (which may not be on PATH)
-set +e
-NINJA=`which ninja`
-if [[ -z $NINJA ]]; then
-  git clone "https://chromium.googlesource.com/chromium/tools/depot_tools.git" --depth 1 $BUILD_DIR/depot_tools
-  NINJA=$BUILD_DIR/depot_tools/ninja
-fi
-# Re-enable error checking
-set -e
-
-./bin/fetch-gn
-
-echo "Compiling bitcode"
-
-# Inspired by https://github.com/Zubnix/skia-wasm-port/blob/master/build_bindings.sh
-./bin/gn gen ${BUILD_DIR} \
-  --args="cc=\"${EMCC}\" \
-  cxx=\"${EMCXX}\" \
-  ar=\"${EMAR}\" \
-  extra_cflags_cc=[\"-frtti\"] \
-  extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\", \"-s\", \"MAIN_MODULE=1\",
-    \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",
-    \"-DSK_DISABLE_EFFECT_DESERIALIZATION\",
-    \"-DSK_FORCE_8_BYTE_ALIGNMENT\",
-    ${GN_GPU_FLAGS}
-    ${EXTRA_CFLAGS}
-  ] \
-  is_debug=false \
-  is_official_build=${IS_OFFICIAL_BUILD} \
-  is_component_build=false \
-  werror=true \
-  target_cpu=\"wasm\" \
-  \
-  ${BUILD_CFG} \
-  skia_use_angle=false \
-  skia_use_dng_sdk=false \
-  skia_use_egl=true \
-  skia_use_expat=false \
-  skia_use_fontconfig=false \
-  skia_use_libheif=false \
-  skia_use_libjpeg_turbo_decode=true \
-  skia_use_libjpeg_turbo_encode=false \
-  skia_use_libpng_encode=false \
-  skia_use_libwebp_decode=false \
-  skia_use_libwebp_encode=false \
-  skia_use_lua=false \
-  skia_use_piex=false \
-  skia_use_system_libjpeg_turbo=false \
-  skia_use_vulkan=false \
-  skia_enable_fontmgr_custom_directory=false \
-  \
-  ${GN_GPU} \
-  \
-  skia_enable_skshaper=true \
-  skia_enable_pdf=false"
-
-# Build all the libs we will need below
-
-${NINJA} -C ${BUILD_DIR} libskia.a libskottie.a libsksg.a libskshaper.a
-
-export EMCC_CLOSURE_ARGS="--externs $BASE_DIR/externs.js "
-
-echo "Generating final wasm"
-
-# Emscripten prefers that the .a files go last in order, otherwise, it
-# may drop symbols that it incorrectly thinks aren't used. One day,
-# Emscripten will use LLD, which may relax this requirement.
-${EMCXX} \
-    -I. \
-    $RELEASE_CONF \
-    -DSK_DISABLE_AAA \
-    -DSK_FORCE_8_BYTE_ALIGNMENT \
-    $WASM_GPU \
-    -std=c++17 \
-    --bind \
-    --no-entry \
-    --pre-js $BASE_DIR/preamble.js \
-    --pre-js $BASE_DIR/helper.js \
-    --pre-js $BASE_DIR/interface.js \
-    --pre-js $BASE_DIR/postamble.js \
-    $BASE_DIR/skottiekit_bindings.cpp \
-    modules/skresources/src/SkResources.cpp \
-    $MANAGED_SKOTTIE_BINDINGS \
-    $BUILD_DIR/libskottie.a \
-    $BUILD_DIR/libsksg.a \
-    $BUILD_DIR/libskshaper.a \
-    $BUILD_DIR/libskia.a \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s EXPORT_NAME="SkottieKitInit" \
-    -s FORCE_FILESYSTEM=0 \
-    -s FILESYSTEM=0 \
-    -s MODULARIZE=1 \
-    -s NO_EXIT_RUNTIME=1 \
-    -s STRICT=1 \
-    -s INITIAL_MEMORY=128MB \
-    -s WARN_UNALIGNED=1 \
-    -s WASM=1 \
-    -o $BUILD_DIR/skottiekit.js
diff --git a/third_party/skia/experimental/skottiekit/cpu.js b/third_party/skia/experimental/skottiekit/cpu.js
deleted file mode 100644
index 620ab71258d64..0000000000000
--- a/third_party/skia/experimental/skottiekit/cpu.js
+++ /dev/null
@@ -1,87 +0,0 @@
-// Adds compile-time JS functions to augment the SkottieKit interface.
-// Specifically, anything that should only be on the CPU version of SkottieKit.
-(function(SkottieKit){
-SkottieKit._extraInitializations = SkottieKit._extraInitializations || [];
-SkottieKit._extraInitializations.push(function() {
-  // Takes in an html id or a canvas element
-  SkottieKit.MakeSWCanvasSurface = function(idOrElement) {
-      var canvas = idOrElement;
-      if (canvas.tagName !== 'CANVAS') {
-        canvas = document.getElementById(idOrElement);
-        if (!canvas) {
-          throw 'Canvas with id ' + idOrElement + ' was not found';
-        }
-      }
-    // Maybe better to use clientWidth/height.  See:
-    // https://webglfundamentals.org/webgl/lessons/webgl-anti-patterns.html
-    var surface = SkottieKit.MakeInMemorySurface(canvas.width, canvas.height);
-    if (surface) {
-      surface._canvas = canvas;
-    }
-    return surface;
-  };
-
-  // Don't over-write the MakeCanvasSurface set by gpu.js if it exists.
-  if (!SkottieKit.MakeCanvasSurface) {
-    SkottieKit.MakeCanvasSurface = SkottieKit.MakeSWCanvasSurface;
-  }
-
-  SkottieKit.MakeInMemorySurface = function(width, height) {
-    /* @dict */
-    var imageInfo = {
-      'width':  width,
-      'height': height,
-      'colorType': SkottieKit.ColorType.RGBA_8888,
-      // Since we are sending these pixels directly into the HTML canvas,
-      // (and those pixels are un-premultiplied, i.e. straight r,g,b,a)
-      'alphaType': SkottieKit.AlphaType.Unpremul,
-    }
-    var pixelLen = width * height * 4; // it's 8888, so 4 bytes per pixel
-    // Allocate the buffer of pixels to be drawn into.
-    var pixelPtr = SkottieKit._malloc(pixelLen);
-
-    var surface = this._getRasterDirectSurface(imageInfo, pixelPtr, width*4);
-    if (surface) {
-      surface._canvas = null;
-      surface._width = width;
-      surface._height = height;
-      surface._pixelLen = pixelLen;
-
-      surface._pixelPtr = pixelPtr;
-      // rasterDirectSurface does not initialize the pixels, so we clear them
-      // to transparent black.
-      surface.getCanvas().clear(SkottieKit.TRANSPARENT);
-    }
-    return surface;
-  };
-
-  SkottieKit.SkSurface.prototype.flush = function() {
-    this._flush();
-    // Do we have an HTML canvas to write the pixels to?
-    // We will not if this a GPU build or a raster surface, for example.
-    if (this._canvas) {
-      var pixels = new Uint8ClampedArray(SkottieKit.HEAPU8.buffer, this._pixelPtr, this._pixelLen);
-      var imageData = new ImageData(pixels, this._width, this._height);
-
-      this._canvas.getContext('2d').putImageData(imageData, 0, 0);
-    }
-  };
-
-  // Call dispose() instead of delete to clean up the underlying memory
-  SkottieKit.SkSurface.prototype.dispose = function() {
-    if (this._pixelPtr) {
-      SkottieKit._free(this._pixelPtr);
-    }
-    this.delete();
-  }
-
-  SkottieKit.currentContext = SkottieKit.currentContext || function() {
-    // no op if this is a cpu-only build.
-  };
-
-  SkottieKit.setCurrentContext = SkottieKit.setCurrentContext || function() {
-     // no op if this is a cpu-only build.
-  };
-});
-}(Module)); // When this file is loaded in, the high level object is "Module";
-
diff --git a/third_party/skia/experimental/skottiekit/debug.js b/third_party/skia/experimental/skottiekit/debug.js
deleted file mode 100644
index 8121414b91d7a..0000000000000
--- a/third_party/skia/experimental/skottiekit/debug.js
+++ /dev/null
@@ -1,4 +0,0 @@
-function SkDebug(msg) {
-  console.warn(msg);
-}
-/** @const */ var skIsDebug = true;
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/examples/.gitignore b/third_party/skia/experimental/skottiekit/examples/.gitignore
deleted file mode 100644
index 7447f89a59769..0000000000000
--- a/third_party/skia/experimental/skottiekit/examples/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/examples/ck.html b/third_party/skia/experimental/skottiekit/examples/ck.html
deleted file mode 100644
index 06ef5479ed1de..0000000000000
--- a/third_party/skia/experimental/skottiekit/examples/ck.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>CanvasKit Demo</title>
-
-  <script type="text/javascript" src="https://particles.skia.org/dist/canvaskit.js"></script>
-
-  <script type="text/javascript" charset="utf-8">
-    const bootTime = performance.now();
-    const cdn = 'https://storage.googleapis.com/skia-cdn/misc/';
-    // loadKit resolves with CanvasKit.
-    const loadKit = CanvasKitInit({
-      locateFile: (file) => 'https://particles.skia.org/dist/'+file,
-    });
-
-    loadKit.then(() => {
-      const n = performance.now();
-      console.log(`loaded Kit in ${(n - bootTime).toFixed(2)} ms`)
-    });
-
-    const loadLegoJSON = fetch(cdn + 'lego_loader.json').then((resp) => {
-      return resp.text();
-    });
-    const loadPartyJSON = fetch(cdn + 'confetti.json').then((resp) => {
-      return resp.text();
-    });
-    const loadDrinksJSON = fetch(cdn + 'drinks.json').then((resp) => {
-      return resp.text();
-    });
-    const loadOnboardingJSON = fetch(cdn + 'onboarding.json').then((resp) => {
-      return resp.text();
-    });
-
-
-
-    function SkottieDemo(values, canvasID, width=400, height=400) {
-      const [CanvasKit, legoJSON] = values;
-      const animation = CanvasKit.MakeManagedAnimation(legoJSON);
-      const duration = animation.duration() * 1000;
-      const size = animation.size();
-
-      const bounds = {fLeft: 0, fTop: 0, fRight: width, fBottom: height};
-
-      const surface = CanvasKit.MakeCanvasSurface(canvasID);
-      if (!surface) {
-        console.error('Could not make surface');
-        return;
-      }
-
-      const firstFrame = Date.now();
-      const clearColor = CanvasKit.WHITE;
-
-      function drawFrame(canvas) {
-        const seek = ((Date.now() - firstFrame) / duration) % 1.0;
-        const damage = animation.seek(seek);
-
-        if (damage.fRight > damage.fLeft && damage.fBottom > damage.fTop) {
-          canvas.clear(clearColor);
-          animation.render(canvas, bounds);
-        }
-        surface.requestAnimationFrame(drawFrame);
-      }
-      surface.requestAnimationFrame(drawFrame);
-    }
-
-    const legosAnimating = Promise.all([loadKit, loadLegoJSON]).then((values) => {
-      SkottieDemo(values, 'legos', 800, 800);
-    });
-    const partyAnimating = Promise.all([loadKit, loadPartyJSON]).then((values) => {
-      SkottieDemo(values, 'party', 800, 800);
-    });
-    const drinksAnimating = Promise.all([loadKit, loadDrinksJSON]).then((values) => {
-      SkottieDemo(values, 'drinks', 800, 800);
-    });
-    const onboardingAnimating = Promise.all([loadKit, loadOnboardingJSON]).then((values) => {
-      SkottieDemo(values, 'onboarding', 800, 800);
-    });
-
-    Promise.all([legosAnimating, partyAnimating, drinksAnimating, onboardingAnimating]).then(() => {
-      const frames = new Float64Array(100);
-      let idx = 0;
-      let now = performance.now();
-      function benchFrame() {
-        frames[idx] = performance.now() - now;
-        idx++;
-        if (idx < frames.length) {
-          now = performance.now();
-          window.requestAnimationFrame(benchFrame);
-        } else {
-          let out = '';
-          for (const frameTime of frames) {
-            out += frameTime.toFixed(2);
-            out += '\n';
-          }
-          console.log(out);
-        }
-      }
-      window.requestAnimationFrame(benchFrame);
-    })
-  </script>
-
-  <style>
-    canvas {
-      border: 1px dashed #AAA;
-      width: 400px;
-      height: 400px;
-    }
-  </style>
-
-</head>
-<body>
-  <h1> CanvasKit</h1>
-
-  <canvas id=legos width=800 height=800></canvas>
-  <canvas id=party width=800 height=800></canvas>
-  <canvas id=drinks width=800 height=800></canvas>
-  <canvas id=onboarding width=800 height=800></canvas>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/examples/index.html b/third_party/skia/experimental/skottiekit/examples/index.html
deleted file mode 100644
index ad0223ba12375..0000000000000
--- a/third_party/skia/experimental/skottiekit/examples/index.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>SkottieKit Demo</title>
-
-  <script type="text/javascript" src="/bin/skottiekit.js"></script>
-
-  <script type="text/javascript" charset="utf-8">
-    const bootTime = performance.now();
-    const cdn = 'https://storage.googleapis.com/skia-cdn/misc/';
-    // loadKit resolves with SkottieKit.
-    const loadKit = SkottieKitInit({
-      locateFile: (file) => '/bin/'+file,
-    });
-
-    loadKit.then(() => {
-      const n = performance.now();
-      console.log(`loaded Kit in ${(n - bootTime).toFixed(2)} ms`)
-    });
-
-    const loadLegoJSON = fetch(cdn + 'lego_loader.json').then((resp) => {
-      return resp.text();
-    });
-    const loadPartyJSON = fetch(cdn + 'confetti.json').then((resp) => {
-      return resp.text();
-    });
-    const loadDrinksJSON = fetch(cdn + 'drinks.json').then((resp) => {
-      return resp.text();
-    });
-    const loadOnboardingJSON = fetch(cdn + 'onboarding.json').then((resp) => {
-      return resp.text();
-    });
-
-    function SkottieDemo(values, canvasID, width=400, height=400) {
-      const [SkottieKit, legoJSON] = values;
-      const animation = SkottieKit.MakeManagedAnimation(legoJSON);
-      const duration = animation.duration() * 1000;
-      const size = animation.size();
-
-      const bounds = {fLeft: 0, fTop: 0, fRight: width, fBottom: height};
-
-      const surface = SkottieKit.MakeCanvasSurface(canvasID);
-      if (!surface) {
-        console.error('Could not make surface');
-        return;
-      }
-
-      const firstFrame = Date.now();
-      const clearColor = SkottieKit.WHITE;
-
-      function drawFrame(canvas) {
-        const seek = ((Date.now() - firstFrame) / duration) % 1.0;
-        const damage = animation.seek(seek);
-
-        if (damage.fRight > damage.fLeft && damage.fBottom > damage.fTop) {
-          canvas.clear(clearColor);
-          animation.render(canvas, bounds);
-        }
-        surface.requestAnimationFrame(drawFrame);
-      }
-      surface.requestAnimationFrame(drawFrame);
-    }
-
-    const legosAnimating = Promise.all([loadKit, loadLegoJSON]).then((values) => {
-      SkottieDemo(values, 'legos', 400, 400);
-    });
-    const partyAnimating = Promise.all([loadKit, loadPartyJSON]).then((values) => {
-      SkottieDemo(values, 'party', 400, 400);
-    });
-    const drinksAnimating = Promise.all([loadKit, loadDrinksJSON]).then((values) => {
-      SkottieDemo(values, 'drinks', 400, 400);
-    });
-    const onboardingAnimating = Promise.all([loadKit, loadOnboardingJSON]).then((values) => {
-      SkottieDemo(values, 'onboarding', 400, 400);
-    });
-
-    Promise.all([legosAnimating, partyAnimating, drinksAnimating, onboardingAnimating]).then(() => {
-      const frames = new Float64Array(100);
-      let idx = 0;
-      let now = performance.now();
-      function benchFrame() {
-        frames[idx] = performance.now() - now;
-        idx++;
-        if (idx < frames.length) {
-          now = performance.now();
-          window.requestAnimationFrame(benchFrame);
-        } else {
-          let out = '';
-          for (const frameTime of frames) {
-            out += frameTime.toFixed(2);
-            out += '\n';
-          }
-          console.log(out);
-        }
-      }
-      window.requestAnimationFrame(benchFrame);
-    })
-  </script>
-
-  <style>
-    canvas {
-      border: 1px dashed #AAA;
-      width: 400px;
-      height: 400px;
-    }
-  </style>
-
-</head>
-<body>
-  <h1> SkottieKit</h1>
-
-  <canvas id=legos width=400 height=400></canvas>
-  <canvas id=party width=400 height=400></canvas>
-  <canvas id=drinks width=400 height=400></canvas>
-  <canvas id=onboarding width=400 height=400></canvas>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/externs.js b/third_party/skia/experimental/skottiekit/externs.js
deleted file mode 100644
index a0028fa4ac36c..0000000000000
--- a/third_party/skia/experimental/skottiekit/externs.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * This externs file prevents the Closure JS compiler from minifying away
- * names of objects created by Emscripten.
- * Basically, by defining empty objects and functions here, Closure will
- * know not to rename them.  This is needed because of our pre-js files,
- * that is, the JS we hand-write to bundle into the output. That JS will be
- * hit by the closure compiler and thus needs to know about what functions
- * have special names and should not be minified.
- *
- * Emscripten does not support automatically generating an externs file, so we
- * do it by hand. The general process is to write some JS code, and then put any
- * calls to SkottieKit or related things in here. Running ./compile.sh and then
- * looking at the minified results or running the Release trybot should
- * verify nothing was missed. Optionally, looking directly at the minified
- * pathkit.js can be useful when developing locally.
- *
- * Docs:
- *   https://github.com/cljsjs/packages/wiki/Creating-Externs
- *   https://github.com/google/closure-compiler/wiki/Types-in-the-Closure-Type-System
- *
- * Example externs:
- *   https://github.com/google/closure-compiler/tree/master/externs
- */
-
-var SkottieKit = {
-  // public API (i.e. things we declare in the pre-js file or in the cpp bindings)
-  Color: function() {},
-  Color4f: function() {},
-
-  GetWebGLContext: function() {},
-  MakeCanvasSurface: function() {},
-  MakeGrContext: function() {},
-  MakeInMemorySurface: function() {},
-  MakeManagedAnimation: function() {},
-  MakeOnScreenGLSurface: function() {},
-  MakeSWCanvasSurface: function() {},
-  MakeWebGLCanvasSurface: function() {},
-  currentContext: function() {},
-  setCurrentContext: function() {},
-
-  _MakeManagedAnimation: function() {},
-  _getRasterDirectSurface: function() {},
-
-  GrContext: {
-    // public API (from C++ bindings)
-    getResourceCacheLimitBytes: function() {},
-    getResourceCacheUsageBytes: function() {},
-    releaseResourcesAndAbandonContext: function() {},
-    setResourceCacheLimitBytes: function() {},
-  },
-
-  SkCanvas: {
-    // public API (from C++ bindings)
-    clear: function() {},
-
-    prototype: {
-      requestAnimationFrame: function() {},
-    }
-  },
-
-  SkSurface: {
-    // public API (from C++ bindings)
-    flush: function() {},
-    getCanvas: function() {},
-
-    // private API
-    _clear: function() {},
-
-    prototype: {
-      clear: function() {},
-    }
-  },
-
-  // Constants and Enums
-  gpu: {},
-  skottie: {},
-  managed_skottie: {},
-
-  TRANSPARENT: {},
-  BLACK: {},
-  WHITE: {},
-
-  AlphaType: {
-    Opaque: {},
-    Premul: {},
-    Unpremul: {},
-  },
-
-  ColorType: {
-    RGBA_8888: {},
-  },
-
-  // Things Emscripten adds for us
-
-  /**
-   * @type {Float32Array}
-   */
-  HEAPF32: {},
-  /**
-   * @type {Float64Array}
-   */
-  HEAPF64: {},
-  /**
-   * @type {Uint8Array}
-   */
-  HEAPU8: {},
-  /**
-   * @type {Uint16Array}
-   */
-  HEAPU16: {},
-  /**
-   * @type {Uint32Array}
-   */
-  HEAPU32: {},
-  /**
-   * @type {Int8Array}
-   */
-  HEAP8: {},
-  /**
-   * @type {Int16Array}
-   */
-  HEAP16: {},
-  /**
-   * @type {Int32Array}
-   */
-  HEAP32: {},
-
-  _malloc: function() {},
-  _free: function() {},
-  onRuntimeInitialized: function() {},
-};
-
-// Not sure why this is needed - might be a bug in emsdk that this isn't properly declared.
-function loadWebAssemblyModule() {};
diff --git a/third_party/skia/experimental/skottiekit/gpu.js b/third_party/skia/experimental/skottiekit/gpu.js
deleted file mode 100644
index 4e4eb8004051a..0000000000000
--- a/third_party/skia/experimental/skottiekit/gpu.js
+++ /dev/null
@@ -1,111 +0,0 @@
-(function(SkottieKit){
-SkottieKit._extraInitializations = SkottieKit._extraInitializations || [];
-SkottieKit._extraInitializations.push(function() {
-  function get(obj, attr, defaultValue) {
-    if (obj && obj.hasOwnProperty(attr)) {
-      return obj[attr];
-    }
-    return defaultValue;
-  }
-
-  function makeWebGLContext(canvas, attrs) {
-    var contextAttributes = {
-      alpha: get(attrs, 'alpha', 1),
-      depth: get(attrs, 'depth', 1),
-      stencil: get(attrs, 'stencil', 8),
-      antialias: get(attrs, 'antialias', 1),
-      premultipliedAlpha: get(attrs, 'premultipliedAlpha', 1),
-      preserveDrawingBuffer: get(attrs, 'preserveDrawingBuffer', 0),
-      preferLowPowerToHighPerformance: get(attrs, 'preferLowPowerToHighPerformance', 0),
-      failIfMajorPerformanceCaveat: get(attrs, 'failIfMajorPerformanceCaveat', 0),
-      majorVersion: get(attrs, 'majorVersion', 2),
-      minorVersion: get(attrs, 'minorVersion', 0),
-      enableExtensionsByDefault: get(attrs, 'enableExtensionsByDefault', 1),
-      explicitSwapControl: get(attrs, 'explicitSwapControl', 0),
-      renderViaOffscreenBackBuffer: get(attrs, 'renderViaOffscreenBackBuffer', 0),
-    };
-    if (!canvas) {
-      SkDebug('null canvas passed into makeWebGLContext');
-      return 0;
-    }
-    // This check is from the emscripten version
-    if (contextAttributes['explicitSwapControl']) {
-      SkDebug('explicitSwapControl is not supported');
-      return 0;
-    }
-    // GL is an enscripten provided helper
-    // See https://github.com/emscripten-core/emscripten/blob/incoming/src/library_webgl.js
-    var ctx = GL.createContext(canvas, contextAttributes);
-
-    if (!ctx && contextAttributes.majorVersion > 1) {
-      contextAttributes.majorVersion = 1;  // fall back to WebGL 1.0
-      contextAttributes.minorVersion = 0;
-      ctx = GL.createContext(canvas, contextAttributes);
-    }
-    return ctx;
-  }
-
-  SkottieKit.GetWebGLContext = function(canvas, attrs) {
-    return makeWebGLContext(canvas, attrs);
-  };
-
-  // arg can be of types:
-  //  - String - in which case it is interpreted as an id of a
-  //          canvas element.
-  //  - HTMLCanvasElement - in which the provided canvas element will
-  //          be used directly.
-  // Width and height can be provided to override those on the canvas
-  // element, or specify a height for when a context is provided.
-  SkottieKit.MakeWebGLCanvasSurface = function(arg, width, height) {
-    var canvas = arg;
-    if (canvas.tagName !== 'CANVAS') {
-      canvas = document.getElementById(arg);
-      if (!canvas) {
-        throw 'Canvas with id ' + arg + ' was not found';
-      }
-    }
-    // we are ok with all the defaults
-    var ctx = this.GetWebGLContext(canvas);
-
-    if (!ctx || ctx < 0) {
-      throw 'failed to create webgl context: err ' + ctx;
-    }
-
-    if (!canvas && (!width || !height)) {
-      throw 'height and width must be provided with context';
-    }
-
-    var grcontext = this.MakeGrContext(ctx);
-
-    // if (grcontext) {
-    //    // Bump the default resource cache limit.
-    //   var RESOURCE_CACHE_BYTES = 256 * 1024 * 1024;
-    //   grcontext.setResourceCacheLimitBytes(RESOURCE_CACHE_BYTES);
-    // }
-
-
-    // Maybe better to use clientWidth/height.  See:
-    // https://webglfundamentals.org/webgl/lessons/webgl-anti-patterns.html
-    var surface = this.MakeOnScreenGLSurface(grcontext,
-                                             width  || canvas.width,
-                                             height || canvas.height);
-    if (!surface) {
-      SkDebug('falling back from GPU implementation to a SW based one');
-      // we need to throw away the old canvas (which was locked to
-      // a webGL context) and create a new one so we can
-      var newCanvas = canvas.cloneNode(true);
-      var parent = canvas.parentNode;
-      parent.replaceChild(newCanvas, canvas);
-      // add a class so the user can detect that it was replaced.
-      newCanvas.classList.add('ck-replaced');
-
-      return SkottieKit.MakeSWCanvasSurface(newCanvas);
-    }
-    surface._context = ctx;
-    surface.grContext = grcontext;
-    return surface;
-  };
-  // Default to trying WebGL first.
-  SkottieKit.MakeCanvasSurface = SkottieKit.MakeWebGLCanvasSurface;
-});
-}(Module)); // When this file is loaded in, the high level object is "Module";
diff --git a/third_party/skia/experimental/skottiekit/helper.js b/third_party/skia/experimental/skottiekit/helper.js
deleted file mode 100644
index 2cdc48d4e8a6a..0000000000000
--- a/third_party/skia/experimental/skottiekit/helper.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var nullptr = 0; // emscripten doesn't like to take null as uintptr_t
-
-// arr can be a normal JS array or a TypedArray
-// dest is something like SkottieKit.HEAPF32
-// ptr can be optionally provided if the memory was already allocated.
-function copy1dArray(arr, dest, ptr) {
-  if (!arr || !arr.length) {
-    return nullptr;
-  }
-  // This was created with SkottieKit.Malloc, so it's already been copied.
-  if (arr['_ck']) {
-    return arr.byteOffset;
-  }
-  if (!ptr) {
-    ptr = SkottieKit._malloc(arr.length * dest.BYTES_PER_ELEMENT);
-  }
-  // In c++ terms, the WASM heap is a uint8_t*, a long buffer/array of single
-  // byte elements. When we run _malloc, we always get an offset/pointer into
-  // that block of memory.
-  // SkottieKit exposes some different views to make it easier to work with
-  // different types. HEAPF32 for example, exposes it as a float*
-  // However, to make the ptr line up, we have to do some pointer arithmetic.
-  // Concretely, we need to convert ptr to go from an index into a 1-byte-wide
-  // buffer to an index into a 4-byte-wide buffer (in the case of HEAPF32)
-  // and thus we divide ptr by 4.
-  dest.set(arr, ptr / dest.BYTES_PER_ELEMENT);
-  return ptr;
-}
diff --git a/third_party/skia/experimental/skottiekit/interface.js b/third_party/skia/experimental/skottiekit/interface.js
deleted file mode 100644
index 291db51a57cd9..0000000000000
--- a/third_party/skia/experimental/skottiekit/interface.js
+++ /dev/null
@@ -1,113 +0,0 @@
-// Adds JS functions to augment the SkottieKit interface.
-// For example, if there is a wrapper around the C++ call or logic to allow
-// chaining, it should go here.
-
-// SkottieKit.onRuntimeInitialized is called after the WASM library has loaded.
-// Anything that modifies an exposed class (e.g. SkPath) should be set
-// after onRuntimeInitialized, otherwise, it can happen outside of that scope.
-SkottieKit.onRuntimeInitialized = function() {
-  // All calls to 'this' need to go in externs.js so closure doesn't minify them away.
-
-  SkottieKit.SkCanvas.prototype.clear = function (color4f) {
-    var cPtr = copy1dArray(color4f, SkottieKit.HEAPF32);
-    this._clear(cPtr);
-    SkottieKit._free(cPtr);
-  }
-
-  SkottieKit.SkSurface.prototype.requestAnimationFrame = function(callback, dirtyRect) {
-    if (!this._cached_canvas) {
-      this._cached_canvas = this.getCanvas();
-    }
-    window.requestAnimationFrame(function() {
-      if (this._context !== undefined) {
-        SkottieKit.setCurrentContext(this._context);
-      }
-
-      callback(this._cached_canvas);
-
-      // We do not dispose() of the SkSurface here, as the client will typically
-      // call requestAnimationFrame again from within the supplied callback.
-      // For drawing a single frame, prefer drawOnce().
-      this.flush();
-    }.bind(this));
-  }
-
-  // Run through the JS files that are added at compile time.
-  if (SkottieKit._extraInitializations) {
-    SkottieKit._extraInitializations.forEach(function(init) {
-      init();
-    });
-  }
-}; // end SkottieKit.onRuntimeInitialized, that is, anything changing prototypes or dynamic.
-
-// Construct a 4-float color.
-// Opaque if opacity is omitted.
-SkottieKit.Color4f = function(r, g, b, a) {
-  if (a === undefined) {
-    a = 1;
-  }
-  return Float32Array.of(r, g, b, a);
-}
-
-// Color constants use property getters to prevent other code from accidentally
-// changing them.
-Object.defineProperty(SkottieKit, "TRANSPARENT", {
-    get: function() { return SkottieKit.Color4f(0, 0, 0, 0); }
-});
-Object.defineProperty(SkottieKit, "BLACK", {
-    get: function() { return SkottieKit.Color4f(0, 0, 0, 1); }
-});
-Object.defineProperty(SkottieKit, "WHITE", {
-    get: function() { return SkottieKit.Color4f(1, 1, 1, 1); }
-});
-// assets is a dictionary of named blobs: { key: ArrayBuffer, ... }
-// The keys should be well-behaved strings - they're turned into null-terminated
-// strings for the native side.
-SkottieKit.MakeManagedAnimation = function(json, assets) {
-  if (!SkottieKit.managed_skottie) {
-    throw 'Not compiled with MakeManagedAnimation';
-  }
-  if (!assets) {
-    return SkottieKit._MakeManagedAnimation(json, 0, nullptr, nullptr, nullptr);
-  }
-  var assetNamePtrs = [];
-  var assetDataPtrs = [];
-  var assetSizes    = [];
-
-  var assetKeys = Object.keys(assets || {});
-  for (var i = 0; i < assetKeys.length; i++) {
-    var key = assetKeys[i];
-    var buffer = assets[key];
-    var data = new Uint8Array(buffer);
-
-    var iptr = SkottieKit._malloc(data.byteLength);
-    SkottieKit.HEAPU8.set(data, iptr);
-    assetDataPtrs.push(iptr);
-    assetSizes.push(data.byteLength);
-
-    // lengthBytesUTF8 and stringToUTF8Array are defined in the emscripten
-    // JS.  See https://kripken.github.io/emscripten-site/docs/api_reference/preamble.js.html#stringToUTF8
-    // Add 1 for null terminator
-    var strLen = lengthBytesUTF8(key) + 1;
-    var strPtr = SkottieKit._malloc(strLen);
-
-    stringToUTF8(key, strPtr, strLen);
-    assetNamePtrs.push(strPtr);
-  }
-
-  // Not entirely sure if it matters, but the uintptr_t are 32 bits
-  // we want to copy our array of uintptr_t into the right size memory.
-  var namesPtr      = copy1dArray(assetNamePtrs, SkottieKit.HEAPU32);
-  var assetsPtr     = copy1dArray(assetDataPtrs, SkottieKit.HEAPU32);
-  var assetSizesPtr = copy1dArray(assetSizes,    SkottieKit.HEAPU32);
-
-  var anim = SkottieKit._MakeManagedAnimation(json, assetKeys.length, namesPtr,
-                                              assetsPtr, assetSizesPtr);
-
-  // The C++ code has made copies of the asset and string data, so free our copies.
-  SkottieKit._free(namesPtr);
-  SkottieKit._free(assetsPtr);
-  SkottieKit._free(assetSizesPtr);
-
-  return anim;
-};
diff --git a/third_party/skia/experimental/skottiekit/postamble.js b/third_party/skia/experimental/skottiekit/postamble.js
deleted file mode 100644
index 592e6c502829f..0000000000000
--- a/third_party/skia/experimental/skottiekit/postamble.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// This closes the scope started in preamble.js
-}(Module)); // When this file is loaded in, the high level object is "Module";
diff --git a/third_party/skia/experimental/skottiekit/preamble.js b/third_party/skia/experimental/skottiekit/preamble.js
deleted file mode 100644
index f80516297c701..0000000000000
--- a/third_party/skia/experimental/skottiekit/preamble.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Adds compile-time JS functions to augment the SkottieKit interface.
-(function(SkottieKit) {
-
-
-// This intentionally dangles because we want all the
-// JS code to be in the same scope, but JS doesn't support
-// namespaces like C++ does. Thus, we simply include this
-// preamble.js file, all the source .js files and then postamble.js
-// to bundle everything in the same scope.
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/release.js b/third_party/skia/experimental/skottiekit/release.js
deleted file mode 100644
index 9d505a48ab203..0000000000000
--- a/third_party/skia/experimental/skottiekit/release.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function SkDebug(msg) {
-  // by leaving this blank, closure optimizes out calls (and the messages)
-  // which trims down code size and marginally improves runtime speed.
-}
-/** @const */ var skIsDebug = false;
\ No newline at end of file
diff --git a/third_party/skia/experimental/skottiekit/skottiekit/README.md b/third_party/skia/experimental/skottiekit/skottiekit/README.md
deleted file mode 100644
index 4e95cf2a1fca4..0000000000000
--- a/third_party/skia/experimental/skottiekit/skottiekit/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-A WASM version of Skottie (Lottie with Skia).
-
-# Getting Started
-
-To use the library, run `npm install skottiekit-wasm` and then simply include it:
-
-    <script src="/node_modules/skottiekit-wasm/bin/skottiekit.js"></script>
-    const loadKit = SkottieKitInit({
-        locateFile: (file) => '/node_modules/skottiekit-wasm/bin/'+file,
-    });
-    // Load the animation Lottie JSON file.
-    const loadLottie = fetch('/path/to/lottie.json').then((resp) => resp.text());
-
-    Promise.all([loadKit, loadLottie]).then((values) => {
-        const [SkottieKit, lottieJSON] = values;
-        const animation = SkottieKit.MakeManagedAnimation(lottieJSON);
-        const duration = animation.duration() * 1000;
-        // Assumes there's a <canvas id="my_canvas"> somewhere
-        const surface = SkottieKit.MakeCanvasSurface("my_canvas");
-
-        const firstFrame = Date.now();
-        const clearColor = SkottieKit.WHITE;
-
-        function drawFrame(canvas) {
-            // seek takes a float from 0.0 to 1.0
-            const seek = ((Date.now() - firstFrame) / duration) % 1.0;
-            animation.seek(seek);
-
-            canvas.clear(clearColor);
-            animation.render(canvas, bounds);
-            surface.requestAnimationFrame(drawFrame);
-        }
-        surface.requestAnimationFrame(drawFrame);
-    })
-
-As with all npm packages, there's a freely available CDN via unpkg.com:
-
-    <script src="https://unpkg.com/skottiekit-wasm@0.1.0/bin/skottiekit.js"></script>
-    const loadKit SkottieKitInit({
-         locateFile: (file) => 'https://unpkg.com/skottiekit-wasm@0.1.0/bin/'+file,
-    })
diff --git a/third_party/skia/experimental/skottiekit/skottiekit/package.json b/third_party/skia/experimental/skottiekit/skottiekit/package.json
deleted file mode 100644
index 2279a6b1965b7..0000000000000
--- a/third_party/skia/experimental/skottiekit/skottiekit/package.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "skottiekit-wasm",
-  "version": "0.1.1",
-  "description": "A WASM version of Skottie",
-  "homepage": "https://skia.org/user/modules/skottie",
-  "bugs": {
-    "url": "https://bugs.chromium.org/p/skia/issues/entry"
-  },
-  "permsRepo": "skia-dev/.github",
-  "publishConfig": {
-    "registry":"https://wombat-dressing-room.appspot.com"
-  },
-  "license": "BSD-3-Clause"
-}
diff --git a/third_party/skia/experimental/skottiekit/skottiekit_bindings.cpp b/third_party/skia/experimental/skottiekit/skottiekit_bindings.cpp
deleted file mode 100644
index b3292e518aa17..0000000000000
--- a/third_party/skia/experimental/skottiekit/skottiekit_bindings.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "include/core/SkCanvas.h"
-#include "include/core/SkColor.h"
-#include "include/core/SkImage.h"
-#include "include/core/SkPaint.h"
-#include "include/core/SkRect.h"
-#include "include/core/SkSize.h"
-#include "include/core/SkString.h"
-#include "include/core/SkSurface.h"
-#include "include/core/SkTypes.h"
-#include "modules/skottie/include/Skottie.h"
-#include "modules/sksg/include/SkSGInvalidationController.h"
-
-#include <string>
-#include <vector>
-
-#include <emscripten.h>
-#include <emscripten/bind.h>
-
-#if SK_INCLUDE_MANAGED_SKOTTIE
-#include "modules/skottie/utils/SkottieUtils.h"
-#include "modules/skresources/include/SkResources.h"
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
-
-#ifdef SK_GL
-#include "include/core/SkImageInfo.h"
-#include "include/gpu/GrBackendSurface.h"
-#include "include/gpu/GrDirectContext.h"
-#include "include/gpu/gl/GrGLInterface.h"
-#include "include/gpu/gl/GrGLTypes.h"
-
-#include <GL/gl.h>
-#include <emscripten/html5.h>
-#endif
-
-using namespace emscripten;
-
-// Self-documenting types
-using JSArray = emscripten::val;
-using JSObject = emscripten::val;
-using JSString = emscripten::val;
-using SkPathOrNull = emscripten::val;
-using Uint8Array = emscripten::val;
-using Float32Array = emscripten::val;
-
-#if SK_INCLUDE_MANAGED_SKOTTIE
-namespace {
-
-class SkottieAssetProvider : public skottie::ResourceProvider {
-public:
-    ~SkottieAssetProvider() override = default;
-
-    // Tried using a map, but that gave strange errors like
-    // https://emscripten.org/docs/porting/guidelines/function_pointer_issues.html
-    // Not entirely sure why, but perhaps the iterator in the map was
-    // confusing enscripten.
-    using AssetVec = std::vector<std::pair<SkString, sk_sp<SkData>>>;
-
-    static sk_sp<SkottieAssetProvider> Make(AssetVec assets) {
-        if (assets.empty()) {
-            return nullptr;
-        }
-
-        return sk_sp<SkottieAssetProvider>(new SkottieAssetProvider(std::move(assets)));
-    }
-
-    sk_sp<skottie::ImageAsset> loadImageAsset(const char[] /* path */,
-                                              const char name[],
-                                              const char[] /* id */) const override {
-        // For CK/Skottie we ignore paths & IDs, and identify images based solely on name.
-        if (auto data = this->findAsset(name)) {
-            return skresources::MultiFrameImageAsset::Make(std::move(data));
-        }
-
-        return nullptr;
-    }
-
-    sk_sp<SkData> loadFont(const char name[], const char[] /* url */) const override {
-        // Same as images paths, we ignore font URLs.
-        return this->findAsset(name);
-    }
-
-private:
-    explicit SkottieAssetProvider(AssetVec assets) : fAssets(std::move(assets)) {}
-
-    sk_sp<SkData> findAsset(const char name[]) const {
-        for (const auto& asset : fAssets) {
-            if (asset.first.equals(name)) {
-                return asset.second;
-            }
-        }
-
-        SkDebugf("Could not find %s\n", name);
-        return nullptr;
-    }
-
-    const AssetVec fAssets;
-};
-
-class ManagedAnimation final : public SkRefCnt {
-public:
-    static sk_sp<ManagedAnimation> Make(const std::string& json,
-                                        sk_sp<skottie::ResourceProvider> rp) {
-        auto mgr = std::make_unique<skottie_utils::CustomPropertyManager>();
-        auto animation = skottie::Animation::Builder()
-                            .setMarkerObserver(mgr->getMarkerObserver())
-                            .setPropertyObserver(mgr->getPropertyObserver())
-                            .setResourceProvider(rp)
-                            .make(json.c_str(), json.size());
-
-        return animation
-            ? sk_sp<ManagedAnimation>(new ManagedAnimation(std::move(animation), std::move(mgr)))
-            : nullptr;
-    }
-
-    ~ManagedAnimation() override = default;
-
-    // skottie::Animation API
-    void render(SkCanvas* canvas) const { fAnimation->render(canvas, nullptr); }
-    void render(SkCanvas* canvas, const SkRect& dst) const { fAnimation->render(canvas, &dst); }
-    // Returns a damage rect.
-    SkRect seek(SkScalar t) {
-        sksg::InvalidationController ic;
-        fAnimation->seek(t, &ic);
-        return ic.bounds();
-    }
-    // Returns a damage rect.
-    SkRect seekFrame(double t) {
-        sksg::InvalidationController ic;
-        fAnimation->seekFrame(t, &ic);
-        return ic.bounds();
-    }
-    double duration() const { return fAnimation->duration(); }
-    double fps() const { return fAnimation->fps(); }
-    const SkSize& size() const { return fAnimation->size(); }
-    std::string version() const { return std::string(fAnimation->version().c_str()); }
-
-    // CustomPropertyManager API
-    JSArray getColorProps() const {
-        JSArray props = emscripten::val::array();
-
-        for (const auto& cp : fPropMgr->getColorProps()) {
-            JSObject prop = emscripten::val::object();
-            prop.set("key", cp);
-            prop.set("value", fPropMgr->getColor(cp));
-            props.call<void>("push", prop);
-        }
-
-        return props;
-    }
-
-    JSArray getOpacityProps() const {
-        JSArray props = emscripten::val::array();
-
-        for (const auto& op : fPropMgr->getOpacityProps()) {
-            JSObject prop = emscripten::val::object();
-            prop.set("key", op);
-            prop.set("value", fPropMgr->getOpacity(op));
-            props.call<void>("push", prop);
-        }
-
-        return props;
-    }
-
-    bool setColor(const std::string& key, SkColor c) {
-        return fPropMgr->setColor(key, c);
-    }
-
-    bool setOpacity(const std::string& key, float o) {
-        return fPropMgr->setOpacity(key, o);
-    }
-
-    JSArray getMarkers() const {
-        JSArray markers = emscripten::val::array();
-        for (const auto& m : fPropMgr->markers()) {
-            JSObject marker = emscripten::val::object();
-            marker.set("name", m.name);
-            marker.set("t0"  , m.t0);
-            marker.set("t1"  , m.t1);
-            markers.call<void>("push", marker);
-        }
-        return markers;
-    }
-
-private:
-    ManagedAnimation(sk_sp<skottie::Animation> animation,
-                     std::unique_ptr<skottie_utils::CustomPropertyManager> propMgr)
-        : fAnimation(std::move(animation))
-        , fPropMgr(std::move(propMgr)) {}
-
-    sk_sp<skottie::Animation>                             fAnimation;
-    std::unique_ptr<skottie_utils::CustomPropertyManager> fPropMgr;
-};
-
-} // anonymous ns
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
-
-struct SimpleImageInfo {
-    int width;
-    int height;
-    SkColorType colorType;
-    SkAlphaType alphaType;
-    // TODO color spaces?
-};
-
-SkImageInfo toSkImageInfo(const SimpleImageInfo& sii) {
-    return SkImageInfo::Make(sii.width, sii.height, sii.colorType, sii.alphaType);
-}
-
-#ifdef SK_GL
-sk_sp<GrDirectContext> MakeGrContext(EMSCRIPTEN_WEBGL_CONTEXT_HANDLE context)
-{
-    EMSCRIPTEN_RESULT r = emscripten_webgl_make_context_current(context);
-    if (r < 0) {
-        printf("failed to make webgl context current %d\n", r);
-        return nullptr;
-    }
-    // setup GrDirectContext
-    auto interface = GrGLMakeNativeInterface();
-    return GrDirectContext::MakeGL(interface);
-}
-
-sk_sp<SkSurface> MakeOnScreenGLSurface(sk_sp<GrDirectContext> grContext, int width, int height) {
-    glClearColor(0, 0, 0, 0);
-    glClearStencil(0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
-
-
-    // Wrap the frame buffer object attached to the screen in a Skia render
-    // target so Skia can render to it
-    GrGLint buffer;
-    glGetIntegerv(GL_FRAMEBUFFER_BINDING, &buffer);
-    GrGLFramebufferInfo info;
-    info.fFBOID = (GrGLuint) buffer;
-    SkColorType colorType;
-
-    GrGLint stencil;
-    glGetIntegerv(GL_STENCIL_BITS, &stencil);
-
-    info.fFormat = GL_RGBA8;
-    colorType = kRGBA_8888_SkColorType;
-
-    GrBackendRenderTarget target(width, height, 0, stencil, info);
-
-    sk_sp<SkSurface> surface(SkSurface::MakeFromBackendRenderTarget(grContext.get(), target,
-                                                                    kBottomLeft_GrSurfaceOrigin,
-                                                                    colorType, nullptr, nullptr));
-    return surface;
-}
-
-sk_sp<SkSurface> MakeRenderTarget(sk_sp<GrDirectContext> grContext, int width, int height) {
-    SkImageInfo info = SkImageInfo::MakeN32(width, height, SkAlphaType::kPremul_SkAlphaType);
-
-    sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(grContext.get(),
-                             SkBudgeted::kYes,
-                             info, 0,
-                             kBottomLeft_GrSurfaceOrigin,
-                             nullptr, true));
-    return surface;
-}
-
-sk_sp<SkSurface> MakeRenderTarget(sk_sp<GrDirectContext> grContext, SimpleImageInfo sii) {
-    sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(grContext.get(),
-                             SkBudgeted::kYes,
-                             toSkImageInfo(sii), 0,
-                             kBottomLeft_GrSurfaceOrigin,
-                             nullptr, true));
-    return surface;
-}
-#endif // SK_GL
-
-// Some signatures below have uintptr_t instead of a pointer to a primitive
-// type (e.g. SkScalar). This is necessary because we can't use "bind" (EMSCRIPTEN_BINDINGS)
-// and pointers to primitive types (Only bound types like SkPoint). We could if we used
-// cwrap (see https://becominghuman.ai/passing-and-returning-webassembly-array-parameters-a0f572c65d97)
-// but that requires us to stick to C code and, AFAIK, doesn't allow us to return nice things like
-// SkPath or SkCanvas.
-//
-// So, basically, if we are using C++ and EMSCRIPTEN_BINDINGS, we can't have primitive pointers
-// in our function type signatures. (this gives an error message like "Cannot call foo due to unbound
-// types Pi, Pf").  But, we can just pretend they are numbers and cast them to be pointers and
-// the compiler is happy.
-EMSCRIPTEN_BINDINGS(Skottie) {
-#ifdef SK_GL
-    function("currentContext", &emscripten_webgl_get_current_context);
-    function("setCurrentContext", &emscripten_webgl_make_context_current);
-    function("MakeGrContext", &MakeGrContext);
-    function("MakeOnScreenGLSurface", &MakeOnScreenGLSurface);
-    function("MakeRenderTarget",
-        select_overload<sk_sp<SkSurface>(sk_sp<GrDirectContext>, int, int)>(&MakeRenderTarget));
-    function("MakeRenderTarget",
-        select_overload<sk_sp<SkSurface>(sk_sp<GrDirectContext>, SimpleImageInfo)>(&MakeRenderTarget));
-
-    constant("gpu", true);
-
-    class_<GrDirectContext>("GrDirectContext")
-    .smart_ptr<sk_sp<GrDirectContext>>("sk_sp<GrDirectContext>");
-    // .function("getResourceCacheLimitBytes", optional_override([](GrDirectContext& self)->size_t {
-    //     int maxResources = 0;// ignored
-    //     size_t currMax = 0;
-    //     self.getResourceCacheLimits(&maxResources, &currMax);
-    //     return currMax;
-    // }))
-    // .function("getResourceCacheUsageBytes", optional_override([](GrDirectContext& self)->size_t {
-    //     int usedResources = 0;// ignored
-    //     size_t currUsage = 0;
-    //     self.getResourceCacheUsage(&usedResources, &currUsage);
-    //     return currUsage;
-    // }))
-    // .function("releaseResourcesAndAbandonContext", &GrDirectContext::releaseResourcesAndAbandonContext)
-    // .function("setResourceCacheLimitBytes", optional_override([](GrDirectContext& self, size_t maxResourceBytes) {
-    //     int maxResources = 0;
-    //     size_t currMax = 0; // ignored
-    //     self.getResourceCacheLimits(&maxResources, &currMax);
-    //     self.setResourceCacheLimits(maxResources, maxResourceBytes);
-    // }));
-#endif
-
-    // function("getDecodeCacheLimitBytes", &SkResourceCache::GetTotalByteLimit);
-    // function("setDecodeCacheLimitBytes", &SkResourceCache::SetTotalByteLimit);
-    // function("getDecodeCacheUsedBytes" , &SkResourceCache::GetTotalBytesUsed);
-
-    function("_getRasterDirectSurface", optional_override([](const SimpleImageInfo ii,
-                                                             uintptr_t /* uint8_t*  */ pPtr,
-                                                             size_t rowBytes)->sk_sp<SkSurface> {
-        uint8_t* pixels = reinterpret_cast<uint8_t*>(pPtr);
-        SkImageInfo imageInfo = toSkImageInfo(ii);
-        return SkSurface::MakeRasterDirect(imageInfo, pixels, rowBytes, nullptr);
-    }), allow_raw_pointers());
-
-    class_<SkCanvas>("SkCanvas")
-        .function("_clear", optional_override([](SkCanvas& self, uintptr_t /* float* */ cPtr) {
-            // See comment above for uintptr_t explanation
-            float* fourFloats = reinterpret_cast<float*>(cPtr);
-            SkColor4f color = { fourFloats[0], fourFloats[1], fourFloats[2], fourFloats[3]};
-            // TODO(reed): SkCanvas.clear() should take SkColor4f, then we could just use it here.
-            SkPaint p;
-            p.setBlendMode(SkBlendMode::kSrc);
-            p.setColor4f(color);
-            self.drawPaint(p);
-        }));
-
-    class_<SkSurface>("SkSurface")
-        .smart_ptr<sk_sp<SkSurface>>("sk_sp<SkSurface>")
-        .function("_flush", select_overload<void()>(&SkSurface::flush))
-        .function("getCanvas", &SkSurface::getCanvas, allow_raw_pointers());
-
-    class_<skottie::Animation>("Animation")
-        .smart_ptr<sk_sp<skottie::Animation>>("sk_sp<Animation>")
-        .function("version", optional_override([](skottie::Animation& self)->std::string {
-            return std::string(self.version().c_str());
-        }))
-        .function("size"    , &skottie::Animation::size)
-        .function("duration", &skottie::Animation::duration)
-        .function("fps"     , &skottie::Animation::fps)
-        .function("seek", optional_override([](skottie::Animation& self, SkScalar t)->void {
-            self.seek(t);
-        }))
-        .function("seekFrame", optional_override([](skottie::Animation& self, double t)->void {
-            self.seekFrame(t);
-        }))
-        .function("render", optional_override([](skottie::Animation& self, SkCanvas* canvas)->void {
-            self.render(canvas, nullptr);
-        }), allow_raw_pointers())
-        .function("render", optional_override([](skottie::Animation& self, SkCanvas* canvas,
-                                                 const SkRect r)->void {
-            self.render(canvas, &r);
-        }), allow_raw_pointers());
-
-    function("MakeAnimation", optional_override([](std::string json)->sk_sp<skottie::Animation> {
-        return skottie::Animation::Make(json.c_str(), json.length());
-    }));
-    constant("skottie", true);
-
-#if SK_INCLUDE_MANAGED_SKOTTIE
-    class_<ManagedAnimation>("ManagedAnimation")
-        .smart_ptr<sk_sp<ManagedAnimation>>("sk_sp<ManagedAnimation>")
-        .function("version"   , &ManagedAnimation::version)
-        .function("size"      , &ManagedAnimation::size)
-        .function("duration"  , &ManagedAnimation::duration)
-        .function("fps"       , &ManagedAnimation::fps)
-        .function("seek"      , &ManagedAnimation::seek)
-        .function("seekFrame" , &ManagedAnimation::seekFrame)
-        .function("render"    , select_overload<void(SkCanvas*) const>(&ManagedAnimation::render), allow_raw_pointers())
-        .function("render"    , select_overload<void(SkCanvas*, const SkRect&) const>
-                                    (&ManagedAnimation::render), allow_raw_pointers());
-        // .function("setColor"  , optional_override([](ManagedAnimation& self, const std::string& key, SimpleColor4f c) {
-        //     self.setColor(key, c.toSkColor());
-        // }))
-        // .function("setOpacity", &ManagedAnimation::setOpacity)
-        // .function("getMarkers", &ManagedAnimation::getMarkers)
-        // .function("getColorProps"  , &ManagedAnimation::getColorProps)
-        // .function("getOpacityProps", &ManagedAnimation::getOpacityProps);
-
-    function("_MakeManagedAnimation", optional_override([](std::string json,
-                                                           size_t assetCount,
-                                                           uintptr_t /* char**     */ nptr,
-                                                           uintptr_t /* uint8_t**  */ dptr,
-                                                           uintptr_t /* size_t*    */ sptr)
-                                                        ->sk_sp<ManagedAnimation> {
-        // See the comment in canvaskit_bindings.cpp about the use of uintptr_t
-        const auto assetNames = reinterpret_cast<char**   >(nptr);
-        const auto assetDatas = reinterpret_cast<uint8_t**>(dptr);
-        const auto assetSizes = reinterpret_cast<size_t*  >(sptr);
-
-        SkottieAssetProvider::AssetVec assets;
-        assets.reserve(assetCount);
-
-        for (size_t i = 0; i < assetCount; i++) {
-            auto name  = SkString(assetNames[i]);
-            auto bytes = SkData::MakeFromMalloc(assetDatas[i], assetSizes[i]);
-            assets.push_back(std::make_pair(std::move(name), std::move(bytes)));
-        }
-
-        return ManagedAnimation::Make(json,
-                 skresources::DataURIResourceProviderProxy::Make(
-                    SkottieAssetProvider::Make(std::move(assets))));
-    }));
-    constant("managed_skottie", true);
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
-
-    value_object<SimpleImageInfo>("SkImageInfo")
-        .field("width",     &SimpleImageInfo::width)
-        .field("height",    &SimpleImageInfo::height)
-        .field("colorType", &SimpleImageInfo::colorType)
-        .field("alphaType", &SimpleImageInfo::alphaType);
-
-    value_object<SkRect>("SkRect")
-        .field("fLeft",   &SkRect::fLeft)
-        .field("fTop",    &SkRect::fTop)
-        .field("fRight",  &SkRect::fRight)
-        .field("fBottom", &SkRect::fBottom);
-
-    // {"w": Number, "h", Number}
-    value_object<SkSize>("SkSize")
-        .field("w",   &SkSize::fWidth)
-        .field("h",   &SkSize::fHeight);
-
-    enum_<SkAlphaType>("AlphaType")
-        .value("Opaque",   SkAlphaType::kOpaque_SkAlphaType)
-        .value("Premul",   SkAlphaType::kPremul_SkAlphaType)
-        .value("Unpremul", SkAlphaType::kUnpremul_SkAlphaType);
-
-    enum_<SkColorType>("ColorType")
-        .value("RGBA_8888", SkColorType::kRGBA_8888_SkColorType);
-
-}
diff --git a/third_party/skia/experimental/sktext/tests/UnicodeText.cpp b/third_party/skia/experimental/sktext/tests/UnicodeText.cpp
index 7cdc1dd4bbefa..c00a5a92c384f 100644
--- a/third_party/skia/experimental/sktext/tests/UnicodeText.cpp
+++ b/third_party/skia/experimental/sktext/tests/UnicodeText.cpp
@@ -63,26 +63,26 @@ UNIX_ONLY_TEST(SkText_UnicodeText_Flags, reporter) {
     auto lineBreak = utf16.find_first_of(u"\n");
     for (size_t i = 0; i < unicodeText16.getText16().size(); ++i) {
         if (i == lineBreak) {
-            REPORTER_ASSERT(reporter, unicodeText16.hasProperty(i, CodeUnitFlags::kHardLineBreakBefore), "Pos16 %d should point to hard line break\n", lineBreak);
-            REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(i, CodeUnitFlags::kHardLineBreakBefore), "Pos8 %d should point to hard line break\n", lineBreak);
+            REPORTER_ASSERT(reporter, unicodeText16.hasProperty(i, CodeUnitFlags::kHardLineBreakBefore), "Pos16 %zu should point to hard line break\n", lineBreak);
+            REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(i, CodeUnitFlags::kHardLineBreakBefore), "Pos8 %zu should point to hard line break\n", lineBreak);
         } else {
-            REPORTER_ASSERT(reporter, unicodeText16.hasProperty(i, CodeUnitFlags::kGraphemeStart), "Pos16 %d should be a grapheme start\n", i);
-            REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(i, CodeUnitFlags::kGraphemeStart), "Pos8 %d should be a grapheme start\n", i);
+            REPORTER_ASSERT(reporter, unicodeText16.hasProperty(i, CodeUnitFlags::kGraphemeStart), "Pos16 %zu should be a grapheme start\n", i);
+            REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(i, CodeUnitFlags::kGraphemeStart), "Pos8 %zu should be a grapheme start\n", i);
         }
     }
 
     auto space1 = utf16.find_first_of(u" ");
     auto space2 = utf16.find_last_of(u" ");
 
-    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space1, CodeUnitFlags::kPartOfWhiteSpace), "Pos16 %d should be a part of whitespaces\n", space1);
-    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space1 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos16 %d should have soft line break before\n", space1 + 1);
-    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space2, CodeUnitFlags::kPartOfWhiteSpace), "Pos16 %d should be a part of whitespaces\n", space2);
-    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space2 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos16 %d should have soft line break before\n", space2 + 1);
+    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space1, CodeUnitFlags::kPartOfWhiteSpace), "Pos16 %zu should be a part of whitespaces\n", space1);
+    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space1 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos16 %zu should have soft line break before\n", space1 + 1);
+    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space2, CodeUnitFlags::kPartOfWhiteSpace), "Pos16 %zu should be a part of whitespaces\n", space2);
+    REPORTER_ASSERT(reporter, unicodeText16.hasProperty(space2 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos16 %zu should have soft line break before\n", space2 + 1);
 
-    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space1, CodeUnitFlags::kPartOfWhiteSpace), "Pos8 %d should be a part of whitespaces\n", space1);
-    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space1 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos8 %d should have soft line break before\n", space1 + 1);
-    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space2, CodeUnitFlags::kPartOfWhiteSpace), "Pos8 %d should be a part of whitespaces\n", space2);
-    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space2 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos8 %d should have soft line break before\n", space2 + 1);
+    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space1, CodeUnitFlags::kPartOfWhiteSpace), "Pos8 %zu should be a part of whitespaces\n", space1);
+    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space1 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos8 %zu should have soft line break before\n", space1 + 1);
+    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space2, CodeUnitFlags::kPartOfWhiteSpace), "Pos8 %zu should be a part of whitespaces\n", space2);
+    REPORTER_ASSERT(reporter, unicodeText8 .hasProperty(space2 + 1, CodeUnitFlags::kSoftLineBreakBefore), "Pos8 %zu should have soft line break before\n", space2 + 1);
 }
 
 // TODO: Test RTL text
diff --git a/third_party/skia/experimental/sorttoy/sorttoy.cpp b/third_party/skia/experimental/sorttoy/sorttoy.cpp
index d3a14c928b144..131add560647b 100644
--- a/third_party/skia/experimental/sorttoy/sorttoy.cpp
+++ b/third_party/skia/experimental/sorttoy/sorttoy.cpp
@@ -76,6 +76,8 @@ using sk_gpu_test::GrContextFactory;
 
 static DEFINE_string2(writePath, w, "", "If set, write bitmaps here as .pngs.");
 
+static void exitf(const char* format, ...) SK_PRINTF_LIKE(1, 2);
+
 static void exitf(const char* format, ...) {
     va_list args;
     va_start(args, format);
@@ -217,7 +219,7 @@ static void check_order(int testID,
                         const std::vector<ID>& actualOrder,
                         const std::vector<ID>& expectedOrder) {
     if (expectedOrder.size() != actualOrder.size()) {
-        exitf("Op count mismatch in test %d. Expected %d - got %d\n",
+        exitf("Op count mismatch in test %d. Expected %zu - got %zu\n",
               testID,
               expectedOrder.size(),
               actualOrder.size());
diff --git a/third_party/skia/experimental/wasm-hello-world/.gitignore b/third_party/skia/experimental/wasm-hello-world/.gitignore
new file mode 100644
index 0000000000000..d16386367f7cd
--- /dev/null
+++ b/third_party/skia/experimental/wasm-hello-world/.gitignore
@@ -0,0 +1 @@
+build/
\ No newline at end of file
diff --git a/third_party/skia/experimental/wasm-hello-world/BUILD.bazel b/third_party/skia/experimental/wasm-hello-world/BUILD.bazel
new file mode 100644
index 0000000000000..ce8eda53b1bb1
--- /dev/null
+++ b/third_party/skia/experimental/wasm-hello-world/BUILD.bazel
@@ -0,0 +1,44 @@
+load("@emsdk//emscripten_toolchain:wasm_rules.bzl", "wasm_cc_binary")
+load("//bazel:cc_binary_with_flags.bzl", "cc_binary_with_flags")
+
+LINKOPTS = [
+    "-sALLOW_MEMORY_GROWTH",
+    "-sUSE_PTHREADS=0",  # Disable pthreads
+    "-sMODULARIZE",
+    "-sDISABLE_EXCEPTION_CATCHING",  # Disable all exception catching
+    "-sWASM",
+    "-sMAX_WEBGL_VERSION=2",
+    "-sFORCE_FILESYSTEM=0",
+    "-sFILESYSTEM=0",
+    "-sASSERTIONS",  # Turn on assertions
+    "-sGL_ASSERTIONS",
+    "-sEXPORT_NAME=HelloWorld",
+]
+
+cc_binary_with_flags(
+    name = "hello_world.webgl",
+    srcs = [
+        "//example:HelloWorld_src",
+        "//tools/sk_app/wasm:main_wasm_src",
+    ],
+    linkopts = LINKOPTS,
+    set_flags = {
+        "gpu_backend": [
+            "gl_backend",
+        ],
+        "with_gl_standard": [
+            "webgl_standard",
+        ],
+    },
+    # This target won't build successfully on its own because of missing emscripten
+    # headers etc. Therefore, we hide it from wildcards.
+    tags = ["manual"],
+    deps = [
+        "//:skia_core",
+    ],
+)
+
+wasm_cc_binary(
+    name = "hello_world_wasm",
+    cc_target = ":hello_world.webgl",
+)
diff --git a/third_party/skia/experimental/wasm-hello-world/Makefile b/third_party/skia/experimental/wasm-hello-world/Makefile
new file mode 100644
index 0000000000000..56eabea7d565a
--- /dev/null
+++ b/third_party/skia/experimental/wasm-hello-world/Makefile
@@ -0,0 +1,10 @@
+debug:
+	bazelisk build //experimental/wasm-hello-world:hello_world_wasm --sandbox_base=/dev/shm
+	- rm -rf build/
+	mkdir build
+	cp ../../bazel-bin/experimental/wasm-hello-world/hello_world_wasm/hello_world.js build/hello_world.js
+	cp ../../bazel-bin/experimental/wasm-hello-world/hello_world_wasm/hello_world.wasm build/hello_world.wasm
+
+serve:
+	echo "Go check out http://localhost:8000/hello_world.html"
+	python3 ../../tools/serve_wasm.py
\ No newline at end of file
diff --git a/third_party/skia/experimental/wasm-hello-world/README.md b/third_party/skia/experimental/wasm-hello-world/README.md
new file mode 100644
index 0000000000000..78ac62e5aae1c
--- /dev/null
+++ b/third_party/skia/experimental/wasm-hello-world/README.md
@@ -0,0 +1,10 @@
+This allows us to experiment with making sk_app target the browser.
+
+To build, make sure bazelisk is installed. (This is a wrapper around bazel).
+https://github.com/google/skia-buildbot/blob/main/BAZEL_CHEATSHEET.md#install-bazelisk
+
+Then, run `make debug` to build the binary. To see the result on the web, run `make serve`
+and navigate to http://localhost:8000/hello_world.html
+
+Presently, the //tools/sk_app/wasm/main_wasm.cpp only prints out hello world, but it should
+set up the surface/window for wasm and then call into the sk_app code.
\ No newline at end of file
diff --git a/third_party/skia/experimental/wasm-hello-world/hello_world.html b/third_party/skia/experimental/wasm-hello-world/hello_world.html
new file mode 100644
index 0000000000000..007a7b22da815
--- /dev/null
+++ b/third_party/skia/experimental/wasm-hello-world/hello_world.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<title>Hello World (sk_app)</title>
+<meta charset="utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+<script type="text/javascript" src="/build/hello_world.js"></script>
+
+<script type="text/javascript" charset="utf-8">
+
+  async function run() {
+    const HW = await HelloWorld({locateFile: (file) => '/build/'+file});
+    console.log('loaded?')
+  }
+  run();
+
+</script>
\ No newline at end of file
diff --git a/third_party/skia/experimental/wasm-skp-debugger/compile.sh b/third_party/skia/experimental/wasm-skp-debugger/compile.sh
index 478d291d2eab4..afa69be113fe2 100755
--- a/third_party/skia/experimental/wasm-skp-debugger/compile.sh
+++ b/third_party/skia/experimental/wasm-skp-debugger/compile.sh
@@ -25,7 +25,7 @@ EMAR=`which emar`
 if [[ $@ == *debug* ]]; then
   echo "Building a Debug build"
   EXTRA_CFLAGS="\"-DSK_DEBUG\","
-  RELEASE_CONF="-O0 --js-opts 0 -s DEMANGLE_SUPPORT=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 -g3 \
+  RELEASE_CONF="-O0 --js-opts 0 -sDEMANGLE_SUPPORT=1 -sASSERTIONS=1 -sGL_ASSERTIONS=1 -g3 \
                 --source-map-base /node_modules/debugger/bin/ -DSK_DEBUG"
   BUILD_DIR=${BUILD_DIR:="out/debugger_wasm_debug"}
 else
@@ -70,7 +70,7 @@ echo "Compiling bitcode"
   cxx=\"${EMCXX}\" \
   ar=\"${EMAR}\" \
   extra_cflags_cc=[\"-frtti\"] \
-  extra_cflags=[\"-s\", \"MAIN_MODULE=1\",
+  extra_cflags=[\"-sMAIN_MODULE=1\",
     \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",
     \"-DSK_FORCE_8_BYTE_ALIGNMENT\",
     \"-DSK_ENABLE_DUMP_GPU\", \"-DSK_DISABLE_LEGACY_SHADERCONTEXT\",
@@ -140,14 +140,14 @@ EMCC_DEBUG=1 ${EMCXX} \
     $BASE_DIR/debugger_bindings.cpp \
     $BUILD_DIR/libdebugcanvas.a \
     $BUILD_DIR/libskia.a \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s EXPORT_NAME="DebuggerInit" \
-    -s FORCE_FILESYSTEM=0 \
-    -s FILESYSTEM=0 \
-    -s MODULARIZE=1 \
-    -s NO_EXIT_RUNTIME=1 \
-    -s STRICT=1 \
-    -s INITIAL_MEMORY=128MB \
-    -s WASM=1 \
-    -s USE_WEBGL2=1 \
+    -sALLOW_MEMORY_GROWTH=1 \
+    -sEXPORT_NAME="DebuggerInit" \
+    -sFORCE_FILESYSTEM=0 \
+    -sFILESYSTEM=0 \
+    -sMODULARIZE=1 \
+    -sNO_EXIT_RUNTIME=1 \
+    -sSTRICT=1 \
+    -sINITIAL_MEMORY=128MB \
+    -sWASM=1 \
+    -sUSE_WEBGL2=1 \
     -o $BUILD_DIR/debugger.js
diff --git a/third_party/skia/experimental/xform/SkShape.cpp b/third_party/skia/experimental/xform/SkShape.cpp
deleted file mode 100644
index cd57b5ef25a1f..0000000000000
--- a/third_party/skia/experimental/xform/SkShape.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "experimental/xform/SkShape.h"
-#include "experimental/xform/SkXform.h"
-#include "include/core/SkCanvas.h"
-
-void GeoShape::draw(XContext* ctx) {
-    ctx->drawRect(fRect, fPaint, this->xform());
-}
-
-void GroupShape::draw(XContext* ctx) {
-    if (fArray.count() == 0) {
-        return;
-    }
-
-    ctx->push(this->xform());
-    for (auto s : fArray) {
-        s->draw(ctx);
-    }
-    ctx->pop();
-}
diff --git a/third_party/skia/experimental/xform/SkShape.h b/third_party/skia/experimental/xform/SkShape.h
deleted file mode 100644
index 3106e26c568f7..0000000000000
--- a/third_party/skia/experimental/xform/SkShape.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkShape_DEFINED
-#define SkShape_DEFINED
-
-#include "experimental/xform/SkXform.h"
-#include "include/core/SkPaint.h"
-
-class SkCanvas;
-
-class XContext {
-public:
-    virtual ~XContext() {}
-
-    void push(Xform* parentXform) { this->onPush(parentXform); }
-    void pop() { this->onPop(); }
-
-    void drawRect(const SkRect&, const SkPaint&, Xform* localXform);
-
-    static std::unique_ptr<XContext> Make(SkCanvas*);
-
-protected:
-    virtual void onPush(Xform*) = 0;
-    virtual void onPop() = 0;
-
-    virtual void onDrawRect(const SkRect&, const SkPaint&, Xform*) = 0;
-};
-
-class Shape : public SkRefCnt {
-    sk_sp<Xform>    fXform;
-
-public:
-    Shape(sk_sp<Xform> x = nullptr) : fXform(std::move(x)) {}
-
-    Xform* xform() const { return fXform.get(); }
-    void setXform(sk_sp<Xform> x) {
-        fXform = std::move(x);
-    }
-
-    virtual void draw(XContext*) {}
-};
-
-class GeoShape : public Shape {
-    SkRect  fRect;
-    SkPaint fPaint;
-
-    GeoShape(sk_sp<Xform> x, const SkRect& r, SkColor c) : Shape(std::move(x)), fRect(r) {
-        fPaint.setColor(c);
-    }
-
-public:
-    static sk_sp<Shape> Make(sk_sp<Xform> x, const SkRect& r, SkColor c) {
-        return sk_sp<Shape>(new GeoShape(std::move(x), r, c));
-    }
-
-    void draw(XContext*) override;
-};
-
-class GroupShape : public Shape {
-    SkTDArray<Shape*> fArray;
-
-    GroupShape(sk_sp<Xform> x) : Shape(std::move(x)) {}
-
-public:
-    static sk_sp<GroupShape> Make(sk_sp<Xform> x = nullptr) {
-        return sk_sp<GroupShape>(new GroupShape(std::move(x)));
-    }
-
-    static sk_sp<GroupShape> Make(sk_sp<Xform> x, sk_sp<Shape> s) {
-        auto g = sk_sp<GroupShape>(new GroupShape(std::move(x)));
-        g->append(std::move(s));
-        return g;
-    }
-
-    ~GroupShape() override {
-        fArray.unrefAll();
-    }
-
-    int count() const { return fArray.count(); }
-    Shape* get(int index) const { return fArray[index]; }
-    void set(int index, sk_sp<Shape> s) {
-        fArray[index] = s.release();
-    }
-
-    void append(sk_sp<Shape> s) {
-        *fArray.append() = s.release();
-    }
-    void insert(int index, sk_sp<Shape> s) {
-        *fArray.insert(index) = s.release();
-    }
-    void remove(int index) {
-        SkSafeUnref(fArray[index]);
-        fArray.remove(index);
-    }
-
-    void draw(XContext*) override ;
-};
-
-#endif
diff --git a/third_party/skia/experimental/xform/SkXform.cpp b/third_party/skia/experimental/xform/SkXform.cpp
deleted file mode 100644
index ddab4f1047f46..0000000000000
--- a/third_party/skia/experimental/xform/SkXform.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "experimental/xform/SkXform.h"
-
-static std::atomic<uint32_t> gGenID{1};
-Xform::GenID Xform::NextGenID() {
-    return gGenID++;
-}
-
-#ifdef SK_DEBUG
-void Xform::debugValidate() const {
-    if (this->isCached() && fParent) {
-        SkASSERT(fParent->isCached());
-    }
-    for (auto c : fChildren) {
-        SkASSERT(c->parent() == this);
-        c->debugValidate();
-    }
-}
-#endif
-
-void Xform::setParent(sk_sp<Xform> parent) {
-    if (parent == fParent) {
-        return;
-    }
-
-    if (fParent) {
-        fParent->internalRemoveChild(this);
-    }
-    if (parent) {
-        parent->internalAddChild(this);
-    }
-    fParent = std::move(parent);
-
-    // Potentially we could skip this if knew that our old and new parents
-    // were both cached, and they started us in the same state...
-    // For now, we conservatively always inval
-    this->invalidateCaches();
-
-    this->debugValidate();
-}
-
-void Xform::internalAddChild(Xform* child) {
-    SkASSERT(fChildren.find(child) < 0);
-    fChildren.push_back(child);
-}
-
-void Xform::internalRemoveChild(Xform* child) {
-    int index = fChildren.find(child);
-    SkASSERT(index >= 0);
-    fChildren.removeShuffle(index);
-}
-
-void Xform::invalidateCaches() {
-    fGenID = 0;
-    if (this->isCached()) {
-        this->internalInvalidateCaches();
-        for (auto c : fChildren) {
-            c->invalidateCaches();
-        }
-    }
-}
-
-void Xform::visit(XformResolver* resolver) {
-    this->onVisit(resolver);
-}
-
-void Xform::setCache(const SkMatrix& ctm, sk_sp<ClipCache> clip) {
-    fCTM = ctm;
-    fClip = std::move(clip);
-    fGenID = NextGenID();
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////
-
-void MatrixXF::onVisit(XformResolver* resolver) {
-    resolver->concat(fLocalMatrix);
-}
-
-void ClipXF::onVisit(XformResolver* resolver) {
-    resolver->clipRect(fRect, fOp);
-}
diff --git a/third_party/skia/experimental/xform/SkXform.h b/third_party/skia/experimental/xform/SkXform.h
deleted file mode 100644
index c47a7be0004ef..0000000000000
--- a/third_party/skia/experimental/xform/SkXform.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkXform_DEFINED
-#define SkXform_DEFINED
-
-#include "include/core/SkClipOp.h"
-#include "include/core/SkMatrix.h"
-#include "include/core/SkPath.h"
-#include "include/core/SkRRect.h"
-#include "include/core/SkRect.h"
-#include "include/core/SkRefCnt.h"
-
-#include "include/private/SkTDArray.h"
-
-class XformResolver {
-public:
-    virtual ~XformResolver() {}
-
-    virtual void concat(const SkMatrix&) = 0;
-    virtual void clipRect(const SkRect&, SkClipOp) = 0;
-    virtual void clipRRect(const SkRRect&, SkClipOp) = 0;
-    virtual void clipPath(const SkPath&, SkClipOp) = 0;
-};
-
-class ClipCache : public SkRefCnt {
-public:
-    ClipCache() {}
-};
-
-class Xform : public SkRefCnt {
-public:
-    typedef uint32_t GenID;
-
-    Xform* parent() const { return fParent.get(); }
-    void setParent(sk_sp<Xform> p);
-
-    void visit(XformResolver* resolver);
-
-    GenID genID() const { return fGenID; }
-
-    bool isCached() const { return !!fClip; }
-    void invalidateCaches();
-
-    const SkMatrix& ctm() const { return fCTM; }
-    ClipCache* clip() const { return fClip.get(); }
-
-    void setCache(const SkMatrix&, sk_sp<ClipCache>);
-
-protected:
-    Xform(sk_sp<Xform> parent = nullptr) {
-        if (parent) {
-            this->setParent(std::move(parent));
-        }
-    }
-
-    virtual void onVisit(XformResolver*) {}
-
-private:
-    sk_sp<Xform> fParent;
-
-    // unowned bare pointers
-    SkTDArray<Xform*> fChildren;
-
-    // cache
-    SkMatrix         fCTM;
-    sk_sp<ClipCache> fClip;
-
-    uint32_t fGenID = 0;
-
-    static GenID NextGenID();
-
-    void internalInvalidateCaches() { fClip = nullptr; }
-    void internalAddChild(Xform*);
-    void internalRemoveChild(Xform*);
-
-#ifdef SK_DEBUG
-    void debugValidate() const;
-#else
-    void debugValidate() const {}
-#endif
-};
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-
-class MatrixXF : public Xform {
-public:
-    static sk_sp<MatrixXF> Make(sk_sp<Xform> parent = nullptr) {
-        return sk_sp<MatrixXF>(new MatrixXF(std::move(parent)));
-    }
-
-    MatrixXF(sk_sp<Xform> parent) : Xform(std::move(parent)) {
-        fLocalMatrix.reset();
-    }
-
-    void setLocalMatrix(const SkMatrix& m) {
-        fLocalMatrix = m;
-    }
-    void setTranslate(SkScalar sx, SkScalar sy) {
-        fLocalMatrix.setTranslate(sx, sy);
-    }
-    void setScale(SkScalar sx, SkScalar sy) {
-        fLocalMatrix.setScale(sx, sy);
-    }
-    void setRotate(SkScalar degrees) {
-        fLocalMatrix.setRotate(degrees);
-    }
-
-protected:
-    void onVisit(XformResolver* resolver) override;
-
-private:
-    SkMatrix fLocalMatrix;
-};
-
-class ClipXF : public Xform {
-public:
-    ClipXF(sk_sp<Xform> parent = nullptr) : Xform(std::move(parent)) {}
-    ClipXF(sk_sp<Xform> parent, const SkRect& r, SkClipOp op = SkClipOp::kIntersect)
-        : Xform(std::move(parent))
-        , fRect(r)
-        , fOp(op)
-    {}
-
-    void setRect(const SkRect& r, SkClipOp op = SkClipOp::kIntersect) {
-        fRect = r;
-        fOp = op;
-    }
-
-protected:
-    void onVisit(XformResolver* resolver) override;
-
-private:
-    SkRect      fRect;
-    SkClipOp    fOp;
-};
-
-#endif
diff --git a/third_party/skia/experimental/xform/XContext.cpp b/third_party/skia/experimental/xform/XContext.cpp
deleted file mode 100644
index f16867b7d5be1..0000000000000
--- a/third_party/skia/experimental/xform/XContext.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2019 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "experimental/xform/SkShape.h"
-#include "experimental/xform/SkXform.h"
-#include "include/core/SkCanvas.h"
-
-#include "src/core/SkRasterClip.h"
-
-class RasterClipCache : public ClipCache {
-public:
-    RasterClipCache(const SkRasterClip& rc) : fRC(std::move(rc)) {}
-
-    SkRasterClip fRC;
-};
-
-static const SkRasterClip& peek_rasterclip(ClipCache* clip) {
-    return ((RasterClipCache*)clip)->fRC;
-}
-
-class RasterXformResolver : public XformResolver {
-public:
-    RasterXformResolver(const SkIRect& bounds)
-        : fBounds(bounds)
-        , fCTM(SkMatrix::I())
-        , fRC(bounds)
-    {}
-
-    RasterXformResolver(Xform* parent) {
-        const SkRasterClip& rc = peek_rasterclip(parent->clip());
-        fBounds = rc.getBounds();
-        fCTM = parent->ctm();
-        fRC = rc;
-    }
-
-    void concat(const SkMatrix& m) override {
-        fCTM.preConcat(m);
-    }
-
-    void clipRect(const SkRect& r, SkClipOp op) override {
-        fRC.op(r, fCTM, op, false);
-        fCache.reset(nullptr);
-    }
-
-    void clipRRect(const SkRRect& rr, SkClipOp op) override {
-        fRC.op(rr, fCTM, op, false);
-        fCache.reset(nullptr);
-    }
-    void clipPath(const SkPath& p, SkClipOp op) override {
-        fRC.op(p, fCTM, op, false);
-        fCache.reset(nullptr);
-    }
-
-    const SkMatrix& ctm() const { return fCTM; }
-
-    sk_sp<ClipCache> snapCache() {
-        if (!fCache) {
-            fCache = sk_sp<ClipCache>(new RasterClipCache(fRC));
-        }
-        return fCache;
-    }
-
-private:
-    SkIRect         fBounds;
-    SkMatrix        fCTM;
-    SkRasterClip    fRC;
-    sk_sp<ClipCache> fCache;
-};
-
-void XContext::drawRect(const SkRect& r, const SkPaint& p, Xform* x) {
-    this->onDrawRect(r, p, x);
-}
-
-class CanvasXContext : public XContext {
-public:
-    CanvasXContext(SkCanvas* canvas) : fCanvas(canvas) {
-        fBounds = {
-            0, 0, canvas->getBaseLayerSize().width(), canvas->getBaseLayerSize().height()
-        };
-    }
-
-protected:
-    static int count_nodes(const Xform* x) {
-        int n = 0;
-        for (; x; x = x->parent()) {
-            n += 1;
-        }
-        return n;
-    }
-
-    void onPush(Xform* x) override {
-        int n = count_nodes(x);
-        fCounts.push_back(n);
-        if (n) {
-            int prevCount = fStack.count();
-            // now push the x tree such that we get [... grandparent, parent, x] in the array
-            Xform** ptr = fStack.append(n) + n;
-            Xform* xx = x;
-            while (n --> 0) {
-                *--ptr = xx;
-                xx = xx->parent();
-            }
-            // init with the old tail
-            if (prevCount > 0) {
-                RasterXformResolver res(fStack[prevCount - 1]);
-                for (int i = prevCount; i < fStack.count(); ++i) {
-                    fStack[i]->visit(&res);
-                    fStack[i]->setCache(res.ctm(), res.snapCache());
-                }
-            } else if (!x->genID()) {
-                RasterXformResolver res(fBounds);
-                for (int i = 0; i < fStack.count(); ++i) {
-                    fStack[i]->visit(&res);
-                    fStack[i]->setCache(res.ctm(), res.snapCache());
-                }
-                SkASSERT(x->genID());
-            }
-        }
-    }
-
-    void onPop() override {
-        int n = fCounts.top();
-        fCounts.pop();
-        if (n) {
-            fStack.setCount(fStack.count() - n);
-        }
-    }
-
-    void onDrawRect(const SkRect& r, const SkPaint& p, Xform* x) override {
-        Xform* parent = this->parentOrNull();
-        Xform::GenID parentID = parent ? parent->genID() : 0;
-        SkASSERT(parent == nullptr || parentID != 0);
-
-        if (x) {
-            SkASSERT(x->genID() != parentID || (x->genID() == 0 && parentID == 0));
-            if (x->genID() <= parentID) {    // x is out of date
-                this->push(x);              // will update caches
-                this->pop();
-            }
-            SkASSERT(x->genID() > parentID);
-        } else {
-            x = parent;
-        }
-
-        SkAutoCanvasRestore acr(fCanvas, false);
-        if (x) {
-            fCanvas->save();
-            fCanvas->concat(x->ctm());
-            fCanvas->clipRegion(peek_rasterclip(x->clip()).bwRgn());
-        }
-        fCanvas->drawRect(r, p);
-    }
-
-private:
-    SkTDArray<Xform*> fStack;
-    SkTDArray<int>    fCounts;
-
-    SkCanvas* fCanvas;    // bare pointer
-    SkIRect   fBounds;
-
-    Xform* parentOrNull() {
-        return fStack.count() > 0 ? fStack.top() : nullptr;
-    }
-};
-
-std::unique_ptr<XContext> XContext::Make(SkCanvas* canvas) {
-    return std::unique_ptr<XContext>(new CanvasXContext(canvas));
-}
diff --git a/third_party/skia/fuzz/FuzzCanvas.cpp b/third_party/skia/fuzz/FuzzCanvas.cpp
index 77ed87988092c..2bc1cdee7a8d6 100644
--- a/third_party/skia/fuzz/FuzzCanvas.cpp
+++ b/third_party/skia/fuzz/FuzzCanvas.cpp
@@ -50,13 +50,16 @@
 #include "src/utils/SkUTF.h"
 #include "tools/flags/CommandLineFlags.h"
 
-#ifdef SK_GL
+#if SK_SUPPORT_GPU
 #include "include/gpu/GrDirectContext.h"
-#include "include/gpu/gl/GrGLFunctions.h"
 #include "src/gpu/GrDirectContextPriv.h"
+#include "tools/gpu/GrContextFactory.h"
+#endif
+
+#ifdef SK_GL
+#include "include/gpu/gl/GrGLFunctions.h"
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/gl/GrGLUtil.h"
-#include "tools/gpu/GrContextFactory.h"
 #endif
 
 // MISC
@@ -1620,8 +1623,24 @@ DEF_FUZZ(SerializedImageFilter, fuzz) {
     canvas.restore();
 }
 
-#ifdef SK_GL
+#if SK_SUPPORT_GPU
+static void fuzz_ganesh(Fuzz* fuzz, GrDirectContext* context) {
+    SkASSERT(context);
+    auto surface = SkSurface::MakeRenderTarget(
+            context,
+            SkBudgeted::kNo,
+            SkImageInfo::Make(kCanvasSize, kRGBA_8888_SkColorType, kPremul_SkAlphaType));
+    SkASSERT(surface && surface->getCanvas());
+    fuzz_canvas(fuzz, surface->getCanvas());
+}
+
+DEF_FUZZ(MockGPUCanvas, fuzz) {
+    sk_gpu_test::GrContextFactory f;
+    fuzz_ganesh(fuzz, f.get(sk_gpu_test::GrContextFactory::kMock_ContextType));
+}
+#endif
 
+#ifdef SK_GL
 static void dump_GPU_info(GrDirectContext* context) {
     const GrGLInterface* gl = static_cast<GrGLGpu*>(context->priv().getGpu())
                                     ->glInterface();
@@ -1636,16 +1655,6 @@ static void dump_GPU_info(GrDirectContext* context) {
     SkDebugf("GL_VERSION %s\n", (const char*) output);
 }
 
-static void fuzz_ganesh(Fuzz* fuzz, GrDirectContext* context) {
-    SkASSERT(context);
-    auto surface = SkSurface::MakeRenderTarget(
-            context,
-            SkBudgeted::kNo,
-            SkImageInfo::Make(kCanvasSize, kRGBA_8888_SkColorType, kPremul_SkAlphaType));
-    SkASSERT(surface && surface->getCanvas());
-    fuzz_canvas(fuzz, surface->getCanvas());
-}
-
 DEF_FUZZ(NativeGLCanvas, fuzz) {
     sk_gpu_test::GrContextFactory f;
     auto context = f.get(sk_gpu_test::GrContextFactory::kGL_ContextType);
@@ -1657,11 +1666,6 @@ DEF_FUZZ(NativeGLCanvas, fuzz) {
     }
     fuzz_ganesh(fuzz, context);
 }
-
-DEF_FUZZ(MockGPUCanvas, fuzz) {
-    sk_gpu_test::GrContextFactory f;
-    fuzz_ganesh(fuzz, f.get(sk_gpu_test::GrContextFactory::kMock_ContextType));
-}
 #endif
 
 DEF_FUZZ(PDFCanvas, fuzz) {
diff --git a/third_party/skia/fuzz/FuzzCommon.cpp b/third_party/skia/fuzz/FuzzCommon.cpp
index a168e0d0d88ec..2b92bcdc17c0b 100644
--- a/third_party/skia/fuzz/FuzzCommon.cpp
+++ b/third_party/skia/fuzz/FuzzCommon.cpp
@@ -7,6 +7,7 @@
 
 #include "fuzz/Fuzz.h"
 #include "fuzz/FuzzCommon.h"
+#include "src/core/SkPathPriv.h"
 
 // We don't always want to test NaNs and infinities.
 static void fuzz_nice_float(Fuzz* fuzz, float* f) {
@@ -44,9 +45,9 @@ void FuzzNicePath(Fuzz* fuzz, SkPath* path, int maxOps) {
             return;
         }
         // How many items in the switch statement below.
-        constexpr uint8_t PATH_OPERATIONS = 32;
+        constexpr uint8_t MAX_PATH_OPERATION = 32;
         uint8_t op;
-        fuzz->nextRange(&op, 0, PATH_OPERATIONS);
+        fuzz->nextRange(&op, 0, MAX_PATH_OPERATION);
         bool test;
         SkPath p;
         SkMatrix m;
@@ -205,13 +206,19 @@ void FuzzNicePath(Fuzz* fuzz, SkPath* path, int maxOps) {
                 break;
             case 30:
                 FuzzNicePath(fuzz, &p, maxOps-1);
-                FuzzNiceMatrix(fuzz, &m);
-                p.transform(m, path);
+                // transform can explode path sizes so skip this op if p too big
+                if (p.countPoints() <= 100000) {
+                    FuzzNiceMatrix(fuzz, &m);
+                    p.transform(m, path);
+                }
                 break;
             case 31:
                 fuzz_nice_float(fuzz, &a, &b);
                 path->setLastPt(a, b);
                 break;
+            case MAX_PATH_OPERATION:
+                SkPathPriv::ShrinkToFit(path);
+                break;
 
             default:
                 SkASSERT(false);
diff --git a/third_party/skia/fuzz/FuzzDDLThreading.cpp b/third_party/skia/fuzz/FuzzDDLThreading.cpp
index c2669d37ff349..fdc4c77e055b8 100644
--- a/third_party/skia/fuzz/FuzzDDLThreading.cpp
+++ b/third_party/skia/fuzz/FuzzDDLThreading.cpp
@@ -54,7 +54,7 @@ class PromiseImageInfo : public SkNVRefCnt<PromiseImageInfo>, SkNoncopyable {
     };
     ~PromiseImageInfo() {
         // If we hit this, then the image or the texture will outlive this object which is bad.
-        SkASSERT_RELEASE(fImage->unique());
+        SkASSERT_RELEASE(!fImage || fImage->unique());
         SkASSERT_RELEASE(!fTexture || fTexture->unique());
         fImage.reset();
         fTexture.reset();
diff --git a/third_party/skia/fuzz/FuzzGradients.cpp b/third_party/skia/fuzz/FuzzGradients.cpp
index 2dfab4efd00ec..5836ce4c507bb 100644
--- a/third_party/skia/fuzz/FuzzGradients.cpp
+++ b/third_party/skia/fuzz/FuzzGradients.cpp
@@ -9,6 +9,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkSurface.h"
 #include "include/effects/SkGradientShader.h"
+#include "src/core/SkDebugUtils.h"
 #include "src/core/SkTLazy.h"
 #include "tools/flags/CommandLineFlags.h"
 
@@ -95,11 +96,7 @@ static void logLinearGradient(const SkPoint pts[2],
     }
     SkDebugf("]\n");
 
-    static const char* gModeName[] = {
-        "kClamp_TileMode", "kRepeat_TileMode", "kMirror_TileMode", "kDecal_TileMode"
-    };
-    SkASSERT((unsigned)mode < SK_ARRAY_COUNT(gModeName));
-    SkDebugf("  mode:\t\t%s\n", gModeName[(unsigned)mode]);
+    SkDebugf("  mode:\t\t%s\n", SkTileModeToStr(mode));
     SkDebugf("  flags:\t0x%x\n", flags);
     logOptionalMatrix("local matrix", localMatrix);
     logOptionalMatrix("global matrix", globalMatrix);
diff --git a/third_party/skia/fuzz/FuzzPolyUtils.cpp b/third_party/skia/fuzz/FuzzPolyUtils.cpp
index e4b3c8b0465d9..bb47268f1d774 100644
--- a/third_party/skia/fuzz/FuzzPolyUtils.cpp
+++ b/third_party/skia/fuzz/FuzzPolyUtils.cpp
@@ -12,33 +12,48 @@
 
 void inline ignoreResult(bool ) {}
 
+// clamps the point to the nearest 16th of a pixel
+static SkPoint sanitize_point(const SkPoint& in) {
+    SkPoint out;
+    out.fX = SkScalarRoundToScalar(16.f*in.fX)*0.0625f;
+    out.fY = SkScalarRoundToScalar(16.f*in.fY)*0.0625f;
+    return out;
+}
+
 DEF_FUZZ(PolyUtils, fuzz) {
     int count;
     fuzz->nextRange(&count, 0, 512);
     SkAutoSTMalloc<64, SkPoint> polygon(count);
     for (int index = 0; index < count; ++index) {
         fuzz->next(&polygon[index].fX, &polygon[index].fY);
+        polygon[index] = sanitize_point(polygon[index]);
     }
     SkRect bounds;
     bounds.setBoundsCheck(polygon, count);
 
     ignoreResult(SkGetPolygonWinding(polygon, count));
-    ignoreResult(SkIsConvexPolygon(polygon, count));
-    ignoreResult(SkIsSimplePolygon(polygon, count));
+    bool isConvex = SkIsConvexPolygon(polygon, count);
+    bool isSimple = SkIsSimplePolygon(polygon, count);
 
-    SkScalar inset;
-    fuzz->next(&inset);
     SkTDArray<SkPoint> output;
-    ignoreResult(SkInsetConvexPolygon(polygon, count, inset, &output));
-
-    SkScalar offset;
-    fuzz->next(&offset);
-    ignoreResult(SkOffsetSimplePolygon(polygon, count, bounds, offset, &output));
+    if (isConvex) {
+        SkScalar inset;
+        fuzz->next(&inset);
+        ignoreResult(SkInsetConvexPolygon(polygon, count, inset, &output));
+    }
 
-    SkAutoSTMalloc<64, uint16_t> indexMap(count);
-    for (int index = 0; index < count; ++index) {
-        fuzz->next(&indexMap[index]);
+    if (isSimple) {
+        SkScalar offset;
+        // Limit this to prevent timeouts.
+        // This should be fine, as this is roughly the range we expect from the shadow algorithm.
+        fuzz->nextRange(&offset, -1000, 1000);
+        ignoreResult(SkOffsetSimplePolygon(polygon, count, bounds, offset, &output));
+
+        SkAutoSTMalloc<64, uint16_t> indexMap(count);
+        for (int index = 0; index < count; ++index) {
+            fuzz->next(&indexMap[index]);
+        }
+        SkTDArray<uint16_t> outputIndices;
+        ignoreResult(SkTriangulateSimplePolygon(polygon, indexMap, count, &outputIndices));
     }
-    SkTDArray<uint16_t> outputIndices;
-    ignoreResult(SkTriangulateSimplePolygon(polygon, indexMap, count, &outputIndices));
 }
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
index 7262707bec607..e22ced3293e3c 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp
@@ -13,13 +13,13 @@
 bool FuzzSKSL2GLSL(sk_sp<SkData> bytes) {
     std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
     SkSL::Compiler compiler(caps.get());
-    SkSL::String output;
     SkSL::Program::Settings settings;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
                                                     SkSL::ProgramKind::kFragment,
-                                                    SkSL::String((const char*) bytes->data(),
-                                                                 bytes->size()),
+                                                    std::string((const char*) bytes->data(),
+                                                                bytes->size()),
                                                     settings);
+    std::string output;
     if (!program || !compiler.toGLSL(*program, &output)) {
         return false;
     }
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
index 13e1f6934a4f6..546463a2c83d6 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp
@@ -13,13 +13,13 @@
 bool FuzzSKSL2Metal(sk_sp<SkData> bytes) {
     std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
     SkSL::Compiler compiler(caps.get());
-    SkSL::String output;
     SkSL::Program::Settings settings;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
                                                     SkSL::ProgramKind::kFragment,
-                                                    SkSL::String((const char*) bytes->data(),
-                                                                 bytes->size()),
+                                                    std::string((const char*) bytes->data(),
+                                                                bytes->size()),
                                                     settings);
+    std::string output;
     if (!program || !compiler.toMetal(*program, &output)) {
         return false;
     }
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
index 546c77be24687..6a529b00259a1 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp
@@ -19,18 +19,16 @@ bool FuzzSKSL2Pipeline(sk_sp<SkData> bytes) {
     SkSL::Program::Settings settings;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
                                                     SkSL::ProgramKind::kRuntimeShader,
-                                                    SkSL::String((const char*) bytes->data(),
-                                                                 bytes->size()),
+                                                    std::string((const char*) bytes->data(),
+                                                                bytes->size()),
                                                     settings);
     if (!program) {
         return false;
     }
 
     class Callbacks : public SkSL::PipelineStage::Callbacks {
-        using String = SkSL::String;
-
-        String declareUniform(const SkSL::VarDeclaration* decl) override {
-            return String(decl->var().name());
+        std::string declareUniform(const SkSL::VarDeclaration* decl) override {
+            return std::string(decl->var().name());
         }
 
         void defineFunction(const char* /*decl*/, const char* /*body*/, bool /*isMain*/) override {}
@@ -38,17 +36,20 @@ bool FuzzSKSL2Pipeline(sk_sp<SkData> bytes) {
         void defineStruct(const char* /*definition*/) override {}
         void declareGlobal(const char* /*declaration*/) override {}
 
-        String sampleShader(int index, String coords) override {
-            return "child_" + SkSL::to_string(index) + ".eval(" + coords + ")";
+        std::string sampleShader(int index, std::string coords) override {
+            return "child_" + std::to_string(index) + ".eval(" + coords + ")";
         }
 
-        String sampleColorFilter(int index, String color) override {
-            return "child_" + SkSL::to_string(index) + ".eval(" + color + ")";
+        std::string sampleColorFilter(int index, std::string color) override {
+            return "child_" + std::to_string(index) + ".eval(" + color + ")";
         }
 
-        String sampleBlender(int index, String src, String dst) override {
-            return "child_" + SkSL::to_string(index) + ".eval(" + src + ", " + dst + ")";
+        std::string sampleBlender(int index, std::string src, std::string dst) override {
+            return "child_" + std::to_string(index) + ".eval(" + src + ", " + dst + ")";
         }
+
+        std::string toLinearSrgb(std::string color) override { return color; }
+        std::string fromLinearSrgb(std::string color) override { return color; }
     };
 
     Callbacks callbacks;
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp
index 902838ef3e926..41281f3e3515c 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp
@@ -13,7 +13,6 @@
 bool FuzzSKSL2SPIRV(sk_sp<SkData> bytes) {
     std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
     SkSL::Compiler compiler(caps.get());
-    SkSL::String output;
     SkSL::Program::Settings settings;
 
     // This tells the compiler where the rt-flip uniform will live should it be required. For
@@ -25,9 +24,10 @@ bool FuzzSKSL2SPIRV(sk_sp<SkData> bytes) {
 
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
                                                     SkSL::ProgramKind::kFragment,
-                                                    SkSL::String((const char*) bytes->data(),
-                                                                 bytes->size()),
+                                                    std::string((const char*) bytes->data(),
+                                                                bytes->size()),
                                                     settings);
+    std::string output;
     if (!program || !compiler.toSPIRV(*program, &output)) {
         return false;
     }
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp
index 450e1b07e5100..681cbf32e575a 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSkDescriptorDeserialize.cpp
@@ -6,16 +6,16 @@
  */
 
 #include "src/core/SkDescriptor.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "src/core/SkReadBuffer.h"
 
 void FuzzSkDescriptorDeserialize(sk_sp<SkData> bytes) {
-    SkAutoDescriptor aDesc;
-    bool ok = SkFuzzDeserializeSkDescriptor(bytes, &aDesc);
-    if (!ok) {
-         return;
+    SkReadBuffer buffer{bytes->data(), bytes->size()};
+    auto sut = SkAutoDescriptor::MakeFromBuffer(buffer);
+    if (!sut.has_value()) {
+        return;
     }
 
-    auto desc = aDesc.getDesc();
+    auto desc = sut->getDesc();
 
     desc->computeChecksum();
     desc->isValid();
diff --git a/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp b/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp
index dec5c4a8342d9..d75c252b7d982 100644
--- a/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp
+++ b/third_party/skia/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp
@@ -6,46 +6,83 @@
  */
 
 #include "include/core/SkCanvas.h"
+#include "include/core/SkColorFilter.h"
 #include "include/core/SkPaint.h"
+#include "include/core/SkShader.h"
 #include "include/core/SkSurface.h"
+#include "include/effects/SkBlenders.h"
 #include "include/effects/SkRuntimeEffect.h"
 #include "src/gpu/GrShaderCaps.h"
 
 #include "fuzz/Fuzz.h"
 
-static constexpr size_t kReservedBytes = 256;
 /**
- * The fuzzer will take in the bytes and divide into two parts.
- * original bytes : [... code bytes ... | 256 bytes]
- * The first part is codeBytes, the original bytes minus 256 bytes, which will be treated
- * as sksl code, intending to create SkRuntimeEffect.
- * For the second part, it will first reserve 256 bytes and then allocate bytes with same size
- * as effect->inputSize() to uniformBytes. The uniformBytes is intended to create makeShader().
- * Note that if uniformBytes->size() != effect->inputSize() the shader won't be created.
+ * The fuzzer treats the input bytes as an SkSL program. The requested number of uniforms and
+ * children are automatically synthesized to match the program's needs.
  *
  * We fuzz twice, with two different settings for inlining in the SkSL compiler. By default, the
  * compiler inlines most small to medium functions. This can hide bugs related to function-calling.
- * So we run the fuzzer once with inlining disabled, and again with it enabled (aggressively).
+ * So we run the fuzzer once with inlining disabled, and again with it enabled.
  * This gives us better coverage, and eases the burden on the fuzzer to inject useless noise into
  * functions to suppress inlining.
  */
-static bool FuzzSkRuntimeEffect_Once(sk_sp<SkData> bytes, const SkRuntimeEffect::Options& options) {
-    if (bytes->size() < kReservedBytes) {
-        return false;
-    }
-    sk_sp<SkData> codeBytes = SkData::MakeSubset(bytes.get(), 0, bytes->size() - kReservedBytes);
-
+static bool FuzzSkRuntimeEffect_Once(sk_sp<SkData> codeBytes,
+                                     const SkRuntimeEffect::Options& options) {
     SkString shaderText{static_cast<const char*>(codeBytes->data()), codeBytes->size()};
     SkRuntimeEffect::Result result = SkRuntimeEffect::MakeForShader(shaderText, options);
     SkRuntimeEffect* effect = result.effect.get();
-
-    if (!effect || effect->uniformSize() > kReservedBytes) { // if there is not enough uniform bytes
+    if (!effect) {
         return false;
     }
-    sk_sp<SkData> uniformBytes =
-            SkData::MakeSubset(bytes.get(), bytes->size() - kReservedBytes, effect->uniformSize());
-    auto shader = effect->makeShader(uniformBytes, /*children=*/nullptr, /*childCount=*/0,
-                                     /*localMatrix=*/nullptr, /*isOpaque=*/false);
+
+    // Create storage for our uniforms.
+    sk_sp<SkData> uniformBytes = SkData::MakeZeroInitialized(effect->uniformSize());
+    void* uniformData = uniformBytes->writable_data();
+
+    for (const SkRuntimeEffect::Uniform& u : effect->uniforms()) {
+        // We treat scalars, vectors, matrices and arrays the same. We just figure out how many
+        // uniform slots need to be filled, and write consecutive numbers into those slots.
+        static_assert(sizeof(int) == 4 && sizeof(float) == 4);
+        size_t numFields = u.sizeInBytes() / 4;
+
+        if (u.type == SkRuntimeEffect::Uniform::Type::kInt ||
+            u.type == SkRuntimeEffect::Uniform::Type::kInt2 ||
+            u.type == SkRuntimeEffect::Uniform::Type::kInt3 ||
+            u.type == SkRuntimeEffect::Uniform::Type::kInt4) {
+            int intVal = 0;
+            while (numFields--) {
+                // Assign increasing integer values to each slot (0, 1, 2, ...).
+                *static_cast<int*>(uniformData) = intVal++;
+                uniformData = static_cast<int*>(uniformData) + 1;
+            }
+        } else {
+            float floatVal = 0.0f;
+            while (numFields--) {
+                // Assign increasing float values to each slot (0.0, 1.0, 2.0, ...).
+                *static_cast<float*>(uniformData) = floatVal++;
+                uniformData = static_cast<float*>(uniformData) + 1;
+            }
+        }
+    }
+
+    // Create valid children for any requested child effects.
+    std::vector<SkRuntimeEffect::ChildPtr> children;
+    children.reserve(effect->children().size());
+    for (const SkRuntimeEffect::Child& c : effect->children()) {
+        switch (c.type) {
+            case SkRuntimeEffect::ChildType::kShader:
+                children.push_back(SkShaders::Color(SK_ColorRED));
+                break;
+            case SkRuntimeEffect::ChildType::kColorFilter:
+                children.push_back(SkColorFilters::Blend(SK_ColorBLUE, SkBlendMode::kModulate));
+                break;
+            case SkRuntimeEffect::ChildType::kBlender:
+                children.push_back(SkBlenders::Arithmetic(0.50f, 0.25f, 0.10f, 0.05f, false));
+                break;
+        }
+    }
+
+    sk_sp<SkShader> shader = effect->makeShader(uniformBytes, SkMakeSpan(children));
     if (!shader) {
         return false;
     }
diff --git a/third_party/skia/gm/3d.cpp b/third_party/skia/gm/3d.cpp
index 4fa1716448abe..cb2214f7aefe8 100644
--- a/third_party/skia/gm/3d.cpp
+++ b/third_party/skia/gm/3d.cpp
@@ -70,9 +70,9 @@ DEF_SIMPLE_GM(sk3d_simple, real_canvas, 300, 300) {
     do_draw(canvas, 0x880000FF);
 
     auto pic = recorder.finishRecordingAsPicture();
-    if (true) {
-        real_canvas->drawPicture(pic);
-    } else {
+    real_canvas->drawPicture(pic);
+
+    if ((false)) {
         auto data = pic->serialize();
         auto pic2 = SkPicture::MakeFromData(data.get());
         real_canvas->drawPicture(pic2);
diff --git a/third_party/skia/gm/BUILD.bazel b/third_party/skia/gm/BUILD.bazel
index 60d92892bc776..98519b22abb94 100644
--- a/third_party/skia/gm/BUILD.bazel
+++ b/third_party/skia/gm/BUILD.bazel
@@ -1,21 +1,9618 @@
-package(default_visibility = ["//:__subpackages__"])
+load("//bazel:macros.bzl", "generated_cc_atom")
 
-filegroup(
-    name = "hdrs",
-    srcs = [
-        "gm.h",
-        "verifiers/gmverifier.h",
+cc_library(
+    name = "gm",
+    testonly = True,
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_src",
+        # These are the deps of the GMs
+        "//modules/particles",
+        "//third_party:etc1",
+        "//tools/fonts:RandomScalerContext_src",
+        "//tools/gpu:gpu_tool_utils",
+        "//tools/timer:TimeUtils_hdr",
+        "//tools:SkMetaData_src",
+        "//tools:ToolUtils_src",
+        "//tools:random_parse_path_src",
+        "//src/utils:json_srcs",
     ],
 )
 
+# In order for the registry to work, all the gms must be compiled as one large blob.
 filegroup(
-    name = "srcs",
+    name = "gm_list",
+    testonly = True,
     srcs = [
+        "3d.cpp",
+        "BUILD.bazel",
+        "aaa.cpp",
+        "aaclip.cpp",
+        "aarecteffect.cpp",
+        "aarectmodes.cpp",
+        "aaxfermodes.cpp",
+        "addarc.cpp",
+        "all_bitmap_configs.cpp",
+        "alpha_image.cpp",
+        "alphagradients.cpp",
+        "analytic_gradients.cpp",
+        "androidblendmodes.cpp",
+        "animated_gif.cpp",
+        "animated_image_orientation.cpp",
+        "animatedimageblurs.cpp",
+        "anisotropic.cpp",
+        "annotated_text.cpp",
+        "arcofzorro.cpp",
+        "arcto.cpp",
+        "arithmode.cpp",
+        "asyncrescaleandread.cpp",
+        "attributes.cpp",
+        "b_119394958.cpp",
+        "backdrop.cpp",
+        "backdrop_imagefilter_croprect.cpp",
+        "badpaint.cpp",
+        "batchedconvexpaths.cpp",
+        "bc1_transparency.cpp",
+        "beziereffects.cpp",
+        "beziers.cpp",
+        "bicubic.cpp",
+        "bigblurs.cpp",
+        "bigmatrix.cpp",
+        "bigrect.cpp",
+        "bigrrectaaeffect.cpp",
+        "bigtext.cpp",
+        "bigtileimagefilter.cpp",
+        "bitmapcopy.cpp",
+        "bitmapfilters.cpp",
+        "bitmapimage.cpp",
+        "bitmappremul.cpp",
+        "bitmaprect.cpp",
+        "bitmaprecttest.cpp",
+        "bitmapshader.cpp",
+        "bitmaptiled.cpp",
+        "bleed.cpp",
+        "blend.cpp",
+        "blurcircles.cpp",
+        "blurcircles2.cpp",
+        "blurignorexform.cpp",
+        "blurimagevmask.cpp",
+        "blurpositioning.cpp",
+        "blurquickreject.cpp",
+        "blurrect.cpp",
+        "blurredclippedcircle.cpp",
+        "blurroundrect.cpp",
+        "blurs.cpp",
+        "blurtextsmallradii.cpp",
+        "bmpfilterqualityrepeat.cpp",
+        "bug12866.cpp",
+        "bug5252.cpp",
+        "bug530095.cpp",
+        "bug615686.cpp",
+        "bug6643.cpp",
+        "bug6783.cpp",
+        "bug9331.cpp",
+        "circle_sizes.cpp",
+        "circulararcs.cpp",
+        "circularclips.cpp",
+        "clear_swizzle.cpp",
+        "clip_error.cpp",
+        "clip_sierpinski_region.cpp",
+        "clip_strokerect.cpp",
+        "clipdrawdraw.cpp",
+        "clippedbitmapshaders.cpp",
+        "clockwise.cpp",
+        "collapsepaths.cpp",
+        "color4f.cpp",
+        "coloremoji.cpp",
+        "coloremoji_blendmodes.cpp",
+        "colorfilteralpha8.cpp",
+        "colorfilterimagefilter.cpp",
+        "colorfilters.cpp",
+        "colormatrix.cpp",
+        "colorspace.cpp",
+        "colorwheel.cpp",
+        "colrv1.cpp",
+        "complexclip.cpp",
+        "complexclip2.cpp",
+        "complexclip3.cpp",
+        "complexclip4.cpp",
+        "complexclip_blur_tiled.cpp",
+        "composecolorfilter.cpp",
+        "composeshader.cpp",
+        "compositor_quads.cpp",
+        "compressed_textures.cpp",
+        "concavepaths.cpp",
+        "conicpaths.cpp",
+        "constcolorprocessor.cpp",
+        "convex_all_line_paths.cpp",
+        "convexpaths.cpp",
+        "convexpolyclip.cpp",
+        "convexpolyeffect.cpp",
+        "copy_to_4444.cpp",
+        "crbug_1041204.cpp",
+        "crbug_1073670.cpp",
+        "crbug_1086705.cpp",
+        "crbug_1113794.cpp",
+        "crbug_1139750.cpp",
+        "crbug_1156804.cpp",
+        "crbug_1162942.cpp",
+        "crbug_1167277.cpp",
+        "crbug_1174186.cpp",
+        "crbug_1174354.cpp",
+        "crbug_1177833.cpp",
+        "crbug_1257515.cpp",
+        "crbug_224618.cpp",
+        "crbug_691386.cpp",
+        "crbug_788500.cpp",
+        "crbug_847759.cpp",
+        "crbug_884166.cpp",
+        "crbug_887103.cpp",
+        "crbug_892988.cpp",
+        "crbug_899512.cpp",
+        "crbug_905548.cpp",
+        "crbug_908646.cpp",
+        "crbug_913349.cpp",
+        "crbug_918512.cpp",
+        "crbug_938592.cpp",
+        "crbug_946965.cpp",
+        "crbug_947055.cpp",
+        "crbug_996140.cpp",
+        "crop_imagefilter.cpp",
+        "croppedrects.cpp",
+        "crosscontextimage.cpp",
+        "cubicpaths.cpp",
+        "custommesh.cpp",
+        "daa.cpp",
+        "dashcircle.cpp",
+        "dashcubics.cpp",
+        "dashing.cpp",
+        "degeneratesegments.cpp",
+        "destcolor.cpp",
+        "dftext.cpp",
+        "dftext_blob_persp.cpp",
+        "discard.cpp",
+        "displacement.cpp",
+        "distantclip.cpp",
+        "draw_bitmap_rect_skbug4374.cpp",
+        "drawable.cpp",
+        "drawatlas.cpp",
+        "drawatlascolor.cpp",
+        "drawbitmaprect.cpp",
+        "drawglyphs.cpp",
+        "drawimageset.cpp",
+        "drawlines_with_local_matrix.cpp",
+        "drawminibitmaprect.cpp",
+        "drawquadset.cpp",
+        "drawregion.cpp",
+        "drawregionmodes.cpp",
+        "dropshadowimagefilter.cpp",
+        "drrect.cpp",
+        "drrect_small_inner.cpp",
+        "dsl_processor_test.cpp",
+        "dstreadshuffle.cpp",
+        "ducky_yuv_blend.cpp",
+        "emboss.cpp",
+        "emptypath.cpp",
+        "encode.cpp",
+        "encode_alpha_jpeg.cpp",
+        "encode_color_types.cpp",
+        "encode_platform.cpp",
+        "encode_srgb.cpp",
+        "exoticformats.cpp",
+        "fadefilter.cpp",
+        "fatpathfill.cpp",
+        "fillrect_gradient.cpp",
+        "filltypes.cpp",
+        "filltypespersp.cpp",
+        "filterbug.cpp",
+        "filterfastbounds.cpp",
+        "filterindiabox.cpp",
+        "flippity.cpp",
+        "fontcache.cpp",
+        "fontmgr.cpp",
+        "fontregen.cpp",
+        "fontscaler.cpp",
+        "fontscalerdistortable.cpp",
+        "fp_sample_chaining.cpp",
+        "fpcoordinateoverride.cpp",
+        "fwidth_squircle.cpp",
+        "gammatext.cpp",
+        "getpostextpath.cpp",
+        "giantbitmap.cpp",
+        "glyph_pos.cpp",
         "gm.cpp",
+        "gm.h",
+        "gpu_blur_utils.cpp",
+        "gradient_dirty_laundry.cpp",
+        "gradient_matrix.cpp",
+        "gradients.cpp",
+        "gradients_2pt_conical.cpp",
+        "gradients_degenerate.cpp",
+        "gradients_no_texture.cpp",
+        "gradtext.cpp",
+        "graphitestart.cpp",
+        "grayscalejpg.cpp",
+        "hairlines.cpp",
+        "hairmodes.cpp",
+        "hardstop_gradients.cpp",
+        "hardstop_gradients_many.cpp",
+        "highcontrastfilter.cpp",
+        "hittestpath.cpp",
+        "hsl.cpp",
+        "hugepath.cpp",
+        "image.cpp",
+        "image_pict.cpp",
+        "image_shader.cpp",
+        "imagealphathreshold.cpp",
+        "imageblur.cpp",
+        "imageblur2.cpp",
+        "imageblurclampmode.cpp",
+        "imageblurrepeatmode.cpp",
+        "imageblurtiled.cpp",
+        "imagefilters.cpp",
+        "imagefiltersbase.cpp",
+        "imagefiltersclipped.cpp",
+        "imagefilterscropexpand.cpp",
+        "imagefilterscropped.cpp",
+        "imagefiltersgraph.cpp",
+        "imagefiltersscaled.cpp",
+        "imagefiltersstroked.cpp",
+        "imagefilterstransformed.cpp",
+        "imagefromyuvtextures.cpp",
+        "imagemagnifier.cpp",
+        "imagemakewithfilter.cpp",
+        "imagemasksubset.cpp",
+        "imageresizetiled.cpp",
+        "imagescalealigned.cpp",
+        "imagesource.cpp",
+        "imagesource2.cpp",
+        "internal_links.cpp",
+        "inverseclip.cpp",
+        "inversepaths.cpp",
+        "jpg_color_cube.cpp",
+        "labyrinth.cpp",
+        "largeclippedpath.cpp",
+        "largeglyphblur.cpp",
+        "lattice.cpp",
+        "lazytiling.cpp",
+        "lcdblendmodes.cpp",
+        "lcdoverlap.cpp",
+        "lcdtext.cpp",
+        "lighting.cpp",
+        "linepaths.cpp",
+        "localmatriximagefilter.cpp",
+        "localmatriximageshader.cpp",
+        "localmatrixshader.cpp",
+        "lumafilter.cpp",
+        "mac_aa_explorer.cpp",
+        "make_raster_image.cpp",
+        "makecolorspace.cpp",
+        "mandoline.cpp",
+        "manypathatlases.cpp",
+        "manypaths.cpp",
+        "matrixconvolution.cpp",
+        "matriximagefilter.cpp",
+        "mipmap.cpp",
+        "mixedtextblobs.cpp",
+        "mixercolorfilter.cpp",
+        "modecolorfilters.cpp",
+        "morphology.cpp",
+        "nested.cpp",
+        "ninepatchstretch.cpp",
+        "nonclosedpaths.cpp",
+        "offsetimagefilter.cpp",
+        "orientation.cpp",
+        "ovals.cpp",
+        "overdrawcanvas.cpp",
+        "overdrawcolorfilter.cpp",
+        "overstroke.cpp",
+        "p3.cpp",
+        "particles.cpp",
+        "patch.cpp",
+        "path_stroke_with_zero_length.cpp",
+        "patharcto.cpp",
+        "pathcontourstart.cpp",
+        "patheffects.cpp",
+        "pathfill.cpp",
+        "pathinterior.cpp",
+        "pathmaskcache.cpp",
+        "pathmeasure.cpp",
+        "pathopsinverse.cpp",
+        "pathreverse.cpp",
+        "pdf_never_embed.cpp",
+        "perlinnoise.cpp",
+        "perspimages.cpp",
+        "perspshaders.cpp",
+        "picture.cpp",
+        "pictureimagefilter.cpp",
+        "pictureimagegenerator.cpp",
+        "pictureshader.cpp",
+        "pictureshadercache.cpp",
+        "pictureshadertile.cpp",
+        "pixelsnap.cpp",
+        "plus.cpp",
+        "points.cpp",
+        "poly2poly.cpp",
+        "polygonoffset.cpp",
+        "polygons.cpp",
+        "postercircle.cpp",
+        "preservefillrule.cpp",
+        "quadpaths.cpp",
+        "radial_gradient_precision.cpp",
+        "rasterhandleallocator.cpp",
+        "readpixels.cpp",
+        "recordopts.cpp",
+        "rectangletexture.cpp",
+        "repeated_bitmap.cpp",
+        "resizeimagefilter.cpp",
+        "roundrects.cpp",
+        "rrect.cpp",
+        "rrectclipdrawpaint.cpp",
+        "rrects.cpp",
+        "rsxtext.cpp",
+        "runtimecolorfilter.cpp",
+        "runtimefunctions.cpp",
+        "runtimeimagefilter.cpp",
+        "runtimeintrinsics.cpp",
+        "runtimeshader.cpp",
+        "samplerstress.cpp",
+        "savelayer.cpp",
+        "scaledemoji.cpp",
+        "scaledemoji_rendering.cpp",
+        "scaledstrokes.cpp",
+        "shadermaskfilter.cpp",
+        "shadertext3.cpp",
+        "shadowutils.cpp",
+        "shallowgradient.cpp",
+        "shapes.cpp",
+        "sharedcorners.cpp",
+        "showmiplevels.cpp",
+        "simple_magnification.cpp",
+        "simpleaaclip.cpp",
+        "simplerect.cpp",
+        "skbug1719.cpp",
+        "skbug_12212.cpp",
+        "skbug_257.cpp",
+        "skbug_4868.cpp",
+        "skbug_5321.cpp",
+        "skbug_8664.cpp",
+        "skbug_8955.cpp",
+        "skbug_9319.cpp",
+        "skbug_9819.cpp",
+        "slug.cpp",
+        "smallarc.cpp",
+        "smallpaths.cpp",
+        "spritebitmap.cpp",
+        "srcmode.cpp",
+        "srgb.cpp",
+        "stlouisarch.cpp",
+        "stringart.cpp",
+        "stroke_rect_shader.cpp",
+        "strokedlines.cpp",
+        "strokefill.cpp",
+        "strokerect.cpp",
+        "strokerect_anisotropic.cpp",
+        "strokerects.cpp",
+        "strokes.cpp",
+        "stroketext.cpp",
+        "subsetshader.cpp",
+        "surface.cpp",
+        "swizzle.cpp",
+        "tablecolorfilter.cpp",
+        "tallstretchedbitmaps.cpp",
+        "tessellation.cpp",
+        "testgradient.cpp",
+        "texelsubset.cpp",
+        "text_scale_skew.cpp",
+        "textblob.cpp",
+        "textblobblockreordering.cpp",
+        "textblobcolortrans.cpp",
+        "textblobgeometrychange.cpp",
+        "textblobmixedsizes.cpp",
+        "textblobrandomfont.cpp",
+        "textblobshader.cpp",
+        "textblobtransforms.cpp",
+        "textblobuseaftergpufree.cpp",
+        "texteffects.cpp",
+        "thinconcavepaths.cpp",
+        "thinrects.cpp",
+        "thinstrokedrects.cpp",
+        "tiledscaledbitmap.cpp",
+        "tileimagefilter.cpp",
+        "tilemodes.cpp",
+        "tilemodes_alpha.cpp",
+        "tilemodes_scaled.cpp",
+        "tinybitmap.cpp",
+        "transparency.cpp",
+        "trickycubicstrokes.cpp",
+        "typeface.cpp",
+        "unpremul.cpp",
+        "userfont.cpp",
+        "variedtext.cpp",
+        "verifiers",
+        "vertices.cpp",
+        "verylargebitmap.cpp",
+        "wacky_yuv_formats.cpp",
+        "widebuttcaps.cpp",
+        "windowrectangles.cpp",
+        "xfermodeimagefilter.cpp",
+        "xfermodes.cpp",
+        "xfermodes2.cpp",
+        "xfermodes3.cpp",
+        "ycbcrimage.cpp",
+        "yuv420_odd_dim.cpp",
+        "yuvtorgbsubset.cpp",
+        # Skipped GMs below TODO(kjlubick)
+        #"cgm.c",
+        #"cgms.cpp",
+        #"video_decoder.cpp",
+        #"xform.cpp",
     ],
+    visibility = ["//:__subpackages__"],
 )
 
-filegroup(
-    name = "gms",
-    srcs = ["dashing.cpp"],
+generated_cc_atom(
+    name = "3d_src",
+    srcs = ["3d.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "aaa_src",
+    srcs = ["aaa.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//include/private:SkPathRef_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "aaclip_src",
+    srcs = ["aaclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils/mac:SkCGUtils_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "aarecteffect_src",
+    srcs = ["aarecteffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:TestOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "aarectmodes_src",
+    srcs = ["aarectmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "aaxfermodes_src",
+    srcs = ["aaxfermodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "addarc_src",
+    srcs = ["addarc.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathMeasure_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkFloatingPoint_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "all_bitmap_configs_src",
+    srcs = ["all_bitmap_configs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "alpha_image_src",
+    srcs = ["alpha_image.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "alphagradients_src",
+    srcs = ["alphagradients.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "analytic_gradients_src",
+    srcs = ["analytic_gradients.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "androidblendmodes_src",
+    srcs = ["androidblendmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "animated_gif_src",
+    srcs = ["animated_gif.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkAnimCodecPlayer_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "animated_image_orientation_src",
+    srcs = ["animated_image_orientation.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/android:SkAnimatedImage_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathTypes_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRRect_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "animatedimageblurs_src",
+    srcs = ["animatedimageblurs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "anisotropic_src",
+    srcs = ["anisotropic.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "annotated_text_src",
+    srcs = ["annotated_text.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkAnnotation_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "arcofzorro_src",
+    srcs = ["arcofzorro.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "arcto_src",
+    srcs = ["arcto.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPathMeasure_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//tools:random_parse_path_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "arithmode_src",
+    srcs = ["arithmode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkBlenders_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "asyncrescaleandread_src",
+    srcs = ["asyncrescaleandread.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkYUVAInfo_hdr",
+        "//include/core:SkYUVAPixmaps_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkScopeExit_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "attributes_src",
+    srcs = ["attributes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrBuffer_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrGpuBuffer_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrProcessorSet_hdr",
+        "//src/gpu:GrProcessor_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrShaderVar_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "b_119394958_src",
+    srcs = ["b_119394958.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "backdrop_imagefilter_croprect_src",
+    srcs = ["backdrop_imagefilter_croprect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "backdrop_src",
+    srcs = ["backdrop.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "badpaint_src",
+    srcs = ["badpaint.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "batchedconvexpaths_src",
+    srcs = ["batchedconvexpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bc1_transparency_src",
+    srcs = ["bc1_transparency.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCompressedDataUtils_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrImageContextPriv_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "beziereffects_src",
+    srcs = ["beziereffects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/core:SkPointPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:GrProcessorAnalysis_hdr",
+        "//src/gpu:GrProcessorSet_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrUserStencilSettings_hdr",
+        "//src/gpu/effects:GrBezierEffect_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/geometry:GrPathUtils_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/ops:GrMeshDrawOp_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "beziers_src",
+    srcs = ["beziers.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bicubic_src",
+    srcs = ["bicubic.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigblurs_src",
+    srcs = ["bigblurs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkBlurMask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigmatrix_src",
+    srcs = ["bigmatrix.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigrect_src",
+    srcs = ["bigrect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigrrectaaeffect_src",
+    srcs = ["bigrrectaaeffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/effects:GrRRectEffect_hdr",
+        "//src/gpu/ops:FillRectOp_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigtext_src",
+    srcs = ["bigtext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bigtileimagefilter_src",
+    srcs = ["bigtileimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmapcopy_src",
+    srcs = ["bitmapcopy.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmapfilters_src",
+    srcs = ["bitmapfilters.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmapimage_src",
+    srcs = ["bitmapimage.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmappremul_src",
+    srcs = ["bitmappremul.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmaprect_src",
+    srcs = ["bitmaprect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmaprecttest_src",
+    srcs = ["bitmaprecttest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmapshader_src",
+    srcs = ["bitmapshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bitmaptiled_src",
+    srcs = ["bitmaptiled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bleed_src",
+    srcs = ["bleed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blend_src",
+    srcs = ["blend.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurcircles2_src",
+    srcs = ["blurcircles2.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurcircles_src",
+    srcs = ["blurcircles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkBlurMask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurignorexform_src",
+    srcs = ["blurignorexform.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurimagevmask_src",
+    srcs = ["blurimagevmask.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurpositioning_src",
+    srcs = ["blurpositioning.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurquickreject_src",
+    srcs = ["blurquickreject.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkBlurMask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurrect_src",
+    srcs = ["blurrect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//src/core:SkMask_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurredclippedcircle_src",
+    srcs = ["blurredclippedcircle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurroundrect_src",
+    srcs = ["blurroundrect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//src/core:SkBlurMask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurs_src",
+    srcs = ["blurs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "blurtextsmallradii_src",
+    srcs = ["blurtextsmallradii.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bmpfilterqualityrepeat_src",
+    srcs = ["bmpfilterqualityrepeat.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug12866_src",
+    srcs = ["bug12866.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug5252_src",
+    srcs = ["bug5252.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug530095_src",
+    srcs = ["bug530095.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug615686_src",
+    srcs = ["bug615686.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug6643_src",
+    srcs = ["bug6643.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug6783_src",
+    srcs = ["bug6783.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "bug9331_src",
+    srcs = ["bug9331.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "cgm_src",
+    srcs = ["cgm.c"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/c:sk_canvas_hdr",
+        "//include/c:sk_data_hdr",
+        "//include/c:sk_image_hdr",
+        "//include/c:sk_imageinfo_hdr",
+        "//include/c:sk_paint_hdr",
+        "//include/c:sk_shader_hdr",
+        "//include/c:sk_surface_hdr",
+        "//include/c:sk_types_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "cgms_src",
+    srcs = ["cgms.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/c:sk_types_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "circle_sizes_src",
+    srcs = ["circle_sizes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "circulararcs_src",
+    srcs = ["circulararcs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkStrokeAndFillPathEffect_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "circularclips_src",
+    srcs = ["circularclips.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clear_swizzle_src",
+    srcs = ["clear_swizzle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrSwizzle_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clip_error_src",
+    srcs = ["clip_error.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clip_sierpinski_region_src",
+    srcs = ["clip_sierpinski_region.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRegion_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clip_strokerect_src",
+    srcs = ["clip_strokerect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clipdrawdraw_src",
+    srcs = ["clipdrawdraw.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clippedbitmapshaders_src",
+    srcs = ["clippedbitmapshaders.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "clockwise_src",
+    srcs = ["clockwise.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrBuffer_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrColorSpaceXform_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrGpuBuffer_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrPipeline_hdr",
+        "//src/gpu:GrProcessorSet_hdr",
+        "//src/gpu:GrProcessor_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSamplerState_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:GrShaderVar_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "collapsepaths_src",
+    srcs = ["collapsepaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "color4f_src",
+    srcs = ["color4f.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "coloremoji_blendmodes_src",
+    srcs = ["coloremoji_blendmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//src/utils:SkUTF_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "coloremoji_src",
+    srcs = ["coloremoji.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrixFilter_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colorfilteralpha8_src",
+    srcs = ["colorfilteralpha8.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colorfilterimagefilter_src",
+    srcs = ["colorfilterimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colorfilters_src",
+    srcs = ["colorfilters.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrixFilter_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colormatrix_src",
+    srcs = ["colormatrix.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colorspace_src",
+    srcs = ["colorspace.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colorwheel_src",
+    srcs = ["colorwheel.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "colrv1_src",
+    srcs = ["colrv1.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "complexclip2_src",
+    srcs = ["complexclip2.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "complexclip3_src",
+    srcs = ["complexclip3.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "complexclip4_src",
+    srcs = ["complexclip4.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "complexclip_blur_tiled_src",
+    srcs = ["complexclip_blur_tiled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "complexclip_src",
+    srcs = ["complexclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "composecolorfilter_src",
+    srcs = ["composecolorfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkLumaColorFilter_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "composeshader_src",
+    srcs = ["composeshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/core:SkTLazy_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "compositor_quads_src",
+    srcs = ["compositor_quads.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//include/private:SkTArray_hdr",
+        "//src/core:SkLineClipper_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "compressed_textures_src",
+    srcs = ["compressed_textures.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCompressedDataUtils_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//src/gpu:GrDataUtils_hdr",
+        "//src/gpu:GrImageContextPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//third_party:etc1",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "concavepaths_src",
+    srcs = ["concavepaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "conicpaths_src",
+    srcs = ["conicpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "constcolorprocessor_src",
+    srcs = ["constcolorprocessor.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrConfig_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/gpu:GrColor_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:TestOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "convex_all_line_paths_src",
+    srcs = ["convex_all_line_paths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "convexpaths_src",
+    srcs = ["convexpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkNoncopyable_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "convexpolyclip_src",
+    srcs = ["convexpolyclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "convexpolyeffect_src",
+    srcs = ["convexpolyeffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu/effects:GrConvexPolyEffect_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:TestOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "copy_to_4444_src",
+    srcs = ["copy_to_4444.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1041204_src",
+    srcs = ["crbug_1041204.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1073670_src",
+    srcs = ["crbug_1073670.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1086705_src",
+    srcs = ["crbug_1086705.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1113794_src",
+    srcs = ["crbug_1113794.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1139750_src",
+    srcs = ["crbug_1139750.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1156804_src",
+    srcs = ["crbug_1156804.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1162942_src",
+    srcs = ["crbug_1162942.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1167277_src",
+    srcs = ["crbug_1167277.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1174186_src",
+    srcs = ["crbug_1174186.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1174354_src",
+    srcs = ["crbug_1174354.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1177833_src",
+    srcs = ["crbug_1177833.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_1257515_src",
+    srcs = ["crbug_1257515.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_224618_src",
+    srcs = ["crbug_224618.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_691386_src",
+    srcs = ["crbug_691386.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkParsePath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_788500_src",
+    srcs = ["crbug_788500.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_847759_src",
+    srcs = ["crbug_847759.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_884166_src",
+    srcs = ["crbug_884166.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_887103_src",
+    srcs = ["crbug_887103.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_892988_src",
+    srcs = ["crbug_892988.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_899512_src",
+    srcs = ["crbug_899512.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_905548_src",
+    srcs = ["crbug_905548.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_908646_src",
+    srcs = ["crbug_908646.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_913349_src",
+    srcs = ["crbug_913349.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_918512_src",
+    srcs = ["crbug_918512.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/effects:SkLumaColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_938592_src",
+    srcs = ["crbug_938592.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_946965_src",
+    srcs = ["crbug_946965.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_947055_src",
+    srcs = ["crbug_947055.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crbug_996140_src",
+    srcs = ["crbug_996140.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crop_imagefilter_src",
+    srcs = ["crop_imagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/effects/imagefilters:SkCropImageFilter_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "croppedrects_src",
+    srcs = ["croppedrects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "crosscontextimage_src",
+    srcs = ["crosscontextimage.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "cubicpaths_src",
+    srcs = ["cubicpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "custommesh_src",
+    srcs = ["custommesh.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlender_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkCustomMesh_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "daa_src",
+    srcs = ["daa.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dashcircle_src",
+    srcs = ["dashcircle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dashcubics_src",
+    srcs = ["dashcubics.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkTrimPathEffect_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dashing_src",
+    srcs = ["dashing.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "degeneratesegments_src",
+    srcs = ["degeneratesegments.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "destcolor_src",
+    srcs = ["destcolor.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dftext_blob_persp_src",
+    srcs = ["dftext_blob_persp.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dftext_src",
+    srcs = ["dftext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/private:SkTo_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "discard_src",
+    srcs = ["discard.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "displacement_src",
+    srcs = ["displacement.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "distantclip_src",
+    srcs = ["distantclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "draw_bitmap_rect_skbug4374_src",
+    srcs = ["draw_bitmap_rect_skbug4374.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawable_src",
+    srcs = ["drawable.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkDrawable_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawatlas_src",
+    srcs = ["drawatlas.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathMeasure_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawatlascolor_src",
+    srcs = ["drawatlascolor.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawbitmaprect_src",
+    srcs = ["drawbitmaprect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawglyphs_src",
+    srcs = ["drawglyphs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/core:SkZip_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawimageset_src",
+    srcs = ["drawimageset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawlines_with_local_matrix_src",
+    srcs = ["drawlines_with_local_matrix.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawminibitmaprect_src",
+    srcs = ["drawminibitmaprect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawquadset_src",
+    srcs = ["drawquadset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawregion_src",
+    srcs = ["drawregion.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drawregionmodes_src",
+    srcs = ["drawregionmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dropshadowimagefilter_src",
+    srcs = ["dropshadowimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drrect_small_inner_src",
+    srcs = ["drrect_small_inner.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "drrect_src",
+    srcs = ["drrect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dsl_processor_test_src",
+    srcs = ["dsl_processor_test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/sksl/dsl/priv:DSLFPs_hdr",
+        "//src/sksl/dsl/priv:DSLWriter_hdr",
+        "//src/sksl/ir:SkSLVariable_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "dstreadshuffle_src",
+    srcs = ["dstreadshuffle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ducky_yuv_blend_src",
+    srcs = ["ducky_yuv_blend.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCachedData_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "emboss_src",
+    srcs = ["emboss.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//src/effects:SkEmbossMaskFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "emptypath_src",
+    srcs = ["emptypath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "encode_alpha_jpeg_src",
+    srcs = ["encode_alpha_jpeg.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "encode_color_types_src",
+    srcs = ["encode_color_types.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "encode_platform_src",
+    srcs = ["encode_platform.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/encode:SkWebpEncoder_hdr",
+        "//src/images:SkImageEncoderPriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "encode_src",
+    srcs = ["encode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "encode_srgb_src",
+    srcs = ["encode_srgb.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/encode:SkWebpEncoder_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "exoticformats_src",
+    srcs = ["exoticformats.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCompressedDataUtils_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//src/gpu:GrImageContextPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//tools:Resources_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fadefilter_src",
+    srcs = ["fadefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fatpathfill_src",
+    srcs = ["fatpathfill.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fiddle_src",
+    srcs = ["fiddle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":gm_hdr"],
+)
+
+generated_cc_atom(
+    name = "fillrect_gradient_src",
+    srcs = ["fillrect_gradient.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "filltypes_src",
+    srcs = ["filltypes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "filltypespersp_src",
+    srcs = ["filltypespersp.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "filterbug_src",
+    srcs = ["filterbug.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "filterfastbounds_src",
+    srcs = ["filterfastbounds.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "filterindiabox_src",
+    srcs = ["filterindiabox.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "flippity_src",
+    srcs = ["flippity.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:SkTArray_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrPixmap_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_Gpu_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fontcache_src",
+    srcs = ["fontcache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fontmgr_src",
+    srcs = ["fontmgr.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//tools:SkMetaData_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fontregen_src",
+    srcs = ["fontregen.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fontscaler_src",
+    srcs = ["fontscaler.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fontscalerdistortable_src",
+    srcs = ["fontscalerdistortable.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontArguments_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fp_sample_chaining_src",
+    srcs = ["fp_sample_chaining.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrMatrixEffect_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fpcoordinateoverride_src",
+    srcs = ["fpcoordinateoverride.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrRRectEffect_hdr",
+        "//src/gpu/effects:GrSkSLFP_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "fwidth_squircle_src",
+    srcs = ["fwidth_squircle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrBuffer_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrGpuBuffer_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrPipeline_hdr",
+        "//src/gpu:GrProcessorSet_hdr",
+        "//src/gpu:GrProcessor_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:GrShaderVar_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
+        "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gammatext_src",
+    srcs = ["gammatext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "getpostextpath_src",
+    srcs = ["getpostextpath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "giantbitmap_src",
+    srcs = ["giantbitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "glyph_pos_src",
+    srcs = ["glyph_pos.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gm_hdr",
+    hdrs = ["gm.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//gm/verifiers:gmverifier_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkMacros_hdr",
+        "//tools:Registry_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gm_src",
+    srcs = ["gm.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//gm/verifiers:gmverifier_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkTraceEvent_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gpu_blur_utils_src",
+    srcs = ["gpu_blur_utils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkGpuBlurUtils_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrBlendFragmentProcessor_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//src/image:SkImage_Base_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradient_dirty_laundry_src",
+    srcs = ["gradient_dirty_laundry.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradient_matrix_src",
+    srcs = ["gradient_matrix.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradients_2pt_conical_src",
+    srcs = ["gradients_2pt_conical.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradients_degenerate_src",
+    srcs = ["gradients_degenerate.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradients_no_texture_src",
+    srcs = ["gradients_no_texture.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradients_src",
+    srcs = ["gradients.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gradtext_src",
+    srcs = ["gradtext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "graphitestart_src",
+    srcs = ["graphitestart.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "grayscalejpg_src",
+    srcs = ["grayscalejpg.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hairlines_src",
+    srcs = ["hairlines.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hairmodes_src",
+    srcs = ["hairmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hardstop_gradients_many_src",
+    srcs = ["hardstop_gradients_many.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hardstop_gradients_src",
+    srcs = ["hardstop_gradients.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "highcontrastfilter_src",
+    srcs = ["highcontrastfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkHighContrastFilter_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hittestpath_src",
+    srcs = ["hittestpath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hsl_src",
+    srcs = ["hsl.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "hugepath_src",
+    srcs = ["hugepath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "image_pict_src",
+    srcs = ["image_pict.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrSamplerState_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_Gpu_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "image_shader_src",
+    srcs = ["image_shader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "image_src",
+    srcs = ["image.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagealphathreshold_src",
+    srcs = ["imagealphathreshold.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageblur2_src",
+    srcs = ["imageblur2.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageblur_src",
+    srcs = ["imageblur.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageblurclampmode_src",
+    srcs = ["imageblurclampmode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageblurrepeatmode_src",
+    srcs = ["imageblurrepeatmode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageblurtiled_src",
+    srcs = ["imageblurtiled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefilters_src",
+    srcs = ["imagefilters.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkHighContrastFilter_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefiltersbase_src",
+    srcs = ["imagefiltersbase.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFlattenable_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//src/core:SkImageFilter_Base_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/utils:SkPatchUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefiltersclipped_src",
+    srcs = ["imagefiltersclipped.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefilterscropexpand_src",
+    srcs = ["imagefilterscropexpand.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefilterscropped_src",
+    srcs = ["imagefilterscropped.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefiltersgraph_src",
+    srcs = ["imagefiltersgraph.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefiltersscaled_src",
+    srcs = ["imagefiltersscaled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefiltersstroked_src",
+    srcs = ["imagefiltersstroked.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefilterstransformed_src",
+    srcs = ["imagefilterstransformed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagefromyuvtextures_src",
+    srcs = ["imagefromyuvtextures.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/core:SkYUVMath_hdr",
+        "//tools:Resources_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagemagnifier_src",
+    srcs = ["imagemagnifier.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixelRef_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagemakewithfilter_src",
+    srcs = ["imagemakewithfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagemasksubset_src",
+    srcs = ["imagemasksubset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imageresizetiled_src",
+    srcs = ["imageresizetiled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagescalealigned_src",
+    srcs = ["imagescalealigned.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagesource2_src",
+    srcs = ["imagesource2.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "imagesource_src",
+    srcs = ["imagesource.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "internal_links_src",
+    srcs = ["internal_links.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkAnnotation_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "inverseclip_src",
+    srcs = ["inverseclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "inversepaths_src",
+    srcs = ["inversepaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "jpg_color_cube_src",
+    srcs = ["jpg_color_cube.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTPin_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "labyrinth_src",
+    srcs = ["labyrinth.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "largeclippedpath_src",
+    srcs = ["largeclippedpath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "largeglyphblur_src",
+    srcs = ["largeglyphblur.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lattice_src",
+    srcs = ["lattice.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lazytiling_src",
+    srcs = ["lazytiling.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkConvertPixels_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lcdblendmodes_src",
+    srcs = ["lcdblendmodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lcdoverlap_src",
+    srcs = ["lcdoverlap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lcdtext_src",
+    srcs = ["lcdtext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lighting_src",
+    srcs = ["lighting.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "linepaths_src",
+    srcs = ["linepaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "localmatriximagefilter_src",
+    srcs = ["localmatriximagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "localmatriximageshader_src",
+    srcs = ["localmatriximageshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "localmatrixshader_src",
+    srcs = ["localmatrixshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "lumafilter_src",
+    srcs = ["lumafilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkLumaColorFilter_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/core:SkColorFilterPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "mac_aa_explorer_src",
+    srcs = ["mac_aa_explorer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "make_raster_image_src",
+    srcs = ["make_raster_image.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "makecolorspace_src",
+    srcs = ["makecolorspace.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkImagePriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "mandoline_src",
+    srcs = ["mandoline.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "manypathatlases_src",
+    srcs = ["manypathatlases.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "manypaths_src",
+    srcs = ["manypaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "matrixconvolution_src",
+    srcs = ["matrixconvolution.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/gpu/effects:GrMatrixConvolutionEffect_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "matriximagefilter_src",
+    srcs = ["matriximagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "mipmap_src",
+    srcs = ["mipmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "mixedtextblobs_src",
+    srcs = ["mixedtextblobs.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "mixercolorfilter_src",
+    srcs = ["mixercolorfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkLumaColorFilter_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "modecolorfilters_src",
+    srcs = ["modecolorfilters.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "morphology_src",
+    srcs = ["morphology.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "nested_src",
+    srcs = ["nested.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ninepatchstretch_src",
+    srcs = ["ninepatchstretch.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "nonclosedpaths_src",
+    srcs = ["nonclosedpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "offsetimagefilter_src",
+    srcs = ["offsetimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkImageFilter_Base_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "orientation_src",
+    srcs = ["orientation.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkEncodedOrigin_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ovals_src",
+    srcs = ["ovals.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "overdrawcanvas_src",
+    srcs = ["overdrawcanvas.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkOverdrawCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkOverdrawColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "overdrawcolorfilter_src",
+    srcs = ["overdrawcolorfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkOverdrawColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "overstroke_src",
+    srcs = ["overstroke.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathMeasure_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//src/core:SkPointPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "p3_src",
+    srcs = ["p3.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTPin_hdr",
+        "//src/core:SkColorSpaceXformSteps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "particles_src",
+    srcs = ["particles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//modules/particles/include:SkParticleEffect_hdr",
+        "//modules/particles/include:SkParticleSerialization_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "patch_src",
+    srcs = ["patch.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//src/utils:SkPatchUtils_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "path_stroke_with_zero_length_src",
+    srcs = ["path_stroke_with_zero_length.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "patharcto_src",
+    srcs = ["patharcto.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/utils:SkParsePath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathcontourstart_src",
+    srcs = ["pathcontourstart.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "patheffects_src",
+    srcs = ["patheffects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:Sk1DPathEffect_hdr",
+        "//include/effects:Sk2DPathEffect_hdr",
+        "//include/effects:SkCornerPathEffect_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkDiscretePathEffect_hdr",
+        "//include/effects:SkOpPathEffect_hdr",
+        "//include/effects:SkStrokeAndFillPathEffect_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//src/core:SkPathEffectBase_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathfill_src",
+    srcs = ["pathfill.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathinterior_src",
+    srcs = ["pathinterior.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathmaskcache_src",
+    srcs = ["pathmaskcache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathmeasure_src",
+    srcs = ["pathmeasure.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathopsinverse_src",
+    srcs = ["pathopsinverse.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pathreverse_src",
+    srcs = ["pathreverse.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pdf_never_embed_src",
+    srcs = ["pdf_never_embed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "perlinnoise_src",
+    srcs = ["perlinnoise.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "perspimages_src",
+    srcs = ["perspimages.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "perspshaders_src",
+    srcs = ["perspshaders.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "picture_src",
+    srcs = ["picture.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pictureimagefilter_src",
+    srcs = ["pictureimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pictureimagegenerator_src",
+    srcs = ["pictureimagegenerator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pictureshader_src",
+    srcs = ["pictureshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pictureshadercache_src",
+    srcs = ["pictureshadercache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pictureshadertile_src",
+    srcs = ["pictureshadertile.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "pixelsnap_src",
+    srcs = ["pixelsnap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "plus_src",
+    srcs = ["plus.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "points_src",
+    srcs = ["points.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "poly2poly_src",
+    srcs = ["poly2poly.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "polygonoffset_src",
+    srcs = ["polygonoffset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/utils:SkPolyUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "polygons_src",
+    srcs = ["polygons.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "postercircle_src",
+    srcs = ["postercircle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "preservefillrule_src",
+    srcs = ["preservefillrule.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "quadpaths_src",
+    srcs = ["quadpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "radial_gradient_precision_src",
+    srcs = ["radial_gradient_precision.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rasterhandleallocator_src",
+    srcs = ["rasterhandleallocator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRasterHandleAllocator_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/utils/mac:SkCGUtils_hdr",
+        "//src/core:SkLeanWindows_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "readpixels_src",
+    srcs = ["readpixels.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "recordopts_src",
+    srcs = ["recordopts.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rectangletexture_src",
+    srcs = ["rectangletexture.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu/gl:GrGLCaps_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "repeated_bitmap_src",
+    srcs = ["repeated_bitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "resizeimagefilter_src",
+    srcs = ["resizeimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "roundrects_src",
+    srcs = ["roundrects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rrect_src",
+    srcs = ["rrect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rrectclipdrawpaint_src",
+    srcs = ["rrectclipdrawpaint.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rrects_src",
+    srcs = ["rrects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/effects:GrRRectEffect_hdr",
+        "//src/gpu/ops:FillRectOp_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "rsxtext_src",
+    srcs = ["rsxtext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "runtimecolorfilter_src",
+    srcs = ["runtimecolorfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "runtimefunctions_src",
+    srcs = ["runtimefunctions.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "runtimeimagefilter_src",
+    srcs = ["runtimeimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixelRef_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/effects/imagefilters:SkRuntimeImageFilter_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "runtimeintrinsics_src",
+    srcs = ["runtimeintrinsics.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "runtimeshader_src",
+    srcs = ["runtimeshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "samplerstress_src",
+    srcs = ["samplerstress.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "savelayer_src",
+    srcs = ["savelayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "scaledemoji_rendering_src",
+    srcs = ["scaledemoji_rendering.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "scaledemoji_src",
+    srcs = ["scaledemoji.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "scaledstrokes_src",
+    srcs = ["scaledstrokes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "shadermaskfilter_src",
+    srcs = ["shadermaskfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkCoverageMode_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//src/core:SkBlendModePriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "shadertext3_src",
+    srcs = ["shadertext3.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "shadowutils_src",
+    srcs = ["shadowutils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkShadowFlags_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/utils:SkShadowUtils_hdr",
+        "//src/core:SkColorFilterPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "shallowgradient_src",
+    srcs = ["shallowgradient.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "shapes_src",
+    srcs = ["shapes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "sharedcorners_src",
+    srcs = ["sharedcorners.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "showmiplevels_src",
+    srcs = ["showmiplevels.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkNx_hdr",
+        "//src/core:SkMipmapBuilder_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "simple_magnification_src",
+    srcs = ["simple_magnification.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/gpu:GrTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "simpleaaclip_src",
+    srcs = ["simpleaaclip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkAAClip_hdr",
+        "//src/core:SkMask_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "simplerect_src",
+    srcs = ["simplerect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug1719_src",
+    srcs = ["skbug1719.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_12212_src",
+    srcs = ["skbug_12212.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_257_src",
+    srcs = ["skbug_257.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_4868_src",
+    srcs = ["skbug_4868.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_5321_src",
+    srcs = ["skbug_5321.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTextBlob_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_8664_src",
+    srcs = ["skbug_8664.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_8955_src",
+    srcs = ["skbug_8955.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkTextBlob_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_9319_src",
+    srcs = ["skbug_9319.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "skbug_9819_src",
+    srcs = ["skbug_9819.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "slug_src",
+    srcs = ["slug.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/private/chromium:GrSlug_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "smallarc_src",
+    srcs = ["smallarc.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "smallpaths_src",
+    srcs = ["smallpaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/pathops:SkPathOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "spritebitmap_src",
+    srcs = ["spritebitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "srcmode_src",
+    srcs = ["srcmode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "srgb_src",
+    srcs = ["srgb.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "stlouisarch_src",
+    srcs = ["stlouisarch.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "stringart_src",
+    srcs = ["stringart.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "stroke_rect_shader_src",
+    srcs = ["stroke_rect_shader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokedlines_src",
+    srcs = ["strokedlines.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTArray_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokefill_src",
+    srcs = ["strokefill.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkStrokeAndFillPathEffect_hdr",
+        "//src/core:SkPathPriv_hdr",
+        "//src/core:SkTextFormatParams_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokerect_anisotropic_src",
+    srcs = ["strokerect_anisotropic.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokerect_src",
+    srcs = ["strokerect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokerects_src",
+    srcs = ["strokerects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "strokes_src",
+    srcs = ["strokes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "stroketext_src",
+    srcs = ["stroketext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "subsetshader_src",
+    srcs = ["subsetshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "surface_src",
+    srcs = ["surface.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "swizzle_src",
+    srcs = ["swizzle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tablecolorfilter_src",
+    srcs = ["tablecolorfilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tallstretchedbitmaps_src",
+    srcs = ["tallstretchedbitmaps.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tessellation_src",
+    srcs = ["tessellation.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrPipeline_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:GrShaderVar_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "testgradient_src",
+    srcs = ["testgradient.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "texelsubset_src",
+    srcs = ["texelsubset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrSamplerState_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:Resources_hdr",
+        "//tools/gpu:TestOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "text_scale_skew_src",
+    srcs = ["text_scale_skew.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/utils:SkTextUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblob_src",
+    srcs = ["textblob.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobblockreordering_src",
+    srcs = ["textblobblockreordering.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobcolortrans_src",
+    srcs = ["textblobcolortrans.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobgeometrychange_src",
+    srcs = ["textblobgeometrychange.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobmixedsizes_src",
+    srcs = ["textblobmixedsizes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobrandomfont_src",
+    srcs = ["textblobrandomfont.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/fonts:RandomScalerContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobshader_src",
+    srcs = ["textblobshader.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobtransforms_src",
+    srcs = ["textblobtransforms.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "textblobuseaftergpufree_src",
+    srcs = ["textblobuseaftergpufree.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "texteffects_src",
+    srcs = ["texteffects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/private:SkTo_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "thinconcavepaths_src",
+    srcs = ["thinconcavepaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkScalar_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "thinrects_src",
+    srcs = ["thinrects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "thinstrokedrects_src",
+    srcs = ["thinstrokedrects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tiledscaledbitmap_src",
+    srcs = ["tiledscaledbitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tileimagefilter_src",
+    srcs = ["tileimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tilemodes_alpha_src",
+    srcs = ["tilemodes_alpha.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tilemodes_scaled_src",
+    srcs = ["tilemodes_scaled.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tilemodes_src",
+    srcs = ["tilemodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "tinybitmap_src",
+    srcs = ["tinybitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "transparency_src",
+    srcs = ["transparency.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "trickycubicstrokes_src",
+    srcs = ["trickycubicstrokes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/ops:TessellationPathRenderer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "typeface_src",
+    srcs = ["typeface.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkStrokeAndFillPathEffect_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "unpremul_src",
+    srcs = ["unpremul.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "userfont_src",
+    srcs = ["userfont.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/utils:SkCustomTypeface_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "variedtext_src",
+    srcs = ["variedtext.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "vertices_src",
+    srcs = ["vertices.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkVerticesPriv_hdr",
+        "//src/shaders:SkLocalMatrixShader_hdr",
+        "//src/utils:SkPatchUtils_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "verylargebitmap_src",
+    srcs = ["verylargebitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/effects:SkGradientShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "video_decoder_src",
+    srcs = ["video_decoder.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//experimental/ffmpeg:SkVideoDecoder_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkStream_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "wacky_yuv_formats_src",
+    srcs = ["wacky_yuv_formats.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkFontTypes_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrConfig_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkConvertPixels_hdr",
+        "//src/core:SkYUVMath_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "widebuttcaps_src",
+    srcs = ["widebuttcaps.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/ops:TessellationPathRenderer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "windowrectangles_src",
+    srcs = ["windowrectangles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkClipStack_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "xfermodeimagefilter_src",
+    srcs = ["xfermodeimagefilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "xfermodes2_src",
+    srcs = ["xfermodes2.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "xfermodes3_src",
+    srcs = ["xfermodes3.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "xfermodes_src",
+    srcs = ["xfermodes.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ycbcrimage_src",
+    srcs = ["ycbcrimage.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools/gpu/vk:VkYcbcrSamplerHelper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "yuv420_odd_dim_src",
+    srcs = ["yuv420_odd_dim.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkCachedData_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools:Resources_hdr",
+        "//tools/gpu:YUVUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "yuvtorgbsubset_src",
+    srcs = ["yuvtorgbsubset.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkYUVAInfo_hdr",
+        "//include/core:SkYUVAPixmaps_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrSamplerState_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrYUVATextureProxies_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrYUVtoRGBEffect_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
 )
diff --git a/third_party/skia/gm/aarectmodes.cpp b/third_party/skia/gm/aarectmodes.cpp
index fdab82650b1be..ca1215881c06b 100644
--- a/third_party/skia/gm/aarectmodes.cpp
+++ b/third_party/skia/gm/aarectmodes.cpp
@@ -129,7 +129,7 @@ static sk_sp<SkShader> make_bg_shader() {
 DEF_SIMPLE_GM(aarectmodes, canvas, 640, 480) {
             SkPaint bgPaint;
             bgPaint.setShader(make_bg_shader());
-            if (false) { // avoid bit rot, suppress warning
+            if ((false)) { // avoid bit rot, suppress warning
                 test4(canvas);
             }
             const SkRect bounds = SkRect::MakeWH(W, H);
diff --git a/third_party/skia/gm/attributes.cpp b/third_party/skia/gm/attributes.cpp
new file mode 100644
index 0000000000000..28539e95efc9a
--- /dev/null
+++ b/third_party/skia/gm/attributes.cpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/gpu/GrRecordingContext.h"
+#include "src/core/SkCanvasPriv.h"
+#include "src/gpu/GrBuffer.h"
+#include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/GrGpuBuffer.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrProcessor.h"
+#include "src/gpu/GrProcessorSet.h"
+#include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrShaderVar.h"
+#include "src/gpu/KeyBuilder.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
+#include "src/gpu/ops/GrDrawOp.h"
+#include "src/gpu/ops/GrOp.h"
+#include "src/gpu/v1/SurfaceDrawContext_v1.h"
+#include "tools/gpu/ProxyUtils.h"
+
+#include <memory>
+#include <vector>
+
+class GrAppliedClip;
+class GrGLSLProgramDataManager;
+
+namespace {
+
+enum class AttrMode {
+    kAuto,
+    kManual,
+    kWacky
+};
+
+class AttributeTestProcessor : public GrGeometryProcessor {
+public:
+    static GrGeometryProcessor* Make(SkArenaAlloc* arena, AttrMode mode) {
+        return arena->make([&](void* ptr) { return new (ptr) AttributeTestProcessor(mode); });
+    }
+
+    const char* name() const final { return "AttributeTestProcessor"; }
+
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const final {
+        b->add32(static_cast<uint32_t>(fMode));
+    }
+
+    std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
+
+private:
+    AttributeTestProcessor(AttrMode mode)
+            : GrGeometryProcessor(kAttributeTestProcessor_ClassID), fMode(mode) {
+        switch (fMode) {
+            case AttrMode::kAuto:
+                fAttributes.emplace_back("pos", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
+                fAttributes.emplace_back("color", kUByte4_norm_GrVertexAttribType,
+                                         SkSLType::kHalf4);
+                this->setVertexAttributesWithImplicitOffsets(fAttributes.data(),
+                                                             fAttributes.size());
+                break;
+            case AttrMode::kManual:
+                // Same result as kAuto but with explicitly specified offsets and stride.
+                fAttributes.emplace_back("pos", kFloat2_GrVertexAttribType, SkSLType::kFloat2, 0);
+                fAttributes.emplace_back("color", kUByte4_norm_GrVertexAttribType,
+                                         SkSLType::kHalf4, 8);
+                this->setVertexAttributes(fAttributes.data(), fAttributes.size(), 12);
+                break;
+            case AttrMode::kWacky:
+                //  0 thru  7 : float2 aliased to "pos0" and "pos1"
+                //  8 thru 11: pad
+                // 12 thru 15: unorm4 "color"
+                // 16 thru 19: pad
+                fAttributes.emplace_back("pos0", kFloat2_GrVertexAttribType, SkSLType::kFloat2, 0);
+                fAttributes.emplace_back("pos1", kFloat2_GrVertexAttribType, SkSLType::kFloat2, 0);
+                fAttributes.emplace_back("color", kUByte4_norm_GrVertexAttribType,
+                                         SkSLType::kHalf4, 12);
+                this->setVertexAttributes(fAttributes.data(), fAttributes.size(), 20);
+                break;
+        }
+    }
+
+    const AttrMode fMode;
+
+    std::vector<Attribute> fAttributes;
+
+    using INHERITED = GrGeometryProcessor;
+};
+
+std::unique_ptr<GrGeometryProcessor::ProgramImpl> AttributeTestProcessor::makeProgramImpl(
+        const GrShaderCaps&) const {
+    class Impl : public ProgramImpl {
+    public:
+        void setData(const GrGLSLProgramDataManager&,
+                     const GrShaderCaps&,
+                     const GrGeometryProcessor&) override {}
+
+    private:
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+            const AttributeTestProcessor& proc = args.fGeomProc.cast<AttributeTestProcessor>();
+            args.fVaryingHandler->emitAttributes(proc);
+            if (proc.fMode == AttrMode::kWacky) {
+                args.fVertBuilder->codeAppend("float2 pos = pos0 + pos1;");
+            }
+            args.fFragBuilder->codeAppendf("half4 %s;", args.fOutputColor);
+            args.fVaryingHandler->addPassThroughAttribute(GrShaderVar("color", SkSLType::kHalf4),
+                                                          args.fOutputColor);
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "pos");
+            args.fFragBuilder->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
+        }
+    };
+
+    return std::make_unique<Impl>();
+}
+
+class AttributeTestOp : public GrDrawOp {
+public:
+    DEFINE_OP_CLASS_ID
+
+    static GrOp::Owner Make(GrRecordingContext* context, AttrMode mode, const SkRect& r) {
+        return GrOp::Make<AttributeTestOp>(context, mode, r);
+    }
+
+private:
+    AttributeTestOp(AttrMode mode, SkRect rect) : GrDrawOp(ClassID()), fMode(mode), fRect(rect) {
+        this->setBounds(fRect, HasAABloat::kNo, IsHairline::kNo);
+    }
+
+    const char* name() const override { return "AttributeTestOp"; }
+    FixedFunctionFlags fixedFunctionFlags() const override { return FixedFunctionFlags::kNone; }
+    GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrClampType) override {
+        return GrProcessorSet::EmptySetAnalysis();
+    }
+
+    GrProgramInfo* createProgramInfo(const GrCaps* caps,
+                                     SkArenaAlloc* arena,
+                                     const GrSurfaceProxyView& writeView,
+                                     bool usesMSAASurface,
+                                     GrAppliedClip&& appliedClip,
+                                     const GrDstProxyView& dstProxyView,
+                                     GrXferBarrierFlags renderPassXferBarriers,
+                                     GrLoadOp colorLoadOp) const {
+        GrGeometryProcessor* geomProc = AttributeTestProcessor::Make(arena, fMode);
+
+        return sk_gpu_test::CreateProgramInfo(caps,
+                                              arena,
+                                              writeView,
+                                              usesMSAASurface,
+                                              std::move(appliedClip),
+                                              dstProxyView,
+                                              geomProc,
+                                              SkBlendMode::kSrcOver,
+                                              GrPrimitiveType::kTriangleStrip,
+                                              renderPassXferBarriers,
+                                              colorLoadOp);
+    }
+
+    GrProgramInfo* createProgramInfo(GrOpFlushState* flushState) const {
+        return this->createProgramInfo(&flushState->caps(),
+                                       flushState->allocator(),
+                                       flushState->writeView(),
+                                       flushState->usesMSAASurface(),
+                                       flushState->detachAppliedClip(),
+                                       flushState->dstProxyView(),
+                                       flushState->renderPassBarriers(),
+                                       flushState->colorLoadOp());
+    }
+
+    void onPrePrepare(GrRecordingContext* context,
+                      const GrSurfaceProxyView& writeView,
+                      GrAppliedClip* clip,
+                      const GrDstProxyView& dstProxyView,
+                      GrXferBarrierFlags renderPassXferBarriers,
+                      GrLoadOp colorLoadOp) final {
+        SkArenaAlloc* arena = context->priv().recordTimeAllocator();
+
+        // DMSAA is not supported on DDL.
+        bool usesMSAASurface = writeView.asRenderTargetProxy()->numSamples() > 1;
+
+        // This is equivalent to a GrOpFlushState::detachAppliedClip
+        GrAppliedClip appliedClip = clip ? std::move(*clip) : GrAppliedClip::Disabled();
+
+        fProgramInfo = this->createProgramInfo(context->priv().caps(),
+                                               arena,
+                                               writeView,
+                                               usesMSAASurface,
+                                               std::move(appliedClip),
+                                               dstProxyView,
+                                               renderPassXferBarriers,
+                                               colorLoadOp);
+
+        context->priv().recordProgramInfo(fProgramInfo);
+    }
+
+    template <typename V> void makeVB(GrOpFlushState* flushState, const SkRect rect) {
+        V v[4];
+        v[0].p = {rect.left() , rect.top()   };
+        v[1].p = {rect.right(), rect.top()   };
+        v[2].p = {rect.left() , rect.bottom()};
+        v[3].p = {rect.right(), rect.bottom()};
+        v[0].color = SK_ColorRED;
+        v[1].color = SK_ColorGREEN;
+        v[2].color = SK_ColorYELLOW;
+        v[3].color = SK_ColorMAGENTA;
+        fVertexBuffer = flushState->resourceProvider()->createBuffer(
+                sizeof(v), GrGpuBufferType::kVertex, kStatic_GrAccessPattern, v);
+    }
+
+    void onPrepare(GrOpFlushState* flushState) override {
+        if (fMode == AttrMode::kWacky) {
+            struct V {
+                SkPoint p;
+                uint32_t pad0;
+                uint32_t color;
+                uint32_t pad1;
+            };
+            SkRect rect {fRect.fLeft/2.f, fRect.fTop/2.f, fRect.fRight/2.f, fRect.fBottom/2.f};
+            this->makeVB<V>(flushState, rect);
+        } else {
+            struct V {
+                SkPoint p;
+                uint32_t color;
+            };
+            this->makeVB<V>(flushState, fRect);
+        }
+    }
+
+    void onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) override {
+        if (!fVertexBuffer) {
+            return;
+        }
+
+        if (!fProgramInfo) {
+            fProgramInfo = this->createProgramInfo(flushState);
+        }
+
+        flushState->bindPipeline(*fProgramInfo, fRect);
+        flushState->bindBuffers(nullptr, nullptr, std::move(fVertexBuffer));
+        flushState->draw(4, 0);
+    }
+
+    sk_sp<GrBuffer> fVertexBuffer;
+    const AttrMode  fMode;
+    const SkRect    fRect;
+
+    // The program info (and both the GrPipeline and GrGeometryProcessor it relies on), when
+    // allocated, are allocated in either the ddl-record-time or flush-time arena. It is the
+    // arena's job to free up their memory so we just have a bare programInfo pointer here. We
+    // don't even store the GrPipeline and GrGeometryProcessor pointers here bc they are
+    // guaranteed to have the same lifetime as the program info.
+    GrProgramInfo* fProgramInfo = nullptr;
+
+    friend class ::GrOp;  // for ctor
+
+    using INHERITED = GrDrawOp;
+};
+
+}  // namespace
+
+namespace skiagm {
+
+/**
+ * This is a GPU-backend specific test that exercises explicit and implicit attribute offsets and
+ * strides.
+ */
+class AttributesGM : public GpuGM {
+    SkString onShortName() override { return SkString("attributes"); }
+    SkISize onISize() override { return {120, 340}; }
+    DrawResult onDraw(GrRecordingContext*, SkCanvas*, SkString* errorMsg) override;
+};
+
+DrawResult AttributesGM::onDraw(GrRecordingContext* rc, SkCanvas* canvas, SkString* errorMsg) {
+    auto sdc = SkCanvasPriv::TopDeviceSurfaceDrawContext(canvas);
+    if (!sdc) {
+        *errorMsg = kErrorMsg_DrawSkippedGpuOnly;
+        return DrawResult::kSkip;
+    }
+
+    sdc->clear(SK_PMColor4fBLACK);
+
+    // Draw the test directly to the frame buffer.
+    auto r = SkRect::MakeXYWH(10, 10, 100, 100);
+    for (AttrMode m : {AttrMode::kAuto, AttrMode::kManual, AttrMode::kWacky}) {
+        sdc->addDrawOp(AttributeTestOp::Make(rc, m, r));
+        r.offset(0, 110);
+    }
+
+    return DrawResult::kOk;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+DEF_GM( return new AttributesGM(); )
+
+}  // namespace skiagm
diff --git a/third_party/skia/gm/bitmapcopy.cpp b/third_party/skia/gm/bitmapcopy.cpp
index f3f3820ca97f1..8e3368dae020f 100644
--- a/third_party/skia/gm/bitmapcopy.cpp
+++ b/third_party/skia/gm/bitmapcopy.cpp
@@ -49,6 +49,7 @@ static const char* color_type_name(SkColorType colorType) {
         case kR16G16_float_SkColorType:       return "R16G16_float";
         case kR16G16B16A16_unorm_SkColorType: return "R16G16B16A16_unorm";
         case kSRGBA_8888_SkColorType:         return "SRGBA_8888";
+        case kR8_unorm_SkColorType:           return "R8_unorm";
     }
     return "";
 }
diff --git a/third_party/skia/gm/bug12866.cpp b/third_party/skia/gm/bug12866.cpp
new file mode 100644
index 0000000000000..ae91fc5522edb
--- /dev/null
+++ b/third_party/skia/gm/bug12866.cpp
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPath.h"
+
+static SkPath get_path() {
+    SkPath path;
+    path.setFillType(SkPathFillType::kWinding);
+    path.moveTo(SkBits2Float(0x45034ec4), SkBits2Float(0x42e7fb80));  // 2100.92f, 115.991f
+    path.quadTo(SkBits2Float(0x4500f46c),
+                SkBits2Float(0x43333300),
+                SkBits2Float(0x4500f46c),
+                SkBits2Float(0x431f0ec0));  // 2063.28f, 179.199f, 2063.28f, 159.058f
+    path.quadTo(SkBits2Float(0x4500f46c),
+                SkBits2Float(0x430ad7c0),
+                SkBits2Float(0x45019462),
+                SkBits2Float(0x42fed580));  // 2063.28f, 138.843f, 2073.27f, 127.417f
+    path.quadTo(SkBits2Float(0x45023458),
+                SkBits2Float(0x42e7fb80),
+                SkBits2Float(0x45034ec4),
+                SkBits2Float(0x42e7fb80));  // 2083.27f, 115.991f, 2100.92f, 115.991f
+    path.close();
+    return path;
+}
+
+// Reproduces the underlying problem from skbug.com/12866.
+// The path (part of a glyph) was being drawn stroked, and with a perspective matrix.
+// The perspective matrix forces a very large resScale when stroking the path.
+// The resulting filled path is incorrect. Note that stroking with a smaller resScale works fine.
+DEF_SIMPLE_GM(bug12866, canvas, 128, 64) {
+    SkPaint strokePaint;
+    strokePaint.setAntiAlias(true);
+    strokePaint.setStyle(SkPaint::kStroke_Style);
+    strokePaint.setStrokeWidth(3);
+
+    SkPaint fillPaint;
+    fillPaint.setAntiAlias(true);
+
+    SkPath strokePath = get_path();
+    SkPath fillPath;
+    strokePaint.getFillPath(strokePath, &fillPath, nullptr, 1200.0f);
+
+    SkRect strokeBounds = strokePath.getBounds();
+    SkRect fillBounds = fillPath.getBounds();
+
+    // Draw the stroked path. This (internally) uses a resScale of 1.0, and looks good.
+    canvas->save();
+    canvas->translate(10 - strokeBounds.fLeft, 10 - strokeBounds.fTop);
+    canvas->drawPath(strokePath, strokePaint);
+    canvas->restore();
+
+    // With a perspective CTM, it's possible for resScale to become large. Draw the filled
+    // path produced by the stroker in that situation, which ends up being incorrect.
+    canvas->save();
+    canvas->translate(74 - fillBounds.fLeft, 10 - fillBounds.fTop);
+    canvas->drawPath(fillPath, fillPaint);
+    canvas->restore();
+}
diff --git a/third_party/skia/gm/clear_swizzle.cpp b/third_party/skia/gm/clear_swizzle.cpp
index 0dfac54459f24..5e7e69f209ddc 100644
--- a/third_party/skia/gm/clear_swizzle.cpp
+++ b/third_party/skia/gm/clear_swizzle.cpp
@@ -11,8 +11,8 @@
 #include "include/private/SkColorData.h"
 #include "src/core/SkCanvasPriv.h"
 #include "src/gpu/GrRecordingContextPriv.h"
-#include "src/gpu/GrSwizzle.h"
 #include "src/gpu/SurfaceFillContext.h"
+#include "src/gpu/Swizzle.h"
 
 namespace skiagm {
 
@@ -32,8 +32,10 @@ DEF_SIMPLE_GPU_GM_CAN_FAIL(clear_swizzle, rContext, canvas, errorMsg, 6*kSize, 2
     }
 
     auto make_offscreen = [&](const SkISize dimensions) {
-        GrSwizzle readSwizzle  = GrSwizzle::Concat(sfc->readSwizzle(), GrSwizzle{"bgra"});
-        GrSwizzle writeSwizzle = GrSwizzle::Concat(sfc->readSwizzle(), GrSwizzle{"bgra"});
+        skgpu::Swizzle readSwizzle  = skgpu::Swizzle::Concat(sfc->readSwizzle(),
+                                                             skgpu::Swizzle{"bgra"});
+        skgpu::Swizzle writeSwizzle = skgpu::Swizzle::Concat(sfc->readSwizzle(),
+                                                             skgpu::Swizzle{"bgra"});
         return rContext->priv().makeSFC(kPremul_SkAlphaType,
                                         sfc->colorInfo().refColorSpace(),
                                         dimensions,
diff --git a/third_party/skia/gm/clockwise.cpp b/third_party/skia/gm/clockwise.cpp
index 1c8e5df434fe9..544f184ce9d9b 100644
--- a/third_party/skia/gm/clockwise.cpp
+++ b/third_party/skia/gm/clockwise.cpp
@@ -41,6 +41,7 @@
 #include "src/gpu/GrShaderVar.h"
 #include "src/gpu/GrSurfaceProxy.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/ops/GrDrawOp.h"
@@ -57,7 +58,7 @@ class GrGLSLProgramDataManager;
 namespace {
 
 static constexpr GrGeometryProcessor::Attribute gVertex =
-        {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        {"position", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // SkSL code.
@@ -72,7 +73,7 @@ class ClockwiseTestProcessor : public GrGeometryProcessor {
 
     const char* name() const final { return "ClockwiseTestProcessor"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const final {
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const final {
         b->add32(fReadSkFragCoord);
     }
 
@@ -84,7 +85,7 @@ class ClockwiseTestProcessor : public GrGeometryProcessor {
     ClockwiseTestProcessor(bool readSkFragCoord)
             : GrGeometryProcessor(kClockwiseTestProcessor_ClassID)
             , fReadSkFragCoord(readSkFragCoord) {
-        this->setVertexAttributes(&gVertex, 1);
+        this->setVertexAttributesWithImplicitOffsets(&gVertex, 1);
     }
 
     const bool fReadSkFragCoord;
@@ -104,7 +105,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> ClockwiseTestProcessor::makePr
         void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
             const ClockwiseTestProcessor& proc = args.fGeomProc.cast<ClockwiseTestProcessor>();
             args.fVaryingHandler->emitAttributes(proc);
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "position");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "position");
             args.fFragBuilder->codeAppendf(
                     "half4 %s = sk_Clockwise ? half4(0,1,0,1) : half4(1,0,0,1);",
                     args.fOutputColor);
diff --git a/third_party/skia/gm/compositor_quads.cpp b/third_party/skia/gm/compositor_quads.cpp
index 8f29cbb6dd293..f1718174472ff 100644
--- a/third_party/skia/gm/compositor_quads.cpp
+++ b/third_party/skia/gm/compositor_quads.cpp
@@ -587,7 +587,7 @@ class DebugTileRenderer : public ClipTileRenderer {
         canvas->translate(0.f, 15.f);
 
         SkString config;
-        static const char* kFormat = "Ext(%s) - Int(%s)";
+        constexpr char kFormat[] = "Ext(%s) - Int(%s)";
         if (fEnableAAOverride) {
             SkASSERT(fAAOverride == SkCanvas::kAll_QuadAAFlags ||
                      fAAOverride == SkCanvas::kNone_QuadAAFlags);
diff --git a/third_party/skia/gm/custommesh.cpp b/third_party/skia/gm/custommesh.cpp
new file mode 100644
index 0000000000000..d11c75b64dfda
--- /dev/null
+++ b/third_party/skia/gm/custommesh.cpp
@@ -0,0 +1,359 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/core/SkBlender.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkCustomMesh.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkGradientShader.h"
+#include "src/core/SkCanvasPriv.h"
+
+#include <memory>
+
+namespace skiagm {
+class CustomMeshGM : public skiagm::GM {
+public:
+    CustomMeshGM() {}
+
+protected:
+    using Attribute = SkCustomMeshSpecification::Attribute;
+    using Varying   = SkCustomMeshSpecification::Varying;
+
+    SkISize onISize() override { return {435, 1180}; }
+
+    void onOnceBeforeDraw() override {
+        {
+            static const Attribute kAttributes[]{
+                    {Attribute::Type::kFloat4,       8, SkString{"xuyv"}},
+                    {Attribute::Type::kUByte4_unorm, 4, SkString{"brag"}},
+            };
+            static const Varying kVaryings[]{
+                    {Varying::Type::kHalf4,  SkString{"color"}},
+                    {Varying::Type::kFloat2, SkString{"uv"}   },
+            };
+            static constexpr char kVS[] = R"(
+                    half4 unswizzle_color(half4 color) { return color.garb; }
+
+                    float2 main(in Attributes attributes, out Varyings varyings) {
+                        varyings.color = unswizzle_color(attributes.brag);
+                        varyings.uv    = attributes.xuyv.yw;
+                        return attributes.xuyv.xz;
+                    }
+            )";
+            static constexpr char kFS[] = R"(
+                    float2 main(in Varyings varyings, out float4 color) {
+                        color = varyings.color;
+                        return varyings.uv;
+                    }
+            )";
+            auto [spec, error] = SkCustomMeshSpecification::Make(
+                    SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                    sizeof(ColorVertex),
+                    SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                    SkString(kVS),
+                    SkString(kFS));
+            if (!spec) {
+                SkDebugf("%s\n", error.c_str());
+            }
+            fSpecWithColor = std::move(spec);
+        }
+        {
+            static const Attribute kAttributes[]{
+                    {Attribute::Type::kFloat4, 0, SkString{"xuyv"}},
+            };
+            static const Varying kVaryings[]{
+                    {Varying::Type::kFloat2, SkString{"vux2"}},
+            };
+            static constexpr char kVS[] = R"(
+                    float2 main(in Attributes a, out Varyings v) {
+                        v.vux2 = 2*a.xuyv.wy;
+                        return a.xuyv.xz;
+                    }
+            )";
+            static constexpr char kFS[] = R"(
+                    float2 helper(in float2 vux2) { return vux2.yx/2; }
+                    float2 main(in Varyings varyings) {
+                        return helper(varyings.vux2);
+                    }
+            )";
+            auto [spec, error] = SkCustomMeshSpecification::Make(
+                    SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                    sizeof(NoColorVertex),
+                    SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                    SkString(kVS),
+                    SkString(kFS));
+            if (!spec) {
+                SkDebugf("%s\n", error.c_str());
+            }
+            fSpecWithNoColor = std::move(spec);
+        }
+
+        static constexpr SkColor kColors[] = {SK_ColorTRANSPARENT, SK_ColorWHITE};
+        fShader = SkGradientShader::MakeRadial({10, 10},
+                                               3,
+                                               kColors,
+                                               nullptr,
+                                               2,
+                                               SkTileMode::kMirror);
+    }
+
+    SkString onShortName() override { return SkString("custommesh"); }
+
+    DrawResult onDraw(SkCanvas* canvas, SkString*) override {
+        int i = 0;
+        for (const sk_sp<SkBlender>& blender : {SkBlender::Mode(SkBlendMode::kDst),
+                                                SkBlender::Mode(SkBlendMode::kSrc),
+                                                SkBlender::Mode(SkBlendMode::kSaturation)}) {
+            canvas->save();
+            for (uint8_t alpha  : {0xFF , 0x40})
+            for (bool    colors : {false, true})
+            for (bool    shader : {false, true}) {
+                SkCustomMesh cm;
+                cm.spec   = colors ? fSpecWithColor : fSpecWithNoColor;
+                cm.bounds = kRect;
+                // Rather than pile onto the combinatorics we draw every other test case indexed.
+                if ((i & 1) == 0) {
+                    cm.vb     = colors ? static_cast<const void*>(kColorQuad)
+                                       : static_cast<const void*>(kNoColorQuad);
+                    cm.vcount = 4;
+                    cm.mode   = SkCustomMesh::Mode::kTriangleStrip;
+                } else {
+                    cm.vb      = colors ? static_cast<const void*>(kColorIndexedQuad)
+                                        : static_cast<const void*>(kNoColorIndexedQuad);
+                    cm.vcount  = 6;
+                    cm.icount  = 6;
+                    cm.indices = kIndices;
+                    cm.mode   = SkCustomMesh::Mode::kTriangles;
+                }
+
+                SkPaint paint;
+                paint.setColor(SK_ColorGREEN);
+                paint.setShader(shader ? fShader : nullptr);
+                paint.setAlpha(alpha);
+
+                SkCanvasPriv::DrawCustomMesh(canvas, std::move(cm), blender, paint);
+
+                canvas->translate(0, 150);
+                ++i;
+            }
+            canvas->restore();
+            canvas->translate(150, 0);
+        }
+        return DrawResult::kOk;
+    }
+
+private:
+    struct ColorVertex {
+        uint32_t pad;
+        uint32_t brag;
+        float    xuyv[4];
+    };
+
+    struct NoColorVertex {
+        float xuyv[4];
+    };
+
+    static constexpr auto kRect = SkRect::MakeLTRB(20, 20, 120, 120);
+    static constexpr auto kUV   = SkRect::MakeLTRB( 0,  0,  20,  20);
+
+    static constexpr ColorVertex kColorQuad[] {
+            {0, 0x00FFFF00, {kRect.left(),  kUV.left(),  kRect.top(),    kUV.top()   }},
+            {0, 0x00FFFFFF, {kRect.right(), kUV.right(), kRect.top(),    kUV.top()   }},
+            {0, 0xFFFF00FF, {kRect.left(),  kUV.left(),  kRect.bottom(), kUV.bottom()}},
+            {0, 0xFFFFFF00, {kRect.right(), kUV.right(), kRect.bottom(), kUV.bottom()}},
+    };
+
+    static constexpr NoColorVertex kNoColorQuad[]{
+            {{kRect.left(),  kUV.left(),  kRect.top(),    kUV.top()   }},
+            {{kRect.right(), kUV.right(), kRect.top(),    kUV.top()   }},
+            {{kRect.left(),  kUV.left(),  kRect.bottom(), kUV.bottom()}},
+            {{kRect.right(), kUV.right(), kRect.bottom(), kUV.bottom()}},
+    };
+
+    // The indexed quads draw the same as the non-indexed. They just have unused vertices that the
+    // index buffer skips over draw with triangles instead of a triangle strip.
+    static constexpr ColorVertex kColorIndexedQuad[] {
+            {0, 0x00FFFF00, {kRect.left(),  kUV.left(),  kRect.top(),    kUV.top()   }},
+            {0, 0x00000000, {        100.f,        0.f,        100.f,    5.f         }}, // unused
+            {0, 0x00FFFFFF, {kRect.right(), kUV.right(), kRect.top(),    kUV.top()   }},
+            {0, 0x00000000, {        200.f,        10.f,        200.f,   10.f        }}, // unused
+            {0, 0xFFFF00FF, {kRect.left(),  kUV.left(),  kRect.bottom(), kUV.bottom()}},
+            {0, 0xFFFFFF00, {kRect.right(), kUV.right(), kRect.bottom(), kUV.bottom()}},
+    };
+
+    static constexpr NoColorVertex kNoColorIndexedQuad[]{
+            {{kRect.left(),  kUV.left(),  kRect.top(),    kUV.top()   }},
+            {{        100.f,        0.f,        100.f,    5.f         }}, // unused
+            {{kRect.right(), kUV.right(), kRect.top(),    kUV.top()   }},
+            {{        200.f,        10.f,        200.f,   10.f        }}, // unused
+            {{kRect.left(),  kUV.left(),  kRect.bottom(), kUV.bottom()}},
+            {{kRect.right(), kUV.right(), kRect.bottom(), kUV.bottom()}},
+    };
+
+    static constexpr uint16_t kIndices[]{0, 2, 4, 2, 5, 4};
+
+    sk_sp<SkShader> fShader;
+
+    sk_sp<SkCustomMeshSpecification> fSpecWithColor;
+    sk_sp<SkCustomMeshSpecification> fSpecWithNoColor;
+};
+
+constexpr SkRect CustomMeshGM::kRect;
+constexpr SkRect CustomMeshGM::kUV;
+
+constexpr CustomMeshGM::ColorVertex   CustomMeshGM::kColorQuad[];
+constexpr CustomMeshGM::NoColorVertex CustomMeshGM::kNoColorQuad[];
+constexpr CustomMeshGM::ColorVertex   CustomMeshGM::kColorIndexedQuad[];
+constexpr CustomMeshGM::NoColorVertex CustomMeshGM::kNoColorIndexedQuad[];
+
+constexpr uint16_t CustomMeshGM::kIndices[];
+
+DEF_GM( return new CustomMeshGM; )
+
+class CustomMeshColorSpaceGM : public skiagm::GM {
+public:
+    CustomMeshColorSpaceGM() {}
+
+protected:
+    using Attribute = SkCustomMeshSpecification::Attribute;
+    using Varying   = SkCustomMeshSpecification::Varying;
+
+    SkISize onISize() override { return {468, 258}; }
+
+    void onOnceBeforeDraw() override {
+        static const Attribute kAttributes[]{
+                {Attribute::Type::kFloat2, 0, SkString{"pos"}  },
+                {Attribute::Type::kFloat4, 8, SkString{"color"}},
+        };
+        static const Varying kVaryings[]{
+                {Varying::Type::kHalf4,  SkString{"color"}},
+        };
+        static constexpr char kPremulVS[] = R"(
+                float2 main(in Attributes attributes, out Varyings varyings) {
+                    varyings.color = half4(attributes.color.a*attributes.color.rgb,
+                                           attributes.color.a);
+                    return attributes.pos;
+                }
+        )";
+        static constexpr char kUnpremulVS[] = R"(
+                float2 main(in Attributes attributes, out Varyings varyings) {
+                    varyings.color = attributes.color;
+                    return attributes.pos;
+                }
+        )";
+        static constexpr char kFS[] = R"(
+                void main(in Varyings varyings, out half4 color) {
+                    color = varyings.color;
+                }
+        )";
+        for (bool unpremul : {false, true}) {
+            auto at = unpremul ? kUnpremul_SkAlphaType : kPremul_SkAlphaType;
+            auto vs = unpremul ? kUnpremulVS : kPremulVS;
+            for (bool spin : {false, true}) {
+                auto cs = SkColorSpace::MakeSRGB();
+                if (spin) {
+                    cs = cs->makeColorSpin();
+                }
+
+                auto [spec, error] = SkCustomMeshSpecification::Make(
+                        SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                        sizeof(Vertex),
+                        SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                        SkString(vs),
+                        SkString(kFS),
+                        std::move(cs),
+                        at);
+                if (!spec) {
+                    SkDebugf("%s\n", error.c_str());
+                }
+                fSpecs[SpecIndex(unpremul, spin)] = std::move(spec);
+            }
+        }
+        SkPoint pts[]    = {{kRect.fLeft, 0}, {kRect.centerX(), 0}};
+        SkColor colors[] = {SK_ColorWHITE,    SK_ColorTRANSPARENT};
+        fShader = SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkTileMode::kMirror);
+    }
+
+    SkString onShortName() override { return SkString("custommesh_cs"); }
+
+    DrawResult onDraw(SkCanvas* canvas, SkString* error) override {
+        // Force an intermediate surface if the canvas is in "legacy" mode
+        SkCanvas* c = canvas;
+        sk_sp<SkSurface> surface;
+        if (!c->imageInfo().colorSpace()) {
+            SkImageInfo info = canvas->imageInfo().makeColorSpace(SkColorSpace::MakeSRGB());
+            surface = canvas->makeSurface(info);
+            if (!surface) {
+                // This GM won't work on configs that use a recording canvas.
+                return DrawResult::kSkip;
+            }
+            c = surface->getCanvas();
+            c->clear(SK_ColorWHITE);
+        }
+        for (bool useShader : {false, true})
+        for (bool unpremul  : {false, true}) {
+            c->save();
+            for (bool spin : {false, true}) {
+                SkCustomMesh cm;
+                cm.spec   = fSpecs[SpecIndex(unpremul, spin)];
+                cm.bounds = kRect;
+                cm.vb     = kQuad;
+                cm.vcount = 4;
+                cm.mode   = SkCustomMesh::Mode::kTriangleStrip;
+
+                SkPaint paint;
+                paint.setShader(useShader ? fShader : nullptr);
+                SkBlendMode mode = useShader ? SkBlendMode::kModulate : SkBlendMode::kDst;
+                SkCanvasPriv::DrawCustomMesh(c,
+                                             std::move(cm),
+                                             SkBlender::Mode(mode),
+                                             paint);
+
+                c->translate(0, kRect.height() + 10);
+            }
+            c->restore();
+            c->translate(kRect.width() + 10, 0);
+            c->save();
+        }
+        if (surface) {
+            surface->draw(canvas, 0, 0);
+        }
+        return DrawResult::kOk;
+    }
+
+private:
+    struct Vertex {
+        SkPoint   pos;
+        SkColor4f color;
+    };
+
+    static int SpecIndex(bool spin, bool unpremul) {
+        return static_cast<int>(spin) + 2*static_cast<int>(unpremul);
+    }
+
+    static constexpr auto kRect = SkRect::MakeLTRB(20, 20, 120, 120);
+
+    static constexpr Vertex kQuad[] {
+            {{kRect.left() , kRect.top()   }, {1, 0, 0, 1}},
+            {{kRect.right(), kRect.top()   }, {0, 1, 0, 0}},
+            {{kRect.left() , kRect.bottom()}, {1, 1, 0, 0}},
+            {{kRect.right(), kRect.bottom()}, {0, 0, 1, 1}},
+    };
+
+    sk_sp<SkCustomMeshSpecification> fSpecs[4];
+
+    sk_sp<SkShader> fShader;
+};
+
+constexpr SkRect CustomMeshColorSpaceGM::kRect;
+
+constexpr CustomMeshColorSpaceGM::Vertex CustomMeshColorSpaceGM::kQuad[];
+
+DEF_GM( return new CustomMeshColorSpaceGM; )
+
+}  // namespace skiagm
diff --git a/third_party/skia/gm/destcolor.cpp b/third_party/skia/gm/destcolor.cpp
index b609e77722daf..520de1137c2d5 100644
--- a/third_party/skia/gm/destcolor.cpp
+++ b/third_party/skia/gm/destcolor.cpp
@@ -44,7 +44,7 @@ class DestColorTestFP : public GrFragmentProcessor {
             : INHERITED(that) {}
 
     const char* name() const override { return "DestColorTestFP"; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override {
diff --git a/third_party/skia/gm/drawlines_with_local_matrix.cpp b/third_party/skia/gm/drawlines_with_local_matrix.cpp
new file mode 100644
index 0000000000000..0fca912d5fdb0
--- /dev/null
+++ b/third_party/skia/gm/drawlines_with_local_matrix.cpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPaint.h"
+#include "include/effects/SkGradientShader.h"
+
+DEF_SIMPLE_GM(drawlines_with_local_matrix, canvas, 500, 500) {
+    canvas->clipRect({0,0,500,500});
+    SkPaint grad;
+    grad.setAntiAlias(true);
+    grad.setStrokeCap(SkPaint::kSquare_Cap);
+    float pos[6] = {0, 2/6.f, 3/6.f, 4/6.f, 5/6.f, 1};
+    constexpr SkColor indigo = SkColorSetARGB(0xFF, 0x4b, 0x00, 0x82);
+    constexpr SkColor violet = SkColorSetARGB(0xFF, 0xee, 0x82, 0xee);
+    SkColor colors[6] = {SK_ColorRED, SK_ColorYELLOW, SK_ColorGREEN, SK_ColorBLUE, indigo, violet};
+    grad.setShader(SkGradientShader::MakeRadial({250,250}, 280, colors, pos, 6,SkTileMode::kClamp));
+    canvas->drawPaint(grad);
+
+    SkPaint white;
+    white.setAntiAlias(true);
+    white.setStrokeCap(SkPaint::kSquare_Cap);
+    white.setColor(SK_ColorWHITE);
+
+    auto drawLine = [&](float x0, float y0, float x1, float y1, float w) {
+        SkPoint p[2] = {{x0, y0}, {x1, y1}};
+        white.setStrokeWidth(w);
+        canvas->drawPoints(SkCanvas::kLines_PointMode, 2, p, white);
+        grad.setStrokeWidth(w - 4);
+        canvas->drawPoints(SkCanvas::kLines_PointMode, 2, p, grad);
+    };
+
+    drawLine(20, 20, 200, 120, 20);
+    drawLine(20, 200, 20, 100, 20);
+    drawLine(480, 20, 400, 400, 20);
+    drawLine(50, 480, 260, 100, 20);
+    drawLine(270, 20, 380, 210, 20);
+    drawLine(280, 280, 400, 480, 20);
+    drawLine(160, 375, 280, 375, 20);
+    drawLine(220, 410, 220, 470, 20);
+    drawLine(250, 250, 250, 250, 20);
+}
diff --git a/third_party/skia/gm/dsl_processor_test.cpp b/third_party/skia/gm/dsl_processor_test.cpp
index b14fe08ab0221..f6a52435d1d0c 100644
--- a/third_party/skia/gm/dsl_processor_test.cpp
+++ b/third_party/skia/gm/dsl_processor_test.cpp
@@ -22,7 +22,7 @@ class SimpleDSLEffect : public GrFragmentProcessor {
     }
 
     const char* name() const override { return "DSLEffect"; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor& that) const override { return this == &that; }
     std::unique_ptr<GrFragmentProcessor> clone() const override { return nullptr; }
 
diff --git a/third_party/skia/gm/fp_sample_chaining.cpp b/third_party/skia/gm/fp_sample_chaining.cpp
index 5361f621e7980..3e43490425fb5 100644
--- a/third_party/skia/gm/fp_sample_chaining.cpp
+++ b/third_party/skia/gm/fp_sample_chaining.cpp
@@ -33,7 +33,7 @@ class UniformMatrixEffect : public GrFragmentProcessor {
     }
 
     const char* name() const override { return "UniformMatrixEffect"; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor& that) const override { return this == &that; }
     std::unique_ptr<GrFragmentProcessor> clone() const override { return nullptr; }
 
@@ -44,7 +44,7 @@ class UniformMatrixEffect : public GrFragmentProcessor {
                 fMatrixVar =
                         args.fUniformHandler->addUniform(&args.fFp,
                                                          kFragment_GrShaderFlag,
-                                                         kFloat3x3_GrSLType,
+                                                         SkSLType::kFloat3x3,
                                                          SkSL::SampleUsage::MatrixUniformName());
                 SkString sample = this->invokeChildWithMatrix(0, args);
                 args.fFragBuilder->codeAppendf("return %s;\n", sample.c_str());
@@ -74,7 +74,7 @@ class ExplicitCoordEffect : public GrFragmentProcessor {
     }
 
     const char* name() const override { return "ExplicitCoordEffect"; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor& that) const override { return this == &that; }
     std::unique_ptr<GrFragmentProcessor> clone() const override { return nullptr; }
 
@@ -103,7 +103,7 @@ class TestPatternEffect : public GrFragmentProcessor {
     }
 
     const char* name() const override { return "TestPatternEffect"; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor& that) const override { return this == &that; }
     std::unique_ptr<GrFragmentProcessor> clone() const override { return nullptr; }
 
diff --git a/third_party/skia/gm/fpcoordinateoverride.cpp b/third_party/skia/gm/fpcoordinateoverride.cpp
index 73f3c803382f0..5365cefe17a61 100644
--- a/third_party/skia/gm/fpcoordinateoverride.cpp
+++ b/third_party/skia/gm/fpcoordinateoverride.cpp
@@ -46,7 +46,7 @@ class SampleCoordEffect : public GrFragmentProcessor {
         return nullptr;
     }
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override {
         SkASSERT(false);
diff --git a/third_party/skia/gm/fwidth_squircle.cpp b/third_party/skia/gm/fwidth_squircle.cpp
index 42d5e8b238867..4a2023b2d5ac0 100644
--- a/third_party/skia/gm/fwidth_squircle.cpp
+++ b/third_party/skia/gm/fwidth_squircle.cpp
@@ -54,7 +54,7 @@ class GrAppliedClip;
 namespace {
 
 static constexpr GrGeometryProcessor::Attribute gVertex =
-        {"bboxcoord", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        {"bboxcoord", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // SkSL code.
@@ -69,7 +69,7 @@ class FwidthSquircleTestProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "FwidthSquircleTestProcessor"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 
@@ -77,7 +77,7 @@ class FwidthSquircleTestProcessor : public GrGeometryProcessor {
     FwidthSquircleTestProcessor(const SkMatrix& viewMatrix)
             : GrGeometryProcessor(kFwidthSquircleTestProcessor_ClassID)
             , fViewMatrix(viewMatrix) {
-        this->setVertexAttributes(&gVertex, 1);
+        this->setVertexAttributesWithImplicitOffsets(&gVertex, 1);
     }
 
     const SkMatrix fViewMatrix;
@@ -103,13 +103,13 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> FwidthSquircleTestProcessor::m
             auto* uniforms = args.fUniformHandler;
             fViewMatrixHandle = uniforms->addUniform(nullptr,
                                                      kVertex_GrShaderFlag,
-                                                     kFloat3x3_GrSLType,
+                                                     SkSLType::kFloat3x3,
                                                      "viewmatrix");
 
             auto* varyings = args.fVaryingHandler;
             varyings->emitAttributes(proc);
 
-            GrGLSLVarying squircleCoord(kFloat2_GrSLType);
+            GrGLSLVarying squircleCoord(SkSLType::kFloat2);
             varyings->addVarying("bboxcoord", &squircleCoord);
 
             auto* v = args.fVertBuilder;
@@ -119,7 +119,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> FwidthSquircleTestProcessor::m
             v->codeAppendf("float3 vertexpos = float3(bboxcoord * 100 * R + 100, 1);");
             v->codeAppendf("vertexpos = %s * vertexpos;",
                            uniforms->getUniformCStr(fViewMatrixHandle));
-            gpArgs->fPositionVar.set(kFloat3_GrSLType, "vertexpos");
+            gpArgs->fPositionVar.set(SkSLType::kFloat3, "vertexpos");
 
             auto* f = args.fFragBuilder;
             f->codeAppendf("float golden_ratio = 1.61803398875;");
diff --git a/third_party/skia/gm/gm.cpp b/third_party/skia/gm/gm.cpp
index 6609cc9876f69..1a7a0419f1560 100644
--- a/third_party/skia/gm/gm.cpp
+++ b/third_party/skia/gm/gm.cpp
@@ -27,7 +27,9 @@
 
 using namespace skiagm;
 
-static void draw_failure_message(SkCanvas* canvas, const char format[], ...)  {
+static void draw_failure_message(SkCanvas* canvas, const char format[], ...) SK_PRINTF_LIKE(2, 3);
+
+static void draw_failure_message(SkCanvas* canvas, const char format[], ...) {
     SkString failureMsg;
 
     va_list argp;
diff --git a/third_party/skia/gm/gpu_blur_utils.cpp b/third_party/skia/gm/gpu_blur_utils.cpp
index 7706283828459..e51b725d6960d 100644
--- a/third_party/skia/gm/gpu_blur_utils.cpp
+++ b/third_party/skia/gm/gpu_blur_utils.cpp
@@ -388,7 +388,7 @@ static DrawResult do_very_large_blur_gm(GrRecordingContext* rContext,
     int x = 10;
     int y = 10;
     for (auto blurDirs : {0b01, 0b10, 0b11}) {
-        for (int t = 0; t <= static_cast<int>(SkTileMode::kLastTileMode); ++t) {
+        for (int t = 0; t < kSkTileModeCount; ++t) {
             auto tm = static_cast<SkTileMode>(t);
             auto dstB = srcB.makeOutset(30, 30);
             for (float sigma : {0.f, 5.f, 25.f, 80.f}) {
diff --git a/third_party/skia/gm/graphitestart.cpp b/third_party/skia/gm/graphitestart.cpp
index 60b9918c79b3a..b14bc1abc9735 100644
--- a/third_party/skia/gm/graphitestart.cpp
+++ b/third_party/skia/gm/graphitestart.cpp
@@ -7,7 +7,53 @@
 
 #include "gm/gm.h"
 #include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
 #include "include/core/SkPaint.h"
+#include "include/effects/SkGradientShader.h"
+#include "tools/Resources.h"
+
+namespace {
+
+sk_sp<SkShader> create_gradient_shader(SkRect r) {
+    // TODO: it seems like only the x-component of sk_FragCoord is making it to the shader!
+    SkPoint pts[2] = { {r.fLeft, r.fTop}, {r.fRight, r.fTop} };
+    SkColor colors[] = { SK_ColorRED, SK_ColorGREEN, SK_ColorBLUE };
+    float offsets[] = { 0.0f, 0.75f, 1.0f };
+
+    return SkGradientShader::MakeLinear(pts, colors, offsets, SK_ARRAY_COUNT(colors),
+                                        SkTileMode::kClamp);
+}
+
+sk_sp<SkShader> create_image_shader() {
+    SkImageInfo ii = SkImageInfo::Make(100, 100, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+    SkBitmap bitmap;
+
+    bitmap.allocPixels(ii);
+    bitmap.eraseColor(SK_ColorWHITE);
+
+    SkCanvas canvas(bitmap);
+
+    SkPaint redPaint;
+    redPaint.setColor(SK_ColorRED);
+    canvas.drawCircle(50, 50, 50, redPaint);
+
+    bitmap.setAlphaType(kOpaque_SkAlphaType);
+    bitmap.setImmutable();
+
+    sk_sp<SkImage> img = SkImage::MakeFromBitmap(bitmap);
+    // TODO: we'll need a 'makeTextureImage' call here
+
+    return img->makeShader(SkTileMode::kRepeat, SkTileMode::kRepeat, SkSamplingOptions());
+}
+
+sk_sp<SkShader> create_blend_shader(SkBlendMode bm) {
+    constexpr SkColor4f kTransYellow = {1.0f, 1.0f, 0.0f, 0.5f};
+
+    sk_sp<SkShader> solid = SkShaders::Color(kTransYellow, nullptr);
+    return SkShaders::Blend(bm, std::move(solid), create_image_shader());
+}
+
+} // anonymous namespace
 
 namespace skiagm {
 
@@ -16,6 +62,7 @@ class GraphiteStartGM : public GM {
 public:
     GraphiteStartGM() {
         this->setBGColor(0xFFCCCCCC);
+        GetResourceAsBitmap("images/color_wheel.gif", &fBitmap);
     }
 
 protected:
@@ -24,20 +71,46 @@ class GraphiteStartGM : public GM {
     }
 
     SkISize onISize() override {
-        return SkISize::Make(256, 256);
+        return SkISize::Make(256, 384);
     }
 
     void onDraw(SkCanvas* canvas) override {
-        SkPaint p1, p2, p3;
 
-        p1.setColor(SK_ColorRED);
-        p2.setColor(SK_ColorGREEN);
-        p3.setColor(SK_ColorBLUE);
+        // UL corner
+        {
+            SkPaint p;
+            p.setColor(SK_ColorRED);
+            canvas->drawRect({2, 2, 127, 127}, p);
+        }
+
+        // UR corner
+        {
+            SkRect r{129, 2, 255, 127};
+            SkPaint p;
+            p.setShader(create_gradient_shader(r));
+            canvas->drawRect(r, p);
+        }
 
-        canvas->drawRect({10, 10, 100, 100}, p1);
-        canvas->drawRect({50, 50, 150, 150}, p2);
-        canvas->drawRect({100, 100, 200, 200}, p3);
+        // LL corner
+        {
+            SkPaint p;
+            p.setShader(create_image_shader());
+            canvas->drawRect({2, 129, 127, 255}, p);
+        }
+
+        // LR corner
+        {
+            SkPaint p;
+            p.setShader(create_blend_shader(SkBlendMode::kDstOver));
+            canvas->drawRect({129, 129, 255, 255}, p);
+        }
+#ifdef SK_GRAPHITE_ENABLED
+        // TODO: failing serialize test on Linux, not sure what's going on
+        canvas->writePixels(fBitmap, 0, 256);
+#endif
     }
+
+    SkBitmap fBitmap;
 };
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/third_party/skia/gm/image.cpp b/third_party/skia/gm/image.cpp
index 281f99d422a8a..51b5c54744c13 100644
--- a/third_party/skia/gm/image.cpp
+++ b/third_party/skia/gm/image.cpp
@@ -29,6 +29,7 @@
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
+#include "include/effects/SkGradientShader.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/private/SkMalloc.h"
 #include "src/core/SkAutoPixmapStorage.h"
@@ -459,3 +460,39 @@ DEF_SIMPLE_GM_CAN_FAIL(image_subset, canvas, errorMsg, 440, 220) {
     canvas->drawImage(sub, 220+110, 10);
     return skiagm::DrawResult::kOk;
 }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+DEF_SIMPLE_GM(image_dither, canvas, 800, 800) {
+    // Make a low-res image of a gradient that shows banding if there's no dithering. When up-scaled
+    // bilerp filtering will emphasize the banding unless the image is drawn with dithering.
+    auto gradImage = []() -> sk_sp<SkImage> {
+        SkImageInfo gradImageInfo = SkImageInfo::Make({8, 16}, {SkColorType::kRGBA_8888_SkColorType,
+                                                                SkAlphaType::kPremul_SkAlphaType,
+                                                                nullptr});
+        auto surface = SkSurface::MakeRaster(gradImageInfo);
+
+        SkPoint pts[2] = {{0.f, 0.f},
+                          {(float) 2 * gradImageInfo.width(), (float) gradImageInfo.height()}};
+        const SkColor colors[] = { 0xFF555555, 0xFF444444 };
+        SkPaint p;
+        p.setShader(SkGradientShader::MakeLinear(pts, colors, nullptr, 2, SkTileMode::kClamp));
+        surface->getCanvas()->drawPaint(p);
+        return surface->makeImageSnapshot();
+    }();
+
+    SkRect imageBounds = SkRect::MakeIWH(gradImage->width(), gradImage->height());
+
+    canvas->scale(50, 50);
+
+    // 1st image definitely goes through general shader paths so should have dithering
+    SkPaint p;
+    p.setShader(gradImage->makeShader(SkSamplingOptions{SkFilterMode::kLinear}));
+    p.setDither(true);
+    canvas->drawRect(imageBounds, p);
+
+    // 2nd image goes through draw-image fast paths, but dithering should be detected
+    p.setShader(nullptr);
+    canvas->translate(imageBounds.width(), 0.f);
+    canvas->drawImage(gradImage, 0.f, 0.f, SkSamplingOptions{SkFilterMode::kLinear}, &p);
+}
diff --git a/third_party/skia/gm/inversepaths.cpp b/third_party/skia/gm/inversepaths.cpp
index 2cf1e83c723af..b87b612f9b651 100644
--- a/third_party/skia/gm/inversepaths.cpp
+++ b/third_party/skia/gm/inversepaths.cpp
@@ -7,6 +7,7 @@
 
 #include "gm/gm.h"
 #include "include/core/SkCanvas.h"
+#include "include/core/SkMaskFilter.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkPathEffect.h"
@@ -15,6 +16,7 @@
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 #include "include/effects/SkDashPathEffect.h"
+#include "include/effects/SkImageFilters.h"
 
 #include <utility>
 
@@ -135,3 +137,64 @@ DEF_SIMPLE_GM(inverse_paths, canvas, 800, 1200) {
         }
     }
 }
+
+DEF_SIMPLE_GM(inverse_fill_filters, canvas, 384, 128) {
+    auto draw = [canvas](const SkPaint& paint) {
+        SkPath path = SkPath::Circle(65.f, 65.f, 30.f);
+        path.setFillType(SkPathFillType::kInverseWinding);
+
+        canvas->save();
+        canvas->clipRect({0, 0, 128, 128});
+        canvas->drawPath(path, paint);
+        canvas->restore();
+
+        SkPaint stroke;
+        stroke.setStyle(SkPaint::kStroke_Style);
+        stroke.setColor(SK_ColorWHITE);
+        canvas->drawRect({0, 0, 128, 128}, stroke);
+    };
+
+    SkPaint paint;
+    paint.setAntiAlias(true);
+
+    draw(paint);
+
+    canvas->translate(128, 0);
+    paint.setImageFilter(SkImageFilters::Blur(5.f, 5.f, nullptr));
+    draw(paint);
+
+    canvas->translate(128, 0);
+    paint.setImageFilter(nullptr);
+    paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 5));
+    draw(paint);
+}
+
+DEF_SIMPLE_GM(inverse_windingmode_filters, canvas, 256, 100) {
+    SkPath path;
+    path.addRect({10, 10, 30, 30}, SkPathDirection::kCW);
+    path.addRect({20, 20, 40, 40}, SkPathDirection::kCW);
+    path.addRect({10, 60, 30, 80}, SkPathDirection::kCW);
+    path.addRect({20, 70, 40, 90}, SkPathDirection::kCCW);
+    SkPaint strokePaint;
+    strokePaint.setStyle(SkPaint::kStroke_Style);
+    SkRect clipRect = {0, 0, 51, 99};
+    canvas->drawPath(path, strokePaint);
+    SkPaint fillPaint;
+    fillPaint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, 1.0f));
+    for (auto fillType : { SkPathFillType::kWinding,
+                           SkPathFillType::kEvenOdd,
+                           SkPathFillType::kInverseWinding,
+                           SkPathFillType::kInverseEvenOdd } ) {
+        canvas->translate(51, 0);
+        canvas->save();
+        canvas->clipRect(clipRect);
+        path.setFillType(fillType);
+        canvas->drawPath(path, fillPaint);
+        canvas->restore();
+        SkPaint clipPaint;
+        clipPaint.setColor(SK_ColorRED);
+        clipPaint.setStyle(SkPaint::kStroke_Style);
+        clipPaint.setStrokeWidth(1.f);
+        canvas->drawRect(clipRect, clipPaint);
+    }
+}
diff --git a/third_party/skia/gm/orientation.cpp b/third_party/skia/gm/orientation.cpp
index 2b49a83310b25..7263726567835 100644
--- a/third_party/skia/gm/orientation.cpp
+++ b/third_party/skia/gm/orientation.cpp
@@ -125,7 +125,7 @@ static void make_images() {
 // EXIF tag for that image's jpg file.
 static void draw(SkCanvas* canvas, const char* suffix) {
     // Avoid unused function warning.
-    if (0) {
+    if ((false)) {
         make_images();
     }
     canvas->save();
diff --git a/third_party/skia/gm/palette.cpp b/third_party/skia/gm/palette.cpp
new file mode 100644
index 0000000000000..7d74d892a20b7
--- /dev/null
+++ b/third_party/skia/gm/palette.cpp
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2022 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkFontMetrics.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypeface.h"
+#include "include/core/SkTypes.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
+
+#include <string.h>
+
+namespace skiagm {
+
+namespace {
+const char kColrCpalTestFontPath[] = "fonts/more_samples-glyf_colr_1.ttf";
+
+constexpr SkFontArguments::Palette::Override kColorOverridesAll[] = {
+        // A gradient of dark to light purple for the circle palette test glyph.
+        // Randomly ordered with `shuf`.
+        // Add a repeat (later overrides override earlier overrides).
+        // Add three out of bounds entries (font has 12 palette entries).
+        { 6, 0xffffff00},
+        { 2, 0xff76078f},
+        { 4, 0xffb404c4},
+        { 1, 0xff510970},
+        { 6, 0xfffa00ff},
+        { 8, 0xff888888},
+        {10, 0xff888888},
+        { 9, 0xff888888},
+        { 7, 0xff888888},
+        {11, 0xff888888},
+        { 0, 0xff310b55},
+        { 3, 0xff9606aa},
+        { 5, 0xffd802e2},
+        {13, 0xff00ffff},
+        {12, 0xff00ffff},
+        {-1, 0xff00ff00},
+};
+
+constexpr SkFontArguments::Palette::Override kColorOverridesOne[] = {
+        {2, 0xff02dfe2},
+};
+
+constexpr SkFontArguments::Palette kLightPaletteOverride{2, nullptr, 0};
+constexpr SkFontArguments::Palette kDarkPaletteOverride{1, nullptr, 0};
+constexpr SkFontArguments::Palette kOnePaletteOverride{
+        0, kColorOverridesOne, SK_ARRAY_COUNT(kColorOverridesOne)};
+constexpr SkFontArguments::Palette kAllPaletteOverride{
+        0, kColorOverridesAll, SK_ARRAY_COUNT(kColorOverridesAll)};
+
+constexpr uint16_t kTestGlyphs[] = {56, 57};
+
+}  // namespace
+
+class FontPaletteGM : public GM {
+public:
+    FontPaletteGM(const char* test_name,
+                  const SkFontArguments::Palette& paletteOverride)
+            : fName(test_name), fPalette(paletteOverride) {}
+
+protected:
+    sk_sp<SkTypeface> fTypefaceDefault;
+    sk_sp<SkTypeface> fTypefaceFromStream;
+    sk_sp<SkTypeface> fTypefaceCloned;
+
+    void onOnceBeforeDraw() override {
+        SkFontArguments paletteArguments;
+        paletteArguments.setPalette(fPalette);
+
+        fTypefaceDefault = MakeResourceAsTypeface(kColrCpalTestFontPath);
+        fTypefaceCloned =
+                fTypefaceDefault ? fTypefaceDefault->makeClone(paletteArguments) : nullptr;
+
+        fTypefaceFromStream = SkFontMgr::RefDefault()->makeFromStream(
+                GetResourceAsStream(kColrCpalTestFontPath), paletteArguments);
+    }
+
+    SkString onShortName() override {
+        SkString gm_name = SkStringPrintf("font_palette_%s", fName.c_str());
+        return gm_name;
+    }
+
+    SkISize onISize() override { return SkISize::Make(1000, 400); }
+
+    DrawResult onDraw(SkCanvas* canvas, SkString* errorMsg) override {
+        canvas->drawColor(SK_ColorWHITE);
+        SkPaint paint;
+
+        canvas->translate(10, 20);
+
+        if (!fTypefaceCloned || !fTypefaceFromStream) {
+            *errorMsg = "Did not recognize COLR v1 test font format.";
+            return DrawResult::kSkip;
+        }
+
+        SkFontMetrics metrics;
+        SkScalar y = 0;
+        SkScalar textSize = 200;
+        for (auto& typeface : { fTypefaceFromStream, fTypefaceCloned} ) {
+            SkFont defaultFont(fTypefaceDefault);
+            SkFont paletteFont(typeface);
+            defaultFont.setSize(textSize);
+            paletteFont.setSize(textSize);
+
+            defaultFont.getMetrics(&metrics);
+            y += -metrics.fAscent;
+            // Set a recognizable foreground color which is not to be overriden.
+            paint.setColor(SK_ColorGRAY);
+            // Draw the default palette on the left, for COLRv0 and COLRv1.
+            canvas->drawSimpleText(kTestGlyphs,
+                                   SK_ARRAY_COUNT(kTestGlyphs) * sizeof(uint16_t),
+                                   SkTextEncoding::kGlyphID,
+                                   0,
+                                   y,
+                                   defaultFont,
+                                   paint);
+            // Draw the overriden palette on the right.
+            canvas->drawSimpleText(kTestGlyphs,
+                                   SK_ARRAY_COUNT(kTestGlyphs) * sizeof(uint16_t),
+                                   SkTextEncoding::kGlyphID,
+                                   440,
+                                   y,
+                                   paletteFont,
+                                   paint);
+            y += metrics.fDescent + metrics.fLeading;
+        }
+        return DrawResult::kOk;
+    }
+
+private:
+    using INHERITED = GM;
+    SkString fName;
+    SkFontArguments::Palette fPalette;
+};
+
+DEF_GM(return new FontPaletteGM("default", SkFontArguments::Palette()));
+DEF_GM(return new FontPaletteGM("light", kLightPaletteOverride));
+DEF_GM(return new FontPaletteGM("dark", kDarkPaletteOverride));
+DEF_GM(return new FontPaletteGM("one", kOnePaletteOverride));
+DEF_GM(return new FontPaletteGM("all", kAllPaletteOverride));
+
+}  // namespace skiagm
diff --git a/third_party/skia/gm/pictureshader.cpp b/third_party/skia/gm/pictureshader.cpp
index e991763248a54..13b598b1db4ea 100644
--- a/third_party/skia/gm/pictureshader.cpp
+++ b/third_party/skia/gm/pictureshader.cpp
@@ -20,6 +20,7 @@
 #include "include/core/SkShader.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
+#include "include/core/SkTextBlob.h"
 #include "include/core/SkTileMode.h"
 #include "include/core/SkTypes.h"
 #include "tools/ToolUtils.h"
@@ -236,3 +237,74 @@ DEF_SIMPLE_GM(tiled_picture_shader, canvas, 400, 400) {
                                     SkFilterMode::kNearest));
     canvas->drawPaint(p);
 }
+
+DEF_SIMPLE_GM(pictureshader_persp, canvas, 215, 110) {
+    enum class DrawStrategy {
+        kDirect,
+        kPictureShader,
+    };
+
+    auto drawPicture = [](SkCanvas* canvas, sk_sp<SkPicture> picture, DrawStrategy strategy) {
+        // Only want local upper 50x50 of 'picture' before we apply decal (or clip)
+        SkRect bounds = {0.f, 0.f, 50.f, 50.f};
+        switch(strategy) {
+            case DrawStrategy::kDirect: {
+                canvas->clipRect(bounds, true);
+                canvas->drawPicture(picture);
+                break; }
+            case DrawStrategy::kPictureShader: {
+                SkPaint paint;
+                paint.setShader(picture->makeShader(SkTileMode::kDecal, SkTileMode::kDecal,
+                                                    SkFilterMode::kLinear, nullptr, &bounds));
+                canvas->drawRect({0.f, 0.f, 50.f, 50.f}, paint);
+                break; }
+        }
+    };
+
+    auto picture = []() {
+        sk_sp<SkTypeface> typeface = SkTypeface::MakeDefault();
+        if (!typeface) {
+            typeface = SkTypeface::MakeFromName("monospace", SkFontStyle());
+        }
+        SkFont font;
+        font.setTypeface(typeface);
+        font.setHinting(SkFontHinting::kNormal);
+        font.setSize(8.f);
+
+        SkPaint paint;
+        paint.setColor(SK_ColorGREEN);
+        SkPictureRecorder recorder;
+        SkCanvas* record_canvas = recorder.beginRecording({0, 0, 100, 100});
+        record_canvas->drawTextBlob(SkTextBlob::MakeFromString("Hamburgefons", font),
+                                    0, 16.f, paint);
+        return recorder.finishRecordingAsPicture();
+    }();
+
+    SkM44 m;
+    m.preScale(2.f, 2.f);
+    SkM44 persp = SkM44::Perspective(0.01f, 10.f, SK_ScalarPI / 3.f);
+    persp.preTranslate(0.f, 5.f, -0.1f);
+    persp.preConcat(SkM44::Rotate({0.f, 1.f, 0.f}, 0.008f));
+    m.postConcat(persp);
+
+    canvas->clear(SK_ColorBLACK);
+    canvas->translate(5.f, 5.f);
+    for (auto strategy : { DrawStrategy::kDirect,
+                           DrawStrategy::kPictureShader }) {
+        canvas->save();
+
+        SkPaint outline;
+        outline.setColor(SK_ColorWHITE);
+        outline.setStyle(SkPaint::kStroke_Style);
+        outline.setStrokeWidth(1.f);
+        canvas->drawRect({-1, -1, 101, 101}, outline);
+
+        canvas->clipRect({0, 0, 100, 100});
+        canvas->concat(m);
+
+        drawPicture(canvas, picture, strategy);
+        canvas->restore();
+
+        canvas->translate(105.f, 0.f);
+    }
+}
diff --git a/third_party/skia/gm/runtimefunctions.cpp b/third_party/skia/gm/runtimefunctions.cpp
index 81588640042c1..0b9f7f544865d 100644
--- a/third_party/skia/gm/runtimefunctions.cpp
+++ b/third_party/skia/gm/runtimefunctions.cpp
@@ -48,7 +48,7 @@ class RuntimeFunctions : public skiagm::GM {
 
         SkColor4f inputColor = { 1, 0, 0, 1 };
         auto shader = gEffect->makeShader(SkData::MakeWithCopy(&inputColor, sizeof(inputColor)),
-                                          nullptr, 0, &localM, true);
+                                          nullptr, 0, &localM);
         SkPaint p;
         p.setShader(std::move(shader));
         canvas->drawRect({0, 0, 256, 256}, p);
diff --git a/third_party/skia/gm/runtimeimagefilter.cpp b/third_party/skia/gm/runtimeimagefilter.cpp
index 75522b394fdba..e0166ae458421 100644
--- a/third_party/skia/gm/runtimeimagefilter.cpp
+++ b/third_party/skia/gm/runtimeimagefilter.cpp
@@ -20,6 +20,7 @@
 #include "include/effects/SkRuntimeEffect.h"
 #include "include/utils/SkRandom.h"
 #include "src/effects/imagefilters/SkRuntimeImageFilter.h"
+#include "tools/Resources.h"
 #include "tools/ToolUtils.h"
 
 static sk_sp<SkImageFilter> make_filter() {
@@ -70,3 +71,35 @@ DEF_SIMPLE_GM_BG(rtif_distort, canvas, 500, 750, SK_ColorBLACK) {
     p.setPerspY(-0.0015f);
     draw_layer(250, 500, p);
 }
+
+DEF_SIMPLE_GM(rtif_unsharp, canvas, 512, 256) {
+    // Similar to "unsharp_rt", which does the entire unsharp filter in a single shader. This uses
+    // the image filter DAG to compute the blurred version, then does the weighted subtraction.
+    sk_sp<SkRuntimeEffect> effect = SkRuntimeEffect::MakeForShader(SkString(R"(
+        uniform shader content;
+        uniform shader blurred;
+        vec4 main(vec2 coord) {
+            vec4 c = content.eval(coord);
+            vec4 b = blurred.eval(coord);
+            return c + (c - b) * 4;
+        }
+    )")).effect;
+    SkRuntimeShaderBuilder builder(std::move(effect));
+
+    auto image = GetResourceAsImage("images/mandrill_256.png");
+    auto blurredSrc = SkImageFilters::Blur(1, 1, /*input=*/nullptr);
+
+    const char* childNames[] = { "content", "blurred" };
+    sk_sp<SkImageFilter> childNodes[] = { nullptr, blurredSrc };
+
+    auto sharpened = SkImageFilters::RuntimeShader(builder, childNames, childNodes, 2);
+
+    canvas->drawImage(image, 0, 0);
+    canvas->translate(256, 0);
+
+    SkPaint paint;
+    paint.setImageFilter(sharpened);
+    canvas->saveLayer({ 0, 0, 256, 256 }, &paint);
+    canvas->drawImage(image, 0, 0);
+    canvas->restore();
+}
diff --git a/third_party/skia/gm/runtimeintrinsics.cpp b/third_party/skia/gm/runtimeintrinsics.cpp
index 6819247bb8f5c..183da789fa9b0 100644
--- a/third_party/skia/gm/runtimeintrinsics.cpp
+++ b/third_party/skia/gm/runtimeintrinsics.cpp
@@ -139,9 +139,8 @@ static void plot(SkCanvas* canvas,
     builder.uniform("yScale") = 1.0f  / (yMax - yMin);
     builder.uniform("yBias")  = -yMin / (yMax - yMin);
 
-    SkBitmap bitmap = draw_shader(canvas,
-                                  builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false),
-                                  /*allowRasterFallback=*/!requireES3);
+    SkBitmap bitmap =
+            draw_shader(canvas, builder.makeShader(), /*allowRasterFallback=*/!requireES3);
     if (!bitmap.empty()) {
         // Plot.
         SkPaint plotPaint({ 0.0f, 0.5f, 0.0f, 1.0f });
@@ -463,7 +462,7 @@ static void plot_matrix_comp_mult(SkCanvas* canvas,
     builder.uniform("m1") = mtx1;
     builder.uniform("m2") = mtx2;
 
-    draw_shader(canvas, builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false));
+    draw_shader(canvas, builder.makeShader());
 
     canvas->restore();
     next_column(canvas);
@@ -501,7 +500,7 @@ static void plot_matrix_inverse(SkCanvas* canvas, std::array<float, N*N> mtx, co
     builder.uniform("bias")  = 0.5f;
     builder.uniform("m")     = mtx;
 
-    draw_shader(canvas, builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false));
+    draw_shader(canvas, builder.makeShader());
 
     canvas->restore();
     next_column(canvas);
@@ -588,12 +587,7 @@ static void plot_bvec(SkCanvas* canvas, const char* fn, const char* label) {
     T uniformData[2] = { -2, -2 };
     sk_sp<SkData> uniforms = SkData::MakeWithCopy(uniformData, sizeof(uniformData));
 
-    draw_shader(canvas,
-                effect->makeShader(uniforms,
-                                   /*children=*/nullptr,
-                                   /*childCount=*/0,
-                                   /*localMatrix=*/nullptr,
-                                   /*isOpaque=*/false));
+    draw_shader(canvas, effect->makeShader(uniforms, /*children=*/{}));
 
     canvas->restore();
     next_column(canvas);
diff --git a/third_party/skia/gm/runtimeshader.cpp b/third_party/skia/gm/runtimeshader.cpp
index bc60222412ee0..94b3e0d4c2278 100644
--- a/third_party/skia/gm/runtimeshader.cpp
+++ b/third_party/skia/gm/runtimeshader.cpp
@@ -17,6 +17,7 @@
 #include "include/effects/SkImageFilters.h"
 #include "include/effects/SkRuntimeEffect.h"
 #include "include/utils/SkRandom.h"
+#include "src/core/SkColorSpacePriv.h"
 #include "tools/Resources.h"
 
 enum RT_Flags {
@@ -77,7 +78,7 @@ class SimpleRT : public RuntimeShaderGM {
         builder.uniform("gColor") = SkColor4f{1, 0, 0, 1};
 
         SkPaint p;
-        p.setShader(builder.makeShader(&localM, true));
+        p.setShader(builder.makeShader(&localM));
         canvas->drawRect({0, 0, 256, 256}, p);
     }
 };
@@ -167,7 +168,7 @@ class ThresholdRT : public RuntimeShaderGM {
         builder.child("threshold_map") = fThreshold;
 
         SkPaint paint;
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
         canvas->drawRect({0, 0, 256, 256}, paint);
 
         auto draw = [&](SkScalar x, SkScalar y, sk_sp<SkShader> shader) {
@@ -213,7 +214,7 @@ class SpiralRT : public RuntimeShaderGM {
         builder.uniform("in_colors1") = SkColors::kGreen;
 
         SkPaint paint;
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
         canvas->drawRect({0, 0, 512, 512}, paint);
     }
 };
@@ -254,7 +255,7 @@ class UnsharpRT : public RuntimeShaderGM {
         builder.child("child") = fMandrill->makeShader(sampling);
 
         SkPaint paint;
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
         canvas->translate(256, 0);
         canvas->drawRect({ 0, 0, 256, 256 }, paint);
     }
@@ -330,13 +331,13 @@ class ColorCubeRT : public RuntimeShaderGM {
 
         // Now draw the image with an identity color cube - it should look like the original
         builder.child("color_cube") = fIdentityCube->makeShader(sampling, normalize);
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
         canvas->translate(256, 0);
         canvas->drawRect({ 0, 0, 256, 256 }, paint);
 
         // ... and with a sepia-tone color cube. This should match the sepia-toned image.
         builder.child("color_cube") = fSepiaCube->makeShader(sampling, normalize);
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
         canvas->translate(0, 256);
         canvas->drawRect({ 0, 0, 256, 256 }, paint);
     }
@@ -446,13 +447,13 @@ class DefaultColorRT : public RuntimeShaderGM {
         // First, we leave the child as null, so sampling it returns the default (paint) color
         SkPaint paint;
         paint.setColor4f({ 0.25f, 0.75f, 0.75f, 1.0f });
-        paint.setShader(builder.makeShader(nullptr, false));
+        paint.setShader(builder.makeShader());
         canvas->drawRect({ 0, 0, 256, 256 }, paint);
 
         // Now we bind an image shader as the child. This (by convention) scales by the paint alpha
         builder.child("child") = fMandrill->makeShader(SkSamplingOptions());
         paint.setColor4f({ 1.0f, 1.0f, 1.0f, 0.5f });
-        paint.setShader(builder.makeShader(nullptr, false));
+        paint.setShader(builder.makeShader());
         canvas->translate(256, 0);
         canvas->drawRect({ 0, 0, 256, 256 }, paint);
 
@@ -542,7 +543,7 @@ class ClipSuperRRect : public RuntimeShaderGM {
         SkMatrix cornerToLocal;
         cornerToLocal.setScaleTranslate(cornerWidth, cornerHeight, superRRect.centerX(),
                                         superRRect.centerY());
-        canvas->clipShader(builder.makeShader(&cornerToLocal, false));
+        canvas->clipShader(builder.makeShader(&cornerToLocal));
 
         // Bloat the outer edges of the rect we will draw so it contains all the antialiased pixels.
         // Bloat by a full pixel instead of half in case Skia is in a mode that draws this rect with
@@ -620,6 +621,60 @@ DEF_GM(return new ClipSuperRRect("clip_super_rrect_pow3.5", 3.5);)
 // DEF_GM(return new ClipSuperRRect("clip_super_rrect_pow4.5", 4.5);)
 // DEF_GM(return new ClipSuperRRect("clip_super_rrect_pow5", 5);)
 
+class LinearGradientRT : public RuntimeShaderGM {
+public:
+    LinearGradientRT() : RuntimeShaderGM("linear_gradient_rt", {256 + 10, 128 + 15}, R"(
+        layout(color) uniform vec4 in_colors0;
+        layout(color) uniform vec4 in_colors1;
+
+        vec4 main(vec2 p) {
+            float t = p.x / 256;
+            if (p.y < 32) {
+                return mix(in_colors0, in_colors1, t);
+            } else {
+                vec3 linColor0 = toLinearSrgb(in_colors0.rgb);
+                vec3 linColor1 = toLinearSrgb(in_colors1.rgb);
+                vec3 linColor = mix(linColor0, linColor1, t);
+                return fromLinearSrgb(linColor).rgb1;
+            }
+        }
+    )") {}
+
+    void onDraw(SkCanvas* canvas) override {
+        // Colors chosen to use values other than 0 and 1 - so that it's obvious if the conversion
+        // intrinsics are doing anything. (Most transfer functions map 0 -> 0 and 1 -> 1).
+        SkRuntimeShaderBuilder builder(fEffect);
+        builder.uniform("in_colors0") = SkColor4f{0.75f, 0.25f, 0.0f, 1.0f};
+        builder.uniform("in_colors1") = SkColor4f{0.0f, 0.75f, 0.25f, 1.0f};
+        SkPaint paint;
+        paint.setShader(builder.makeShader());
+
+        canvas->save();
+        canvas->clear(SK_ColorWHITE);
+        canvas->translate(5, 5);
+
+        // We draw everything twice. First to a surface with no color management, where the
+        // intrinsics should do nothing (eg, the top bar should look the same in the top and bottom
+        // halves). Then to an sRGB surface, where they should produce linearly interpolated
+        // gradients (the bottom half of the second bar should be brighter than the top half).
+        for (auto cs : {static_cast<SkColorSpace*>(nullptr), sk_srgb_singleton()}) {
+            SkImageInfo info = SkImageInfo::Make(
+                    256, 64, kN32_SkColorType, kPremul_SkAlphaType, sk_ref_sp(cs));
+            auto surface = canvas->makeSurface(info);
+            if (!surface) {
+                surface = SkSurface::MakeRaster(info);
+            }
+
+            surface->getCanvas()->drawRect({0, 0, 256, 64}, paint);
+            canvas->drawImage(surface->makeImageSnapshot(), 0, 0);
+            canvas->translate(0, 64 + 5);
+        }
+
+        canvas->restore();
+    }
+};
+DEF_GM(return new LinearGradientRT;)
+
 DEF_SIMPLE_GM(child_sampling_rt, canvas, 256,256) {
     static constexpr char scale[] =
         "uniform shader child;"
@@ -639,7 +694,7 @@ DEF_SIMPLE_GM(child_sampling_rt, canvas, 256,256) {
 
     SkRuntimeShaderBuilder builder(SkRuntimeEffect::MakeForShader(SkString(scale)).effect);
     builder.child("child") = shader;
-    p.setShader(builder.makeShader(nullptr, false));
+    p.setShader(builder.makeShader());
 
     canvas->drawPaint(p);
 }
@@ -655,7 +710,7 @@ static sk_sp<SkShader> normal_map_shader() {
         }
     )";
     auto effect = SkRuntimeEffect::MakeForShader(SkString(kSrc)).effect;
-    return effect->makeShader(nullptr, {}, nullptr, true);
+    return effect->makeShader(nullptr, {});
 }
 
 static sk_sp<SkImage> normal_map_image() {
@@ -700,7 +755,7 @@ static sk_sp<SkShader> normal_map_raw_unpremul_image_shader() {
 }
 
 static sk_sp<SkShader> lit_shader(sk_sp<SkShader> normals) {
-    // Simple N.L against a fixed, directional light:
+    // Simple N-dot-L against a fixed, directional light:
     static const char* kSrc = R"(
         uniform shader normals;
         half4 main(vec2 p) {
@@ -710,7 +765,21 @@ static sk_sp<SkShader> lit_shader(sk_sp<SkShader> normals) {
         }
     )";
     auto effect = SkRuntimeEffect::MakeForShader(SkString(kSrc)).effect;
-    return effect->makeShader(nullptr, &normals, 1, nullptr, true);
+    return effect->makeShader(nullptr, &normals, 1);
+}
+
+static sk_sp<SkShader> lit_shader_linear(sk_sp<SkShader> normals) {
+    // Simple N-dot-L against a fixed, directional light, done in linear space:
+    static const char* kSrc = R"(
+        uniform shader normals;
+        half4 main(vec2 p) {
+            vec3 n = normalize(normals.eval(p).xyz * 2 - 1);
+            vec3 l = normalize(vec3(1, -1, 1));
+            return fromLinearSrgb(saturate(dot(n, l)).xxx).xxx1;
+        }
+    )";
+    auto effect = SkRuntimeEffect::MakeForShader(SkString(kSrc)).effect;
+    return effect->makeShader(nullptr, &normals, 1);
 }
 
 DEF_SIMPLE_GM(paint_alpha_normals_rt, canvas, 512,512) {
@@ -789,3 +858,34 @@ DEF_SIMPLE_GM(raw_image_shader_normals_rt, canvas, 768, 512) {
     draw_shader(512, 0, lit_shader(normal_map_unpremul_image_shader()), canvas);
     draw_shader(512, 256, lit_shader(normal_map_raw_unpremul_image_shader()), canvas);
 }
+
+DEF_SIMPLE_GM(lit_shader_linear_rt, canvas, 512, 256) {
+    // First, make an offscreen surface, so we can control the destination color space:
+    auto surfInfo = SkImageInfo::Make(512, 256,
+                                      kN32_SkColorType,
+                                      kPremul_SkAlphaType,
+                                      SkColorSpace::MakeSRGB());
+    auto surface = canvas->makeSurface(surfInfo);
+    if (!surface) {
+        surface = SkSurface::MakeRaster(surfInfo);
+    }
+
+    auto draw_shader = [](int x, int y, sk_sp<SkShader> shader, SkCanvas* canvas) {
+        SkPaint p;
+        p.setShader(shader);
+
+        canvas->save();
+        canvas->translate(x, y);
+        canvas->clipRect({0, 0, 256, 256});
+        canvas->drawPaint(p);
+        canvas->restore();
+    };
+
+    // We draw two lit spheres - one does math in the working space (so gamma-encoded). The second
+    // works in linear space, then converts to sRGB. This produces (more accurate) sharp falloff:
+    draw_shader(0, 0, lit_shader(normal_map_shader()), surface->getCanvas());
+    draw_shader(256, 0, lit_shader_linear(normal_map_shader()), surface->getCanvas());
+
+    // Now draw the offscreen surface back to our original canvas:
+    canvas->drawImage(surface->makeImageSnapshot(), 0, 0);
+}
diff --git a/third_party/skia/gm/slug.cpp b/third_party/skia/gm/slug.cpp
index 441af520a46bd..ec306d1c69b74 100644
--- a/third_party/skia/gm/slug.cpp
+++ b/third_party/skia/gm/slug.cpp
@@ -25,7 +25,7 @@
 #include "include/private/chromium/GrSlug.h"
 #include "tools/ToolUtils.h"
 
-#if SK_SUPPORT_GPU && defined(SK_EXPERIMENTAL_ADD_ATLAS_PADDING)
+#if SK_SUPPORT_GPU && defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG)
 class SlugGM : public skiagm::GM {
 public:
     SlugGM(const char* txt)
diff --git a/third_party/skia/gm/swizzle.cpp b/third_party/skia/gm/swizzle.cpp
index a554c3ccb69fa..972e56e8d3870 100644
--- a/third_party/skia/gm/swizzle.cpp
+++ b/third_party/skia/gm/swizzle.cpp
@@ -32,7 +32,7 @@ DEF_SIMPLE_GPU_GM(swizzle, rContext, canvas, 512, 512) {
     }
     std::unique_ptr<GrFragmentProcessor> imgFP =
         GrTextureEffect::Make(std::move(view), bmp.alphaType(), SkMatrix());
-    auto fp = GrFragmentProcessor::SwizzleOutput(std::move(imgFP), GrSwizzle("grb1"));
+    auto fp = GrFragmentProcessor::SwizzleOutput(std::move(imgFP), skgpu::Swizzle("grb1"));
 
     sfc->fillWithFP(std::move(fp));
 }
diff --git a/third_party/skia/gm/tessellation.cpp b/third_party/skia/gm/tessellation.cpp
index f7a9c79eac2bb..c0e337c073c50 100644
--- a/third_party/skia/gm/tessellation.cpp
+++ b/third_party/skia/gm/tessellation.cpp
@@ -28,7 +28,7 @@
 namespace skiagm {
 
 constexpr static GrGeometryProcessor::Attribute kPositionAttrib =
-        {"position", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+        {"position", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
 
 constexpr static std::array<float, 3> kTri1[3] = {
         {20.5f,20.5f,1}, {170.5f,280.5f,4}, {320.5f,20.5f,1}};
@@ -55,13 +55,13 @@ class TessellationTestTriShader : public GrGeometryProcessor {
 public:
     TessellationTestTriShader(const SkMatrix& viewMatrix)
             : GrGeometryProcessor(kTessellationTestTriShader_ClassID), fViewMatrix(viewMatrix) {
-        this->setVertexAttributes(&kPositionAttrib, 1);
+        this->setVertexAttributesWithImplicitOffsets(&kPositionAttrib, 1);
         this->setWillUseTessellationShaders();
     }
 
 private:
     const char* name() const final { return "TessellationTestTriShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
 
     class Impl : public ProgramImpl {
     public:
@@ -77,9 +77,9 @@ class TessellationTestTriShader : public GrGeometryProcessor {
             args.fVaryingHandler->emitAttributes(args.fGeomProc.cast<TessellationTestTriShader>());
             const char* viewMatrix;
             fViewMatrixUniform = args.fUniformHandler->addUniform(
-                    nullptr, kVertex_GrShaderFlag, kFloat3x3_GrSLType, "view_matrix", &viewMatrix);
+                    nullptr, kVertex_GrShaderFlag, SkSLType::kFloat3x3, "view_matrix", &viewMatrix);
             args.fVertBuilder->declareGlobal(
-                    GrShaderVar("P_", kFloat3_GrSLType, GrShaderVar::TypeModifier::Out));
+                    GrShaderVar("P_", SkSLType::kFloat3, GrShaderVar::TypeModifier::Out));
             args.fVertBuilder->codeAppendf(R"(
             P_.xy = (%s * float3(position.xy, 1)).xy;
             P_.z = position.z;)", viewMatrix);
@@ -151,7 +151,7 @@ class TessellationTestTriShader : public GrGeometryProcessor {
 
         void writeFragmentShader(GrGLSLFPFragmentBuilder* f, const char* color,
                                  const char* coverage) {
-            f->declareGlobal(GrShaderVar("barycentric_coord", kFloat3_GrSLType,
+            f->declareGlobal(GrShaderVar("barycentric_coord", SkSLType::kFloat3,
                                          GrShaderVar::TypeModifier::In));
             f->codeAppendf(R"(
             half3 d = half3(1 - barycentric_coord/fwidth(barycentric_coord));
@@ -179,7 +179,7 @@ class TessellationTestRectShader : public GrGeometryProcessor {
 
     const char* name() const final { return "TessellationTestRectShader"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
 
 private:
     class Impl : public ProgramImpl {
@@ -195,9 +195,9 @@ class TessellationTestRectShader : public GrGeometryProcessor {
         void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
             const char* viewMatrix;
             fViewMatrixUniform = args.fUniformHandler->addUniform(
-                    nullptr, kVertex_GrShaderFlag, kFloat3x3_GrSLType, "view_matrix", &viewMatrix);
+                    nullptr, kVertex_GrShaderFlag, SkSLType::kFloat3x3, "view_matrix", &viewMatrix);
             args.fVertBuilder->declareGlobal(
-                    GrShaderVar("M_", kFloat3x3_GrSLType, GrShaderVar::TypeModifier::Out));
+                    GrShaderVar("M_", SkSLType::kFloat3x3, GrShaderVar::TypeModifier::Out));
             args.fVertBuilder->codeAppendf("M_ = %s;", viewMatrix);
             // GrGLProgramBuilder will call writeTess*ShaderGLSL when it is compiling.
             this->writeFragmentShader(args.fFragBuilder, args.fOutputColor, args.fOutputCoverage);
@@ -261,7 +261,7 @@ class TessellationTestRectShader : public GrGeometryProcessor {
 
         void writeFragmentShader(GrGLSLFPFragmentBuilder* f, const char* color,
                                  const char* coverage) {
-            f->declareGlobal(GrShaderVar("barycentric_coord", kFloat4_GrSLType,
+            f->declareGlobal(GrShaderVar("barycentric_coord", SkSLType::kFloat4,
                                          GrShaderVar::TypeModifier::In));
             f->codeAppendf(R"(
             float4 fwidths = fwidth(barycentric_coord);
diff --git a/third_party/skia/gm/verifiers/BUILD.bazel b/third_party/skia/gm/verifiers/BUILD.bazel
new file mode 100644
index 0000000000000..f22e872090645
--- /dev/null
+++ b/third_party/skia/gm/verifiers/BUILD.bazel
@@ -0,0 +1,28 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "gmverifier_hdr",
+    hdrs = ["gmverifier.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "gmverifier_src",
+    srcs = ["gmverifier.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":gmverifier_hdr",
+        "//gm:gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//src/utils:SkOSPath_hdr",
+    ],
+)
diff --git a/third_party/skia/gm/wacky_yuv_formats.cpp b/third_party/skia/gm/wacky_yuv_formats.cpp
index 2d220fbbfbe23..c753426635124 100644
--- a/third_party/skia/gm/wacky_yuv_formats.cpp
+++ b/third_party/skia/gm/wacky_yuv_formats.cpp
@@ -37,6 +37,7 @@
 #include "include/gpu/GrRecordingContext.h"
 #include "include/gpu/GrTypes.h"
 #include "include/private/GrTypesPriv.h"
+#include "include/private/SkHalf.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTDArray.h"
 #include "include/private/SkTPin.h"
diff --git a/third_party/skia/gm/xform.cpp b/third_party/skia/gm/xform.cpp
deleted file mode 100644
index 5ed89c2dac7e7..0000000000000
--- a/third_party/skia/gm/xform.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "gm/gm.h"
-
-#ifndef SK_BUILD_FOR_GOOGLE3
-
-#include "experimental/xform/SkShape.h"
-#include "experimental/xform/SkXform.h"
-
-#include "include/core/SkCanvas.h"
-#include "include/core/SkPaint.h"
-#include "tools/timer/TimeUtils.h"
-
-class XformGM : public skiagm::GM {
-    sk_sp<MatrixXF> fRoot, fRA, fRB, fA, fB;
-    sk_sp<Shape> fShape;
-
-public:
-    XformGM() {
-        fRoot = MatrixXF::Make();
-
-        fRA = MatrixXF::Make(fRoot);
-        fRB = MatrixXF::Make(fRoot);
-
-        fA = MatrixXF::Make(fRA);
-        fB = MatrixXF::Make(fRB);
-
-        fRA->setRotate(30);
-        fA->setTranslate(100, 0);
-
-        fRB->setTranslate(100, 0);
-        fB->setRotate(30);
-
-        sk_sp<GroupShape> g = GroupShape::Make();
-        g->append(GeoShape::Make(fA,  {0, 0, 100, 60}, SK_ColorRED));
-        g->append(GeoShape::Make(fB,  {0, 0, 100, 60}, SK_ColorGREEN));
-        g->append(GeoShape::Make(fRA, {0, 0, 100, 60}, SK_ColorBLUE));
-        g->append(GeoShape::Make(fRB, {0, 0, 100, 60}, SK_ColorGRAY));
-        g->append(GeoShape::Make(fRoot, {0, 0, 100, 60}, 0xFFCC8844));
-
-        sk_sp<MatrixXF> sub = MatrixXF::Make();
-        SkMatrix m;
-        m.setScale(0.5, 0.5);
-        m.postTranslate(50, 50);
-        sub->setLocalMatrix(m);
-
-        sk_sp<GroupShape> parent = GroupShape::Make();
-        parent->append(g);
-        parent->append(GroupShape::Make(sub, g));
-        fShape = parent;
-    }
-
-protected:
-    SkString onShortName() override { return SkString("exp_xform"); }
-
-    SkISize onISize() override { return SkISize::Make(520, 520); }
-
-    void onDraw(SkCanvas* canvas) override {
-        auto ctx = XContext::Make(canvas);
-
-        if (0) {
-            canvas->translate(2, 2);
-
-            SkRect rect{0, 0, 100, 60};
-            SkPaint paint; paint.setStyle(SkPaint::kStroke_Style);
-            canvas->drawRect(rect, paint);
-            canvas->save(); canvas->translate(10, 10);
-            paint.setColor(SK_ColorRED); canvas->drawRect(rect, paint); canvas->restore();
-            canvas->save(); canvas->scale(2, 2);
-            paint.setColor(SK_ColorBLUE); canvas->drawRect(rect, paint); canvas->restore();
-            canvas->save(); canvas->scale(2, 2); canvas->translate(10, 10);
-            paint.setColor(SK_ColorBLACK); canvas->drawRect(rect, paint); canvas->restore();
-            canvas->save(); canvas->translate(10, 10); canvas->scale(2, 2);
-            paint.setColor(SK_ColorBLACK); canvas->drawRect(rect, paint); canvas->restore();
-
-            auto x0 = MatrixXF::Make();
-            auto x1 = MatrixXF::Make(x0);
-            auto x2 = MatrixXF::Make(x1);
-            x1->setScale(2, 2);
-            x2->setTranslate(10, 10);
-
-            auto sh = GeoShape::Make(x2,  {0, 0, 100, 60}, 0x8800FF00);
-            sh->draw(ctx.get());
-            return;
-        }
-        fShape->draw(ctx.get());
-    }
-
-    bool onAnimate(double nanos) override {
-        float scale = 3 + sinf(TimeUtils::Scaled(1e-9 * nanos, 1, 0)) * 2;
-        fRoot->setScale(scale, scale);
-        fRA->setRotate(TimeUtils::Scaled(1e-9 * nanos, 40, 0));
-        fB->setRotate(TimeUtils::Scaled(1e-9 * nanos, 40*sqrtf(2), 0));
-        return true;
-    }
-
-private:
-    using INHERITED = skiagm::GM;
-};
-DEF_GM( return new XformGM; )
-
-#endif
diff --git a/third_party/skia/gn/BUILDCONFIG.gn b/third_party/skia/gn/BUILDCONFIG.gn
index 5f800a67cab15..8d7a76b04088a 100644
--- a/third_party/skia/gn/BUILDCONFIG.gn
+++ b/third_party/skia/gn/BUILDCONFIG.gn
@@ -59,6 +59,7 @@ is_ios = current_os == "ios" || current_os == "tvos"
 is_tvos = current_os == "tvos"
 is_linux = current_os == "linux"
 is_mac = current_os == "mac"
+is_wasm = target_os == "wasm"
 is_win = current_os == "win"
 
 # This is just to make the Dawn build files happy. Skia itself uses target_os = "linux"
@@ -81,7 +82,7 @@ if (current_cpu == "") {
   current_cpu = target_cpu
 }
 
-is_clang = is_android || is_ios || is_mac || is_fuchsia ||
+is_clang = is_android || is_ios || is_mac || is_fuchsia || is_wasm ||
            (cc == "clang" && cxx == "clang++") || clang_win != ""
 if (!is_clang && !is_win) {
   is_clang = exec_script("//gn/is_clang.py",
@@ -226,6 +227,10 @@ if (is_win) {
   set_default_toolchain("//gn/toolchain:msvc")
   default_toolchain_name = "msvc"
   host_toolchain = "msvc"
+} else if (is_wasm) {
+  set_default_toolchain("//gn/toolchain:wasm")
+  default_toolchain_name = "wasm"
+  host_toolchain = "wasm"
 } else {
   # GCC-like toolchains, including Clang.
   set_default_toolchain("//gn/toolchain:gcc_like")
diff --git a/third_party/skia/gn/core.gni b/third_party/skia/gn/core.gni
index f0318876df682..c87315afcb11d 100644
--- a/third_party/skia/gn/core.gni
+++ b/third_party/skia/gn/core.gni
@@ -24,6 +24,7 @@ skia_core_public = [
   "$_include/core/SkContourMeasure.h",
   "$_include/core/SkCoverageMode.h",
   "$_include/core/SkCubicMap.h",
+  "$_include/core/SkCustomMesh.h",
   "$_include/core/SkData.h",
   "$_include/core/SkDataTable.h",
   "$_include/core/SkDeferredDisplayList.h",
@@ -78,7 +79,6 @@ skia_core_public = [
   "$_include/core/SkSpan.h",
   "$_include/core/SkStream.h",
   "$_include/core/SkString.h",
-  "$_include/core/SkStringView.h",
   "$_include/core/SkStrokeRec.h",
   "$_include/core/SkSurface.h",
   "$_include/core/SkSurfaceCharacterization.h",
@@ -142,10 +142,12 @@ skia_core_sources = [
   "$_src/core/SkBlurMask.cpp",
   "$_src/core/SkBlurMask.h",
   "$_src/core/SkBuffer.cpp",
+  "$_src/core/SkBuiltInCodeSnippetID.h",
   "$_src/core/SkCachedData.cpp",
   "$_src/core/SkCanvas.cpp",
   "$_src/core/SkCanvasPriv.cpp",
   "$_src/core/SkCanvasPriv.h",
+  "$_src/core/SkChromeRemoteGlyphCache.cpp",
   "$_src/core/SkClipStack.cpp",
   "$_src/core/SkClipStack.h",
   "$_src/core/SkClipStackDevice.cpp",
@@ -168,9 +170,13 @@ skia_core_sources = [
   "$_src/core/SkCubicClipper.h",
   "$_src/core/SkCubicMap.cpp",
   "$_src/core/SkCubicSolver.h",
+  "$_src/core/SkCustomMesh.cpp",
+  "$_src/core/SkCustomMeshPriv.cpp",
+  "$_src/core/SkCustomMeshPriv.h",
   "$_src/core/SkData.cpp",
   "$_src/core/SkDataTable.cpp",
   "$_src/core/SkDebug.cpp",
+  "$_src/core/SkDebugUtils.h",
   "$_src/core/SkDeferredDisplayList.cpp",
   "$_src/core/SkDeferredDisplayListPriv.h",
   "$_src/core/SkDeferredDisplayListRecorder.cpp",
@@ -241,6 +247,8 @@ skia_core_sources = [
   "$_src/core/SkImageFilter_Base.h",
   "$_src/core/SkImageGenerator.cpp",
   "$_src/core/SkImageInfo.cpp",
+  "$_src/core/SkKeyHelpers.cpp",
+  "$_src/core/SkKeyHelpers.h",
   "$_src/core/SkLRUCache.h",
   "$_src/core/SkLatticeIter.cpp",
   "$_src/core/SkLatticeIter.h",
@@ -287,6 +295,8 @@ skia_core_sources = [
   "$_src/core/SkOverdrawCanvas.cpp",
   "$_src/core/SkPaint.cpp",
   "$_src/core/SkPaintDefaults.h",
+  "$_src/core/SkPaintParamsKey.cpp",
+  "$_src/core/SkPaintParamsKey.h",
   "$_src/core/SkPaintPriv.cpp",
   "$_src/core/SkPaintPriv.h",
   "$_src/core/SkPath.cpp",
@@ -325,10 +335,9 @@ skia_core_sources = [
   "$_src/core/SkRegion.cpp",
   "$_src/core/SkRegionPriv.h",
   "$_src/core/SkRegion_path.cpp",
-  "$_src/core/SkRemoteGlyphCache.cpp",
-  "$_src/core/SkRemoteGlyphCache.h",
   "$_src/core/SkResourceCache.cpp",
   "$_src/core/SkRuntimeEffect.cpp",
+  "$_src/core/SkSLTypeShared.h",
   "$_src/core/SkSafeMath.h",
   "$_src/core/SkScalar.cpp",
   "$_src/core/SkScaleToSides.h",
@@ -346,6 +355,8 @@ skia_core_sources = [
   "$_src/core/SkScan_Path.cpp",
   "$_src/core/SkScopeExit.h",
   "$_src/core/SkSemaphore.cpp",
+  "$_src/core/SkShaderCodeDictionary.cpp",
+  "$_src/core/SkShaderCodeDictionary.h",
   "$_src/core/SkSharedMutex.cpp",
   "$_src/core/SkSharedMutex.h",
   "$_src/core/SkSpecialImage.cpp",
@@ -367,7 +378,6 @@ skia_core_sources = [
   "$_src/core/SkString.cpp",
   "$_src/core/SkStringUtils.cpp",
   "$_src/core/SkStringUtils.h",
-  "$_src/core/SkStringView.cpp",
   "$_src/core/SkStroke.cpp",
   "$_src/core/SkStroke.h",
   "$_src/core/SkStrokeRec.cpp",
@@ -402,6 +412,9 @@ skia_core_sources = [
   "$_src/core/SkTypeface_remote.cpp",
   "$_src/core/SkTypeface_remote.h",
   "$_src/core/SkUnPreMultiply.cpp",
+  "$_src/core/SkUniform.h",
+  "$_src/core/SkUniformData.cpp",
+  "$_src/core/SkUniformData.h",
   "$_src/core/SkUtils.cpp",
   "$_src/core/SkUtils.h",
   "$_src/core/SkVM.cpp",
@@ -484,6 +497,7 @@ skia_core_sources = [
   "$_include/private/SkSemaphore.h",
   "$_include/private/SkShadowFlags.h",
   "$_include/private/SkSpinlock.h",
+  "$_include/private/SkStringView.h",
   "$_include/private/SkTArray.h",
   "$_include/private/SkTDArray.h",
   "$_include/private/SkTFitsIn.h",
@@ -493,8 +507,10 @@ skia_core_sources = [
   "$_include/private/SkTemplates.h",
   "$_include/private/SkThreadAnnotations.h",
   "$_include/private/SkThreadID.h",
+  "$_include/private/SkUniquePaintParamsID.h",
   "$_include/private/SkVx.h",
   "$_include/private/SkWeakRefCnt.h",
+  "$_include/private/chromium/SkChromeRemoteGlyphCache.h",
 ]
 
 skia_pathops_public = [ "$_include/pathops/SkPathOps.h" ]
diff --git a/third_party/skia/gn/gm.gni b/third_party/skia/gn/gm.gni
index 6785e512578c1..a19a315917e8d 100644
--- a/third_party/skia/gn/gm.gni
+++ b/third_party/skia/gn/gm.gni
@@ -27,6 +27,7 @@ gm_sources = [
   "$_gm/arcto.cpp",
   "$_gm/arithmode.cpp",
   "$_gm/asyncrescaleandread.cpp",
+  "$_gm/attributes.cpp",
   "$_gm/b_119394958.cpp",
   "$_gm/backdrop.cpp",
   "$_gm/backdrop_imagefilter_croprect.cpp",
@@ -62,6 +63,7 @@ gm_sources = [
   "$_gm/blurs.cpp",
   "$_gm/blurtextsmallradii.cpp",
   "$_gm/bmpfilterqualityrepeat.cpp",
+  "$_gm/bug12866.cpp",
   "$_gm/bug5252.cpp",
   "$_gm/bug530095.cpp",
   "$_gm/bug615686.cpp",
@@ -137,6 +139,7 @@ gm_sources = [
   "$_gm/croppedrects.cpp",
   "$_gm/crosscontextimage.cpp",
   "$_gm/cubicpaths.cpp",
+  "$_gm/custommesh.cpp",
   "$_gm/daa.cpp",
   "$_gm/dashcircle.cpp",
   "$_gm/dashcubics.cpp",
@@ -154,6 +157,7 @@ gm_sources = [
   "$_gm/drawbitmaprect.cpp",
   "$_gm/drawglyphs.cpp",
   "$_gm/drawimageset.cpp",
+  "$_gm/drawlines_with_local_matrix.cpp",
   "$_gm/drawminibitmaprect.cpp",
   "$_gm/drawregion.cpp",
   "$_gm/drawregionmodes.cpp",
@@ -275,6 +279,7 @@ gm_sources = [
   "$_gm/overdrawcolorfilter.cpp",
   "$_gm/overstroke.cpp",
   "$_gm/p3.cpp",
+  "$_gm/palette.cpp",
   "$_gm/particles.cpp",
   "$_gm/patch.cpp",
   "$_gm/path_stroke_with_zero_length.cpp",
diff --git a/third_party/skia/gn/gn_to_bp.py b/third_party/skia/gn/gn_to_bp.py
index 8b730b176a562..cff5552938c81 100755
--- a/third_party/skia/gn/gn_to_bp.py
+++ b/third_party/skia/gn/gn_to_bp.py
@@ -15,6 +15,7 @@
 import subprocess
 import tempfile
 
+import skqp_gn_args
 import gn_to_bp_utils
 
 # First we start off with a template for Android.bp,
@@ -63,7 +64,6 @@
         "SPDX-license-identifier-CC0-1.0",
         "SPDX-license-identifier-FTL",
         "SPDX-license-identifier-MIT",
-        "SPDX-license-identifier-MPL",
         "legacy_unencumbered",
     ],
     license_text: [
@@ -73,23 +73,7 @@
 }
 
 cc_defaults {
-    name: "skia_defaults",
-    cflags: [
-        $cflags
-    ],
-
-    cppflags:[
-        $cflags_cc
-    ],
-
-    export_include_dirs: [
-        $export_includes
-    ],
-
-    local_include_dirs: [
-        $local_includes
-    ],
-
+    name: "skia_arch_defaults",
     arch: {
         arm: {
             srcs: [
@@ -134,6 +118,26 @@
     },
 }
 
+cc_defaults {
+    name: "skia_defaults",
+    defaults: ["skia_arch_defaults"],
+    cflags: [
+        $cflags
+    ],
+
+    cppflags:[
+        $cflags_cc
+    ],
+
+    export_include_dirs: [
+        $export_includes
+    ],
+
+    local_include_dirs: [
+        $local_includes
+    ]
+}
+
 cc_library_static {
     // Smaller version of Skia, without e.g. codecs, intended for use by RenderEngine.
     name: "libskia_renderengine",
@@ -216,37 +220,10 @@
     },
 
     defaults: ["skia_deps",
-               "skia_pgo",
                "skia_defaults",
     ],
 }
 
-// Build libskia with PGO by default.
-// Location of PGO profile data is defined in build/soong/cc/pgo.go
-// and is separate from skia.
-// To turn it off, set ANDROID_PGO_NO_PROFILE_USE environment variable
-// or set enable_profile_use property to false.
-cc_defaults {
-    name: "skia_pgo",
-    pgo: {
-        instrumentation: true,
-        profile_file: "hwui/hwui.profdata",
-        benchmarks: ["hwui", "skia"],
-        enable_profile_use: true,
-    },
-}
-
-// "defaults" property to disable profile use for Skia tools and benchmarks.
-cc_defaults {
-    name: "skia_pgo_no_profile_use",
-    defaults: [
-        "skia_pgo",
-    ],
-    pgo: {
-        enable_profile_use: false,
-    },
-}
-
 cc_defaults {
     // Subset of the larger "skia_deps", which includes only the dependencies
     // needed for libskia_renderengine. Note that it includes libpng and libz
@@ -293,6 +270,7 @@
         "libwebp-decode",
         "libwebp-encode",
         "libsfntly",
+        "libwuffs_mirror_release_c",
     ],
     target: {
       android: {
@@ -322,7 +300,6 @@
     name: "skia_tool_deps",
     defaults: [
         "skia_deps",
-        "skia_pgo_no_profile_use"
     ],
     shared_libs: [
         "libicu",
@@ -343,13 +320,41 @@
         enabled: true,
       },
     },
+
+    data: [
+        "resources/**/*",
+    ],
+}
+
+cc_defaults {
+    name: "skia_gm_srcs",
+    local_include_dirs: [
+        $gm_includes
+    ],
+
+    srcs: [
+        $gm_srcs
+    ],
+}
+
+cc_defaults {
+    name: "skia_test_minus_gm_srcs",
+    local_include_dirs: [
+        $test_minus_gm_includes
+    ],
+
+    srcs: [
+        $test_minus_gm_srcs
+    ],
 }
 
 cc_test {
     name: "skia_dm",
 
     defaults: [
-        "skia_tool_deps"
+        "skia_gm_srcs",
+        "skia_test_minus_gm_srcs",
+        "skia_tool_deps",
     ],
 
     local_include_dirs: [
@@ -370,6 +375,7 @@
     name: "skia_nanobench",
 
     defaults: [
+        "skia_gm_srcs",
         "skia_tool_deps"
     ],
 
@@ -381,10 +387,86 @@
         $nanobench_srcs
     ],
 
-    data: [
-        "resources/**/*",
+    lto: {
+        never: true,
+    },
+}
+
+cc_library_shared {
+    name: "libskqp_jni",
+    sdk_version: "$skqp_sdk_version",
+    stl: "libc++_static",
+    compile_multilib: "both",
+
+    defaults: [
+        "skia_arch_defaults",
+    ],
+
+    cflags: [
+        $skqp_cflags
+        "-Wno-unused-parameter",
+        "-Wno-unused-variable",
+    ],
+
+    cppflags:[
+        $skqp_cflags_cc
+    ],
+
+    local_include_dirs: [
+        "skqp",
+        $skqp_includes
+    ],
+
+    export_include_dirs: [
+        "skqp",
+    ],
+
+    srcs: [
+        $skqp_srcs
     ],
-}''')
+
+    header_libs: ["jni_headers"],
+
+    shared_libs: [
+          "libandroid",
+          "libEGL",
+          "libGLESv2",
+          "liblog",
+          "libvulkan",
+          "libz",
+    ],
+    static_libs: [
+          "libexpat",
+          "libjpeg_static_ndk",
+          "libpng_ndk",
+          "libwebp-decode",
+          "libwebp-encode",
+          "libwuffs_mirror_release_c",
+    ]
+}
+
+android_test {
+    name: "CtsSkQPTestCases",
+    defaults: ["cts_defaults"],
+
+    libs: ["android.test.runner.stubs"],
+    jni_libs: ["libskqp_jni"],
+    compile_multilib: "both",
+
+    static_libs: [
+        "android-support-design",
+        "ctstestrunner-axt",
+    ],
+    manifest: "platform_tools/android/apps/skqp/src/main/AndroidManifest.xml",
+    test_config: "platform_tools/android/apps/skqp/src/main/AndroidTest.xml",
+
+    asset_dirs: ["platform_tools/android/apps/skqp/src/main/assets", "resources"],
+    resource_dirs: ["platform_tools/android/apps/skqp/src/main/res"],
+    srcs: ["platform_tools/android/apps/skqp/src/main/java/**/*.java"],
+
+    sdk_version: "test_current",
+}
+''')
 
 # We'll run GN to get the main source lists and include directories for Skia.
 def generate_args(target_os, enable_gpu, renderengine = False):
@@ -408,7 +490,6 @@ def generate_args(target_os, enable_gpu, renderengine = False):
 
     'skia_use_fontconfig':                  'false',
     'skia_include_multiframe_procs':        'false',
-    'skia_libgifcodec_path':                '"third_party/libgifcodec"',
   }
   d['target_os'] = target_os
   if target_os == '"android"':
@@ -454,6 +535,7 @@ def generate_args(target_os, enable_gpu, renderengine = False):
     d['skia_use_freetype'] = 'true'
     d['skia_use_fixed_gamma_text'] = 'true'
     d['skia_enable_fontmgr_custom_empty'] = 'true'
+    d['skia_use_wuffs'] = 'true'
 
   return d
 
@@ -474,6 +556,12 @@ def strip_slashes(lst):
 local_includes  = strip_slashes(js['targets']['//:skia']['include_dirs'])
 export_includes = strip_slashes(js['targets']['//:public']['include_dirs'])
 
+gm_srcs         = strip_slashes(js['targets']['//:gm']['sources'])
+gm_includes     = strip_slashes(js['targets']['//:gm']['include_dirs'])
+
+test_srcs         = strip_slashes(js['targets']['//:tests']['sources'])
+test_includes     = strip_slashes(js['targets']['//:tests']['include_dirs'])
+
 dm_srcs         = strip_slashes(js['targets']['//:dm']['sources'])
 dm_includes     = strip_slashes(js['targets']['//:dm']['include_dirs'])
 
@@ -481,13 +569,17 @@ def strip_slashes(lst):
 nanobench_srcs     = strip_slashes(nanobench_target['sources'])
 nanobench_includes = strip_slashes(nanobench_target['include_dirs'])
 
-gn_to_bp_utils.GrabDependentValues(js, '//:dm', 'sources', dm_srcs, 'skia')
+
+gn_to_bp_utils.GrabDependentValues(js, '//:gm', 'sources', gm_srcs, '//:skia')
+gn_to_bp_utils.GrabDependentValues(js, '//:tests', 'sources', test_srcs, '//:skia')
+gn_to_bp_utils.GrabDependentValues(js, '//:dm', 'sources',
+                                   dm_srcs, ['//:skia', '//:gm', '//:tests'])
 gn_to_bp_utils.GrabDependentValues(js, '//:nanobench', 'sources',
-                                   nanobench_srcs, 'skia')
+                                   nanobench_srcs, ['//:skia', '//:gm'])
 
 # skcms is a little special, kind of a second-party library.
 local_includes.add("include/third_party/skcms")
-dm_includes   .add("include/third_party/skcms")
+gm_includes   .add("include/third_party/skcms")
 
 # Android's build will choke if we list headers.
 def strip_headers(sources):
@@ -521,6 +613,18 @@ def strip_headers(sources):
 mac_srcs        =     mac_srcs.difference(srcs)
 win_srcs        =     win_srcs.difference(srcs)
 
+gm_srcs         = strip_headers(gm_srcs)
+test_srcs       = strip_headers(test_srcs)
+dm_srcs         = strip_headers(dm_srcs).difference(gm_srcs).difference(test_srcs)
+nanobench_srcs  = strip_headers(nanobench_srcs).difference(gm_srcs)
+
+test_minus_gm_includes = test_includes.difference(gm_includes)
+test_minus_gm_srcs = test_srcs.difference(gm_srcs)
+
+cflags = gn_to_bp_utils.CleanupCFlags(cflags)
+cflags_cc = gn_to_bp_utils.CleanupCCFlags(cflags_cc)
+
+# Execute GN for specialized RenderEngine target
 js_renderengine   = gn_to_bp_utils.GenerateJSONFromGN(gn_args_renderengine)
 renderengine_srcs = strip_slashes(
     js_renderengine['targets']['//:skia']['sources'])
@@ -528,11 +632,33 @@ def strip_headers(sources):
                                    renderengine_srcs, None)
 renderengine_srcs = strip_headers(renderengine_srcs)
 
-dm_srcs         = strip_headers(dm_srcs)
-nanobench_srcs  = strip_headers(nanobench_srcs)
-
-cflags = gn_to_bp_utils.CleanupCFlags(cflags)
-cflags_cc = gn_to_bp_utils.CleanupCCFlags(cflags_cc)
+# Execute GN for specialized SkQP target
+skqp_sdk_version = 26
+js_skqp = gn_to_bp_utils.GenerateJSONFromGN(skqp_gn_args.GetGNArgs(api_level=skqp_sdk_version,
+                                                                   debug=False,
+                                                                   is_android_bp=True))
+skqp_srcs      = strip_slashes(js_skqp['targets']['//:libskqp_app']['sources'])
+skqp_includes  = strip_slashes(js_skqp['targets']['//:libskqp_app']['include_dirs'])
+skqp_cflags    = strip_slashes(js_skqp['targets']['//:libskqp_app']['cflags'])
+skqp_cflags_cc = strip_slashes(js_skqp['targets']['//:libskqp_app']['cflags_cc'])
+skqp_defines   = strip_slashes(js_skqp['targets']['//:libskqp_app']['defines'])
+
+skqp_includes.update(strip_slashes(js_skqp['targets']['//:public']['include_dirs']))
+
+gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'sources',
+                                   skqp_srcs, None)
+gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'include_dirs',
+                                   skqp_includes, ['//:gif'])
+gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'cflags',
+                                   skqp_cflags, None)
+gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'cflags_cc',
+                                   skqp_cflags_cc, None)
+gn_to_bp_utils.GrabDependentValues(js_skqp, '//:libskqp_app', 'defines',
+                                   skqp_defines, None)
+
+skqp_srcs = strip_headers(skqp_srcs)
+skqp_cflags = gn_to_bp_utils.CleanupCFlags(skqp_cflags)
+skqp_cflags_cc = gn_to_bp_utils.CleanupCCFlags(skqp_cflags_cc)
 
 here = os.path.dirname(__file__)
 defs = gn_to_bp_utils.GetArchSources(os.path.join(here, 'opts.gni'))
@@ -544,6 +670,7 @@ def get_defines(json):
 mac_defines          = get_defines(js_mac)
 win_defines          = get_defines(js_win)
 renderengine_defines = get_defines(js_renderengine)
+renderengine_defines.add('SK_IN_RENDERENGINE')
 
 def mkdir_if_not_exists(path):
   if not os.path.exists(path):
@@ -553,6 +680,7 @@ def mkdir_if_not_exists(path):
 mkdir_if_not_exists('mac/include/config/')
 mkdir_if_not_exists('win/include/config/')
 mkdir_if_not_exists('renderengine/include/config/')
+mkdir_if_not_exists('skqp/include/config/')
 
 platforms = { 'IOS', 'MAC', 'WIN', 'ANDROID', 'UNIX' }
 
@@ -574,7 +702,7 @@ def append_to_file(config, s):
   with open(config, 'a') as f:
     print(s, file=f)
 
-def write_android_config(config_path, defines):
+def write_android_config(config_path, defines, isNDKConfig = False):
   gn_to_bp_utils.WriteUserConfig(config_path, defines)
   append_to_file(config_path, '''
 #ifndef SK_BUILD_FOR_ANDROID
@@ -582,8 +710,13 @@ def write_android_config(config_path, defines):
 #endif''')
   disallow_platforms(config_path, 'ANDROID')
 
+  if isNDKConfig:
+    append_to_file(config_path, '''
+#undef SK_BUILD_FOR_ANDROID_FRAMEWORK''')
+
 write_android_config('android/include/config/SkUserConfig.h', android_defines)
 write_android_config('renderengine/include/config/SkUserConfig.h', renderengine_defines)
+write_android_config('skqp/include/config/SkUserConfig.h', skqp_defines, True)
 
 def write_config(config_path, defines, platform):
   gn_to_bp_utils.WriteUserConfig(config_path, defines)
@@ -629,12 +762,24 @@ def bpfmt(indent, lst, sort=True):
                                              defs['hsw'  ] +
                                              defs['skx'  ])),
 
+    'gm_includes'       : bpfmt(8, gm_includes),
+    'gm_srcs'           : bpfmt(8, gm_srcs),
+
+    'test_minus_gm_includes' : bpfmt(8, test_minus_gm_includes),
+    'test_minus_gm_srcs'     : bpfmt(8, test_minus_gm_srcs),
+
     'dm_includes'       : bpfmt(8, dm_includes),
     'dm_srcs'           : bpfmt(8, dm_srcs),
 
     'nanobench_includes'    : bpfmt(8, nanobench_includes),
     'nanobench_srcs'        : bpfmt(8, nanobench_srcs),
 
+    'skqp_sdk_version': skqp_sdk_version,
+    'skqp_includes':    bpfmt(8, skqp_includes),
+    'skqp_srcs':        bpfmt(8, skqp_srcs),
+    'skqp_cflags':      bpfmt(8, skqp_cflags, False),
+    'skqp_cflags_cc':   bpfmt(8, skqp_cflags_cc),
+
     'android_srcs':  bpfmt(10, android_srcs),
     'linux_srcs':    bpfmt(10, linux_srcs),
     'mac_srcs':      bpfmt(10, mac_srcs),
diff --git a/third_party/skia/gn/gn_to_bp_utils.py b/third_party/skia/gn/gn_to_bp_utils.py
index 4fca9611fc423..40d5a66f0b754 100755
--- a/third_party/skia/gn/gn_to_bp_utils.py
+++ b/third_party/skia/gn/gn_to_bp_utils.py
@@ -39,8 +39,11 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude):
       continue   # We've handled all third-party DEPS as static or shared_libs.
     if 'none' in dep:
       continue   # We'll handle all cpu-specific sources manually later.
-    if exclude and exclude in dep:
+    if exclude and isinstance(exclude, str) and exclude == dep:
       continue
+    if exclude and isinstance(exclude, list) and dep in exclude:
+      continue
+
     list_to_extend.update(_strip_slash(js['targets'][dep].get(value_type, [])))
     GrabDependentValues(js, dep, value_type, list_to_extend, exclude)
 
@@ -68,6 +71,10 @@ def CleanupCFlags(cflags):
     "-DATRACE_TAG=ATRACE_TAG_VIEW",
   ])
 
+  # Android does not want -Weverything set, it blocks toolchain updates.
+  if "-Weverything" in cflags:
+    cflags.remove("-Weverything")
+
   # We need to undefine FORTIFY_SOURCE before we define it. Insert it at the
   # beginning after sorting.
   cflags = sorted(cflags)
@@ -75,6 +82,10 @@ def CleanupCFlags(cflags):
   return cflags
 
 def CleanupCCFlags(cflags_cc):
+  # Android does not want -Weverything set, it blocks toolchain updates.
+  if "-Weverything" in cflags_cc:
+    cflags_cc.remove("-Weverything")
+
   # Only use the generated flags related to warnings.
   return {s for s in cflags_cc      if s.startswith('-W')}
 
@@ -117,6 +128,7 @@ def WriteUserConfig(userConfigPath, defines):
     print('// If need to change a define, modify SkUserConfigManual.h', file=f)
     print('#pragma once', file=f)
     print('#include "SkUserConfigManual.h"', file=f)
+
     for define in sorted(defines):
       print('', file=f)
       print('#ifndef', define.split('=')[0], file=f)
diff --git a/third_party/skia/gn/gpu.gni b/third_party/skia/gn/gpu.gni
index fb4f25491d1eb..09301a628aee5 100644
--- a/third_party/skia/gn/gpu.gni
+++ b/third_party/skia/gn/gpu.gni
@@ -27,8 +27,6 @@ skia_gpu_sources = [
   "$_include/private/GrGLTypesPriv.h",
   "$_include/private/GrImageContext.h",
   "$_include/private/GrMtlTypesPriv.h",
-  "$_include/private/GrResourceKey.h",
-  "$_include/private/GrSingleOwner.h",
   "$_include/private/GrTypesPriv.h",
   "$_include/private/chromium/GrSlug.h",
   "$_src/gpu/GrAHardwareBufferImageGenerator.cpp",
@@ -189,8 +187,6 @@ skia_gpu_sources = [
   "$_src/gpu/GrSemaphore.h",
   "$_src/gpu/GrShaderCaps.cpp",
   "$_src/gpu/GrShaderCaps.h",
-  "$_src/gpu/GrShaderUtils.cpp",
-  "$_src/gpu/GrShaderUtils.h",
   "$_src/gpu/GrShaderVar.cpp",
   "$_src/gpu/GrShaderVar.h",
   "$_src/gpu/GrSimpleMesh.h",
@@ -209,8 +205,6 @@ skia_gpu_sources = [
   "$_src/gpu/GrSurfaceProxy.h",
   "$_src/gpu/GrSurfaceProxyPriv.h",
   "$_src/gpu/GrSurfaceProxyView.h",
-  "$_src/gpu/GrSwizzle.cpp",
-  "$_src/gpu/GrSwizzle.h",
   "$_src/gpu/GrTTopoSort.h",
   "$_src/gpu/GrTestUtils.cpp",
   "$_src/gpu/GrTestUtils.h",
@@ -356,6 +350,8 @@ skia_gpu_sources = [
   "$_src/gpu/text/GrAtlasManager.h",
   "$_src/gpu/text/GrDistanceFieldAdjustTable.cpp",
   "$_src/gpu/text/GrDistanceFieldAdjustTable.h",
+  "$_src/gpu/text/GrGlyphVector.cpp",
+  "$_src/gpu/text/GrGlyphVector.h",
   "$_src/gpu/text/GrSDFMaskFilter.cpp",
   "$_src/gpu/text/GrSDFMaskFilter.h",
   "$_src/gpu/text/GrSDFTControl.cpp",
@@ -365,8 +361,8 @@ skia_gpu_sources = [
   "$_src/gpu/text/GrStrikeCache.h",
   "$_src/gpu/text/GrTextBlob.cpp",
   "$_src/gpu/text/GrTextBlob.h",
-  "$_src/gpu/text/GrTextBlobCache.cpp",
-  "$_src/gpu/text/GrTextBlobCache.h",
+  "$_src/gpu/text/GrTextBlobRedrawCoordinator.cpp",
+  "$_src/gpu/text/GrTextBlobRedrawCoordinator.h",
 
   # GLSL
   "$_src/gpu/glsl/GrGLSL.cpp",
@@ -513,8 +509,8 @@ skia_skgpu_v1_sources = [
   "$_src/gpu/ops/DrawAtlasOp.h",
   "$_src/gpu/ops/DrawAtlasPathOp.cpp",
   "$_src/gpu/ops/DrawAtlasPathOp.h",
-  "$_src/gpu/ops/DrawVerticesOp.cpp",
-  "$_src/gpu/ops/DrawVerticesOp.h",
+  "$_src/gpu/ops/DrawCustomMeshOp.cpp",
+  "$_src/gpu/ops/DrawCustomMeshOp.h",
   "$_src/gpu/ops/DrawableOp.cpp",
   "$_src/gpu/ops/DrawableOp.h",
   "$_src/gpu/ops/FillPathFlags.h",
@@ -818,7 +814,15 @@ skia_native_gpu_sources = [
 ]
 
 skia_shared_gpu_sources = [
+  "$_include/gpu/ShaderErrorHandler.h",
+  "$_include/private/SingleOwner.h",
   "$_src/gpu/BufferWriter.h",
+  "$_src/gpu/KeyBuilder.h",
+  "$_src/gpu/ResourceKey.cpp",
+  "$_src/gpu/ResourceKey.h",
+  "$_src/gpu/ShaderErrorHandler.cpp",
+  "$_src/gpu/Swizzle.cpp",
+  "$_src/gpu/Swizzle.h",
 
   # tessellate
   "$_src/gpu/tessellate/CullTest.h",
diff --git a/third_party/skia/gn/graphite.gni b/third_party/skia/gn/graphite.gni
index 9f4ce6cfbe031..ad4036d7f5468 100644
--- a/third_party/skia/gn/graphite.gni
+++ b/third_party/skia/gn/graphite.gni
@@ -48,6 +48,8 @@ skia_graphite_sources = [
   "$_src/DrawWriter.cpp",
   "$_src/DrawWriter.h",
   "$_src/EnumBitMask.h",
+  "$_src/GlobalCache.cpp",
+  "$_src/GlobalCache.h",
   "$_src/Gpu.cpp",
   "$_src/Gpu.h",
   "$_src/GpuWorkSubmission.h",
@@ -55,16 +57,29 @@ skia_graphite_sources = [
   "$_src/GraphicsPipeline.h",
   "$_src/GraphicsPipelineDesc.cpp",
   "$_src/GraphicsPipelineDesc.h",
+  "$_src/GraphiteResourceKey.cpp",
+  "$_src/GraphiteResourceKey.h",
   "$_src/Image_Graphite.cpp",
   "$_src/Image_Graphite.h",
+  "$_src/Log.h",
+  "$_src/PaintParams.cpp",
+  "$_src/PaintParams.h",
   "$_src/Recorder.cpp",
+  "$_src/RecorderPriv.cpp",
+  "$_src/RecorderPriv.h",
   "$_src/Recording.cpp",
   "$_src/RenderPassTask.cpp",
   "$_src/RenderPassTask.h",
   "$_src/Renderer.h",
+  "$_src/Resource.cpp",
+  "$_src/Resource.h",
+  "$_src/ResourceCache.cpp",
+  "$_src/ResourceCache.h",
   "$_src/ResourceProvider.cpp",
   "$_src/ResourceProvider.h",
   "$_src/ResourceTypes.h",
+  "$_src/Sampler.cpp",
+  "$_src/Sampler.h",
   "$_src/SkStuff.cpp",
   "$_src/Surface_Graphite.cpp",
   "$_src/Surface_Graphite.h",
@@ -77,11 +92,13 @@ skia_graphite_sources = [
   "$_src/TextureInfo.cpp",
   "$_src/TextureProxy.cpp",
   "$_src/TextureProxy.h",
-  "$_src/Uniform.h",
+  "$_src/TextureProxyView.h",
   "$_src/UniformCache.cpp",
   "$_src/UniformCache.h",
   "$_src/UniformManager.cpp",
   "$_src/UniformManager.h",
+  "$_src/UploadTask.cpp",
+  "$_src/UploadTask.h",
   "$_src/geom/BoundsManager.h",
   "$_src/geom/IntersectionTree.cpp",
   "$_src/geom/IntersectionTree.h",
@@ -112,6 +129,8 @@ skia_graphite_mtl_sources = [
   "$_src/mtl/MtlRenderCommandEncoder.h",
   "$_src/mtl/MtlResourceProvider.h",
   "$_src/mtl/MtlResourceProvider.mm",
+  "$_src/mtl/MtlSampler.h",
+  "$_src/mtl/MtlSampler.mm",
   "$_src/mtl/MtlTexture.h",
   "$_src/mtl/MtlTexture.mm",
   "$_src/mtl/MtlTrampoline.h",
diff --git a/third_party/skia/gn/skia.gni b/third_party/skia/gn/skia.gni
index bda6cbabe9092..8c8b44f9e160c 100644
--- a/third_party/skia/gn/skia.gni
+++ b/third_party/skia/gn/skia.gni
@@ -20,8 +20,9 @@ declare_args() {
   skia_enable_fontmgr_fuchsia = is_fuchsia
   skia_enable_fontmgr_win = is_win
   skia_enable_gpu = true
-  skia_enable_pdf = true
-  skia_enable_skottie = !(is_win && is_component_build)
+  skia_enable_pdf = !is_wasm
+  skia_enable_skottie = !(is_win && is_component_build) ||
+                        (is_wasm && skia_canvaskit_enable_skottie)
   skia_enable_skrive = true
   skia_enable_sksl = true
   skia_enable_skvm_jit_when_possible = is_skia_dev_build
@@ -35,37 +36,36 @@ declare_args() {
   skia_lex = false
   skia_libgifcodec_path = "third_party/externals/libgifcodec"
   skia_qt_path = getenv("QT_PATH")
-  skia_skqp_global_error_tolerance = 0
   skia_tools_require_resources = false
   skia_update_fuchsia_sdk = false
   skia_use_angle = false
   skia_use_dawn = false
   skia_use_direct3d = false
   skia_use_egl = false
-  skia_use_expat = true
-  skia_use_experimental_xform = false
+  skia_use_expat = !is_wasm
   skia_use_ffmpeg = false
   skia_use_fixed_gamma_text = is_android
   skia_use_fontconfig = is_linux
   skia_use_fonthost_mac = is_mac || is_ios
-  skia_use_freetype = is_android || is_fuchsia || is_linux
+  skia_use_freetype = is_android || is_fuchsia || is_linux || is_wasm
   skia_use_harfbuzz = true
   skia_use_gl = !is_fuchsia
   skia_use_icu = !is_fuchsia
   skia_use_libheif = is_skia_dev_build
   skia_use_libjpeg_turbo_decode = true
   skia_use_libjpeg_turbo_encode = true
+  skia_use_libjxl_decode = false
   skia_use_libpng_decode = true
   skia_use_libpng_encode = true
   skia_use_libwebp_decode = true
-  skia_use_libwebp_encode = true
+  skia_use_libwebp_encode = !is_wasm
   skia_use_lua = is_skia_dev_build && !is_ios
   skia_use_metal = false
   skia_use_ndk_images = is_android && defined(ndk_api) && ndk_api >= 30
-  skia_use_piex = !is_win
+  skia_use_piex = !is_win && !is_wasm
   skia_use_sfml = false
-  skia_use_webgl = false
-  skia_use_wuffs = false
+  skia_use_webgl = is_wasm
+  skia_use_wuffs = is_wasm
   skia_use_x11 = is_linux
   skia_use_xps = true
   skia_enable_graphite = false
@@ -77,11 +77,15 @@ declare_args() {
     skia_ios_identity = ".*Google.*"
     skia_ios_profile = "Google Development"
   }
+}
 
+declare_args() {
   if (is_mac) {
     skia_gl_standard = "gl"
   } else if (is_ios) {
     skia_gl_standard = "gles"
+  } else if (is_wasm && skia_enable_gpu) {
+    skia_gl_standard = "webgl"
   } else {
     skia_gl_standard = ""
   }
@@ -105,16 +109,17 @@ declare_args() {
 declare_args() {
   skia_compile_sksl_tests = skia_compile_processors
   skia_enable_fontmgr_android = skia_use_expat && skia_use_freetype
-  skia_enable_fontmgr_custom_directory = skia_use_freetype && !is_fuchsia
+  skia_enable_fontmgr_custom_directory =
+      skia_use_freetype && !is_fuchsia && !is_wasm
   skia_enable_fontmgr_custom_embedded = skia_use_freetype && !is_fuchsia
-  skia_enable_fontmgr_custom_empty = skia_use_freetype
+  skia_enable_fontmgr_custom_empty = skia_use_freetype && !is_wasm
   skia_enable_fontmgr_fontconfig = skia_use_freetype && skia_use_fontconfig
   skia_enable_fontmgr_win_gdi = is_win && !skia_enable_winuwp
   skia_enable_fontmgr_FontConfigInterface =
       skia_use_freetype && skia_use_fontconfig
   skia_enable_spirv_validation = is_skia_dev_build && is_debug && !skia_use_dawn
   skia_use_dng_sdk =
-      !is_fuchsia && skia_use_libjpeg_turbo_decode && skia_use_zlib
+      !is_fuchsia && !is_wasm && skia_use_libjpeg_turbo_decode && skia_use_zlib
   skia_use_libgifcodec = !skia_use_wuffs
   skia_use_sfntly = skia_use_icu
   skia_enable_vulkan_debug_layers = skia_enable_gpu_debug_layers
diff --git a/third_party/skia/gn/skia/BUILD.gn b/third_party/skia/gn/skia/BUILD.gn
index 5948c05984f3c..da6ca646c4fa6 100644
--- a/third_party/skia/gn/skia/BUILD.gn
+++ b/third_party/skia/gn/skia/BUILD.gn
@@ -6,6 +6,9 @@
 if (is_fuchsia) {
   import("//build/fuchsia/sdk.gni")
 }
+if (is_wasm) {
+  import("//gn/toolchain/wasm.gni")
+}
 
 declare_args() {
   extra_asmflags = []
@@ -90,15 +93,7 @@ config("default") {
       "/bigobj",  # Some of our files are bigger than the regular limits.
       "/utf-8",  # Set Source and Executable character sets to UTF-8.
     ]
-    if (is_clang) {
-      # crbug.com/1257145
-      cflags_cc += [
-        "/std:c++14",
-        "-Wno-c++17-extensions",
-      ]
-    } else {
-      cflags_cc += [ "/std:c++17" ]
-    }
+    cflags_cc += [ "/std:c++17" ]
     defines += [
       "_CRT_SECURE_NO_WARNINGS",  # Disables warnings about sscanf().
       "_HAS_EXCEPTIONS=0",  # Disables exceptions in MSVC STL.
@@ -136,16 +131,10 @@ config("default") {
       "-fPIC",
       "-fvisibility=hidden",
     ]
-    if (is_clang) {
-      # crbug.com/1257145
-      cflags_cc += [
-        "-std=c++14",
-        "-Wno-c++17-extensions",
-      ]
-    } else {
-      cflags_cc += [ "-std=c++17" ]
-    }
-    cflags_cc += [ "-fvisibility-inlines-hidden" ]
+    cflags_cc += [
+      "-std=c++17",
+      "-fvisibility-inlines-hidden",
+    ]
   }
 
   if (current_cpu == "arm") {
@@ -281,6 +270,14 @@ config("default") {
     }
   }
 
+  if (is_wasm) {
+    cflags += [
+      "--sysroot=$skia_emsdk_dir/upstream/emscripten/cache/sysroot",
+      "-sMAIN_MODULE=1",
+    ]
+    ldflags += [ "--sysroot=$skia_emsdk_dir/upstream/emscripten/cache/sysroot" ]
+  }
+
   if (sanitize != "" && sanitize != "MSVC") {
     # You can either pass the sanitizers directly, e.g. "address,undefined",
     # or pass one of the couple common aliases used by the bots.
@@ -426,6 +423,10 @@ config("warnings") {
       "-Weverything",
       "-Wno-unknown-warning-option",  # Let older Clangs ignore newer Clangs'
                                       # warnings.
+
+      # This was deprecated in Clang 14 and removed in Clang 15. It might still
+      # fire with older Clangs, so disable it explicitly.
+      "-Wno-weak-template-vtables",
     ]
 
     if (target_cpu == "arm" && is_ios) {
@@ -457,7 +458,6 @@ config("warnings") {
       "-Wno-double-promotion",
       "-Wno-exit-time-destructors",  # TODO: OK outside libskia
       "-Wno-float-equal",
-      "-Wno-format-nonliteral",
       "-Wno-global-constructors",  # TODO: OK outside libskia
       "-Wno-missing-prototypes",
       "-Wno-missing-variable-declarations",
@@ -469,13 +469,10 @@ config("warnings") {
       "-Wno-switch-enum",
       "-Wno-thread-safety-negative",
       "-Wno-undef",
-      "-Wno-unreachable-code",
       "-Wno-unreachable-code-break",
       "-Wno-unreachable-code-return",
       "-Wno-unused-macros",
       "-Wno-unused-member-function",
-      "-Wno-unused-template",
-      "-Wno-zero-as-null-pointer-constant",
       "-Wno-non-c-typedef-for-linkage",  # Dawn, not Skia per se.
     ]
     cflags_cc += [
@@ -493,6 +490,7 @@ config("warnings") {
       "-Wno-padded",
       "-Wno-shadow-field-in-constructor",
       "-Wno-shadow-uncaptured-local",
+      "-Wno-zero-as-null-pointer-constant",  # VK_NULL_HANDLE is defined as 0
 
       # https://quuxplusone.github.io/blog/2020/08/26/wrange-loop-analysis/
       # https://bugzilla.mozilla.org/show_bug.cgi?id=1683213
@@ -607,20 +605,13 @@ config("optimize") {
     cflags = [ "-O3" ]
     if (is_mac || is_ios) {
       ldflags = [ "-dead_strip" ]
-    } else {
+    } else if (!is_wasm) {
       cflags += [
         "-fdata-sections",
         "-ffunction-sections",
       ]
       ldflags = [ "-Wl,--gc-sections" ]
     }
-    if (target_cpu == "wasm") {
-      # The compiler asks us to add an optimization flag to both cflags
-      # and ldflags to cut down on the local variables,
-      # for performance reasons.
-      # The "linking" step is the conversion to javascript.
-      ldflags += [ "-O3" ]
-    }
   }
 }
 
diff --git a/third_party/skia/gn/skqp_gn_args.py b/third_party/skia/gn/skqp_gn_args.py
new file mode 100644
index 0000000000000..6105396670bb3
--- /dev/null
+++ b/third_party/skia/gn/skqp_gn_args.py
@@ -0,0 +1,46 @@
+# Copyright 2019 Google LLC.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+def GetGNArgs(api_level, debug, arch=None, ndk=None, is_android_bp=False):
+    gn_args = {
+        'ndk_api':                          api_level,
+        'is_debug':                         'true' if debug else 'false',
+        'extra_cflags':                     '[ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]',
+        'skia_enable_fontmgr_android':      'false',
+        'skia_enable_fontmgr_empty':        'true',
+        'skia_enable_pdf':                  'false',
+        'skia_enable_skshaper':             'false',
+        'skia_enable_skottie':              'false',
+        'skia_enable_skrive':               'false',
+        'skia_enable_sktext':               'false',
+        'skia_enable_tools':                'true',
+        'skia_enable_svg':                  'false',
+        'skia_tools_require_resources':     'true',
+        'skia_use_dng_sdk':                 'false',
+        'skia_use_expat':                   'true',
+        'skia_use_freetype':                'false',
+        'skia_use_icu':                     'false',
+        'skia_use_libgifcodec':             'false',
+        'skia_use_libheif':                 'false',
+        'skia_use_lua':                     'false',
+        'skia_use_piex':                    'false',
+        'skia_use_vulkan':                  'true',
+        'skia_use_wuffs':                   'true',
+    }
+
+    def gn_quote(s):
+        return '"%s"' % s
+
+    if is_android_bp is True:
+        gn_args.update({
+            'target_os':          gn_quote("android"),
+            'target_cpu':         gn_quote("none"),
+            'is_official_build':  'true',
+        })
+    else:
+        gn_args.update({
+            'target_cpu':  gn_quote(arch),
+            'ndk':         gn_quote(ndk),
+        })
+    return gn_args
diff --git a/third_party/skia/gn/sksl.gni b/third_party/skia/gn/sksl.gni
index e9062cb692c34..6490d6f0e8edd 100644
--- a/third_party/skia/gn/sksl.gni
+++ b/third_party/skia/gn/sksl.gni
@@ -35,6 +35,8 @@ skia_sksl_sources = [
   "$_include/sksl/SkSLErrorReporter.h",
   "$_src/sksl/SkSLAnalysis.cpp",
   "$_src/sksl/SkSLAnalysis.h",
+  "$_src/sksl/SkSLBuiltinMap.cpp",
+  "$_src/sksl/SkSLBuiltinMap.h",
   "$_src/sksl/SkSLBuiltinTypes.cpp",
   "$_src/sksl/SkSLBuiltinTypes.h",
   "$_src/sksl/SkSLCompiler.cpp",
@@ -53,8 +55,6 @@ skia_sksl_sources = [
   "$_src/sksl/SkSLInliner.cpp",
   "$_src/sksl/SkSLInliner.h",
   "$_src/sksl/SkSLIntrinsicList.h",
-  "$_src/sksl/SkSLIntrinsicMap.cpp",
-  "$_src/sksl/SkSLIntrinsicMap.h",
   "$_src/sksl/SkSLLexer.cpp",
   "$_src/sksl/SkSLLexer.h",
   "$_src/sksl/SkSLMangler.cpp",
@@ -83,6 +83,7 @@ skia_sksl_sources = [
   "$_src/sksl/SkSLUtil.h",
   "$_src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp",
   "$_src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp",
+  "$_src/sksl/analysis/SkSLFinalizationChecks.cpp",
   "$_src/sksl/analysis/SkSLGetLoopUnrollInfo.cpp",
   "$_src/sksl/analysis/SkSLIsConstantExpression.cpp",
   "$_src/sksl/analysis/SkSLProgramUsage.cpp",
@@ -90,8 +91,6 @@ skia_sksl_sources = [
   "$_src/sksl/analysis/SkSLSwitchCaseContainsExit.cpp",
   "$_src/sksl/codegen/SkSLVMCodeGenerator.cpp",
   "$_src/sksl/codegen/SkSLVMCodeGenerator.h",
-  "$_src/sksl/codegen/SkVMDebugTrace.cpp",
-  "$_src/sksl/codegen/SkVMDebugTrace.h",
   "$_src/sksl/dsl/DSLBlock.cpp",
   "$_src/sksl/dsl/DSLCase.cpp",
   "$_src/sksl/dsl/DSLCore.cpp",
@@ -184,7 +183,6 @@ skia_sksl_sources = [
   "$_src/sksl/ir/SkSLSwitchStatement.h",
   "$_src/sksl/ir/SkSLSwizzle.cpp",
   "$_src/sksl/ir/SkSLSwizzle.h",
-  "$_src/sksl/ir/SkSLSymbolAlias.h",
   "$_src/sksl/ir/SkSLSymbolTable.cpp",
   "$_src/sksl/ir/SkSLSymbolTable.h",
   "$_src/sksl/ir/SkSLTernaryExpression.cpp",
@@ -201,6 +199,10 @@ skia_sksl_sources = [
   "$_src/sksl/ir/SkSLVariableReference.cpp",
   "$_src/sksl/ir/SkSLVariableReference.h",
   "$_src/sksl/spirv.h",
+  "$_src/sksl/tracing/SkVMDebugTrace.cpp",
+  "$_src/sksl/tracing/SkVMDebugTrace.h",
+  "$_src/sksl/tracing/SkVMDebugTracePlayer.cpp",
+  "$_src/sksl/tracing/SkVMDebugTracePlayer.h",
   "$_src/sksl/transform/SkSLBuiltinVariableScanner.cpp",
   "$_src/sksl/transform/SkSLEliminateDeadFunctions.cpp",
   "$_src/sksl/transform/SkSLEliminateDeadGlobalVariables.cpp",
diff --git a/third_party/skia/gn/sksl_tests.gni b/third_party/skia/gn/sksl_tests.gni
index 19d9265fe7c5c..b2576c97d3e97 100644
--- a/third_party/skia/gn/sksl_tests.gni
+++ b/third_party/skia/gn/sksl_tests.gni
@@ -45,6 +45,7 @@ sksl_error_tests = [
   "/sksl/errors/BreakOutsideLoop.sksl",
   "/sksl/errors/CallNonFunction.sksl",
   "/sksl/errors/CanExitWithoutReturningValue.sksl",
+  "/sksl/errors/ComparisonDimensional.sksl",
   "/sksl/errors/ConstructorArgumentCount.sksl",
   "/sksl/errors/ConstructorTypeMismatch.sksl",
   "/sksl/errors/ContinueOutsideLoop.sksl",
@@ -66,6 +67,8 @@ sksl_error_tests = [
   "/sksl/errors/InVarWithInitializerExpression.sksl",
   "/sksl/errors/IncompleteExpression.sksl",
   "/sksl/errors/IncompleteFunctionCall.sksl",
+  "/sksl/errors/InterfaceBlockMemberReservedName.sksl",
+  "/sksl/errors/InterfaceBlockReservedName.sksl",
   "/sksl/errors/InterfaceBlockScope.sksl",
   "/sksl/errors/InterfaceBlockStorageModifiers.sksl",
   "/sksl/errors/InterfaceBlockWithNoMembers.sksl",
@@ -74,7 +77,6 @@ sksl_error_tests = [
   "/sksl/errors/InvalidOutParams.sksl",
   "/sksl/errors/InvalidToken.sksl",
   "/sksl/errors/InvalidUnary.sksl",
-  "/sksl/errors/LastFragColorWithoutCaps.sksl",
   "/sksl/errors/LayoutInFunctions.sksl",
   "/sksl/errors/LayoutInInterfaceBlock.sksl",
   "/sksl/errors/LayoutInStruct.sksl",
@@ -86,6 +88,8 @@ sksl_error_tests = [
   "/sksl/errors/MatrixToVectorCastInteger.sksl",
   "/sksl/errors/MatrixToVectorCastTooSmall.sksl",
   "/sksl/errors/MismatchedNumbers.sksl",
+  "/sksl/errors/MultipleFields.sksl",
+  "/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl",
   "/sksl/errors/ModifiersInStruct.sksl",
   "/sksl/errors/NoES3ModifierInUserCode.sksl",
   "/sksl/errors/OpaqueTypeAssignment.sksl",
@@ -122,6 +126,13 @@ sksl_error_tests = [
   "/sksl/errors/Ossfuzz40428.sksl",
   "/sksl/errors/Ossfuzz40479.sksl",
   "/sksl/errors/Ossfuzz40660.sksl",
+  "/sksl/errors/Ossfuzz44045.sksl",
+  "/sksl/errors/Ossfuzz44551.sksl",
+  "/sksl/errors/Ossfuzz44555.sksl",
+  "/sksl/errors/Ossfuzz44557.sksl",
+  "/sksl/errors/Ossfuzz44559.sksl",
+  "/sksl/errors/Ossfuzz44561.sksl",
+  "/sksl/errors/Ossfuzz44565.sksl",
   "/sksl/errors/OverflowFloatLiteral.sksl",
   "/sksl/errors/OverflowInlinedLiteral.sksl",
   "/sksl/errors/OverflowIntLiteral.sksl",
@@ -132,6 +143,7 @@ sksl_error_tests = [
   "/sksl/errors/ProgramTooLarge_Stack.sksl",
   "/sksl/errors/PrototypeInFuncBody.sksl",
   "/sksl/errors/PrivateTypes.sksl",
+  "/sksl/errors/PrivateVariables.sksl",
   "/sksl/errors/RedeclareBasicType.sksl",
   "/sksl/errors/RedeclareSamplerType.sksl",
   "/sksl/errors/RedeclareStruct.sksl",
@@ -193,8 +205,10 @@ sksl_error_tests = [
   "/sksl/errors/StaticSwitchWithConditionalBreak.sksl",
   "/sksl/errors/StaticSwitchWithConditionalContinue.sksl",
   "/sksl/errors/StaticSwitchWithConditionalReturn.sksl",
+  "/sksl/errors/StructMemberReservedName.sksl",
   "/sksl/errors/StructNameWithoutIdentifier.sksl",
   "/sksl/errors/StructTooDeeplyNested.sksl",
+  "/sksl/errors/StructVariableReservedName.sksl",
   "/sksl/errors/SwitchDuplicateCase.sksl",
   "/sksl/errors/SwitchDuplicateDefault.sksl",
   "/sksl/errors/SwitchTypes.sksl",
@@ -206,6 +220,7 @@ sksl_error_tests = [
   "/sksl/errors/SwizzleOutOfBounds.sksl",
   "/sksl/errors/SwizzleTooManyComponents.sksl",
   "/sksl/errors/TernaryMismatch.sksl",
+  "/sksl/errors/UnassignedOutParameter.sksl",
   "/sksl/errors/UndeclaredFunction.sksl",
   "/sksl/errors/UndefinedFunction.sksl",
   "/sksl/errors/UndefinedSymbol.sksl",
@@ -232,6 +247,7 @@ sksl_glsl_tests = [
   "/sksl/glsl/ForceHighPrecision.sksl",
   "/sksl/glsl/IncompleteShortIntPrecision.sksl",
   "/sksl/glsl/LastFragColor.sksl",
+  "/sksl/glsl/LastFragColorWithoutCaps.sksl",
   "/sksl/glsl/LayoutQualifiers.sksl",
   "/sksl/glsl/ShortIntPrecision.sksl",
   "/sksl/glsl/TextureSharpenVersion110.sksl",
@@ -264,13 +280,14 @@ sksl_spirv_tests = [
   "/sksl/spirv/OpaqueTypeInArray.sksl",
   "/sksl/spirv/Ossfuzz35916.sksl",
   "/sksl/spirv/Ossfuzz37627.sksl",
+  "/sksl/spirv/Ossfuzz44096.sksl",
+  "/sksl/spirv/UnusedInterfaceBlock.sksl",
   "/sksl/workarounds/RewriteMatrixVectorMultiply.sksl",
   "/sksl/errors/LayoutInInterfaceBlock.sksl",
   "/sksl/errors/LayoutInStruct.sksl",
   "/sksl/errors/Ossfuzz36850.sksl",
   "/sksl/errors/Ossfuzz37469.sksl",
   "/sksl/errors/UndefinedFunction.sksl",
-  "/sksl/errors/UnusedInterfaceBlock.sksl",
 ]
 
 sksl_shared_tests = [
@@ -394,6 +411,7 @@ sksl_shared_tests = [
   "/sksl/shared/ForLoopControlFlow.sksl",
   "/sksl/shared/ForLoopMultipleInit.sksl",
   "/sksl/shared/FragCoords.sksl",
+  "/sksl/shared/FunctionAnonymousParameters.sksl",
   "/sksl/shared/FunctionArgTypeMatch.sksl",
   "/sksl/shared/FunctionReturnTypeMatch.sksl",
   "/sksl/shared/FunctionPrototype.sksl",
@@ -403,6 +421,7 @@ sksl_shared_tests = [
   "/sksl/shared/HelloWorld.sksl",
   "/sksl/shared/Hex.sksl",
   "/sksl/shared/HexUnsigned.sksl",
+  "/sksl/shared/InoutParameters.sksl",
   "/sksl/shared/InstanceID.vert",
   "/sksl/shared/InterfaceBlockNamed.sksl",
   "/sksl/shared/InterfaceBlockNamedArray.sksl",
@@ -411,7 +430,7 @@ sksl_shared_tests = [
   "/sksl/shared/MatrixConstructorsES2.sksl",
   "/sksl/shared/MatrixConstructorsES3.sksl",
   "/sksl/shared/MatrixEquality.sksl",
-  "/sksl/shared/MatrixScalarSplat.sksl",
+  "/sksl/shared/MatrixScalarMath.sksl",
   "/sksl/shared/MatrixToVectorCast.sksl",
   "/sksl/shared/MultipleAssignments.sksl",
   "/sksl/shared/Negation.sksl",
@@ -437,7 +456,7 @@ sksl_shared_tests = [
   "/sksl/shared/Ossfuzz37900.sksl",
   "/sksl/shared/Ossfuzz41000.sksl",
   "/sksl/shared/OutParams.sksl",
-  "/sksl/shared/OutParamsNoInline.sksl",
+  "/sksl/shared/OutParamsAreDistinct.sksl",
   "/sksl/shared/OutParamsTricky.sksl",
   "/sksl/shared/Overflow.sksl",
   "/sksl/shared/RectangleTexture.sksl",
@@ -508,6 +527,7 @@ sksl_folding_tests = [
   "/sksl/folding/SelfAssignment.sksl",
   "/sksl/folding/ShortCircuitBoolFolding.sksl",
   "/sksl/folding/SwizzleFolding.sksl",
+  "/sksl/folding/SwitchCaseFolding.sksl",
   "/sksl/folding/VectorScalarFolding.sksl",
   "/sksl/folding/VectorVectorFolding.sksl",
 ]
@@ -529,14 +549,12 @@ sksl_inliner_tests = [
   "/sksl/inliner/InlinerElidesTempVarForReturnsInsideBlock.sksl",
   "/sksl/inliner/InlinerUsesTempVarForMultipleReturns.sksl",
   "/sksl/inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl",
-  "/sksl/inliner/InlineWithInoutArgument.sksl",
   "/sksl/inliner/InlineWithModifiedArgument.sksl",
   "/sksl/inliner/InlineWithNestedBigCalls.sksl",
   "/sksl/inliner/InlineWithNestedCalls.sksl",
   "/sksl/inliner/InlineWithUnmodifiedArgument.sksl",
   "/sksl/inliner/InlineWithUnnecessaryBlocks.sksl",
   "/sksl/inliner/InlinerAvoidsVariableNameOverlap.sksl",
-  "/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.sksl",
   "/sksl/inliner/InlinerManglesNames.sksl",
   "/sksl/inliner/NoInline.sksl",
   "/sksl/inliner/Ossfuzz37994.sksl",
@@ -614,6 +632,7 @@ sksl_rte_tests = [
   "/sksl/runtime/ArrayIndexing.rts",
   "/sksl/runtime/ArrayNarrowingConversions.rts",
   "/sksl/runtime/Blend.rtb",
+  "/sksl/runtime/ChildEffects.rts",
   "/sksl/runtime/Commutative.rts",
   "/sksl/runtime/ConstPreservation.rts",
   "/sksl/runtime/ConversionConstructors.rts",
@@ -683,6 +702,8 @@ sksl_rte_error_tests = [
   "/sksl/runtime_errors/ReservedNameSubpassInput.rts",
   "/sksl/runtime_errors/ReservedNameSubpassInputMS.rts",
   "/sksl/runtime_errors/ReservedNameTexture2D.rts",
+  "/sksl/runtime_errors/TypeAliases.rts",
+  "/sksl/runtime_errors/UnsupportedExtension.rts",
   "/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts",
   "/sksl/runtime_errors/UnsupportedTypeSampler.rts",
   "/sksl/runtime_errors/UnsupportedTypeTexture.rts",
diff --git a/third_party/skia/gn/tests.gni b/third_party/skia/gn/tests.gni
index 0532dd5b5ea40..2a7eac03f7350 100644
--- a/third_party/skia/gn/tests.gni
+++ b/third_party/skia/gn/tests.gni
@@ -52,6 +52,7 @@ tests_sources = [
   "$_tests/CopySurfaceTest.cpp",
   "$_tests/CubicMapTest.cpp",
   "$_tests/CullTestTest.cpp",
+  "$_tests/CustomMeshTest.cpp",
   "$_tests/DashPathEffectTest.cpp",
   "$_tests/DataRefTest.cpp",
   "$_tests/DebugLayerManagerTest.cpp",
@@ -97,6 +98,7 @@ tests_sources = [
   "$_tests/GrContextOOM.cpp",
   "$_tests/GrDDLImageTest.cpp",
   "$_tests/GrFinishedFlushTest.cpp",
+  "$_tests/GrGlyphVectorTest.cpp",
   "$_tests/GrMemoryPoolTest.cpp",
   "$_tests/GrOpListFlushTest.cpp",
   "$_tests/GrPorterDuffTest.cpp",
@@ -106,6 +108,7 @@ tests_sources = [
   "$_tests/GrSlugTest.cpp",
   "$_tests/GrStyledShapeTest.cpp",
   "$_tests/GrSubmittedFlushTest.cpp",
+  "$_tests/GrSurfaceResolveTest.cpp",
   "$_tests/GrSurfaceTest.cpp",
   "$_tests/GrTextBlobTest.cpp",
   "$_tests/GrTextureMipMapInvalidationTest.cpp",
@@ -214,6 +217,7 @@ tests_sources = [
   "$_tests/SVGDeviceTest.cpp",
   "$_tests/SafeMathTest.cpp",
   "$_tests/SamplingTest.cpp",
+  "$_tests/SaveLayerOriginTest.cpp",
   "$_tests/ScalarTest.cpp",
   "$_tests/ScaleToSidesTest.cpp",
   "$_tests/SerialProcsTest.cpp",
@@ -230,7 +234,6 @@ tests_sources = [
   "$_tests/SkColorSpaceXformStepsTest.cpp",
   "$_tests/SkDOMTest.cpp",
   "$_tests/SkDSLRuntimeEffectTest.cpp",
-  "$_tests/SkFixed15Test.cpp",
   "$_tests/SkGaussFilterTest.cpp",
   "$_tests/SkGlyphBufferTest.cpp",
   "$_tests/SkGlyphTest.cpp",
@@ -245,6 +248,7 @@ tests_sources = [
   "$_tests/SkSLDSLOnlyTest.cpp",
   "$_tests/SkSLDSLTest.cpp",
   "$_tests/SkSLES2ConformanceTest.cpp",
+  "$_tests/SkSLErrorTest.cpp",
   "$_tests/SkSLGLSLTestbed.cpp",
   "$_tests/SkSLInterpreterTest.cpp",
   "$_tests/SkSLMemoryLayoutTest.cpp",
@@ -258,8 +262,8 @@ tests_sources = [
   "$_tests/SkStrikeCacheTest.cpp",
   "$_tests/SkStringViewTest.cpp",
   "$_tests/SkTBlockListTest.cpp",
-  "$_tests/SkTOptionalTest.cpp",
   "$_tests/SkUTFTest.cpp",
+  "$_tests/SkVMDebugTracePlayerTest.cpp",
   "$_tests/SkVMDebugTraceTest.cpp",
   "$_tests/SkVMTest.cpp",
   "$_tests/SkVxTest.cpp",
@@ -308,7 +312,6 @@ tests_sources = [
   "$_tests/VkProtectedContextTest.cpp",
   "$_tests/VkWrapTests.cpp",
   "$_tests/VkYcbcrSamplerTest.cpp",
-  "$_tests/VptrTest.cpp",
   "$_tests/WebpTest.cpp",
   "$_tests/WindowRectanglesTest.cpp",
   "$_tests/WrappedSurfaceCopyOnWriteTest.cpp",
@@ -332,9 +335,12 @@ metal_tests_sources = [
 
 graphite_tests_sources = [
   "$_tests/graphite/BackendTextureTest.cpp",
+  "$_tests/graphite/ComboTest.cpp",
   "$_tests/graphite/CommandBufferTest.cpp",
   "$_tests/graphite/IntersectionTreeTest.cpp",
+  "$_tests/graphite/KeyTest.cpp",
   "$_tests/graphite/MaskTest.cpp",
+  "$_tests/graphite/RecorderTest.cpp",
   "$_tests/graphite/RectTest.cpp",
   "$_tests/graphite/ShapeTest.cpp",
   "$_tests/graphite/TransformTest.cpp",
diff --git a/third_party/skia/gn/toolchain/BUILD.gn b/third_party/skia/gn/toolchain/BUILD.gn
index 8029086eff1d1..a966e320df654 100644
--- a/third_party/skia/gn/toolchain/BUILD.gn
+++ b/third_party/skia/gn/toolchain/BUILD.gn
@@ -1,3 +1,6 @@
+if (is_wasm) {
+  import("wasm.gni")
+}
 if (is_fuchsia) {
   import("//build/fuchsia/sdk.gni")
 }
@@ -419,3 +422,15 @@ gcc_like_toolchain("gcc_like_host") {
   cxx = host_cxx
   link = host_link
 }
+
+# Only define this toolchain if actually building for wasm.
+if (is_wasm) {
+  gcc_like_toolchain("wasm") {
+    cpu = "wasm"
+    os = "wasm"
+    ar = "$skia_emsdk_dir/upstream/emscripten/emar"
+    cc = "$skia_emsdk_dir/upstream/emscripten/emcc"
+    cxx = "$skia_emsdk_dir/upstream/emscripten/em++"
+    link = cxx
+  }
+}
diff --git a/third_party/skia/gn/toolchain/wasm.gni b/third_party/skia/gn/toolchain/wasm.gni
new file mode 100644
index 0000000000000..cf34caaaa0edc
--- /dev/null
+++ b/third_party/skia/gn/toolchain/wasm.gni
@@ -0,0 +1,66 @@
+# Copyright (c) 2022 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../../modules/canvaskit/canvaskit.gni")
+
+# Defines the configuration of emscripten for building WASM targets.
+import("../skia.gni")
+declare_args() {
+  # The location of an activated emsdk. We default to the one brought in by
+  # DEPS and bin/activate-emsdk.
+  skia_emsdk_dir = rebase_path("../../third_party/externals/emsdk")
+}
+
+skia_wasm_toolchain = "//gn/toolchain:wasm"
+is_wasm = target_os == "wasm"
+
+# Defines a WASM library target.
+template("skia_wasm_lib") {
+  _vars_to_forward = [
+    "cflags",
+    "ldflags",
+    "defines",
+    "deps",
+    "includes",
+    "sources",
+    "include_dirs",
+    "public_configs",
+    "testonly",
+    "visibility",
+  ]
+
+  _lib_name = target_name
+
+  executable("${_lib_name}.js") {
+    forward_variables_from(invoker, _vars_to_forward)
+    output_extension = ""
+  }
+
+  group("$_lib_name") {
+    deps = [ ":${_lib_name}.js($skia_wasm_toolchain)" ]
+  }
+}
+
+wasm_defines = [
+  "SKNX_NO_SIMD",
+  "SK_DISABLE_AAA",
+  "SK_FORCE_8_BYTE_ALIGNMENT",
+]
+
+if (!is_debug && !skia_canvaskit_force_tracing) {
+  wasm_defines += [ "SK_DISABLE_TRACING" ]
+}
+
+if (skia_enable_gpu) {
+  wasm_defines += [ "SK_DISABLE_LEGACY_SHADERCONTEXT" ]
+}
+
+if (!skia_canvaskit_enable_effects_deserialization ||
+    !skia_canvaskit_enable_skp_serialization) {
+  wasm_defines += [ "SK_DISABLE_EFFECT_DESERIALIZATION" ]
+}
+
+if (!skia_canvaskit_enable_alias_font) {
+  wasm_defines += [ "CANVASKIT_NO_ALIAS_FONT" ]
+}
diff --git a/third_party/skia/gn/utils.gni b/third_party/skia/gn/utils.gni
index 1237e75afb5e0..96fd884d09fd0 100644
--- a/third_party/skia/gn/utils.gni
+++ b/third_party/skia/gn/utils.gni
@@ -68,6 +68,8 @@ skia_utils_sources = [
   "$_src/utils/SkPatchUtils.h",
   "$_src/utils/SkPolyUtils.cpp",
   "$_src/utils/SkPolyUtils.h",
+  "$_src/utils/SkShaderUtils.cpp",
+  "$_src/utils/SkShaderUtils.h",
   "$_src/utils/SkShadowTessellator.cpp",
   "$_src/utils/SkShadowTessellator.h",
   "$_src/utils/SkShadowUtils.cpp",
@@ -78,6 +80,8 @@ skia_utils_sources = [
   "$_src/utils/SkThreadUtils_win.cpp",
   "$_src/utils/SkUTF.cpp",
   "$_src/utils/SkUTF.h",
+  "$_src/utils/SkVMVisualizer.cpp",
+  "$_src/utils/SkVMVisualizer.h",
 
   #mac
   "$_src/utils/mac/SkCGBase.h",
diff --git a/third_party/skia/go.mod b/third_party/skia/go.mod
index b8b2d4d099544..41b8110a3aa45 100644
--- a/third_party/skia/go.mod
+++ b/third_party/skia/go.mod
@@ -4,63 +4,20 @@ go 1.12
 
 require (
 	cloud.google.com/go v0.72.0 // indirect
-	cloud.google.com/go/datastore v1.3.0
-	cloud.google.com/go/pubsub v1.8.3 // indirect
+	cloud.google.com/go/pubsub v1.8.3
 	cloud.google.com/go/storage v1.12.0
-	github.com/99designs/goodies v0.0.0-20140916053233-ec7f410f2ff2 // indirect
-	github.com/GeertJohan/go.rice v1.0.0 // indirect
-	github.com/Microsoft/go-winio v0.4.15 // indirect
-	github.com/OneOfOne/struct2ts v1.0.4 // indirect
-	github.com/VividCortex/godaemon v0.0.0-20150910212227-3d9f6e0b234f // indirect
 	github.com/andygrunwald/go-gerrit v0.0.0-20200503132804-ed2419acda39
 	github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc // indirect
-	github.com/bazelbuild/rules_go v0.25.0 // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/codegangsta/negroni v1.0.0 // indirect
-	github.com/daaku/go.zipexe v1.0.1 // indirect
-	github.com/dgraph-io/ristretto v0.0.3 // indirect
-	github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
 	github.com/flynn/json5 v0.0.0-20160717195620-7620272ed633
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0 // indirect
 	github.com/google/uuid v1.1.2
-	github.com/gophercloud/gophercloud v0.1.0 // indirect
-	github.com/gorilla/csrf v1.7.0 // indirect
-	github.com/huin/goserial v0.0.0-20121012073615-7b90efdb22b1 // indirect
-	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
-	github.com/jackc/pgx v3.2.0+incompatible // indirect
-	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.11.3 // indirect
-	github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
-	github.com/maruel/subcommands v1.0.0 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/neo4j-drivers/gobolt v1.7.4 // indirect
-	github.com/peterh/liner v1.2.0 // indirect
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/common v0.15.0 // indirect
-	github.com/rogpeppe/go-internal v1.5.0 // indirect
-	github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4 // indirect
 	github.com/stretchr/testify v1.6.1
-	github.com/ugorji/go v1.1.4 // indirect
-	github.com/vektra/mockery v1.1.2 // indirect
-	github.com/xanzy/ssh-agent v0.3.0 // indirect
-	github.com/yosuke-furukawa/json5 v0.1.1 // indirect
-	go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect
 	go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect
-	go.skia.org/infra v0.0.0-20211201214445-039210fafe39
-	go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect
+	go.skia.org/infra v0.0.0-20220110171919-69477ccd2d29
 	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
-	golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect
-	golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
 	golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
 	google.golang.org/api v0.35.0
 	google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4 // indirect
-	honnef.co/go/tools v0.0.1-2020.1.6 // indirect
-	k8s.io/klog v1.0.0 // indirect
-	rsc.io/sampler v1.99.99 // indirect
-	sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect
-	sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
 )
diff --git a/third_party/skia/go.sum b/third_party/skia/go.sum
index c9ac47a58f1f8..bc30895901dd3 100644
--- a/third_party/skia/go.sum
+++ b/third_party/skia/go.sum
@@ -1,168 +1,78 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
-cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.43.0 h1:banaiRPAM8kUVYneOSkhgcDsLzEvL25FinuiSZaH/2w=
-cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg=
-cloud.google.com/go v0.44.1 h1:7gXaI3V/b4DRaK++rTqhRajcT7z8gtP0qKMZTXqlySM=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1 h1:lRi0CHyU+ytlvylOlFKKq0af6JncuyoRh1J+QJBqQx0=
 cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3 h1:AVXDdKsrtX33oR9fbCMu/+c1o8Ofjq6Ku/MInaLVg5Y=
 cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
 cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
-cloud.google.com/go v0.52.0 h1:GGslhk/BU052LPlnI1vpp3fcbUs+hQ3E+Doti/3/vF8=
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0 h1:MZQCQQaRwOrAcuKjiHWHrgKykt4fZyuwF2dtiG3fGW8=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.55.0 h1:eoz/lYxKSL4CNAiaUJ0ZfD1J3bfMYbU5B3rwM1C1EIU=
-cloud.google.com/go v0.55.0/go.mod h1:ZHmoY+/lIMNkN2+fBmuTiqZ4inFhvQad8ft7MT8IV5Y=
-cloud.google.com/go v0.56.0 h1:WRz29PgAsVEyPSDHyk+0fpEkwEFyfhHn+JbksT6gIL4=
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0 h1:EpMNVUorLiZIELdMZbCYX/ByTFCdoYopYAGxaGVz9ms=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.58.0 h1:vtAfVc723K3xKq1BQydk/FyCldnaNFhGhpJxaJzgRMQ=
-cloud.google.com/go v0.58.0/go.mod h1:W+9FnSUw6nhVwXlFcp1eL+krq5+HQUJeUogSeJZZiWg=
-cloud.google.com/go v0.59.0 h1:BM3svUDU3itpc2m5cu5wCyThIYNDlFlts9GASw31GW8=
-cloud.google.com/go v0.59.0/go.mod h1:qJxNOVCRTxHfwLhvDxxSI9vQc1zI59b9pEglp1Iv60E=
-cloud.google.com/go v0.60.0 h1:R+tDlceO7Ss+zyvtsdhTxacDyZ1k99xwskQ4FT7ruoM=
-cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU=
-cloud.google.com/go v0.61.0 h1:NLQf5e1OMspfNT1RAHOB3ublr1TW3YTXO8OiWwVjK2U=
 cloud.google.com/go v0.61.0/go.mod h1:XukKJg4Y7QsUu0Hxg3qQKUWR4VuWivmyMK2+rUyxAqw=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.63.0 h1:A+DfAZQ/eWca7gvu42CS6FNSDX4R8cghF+XfWLn4R6g=
 cloud.google.com/go v0.63.0/go.mod h1:GmezbQc7T2snqkEXWfZ0sy0VfkB/ivI2DdtJL2DEmlg=
 cloud.google.com/go v0.64.0/go.mod h1:xfORb36jGvE+6EexW71nMEtL025s3x6xvuYUKM4JLv4=
-cloud.google.com/go v0.65.0 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.66.0/go.mod h1:dgqGAjKCDxyhGTtC9dAREQGUJpkceNm1yt590Qno0Ko=
-cloud.google.com/go v0.70.0 h1:ujhG1RejZYi+HYfJNlgBh3j/bVKD8DewM7AkJ5UPyBc=
 cloud.google.com/go v0.70.0/go.mod h1:/UTKYRQTWjVnSe7nGvoSzxEFUELzSI/yAYd0JQT6cRo=
 cloud.google.com/go v0.71.0/go.mod h1:qZfY4Y7AEIQwG/fQYD3xrxLNkQZ0Xzf3HGeqCkA6LVM=
 cloud.google.com/go v0.72.0 h1:eWRCuwubtDrCJG0oSUMgnsbD4CmPFQF2ei4OFbXvwww=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go/bigquery v1.0.1 h1:hL+ycaJpVE9M7nLoiXb/Pn10ENE2u+oddxbD8uu0ZVU=
 cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
 cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
 cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
 cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.6.0 h1:ajp/DjpiCHO71SyIhwb83YsUGAyWuzVvMko+9xCsJLw=
-cloud.google.com/go/bigquery v1.6.0/go.mod h1:hyFDG0qSGdHNz8Q6nDN8rYIkld0q/+5uBZaelxiDLfE=
 cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
 cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA=
 cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/bigtable v1.3.0 h1:PAplkJLXheOLlK5PPyy4/HXtPzHn+1/LaYDWIeGxnio=
-cloud.google.com/go/bigtable v1.3.0/go.mod h1:z5EyKrPE8OQmeg4h5MNdKvuSnI9CCT49Ki3f23aBzio=
-cloud.google.com/go/bigtable v1.4.0 h1:53CVzqOOfDOZLgwdbxktMY7FVcg+V7VbFIvz6TT6+x4=
-cloud.google.com/go/bigtable v1.4.0/go.mod h1:AgdyvSw1ksn4wdYT4sXDZSXlaaM6WpdWQyD7DE5ggPM=
-cloud.google.com/go/bigtable v1.5.0 h1:ylPDE1w1+koWpPOzf8HkX2PqKaIvN8hPc9t+F0GT3do=
-cloud.google.com/go/bigtable v1.5.0/go.mod h1:713PsD2nkJwTioSe6vF/sFCAcjhINJ62cEtKCr8u+F8=
 cloud.google.com/go/bigtable v1.6.0 h1:hcHWHVX8sfXW4qgfB0fYVd3i22Od2TK6gxoN7EWsbwY=
 cloud.google.com/go/bigtable v1.6.0/go.mod h1:tqUJmGg13x13j3xXf6oUXsB7ZEI1mxd5wGMvLStr8y0=
-cloud.google.com/go/datastore v1.0.0 h1:Kt+gOPPp2LEPWp8CSfxhsM8ik9CcyE/gYu+0r+RnZvM=
 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/datastore v1.2.0 h1:906wMszEeOl3+WoaxXeoBpZbSWmZ/q2xRHMIVLBLCJc=
-cloud.google.com/go/datastore v1.2.0/go.mod h1:FKd9dFEjRui5757lkOJ7z/eKtL74o5hsbY0o6Z0ozz8=
 cloud.google.com/go/datastore v1.3.0 h1:+T3aKNlZd+MABChjtgQqz5kVysNrFubz5HmljVQG4Zg=
 cloud.google.com/go/datastore v1.3.0/go.mod h1:HMXIAklx0N49XfVDSw1orj80NgkzaLRO9MW/uEIzoD0=
 cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
-cloud.google.com/go/firestore v1.2.0 h1:zrl+2VJAYC/C6WzEPnkqZIBeHyHFs/UmtzJdXU4Bvmo=
-cloud.google.com/go/firestore v1.2.0/go.mod h1:iISCjWnTpnoJT1R287xRdjvQHJrxQOpeah4phb5D3h0=
 cloud.google.com/go/firestore v1.3.0 h1:QaBSisuvNi9/o+3nCHqUEfduHCPfhEw2jcUofi0n8oY=
 cloud.google.com/go/firestore v1.3.0/go.mod h1:Qt0gS9Qz9tROrmgFavo36+hdST1FXvmtnGnO0Dr03pU=
-cloud.google.com/go/logging v1.0.0 h1:kaunpnoEh9L4hu6JUsBa8Y20LBfKnCuDhKUgdZp7oK8=
-cloud.google.com/go/logging v1.0.0/go.mod h1:V1cc3ogwobYzQq5f2R7DS/GvRIrI4FKj01Gs5glwAls=
 cloud.google.com/go/logging v1.1.1 h1:mU+6wZyP0llWyobJ+aJFqeEfDzMp95R449wEPPILVX0=
 cloud.google.com/go/logging v1.1.1/go.mod h1:oShOorPr2XGlPEXXI9VUJQH10md4lW25RYpSJjhE0TM=
-cloud.google.com/go/pubsub v1.0.1 h1:W9tAK3E57P75u0XLLR82LZyw8VpAnhmyTOxW9qzmyj8=
 cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0 h1:9/vpR43S4aJaROxqQHQ3nH9lfyKKV0dC3vOmnw8ebQQ=
 cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0 h1:Lpy6hKgdcl7a3WGSfJIFmxmcdjSpP6OmBEfcOv1Y680=
 cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1 h1:ukjixP1wl0LpnZ6LWtZJ0mX5tBmjp1f8Sqer8Z2OMUU=
 cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/pubsub v1.4.0 h1:76oR7VBOkL7ivoIrFKyW0k7YDCRelrlxktIzQiIUGgg=
-cloud.google.com/go/pubsub v1.4.0/go.mod h1:LFrqilwgdw4X2cJS9ALgzYmMu+ULyrUN6IHV3CPK4TM=
-cloud.google.com/go/pubsub v1.5.0 h1:9cH52jizPUVSSrSe+J16RC9wB0QI7i/cfuCm5UUCcIk=
-cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w=
-cloud.google.com/go/pubsub v1.6.0 h1:bDVdVLswSdDKRQDXlAUKDwnW4zV5bsH99W2lqd2gd+I=
-cloud.google.com/go/pubsub v1.6.0/go.mod h1:I6DkrTv7tKIvDQTZt+6rAFo1446FEoVDJeLXTu4pCcE=
-cloud.google.com/go/pubsub v1.6.1 h1:lhCQrTgu7f5SjWm5yJO0geSsPORQ2OAD+Eq1AMyBW8Y=
-cloud.google.com/go/pubsub v1.6.1/go.mod h1:kvW9rcn9OLEx6eTIzMBbWbpB8YsK3vu9jxgPolVz+p4=
-cloud.google.com/go/pubsub v1.8.2 h1:PpS9dq+D7eSjQ0YAx5fxO33LjqHVpAlXFrpvt/LoVy8=
 cloud.google.com/go/pubsub v1.8.2/go.mod h1:tQ1zYqOrDLXxRyNeL/CQW58NaVOTnPPDYFxmJQ1k3QI=
 cloud.google.com/go/pubsub v1.8.3 h1:kl5QdIn98mYhX+G7OzdQ9W3SQ0XXdhHlTw0GHa723pI=
 cloud.google.com/go/pubsub v1.8.3/go.mod h1:m8NMRz5lt0YjbQQ40RjocDVRjgYyzyYpP6ix3dxwRno=
-cloud.google.com/go/spanner v1.2.0/go.mod h1:LfwGAsK42Yz8IeLsd/oagGFBqTXt3xVWtm8/KD2vrEI=
-cloud.google.com/go/spanner v1.8.0/go.mod h1:mdAPDiFUbE9vCmhHHlxyDUtaPPsIK+pUdf5KmHaUfT8=
 cloud.google.com/go/spanner v1.9.0 h1:WXuGWhUp5i7MeUMzMrJlodqJvSGtU0Cdw6BdHGgCgVo=
 cloud.google.com/go/spanner v1.9.0/go.mod h1:xvlEn0NZ5v1iJPYsBnUVRDNvccDxsBTEi16pJRKQVws=
 cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0 h1:RPUcBvDeYgQFMfQu1eBMq6piD1SXmLH+vK3qjewZPus=
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0 h1:UDpwYIwla4jHGzZJaEJYx1tOejbgSoNqsAfHAUYe2r8=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.7.0 h1:DzdLPI8Em+DEk7IzA2a10ivq3mxIEASC9GeNJ6FFt5Q=
-cloud.google.com/go/storage v1.7.0/go.mod h1:jGMIBwF+L/tL6WN/W5InNgYYu4HP0DvGB6rQ1mufWfs=
-cloud.google.com/go/storage v1.8.0 h1:86K1Gel7BQ9/WmNWn7dTKMvTLFzwtBe5FNqYbi9X35g=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.9.0 h1:oXnZyBjHB6hC8TnSle0AWW6pGJ29EuSo5ww+SFmdNBg=
-cloud.google.com/go/storage v1.9.0/go.mod h1:m+/etGaqZbylxaNT876QGXqEHp4PR2Rq5GMqICWb9bU=
-cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 cloud.google.com/go/storage v1.12.0 h1:4y3gHptW1EHVtcPAVE0eBBlFuGqEejTTG3KdIE0lUX4=
 cloud.google.com/go/storage v1.12.0/go.mod h1:fFLk2dp2oAhDz8QFKwqrjdJvxSp/W2g7nillojlL5Ho=
-contrib.go.opencensus.io/exporter/stackdriver v0.13.1 h1:RX9W6FelAqTVnBi/bRXJLXr9n18v4QkQwZYIdnNS51I=
-contrib.go.opencensus.io/exporter/stackdriver v0.13.1/go.mod h1:z2tyTZtPmQ2HvWH4cOmVDgtY+1lomfKdbLnkJvZdc8c=
-contrib.go.opencensus.io/exporter/stackdriver v0.13.2 h1:5lKLBwUuq4S6pTbYaBtWmnay3eJfKNS3qL8M8HM5fM4=
-contrib.go.opencensus.io/exporter/stackdriver v0.13.2/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.4 h1:ksUxwH3OD5sxkjzEqGxNTl+Xjsmu3BnC/300MhSVTSc=
 contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9 h1:VpgP7xuJadIUuKccphEpTJnWhS2jkQyMt6Y7pJCD7fY=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/99designs/goodies v0.0.0-20140916053233-ec7f410f2ff2 h1:fDVqZtKvHbahsmAyx44RVCFK5uuqXHzZfeegx37QJwk=
-github.com/99designs/goodies v0.0.0-20140916053233-ec7f410f2ff2/go.mod h1:cbC1BMQYOqZ70I8LEvH53q53MzD33COOamPrxo0Y3Wk=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-autorest v11.1.2+incompatible h1:viZ3tV5l4gE2Sw0xrasFHytCGtzYCrT+um/rrSQ1BfA=
-github.com/Azure/go-autorest v11.1.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest v0.9.6 h1:5YWtOnckcudzIw8lPPBcWOnmIFWMtHci1ZWAZulMSx0=
-github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
 github.com/Azure/go-autorest/autorest v0.11.12 h1:gI8ytXbxMfI+IVbI9mP2JGCTXIuhHLgRlvQ9X4PsnHE=
 github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.8.2 h1:O1X4oexUxnZCaEUGsvMnr8ZGj8HI37tNezwY4npRqA0=
-github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.9.5 h1:Y3bBUV4rTuxenJJs41HU3qmqsb+auo+a3Lz+PlJPpL0=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
 github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
 github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk=
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
 github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE=
 github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
@@ -171,14 +81,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOC
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.3.12 h1:HvD2NhKPLSeO3Ots6YV0ePgs4l3wO0bLqa9Uk1yeMOs=
 github.com/ClickHouse/clickhouse-go v1.3.12/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
-github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg=
-github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0=
-github.com/GeertJohan/go.rice v1.0.0 h1:KkI6O9uMaQU3VEKaj01ulavtF7o1fWT7+pk/4voiMLQ=
-github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0=
-github.com/Jeffail/gabs/v2 v2.5.0 h1:ERXffrksCEPjKVDWbZDBcOwrpXctXfeFGXxOQh1umOE=
-github.com/Jeffail/gabs/v2 v2.5.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
-github.com/Jeffail/gabs/v2 v2.5.1 h1:ANfZYjpMlfTTKebycu4X1AgkVWumFVDYQl7JwOr4mDk=
-github.com/Jeffail/gabs/v2 v2.5.1/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
 github.com/Jeffail/gabs/v2 v2.6.0 h1:WdCnGaDhNa4LSRTMwhLZzJ7SRDXjABNP13SOKvCpL5w=
 github.com/Jeffail/gabs/v2 v2.6.0/go.mod h1:xCn81vdHKxFUuWWAaD5jCTQDNPBMh5pPs9IJ+NcziBI=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
@@ -194,37 +96,23 @@ github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN
 github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
 github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
-github.com/Microsoft/go-winio v0.4.15 h1:qkLXKzb1QoVatRyd/YlXZ/Kg0m5K3SPuoD82jjSOaBc=
-github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0=
 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
-github.com/OneOfOne/struct2ts v1.0.4 h1:q6oBD4F+2wOPwCwDHK6scvJDs6MG77b4RZXfHAdZisg=
-github.com/OneOfOne/struct2ts v1.0.4/go.mod h1:GbIenlFXroS2wRhpYXHEq7y7HWsY3SFBIKxkqzbnAsU=
 github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
-github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/PuerkitoBio/goquery v1.6.0 h1:j7taAbelrdcsOlGeMenZxc2AWXD5fieT1/znArdnx94=
 github.com/PuerkitoBio/goquery v1.6.0/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/PuerkitoBio/purell v1.0.0 h1:0GoNN3taZV6QI81IXgCbxMyEaJDXMSIjArYBCYzVVvs=
-github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2 h1:JCHLVE3B+kJde7bIEo5N4J+ZbLhp0J1Fs+ulyRws4gE=
-github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/VividCortex/godaemon v0.0.0-20150910212227-3d9f6e0b234f h1:CGNNnJTXn6efEPOEHlxqRrvg9AP0Hsumy9vbXk8aU/k=
-github.com/VividCortex/godaemon v0.0.0-20150910212227-3d9f6e0b234f/go.mod h1:Y8CJ3IwPIAkMhv/rRUWIlczaeqd9ty9yrl+nc2AbaL4=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/a8m/envsubst v1.1.0 h1:d+14SVq1lbI+JuxhEqYduWofZ0/qQHatwm3TBzvdzaE=
-github.com/a8m/envsubst v1.1.0/go.mod h1:91m2Q6AZE0w4WD/laQam2MtWq6FxJVm7UqcB30DeYxw=
 github.com/a8m/envsubst v1.2.0 h1:yvzAhJD2QKdo35Ut03wIfXQmg+ta3wC/1bskfZynz+Q=
 github.com/a8m/envsubst v1.2.0/go.mod h1:PpvLvNWa+Rvu/10qXmFbFiGICIU5hZvFJNPCCkUaObg=
 github.com/aclements/go-gg v0.0.0-20170323211221-abd1f791f5ee h1:KJgh99JlYRhfgHtb7XyhAZSJMdfkjVmo3PP7XO1/HO8=
@@ -239,8 +127,6 @@ github.com/ajstarks/deck v0.0.0-20191009173945-82d717002242 h1:30XVZzSxUv+pE25mn
 github.com/ajstarks/deck v0.0.0-20191009173945-82d717002242/go.mod h1:j3f/59diR4DorW5A78eDYvRkdrkh+nps4p5LA1Tl05U=
 github.com/ajstarks/svgo v0.0.0-20190826172357-de52242f3d65 h1:kZegOsPGxfV9mM8WzfllNZOx3MvM5zItmhQlvITKVvA=
 github.com/ajstarks/svgo v0.0.0-20190826172357-de52242f3d65/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
-github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/alecthomas/jsonschema v0.0.0-20210526225647-edb03dcab7bc h1:mT8qSzuyEAkxbv4GBln7yeuQZpBnfikr3PTuiPs6Z3k=
@@ -254,12 +140,9 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d h1:UQZhZ2O0vMHr2c
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.2.0 h1:vuRCkM5Ozh/BfmsaTm26kbjm0mIOM3yS5Ek/F5h18aE=
 github.com/andybalholm/cascadia v1.2.0/go.mod h1:YCyR8vOZT9aZ1CHEd8ap0gMVm2aFgxBp0T0eFw1RUQY=
-github.com/andygrunwald/go-gerrit v0.0.0-20191101112536-3f5e365ccf57 h1:wtSQ14h8qAUezER6QPfYmCh5+W5Ly1lVruhm/QeOVUE=
-github.com/andygrunwald/go-gerrit v0.0.0-20191101112536-3f5e365ccf57/go.mod h1:0iuRQp6WJ44ts+iihy5E/WlPqfg5RNeQxOmzRkxCdtk=
 github.com/andygrunwald/go-gerrit v0.0.0-20200503132804-ed2419acda39 h1:MPEPS9/Wj22GJws8T+Ghs0FzncChap413xWSIihlwvg=
 github.com/andygrunwald/go-gerrit v0.0.0-20200503132804-ed2419acda39/go.mod h1:0iuRQp6WJ44ts+iihy5E/WlPqfg5RNeQxOmzRkxCdtk=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
@@ -289,88 +172,25 @@ github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQ
 github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.29.11 h1:f1QJRPu30p0i1lzKhkSSaZFudFGCra2HKgdE442nN6c=
 github.com/aws/aws-sdk-go v1.29.11/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
-github.com/aws/aws-sdk-go v1.30.11 h1:bJoa1QGyyAV4COx1SXpf+LElFVVnOreG6KM0jIxwZq0=
-github.com/aws/aws-sdk-go v1.30.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.21 h1:19EO1Jr80+jLwJyITzH8c79C/6EwY5mMyasqDbBiCuc=
-github.com/aws/aws-sdk-go v1.30.21/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.22 h1:wImJ8jQrplgmxaTeUY7FrJFn4te/VtWq+mmmJ1TnWAg=
-github.com/aws/aws-sdk-go v1.30.22/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.23 h1:1Npeg2q6hicbrHoFu6MoeqZdcQf8187BI0VwKxEfLAY=
-github.com/aws/aws-sdk-go v1.30.23/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.24 h1:y3JPD51VuEmVqN3BEDVm4amGpDma2cKJcDPuAU1OR58=
-github.com/aws/aws-sdk-go v1.30.24/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.25 h1:89NXJkfpjnMEnsxkP8MVX+LDsoiLCSqevraLb5y4Mjk=
-github.com/aws/aws-sdk-go v1.30.25/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.26 h1:wP0N6DBb/3EyHTtWNz4jzgGVi1l290zoFGfu4HFGeM0=
-github.com/aws/aws-sdk-go v1.30.26/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.27 h1:9gPjZWVDSoQrBO2AvqrWObS6KAZByfEJxQoCYo4ZfK0=
-github.com/aws/aws-sdk-go v1.30.27/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.28 h1:SaPM7dlmp7h3Lj1nJ4jdzOkTdom08+g20k7AU5heZYg=
-github.com/aws/aws-sdk-go v1.30.28/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.30.29 h1:NXNqBS9hjOCpDL8SyCyl38gZX3LLLunKOJc5E7vJ8P0=
-github.com/aws/aws-sdk-go v1.30.29/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.0 h1:ITLZ0oy7IOB1NGt2Ee75bLevBaH1jaAXE2eyGbPRbCg=
-github.com/aws/aws-sdk-go v1.31.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.7 h1:TCA+pXKvzDMA3vVqhK21cCy5GarC8pTQb/DrVOWI3iY=
-github.com/aws/aws-sdk-go v1.31.7/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.8 h1:qbA8nsLYcqtGjMGDogqykuO0LyUONkP9YlsKu1SVV5M=
-github.com/aws/aws-sdk-go v1.31.8/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.9 h1:n+b34ydVfgC30j0Qm69yaapmjejQPW2BoDBX7Uy/tLI=
-github.com/aws/aws-sdk-go v1.31.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.10 h1:33jOMifUSdOP9pvNEOj+PGwljzunc8bJvKKNF/JuGzo=
-github.com/aws/aws-sdk-go v1.31.10/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.11 h1:Uz7VGg3giOV9Z4SlLdXO6RHafArHbK59vSc6mnzYjGU=
-github.com/aws/aws-sdk-go v1.31.11/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.31.14 h1:uRC2riabEXPMHl1CDylsfCod5DKjiOSXhYvxg/Eb9V8=
-github.com/aws/aws-sdk-go v1.31.14/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.32.13 h1:zzyXF7SUxJcJa3hTcYCl1/Ey+kh2N8TjK5tWnL0wieo=
-github.com/aws/aws-sdk-go v1.32.13/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.33.1 h1:yz9XmNzPshz/lhfAZvLfMnIS9HPo8+boGRcWqDVX+T0=
-github.com/aws/aws-sdk-go v1.33.1/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.33.2 h1:8TVrnPnSD7I+AmDp66xBUvS3K0J+jH09YXdrkJ34ey0=
-github.com/aws/aws-sdk-go v1.33.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.33.10 h1:W9pAK/NlveaJXzfcehkIQD7cQStEM0z2MrmTgdDY5BE=
-github.com/aws/aws-sdk-go v1.33.10/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
-github.com/aws/aws-sdk-go v1.34.0/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/aws/aws-sdk-go v1.35.18 h1:Gka1bopihF2e9XFhuVZPrgafmOFpCsRtAPMYLp/0AfA=
 github.com/aws/aws-sdk-go v1.35.18/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/aws/aws-sdk-go-v2 v0.18.0 h1:qZ+woO4SamnH/eEbjM2IDLhRNwIwND/RQyVlBLp3Jqg=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/bazelbuild/bazel-gazelle v0.21.1/go.mod h1:xM5AuwJJYa2OUDBT+YqrZrcD8DW//aauZ+U424Wadlo=
 github.com/bazelbuild/bazel-gazelle v0.23.0 h1:Ks6YN+WkOv2lYWlvf7ksxUpLvrDbBHPBXXUrBFQ3BZM=
 github.com/bazelbuild/bazel-gazelle v0.23.0/go.mod h1:3mHi4TYn0QxwdMKPJfj3FKhZxYgWm46DjWQQPOg20BY=
-github.com/bazelbuild/buildtools v0.0.0-20190731111112-f720930ceb60/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
 github.com/bazelbuild/buildtools v0.0.0-20200718160251-b1667ff58f71/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
 github.com/bazelbuild/buildtools v0.0.0-20201102150426-f0f162f0456b h1:a+J2VBrlAmgdb1eXDTFxdoPA/wA/L2+33DcdfzhnhXM=
 github.com/bazelbuild/buildtools v0.0.0-20201102150426-f0f162f0456b/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
-github.com/bazelbuild/remote-apis v0.0.0-20200904140912-1aeb39973178 h1:qDZ7lr7knlTckZgbKwWD1PHTY6WYe5V+DqILuzpMHPY=
 github.com/bazelbuild/remote-apis v0.0.0-20200904140912-1aeb39973178/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
-github.com/bazelbuild/remote-apis v0.0.0-20201017154855-ddca4b2c4487 h1:tEvrBD4qzFkN9Npd8RU6iCmNv1rcd51UIKM7ghI3tNg=
-github.com/bazelbuild/remote-apis v0.0.0-20201017154855-ddca4b2c4487/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
-github.com/bazelbuild/remote-apis v0.0.0-20201030192148-aa8e718768c2 h1:in8ww8rHwdcmLN3J9atiRDvAaYHobXBJzp7uAxlUREU=
-github.com/bazelbuild/remote-apis v0.0.0-20201030192148-aa8e718768c2/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
-github.com/bazelbuild/remote-apis v0.0.0-20201113154229-1e9ccef3705c h1:rk6YYsIbLDZ/frDYZPANInvCUqAEjPitjRSyWTcsjiA=
-github.com/bazelbuild/remote-apis v0.0.0-20201113154229-1e9ccef3705c/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
 github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9 h1:/EMHYfINZDLrrr4f72+MxCYvmJ9EYcL8PYbQFHrnm38=
 github.com/bazelbuild/remote-apis v0.0.0-20201209220655-9e72daff42c9/go.mod h1:9Y+1FnaNUGVV6wKE0Jdh+mguqDUsyd9uUqokalrC7DQ=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201015165011-bac45969347c h1:+4DMvfGdgCeGwwWhCwTRlMlwlkrLUlWrsv8m75bXiUI=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201015165011-bac45969347c/go.mod h1:qYwgoeLmixW0VkG6F665WCYE4oneGGqvDzUNmzukY1c=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201029144734-84eedba4d9ea h1:m6pq4nascFemVhCz2outsp6fDwDqGn5xY/5ZrIzP1Xg=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201029144734-84eedba4d9ea/go.mod h1:qYwgoeLmixW0VkG6F665WCYE4oneGGqvDzUNmzukY1c=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201110004117-e776219c9bb7 h1:0SkXdQd6uHU6pDzy0ZJw4KUWsBnil6QAzBj+SljxRaM=
 github.com/bazelbuild/remote-apis-sdks v0.0.0-20201110004117-e776219c9bb7/go.mod h1:SvHtabqK9r562BLgmQfd+s5hzd9UUS903b0OmQHvzrI=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201116233214-f0ad8b722536 h1:vtJoTfFkzNGbcSSdcGiLC9a+aHRKsnlGceE0Wm5xHBE=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201117200903-8ec2ee2346e2 h1:hZbRrJ7TK0pqX6PwYuSJesbxichRb4Jpyozpb2IywJI=
-github.com/bazelbuild/remote-apis-sdks v0.0.0-20201118210229-b732553f9d45 h1:w/E5Tqx2yumJ5+wYa4Jekq3lr57DmxrSc+xD3SaY13k=
 github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc h1:T8tt5LPzm/nE/+DdopIs+6qOOAUNme01K7+d5y5lkxc=
 github.com/bazelbuild/remote-apis-sdks v0.0.0-20201120151053-8f976b9bf4fc/go.mod h1:SvHtabqK9r562BLgmQfd+s5hzd9UUS903b0OmQHvzrI=
+github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab h1:wzbawlkLtl2ze9w/312NHZ84c7kpUCtlkD8HgFY27sw=
 github.com/bazelbuild/rules_go v0.0.0-20190719190356-6dae44dc5cab/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
-github.com/bazelbuild/rules_go v0.25.0 h1:mb2SfWfQcOkIGTEf8QdRna9nF6nnjlyv/qeXvPVkleE=
-github.com/bazelbuild/rules_go v0.25.0/go.mod h1:MC23Dc/wkXEyk3Wpq6lCqz0ZAYOZDw2DR5y3N1q2i7M=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
@@ -388,8 +208,6 @@ github.com/bmatcuk/doublestar v1.2.2 h1:oC24CykoSAB8zd7XgruHo33E0cHJf/WhQA/7BeXj
 github.com/bmatcuk/doublestar v1.2.2/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
-github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/boombuler/barcode v1.0.0 h1:s1TvRnXwL2xJRaccrdcBQMZxq6X7DvsMogtmJeHDdrc=
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625 h1:ckJgFhFWywOx+YLEMIJsTb+NV6NexWICk5+AMSuz3ss=
@@ -402,7 +220,6 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs=
 github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg=
-github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk=
 github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -430,16 +247,12 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051 h1:eApuUG8W2EtBVwxqLlY2wgoqDYOg3WvIHGvW4fUbbow=
 github.com/cockroachdb/cockroach-go v0.0.0-20190925194419-606b3d062051/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
-github.com/cockroachdb/cockroach-go v2.0.1+incompatible h1:rkk9T7FViadPOz28xQ68o18jBSpyShru0mayVumxqYA=
-github.com/cockroachdb/cockroach-go v2.0.1+incompatible/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/cockroachdb/cockroach-go/v2 v2.1.0 h1:zicZlBhWZu6wfK7Ezg4Owdc3HamLpRdBllPTT9tb+2k=
 github.com/cockroachdb/cockroach-go/v2 v2.1.0/go.mod h1:ilhrLnPDDwGHL+iK2UxQhp1UzUhst8sfItSAgCYwAyg=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd h1:qMd81Ts1T2OTKmB4acZcyKaMtRnY5Y44NuXGX2GFJ1w=
 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
-github.com/codegangsta/negroni v1.0.0 h1:+aYywywx4bnKXWvoWtRfJ91vC59NbEhEY03sZjQhbVY=
-github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/containerd/containerd v1.3.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
 github.com/containerd/containerd v1.4.1 h1:pASeJT3R3YyVn+94qEPk0SnU1OQ20Jd/T+SPKy9xehY=
 github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA=
@@ -469,7 +282,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
-github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -494,11 +306,6 @@ github.com/cznic/strutil v0.0.0-20181122101858-275e90344537 h1:MZRmHqDBd0vxNwenE
 github.com/cznic/strutil v0.0.0-20181122101858-275e90344537/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc=
 github.com/cznic/xc v0.0.0-20181122101856-45b06973881e h1:U9mUTtTukbCdFuphv3QiJBjtImXsUTHcX5toZZi4OzY=
 github.com/cznic/xc v0.0.0-20181122101856-45b06973881e/go.mod h1:3oFoiOvCDBYH+swwf5+k/woVmWy7h1Fcyu8Qig/jjX0=
-github.com/daaku/go.zipexe v1.0.0/go.mod h1:z8IiR6TsVLEYKwXAoE/I+8ys/sDkgTzSL0CLnGVd57E=
-github.com/daaku/go.zipexe v1.0.1 h1:wV4zMsDOI2SZ2m7Tdz1Ps96Zrx+TzaK15VbUaGozw0M=
-github.com/daaku/go.zipexe v1.0.1/go.mod h1:5xWogtqlYnfBXkSB1o9xysukNP9GTvaNkqzUZbt3Bw8=
-github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 h1:X6mKGhCFOxrKeeHAjv/3UvT6e5RRxW6wRdlqlV6/H4w=
-github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37/go.mod h1:DC3JtzuG7kxMvJ6dZmf2ymjNyoXwgtklr7FN+Um2B0U=
 github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0 h1:IKVDBWlOZykX5WFI5DyYjX8oL+6+YuovdUvOf+1WHNQ=
 github.com/danjacques/gofslock v0.0.0-20200623023034-5d0bd0fa6ef0/go.mod h1:DC3JtzuG7kxMvJ6dZmf2ymjNyoXwgtklr7FN+Um2B0U=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -506,15 +313,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
-github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec h1:NfhRXXFDPxcF5Cwo06DzeIaE7uuJtAUhsDwH3LNsjos=
 github.com/denisenkom/go-mssqldb v0.0.0-20200620013148-b91950f658ec/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
-github.com/dgraph-io/ristretto v0.0.3 h1:jh22xisGBjrEVnRZ1DVTpBVQm0Xndu8sMl0CWDzSIBI=
-github.com/dgraph-io/ristretto v0.0.3/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
-github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954 h1:RMLoZVzv4GliuWafOuPuQDKSm1SJph7uCRnnS61JAn4=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dhui/dktest v0.3.2 h1:nZSDcnkpbotzT/nEHNsO+JCKY8i1Qoki1AYOpeLRb6M=
@@ -531,13 +333,10 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
 github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/eapache/go-resiliency v1.1.0 h1:1NtRmCAqadE2FN4ZcN6g90TP3uk8cg9rn9eNK2197aU=
 github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
@@ -549,7 +348,6 @@ github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
 github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -562,7 +360,6 @@ github.com/envoyproxy/go-control-plane v0.9.4 h1:rEvIZUSZ3fx39WIi3JkQqQBitGwpELB
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -588,7 +385,6 @@ github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db h1:gb2Z18BhTPJPpLQW
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 h1:a9ENSRDFBUPkJ5lCgVZh26+ZbGyoVJG7yb5SSzF5H54=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
-github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -598,7 +394,6 @@ github.com/fvbommel/sortorder v1.0.1 h1:dSnXLt4mJYH25uDDGa3biZNQsozaUWDSWeKJ0qqF
 github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0=
 github.com/garyburd/redigo v1.6.0 h1:0VruCpn7yAIIu7pWVClQC8wxCJEcG3nyzpMSHKi1PQc=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
@@ -624,8 +419,6 @@ github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE=
-github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
 github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
@@ -638,15 +431,11 @@ github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQH
 github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0=
 github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY=
 github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1 h1:wSt/4CYxs70xbATrGXhokKF1i0tZjENLOo1ioIO13zk=
-github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9 h1:tF+augKRWlWx0J0B7ZyyKSiTyV6E1zZe+7b3qQlcEf8=
-github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I=
 github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
@@ -662,8 +451,6 @@ github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6
 github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64=
 github.com/go-openapi/runtime v0.19.4 h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI=
 github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501 h1:C1JKChikHGpXwT5UQDFaryIpDtyyGL/CR6C2kB7F1oc=
-github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI=
 github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY=
@@ -676,8 +463,6 @@ github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+Z
 github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU=
 github.com/go-openapi/strfmt v0.19.5 h1:0utjKrw+BAh8s57XE9Xz8DUBsVvPmRUB6styvl9wWIM=
 github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87 h1:zP3nY8Tk2E6RTkqGYrarZXuzh+ffyLDljLxCy1iJw80=
-github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
 github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
 github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
@@ -700,8 +485,6 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4 h1:vF83LI8tAakwEwvWZtrIEx7pOySacl2TOxx6eXk4ePo=
 github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0=
-github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f h1:zlOR3rOlPAVvtfuxGKoghCmop5B0TRyu/ZieziZuGiM=
-github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus v4.1.0+incompatible h1:WqqLRTsQic3apZUK9qC5sGNfXthmPXzUZ7nQPrNITa4=
 github.com/godbus/dbus v4.1.0+incompatible/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
 github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
@@ -714,15 +497,9 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-migrate/migrate/v4 v4.10.0 h1:76R6UL3BGnDTpYeittMtfpaNvGBH5zMZatO/fCzIjWo=
-github.com/golang-migrate/migrate/v4 v4.10.0/go.mod h1:Llx0NRzBKs/zbR/Pc0huEpJA2195sJVkGU5dCyjQ678=
-github.com/golang-migrate/migrate/v4 v4.11.0 h1:uqtd0ysK5WyBQ/T1K2uDIooJV0o2Obt6uPwP062DupQ=
-github.com/golang-migrate/migrate/v4 v4.11.0/go.mod h1:nqbpDbckcYjsCD5I8q5+NI9Tkk7SVcmaF40Ax1eAWhg=
-github.com/golang-migrate/migrate/v4 v4.12.2/go.mod h1:HQ1DaC8uLHkg4afY8ZQ8D/P5SG+YW9X5INZBVvm+d2k=
 github.com/golang-migrate/migrate/v4 v4.13.0 h1:5S7HMjiq9u50X3+WXpzXPbUj1qUFuZRm8NCsX989Tn4=
 github.com/golang-migrate/migrate/v4 v4.13.0/go.mod h1:RUEXGkgYXTOdBY9Rbs9izc/SOalUK+dDi7YphFV/CUI=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -733,51 +510,35 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0 h1:28o5sBqPkBsMGnC6b4MvE2TzSr5/AT4c/1fLqVGIwlk=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1 h1:ocYkMQY5RrXTYgXl7ICpV0IXwlEQGwKIsery4gyXa1U=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4 h1:87PNWwrRvUSnqS4dlcBU/ftvOIBep4sYuBLlh6rX2wk=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.2 h1:aeE13tS0IiQgFjYdoL8qN3K1N2bXXtI6Vi51/y7BpMw=
 github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -793,8 +554,6 @@ github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9 h1:7qnwS9+oeSiOIsiUMa
 github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2EAE789SSiSJNqxPaC0aE9J8NTOI0Jo/A=
 github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9 h1:V2IgdyerlBa/MxaEFRbV5juy/C3MGdj4ePi+g6ePIp4=
 github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw=
-github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0 h1:ydbHzabf84uucKri5fcfiqYxGg+rYgP/zQfLLN8lyP0=
-github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0/go.mod h1:QtPG26W17m+OIQgE6gQ24gC1M6pUaMBAbFrTIDtwG/E=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -802,66 +561,31 @@ github.com/google/flatbuffers v1.11.0 h1:O7CEyB8Cb3/DmtxODGtLHcEvpr81Jm5qLg/hsHn
 github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.2-0.20191028172631-481baca67f93/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3 h1:x95R7cp+rSeeqAMI2knLtQ0DKlaBhv2NrtrOvafPHRo=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-github/v29 v29.0.3 h1:IktKCTwU//aFHnpA+2SLIi7Oo9uhAzgsdZNbcAqhgdc=
 github.com/google/go-github/v29 v29.0.3/go.mod h1:CHKiKKPHJ0REzfwc14QMklvtHwCveD0PxlMjLlzAM5E=
-github.com/google/go-licenses v0.0.0-20200227160636-0fa8c766a591 h1:eVR9gT5gBPTHXeyGAcA8OF/SKNUFFg+a0BJqfx4z5eE=
-github.com/google/go-licenses v0.0.0-20200227160636-0fa8c766a591/go.mod h1:JWeTIGPLQ9gF618ZOdlUitd1gRR/l99WOkHOlmR/UVA=
-github.com/google/go-licenses v0.0.0-20200511085313-e4cf7a36ee79 h1:/kgCkStHv3ZHqBwe7NPs0NWFt5GbufTrjcHKJm1Osvk=
-github.com/google/go-licenses v0.0.0-20200511085313-e4cf7a36ee79/go.mod h1:EiGoSZYaoyOKTmTfBpX5D5odFoqz4uXoSgtvxKLeOYo=
-github.com/google/go-licenses v0.0.0-20200602185517-f29a4c695c3d h1:r8YwMrdIrMvQUlRJT/D5BCIy42bMMxS7zxV89k0i3ik=
-github.com/google/go-licenses v0.0.0-20200602185517-f29a4c695c3d/go.mod h1:g1VOUGKZYIqe8lDq2mL7plhAWXqrEaGUs7eIjthN1sk=
-github.com/google/go-licenses v0.0.0-20201026145851-73411c8fa237 h1:qmrsmPqL7jK5f7dwLc4oDBZu/3pzB19tvhnP4TngNYY=
-github.com/google/go-licenses v0.0.0-20201026145851-73411c8fa237/go.mod h1:g1VOUGKZYIqe8lDq2mL7plhAWXqrEaGUs7eIjthN1sk=
-github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d h1:JtmsUf+m+KdwCOgLG578T0Mvd0+l+dezPrJh5KYnXZg=
-github.com/google/go-licenses v0.0.0-20210329231322-ce1d9163b77d/go.mod h1:+TYOmkVoJOpwnS0wfdsJCV9CoD5nJYsHoFk/0CrTK4M=
-github.com/google/go-licenses v0.0.0-20210623184300-9376cf9847a0 h1:jEUknfQnsQ2/fCRDsOsfeRjkwmc7otBwVLD2uhCBWWY=
-github.com/google/go-licenses v0.0.0-20210623184300-9376cf9847a0/go.mod h1:yrUa7XR4KpFKeb+/N8/NokREkP3p25uqXDSfIFMO4fA=
-github.com/google/go-licenses v0.0.0-20210715153004-8751804a5b80 h1:LFxfYF9RntrK2cRV7vr+xpNle/lNmeQ4+XOr1iWUL1o=
-github.com/google/go-licenses v0.0.0-20210715153004-8751804a5b80/go.mod h1:yrUa7XR4KpFKeb+/N8/NokREkP3p25uqXDSfIFMO4fA=
-github.com/google/go-licenses v0.0.0-20210727195037-24e2421190d8 h1:witO2HVN17VLN3zqEkHqvgzUyz/G9nGDMGJccZBXPhA=
-github.com/google/go-licenses v0.0.0-20210727195037-24e2421190d8/go.mod h1:WkPB6PtjnM1pF4qeK8RcFmk7z+TIsrPYOng7OPlFDiw=
 github.com/google/go-licenses v0.0.0-20210816172045-3099c18c36e1 h1:ZK63Yns/0Y8hE5y50WuSsfFWNPmpYDQ9tzh/J2vWV8c=
 github.com/google/go-licenses v0.0.0-20210816172045-3099c18c36e1/go.mod h1:WkPB6PtjnM1pF4qeK8RcFmk7z+TIsrPYOng7OPlFDiw=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
 github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/licenseclassifier v0.0.0-20190926221455-842c0d70d702/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
-github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0 h1:OggOMmdI0JLwg1FkOKH9S7fVHF0oEm8PX6S8kAdpOps=
-github.com/google/licenseclassifier v0.0.0-20200402202327-879cb1424de0/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
-github.com/google/licenseclassifier v0.0.0-20200708223521-3d09a0ea2f39 h1:nkr7S2ETn5pAuBeeoZggV5nXSwOm4nBLz3vscQfA/A8=
-github.com/google/licenseclassifier v0.0.0-20200708223521-3d09a0ea2f39/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
-github.com/google/licenseclassifier v0.0.0-20201113175434-78a70215ca36 h1:YGB3wNLUTvq+lbIwdNRsaMJvoX4mCKkwzHlmlT1V+ow=
-github.com/google/licenseclassifier v0.0.0-20201113175434-78a70215ca36/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
-github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72 h1:EfzlPF5MRmoWsCGvSkPZ1Nh9uVzHf4FfGnDQ6CXd2NA=
-github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M=
 github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 h1:TJsAqW6zLRMDTyGmc9TPosfn9OyVlHs8Hrn3pY6ONSY=
 github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148/go.mod h1:rq9F0RSpNKlrefnf6ZYMHKUnEJBCNzf6AcCXMYBeYvE=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
 github.com/google/martian/v3 v3.1.0 h1:wCKgOCHuUEVfsaQLpPSJb7VdYCdTVZQAuOdYm1yc/60=
 github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -871,7 +595,6 @@ github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20200905233945-acf8798be1f7/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20201009210932-67992a1a5a35/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
@@ -882,45 +605,29 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go v2.0.2+incompatible h1:silFMLAnr330+NRuag/VjIGF7TLp/LBrV2CJKFLWEww=
 github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
-github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.4.0 h1:BXDUo8p/DaxC+4FJY/SSx3gvnx9C1VdHNgaUkiEL5mk=
-github.com/googleapis/gnostic v0.4.0/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
 github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
 github.com/googleapis/gnostic v0.5.3 h1:2qsuRm+bzgwSIKikigPASa2GhW8H2Dn4Qq7UxD8K/48=
 github.com/googleapis/gnostic v0.5.3/go.mod h1:TRWw1s4gxBGjSe301Dai3c7wXJAZy57+/6tawkOvqHQ=
-github.com/gophercloud/gophercloud v0.1.0 h1:P/nh25+rzXouhytV2pUHBb65fnds26Ghl8/391+sT5o=
-github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
 github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f h1:TyqzGm2z1h3AGhjOoRYyeLcW4WlW81MDQkWa+rx/000=
-github.com/gopherjs/gopherjs v0.0.0-20190915194858-d3ddacdb130f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0=
 github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherwasm v1.0.0 h1:32nge/RlujS1Im4HNCJPp0NbBOAeBXFuT1KonUuLl+Y=
 github.com/gopherjs/gopherwasm v1.0.0/go.mod h1:SkZ8z7CWBz5VXbhJel8TxCmAcsQqzgWGR/8nMhyhZSI=
 github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
-github.com/gorilla/csrf v1.6.2 h1:QqQ/OWwuFp4jMKgBFAzJVW3FMULdyUW7JoM4pEWuqKg=
-github.com/gorilla/csrf v1.6.2/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI=
-github.com/gorilla/csrf v1.7.0 h1:mMPjV5/3Zd460xCavIkppUdvnl5fPXMpv2uz2Zyg7/Y=
-github.com/gorilla/csrf v1.7.0/go.mod h1:+a/4tCmqhG6/w4oafeAZ9pEa3/NZOWYVbD9fV0FwIQA=
 github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
-github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
 github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
@@ -950,7 +657,6 @@ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoP
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
 github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ=
 github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -960,7 +666,6 @@ github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxB
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3 h1:zKjpN5BK/P5lMYrLmBHdBULWbJ0XpYR+7NGzqkZzoD4=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
 github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
@@ -978,7 +683,6 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09
 github.com/hashicorp/go.net v0.0.1 h1:sNCoNyDEvN1xa+X0baata4RdcpKwcMS6DH+xwfqPgjw=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -994,24 +698,16 @@ github.com/hashicorp/serf v0.8.2 h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs=
-github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw=
 github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
 github.com/hudl/fargo v1.3.0 h1:0U6+BtN6LhaYuTnIJq4Wyq5cpn6O2kWrxAtcqBmYY6w=
 github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
-github.com/huin/goserial v0.0.0-20121012073615-7b90efdb22b1 h1:v6symRpmVeKVUqq1grXnDDtus+lmQufUhgZ/lgMr4nU=
-github.com/huin/goserial v0.0.0-20121012073615-7b90efdb22b1/go.mod h1:x4wgpgRJT44loaDTf8/wWCkvTlhrKlVlaHATk7Leqlw=
 github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 h1:i462o439ZjprVSFSZLZxcsoAe592sZB1rci2Z8j4wdk=
 github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 h1:mV02weKRL81bEnm8A0HT1/CAelMQDBuQIfLw8n+d6xI=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
-github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
-github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA=
 github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
@@ -1023,18 +719,13 @@ github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.3.2 h1:9UIGICxEAW70RQDGilGwsCG63NCcm5amjuBQCFzrmsw=
 github.com/jackc/pgconn v1.3.2/go.mod h1:LvCquS3HbBKwgl7KbX9KyqEIumJAbm1UMcTvGaIf3bM=
 github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
 github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
 github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
-github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78=
-github.com/jackc/pgconn v1.7.0 h1:pwjzcYyfmz/HQOQlENvG1OcDqauTGaqlVahq934F0/U=
 github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA=
 github.com/jackc/pgconn v1.7.2 h1:195tt17jkjy+FrFlY0pgyrul5kRLb7BGXY3JTrNxeXU=
 github.com/jackc/pgconn v1.7.2/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
@@ -1050,11 +741,7 @@ github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.1 h1:Rdjp4NFjwHnEslx2b66FfCI2S0LhO4itac3hXz6WX9M=
 github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.0.4/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM=
 github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.0.6 h1:b1105ZGEMFe7aCvrT1Cca3VoVb4ZFMaFJLJcg/3zD+8=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
@@ -1067,21 +754,15 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU
 github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
 github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
 github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
-github.com/jackc/pgtype v1.4.2/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
-github.com/jackc/pgtype v1.5.0 h1:jzBqRk2HFG2CV4AIwgCI2PwTgm6UUoCAK2ofHHRirtc=
 github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
 github.com/jackc/pgtype v1.6.1 h1:CAtFD7TS95KrxRAh3bidgLwva48WYxk8YkbHZsSWfbI=
 github.com/jackc/pgtype v1.6.1/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
-github.com/jackc/pgx v3.2.0+incompatible h1:0Vihzu20St42/UDsvZGdNE6jak7oi/UOeMzwMPHkgFY=
-github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
 github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
 github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
 github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
-github.com/jackc/pgx/v4 v4.8.1/go.mod h1:4HOLxrl8wToZJReD04/yB20GDwf4KBYETvlHciCnwW0=
-github.com/jackc/pgx/v4 v4.9.0 h1:6STjDqppM2ROy5p1wNDcsC7zJTjSHeuCsguZmXyzx7c=
 github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms=
 github.com/jackc/pgx/v4 v4.9.2 h1:1V7EAc5jvIqXwdzgk8+YyOK+4071hhePzBCAF6gxUUw=
 github.com/jackc/pgx/v4 v4.9.2/go.mod h1:Jt/xJDqjUDUOMSv8VMWPQlCObVgF2XOgqKsW8S4ROYA=
@@ -1105,10 +786,7 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
-github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
@@ -1117,15 +795,11 @@ github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
 github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
@@ -1133,7 +807,6 @@ github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfE
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
@@ -1144,21 +817,12 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
-github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0 h1:reN85Pxc5larApoH1keMBiu2GWtPqXQ1nc9gx+jOU+E=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/errcheck v1.3.0 h1:LT9MIcYaA4MhK2jGb1DIWjJY8nnzC/bBqgKYhbWq+lk=
-github.com/kisielk/errcheck v1.3.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/errcheck v1.4.0 h1:ueN6QYA+c7eDQo7ebpNdYR8mUJZThiGz9PEoJEMGPzA=
-github.com/kisielk/errcheck v1.4.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ=
-github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.11.3 h1:dB4Bn0tN3wdCzQxnS8r06kV74qN/TAfaIS0bVE8h3jc=
 github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -1169,17 +833,14 @@ github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
 github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
@@ -1188,7 +849,6 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.4.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.8.0 h1:9xohqzkUwzR4Ga4ivdTcawVS89YSDVxXMa3xJX3cGzg=
@@ -1206,31 +866,19 @@ github.com/luci/gtreap v0.0.0-20161228054646-35df89791e8f/go.mod h1:OjKOY0UvVOOH
 github.com/lyft/protoc-gen-validate v0.0.13 h1:KNt/RhmQTOLr7Aj8PsJ7mTronaFyx80mRTT9qF261dA=
 github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY=
 github.com/magiconair/properties v1.8.4/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/mailru/easyjson v0.7.1 h1:mdxE1MF9o53iCb2Ghj1VfWvh7ZOwHpnVG/xwXrV90U8=
 github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/mailru/easyjson v0.7.2/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/pkger v0.15.1 h1:3MPelV53RnGSW07izx5xGxl4e/sdRD6zqseIk0rMASY=
 github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
 github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
 github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
-github.com/maruel/subcommands v0.0.0-20200206125935-de1d40e70d4b h1:PlujZ2Y2Lq0VCaDu7SshaGpfm0iv4cML2AGUyS5By9I=
-github.com/maruel/subcommands v0.0.0-20200206125935-de1d40e70d4b/go.mod h1:4cd1CVd4c9phb1z9fTkV+JbmnFm394Hp9rHEAOvD+vs=
-github.com/maruel/subcommands v1.0.0 h1:tMgSVvquoQY3VXPaZ5in2C4OX8hf5MFBdfS7tylwdvA=
-github.com/maruel/subcommands v1.0.0/go.mod h1:QJzmNYsw4uJLowglbBbvCeMK/K6yOPweU1GfEdnZMQ0=
-github.com/maruel/ut v1.0.1/go.mod h1:RV8PwPD9dd2KFlnlCc/DB2JVvkXmyaalfc5xvmSrRSs=
-github.com/maruel/ut v1.0.2 h1:mQTlQk3jubTbdTcza+hwoZQWhzcvE4L6K6RTtAFlA1k=
-github.com/maruel/ut v1.0.2/go.mod h1:RV8PwPD9dd2KFlnlCc/DB2JVvkXmyaalfc5xvmSrRSs=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -1246,16 +894,13 @@ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHX
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
 github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
 github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
@@ -1277,16 +922,7 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4
 github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.2.2 h1:dxe5oCinTXiTIcfgmZecdCzPmAJKd46KsCWc35r0TV4=
-github.com/mitchellh/mapstructure v1.2.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.3.0 h1:iDwIio/3gk2QtLLEsqU5lInaMzos0hDTz8a6lazSFVw=
-github.com/mitchellh/mapstructure v1.3.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA=
-github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
-github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
 github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
@@ -1331,17 +967,12 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
-github.com/neo4j-drivers/gobolt v1.7.4 h1:80c7W+vtw39ES9Q85q9GZh4tJo+1MpQGpFTuo28CP+Y=
-github.com/neo4j-drivers/gobolt v1.7.4/go.mod h1:O9AUbip4Dgre+CD3p40dnMD4a4r52QBIfblg5k7CTbE=
-github.com/neo4j/neo4j-go-driver v1.7.4/go.mod h1:aPO0vVr+WnhEJne+FgFjfsjzAnssPFLucHgGZ76Zb/U=
 github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba h1:fhFP5RliM2HW/8XdcO5QngSfFli9GcRIpMXvypTQt6E=
 github.com/neo4j/neo4j-go-driver v1.8.1-0.20200803113522-b626aa943eba/go.mod h1:ncO5VaFWh0Nrt+4KT4mOZboaczBZcLuHrG+/sUeP8gI=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229 h1:E2B8qYyeSgv5MXpmzZXRNp8IAQ4vjxIjhpAf5hv/tAg=
-github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.5 h1:obHEce3upls1IBn1gTw/o7bCv7OJb6Ib/o7wNO+4eKw=
 github.com/nxadm/tail v1.4.5/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -1351,7 +982,6 @@ github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5 h1:58+kh9C6jJVXYjt8IE48G2eWl6BjwU5Gj0gqY84fy78=
 github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
 github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8=
 github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA=
@@ -1393,20 +1023,12 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2 h1:nY8Hti+WKaP0cRsSeQ026wU03QsM762XBeCXBb9NAWI=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc=
-github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
-github.com/otiai10/copy v1.1.1 h1:PH7IFlRQ6Fv9vYmuXbDRLdgTHoP1w483kPNUP2bskpo=
-github.com/otiai10/copy v1.1.1/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
-github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
-github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
 github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ=
 github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
 github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI=
 github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
-github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
-github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E=
 github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pact-foundation/pact-go v1.0.4 h1:OYkFijGHoZAYbOIb1LWXrwKQbMMRUv1oQ89blD2Mh2Q=
@@ -1421,19 +1043,14 @@ github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP
 github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
 github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
-github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
-github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
 github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
 github.com/performancecopilot/speed v3.0.0+incompatible h1:2WnRzIquHa5QxaJKShDkLM+sc0JPuwhXzK8OYOyt3Vg=
 github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
+github.com/peterh/liner v1.1.0 h1:f+aAedNJA6uk7+6rXsYBnhdo4Xux7ESLe+kcuVUF5os=
 github.com/peterh/liner v1.1.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
-github.com/peterh/liner v1.2.0 h1:w/UPXyl5GfahFxcTOz2j9wCIHNI+pUPr2laqpojKNCg=
-github.com/peterh/liner v1.2.0/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/phpdave11/gofpdi v1.0.7 h1:k2oy4yhkQopCK+qW8KjCla0iU2RpDow+QUDmH9DDt44=
 github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
@@ -1442,7 +1059,6 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 h1:49lOXmGaUpV9Fz3gd7TFZY106KVlPVa5jcYD1gaQf98=
 github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -1457,24 +1073,14 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
-github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
-github.com/prometheus/client_golang v1.5.1 h1:bdHYieyGlH+6OLEk2YQha8THib30KP0/yD0YH9m6xcA=
-github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_golang v1.6.0 h1:YVPodQOcK15POxhgARIvnDRVpLcuK8mglnMrWfyrw6A=
-github.com/prometheus/client_golang v1.6.0/go.mod h1:ZLOG9ck3JLRdB5MgO8f+lLTe83AXG6ro35rLTxvnIl4=
-github.com/prometheus/client_golang v1.7.0 h1:wCi7urQOGBsYcQROHqpUUX4ct84xp40t9R9JX0FuA/U=
-github.com/prometheus/client_golang v1.7.0/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.8.0 h1:zvJNkoCFAnYFNC24FV8nW4JdRJ3GIFcLbg65lL/JDcw=
 github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 h1:S/YWwWx/RA8rT8tKFRuGUZhuA90OyIBpPCXkcbwU8DE=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 h1:gQz4mCbXsO+nc9n1hCxHcGA3Zx3Eo+UHZoInFGUIXNM=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
@@ -1482,31 +1088,17 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/common v0.9.1 h1:KOMtN28tlbam3/7ZKEYKHhKoJZYYj3gMH4uc62x7X7U=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4=
 github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.2 h1:6LJUbpNm42llc4HRCuvApCSWB/WfhuNo9K98Q9sNGfs=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.0.10 h1:QJQN3jYQhkamO4mhfUWqdDH2asK7ONOI9MTWjyAxNKM=
-github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
-github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.1.0 h1:jhMy6QXfi3y2HEzFoyuCj40z4OZIIHHPtFyCMftmvKA=
-github.com/prometheus/procfs v0.1.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
@@ -1516,15 +1108,12 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a h1:9ZKAASQSHhD
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 h1:HQagqIiBmr8YXawX/le3+O26N+vPPC1PtjaF3mwnook=
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff h1:+6NUiITWwE5q1KO6SAfUX918c+Tab0+tGAM/mtdlUyA=
-github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
 github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac h1:kYPjbEN6YPYWWHI6ky1J813KzIq/8+Wg4TO4xU7A/KU=
 github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af h1:gu+uRPtBe88sKxUCEXRoeCvVG90TJmwhiqRpvdhQFng=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.5.0 h1:Usqs0/lDK/NqTkvrmKSwA/3XkZAs7ZAW/eLeQ2MVBTw=
-github.com/rogpeppe/go-internal v1.5.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI=
 github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
@@ -1549,7 +1138,6 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
 github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
 github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
@@ -1566,30 +1154,11 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM=
 github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4 h1:KPlmEyLo5r9hnWZq8O0B0Rj4AcRv/tJMqEgS6p0JMeQ=
-github.com/skia-dev/go-systemd v0.0.0-20181025131956-1cc903e82ae4/go.mod h1:TUH3112UTh2tzE4XSwBwt7bCKnQbI7TPpAd0cbQ9RzY=
-github.com/skia-dev/go2ts v1.1.0 h1:jcd0AIOe7PxizwPsInBQA8X3cgLm4tGint/LMIKb1DE=
-github.com/skia-dev/go2ts v1.1.0/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.0 h1:0MJfc4SBAlx+7ZeGsQA5zCKg59hcNapoi7AdqIGT9lo=
-github.com/skia-dev/go2ts v1.3.0/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.1 h1:3uw+9eCAaXjQE646bOccvBDDCw6R+PHwXUZAhhXXQzg=
-github.com/skia-dev/go2ts v1.3.1/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.2 h1:ilwpMf2M8xxZCmElFf5x7WI7pokKqZiYxQkQ2oqYHWE=
-github.com/skia-dev/go2ts v1.3.2/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.3/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.4 h1:xlgs+2aM2APE5U2NP+OFByIZzZooPKir+iVpIHD5CD0=
-github.com/skia-dev/go2ts v1.3.4/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.3.5/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.4.0 h1:eAtVpmMhhyv5yKrc18hkH+HIdRz7intA5/oyHxmoyaE=
-github.com/skia-dev/go2ts v1.4.0/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
-github.com/skia-dev/go2ts v1.4.1 h1:kbf9/70IJC+mOlAR4ZdXVzZJdjlJuUGSeqpXtCUDxZA=
-github.com/skia-dev/go2ts v1.4.1/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
 github.com/skia-dev/go2ts v1.5.0 h1:AHQe+t5W18HFoTuApMeShiVMu2nBMHdHgLWo2b2y7/U=
 github.com/skia-dev/go2ts v1.5.0/go.mod h1:pE59J8wf5IHSMtPhH8PmWq5ZTLt6p1Ih+4ODd9fkGXk=
 github.com/skia-dev/google-api-go-client v0.10.1-0.20200109184256-16c3d6f408b2 h1:Id5JdSD66PKQQiiVFG1VXDVCT5U3DcDzJSReXRxKRLk=
 github.com/skia-dev/google-api-go-client v0.10.1-0.20200109184256-16c3d6f408b2/go.mod h1:N0iTzjbw95ZVfOL7wVngmVXE2kG0NP+LYlq3QMwf9Qo=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w=
 github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
 github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
 github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
@@ -1610,23 +1179,14 @@ github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJ
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/afero v1.3.1 h1:GPTpEAuNr98px18yNQ66JllNil98wfRZ/5Ukny8FeQA=
-github.com/spf13/afero v1.3.1/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.3.2 h1:GDarE4TJQI52kYSbSAmLiId1Elfj+xgSDqrUZxFhxlU=
-github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/afero v1.4.1 h1:asw9sl74539yqavKaglDM5hFpdJVK0Y5Dr/JOgQ89nQ=
 github.com/spf13/afero v1.4.1/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
-github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
@@ -1638,12 +1198,8 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
-github.com/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
-github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
-github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk=
 github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
@@ -1658,20 +1214,15 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a h1:AhmOdSHeswKHBjh
 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As=
 github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.0 h1:jlIyCplCJFULU/01vCkhKuTyc3OorI3bJFuw6obfgho=
 github.com/stretchr/testify v1.6.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -1681,11 +1232,8 @@ github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFd
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6 h1:9VTskZOIRf2vKF3UL8TuWElry5pgUpV1tFSe/e/0m/E=
-github.com/texttheater/golang-levenshtein v0.0.0-20191208221605-eb6844b05fc6/go.mod h1:XDKHRm5ThF8YJjx001LtgelzsoaEcvnA7lVWz9EeX3g=
 github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U=
 github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8=
-github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51 h1:BP2bjP495BBPaBcS5rmqviTfrOkN5rO5ceKAMRZCRFc=
 github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
@@ -1693,16 +1241,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/twitchtv/twirp v5.5.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
-github.com/twitchtv/twirp v5.12.1+incompatible h1:UnrJ4Z8llkdjnQbLqJBWRBwaDGojBsU5lft3DrD/SvY=
-github.com/twitchtv/twirp v5.12.1+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
 github.com/twitchtv/twirp v7.1.0+incompatible h1:3fNSDoSPyq+fTrifIvGue9XM/tptzuhiGY83rxPVNUg=
 github.com/twitchtv/twirp v7.1.0+incompatible/go.mod h1:RRJoFSAmTEh2weEqWtpPE3vFK5YBhA6bqp2l1kfCC5A=
 github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 h1:3SVOIvH7Ae1KRYyQWRjXWJEA9sS/c/pjvH++55Gr648=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/unrolled/secure v1.0.7 h1:BcQHp3iKZyZCKj5gRqwQG+5urnGBF00wGgoPPwtheVQ=
-github.com/unrolled/secure v1.0.7/go.mod h1:uGc1OcRF8gCVBA+ANksKmvM85Hka6SZtQIbrKc3sHS4=
 github.com/unrolled/secure v1.0.8 h1:JaMvKbe4CRt8oyxVXn+xY+6jlqd7pyJNSVkmsBxxQsM=
 github.com/unrolled/secure v1.0.8/go.mod h1:fO+mEan+FLB0CdEnHf6Q4ZZVNqG+5fuLFnP8p0BXDPI=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
@@ -1712,32 +1256,14 @@ github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
-github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/vektah/gqlparser v1.1.2 h1:ZsyLGn7/7jDNI+y4SEhI4yAxRChlv15pUHMjijT+e68=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5 h1:Xim2mBRFdXzXmKRO8DJg/FJtn/8Fj9NOEpO6+WuMPmk=
-github.com/vektra/mockery v0.0.0-20181123154057-e78b021dcbb5/go.mod h1:ppEjwdhyy7Y31EnHRDm1JkChoC7LXIJ7Ex0VYLWtZtQ=
-github.com/vektra/mockery v1.0.0 h1:eQBu/DLHPW2WkHORUT/M5h6wvW91oR7EUfP3eu0G6wg=
-github.com/vektra/mockery v1.0.0/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU=
-github.com/vektra/mockery v1.1.0 h1:P8cgAIM8zkpMud24keNCOrc1Fvd+nt1cmztK8ei/HXs=
-github.com/vektra/mockery v1.1.0/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU=
-github.com/vektra/mockery v1.1.1 h1:tSw+5rMJKNTHWu12FfS8k5sU4Z8+7WsslcQdibtRgHI=
-github.com/vektra/mockery v1.1.1/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU=
-github.com/vektra/mockery v1.1.2 h1:uc0Yn67rJpjt8U/mAZimdCKn9AeA97BOkjpmtBSlfP4=
-github.com/vektra/mockery v1.1.2/go.mod h1:VcfZjKaFOPO+MpN4ZvwPjs4c48lkq1o3Ym8yHZJu0jU=
-github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc=
-github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
 github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
 github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
 github.com/xanzy/go-gitlab v0.15.0 h1:rWtwKTgEnXyNUGrOArN7yyc3THRkpYcKXIXia9abywQ=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
 github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
 github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
-github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
-github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0=
@@ -1754,8 +1280,6 @@ github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca h1:1CFlNzQhALwjS9mB
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 h1:ESFSdwYZvkeru3RtdrYueztKhOBCSAAzS4Gf+k0tEow=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/yosuke-furukawa/json5 v0.1.1 h1:0F9mNwTvOuDNH243hoPqvf+dxa5QsKnZzU20uNsh3ZI=
-github.com/yosuke-furukawa/json5 v0.1.1/go.mod h1:sw49aWDqNdRJ6DYUtIQiaA3xyj2IL9tjeNYmX2ixwcU=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -1767,132 +1291,7 @@ github.com/zenazn/goji v0.9.0 h1:RSQQAbXGArQ0dIDEq+PI6WqN6if+5KHu6x2Cx/GXLTQ=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b h1:7gd+rd8P3bqcn/96gOZa3F5dpJr/vEiDQYlNb/y2uNs=
 gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE=
-go.chromium.org/gae v0.0.0-20190826183307-50a499513efa h1:1Ia0zTIyW9IktCoEQOHPqlBsohu5n/Vzqmupj4B4tqg=
-go.chromium.org/gae v0.0.0-20190826183307-50a499513efa/go.mod h1:ypuIZj/TmtaQgUYPNNu0iKlsUkuv10PROeqHCNrqrog=
-go.chromium.org/luci v0.0.0-20200422113612-5e97843a5fd2 h1:DSh5XL1n+AGAqj+p9+AMhd2a7dsk4LuG+72R8tRJ4ik=
-go.chromium.org/luci v0.0.0-20200422113612-5e97843a5fd2/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200427011235-aa03c1c642c3 h1:862RE21ltEvWS/tgx550oCIrJQWyj41fBropzU8MuoQ=
-go.chromium.org/luci v0.0.0-20200427011235-aa03c1c642c3/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200428040605-0ad535668749 h1:BIyS0EPqijPQaMcoZ2BTEN7AVgWB9QuN3oTpRTQwQFM=
-go.chromium.org/luci v0.0.0-20200428040605-0ad535668749/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200429015048-333ada2a350e h1:75hC5/8To8ZK1U3ltwf1N1cpmMpi5stNW5Jr1Aa3Okc=
-go.chromium.org/luci v0.0.0-20200429015048-333ada2a350e/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200430042333-6d74091d0061 h1:yaRBXMPaAFHBoPYJUO2lD72BPuDvQxD+WzazYvgR4/M=
-go.chromium.org/luci v0.0.0-20200430042333-6d74091d0061/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200501022719-17242f68b20f h1:t61ZYO8ujWGTvjvboVu0gZCEdJvc9+oHFXSS4oQXgiI=
-go.chromium.org/luci v0.0.0-20200501022719-17242f68b20f/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200502041843-0b2779a88016 h1:UA4s3cfByqOic1VfzIySw25skS5anOXJxAqzj7kazQA=
-go.chromium.org/luci v0.0.0-20200502041843-0b2779a88016/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200503010324-19f257ce35d3 h1:n3JDCBfO2ea2sXFCWUp5+2TebItRFcwEfzeOOiaYPhw=
-go.chromium.org/luci v0.0.0-20200503010324-19f257ce35d3/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200504000755-e3f22e3930e4 h1:ioNiemsrbY6WcWFGUluVg33tj06qdegJW9qk5c4uOjc=
-go.chromium.org/luci v0.0.0-20200504000755-e3f22e3930e4/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200505035555-18ccdaab7550 h1:/EbnjNXPQntLEQK9RTsC/jMCIL8EiZj6ByEHCao/8hY=
-go.chromium.org/luci v0.0.0-20200505035555-18ccdaab7550/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200506033851-1d2f8079f6c1 h1:TYxn/KjPYPo03Scc7mkRqFeKFBeFxgQ3VZupgzJEx0o=
-go.chromium.org/luci v0.0.0-20200506033851-1d2f8079f6c1/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200506070131-472a6cc95073 h1:BXKOQQLpGgsWjuKP2PG4Wq/DxcjfCeOdVYPeMHPBw+8=
-go.chromium.org/luci v0.0.0-20200506070131-472a6cc95073/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200507011831-6268d5c70562 h1:Y6PX0bTwh3e+V9mEK5TRaizkPWpktGCKpW5d6Nlr0SE=
-go.chromium.org/luci v0.0.0-20200507011831-6268d5c70562/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200508033456-d92e37c72a39 h1:8bVDcgbgWctCfYjQEdTri9+7d2ASnraE6N+9NVlMdsI=
-go.chromium.org/luci v0.0.0-20200508033456-d92e37c72a39/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200508231537-1719e4e808f9 h1:0tFhS/EHma0i31gaC8YOZJDE/V33NxdLT68jyqBsbrE=
-go.chromium.org/luci v0.0.0-20200508231537-1719e4e808f9/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200511040339-30a8e14ed9ab h1:LGCaLjaV1Qd2VJxwWqUPRbhai90NMPCPPx12I2IHITE=
-go.chromium.org/luci v0.0.0-20200511040339-30a8e14ed9ab/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200512011855-6544ee9df9fa h1:u6xM5X1RxEOPs5++ETPIsw9XT+b+biSSM/OjtxUjXJg=
-go.chromium.org/luci v0.0.0-20200512011855-6544ee9df9fa/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200512212603-d4bc79d85e4a h1:TOLBKdWKe+AjZib64KgseXatAjKdLHKSKbZYVAJzT7k=
-go.chromium.org/luci v0.0.0-20200512212603-d4bc79d85e4a/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200514021706-fa8dd98fcf00 h1:6yUpK5/wUO+6kk27g8s4BHqrpH3fcBXF324pe+29HrM=
-go.chromium.org/luci v0.0.0-20200514021706-fa8dd98fcf00/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200515024543-2c12eb51855f h1:z0WwiAYXwM8lSNE2TTI1Tpb5CZB2avXxwVD6kp5YXXw=
-go.chromium.org/luci v0.0.0-20200515024543-2c12eb51855f/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200516014619-ad87be4122fc h1:65cY8veo1OJckoGp9kEm7ceh98fd9hFDvbEciyl+s9Y=
-go.chromium.org/luci v0.0.0-20200516014619-ad87be4122fc/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200517015940-a4f4b073be33 h1:BovFCllMqHeCztxmDuubjJfv3yax7027zuPJYuQs4lU=
-go.chromium.org/luci v0.0.0-20200517015940-a4f4b073be33/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200519013512-8b5a1cbea884 h1:lLNMxIFXfqyE7azbApM5/WM+7LQp3d8JkKnKqX6Cm8A=
-go.chromium.org/luci v0.0.0-20200519013512-8b5a1cbea884/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200520021201-88b3eca655d0 h1:gLmv2w+XctPdD9Efsnu20x+mxYT5YhcjGDOtDwFHHTU=
-go.chromium.org/luci v0.0.0-20200520021201-88b3eca655d0/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200521015543-ca04aca21808 h1:Ev+amipbJHdTsWMg/7bjfagGxe+Y2cCsV2jFTv4KXuo=
-go.chromium.org/luci v0.0.0-20200521015543-ca04aca21808/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200522032345-09f90024e34d h1:dczu65GQ+3ZA9lBDVWwrxikF1zm7QAKVWc06kluGGJY=
-go.chromium.org/luci v0.0.0-20200522032345-09f90024e34d/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200522081855-29d5a88a1316 h1:0YgB/Hk5PuPq0Q/0yD8h+/x7L43378mFM9R8VOBqLH8=
-go.chromium.org/luci v0.0.0-20200522081855-29d5a88a1316/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200523054546-f0cbbf49e27f h1:jA8gzR8ENqD5O5xisx8/0NHdqJjg04rlaMDxa4oVVco=
-go.chromium.org/luci v0.0.0-20200523054546-f0cbbf49e27f/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200524184858-ab1d1916efef h1:n0YmaJQFhbnBvVQB/FETGkva8pCbT637Clp7K7bC9QY=
-go.chromium.org/luci v0.0.0-20200524184858-ab1d1916efef/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200526012907-6aaf9821073c h1:lL+V5nazifwK27w9oKF83yHbObKJqMVJOZ0lP2lt//I=
-go.chromium.org/luci v0.0.0-20200526012907-6aaf9821073c/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200527050003-08773ee1fd99 h1:0YtUSYRgpmNqantY7z8MjAsLscRuELXJcAPLU7QkJIQ=
-go.chromium.org/luci v0.0.0-20200527050003-08773ee1fd99/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200528030809-4fafa61b2ec1 h1:ejFyKIul/rCJSD64b9MXFo3RiVQjtpz5bghmQT0uHE8=
-go.chromium.org/luci v0.0.0-20200528030809-4fafa61b2ec1/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200529044848-7e5bce570be3 h1:CemjuuinBFQO9z3/CEfJpRfXHAhqj2NzsnAoPV9GYdo=
-go.chromium.org/luci v0.0.0-20200529044848-7e5bce570be3/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200530010316-74c9d53547b2 h1:POIExLlsGsdfjf33bDnTQoUVAiHRkouD0iHCaODliZk=
-go.chromium.org/luci v0.0.0-20200530010316-74c9d53547b2/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200530205650-69abefee5f1a h1:lX9MkmpQztfZDYNh+T5C8A+wDoYaHVl8rLdEI7VNpCc=
-go.chromium.org/luci v0.0.0-20200530205650-69abefee5f1a/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200531062644-3e6d1e814914 h1:ZtNuLMJ+8/UL2dAQsQwtHZvoFd+bvIYr8fvYdpeFtpE=
-go.chromium.org/luci v0.0.0-20200531062644-3e6d1e814914/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200602010101-22381a3ca5d8 h1:nh9cuIW15llNjMU5w0/AM3cLOV6X1yg3RtUevykUIO4=
-go.chromium.org/luci v0.0.0-20200602010101-22381a3ca5d8/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200603035826-6f83db364f7f h1:7JuZujdZDxrgVL5ZEs2gY//MMIPJXrtPlTK2T+qlGig=
-go.chromium.org/luci v0.0.0-20200603035826-6f83db364f7f/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200604042319-a5a7ce1799fa h1:E42yWOcJQIhOnOGH6by9wWIQT7H7pyyBsYJVlOsLrI4=
-go.chromium.org/luci v0.0.0-20200604042319-a5a7ce1799fa/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200605045204-39c0f2d93834 h1:9v7x9nGhW8VpQxHTmCDLEE1aORWrO33u6c2UUAUUMWg=
-go.chromium.org/luci v0.0.0-20200605045204-39c0f2d93834/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200605231454-b70b93d4ae6d h1:wQ9yA9PJfTskgIfszZS+y9n7oNrYNutFZxItzpjQM+g=
-go.chromium.org/luci v0.0.0-20200605231454-b70b93d4ae6d/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200606210838-0cf95fe43711 h1:w40rE6vljasTHsgSantm2YEmUgO3V8AfNcx+RBp0bmQ=
-go.chromium.org/luci v0.0.0-20200606210838-0cf95fe43711/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200607214229-335dfe308d12 h1:SW4K2pCWkD9JJIJejDmMdvsmoaOBLdgk/a5J3WcPggU=
-go.chromium.org/luci v0.0.0-20200607214229-335dfe308d12/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200610031951-aa35210c29b0 h1:t1mvHoACc3BTwLszzxklvj5DhFgeF2bM0srv6yPP4r4=
-go.chromium.org/luci v0.0.0-20200610031951-aa35210c29b0/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200616031706-d0fdf43f911f h1:YzAEJZzV9ML+5k5a99zUa0TVzg5LguU0Mh680T9H7Go=
-go.chromium.org/luci v0.0.0-20200616031706-d0fdf43f911f/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200617043411-34dd37734506 h1:SimW6kdpOPUzQxbfsGjmC6/MGj2+2Qe9JFfUPtWH4Ac=
-go.chromium.org/luci v0.0.0-20200617043411-34dd37734506/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200620051646-b4124b2326a0 h1:KbTWugpDXgM5wSYWAlmp0NPxxj65l3COVTbPxJaoUXs=
-go.chromium.org/luci v0.0.0-20200620051646-b4124b2326a0/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200624214209-c1ada0c7a303 h1:P3/DuOPaxxznXpgYVLBevVnGSGFZsxwA1MYOCG+pufg=
-go.chromium.org/luci v0.0.0-20200624214209-c1ada0c7a303/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200701021647-c690c0e32e57 h1:8oYI9hlYoLz3NfO1AekWGvi7mrkTPUA+x+hTt52AfTw=
-go.chromium.org/luci v0.0.0-20200701021647-c690c0e32e57/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200702032142-448217aee33a h1:lNeTwNatup7rExN+iy/yYRHx9ZP0bEZnyhQ0K0uUhHI=
-go.chromium.org/luci v0.0.0-20200702032142-448217aee33a/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200706010025-fa1f2bddad9a h1:jS3SDgnlOpSc0s4aPpewBI3y+G6pEY5dOsZYknXH7+c=
-go.chromium.org/luci v0.0.0-20200706010025-fa1f2bddad9a/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200707033358-8fb6a0ac9ee5 h1:P9lJR5u5PNQQcyL4g7LVDsr6rsqtsPzxzJJfnTBxaKM=
-go.chromium.org/luci v0.0.0-20200707033358-8fb6a0ac9ee5/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200708090551-4d14b1192fec h1:N8OHdweRmM8C/ScbyKd8K1We8HQWG3Nm31naCvlsfeA=
-go.chromium.org/luci v0.0.0-20200708090551-4d14b1192fec/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200709090344-f701a3b9eae1 h1:VHLTprBcFsoD3MKfpzgAEiqw0BrLTmrd+YQe1jqXMJs=
-go.chromium.org/luci v0.0.0-20200709090344-f701a3b9eae1/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200710031956-d56ed9f378f9 h1:3XCLKvsr46mM7CZtgX6QynMKoo4D2u7jWE44Hxw2NDo=
-go.chromium.org/luci v0.0.0-20200710031956-d56ed9f378f9/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200714005733-7a755727d74d h1:TH4+2BCUKRB7GJyqvgjLYy0YwHz4YZGN1fJzMONQCsY=
-go.chromium.org/luci v0.0.0-20200714005733-7a755727d74d/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200722014439-1109d0aded30 h1:/l8Ed1BLOAolzbODCsHgGl0wY+5CaKZI9uPkZK7/9s8=
-go.chromium.org/luci v0.0.0-20200722014439-1109d0aded30/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200723011829-5a18d1392b35 h1:C1m4wZS21oReIVg2XNMjXMzPSoz82viLNNnfRfWumKg=
-go.chromium.org/luci v0.0.0-20200723011829-5a18d1392b35/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200724233229-f1ca56e8cee0 h1:VyYGkXa6Q0+f6UAYcpQLw8vSn9YlDU3xEqTLtIP5Ac4=
-go.chromium.org/luci v0.0.0-20200724233229-f1ca56e8cee0/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20200810035958-a85648a14281 h1:i1oPNptavXrHcRzS0TkdlqUc7M0QsbySNT7olSHH0MM=
-go.chromium.org/luci v0.0.0-20200810035958-a85648a14281/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20201029184154-594d11850ebf h1:NU60UEpWAebRM4M5vF/ZzhyPH+v6kZQF0SIeQ0wMjxs=
 go.chromium.org/luci v0.0.0-20201029184154-594d11850ebf/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
-go.chromium.org/luci v0.0.0-20201030140206-3cb383bad2fa h1:3AtmNweHUJIaa8shx7PhdBx/lfgg2uiOjVY2VRawv1U=
-go.chromium.org/luci v0.0.0-20201030140206-3cb383bad2fa/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
 go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 h1:Qe0s5XpxD36QC+7OVnc1Ce8igF3sfTo3f3ad4WKEpNo=
 go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198/go.mod h1:MIQewVTLvOvc0UioV0JNqTNO/RspKFS0XEeoKrOxsdM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -1900,210 +1299,30 @@ go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20200623200853-f5da1af25b54 h1:lCIdXBeomPpIFUOoUvW9Ofded16dqv1i+qvCJoZex9o=
-go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20200623200853-f5da1af25b54/go.mod h1:51F13nJvsTFin0RTIOZL4z8RxGitAz4ww1TD21okMZs=
 go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20201012232926-5c91a3223921 h1:ZpSFyBdyfAuBjsidyg40BRR5g3WYXUHMqOqSqOAY4w8=
 go.larrymyers.com/protoc-gen-twirp_typescript v0.0.0-20201012232926-5c91a3223921/go.mod h1:51F13nJvsTFin0RTIOZL4z8RxGitAz4ww1TD21okMZs=
 go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
-go.mongodb.org/mongo-driver v1.1.0 h1:aeOqSrhl9eDRAap/3T5pCfMBEBxZ0vuXBP+RMtp2KX8=
 go.mongodb.org/mongo-driver v1.1.0/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
 go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
-go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.skia.org/infra v0.0.0-20200426051548-d5561681c574 h1:ncyx3a9Y+Z+dWmTxoZpiP+KAugNHXzBuCN8cgiajXwU=
-go.skia.org/infra v0.0.0-20200426051548-d5561681c574/go.mod h1:oBRD8ErmsFrK7iGrag6lV1O0mGWUHkUEKnJMz5bLIuo=
-go.skia.org/infra v0.0.0-20200427173615-ee504c19b426 h1:TgOSfFggLtGANTRzWQZcnIFJvzsjVugqbCewJrs0fHk=
-go.skia.org/infra v0.0.0-20200427173615-ee504c19b426/go.mod h1:oBRD8ErmsFrK7iGrag6lV1O0mGWUHkUEKnJMz5bLIuo=
-go.skia.org/infra v0.0.0-20200428170256-e70b0c95609d h1:hS23bAR83e8SqcAYtWKz3w4eTWmNXxLU6JzLt+MC16g=
-go.skia.org/infra v0.0.0-20200428170256-e70b0c95609d/go.mod h1:oBRD8ErmsFrK7iGrag6lV1O0mGWUHkUEKnJMz5bLIuo=
-go.skia.org/infra v0.0.0-20200429221357-e24595334f06 h1:gIhdVNfytlq2cgV6A0yueNwwYeRTrVgd8hEa0r0TrOM=
-go.skia.org/infra v0.0.0-20200429221357-e24595334f06/go.mod h1:oBRD8ErmsFrK7iGrag6lV1O0mGWUHkUEKnJMz5bLIuo=
-go.skia.org/infra v0.0.0-20200430185047-3ccc19b46660 h1:nOvp0ldpMpjRefFY1KZP7hC8YbIupTE/eJRKdFUh618=
-go.skia.org/infra v0.0.0-20200430185047-3ccc19b46660/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200501203151-eb0a288b018e h1:yafGaDsNNf4HDJCvLRhZTZK7jKD6SwLzD104hNdRnlU=
-go.skia.org/infra v0.0.0-20200501203151-eb0a288b018e/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200502103800-94e8762baaf7 h1:vnkzYCbXRXxLHJDCIGPLvUZm07j+5bIXTZYtYq+kNlw=
-go.skia.org/infra v0.0.0-20200502103800-94e8762baaf7/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200503052148-83859334b074 h1:6cV5GzR5C9af52Sfgx8QxBVMVUvQgCMRP5qXihY68NU=
-go.skia.org/infra v0.0.0-20200503052148-83859334b074/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200504172459-3a2f532f7f6a h1:8V9pdO7CkfCCfg0wAbyONkGYYOSTfFVgAQ3ACQoDS6A=
-go.skia.org/infra v0.0.0-20200504172459-3a2f532f7f6a/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200505190403-4f948f03bc1d h1:Ht+K2to8As2OuD3w8OXYm6sHtjP0aUFApl78IxvusJ4=
-go.skia.org/infra v0.0.0-20200505190403-4f948f03bc1d/go.mod h1:gd0b6Q/5kysjM1NolzPHnccv4P4osplGQ2C21dsJuJc=
-go.skia.org/infra v0.0.0-20200506175242-54a7277fb8ba h1:vJpgc1XCNYHpKtzrc+aQAb5UKrnyeNAoVcJB6ZhGH5M=
-go.skia.org/infra v0.0.0-20200506175242-54a7277fb8ba/go.mod h1:6JuLy3GfEHbd0w7OY71clI/v95WahXNTUoIqoHzgz4E=
-go.skia.org/infra v0.0.0-20200507202525-244ffab1cfff h1:gFh9UAm+FIPtRaEoJJusKcZCRhSR1ivF53NnWhYgbO4=
-go.skia.org/infra v0.0.0-20200507202525-244ffab1cfff/go.mod h1:r7NNPvrakvWrvwjbahbnoAUe6ObgW+is42Jn5W/O3vs=
-go.skia.org/infra v0.0.0-20200508202611-ae56b6e7b85d h1:UoiDVtU7Myd5EOqce+Y1G4rIBpIHu0T2wskmy+P51ig=
-go.skia.org/infra v0.0.0-20200508202611-ae56b6e7b85d/go.mod h1:9u3I25Vzr4MQmaP3OGxU8H+pTmSF0XTznyrnejgZajE=
-go.skia.org/infra v0.0.0-20200509052705-4fef3ca31a64 h1:ZG0mUufL+X4JIJz6E3W7XgLO5efVnrtXI+XaJtmJv/E=
-go.skia.org/infra v0.0.0-20200509052705-4fef3ca31a64/go.mod h1:EWhJ9TjeUGYft6Ml6uAWDV1h2muCkUTVI9XaJ/x2YfE=
-go.skia.org/infra v0.0.0-20200510051916-c510af98b2e2 h1:tPicDtbbhbm2VIeWGkJWqttFU/5NulgKozeZghrnZcE=
-go.skia.org/infra v0.0.0-20200510051916-c510af98b2e2/go.mod h1:5zYgNYV5pIppdFozmiODsG2uQCMC+0fOyyrcLg7aysY=
-go.skia.org/infra v0.0.0-20200511211207-95f3089bc4cc h1:BTPeEAw2uZiDkkgB0/3uJs7CXtCb10KYbqRh/C0nVzg=
-go.skia.org/infra v0.0.0-20200511211207-95f3089bc4cc/go.mod h1:Y3FtJfwMwYFLkFseYoxx0vFXULPRmMeCkdh/V4MZ2zk=
-go.skia.org/infra v0.0.0-20200512194548-951341df22eb h1:2SaF0/4WKl7qK4dnuL6KqwubGmxWM3FxJOOMugvgM0s=
-go.skia.org/infra v0.0.0-20200512194548-951341df22eb/go.mod h1:nLrngGIDY14mGE2QHyNdZwVdFjFy1fiQt8BuITWnQUE=
-go.skia.org/infra v0.0.0-20200513214741-b48b7541705b h1:CvAf0vQNYfGestzVEnPlC/FivS0lOO2Yy4GGMu+9wd8=
-go.skia.org/infra v0.0.0-20200513214741-b48b7541705b/go.mod h1:tBQDukWk2xVQloTQm8u0NEMLogJotYLaIIRGaW8ptzU=
-go.skia.org/infra v0.0.0-20200514203654-68437497a177 h1:dkJUApDvQd0YelLlTtOw8e2t+rPiqTi0BXROdTPstvo=
-go.skia.org/infra v0.0.0-20200514203654-68437497a177/go.mod h1:ZYLSLco+ZPsUvsLIuHQ4imULI2iQpIsqjJgQV51nJYQ=
-go.skia.org/infra v0.0.0-20200515201715-a7a36bfa3904 h1:zBqjjxRqYNanPs/u1eG+OS5ES2NDze5+YgUHpR/ECiw=
-go.skia.org/infra v0.0.0-20200515201715-a7a36bfa3904/go.mod h1:RgvrC4IwpwLL8pGY6Ky+jvo4ESN6QIhDCTLuQRMLS+Y=
-go.skia.org/infra v0.0.0-20200517003836-a97023535be0 h1:5Y3+W824N7nyN6jtRQ5nVIR4+F6X82yanNCKy3+mfZk=
-go.skia.org/infra v0.0.0-20200517003836-a97023535be0/go.mod h1:wUNkV36PKChD+FqXnbutU+CTrowS34zogZxR7dM9/Qw=
-go.skia.org/infra v0.0.0-20200517051906-a6ca5c350a27 h1:uoETWhQd19HZtOCpyrtJF2N40JKJRSBDc8r/H+RrFwE=
-go.skia.org/infra v0.0.0-20200517051906-a6ca5c350a27/go.mod h1:r4menQ81DCh2Z8F1VQrVwTF6MfjF+SjiNBNuhw/zOVk=
-go.skia.org/infra v0.0.0-20200518163317-d13378041764 h1:TxP8bWoGbxkKe/7qy42lzKWjLR0lQgXHdL+xEfPcFE0=
-go.skia.org/infra v0.0.0-20200518163317-d13378041764/go.mod h1:YUonajNEXmp2zXY4nCjq71u2jS3buVVmcwRJkqPemt4=
-go.skia.org/infra v0.0.0-20200519192145-3e17804945b5 h1:b7XWeRG85a6L6XyM3nwUkLr4Pxji7f50v3fmTUyQdac=
-go.skia.org/infra v0.0.0-20200519192145-3e17804945b5/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200521012806-adfecbf4d12b h1:1/XcccQg9+H2mnXdngmy9S9gqwVQGbctktDXRWq55C4=
-go.skia.org/infra v0.0.0-20200521012806-adfecbf4d12b/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200521174639-5a4c3706743c h1:0w6wK5H9yJFYubuABdlN0mm/fYF5+16ZC27bh2JII9s=
-go.skia.org/infra v0.0.0-20200521174639-5a4c3706743c/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200522021524-374ac39a37f3 h1:oyfXrRT5bcy9ov2cDmv9JK2jUj2SU7TGuZouUtAD7uA=
-go.skia.org/infra v0.0.0-20200522021524-374ac39a37f3/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200524051606-dbb4c0a8b550 h1:y5cO+QUeKajZ4+0KBLLvqO1YXtQI0pLfds+xbfGUm30=
-go.skia.org/infra v0.0.0-20200524051606-dbb4c0a8b550/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200526214647-c7b51d93a48c h1:bFMJCTNpW7Dg5aQXgtmCLmmyNjP3YRsntszb6zqZOtQ=
-go.skia.org/infra v0.0.0-20200526214647-c7b51d93a48c/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200527211736-fd92f6d87408 h1:oZCbx0/QT0YDZpM4zXQmjnb/V2y9lVGLFkmRBMACojE=
-go.skia.org/infra v0.0.0-20200527211736-fd92f6d87408/go.mod h1:TrfsolBfPGSzcdhyDUunXeiiib2qh8QdR03x0e2DDvY=
-go.skia.org/infra v0.0.0-20200529025909-067ee0d9cae2 h1:2jMoZlANXkH0DxmTkTdfw9Zow1/s/HBUZqD0bu3aoHA=
-go.skia.org/infra v0.0.0-20200529025909-067ee0d9cae2/go.mod h1:j3HKJ6UWFS8tfOIpvG6v5W/j+Adn29iDhccrSXUvNNY=
-go.skia.org/infra v0.0.0-20200529222451-b641a303256d h1:31V/uagC9bhiRoYqPnGRaIx2pzYcOhGBNuFPXukSn6w=
-go.skia.org/infra v0.0.0-20200529222451-b641a303256d/go.mod h1:dJEDl07151HEE01+fxbLF++Q/vg05jY5ncsnZnoMpKI=
-go.skia.org/infra v0.0.0-20200530052006-537aafa16b0c h1:KjVTmo/5MWxcVq9TFJbMPqd/qtvtpUpNU3SNmoKyyNE=
-go.skia.org/infra v0.0.0-20200530052006-537aafa16b0c/go.mod h1:LhPONsfnCn1CZ+8hUZwizdGjKpwhOLVBbTpeLQKotLI=
-go.skia.org/infra v0.0.0-20200531235413-49ee856d9221 h1:mwwLw4G9yVKLrATCCojYJaGLDzYO3hxqTuPxRJUIi6M=
-go.skia.org/infra v0.0.0-20200531235413-49ee856d9221/go.mod h1:FGT/VEEXbjSkv4BLKOaOTIwnN5UuOVq+otgfuRNnyuo=
-go.skia.org/infra v0.0.0-20200601172913-661352160768 h1:2Ost47UuFoayaOOw9ViWobzVllXGSzG9PvD7BMxjx+0=
-go.skia.org/infra v0.0.0-20200601172913-661352160768/go.mod h1:kHaLU+44ROLRPXzBM8T+I228aI5I3iLyQJfl7jKgNV0=
-go.skia.org/infra v0.0.0-20200602205122-4b2f488e41f2 h1:BDmPEnFuRjA1hse1mrtENFdNWI/xbeuK1Ud+zjOGpPY=
-go.skia.org/infra v0.0.0-20200602205122-4b2f488e41f2/go.mod h1:V3DIL+P3Z02iAcrN6fv12VdGmcGk0Ilnll9AaJMwcJ8=
-go.skia.org/infra v0.0.0-20200603202721-a6e610f118bb h1:E5FJMOSsxV2rO8BQCCoWmHupW452aZnsPxmyucdSZ2U=
-go.skia.org/infra v0.0.0-20200603202721-a6e610f118bb/go.mod h1:fWqpZS0bMv6mNkxuLcBO3QT99/esXYMStxWBump650A=
-go.skia.org/infra v0.0.0-20200604211856-3c19627e244c h1:b+GM2TnLzcrLmErKUhfAAo+2LszF4ytZ0a3JRxPcsTg=
-go.skia.org/infra v0.0.0-20200604211856-3c19627e244c/go.mod h1:rZheB7d1g56dFa1+ppg+MM+eLIFOU0FtWjOH9qt0+js=
-go.skia.org/infra v0.0.0-20200605163027-b867fb6b6232 h1:1Ijp82P9IWeUQxp5GksR9lNpewQrapamOoL5bM4U6Zg=
-go.skia.org/infra v0.0.0-20200605163027-b867fb6b6232/go.mod h1:rUspbipWPw+4biwgLMMx4G+N98efd9fe9bGN5w3McX0=
-go.skia.org/infra v0.0.0-20200607051952-f5b0a6c1ff19 h1:r7jv7+kc3/GWF6V6F41DGewz8I88JPZ/8SJgIOzAO4g=
-go.skia.org/infra v0.0.0-20200607051952-f5b0a6c1ff19/go.mod h1:rUspbipWPw+4biwgLMMx4G+N98efd9fe9bGN5w3McX0=
-go.skia.org/infra v0.0.0-20200616030136-5b68b7891c11 h1:7mRcsdA0SA+ZBlr/hIaqyObrLOJJiLoNDtIQfcm4HXM=
-go.skia.org/infra v0.0.0-20200616030136-5b68b7891c11/go.mod h1:zZzuuDGdQ4PWDlSeT6XES2oeGAN0MC3Si7jAqktPpj0=
-go.skia.org/infra v0.0.0-20200616185547-28019d8c7381 h1:ufnikxI51+amDAf+4DtT31CmmfF0qAyRHMxt44rqp9o=
-go.skia.org/infra v0.0.0-20200616185547-28019d8c7381/go.mod h1:zZzuuDGdQ4PWDlSeT6XES2oeGAN0MC3Si7jAqktPpj0=
-go.skia.org/infra v0.0.0-20200620150920-23b7fda631d5 h1:3vYt68R8Bw8eYBbuh0e/olkspGyJqIbcfMNGJjc1x3A=
-go.skia.org/infra v0.0.0-20200620150920-23b7fda631d5/go.mod h1:pMsp+TR1J9uXYYdx1eb5CN6l89l0h9jloETXMKmesPM=
-go.skia.org/infra v0.0.0-20200624212929-6c6f866a7d58 h1:z1yyY9tpiiqrgeskjVoJhTZoI7xXRc8tQYEACM7I8TA=
-go.skia.org/infra v0.0.0-20200624212929-6c6f866a7d58/go.mod h1:pMsp+TR1J9uXYYdx1eb5CN6l89l0h9jloETXMKmesPM=
-go.skia.org/infra v0.0.0-20200701232717-f65049e8d199 h1:xzgNDs+qemaawIcCrv4i9nWMwb6PMznZY/7KJu/t61A=
-go.skia.org/infra v0.0.0-20200701232717-f65049e8d199/go.mod h1:31exDrG21U2Ipqt0Ao2zlJM/GEMS/0za5zovLSJH1c0=
-go.skia.org/infra v0.0.0-20200706211051-88e733d409bf h1:a8WuucYFZoZH56L9Vxb8sGTIYMfLzEjeaE29ZmG/QJM=
-go.skia.org/infra v0.0.0-20200706211051-88e733d409bf/go.mod h1:9X0Tt0jgyjgQ3GlJyjSUVoVahWlmQ4gCAI0Ba2ouh8w=
-go.skia.org/infra v0.0.0-20200708134745-fcce5bb3db4b h1:3McKLCugVU8pPzZbhu8E0iHkKkYhS5sb4wg5AAEQj0A=
-go.skia.org/infra v0.0.0-20200708134745-fcce5bb3db4b/go.mod h1:dNfsYphZk1yD3L700jW76XyiMwiPLq9ZJkJtAz5jkGU=
-go.skia.org/infra v0.0.0-20200709171759-d743a7d95130 h1:DUHPuHONF9CMYMAp0Lm7Spv/Gb/6uZhvO2KwnU9u9vM=
-go.skia.org/infra v0.0.0-20200709171759-d743a7d95130/go.mod h1:dNfsYphZk1yD3L700jW76XyiMwiPLq9ZJkJtAz5jkGU=
-go.skia.org/infra v0.0.0-20200709211939-9acc96b0753c h1:sgK3KuxLu6JJVmUZIAdMUi5UnkxJ/vjtxQYjCkUZdNc=
-go.skia.org/infra v0.0.0-20200709211939-9acc96b0753c/go.mod h1:dNfsYphZk1yD3L700jW76XyiMwiPLq9ZJkJtAz5jkGU=
-go.skia.org/infra v0.0.0-20200713190753-d1daff06b038 h1:GkHR6qeSY1r8hSSglcJqabyUBlaGsKQWZQeGbwVlMwM=
-go.skia.org/infra v0.0.0-20200713190753-d1daff06b038/go.mod h1:zfu28RupR3UvPnglFAlYuzRZmGay+YZkOhGaNYj5gXw=
-go.skia.org/infra v0.0.0-20200716131439-4244d8caa80b h1:fll+xjSjHku+Cw3L/d2S27Hx1wZENQKm8pU+ZdNJjWU=
-go.skia.org/infra v0.0.0-20200716131439-4244d8caa80b/go.mod h1:9W+GA25bm1ATJJudXnD5w5Eef8H5ZOMeyvoMvpDO+pM=
-go.skia.org/infra v0.0.0-20200720192647-60abe5858d25 h1:g1oy4+IZkt9pwoSAJy5kLvKuRiQ8XytsfyMmRj585DE=
-go.skia.org/infra v0.0.0-20200720192647-60abe5858d25/go.mod h1:tWlEE4kQzt/95Kp1siIyhRePuV4z3fLGYyrtn8ZwrfM=
-go.skia.org/infra v0.0.0-20200722213434-4161883552b4 h1:5cc23P7wztQR3Cx56BDU7ciXxRqhmzO+jxvM16F9Dho=
-go.skia.org/infra v0.0.0-20200722213434-4161883552b4/go.mod h1:tWlEE4kQzt/95Kp1siIyhRePuV4z3fLGYyrtn8ZwrfM=
-go.skia.org/infra v0.0.0-20200725035726-922d9605db0b h1:JHzBNY+G8f+Ji0Bcsd9McyWL1kJMiWks19+ZrTYEt/A=
-go.skia.org/infra v0.0.0-20200725035726-922d9605db0b/go.mod h1:QuaU6UrfzN9qSKZ3i/zqOGrZRa2B0g2xfErkgXs9ugo=
-go.skia.org/infra v0.0.0-20201020104011-d5d53db1a256 h1:siwoFkVEAikQV9B5fa9QkhwQhVGBP3+YYDadDyWqyYY=
-go.skia.org/infra v0.0.0-20201020104011-d5d53db1a256/go.mod h1:QwWnnt5NJk/+Wf1eCEW3i/e5qwtMvnB+VaSFgNdRW2k=
-go.skia.org/infra v0.0.0-20201020123031-a17e5c55b742 h1:2J7Xc5gQJjg1Ro9MzN58e2LvTU6ibuh/MezLN/Vu0wM=
-go.skia.org/infra v0.0.0-20201020123031-a17e5c55b742/go.mod h1:QwWnnt5NJk/+Wf1eCEW3i/e5qwtMvnB+VaSFgNdRW2k=
-go.skia.org/infra v0.0.0-20201030163508-003d90397045 h1:9uAC3f9GstmnQ1p/dNyWA2rtaCP/GwXiXhkJrsJD8cE=
-go.skia.org/infra v0.0.0-20201030163508-003d90397045/go.mod h1:ytV4zF6Ko8b2prbRy/3dws2LG0zllbkcpp9TyrMsPSo=
-go.skia.org/infra v0.0.0-20201116224347-1e7e10cc955e h1:4nZBi12MpE8M5Lkb9/fVRCzMc1+5nmhwkWjyx+cgsQ0=
-go.skia.org/infra v0.0.0-20201116224347-1e7e10cc955e/go.mod h1:oU/fFSg6ls3dhtf8znJiyV6igl/Usj8dyAKwOW8mqBs=
-go.skia.org/infra v0.0.0-20201117202645-45feb3444957 h1:Ij9XfTHPWN28cLPnWXtXfreCIMdJl8bm5njgf3/16AI=
-go.skia.org/infra v0.0.0-20201117202645-45feb3444957/go.mod h1:oU/fFSg6ls3dhtf8znJiyV6igl/Usj8dyAKwOW8mqBs=
-go.skia.org/infra v0.0.0-20201119140725-137eb7f64dfc h1:06CrKLElcBVwZbz2G5kH3pdb2RFwbJ8snEJzTgvPzLg=
-go.skia.org/infra v0.0.0-20201119140725-137eb7f64dfc/go.mod h1:oU/fFSg6ls3dhtf8znJiyV6igl/Usj8dyAKwOW8mqBs=
-go.skia.org/infra v0.0.0-20201121180522-93bdbc7a75f1 h1:G54ibWX1ZUTtXtxbJa9cSwnpnpWczairKt0gVYk1Ilw=
-go.skia.org/infra v0.0.0-20201121180522-93bdbc7a75f1/go.mod h1:oU/fFSg6ls3dhtf8znJiyV6igl/Usj8dyAKwOW8mqBs=
-go.skia.org/infra v0.0.0-20201124180436-e5c4a9cfc497 h1:e+mgl62r///L7xONfLvHoICWVuBgDHojouuSp2kMDQM=
-go.skia.org/infra v0.0.0-20201124180436-e5c4a9cfc497/go.mod h1:oFkIcc1CyrdaKdUCEdzTaEYrZ5VQilTafssIyqmDX5c=
-go.skia.org/infra v0.0.0-20201207203943-872c83842f7f h1:YYw8uJAhrDhZEeADqP1VRIhGwbXLc85CAbRssIRn3po=
-go.skia.org/infra v0.0.0-20201207203943-872c83842f7f/go.mod h1:Y9eqtwoOyMrt8v6BhHkKeowb5NtwW0QS7acq62C5hYA=
-go.skia.org/infra v0.0.0-20201208190233-5ff1df349fce h1:33k5qh7TbSOoR7v66BL0mXem4dgepFY/aEbhWDoNUA8=
-go.skia.org/infra v0.0.0-20201208190233-5ff1df349fce/go.mod h1:Y9eqtwoOyMrt8v6BhHkKeowb5NtwW0QS7acq62C5hYA=
-go.skia.org/infra v0.0.0-20201211124251-12d4265d9508 h1:e4OP3bMRuV6rzu+/glC/qjuij9IZHofdn3ybaan0aS0=
-go.skia.org/infra v0.0.0-20201211124251-12d4265d9508/go.mod h1:7t8Lju542R6/LHj4Swn4cGWHPYylIAQPGeS5V0fpFPU=
-go.skia.org/infra v0.0.0-20201217154708-25854a97e536 h1:jOJz5EMh0nf54wV8CQpTyuPx7N2kz3cGkYim8prurPc=
-go.skia.org/infra v0.0.0-20201217154708-25854a97e536/go.mod h1:5q1SY6pVIsvuPD68rYiVzgjguBKFy1DlJN5UzFem3uk=
-go.skia.org/infra v0.0.0-20201221193112-e9c390189fa6 h1:Si4o3D+S8uveMzJlwP6Xpuo8hwwDMIJl/6w0Ub+6d8I=
-go.skia.org/infra v0.0.0-20201221193112-e9c390189fa6/go.mod h1:5q1SY6pVIsvuPD68rYiVzgjguBKFy1DlJN5UzFem3uk=
-go.skia.org/infra v0.0.0-20210225173621-2d381258bc7f h1:7bIdYLWbyYaIIaeUhfxP/Jz5l4KIGYgOOroV6rrfF4I=
-go.skia.org/infra v0.0.0-20210225173621-2d381258bc7f/go.mod h1:WnqjWzF6oICFv15yl3JMIlcPyaE/Ln2SBQJY3LOx620=
-go.skia.org/infra v0.0.0-20210516052255-1a8ff8585fce h1:3LtaFsEr/rwQBSEb9COXkqRFTqVNV7A0hDDx9EdI2DQ=
-go.skia.org/infra v0.0.0-20210516052255-1a8ff8585fce/go.mod h1:CLaSKpALX5MdHvEbOYQwfwRs/fSt84ELnDW/p+2Sqzg=
-go.skia.org/infra v0.0.0-20210604140612-9ff0abde8f7d h1:XhGK3A0tR8LnHs2U6KSXDBmq88/fgcYyNs5H8ytHix8=
-go.skia.org/infra v0.0.0-20210604140612-9ff0abde8f7d/go.mod h1:jmbE7Rb5L9wQ5ThDHRy5fzzI5qeMMS6tBhhwRC/5/1M=
-go.skia.org/infra v0.0.0-20210604150202-e9a7516eb634 h1:5KJfPwLjv4Wc9Dp3omRfQS+ZIyJrjjVzNT+/nA8x190=
-go.skia.org/infra v0.0.0-20210604150202-e9a7516eb634/go.mod h1:jmbE7Rb5L9wQ5ThDHRy5fzzI5qeMMS6tBhhwRC/5/1M=
-go.skia.org/infra v0.0.0-20210625193141-b3e5ef879196 h1:OqSR9rTG6KPk1mpcI0myywQhImlhG7a3vDSxpcWo3Ic=
-go.skia.org/infra v0.0.0-20210625193141-b3e5ef879196/go.mod h1:ANHRJSQc1LAoqA/ChJIp31Ga/t/14INkoMMwjaUD/x0=
-go.skia.org/infra v0.0.0-20210721141210-b49462a62808 h1:GWWz6hPS9UHkll+X0eREPurcG/qkOaLlcLbzwARtDMI=
-go.skia.org/infra v0.0.0-20210721141210-b49462a62808/go.mod h1:DFXhiY1makX+YrEr0lV0OE7E2yF3L67KsLKzE9e0r5A=
-go.skia.org/infra v0.0.0-20210722131314-83d167c8dec8 h1:xLjgibhP4Mo+q0CnEKPX3WH9cHhZm7xohaaHjxP7xZk=
-go.skia.org/infra v0.0.0-20210722131314-83d167c8dec8/go.mod h1:DFXhiY1makX+YrEr0lV0OE7E2yF3L67KsLKzE9e0r5A=
-go.skia.org/infra v0.0.0-20210805120035-d7adf64fa8ce h1:LfY/AAheMFAeucBc4KQeV8qu+643PPhn9sQS+Q34c0s=
-go.skia.org/infra v0.0.0-20210805120035-d7adf64fa8ce/go.mod h1:GyZrul70Cfa4weHZsZewKFguAq/o2UzvrVxnU35Z+Yo=
-go.skia.org/infra v0.0.0-20210805134743-b82de02ca21f h1:HFpFtcGMI3zt3r/FUTGtNngULZY95KCUcx/jhadtSmQ=
-go.skia.org/infra v0.0.0-20210805134743-b82de02ca21f/go.mod h1:GyZrul70Cfa4weHZsZewKFguAq/o2UzvrVxnU35Z+Yo=
-go.skia.org/infra v0.0.0-20210805161050-852830eb10cf h1:6Wl/2EAmBMbFCx5iVi1OejEXgd1gX6C/hVJUKGYaYjI=
-go.skia.org/infra v0.0.0-20210805161050-852830eb10cf/go.mod h1:GyZrul70Cfa4weHZsZewKFguAq/o2UzvrVxnU35Z+Yo=
-go.skia.org/infra v0.0.0-20210826161750-abfa88005ea2 h1:rtUkzTl262cTcNNXzb+2dtLo5kkKFmzAt8V6fCt5cas=
-go.skia.org/infra v0.0.0-20210826161750-abfa88005ea2/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20210902145641-d491ce07b3ec h1:spurw6vV+901MVCFT2v5RKlmviAmfgzSn+C2GfCMlTU=
-go.skia.org/infra v0.0.0-20210902145641-d491ce07b3ec/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20210907172252-301711e495a6 h1:Ias8OCxxmGKRP9LBGI+fgDHtoUerLeJCKuHad8JK0yE=
-go.skia.org/infra v0.0.0-20210907172252-301711e495a6/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20210907181340-7a7b1124f8fa h1:TC6DdCxBpp4u57PJuvjSkdKWsztMj2i+xzZhFS2CmPs=
-go.skia.org/infra v0.0.0-20210907181340-7a7b1124f8fa/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20210907185953-86c4d2f6fc33 h1:VAeUs+hEzAhHZTwoubBD2jnUCgAJR7C91ukORoXDKDU=
-go.skia.org/infra v0.0.0-20210907185953-86c4d2f6fc33/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20210910143316-141caab7391e h1:klXhFdngbjdDI+e9m+iLvFquoCT+VqXGzAO0VI4BUaw=
-go.skia.org/infra v0.0.0-20210910143316-141caab7391e/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20211110142552-553519b41e71 h1:MsyIiBuNicDVyMBAECY6QO6A/BpjTdRgImiWQ9iaQro=
-go.skia.org/infra v0.0.0-20211110142552-553519b41e71/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20211118151522-74751ee0f13f h1:2QeDr9yTkQd/Mi9uyaXJ4FUnm7OADX6TflY++ne/8R4=
-go.skia.org/infra v0.0.0-20211118151522-74751ee0f13f/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20211122205336-2a6261fa4406 h1:0RAsI1kFsIIVP6Xf6tsfxPKcjrlAb5Cc8NqyhGzg1Rs=
-go.skia.org/infra v0.0.0-20211122205336-2a6261fa4406/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20211123203253-4b3906380051 h1:/6cXTEFbze/fDY4ck4zdDu4mg85a4PyxkH5Scvo4Uhk=
-go.skia.org/infra v0.0.0-20211123203253-4b3906380051/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
-go.skia.org/infra v0.0.0-20211201214445-039210fafe39 h1:u003Vjd7xBFaKlEYohyQRGgPi5pzvMyyi4+a6M7PYDk=
-go.skia.org/infra v0.0.0-20211201214445-039210fafe39/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM=
+go.skia.org/infra v0.0.0-20211220211329-847b896d0605 h1:X0VVb9xr8RbgeaC4hD+t4F7vju9lmXYeGgQOeJ4Y/bw=
+go.skia.org/infra v0.0.0-20211220211329-847b896d0605/go.mod h1:F317bWqAb10VqH9f5yC3cZugJ87N0Lvoi5xjM+vmR1g=
+go.skia.org/infra v0.0.0-20211221155757-2dce552b7a06 h1:0nA6CcXj6OayS2l7WKWT8xY/BmR+gg1bYRbI3UNzyvE=
+go.skia.org/infra v0.0.0-20211221155757-2dce552b7a06/go.mod h1:F317bWqAb10VqH9f5yC3cZugJ87N0Lvoi5xjM+vmR1g=
+go.skia.org/infra v0.0.0-20220110171919-69477ccd2d29 h1:EQFMh6ZPs6RJ7pyDiH3z1JrIEl/BR2YNGqMAdctU7N8=
+go.skia.org/infra v0.0.0-20220110171919-69477ccd2d29/go.mod h1:F317bWqAb10VqH9f5yC3cZugJ87N0Lvoi5xjM+vmR1g=
+go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
-go.starlark.net v0.0.0-20201118183435-e55f603d8c79 h1:JPjLPz44y2N9mkzh2N344kTk1Y4/V4yJAjTrXGmzv8I=
-go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -2126,7 +1345,6 @@ golang.org/x/build v0.0.0-20191031202223-0706ea4fce0c/go.mod h1:Nl5grlQor/lxfX9F
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -2141,40 +1359,13 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f h1:kz4KIr+xcPUsI3VMoqWfPMvtnJ6MGfiVwsWSVzphMO4=
 golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM=
-golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a h1:y6sBfNd1b9Wy08a6K1Z1DZc4aXABUN5TKjkYhz7UKmo=
-golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5 h1:Q7tZBpemrlsc2I7IyODzhtallWRSm4Q0d09pL6XbQtU=
-golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc h1:ZGI/fILM2+ueot/UixBSoj9188jCAxVHEZEGhqq67I4=
-golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
-golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw=
 golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed h1:g4KENRiCMEx58Q7/ecwfT0N2o8z35Fnbsjig/Alf2T4=
-golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM=
-golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 h1:eIYIE7EC5/Wv5Kbz8bJPaq+TN3kq3W8S+LSm62vM0DY=
-golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg=
 golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig=
-golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E=
 golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 h1:phUcVbl53swtrUN8kQEXFhUxPlIlWyBfKmidCu7P95o=
-golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2185,16 +1376,10 @@ golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm0
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a h1:7Wlg8L54In96HTWOaI4sreLJ6qfyGuvSau5el3fK41Y=
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd h1:zkO/Lhoka23X63N9OSzpSeROEUQ5ODw47tM3YWjygbs=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200213203834-85f925bdd4d0 h1:tm4MMkqdvahr61SDpB2su1XZfifRH4XMRQODT1z3p2Q=
-golang.org/x/exp v0.0.0-20200213203834-85f925bdd4d0/go.mod h1:IX6Eufr4L0ErOUlzqX/aFlHqsiKZRbV42Kb69e9VsTE=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 h1:QE6XYQK6naiK1EPAe1g/ILLxN5RBoH5xkJk3CqlMI/Y=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 h1:jqhIzSw5SQNkbu5hOGpgMHhkfXxrbsLJdkIRcX19gCY=
-golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -2206,31 +1391,24 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
 golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367 h1:0IiAsCRByjO2QjX7ZPkw5oU9x+n1YqRL802rjC0c3Aw=
 golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
 golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mobile v0.0.0-20191002175909-6d0d39b2ca82/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ=
 golang.org/x/mobile v0.0.0-20191031020345-0945064e013a h1:CrJ8+QyIm2tcw/zt9Rp/vGFsey+jndL1y5EnFwzgGOg=
 golang.org/x/mobile v0.0.0-20191031020345-0945064e013a/go.mod h1:p895TfNkDgPEmEQrNiOtIl3j98d/tGU95djDj7NfyjQ=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2248,72 +1426,41 @@ golang.org/x/net v0.0.0-20190225153610-fe579d43d832/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 h1:KaQtG+aDELoNmXYas3TVkGNYRuq8JQ1aa7LJt8EXVyo=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 h1:MsuvTghUPjX762sGLnGsxC3HM0B5r83wEtYcYR8/vRs=
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200421231249-e086a090c8fd h1:QPwSajcTUrFriMF1nJ3XzgoqakqQEsnZf9LdXdi2nkI=
-golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0 h1:Jcxah/M+oLZ/R4/z5RzfPzGbPXnVDPkEDtf2JnuxN+U=
-golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 h1:WQ8q63x+f/zpC8Ac1s9wLElVoHhm32p6tudrU72n1QA=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200505041828-1ed23360d12c h1:zJ0mtu4jCalhKg6Oaukv6iIkb+cOvDrajDH9DH46Q4M=
-golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJnl/ymnJWAdMuinqL7Y=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7 h1:AeiKBIuRw3UomYXSbLy0Mc2dDLfdtbT/IVn4keq83P0=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 h1:eDrdRpKgkcCqKZQwyZRyeFZgfqt37SL7Kv3tok06cKE=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200528225125-3c3fba18258b h1:IYiJPiJfzktmDAO1HQiwjMjwjlYKHAL7KzeD544RJPs=
-golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d h1:dOiJ2n2cMwGLce/74I/QHMbnpk5GfY7InR8rczoMqRM=
-golang.org/x/net v0.0.0-20201029221708-28c70e62bb1d/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 h1:OgUuv8lsRpBibGNbSizVwKWlysjaNzmC9gYMhPVfqFM=
 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -2321,12 +1468,9 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc=
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 h1:Mj83v+wSRNEar42a/MQgxk9X42TdEmrOl9i+y8WbxLo=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
@@ -2336,18 +1480,13 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2357,8 +1496,6 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190122071731-054c452bb702/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2372,17 +1509,14 @@ golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -2393,117 +1527,54 @@ golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4 h1:sfkvUWPNGwSV+8/fNqctR5lS2AqCSqYwXdrjCxp/dXo=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200317113312-5766fd39f98d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa h1:mQTN3ECqfsViCNBgq+A40vdwhkGykrrQlYe3mPj6BoU=
-golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f h1:gWF768j/LaZugp8dyS4UwsslYCYz9XgFxvlgsn0n9H8=
-golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200427175716-29b57079015a h1:08u6b1caTT9MQY4wSbmsd4Ulm6DmgNYnbImBuZjGJow=
-golang.org/x/sys v0.0.0-20200427175716-29b57079015a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200428200454-593003d681fa h1:yMbJOvnfYkO1dSAviTu/ZguZWLBTXx4xE3LYrxUCCiA=
-golang.org/x/sys v0.0.0-20200428200454-593003d681fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200430202703-d923437fa56d h1:xmcims+WSpFuY56YEzkKF6IMDxYAVDRipkQRJfXUBZk=
-golang.org/x/sys v0.0.0-20200430202703-d923437fa56d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 h1:5B6i6EAiSYyejWfvc5Rc9BbI3rzIsrrXfAQBWnYfn+w=
-golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200508214444-3aab700007d7 h1:EEDKzZsac90dOwDpumCaAWrqnvbzVPdlUH9lCZ1yExw=
-golang.org/x/sys v0.0.0-20200508214444-3aab700007d7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f h1:mOhmO9WsBaJCNmaZHPtHs9wOcdqdKCjF6OPJlmDM3KI=
-golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25 h1:OKbAoGs4fGM5cPLlVQLZGYkFC8OnOfgo6tt0Smf9XhM=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c h1:kISX68E8gSkNYAFRFiDU8rl5RIn1sJYKYb/r2vMLDrU=
-golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wBXhXNeUbB1XfN2vmTm0=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299 h1:DYfZAGf2WMFjMxbgTjaC+2HC7NkNAQs+6Q8b9WEB/F4=
 golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980 h1:OjiUf46hAmXblsZdnoSXsEUSKU8r1UEzcL5RVZ4gO9Y=
-golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM/fAoGlaiiHYiFYdm80=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200620081246-981b61492c35 h1:wb/9mP8eUAmHfkM8RmpeLq6nUA7c2i5+bQOtcDftjaE=
-golang.org/x/sys v0.0.0-20200620081246-981b61492c35/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
-golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666 h1:gVCS+QOncANNPlmlO1AhlU3oxs4V9z+gTtPwIk3p2N8=
-golang.org/x/sys v0.0.0-20200720211630-cb9d2d5c5666/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6 h1:X9xIZ1YU8bLZA3l6gqDUHSFiD0GFI9S548h6C8nDtOY=
-golang.org/x/sys v0.0.0-20200722175500-76b94024e4b6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c=
-golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9 h1:yi1hN8dcqI9l8klZfy4B8mJvFmmAxJEePIQQFNSd7Cs=
-golang.org/x/sys v0.0.0-20200808120158-1030fc2bf1d9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f h1:Fqb3ao1hUmOR3GkUOg/Y+BadLwykBIzs5q8Ez2SbHyc=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418 h1:HlFl4V6pEMziuLXyRkm5BIYq1y1GAbb02pRlWvI54OM=
-golang.org/x/sys v0.0.0-20201029080932-201ba4db2418/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 h1:8qxJSnu+7dRq6upnbntrmriWByIakBuct5OM/MdQC1M=
 golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181112210238-4b1f3b6b1646/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190122202912-9c309ee22fab/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190213135902-6bedcd10978a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -2516,12 +1587,10 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac h1:MQEvx39qSf8vyrx3XRaOe+j1UDIzKwkYOVObRgGPVqI=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479 h1:lfN2PY/jymfnxkNHlbBF5DwPsUvhqUnrdgfK01iH2s0=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190909214602-067311248421/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -2542,147 +1611,29 @@ golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200128002243-345141a36859 h1:xIszjAtlVeHg9hhv6Zhntvwqowji1k2rrgoOhj/aaKw=
-golang.org/x/tools v0.0.0-20200128002243-345141a36859/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7 h1:EBZoQjiKKPaLbPrbpssUfuHtwM6KV/vb4U85g/cigFY=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200213224642-88e652f7a869 h1:DPqS0AlgYBVHhG5jnEVScBXXIS+xjgn7O8s1E3sDqxc=
-golang.org/x/tools v0.0.0-20200213224642-88e652f7a869/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2 h1:L/G4KZvrQn7FWLN/LlulBtBzrLUhqjiGfTWWDmrh+IQ=
 golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d h1:7M9AXzLrJWWGdDYtBblPHBTnHtaN6KKQ98OYb35mLlY=
 golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb h1:iKlO7ROJc6SttHKlxzwGytRtBUqX4VARrNTgP2YLX5M=
 golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200317043434-63da46f3035e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200323144430-8dcfad9e016e/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224 h1:azwY/v0y0K4mFHVsg5+UrTgchqALYWpqVo6vL5OmkmI=
-golang.org/x/tools v0.0.0-20200325010219-a49f79bcc224/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4 h1:kDtqNkeBrZb8B+atrj50B5XLHpzXXqcCdZPP/ApQ5NY=
 golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200409170454-77362c5149f0/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200410194907-79a7a3126eef/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e h1:3Dzrrxi54Io7Aoyb0PYLsI47K2TxkRQg+cqUn+m04do=
-golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b h1:zSzQJAznWxAh9fZxiPy2FZo+ZZEYoYFYYDYdOrU7AaM=
-golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200428021058-7ae4988eb4d9 h1:nSSuQTxk9hjYf2koTs9mHZtYm2pu7Yt8WuIeKOrCWNI=
-golang.org/x/tools v0.0.0-20200428021058-7ae4988eb4d9/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32 h1:Xvf3ZQTm5bjXPxhI7g+dwqsCqadK1rcNtwtszuatetk=
-golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200430040329-4b814e061378 h1:9PP65Qh7XP8c0HOR8HZXX5mlFDjSC/BMYUGNokeqEjM=
-golang.org/x/tools v0.0.0-20200430040329-4b814e061378/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200501005904-d351ea090f9b h1:2hSR2MyOaYEy6yJYg/CpErymr/m7xJEJpm9kfT7ZMg4=
-golang.org/x/tools v0.0.0-20200501005904-d351ea090f9b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200501205727-542909fd9944 h1:H2fcUfqnOlhuExePgcxfMRf98XwAWOF2pqkJTFTc2z0=
-golang.org/x/tools v0.0.0-20200501205727-542909fd9944/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770 h1:M9Fif0OxNji8w+HvmhVQ8KJtiZOsjU9RgslJGhn95XE=
-golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200504022951-6b6965ac5dd1 h1:C8rdnd6KieI73Z2Av0sS0t4kW+geIH/M8kNX8Hmvn9E=
-golang.org/x/tools v0.0.0-20200504022951-6b6965ac5dd1/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8 h1:BMFHd4OFnFtWX46Xj4DN6vvT1btiBxyq+s0orYBqcQY=
 golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200507033352-be0c89d0d3ec h1:dDlhlZjimomZWexPwtmxHrAo2i0/WE86DxYyvtSQTwY=
-golang.org/x/tools v0.0.0-20200507033352-be0c89d0d3ec/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200507205054-480da3ebd79c h1:TDspWmUQsjdWzrHnd5imfaJSfhR4AO/R7kG++T2cONw=
-golang.org/x/tools v0.0.0-20200507205054-480da3ebd79c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5 h1:MeC2gMlMdkd67dn17MEby3rGXRxZtWeiRXOnISfTQ74=
-golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a h1:vAa2fXRLbiVN3N/xCnodIT36K4QKZQNyQFq3hQJfQ1U=
-golang.org/x/tools v0.0.0-20200512001501-aaeff5de670a/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88 h1:4j84u0sokprDu3IdSYHJMmou+YSLflMz8p7yAx/QI4g=
 golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200513022744-65e69ff2d148 h1:X3wiF+nWEwv11fBoJVQN0dSMu7rlvPkRKYAHuuJoyvc=
-golang.org/x/tools v0.0.0-20200513022744-65e69ff2d148/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97 h1:DAuln/hGp+aJiHpID1Y1hYzMEPP5WLwtZHPb50mN0OE=
-golang.org/x/tools v0.0.0-20200513201620-d5fe73897c97/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d h1:n6zwymXmN9rCClNNmCWwV3qwMmBcRw/WeIGDK8Qnzk4=
 golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515220128-d3bf790afa53 h1:vmsb6v0zUdmUlXfwKaYrHPPRCV0lHq/IwNIf0ASGjyQ=
-golang.org/x/tools v0.0.0-20200515220128-d3bf790afa53/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200519015757-0d0afa43d58a h1:gILuVKC+ZPD6g/tj6zBOdnOH1ZHI0zZ86+KLMogc6/s=
-golang.org/x/tools v0.0.0-20200519015757-0d0afa43d58a/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200519205726-57a9e4404bf7 h1:nm4zDh9WvH4jiuUpMY5RUsvOwrtTVVAsUaCdLW71hfY=
-golang.org/x/tools v0.0.0-20200519205726-57a9e4404bf7/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200520220537-cf2d1e09c845 h1:F4gQH8TKyCccYDuNHX5TfZwiM8QWnPbSPUFE96qvGbs=
-golang.org/x/tools v0.0.0-20200520220537-cf2d1e09c845/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200521211927-2b542361a4fc h1:6m2YO+AmBApbUOmhsghW+IfRyZOY4My4UYvQQrEpHfY=
-golang.org/x/tools v0.0.0-20200521211927-2b542361a4fc/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375 h1:SjQ2+AKWgZLc1xej6WSzL+Dfs5Uyd5xcZH1mGC411IA=
-golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2 h1:21BqcH/onxtGHn1A2GDOJjZnbt4Nlez629S3eaR+eYs=
-golang.org/x/tools v0.0.0-20200526224456-8b020aee10d2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d h1:SR+e35rACZFBohNb4Om1ibX6N3iO0FtdbwqGSuD9dBU=
-golang.org/x/tools v0.0.0-20200527183253-8e7acdbce89d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200528185414-6be401e3f76e h1:jTL1CJ2kmavapMVdBKy6oVrhBHByRCMfykS45+lEFQk=
-golang.org/x/tools v0.0.0-20200528185414-6be401e3f76e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200529172331-a64b76657301 h1:G6CNEgFU8/XwexSnuFw+Jq/WePjRitgy6ofBcPnAIPo=
-golang.org/x/tools v0.0.0-20200529172331-a64b76657301/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200530233709-52effbd89c51 h1:Wec8/IO8hAraBf0it7/dPQYOslIrgM938wZYNkLnOYc=
-golang.org/x/tools v0.0.0-20200530233709-52effbd89c51/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 h1:deddXmhOJb/bvD/4M/j2AUMrhHeh6GkqykJSCWyTNVk=
-golang.org/x/tools v0.0.0-20200601175630-2caf76543d99/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200604042327-9b20fe4cabe8 h1:8Xr1qwxn90MXYKftwNxIO2g4J+26naghxFS5rYiTZww=
-golang.org/x/tools v0.0.0-20200604042327-9b20fe4cabe8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200604183345-4d5ea46c79fe h1:nHJ3EpvC/Nk6Gc4FTwTQ3YOBAODRx412L5jEPjgJcEg=
-golang.org/x/tools v0.0.0-20200604183345-4d5ea46c79fe/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6 h1:5Y8c5HBW6hBYnGEE3AbJPV0R8RsQmg1/eaJrpvasns0=
-golang.org/x/tools v0.0.0-20200606014950-c42cb6316fb6/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200609164405-eb789aa7ce50/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200612220849-54c614fe050c/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200615222825-6aa8f57aacd9 h1:cwgUY+1ja2qxWb2dyaCoixaA66WGWmrijSlxaM+JM/g=
-golang.org/x/tools v0.0.0-20200615222825-6aa8f57aacd9/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200617042924-7f3f4b10a808 h1:t4rDo0JMqBOEHVnboBBPY/e1U1exx2OO5lL/TcfJM28=
-golang.org/x/tools v0.0.0-20200617042924-7f3f4b10a808/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2 h1:FD4wDsP+CQUqh2V12OBOt90pLHVToe58P++fUu3ggV4=
 golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619210111-0f592d2728bb h1:/7SQoPdMxZ0c/Zu9tBJgMbRE/BmK6i9QXflNJXKAmw0=
-golang.org/x/tools v0.0.0-20200619210111-0f592d2728bb/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff h1:foic6oVZ4MKltJC6MXzuFZFswE7NCjjtc0Hxbyblawc=
-golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200701041122-1837592efa10/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200701221012-f01a4bec33ec h1:YBEOZz3haVTr7CIxw2aKLMIED46tia+Er/qC82KAHu0=
-golang.org/x/tools v0.0.0-20200701221012-f01a4bec33ec/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200702044944-0cc1aa72b347/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7 h1:JxpwOnW/RU5vsiwsDw3eqto/7ccehcv162Xma5/FHoI=
-golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200708003708-134513de8882 h1:x4Two2lSwHxTqR+eal4lB4ydUnTvmDDpPQeL92ZHDgA=
-golang.org/x/tools v0.0.0-20200708003708-134513de8882/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200708183856-df98bc6d456c h1:Jt8nybBNSGn80qEV8fQLwCam6RQeX4dsxit8if67Sfc=
-golang.org/x/tools v0.0.0-20200708183856-df98bc6d456c/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1 h1:rD1FcWVsRaMY+l8biE9jbWP5MS/CJJ/90a9TMkMgNrM=
-golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200713011307-fd294ab11aed/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200713235242-6acd2ab80ede h1:ItmFoZpZfJTYGsnON6247QuXEOKiKLBpieGcAgweGsk=
-golang.org/x/tools v0.0.0-20200713235242-6acd2ab80ede/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200721032237-77f530d86f9a/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200721223218-6123e77877b2 h1:kxDWg8KNMtpGjI/XVKGgOtSljTnVg/PrjhS8+0pxjLE=
-golang.org/x/tools v0.0.0-20200721223218-6123e77877b2/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200723000907-a7c6fd066f6d h1:7k9BKfwmdbykG6l5ztniTrH0TP25yel8O7l26/yovMU=
-golang.org/x/tools v0.0.0-20200723000907-a7c6fd066f6d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200724172932-b5fc9d354d99 h1:OHn441rq5CeM5r1xJ0OmY7lfdTvnedi6k+vQiI7G9b8=
-golang.org/x/tools v0.0.0-20200724172932-b5fc9d354d99/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200725200936-102e7d357031/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200727233628-55644ead90ce/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200806022845-90696ccdc692/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200809012840-6f4f008689da h1:ml5G98G4/tdKT1XNq+ky5iSRdKKux0TANlLAzmXT/hg=
-golang.org/x/tools v0.0.0-20200809012840-6f4f008689da/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200814230902-9882f1d1823d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200817023811-d00afeaade8f/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200818005847-188abfa75333/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d h1:W07d4xkoAUSNOkOzdzXCdFGxT7o2rW4q8M34tB2i//k=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200828161849-5deb26317202/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
@@ -2692,14 +1643,8 @@ golang.org/x/tools v0.0.0-20200916150407-587cf2330ce8/go.mod h1:z6u4i615ZeAfBE4X
 golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201017001424-6003fad69a88/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201021122455-2be66b663cb6/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
-golang.org/x/tools v0.0.0-20201030010431-2feb2bb1ff51 h1:/gZVO/TtBZ9jVAf8P5ZySajCofEId/8jR1PjkdSoqQ4=
-golang.org/x/tools v0.0.0-20201030010431-2feb2bb1ff51/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201030143252-cf7a54d06671/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201030160639-589136c8afd9 h1:biEkB+O0wNDdrI+ut9cDMMEC/lG4WQRWBgk7Z5lCrvU=
-golang.org/x/tools v0.0.0-20201030160639-589136c8afd9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb h1:z5+u0pkAUPUWd3taoTialQ2JAMo4Wo1Z3L25U4ZV9r0=
-golang.org/x/tools v0.0.0-20201121010211-780cb80bd7fb/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
@@ -2707,56 +1652,30 @@ golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/api v0.4.0 h1:KKgc1aqhV8wDPbDzlDtpvyjZFY3vjz85FP7p4wcQUyI=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0 h1:9sdfJOzWlkqPltHAuzT2Cp+yrBeY1KRVYgms8soxMwM=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0 h1:VGGbLNyPF7dvYHhcUGYBBGCRDDK0RRJAI6KCvo0CL+E=
 google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8=
 google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0 h1:yzlyyDW/J0w8yNFJIhiAJy4kq74S+1DOLdawELNxFMA=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0 h1:0q95w+VuFtv4PAx4PZVQdBMmYbaCHbnfKaEiDIcVyag=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0 h1:TgDr+1inK2XVUKZx3BYAqQg/GwucGdBkzZjWaTg/I+A=
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0 h1:GwFK8+l5/gdsOYKz5p6M4UK+QT8OvmHWZPJCnf+5DjA=
 google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0 h1:jz2KixHX7EcCPiQrySzPdnYT7DbINAypCqKZ1Z7GM40=
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.21.0 h1:zS+Q/CJJnVlXpXQVIz+lH0ZT2lBuT2ac7XD8Y/3w6hY=
-google.golang.org/api v0.21.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0 h1:J1Pl9P2lnmYFSJvgs70DKELqHNh8CNWXPbud4njEE2s=
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.23.0 h1:YlvGEOq2NA2my8cZ/9V8BcEO9okD48FlJcdqN0xJL3s=
-google.golang.org/api v0.23.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.24.0 h1:cG03eaksBzhfSIk7JRGctfp3lanklcOM/mTGvow7BbQ=
 google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.25.0 h1:LodzhlzZEUfhXzNUMIfVlf9Gr6Ua5MMtoFWh7+f47qA=
-google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.26.0 h1:VJZ8h6E8ip82FRpQl848c5vAadxlTXrUh8RzQzSRm08=
-google.golang.org/api v0.26.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.27.0 h1:L02vxokXh9byvvyTw3PLA4MmNri7cY29nliyK4MnIxY=
-google.golang.org/api v0.27.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0 h1:jMF5hhVfMkTZwHW1SDpKq5CkgWLXOb31Foaca9Zr3oM=
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0 h1:BaiDisFir8O4IJxvAabCGGkQ6yCJegNQqSVoYUNAnbk=
 google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0 h1:yfrXXP61wVuLb0vBcG6qaOoIoqYEzOQS8jum51jkv2w=
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
 google.golang.org/api v0.31.0/go.mod h1:CL+9IBCa2WWU6gRuBWaKqGWLFFwbEUXkfeMkHLQWYWo=
 google.golang.org/api v0.32.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.33.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.34.0 h1:k40adF3uR+6x/+hO5Dh4ZFUqFp67vxvbpafFiJxl10A=
 google.golang.org/api v0.34.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
 google.golang.org/api v0.35.0 h1:TBCmTTxUrRDA1iTctnK/fIeitxIZ+TQuaf0j29fmCGo=
 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
@@ -2767,139 +1686,45 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb h1:i1Ppqkc3WQXikh8bXiwHqAN5Rv3/qDCcRk0/Otx73BY=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532 h1:5pOB7se0B2+IssELuQUs6uoBgYJenkU2AQlvopc2sRw=
-google.golang.org/genproto v0.0.0-20190708153700-3bdd9d9f5532/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610 h1:Ygq9/SRJX9+dU0WCIICM8RkWvDw03lvB77hrhJnpxfU=
-google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64 h1:iKtrH9Y8mcbADOP0YFaEMth7OfuHY9xHOwNj4znpM1A=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51 h1:Ex1mq5jaJof+kRnYi3SlYJ8KKa9Ao3NHyIT5XJ1gF6U=
 google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
 google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150 h1:VPpdpQkGvFicX9yo4G5oxZPi9ALBnEOZblPSa/Wa2m4=
 google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b h1:c8OBoXP3kTbDWWB/oVE3FkR851p4iZ3MPadz7zXEIPU=
-google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
 google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce h1:1mbrb1tUU+Zmt5C94IGKADBTJZjZXAd+BubWi7r9EiI=
 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63 h1:YzfoEYWbODU5Fbt37+h7X16BWQbad7Q4S6gclTKFXM8=
 google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383 h1:Vo0fD5w0fUKriWlZLyrim2GXbumyN0D6euW79T9PgEE=
 google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171 h1:xes2Q2k+d/+YNXVw0FpZkIDJiaux4OVrRKXRAzH6A0U=
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b h1:j5eujPLMak6H9l2EM381rW9X47/HPUyESXWJW9lVSsQ=
-google.golang.org/genproto v0.0.0-20200325114520-5b2d0af7952b/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 h1:MRHtG0U6SnaUb+s+LhNE1qt1FQ1wlhqr5E4usBKC0uA=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d h1:I7Vuu5Ejagca+VcgfBINHke3xwjCTYnIG4Q57fv0wYY=
-google.golang.org/genproto v0.0.0-20200409111301-baae70f3302d/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb h1:nAFaltAMbNVA0rixtwvdnqgSVLX3HFUUvMkEklmzbYM=
-google.golang.org/genproto v0.0.0-20200420144010-e5e8543f8aeb/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200424135956-bca184e23272 h1:yKqICwsk6cvaHc7nFgdKRJU45wKUGve28MXBkX8nCTg=
-google.golang.org/genproto v0.0.0-20200424135956-bca184e23272/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200428115010-c45acf45369a h1:ykRcNp3dotYGpAEIYeWCGaefklVjVy/rnSvM3zNh6j8=
-google.golang.org/genproto v0.0.0-20200428115010-c45acf45369a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200429120912-1f37eeb960b2 h1:fhZC+JJ5NhTWQS4q+Q1p9bkXUduHUDEVxsHM1HGtfDo=
-google.golang.org/genproto v0.0.0-20200429120912-1f37eeb960b2/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84 h1:pSLkPbrjnPyLDYUO2VM9mDLqo2V6CFBY84lFSZAfoi4=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31 h1:Bz1qTn2YRWV+9OKJtxHJiQKCiXIdf+kwuKXdt9cBxyU=
-google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380 h1:xriR1EgvKfkKxIoU2uUvrMVl+H26359loFFUleSMXFo=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200514193133-8feb7f20f2a2 h1:RwW6+LxyOQJ7oeoZ76GIJlwt/O0J5cN2fk+q/jK27kQ=
-google.golang.org/genproto v0.0.0-20200514193133-8feb7f20f2a2/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587 h1:1Ym+vvUpq1ZHvxzn34gENJX8U4aKO+vhy2P/2+Xl6qQ=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200519141106-08726f379972 h1:6ydLqG65DIMNJf6p97WudGsmd1w3Ickm/LiZnBrREPI=
-google.golang.org/genproto v0.0.0-20200519141106-08726f379972/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200521103424-e9a78aa275b7 h1:JUs1uIDQ46c7iI0QuMPzAHqXaSmqKF0f9freFMk2ivs=
-google.golang.org/genproto v0.0.0-20200521103424-e9a78aa275b7/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece h1:1YM0uhfumvoDu9sx8+RyWwTI63zoCQvI23IYFRlvte0=
-google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200528110217-3d3490e7e671/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200528191852-705c0b31589b h1:nl5tymnV+50ACFZUDAP+xFCe3Zh3SWdMDx+ernZSKNA=
-google.golang.org/genproto v0.0.0-20200528191852-705c0b31589b/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200601130524-0f60399e6634 h1:yUEnIJPm1I2GGauN1xOkwj6gXw/3t1R+HA1r/cdnkHE=
-google.golang.org/genproto v0.0.0-20200601130524-0f60399e6634/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200602104108-2bb8d6132df6 h1:fsxmG3uIxSjgTNy6zSkdHSyElfRV0Tq+yzS+Ukjthx0=
-google.golang.org/genproto v0.0.0-20200602104108-2bb8d6132df6/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200603110839-e855014d5736 h1:+IE3xTD+6Eb7QWG5JFp+dQr/XjKpjmrNkh4pdjTdHEs=
-google.golang.org/genproto v0.0.0-20200603110839-e855014d5736/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200604104852-0b0486081ffb h1:ek2py5bOqzR7MR/6obzk0rXUgYCLmjyLnaO9ssT+l6w=
-google.golang.org/genproto v0.0.0-20200604104852-0b0486081ffb/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200605102947-12044bf5ea91 h1:ES+5k7Xz+sYByd2L7mvcanaIuY0Iz3L3O6OhN+cRdu8=
-google.golang.org/genproto v0.0.0-20200605102947-12044bf5ea91/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200608115520-7c474a2e3482/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200612171551-7676ae05be11/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200615140333-fd031eab31e7 h1:1N7l1PuXZwEK7OhHdmKQROOM75PnUjABGwvVRbLBgFk=
-google.golang.org/genproto v0.0.0-20200615140333-fd031eab31e7/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200617032506-f1bdc9086088 h1:XXo4PvhJkaWYIkwn7bX7mcdB8RdcOvn12HbaUUAwX3E=
-google.golang.org/genproto v0.0.0-20200617032506-f1bdc9086088/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790 h1:FGjyjrQGURdc98leD1P65IdQD9Zlr4McvRcqIlV6OSs=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200620020550-bd6e04640131 h1:IXNofpkLhv80L3TJQvj2YQLnMHZgAktycswvtXwQiRk=
-google.golang.org/genproto v0.0.0-20200620020550-bd6e04640131/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad h1:uAwc13+y0Y8QZLTYhLCu6lHhnG99ecQU5FYTj8zxAng=
-google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200701001935-0939c5918c31/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200702021140-07506425bd67 h1:4BC1C1i30F3MZeiIO6y6IIo4DxrtOwITK87bQl3lhFA=
-google.golang.org/genproto v0.0.0-20200702021140-07506425bd67/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df h1:HWF6nM8ruGdu1K8IXFR+i2oT3YP+iBfZzCbC9zUfcWo=
-google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200708133552-18036109789b h1:gYoomKOmhJ9YGwv9D05xH6fNWcNBNrMvOuoysvYIVV4=
-google.golang.org/genproto v0.0.0-20200708133552-18036109789b/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3 h1:JwLN1jVnmIsfE4HkDVe2AblFAbo0Z+4cjteDSOnv6oE=
-google.golang.org/genproto v0.0.0-20200709005830-7a2ca40e9dc3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200711021454-869866162049 h1:YFTFpQhgvrLrmxtiIncJxFXeCyq84ixuKWVCaCAi9Oc=
 google.golang.org/genproto v0.0.0-20200711021454-869866162049/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200720141249-1244ee217b7e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200721032028-5044d0edf986/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200722002428-88e341933a54 h1:ASrBgpl9XvkNTP0m39/j18mid7aoF21npu2ioIBxYnY=
-google.golang.org/genproto v0.0.0-20200722002428-88e341933a54/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200724131911-43cab4749ae7 h1:AWgNCmk2V5HZp9AiCDRBExX/b9I0Ey9F8STHDZlhCC4=
-google.golang.org/genproto v0.0.0-20200724131911-43cab4749ae7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200726014623-da3ae01ef02d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200728010541-3dc8dca74b7b/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200808173500-a06252235341 h1:Kceb+1TNS2X7Cj/A+IUTljNerF/4wOFjlFJ0RGHYKKE=
-google.golang.org/genproto v0.0.0-20200808173500-a06252235341/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200815001618-f69a88009b70/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200831141814-d751682dd103/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d h1:92D1fum1bJLKSdr11OJ+54YeCMCGYIygTA7R/YZxH5M=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200911024640-645f7a48b24f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200914193844-75d14daec038/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -2907,9 +1732,7 @@ google.golang.org/genproto v0.0.0-20200916143405-f6a2fa72f0c4/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20200921151605-7abf4a1a14d5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201021134325-0d71844de594/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201029200359-8ce4113da6f7 h1:2BaavIGjmdbQJl0IFOYI8SBd5WLIjH+tIOMIFf9QENo=
 google.golang.org/genproto v0.0.0-20201029200359-8ce4113da6f7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3 h1:sg8vLDNIxFPHTchfhH1E3AI32BL3f23oie38xUWnJM8=
 google.golang.org/genproto v0.0.0-20201030142918-24207fddd1c3/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4 h1:Rt0FRalMgdSlXAVJvX4pr65KfqaxHXSLkSJRD9pw6g0=
@@ -2917,37 +1740,22 @@ google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6D
 google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
-google.golang.org/grpc v1.20.1 h1:Hz2g2wirWK7H0qIIhGIqRGTuMwTE8HEKFnDZZ7lm9NU=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.21.1 h1:j6XxA85m/6txkUCHvzlV5f+HBNl/1r5cZ2A/3IEFOO8=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
-google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.0 h1:2pJjwYOdkZ9HlN4sWRYBg9ttH5bCOlsueaM+b/oYjwo=
-google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0 h1:T7P4R73V3SSDPhH7WW7ATbfViLtmamH0DKrP3f9AuDI=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1 h1:DGeFlSan2f+WEtCERJ4J9GJWk15TxUi8QGagfI87Xyc=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
@@ -2955,14 +1763,10 @@ google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLY
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2MY=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
@@ -2970,9 +1774,7 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQ
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -2989,16 +1791,8 @@ gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:a
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.55.0 h1:E8yzL5unfpW3M6fz/eB7Cb5MQAYSZ7GKo4Qth+N2sgQ=
-gopkg.in/ini.v1 v1.55.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.56.0 h1:DPMeDvGTM54DXbPkVIZsp19fp/I2K7zwA/itHYHKo8Y=
-gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/ini.v1 v1.57.0 h1:9unxIsFcTt4I55uWluz+UmL95q4kdJ0buvQ1ZIqVQww=
-gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/olivere/elastic.v5 v5.0.85 h1:GwBqEsvRIHVfCQVXDHYi9LHec2yEkc3GNKh9WB8G/es=
-gopkg.in/olivere/elastic.v5 v5.0.85/go.mod h1:M3WNlsF+WhYn7api4D87NIflwTV/c0iVs8cqfWhK+68=
 gopkg.in/olivere/elastic.v5 v5.0.86 h1:xFy6qRCGAmo5Wjx96srho9BitLhZl2fcnpuidPwduXM=
 gopkg.in/olivere/elastic.v5 v5.0.86/go.mod h1:M3WNlsF+WhYn7api4D87NIflwTV/c0iVs8cqfWhK+68=
 gopkg.in/resty.v1 v1.12.0 h1:CuXP0Pjfw9rOuY6EP+UvtNvt5DSqHpIxILZKT/quCZI=
@@ -3019,31 +1813,16 @@ gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+p
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86 h1:OfFoIUYv/me30yv7XlMy4F9RJw8DEm8WQ6QG1Ph4bH0=
-gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2 h1:VEmvx0P+GVTgkNu2EdTN988YCZPcD3lo9AoczZpucwc=
-gopkg.in/yaml.v3 v3.0.0-20200601152816-913338de1bd2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200602174320-3e3e88ca92fa h1:5lGs+2OAqZvyIo1XjvoyXoDb8g6k9uAg2WTflQT/yl8=
-gopkg.in/yaml.v3 v3.0.0-20200602174320-3e3e88ca92fa/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8 h1:jL/vaozO53FMfZLySWM+4nulF3gQEC6q5jH90LPomDo=
-gopkg.in/yaml.v3 v3.0.0-20200603094226-e3079894b1e8/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c h1:grhR+C34yXImVGp7EzNk+DTIk+323eIUWOmEevy6bDo=
-gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/postgres v1.0.5 h1:raX6ezL/ciUmaYTvOq48jq1GE95aMC0CmxQYbxQ4Ufw=
@@ -3051,7 +1830,6 @@ gorm.io/driver/postgres v1.0.5/go.mod h1:qrD92UurYzNctBMVCJ8C3VQEjffEuphycXtxOud
 gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.6 h1:qa7tC1WcU+DBI/ZKMxvXy1FcrlGsvxlaKufHrT2qQ08=
 gorm.io/gorm v1.20.6/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
 gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8=
@@ -3062,51 +1840,16 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4 h1:UoveltGrhghAA7ePc+e+QYDHXrBps2PqFZiHkGR/xK8=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.6 h1:W18jzjh8mfPez+AwGLxmOImucz/IFjpNlrKVnaj2YVc=
-honnef.co/go/tools v0.0.1-2020.1.6/go.mod h1:pyyisuGw24ruLjrr1ddx39WE0y9OooInRzEYLhQB2YY=
-k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8=
-k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
-k8s.io/api v0.18.3 h1:2AJaUQdgUZLoDZHrun21PW2Nx9+ll6cUzvn3IKhSIn0=
-k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA=
-k8s.io/api v0.18.5 h1:fKbCxr+U3fu7k6jB+QeYPD/c6xKYeSJ2KVWmyUypuWM=
-k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk=
-k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE=
-k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
-k8s.io/api v0.19.3 h1:GN6ntFnv44Vptj/b+OnMW7FmzkpDoIDLZRvKX3XH9aU=
-k8s.io/api v0.19.3/go.mod h1:VF+5FT1B74Pw3KxMdKyinLo+zynBaMBiAfGMuldcNDs=
 k8s.io/api v0.21.0 h1:gu5iGF4V6tfVCQ/R+8Hc0h7H1JuEhzyEi9S4R5LM8+Y=
 k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU=
-k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA=
-k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
-k8s.io/apimachinery v0.18.3 h1:pOGcbVAhxADgUYnjS08EFXs9QMl8qaH5U4fr5LGUrSk=
-k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
-k8s.io/apimachinery v0.18.5 h1:Lh6tgsM9FMkC12K5T5QjRm7rDs6aQN5JHkA0JomULDM=
-k8s.io/apimachinery v0.18.5/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
-k8s.io/apimachinery v0.18.6 h1:RtFHnfGNfd1N0LeSrKCUznz5xtUP1elRGvHJbL3Ntag=
-k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
-k8s.io/apimachinery v0.19.3 h1:bpIQXlKjB4cB/oNpnNnV+BybGPR7iP5oYpsOTEJ4hgc=
-k8s.io/apimachinery v0.19.3/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
 k8s.io/apimachinery v0.21.0 h1:3Fx+41if+IRavNcKOz09FwEXDBG6ORh6iMsTSelhkMA=
 k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
 k8s.io/cli-runtime v0.21.0 h1:/V2Kkxtf6x5NI2z+Sd/mIrq4FQyQ8jzZAUD6N5RnN7Y=
 k8s.io/cli-runtime v0.21.0/go.mod h1:XoaHP93mGPF37MkLbjGVYqg3S1MnsFdKtiA/RZzzxOo=
-k8s.io/client-go v0.18.2 h1:aLB0iaD4nmwh7arT2wIn+lMnAq7OswjaejkQ8p9bBYE=
-k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU=
-k8s.io/client-go v0.18.3 h1:QaJzz92tsN67oorwzmoB0a9r9ZVHuD5ryjbCKP0U22k=
-k8s.io/client-go v0.18.3/go.mod h1:4a/dpQEvzAhT1BbuWW09qvIaGw6Gbu1gZYiQZIi1DMw=
-k8s.io/client-go v0.18.5 h1:cLhGZdOmyPhwtt20Lrb7uAqxxB1uvY+NTmNJvno1oKA=
-k8s.io/client-go v0.18.5/go.mod h1:EsiD+7Fx+bRckKWZXnAXRKKetm1WuzPagH4iOSC8x58=
-k8s.io/client-go v0.18.6 h1:I+oWqJbibLSGsZj8Xs8F0aWVXJVIoUHWaaJV3kUN/Zw=
-k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
-k8s.io/client-go v0.19.3 h1:ctqR1nQ52NUs6LpI0w+a5U+xjYwflFwA13OJKcicMxg=
-k8s.io/client-go v0.19.3/go.mod h1:+eEMktZM+MG0KO+PTkci8xnbCZHvj9TqR6Q1XDUIJOM=
 k8s.io/client-go v0.21.0 h1:n0zzzJsAQmJngpC0IhgFcApZyoGXPrDIAD601HD09ag=
 k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA=
 k8s.io/code-generator v0.21.0 h1:LGWJOvkbBNpuRBqBRXUjzfvymUh7F/iR2KDpwLnqCM4=
@@ -3115,37 +1858,19 @@ k8s.io/component-base v0.21.0 h1:tLLGp4BBjQaCpS/KiuWh7m2xqvAdsxLm4ATxHSe5Zpg=
 k8s.io/component-base v0.21.0/go.mod h1:qvtjz6X0USWXbgmbfXR+Agik4RZ3jv2Bgr5QnZzdPYw=
 k8s.io/component-helpers v0.21.0 h1:SoWLsd63LI5uwofcHVSO4jtlmZEJRycfwNBKU4eAGPQ=
 k8s.io/component-helpers v0.21.0/go.mod h1:tezqefP7lxfvJyR+0a+6QtVrkZ/wIkyMLK4WcQ3Cj8U=
-k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac h1:sAvhNk5RRuc6FNYGqe7Ygz3PSo/2wGWbulskmzRX8Vs=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=
 k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
-k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
-k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
-k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 h1:mNpvQf4lkIHNOXCoM+Veu/UXwA56Yx1J7hY1Tvcs/oM=
-k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
 k8s.io/kubectl v0.21.0 h1:WZXlnG/yjcE4LWO2g6ULjFxtzK6H1TKzsfaBFuVIhNg=
 k8s.io/kubectl v0.21.0/go.mod h1:EU37NukZRXn1TpAkMUoy8Z/B2u6wjHDS4aInsDzVvks=
 k8s.io/metrics v0.21.0 h1:uwS3CgheLKaw3PTpwhjMswnm/PMqeLbdLH88VI7FMQQ=
 k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ=
-k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
-k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
-k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20201027101359-01387209bb0d h1:1qqs/6lQQGCeZhCu0tO7La4lAazDXic6BiCmpjWcWUo=
-k8s.io/utils v0.0.0-20201027101359-01387209bb0d/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 modernc.org/b v1.0.0 h1:vpvqeyp17ddcQWF29Czawql4lDdABCDRbXRAS4+aF2o=
@@ -3176,9 +1901,8 @@ rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
+rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-rsc.io/sampler v1.99.99 h1:7i08f/p5TBU5joCPW3GjWG1ZFCmr28ybGqlXtelhEK8=
-rsc.io/sampler v1.99.99/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/kustomize/api v0.8.5 h1:bfCXGXDAbFbb/Jv5AhMj2BB8a5VAJuuQ5/KU69WtDjQ=
 sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY=
 sigs.k8s.io/kustomize/cmd/config v0.9.7 h1:xxvL/np/zYHVuCH1tNFehlyEtSW5oXjoI6ycejiyOwQ=
@@ -3187,17 +1911,9 @@ sigs.k8s.io/kustomize/kustomize/v4 v4.0.5 h1:0xQWp03aKWilF6UJrupcA2rCoCn3jejkJ+m
 sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod h1:C7rYla7sI8EnxHE/xEhRBSHMNfcL91fx0uKmUlUhrBk=
 sigs.k8s.io/kustomize/kyaml v0.10.15 h1:dSLgG78KyaxN4HylPXdK+7zB3k7sW6q3IcCmcfKA+aI=
 sigs.k8s.io/kustomize/kyaml v0.10.15/go.mod h1:mlQFagmkm1P+W4lZJbJ/yaxMd8PqMRSC4cPcfUVt5Hg=
-sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e h1:4Z09Hglb792X0kfOBBJUPFEyvVfQWrYT/l8h5EKA6JQ=
-sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
-sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
diff --git a/third_party/skia/go_repositories.bzl b/third_party/skia/go_repositories.bzl
index d1e31b2cef27d..f1e12f607c076 100644
--- a/third_party/skia/go_repositories.bzl
+++ b/third_party/skia/go_repositories.bzl
@@ -3490,8 +3490,8 @@ def go_repositories():
     go_repository(
         name = "org_skia_go_infra",
         importpath = "go.skia.org/infra",
-        sum = "h1:4N5YfkJxnlEyzYRwMu4UrENUibFW7y/HaWDpf3qsUNU=",
-        version = "v0.0.0-20211123190342-9cd7cd57f7fb",
+        sum = "h1:EQFMh6ZPs6RJ7pyDiH3z1JrIEl/BR2YNGqMAdctU7N8=",
+        version = "v0.0.0-20220110171919-69477ccd2d29",
     )
     go_repository(
         name = "org_uber_go_atomic",
diff --git a/third_party/skia/include/codec/SkCodec.h b/third_party/skia/include/codec/SkCodec.h
index e7c7c0eaadb75..0f891c7979b45 100644
--- a/third_party/skia/include/codec/SkCodec.h
+++ b/third_party/skia/include/codec/SkCodec.h
@@ -758,6 +758,8 @@ class SK_API SkCodec : SkNoncopyable {
             std::unique_ptr<SkStream>,
             SkEncodedOrigin = kTopLeft_SkEncodedOrigin);
 
+    void setSrcXformFormat(XformFormat pixelFormat);
+
     virtual SkISize onGetScaledDimensions(float /*desiredScale*/) const {
         // By default, scaling is not supported.
         return this->dimensions();
@@ -876,7 +878,7 @@ class SK_API SkCodec : SkNoncopyable {
 
 private:
     const SkEncodedInfo                fEncodedInfo;
-    const XformFormat                  fSrcXformFormat;
+    XformFormat                        fSrcXformFormat;
     std::unique_ptr<SkStream>          fStream;
     bool                               fNeedsRewind;
     const SkEncodedOrigin              fOrigin;
diff --git a/third_party/skia/include/core/BUILD.bazel b/third_party/skia/include/core/BUILD.bazel
index c42ddfee4effe..e7ee356e21dcf 100644
--- a/third_party/skia/include/core/BUILD.bazel
+++ b/third_party/skia/include/core/BUILD.bazel
@@ -90,6 +90,7 @@ generated_cc_atom(
         ":SkTypes_hdr",
         "//include/private:SkDeque_hdr",
         "//include/private:SkMacros_hdr",
+        "//include/private:SkTOptional_hdr",
     ],
 )
 
@@ -382,6 +383,7 @@ generated_cc_atom(
         ":SkImageInfo_hdr",
         ":SkImage_hdr",
         ":SkYUVAPixmaps_hdr",
+        "//include/private:SkTOptional_hdr",
     ],
 )
 
@@ -406,13 +408,13 @@ generated_cc_atom(
     deps = [
         ":SkImageEncoder_hdr",
         ":SkImageInfo_hdr",
-        ":SkM44_hdr",
         ":SkRefCnt_hdr",
         ":SkSamplingOptions_hdr",
         ":SkScalar_hdr",
         ":SkShader_hdr",
         ":SkTileMode_hdr",
         "//include/gpu:GrTypes_hdr",
+        "//include/private:SkTOptional_hdr",
     ],
 )
 
@@ -638,7 +640,6 @@ generated_cc_atom(
         ":SkRefCnt_hdr",
         ":SkTypes_hdr",
         "//include/gpu:GrBackendSurface_hdr",
-        "//include/private:GrResourceKey_hdr",
     ],
 )
 
@@ -760,12 +761,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkStringView_hdr",
-    hdrs = ["SkStringView.h"],
-    visibility = ["//:__subpackages__"],
-)
-
 generated_cc_atom(
     name = "SkString_hdr",
     hdrs = ["SkString.h"],
@@ -934,3 +929,18 @@ generated_cc_atom(
         "//include/private:SkTo_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkCustomMesh_hdr",
+    hdrs = ["SkCustomMesh.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkColorSpace_hdr",
+        ":SkImageInfo_hdr",
+        ":SkRect_hdr",
+        ":SkRefCnt_hdr",
+        ":SkSpan_hdr",
+        ":SkString_hdr",
+        ":SkTypes_hdr",
+    ],
+)
diff --git a/third_party/skia/include/core/SkCanvas.h b/third_party/skia/include/core/SkCanvas.h
index 505b3e08c2f5a..3a7d53064ad72 100644
--- a/third_party/skia/include/core/SkCanvas.h
+++ b/third_party/skia/include/core/SkCanvas.h
@@ -28,6 +28,7 @@
 #include "include/core/SkTypes.h"
 #include "include/private/SkDeque.h"
 #include "include/private/SkMacros.h"
+#include "include/private/SkTOptional.h"
 
 #include <cstring>
 #include <memory>
@@ -58,16 +59,13 @@ class SkPixmap;
 class SkRegion;
 class SkRRect;
 struct SkRSXform;
+struct SkCustomMesh;
 class SkSpecialImage;
 class SkSurface;
 class SkSurface_Base;
 class SkTextBlob;
 class SkVertices;
 
-namespace skstd {
-    template<typename T> class optional;
-}
-
 /** \class SkCanvas
     SkCanvas provides an interface for drawing, and how the drawing is clipped and transformed.
     SkCanvas contains a stack of SkMatrix and clip values.
@@ -1957,6 +1955,29 @@ class SK_API SkCanvas {
     */
     void drawVertices(const sk_sp<SkVertices>& vertices, SkBlendMode mode, const SkPaint& paint);
 
+#if defined(SK_ENABLE_EXPERIMENTAL_CUSTOM_MESH) && defined(SK_ENABLE_SKSL)
+    /**
+        Experimental, under active development, and subject to change without notice.
+
+        Draws a mesh using a user-defined specification (see SkCustomMeshSpecification).
+
+        SkBlender is ignored if SkCustomMesh's specification does not output fragment shader color.
+        Otherwise, it combines
+            - the SkShader if SkPaint contains SkShader
+            - or the opaque SkPaint color if SkPaint does not contain SkShader
+        as the src of the blend and the mesh's fragment color as the dst.
+
+        SkMaskFilter, SkPathEffect, and antialiasing on SkPaint are ignored.
+
+        @param cm        the custom mesh vertices and compatible specification.
+        @param blender   combines vertices colors with SkShader if present or SkPaint opaque color
+                         if not. Ignored if the custom mesh does not output color. Defaults to
+                         SkBlendMode::kModulate if nullptr.
+        @param paint     specifies the SkShader, used as SkVertices texture, may be nullptr
+    */
+    void drawCustomMesh(SkCustomMesh cm, sk_sp<SkBlender> blender, const SkPaint& paint);
+#endif
+
     /** Draws a Coons patch: the interpolation of four cubics with shared corners,
         associating a color, and optionally a texture SkPoint, with each corner.
 
@@ -2176,6 +2197,11 @@ class SK_API SkCanvas {
     virtual void didTranslate(SkScalar, SkScalar) {}
     virtual void didScale(SkScalar, SkScalar) {}
 
+#ifndef SK_ENABLE_EXPERIMENTAL_CUSTOM_MESH
+    // Define this in protected so we can still access internally for testing.
+    void drawCustomMesh(SkCustomMesh cm, sk_sp<SkBlender> blender, const SkPaint& paint);
+#endif
+
     // NOTE: If you are adding a new onDraw virtual to SkCanvas, PLEASE add an override to
     // SkCanvasVirtualEnforcer (in SkCanvasVirtualEnforcer.h). This ensures that subclasses using
     // that mechanism  will be required to implement the new function.
@@ -2216,7 +2242,9 @@ class SK_API SkCanvas {
 
     virtual void onDrawVerticesObject(const SkVertices* vertices, SkBlendMode mode,
                                       const SkPaint& paint);
-
+#ifdef SK_ENABLE_SKSL
+    virtual void onDrawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&);
+#endif
     virtual void onDrawAnnotation(const SkRect& rect, const char key[], SkData* value);
     virtual void onDrawShadowRec(const SkPath&, const SkDrawShadowRec&);
 
@@ -2271,7 +2299,7 @@ class SK_API SkCanvas {
         kYes = true
     };
     // call the appropriate predrawNotify and create a layer if needed.
-    skstd::optional<AutoLayerForImageFilter> aboutToDraw(
+    std::optional<AutoLayerForImageFilter> aboutToDraw(
         SkCanvas* canvas,
         const SkPaint& paint,
         const SkRect* rawBounds = nullptr,
diff --git a/third_party/skia/include/core/SkCustomMesh.h b/third_party/skia/include/core/SkCustomMesh.h
new file mode 100644
index 0000000000000..f9bddf3385ce6
--- /dev/null
+++ b/third_party/skia/include/core/SkCustomMesh.h
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCustomMesh_DEFINED
+#define SkCustomMesh_DEFINED
+
+#include "include/core/SkTypes.h"
+
+#ifdef SK_ENABLE_SKSL
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
+#include "include/core/SkString.h"
+
+#include <vector>
+
+namespace SkSL { struct Program; }
+
+/**
+ * A specification for custom meshes. Specifies the vertex buffer attributes and stride, the
+ * vertex program that produces a user-defined set of varyings, a fragment program that ingests
+ * the interpolated varyings and produces local coordinates and optionally a color.
+ *
+ * The signature of the vertex program must be:
+ *   float2 main(Attributes, out Varyings)
+ * where the return value is a local position that will be transformed by SkCanvas's matrix.
+ *
+ * The signature of the fragment program must be either:
+ *   (float2|void) main(Varyings)
+ * or
+ *   (float2|void) main(Varyings, out (half4|float4) color)
+ *
+ * where the return value is the local coordinates that will be used to access SkShader. If the
+ * return type is void then the interpolated position from vertex shader return is used as the local
+ * coordinate. If the color variant is used it will be blended with SkShader (or SkPaint color in
+ * absence of a shader) using the SkBlender provided to the SkCanvas draw call.
+ */
+class SkCustomMeshSpecification : public SkNVRefCnt<SkCustomMeshSpecification> {
+public:
+    /** These values are enforced when creating a specification. */
+    static constexpr size_t kMaxStride       = 1024;
+    static constexpr size_t kMaxAttributes   = 8;
+    static constexpr size_t kStrideAlignment = 4;
+    static constexpr size_t kOffsetAlignment = 4;
+    static constexpr size_t kMaxVaryings     = 6;
+
+    struct Attribute {
+        enum class Type : uint32_t {  // CPU representation     Shader Type
+            kFloat,                   // float                  float
+            kFloat2,                  // two floats             float2
+            kFloat3,                  // three floats           float3
+            kFloat4,                  // four floats            float4
+            kUByte4_unorm,            // four bytes             half4
+
+            kLast = kUByte4_unorm
+        };
+        Type     type;
+        size_t   offset;
+        SkString name;
+    };
+
+    struct Varying {
+        enum class Type : uint32_t {
+            kFloat,   // "float"
+            kFloat2,  // "float2"
+            kFloat3,  // "float3"
+            kFloat4,  // "float4"
+            kHalf,    // "half"
+            kHalf2,   // "half2"
+            kHalf3,   // "half3"
+            kHalf4,   // "half4"
+
+            kLast = kHalf4
+        };
+        Type     type;
+        SkString name;
+    };
+
+    ~SkCustomMeshSpecification();
+
+    struct Result {
+        sk_sp<SkCustomMeshSpecification> specification;
+        SkString                         error;
+    };
+
+    /**
+     * If successful the return is a specification and an empty error string. Otherwise, it is a
+     * null specification a non-empty error string.
+     *
+     * @param attributes     The vertex attributes that will be consumed by 'vs'. Attributes need
+     *                       not be tightly packed but attribute offsets must be aligned to
+     *                       kOffsetAlignment and offset + size may not be greater than
+     *                       'vertexStride'. At least one attribute is required.
+     * @param vertexStride   The offset between successive attribute values. This must be aligned to
+     *                       kStrideAlignment.
+     * @param varyings       The varyings that will be written by 'vs' and read by 'fs'. This may
+     *                       be empty.
+     * @param vs             The vertex shader code that computes a vertex position and the varyings
+     *                       from the attributes.
+     * @param fs             The fragment code that computes a local coordinate and optionally a
+     *                       color from the varyings. The local coordinate is used to sample
+     *                       SkShader.
+     * @param cs             The colorspace of the color produced by 'fs'. Ignored if 'fs's main()
+     *                       function does not have a color out param.
+     * @param at             The alpha type of the color produced by 'fs'. Ignored if 'fs's main()
+     *                       function does not have a color out param. Cannot be kUnknown.
+     */
+    static Result Make(SkSpan<const Attribute> attributes,
+                       size_t                  vertexStride,
+                       SkSpan<const Varying>   varyings,
+                       const SkString&         vs,
+                       const SkString&         fs,
+                       sk_sp<SkColorSpace>     cs = SkColorSpace::MakeSRGB(),
+                       SkAlphaType             at = kPremul_SkAlphaType);
+
+    SkSpan<const Attribute> attributes() const { return SkMakeSpan(fAttributes); }
+
+    size_t stride() const { return fStride; }
+
+private:
+    friend struct SkCustomMeshSpecificationPriv;
+
+    enum class ColorType {
+        kNone,
+        kHalf4,
+        kFloat4,
+    };
+
+    static Result MakeFromSourceWithStructs(SkSpan<const Attribute> attributes,
+                                            size_t                  stride,
+                                            SkSpan<const Varying>   varyings,
+                                            const SkString&         vs,
+                                            const SkString&         fs,
+                                            sk_sp<SkColorSpace>     cs,
+                                            SkAlphaType             at);
+
+    SkCustomMeshSpecification(SkSpan<const Attribute>,
+                              size_t,
+                              SkSpan<const Varying>,
+                              std::unique_ptr<SkSL::Program>,
+                              std::unique_ptr<SkSL::Program>,
+                              ColorType,
+                              bool hasLocalCoords,
+                              sk_sp<SkColorSpace>,
+                              SkAlphaType);
+
+    SkCustomMeshSpecification(const SkCustomMeshSpecification&) = delete;
+    SkCustomMeshSpecification(SkCustomMeshSpecification&&) = delete;
+
+    SkCustomMeshSpecification& operator=(const SkCustomMeshSpecification&) = delete;
+    SkCustomMeshSpecification& operator=(SkCustomMeshSpecification&&) = delete;
+
+    const std::vector<Attribute>       fAttributes;
+    const std::vector<Varying>         fVaryings;
+    std::unique_ptr<SkSL::Program>     fVS;
+    std::unique_ptr<SkSL::Program>     fFS;
+    size_t                             fStride;
+    uint32_t                           fHash;
+    ColorType                          fColorType;
+    bool                               fHasLocalCoords;
+    sk_sp<SkColorSpace>                fColorSpace;
+    SkAlphaType                        fAlphaType;
+};
+
+/**
+ * This is a placeholder object. We will want something that allows the client to incrementally
+ * update the mesh that can be synchronized with the GPU backend without requiring extra copies.
+ *
+ * A buffer of vertices, a topology, optionally indices, and a compatible SkCustomMeshSpecification.
+ * The data in 'vb' is expected to contain the attributes described in 'spec' for 'vcount' vertices.
+ * The size of the buffer must be at least spec->stride()*vcount (even if vertex attributes contains
+ * pad at the end of the stride). If 'bounds' does not contain all points output by 'spec''s vertex
+ * program when applied to the vertices in 'vb' a draw of the custom mesh produces undefined
+ * results.
+ *
+ * If indices is null then then 'icount' must be <= 0. 'vcount' vertices will be selected from 'vb'
+ * to create the topology indicated by 'mode'.
+ *
+ * If indices is not null then icount must be >= 3. 'vb' will be indexed by 'icount' successive
+ * values in 'indices' to create the topology indicated by 'mode'. The values in 'indices' must be
+ * less than 'vcount'
+ */
+struct SkCustomMesh {
+    enum class Mode { kTriangles, kTriangleStrip };
+    sk_sp<SkCustomMeshSpecification>  spec;
+    Mode                              mode     = Mode::kTriangles;
+    SkRect                            bounds   = SkRect::MakeEmpty();
+    const void*                       vb       = nullptr;
+    int                               vcount   = 0;
+    const uint16_t*                   indices  = nullptr;
+    int                               icount   = 0;
+};
+
+#endif  // SK_ENABLE_SKSL
+
+#endif
diff --git a/third_party/skia/include/core/SkDrawable.h b/third_party/skia/include/core/SkDrawable.h
index 8d605f80d61cc..c86543dc6b367 100644
--- a/third_party/skia/include/core/SkDrawable.h
+++ b/third_party/skia/include/core/SkDrawable.h
@@ -103,6 +103,12 @@ class SK_API SkDrawable : public SkFlattenable {
      */
     SkRect getBounds();
 
+    /**
+     *  Return approximately how many bytes would be freed if this drawable is destroyed.
+     *  The base implementation returns 0 to indicate that this is unknown.
+     */
+    size_t approximateBytesUsed();
+
     /**
      *  Calling this invalidates the previous generation ID, and causes a new one to be computed
      *  the next time getGenerationID() is called. Typically this is called by the object itself,
@@ -132,6 +138,7 @@ class SK_API SkDrawable : public SkFlattenable {
     SkDrawable();
 
     virtual SkRect onGetBounds() = 0;
+    virtual size_t onApproximateBytesUsed();
     virtual void onDraw(SkCanvas*) = 0;
 
     virtual std::unique_ptr<GpuDrawHandler> onSnapGpuDrawHandler(GrBackendApi, const SkMatrix&,
diff --git a/third_party/skia/include/core/SkEncodedImageFormat.h b/third_party/skia/include/core/SkEncodedImageFormat.h
index 97add6dea6c6b..99ca44e765c53 100644
--- a/third_party/skia/include/core/SkEncodedImageFormat.h
+++ b/third_party/skia/include/core/SkEncodedImageFormat.h
@@ -30,6 +30,7 @@ enum class SkEncodedImageFormat {
     kDNG,
     kHEIF,
     kAVIF,
+    kJPEGXL,
 };
 
 #endif  // SkEncodedImageFormat_DEFINED
diff --git a/third_party/skia/include/core/SkFont.h b/third_party/skia/include/core/SkFont.h
index 947e4dd779cdf..2732ae04934ff 100644
--- a/third_party/skia/include/core/SkFont.h
+++ b/third_party/skia/include/core/SkFont.h
@@ -529,6 +529,7 @@ class SK_API SkFont {
     friend class SkFontPriv;
     friend class SkGlyphRunListPainter;
     friend class SkStrikeSpec;
+    friend class SkRemoteGlyphCacheTest;
 };
 
 #endif
diff --git a/third_party/skia/include/core/SkFontArguments.h b/third_party/skia/include/core/SkFontArguments.h
index 2aaaf55cad1cf..a5139bb21bde6 100644
--- a/third_party/skia/include/core/SkFontArguments.h
+++ b/third_party/skia/include/core/SkFontArguments.h
@@ -8,6 +8,7 @@
 #ifndef SkFontArguments_DEFINED
 #define SkFontArguments_DEFINED
 
+#include "include/core/SkColor.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
 
@@ -22,7 +23,27 @@ struct SkFontArguments {
         int coordinateCount;
     };
 
-    SkFontArguments() : fCollectionIndex(0), fVariationDesignPosition{nullptr, 0} {}
+    /** Specify a palette to use and overrides for palette entries.
+     *
+     *  `overrides` is a list of pairs of palette entry index and color.
+     *  The overriden palette entries will use the associated color.
+     *  Override pairs with palette entry indices out of range will not be applied.
+     *  Later override entries override earlier ones.
+     */
+    struct Palette {
+        struct Override {
+            int index;
+            SkColor color;
+        };
+        int index;
+        const Override* overrides;
+        int overrideCount;
+    };
+
+    SkFontArguments()
+            : fCollectionIndex(0)
+            , fVariationDesignPosition{nullptr, 0}
+            , fPalette{0, nullptr, 0} {}
 
     /** Specify the index of the desired font.
      *
@@ -54,9 +75,20 @@ struct SkFontArguments {
     VariationPosition getVariationDesignPosition() const {
         return fVariationDesignPosition;
     }
+
+    SkFontArguments& setPalette(Palette palette) {
+        fPalette.index = palette.index;
+        fPalette.overrides = palette.overrides;
+        fPalette.overrideCount = palette.overrideCount;
+        return *this;
+    }
+
+    Palette getPalette() const { return fPalette; }
+
 private:
     int fCollectionIndex;
     VariationPosition fVariationDesignPosition;
+    Palette fPalette;
 };
 
 #endif
diff --git a/third_party/skia/include/core/SkGraphics.h b/third_party/skia/include/core/SkGraphics.h
index fc1e47ceceeae..b68bb78bad150 100644
--- a/third_party/skia/include/core/SkGraphics.h
+++ b/third_party/skia/include/core/SkGraphics.h
@@ -23,9 +23,6 @@ class SK_API SkGraphics {
      */
     static void Init();
 
-    // We're in the middle of cleaning this up.
-    static void Term() {}
-
     /**
      *  Return the max number of bytes that should be used by the font cache.
      *  If the cache needs to allocate more, it will purge previous entries.
diff --git a/third_party/skia/include/core/SkImage.h b/third_party/skia/include/core/SkImage.h
index 81fdd9fd48c4c..72dfefa3450c7 100644
--- a/third_party/skia/include/core/SkImage.h
+++ b/third_party/skia/include/core/SkImage.h
@@ -10,7 +10,6 @@
 
 #include "include/core/SkImageEncoder.h"
 #include "include/core/SkImageInfo.h"
-#include "include/core/SkM44.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkSamplingOptions.h"
 #include "include/core/SkScalar.h"
@@ -185,7 +184,7 @@ class SK_API SkImage : public SkRefCnt {
         example: https://fiddle.skia.org/c/@Image_MakeFromEncoded
     */
     static sk_sp<SkImage> MakeFromEncoded(sk_sp<SkData> encoded,
-                                          skstd::optional<SkAlphaType> alphaType = skstd::nullopt);
+                                          std::optional<SkAlphaType> alphaType = std::nullopt);
 
     /*
      * Experimental:
diff --git a/third_party/skia/include/core/SkImageGenerator.h b/third_party/skia/include/core/SkImageGenerator.h
index 73c8e36b82c38..bdd913c61f4c7 100644
--- a/third_party/skia/include/core/SkImageGenerator.h
+++ b/third_party/skia/include/core/SkImageGenerator.h
@@ -158,7 +158,7 @@ class SK_API SkImageGenerator {
      *  kOpaque_SkAlphaType is not supported, and will return NULL.
      */
     static std::unique_ptr<SkImageGenerator> MakeFromEncoded(
-            sk_sp<SkData>, skstd::optional<SkAlphaType> = skstd::nullopt);
+            sk_sp<SkData>, std::optional<SkAlphaType> = std::nullopt);
 
     /** Return a new image generator backed by the specified picture.  If the size is empty or
      *  the picture is NULL, this returns NULL.
@@ -186,6 +186,12 @@ class SK_API SkImageGenerator {
     // returns nullptr
     virtual GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&,
                                                  const SkIPoint&, GrMipmapped, GrImageTexGenPolicy);
+
+    // Most internal SkImageGenerators produce textures and views that use kTopLeft_GrSurfaceOrigin.
+    // If the generator may produce textures with different origins (e.g.
+    // GrAHardwareBufferImageGenerator) it should override this function to return the correct
+    // origin.
+    virtual GrSurfaceOrigin origin() const { return kTopLeft_GrSurfaceOrigin; }
 #endif
 
 private:
@@ -198,7 +204,7 @@ class SK_API SkImageGenerator {
     // It is called from NewFromEncoded() after it has checked for any runtime factory.
     // The SkData will never be NULL, as that will have been checked by NewFromEncoded.
     static std::unique_ptr<SkImageGenerator> MakeFromEncodedImpl(sk_sp<SkData>,
-                                                                 skstd::optional<SkAlphaType>);
+                                                                 std::optional<SkAlphaType>);
 
     SkImageGenerator(SkImageGenerator&&) = delete;
     SkImageGenerator(const SkImageGenerator&) = delete;
diff --git a/third_party/skia/include/core/SkImageInfo.h b/third_party/skia/include/core/SkImageInfo.h
index 3068ec41cda75..6426811c1bd7d 100644
--- a/third_party/skia/include/core/SkImageInfo.h
+++ b/third_party/skia/include/core/SkImageInfo.h
@@ -92,8 +92,9 @@ enum SkColorType : int {
                                      //   and alpha
 
     kSRGBA_8888_SkColorType,
+    kR8_unorm_SkColorType,
 
-    kLastEnum_SkColorType     = kSRGBA_8888_SkColorType, //!< last valid value
+    kLastEnum_SkColorType     = kR8_unorm_SkColorType, //!< last valid value
 
 #if !defined(STARBOARD)
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
diff --git a/third_party/skia/include/core/SkMilestone.h b/third_party/skia/include/core/SkMilestone.h
index 70106c8db3fd4..5409f46dea781 100644
--- a/third_party/skia/include/core/SkMilestone.h
+++ b/third_party/skia/include/core/SkMilestone.h
@@ -5,5 +5,5 @@
  * found in the LICENSE file.
  */
 #ifndef SK_MILESTONE
-#define SK_MILESTONE 98
+#define SK_MILESTONE 100
 #endif
diff --git a/third_party/skia/include/core/SkPaint.h b/third_party/skia/include/core/SkPaint.h
index e3cc0391d4b12..08c4aa9e41c32 100644
--- a/third_party/skia/include/core/SkPaint.h
+++ b/third_party/skia/include/core/SkPaint.h
@@ -470,7 +470,7 @@ class SK_API SkPaint {
      *  enum in the optional's value(). If it cannot, then the returned optional does not
      *  contain a value.
      */
-    skstd::optional<SkBlendMode> asBlendMode() const;
+    std::optional<SkBlendMode> asBlendMode() const;
 
     /**
      *  Queries the blender, and if it can be represented as a SkBlendMode, return that mode,
diff --git a/third_party/skia/include/core/SkPromiseImageTexture.h b/third_party/skia/include/core/SkPromiseImageTexture.h
index 99f6cc582afbe..05434c0942517 100644
--- a/third_party/skia/include/core/SkPromiseImageTexture.h
+++ b/third_party/skia/include/core/SkPromiseImageTexture.h
@@ -13,17 +13,10 @@
 #if SK_SUPPORT_GPU
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrBackendSurface.h"
-#include "include/private/GrResourceKey.h"
 /**
  * This type is used to fulfill textures for PromiseImages. Once an instance is returned from a
  * PromiseImageTextureFulfillProc the GrBackendTexture it wraps must remain valid until the
- * corresponding PromiseImageTextureReleaseProc is called. For performance reasons it is
- * recommended that the client reuse a single PromiseImageTexture each time a given texture
- * is returned by the PromiseImageTextureFulfillProc rather than creating a new PromiseImageTexture
- * representing the same underlying backend API texture. If the underlying texture is deleted (after
- * PromiseImageTextureReleaseProc has been called if this was returned by a
- * PromiseImageTextureFulfillProc) then this object should be disposed as the texture it represented
- * cannot be used to fulfill again.
+ * corresponding PromiseImageTextureReleaseProc is called.
  */
 class SK_API SkPromiseImageTexture : public SkNVRefCnt<SkPromiseImageTexture> {
 public:
@@ -43,20 +36,10 @@ class SK_API SkPromiseImageTexture : public SkNVRefCnt<SkPromiseImageTexture> {
 
     GrBackendTexture backendTexture() const { return fBackendTexture; }
 
-    void addKeyToInvalidate(uint32_t contextID, const GrUniqueKey& key);
-    uint32_t uniqueID() const { return fUniqueID; }
-
-#if GR_TEST_UTILS
-    SkTArray<GrUniqueKey> testingOnly_uniqueKeysToInvalidate() const;
-#endif
-
 private:
     explicit SkPromiseImageTexture(const GrBackendTexture& backendTexture);
 
-    SkSTArray<1, GrUniqueKeyInvalidatedMessage> fMessages;
     GrBackendTexture fBackendTexture;
-    uint32_t fUniqueID = SK_InvalidUniqueID;
-    static std::atomic<uint32_t> gUniqueID;
 };
 #endif // SK_SUPPORT_GPU
 
diff --git a/third_party/skia/include/core/SkString.h b/third_party/skia/include/core/SkString.h
index 5576e74221703..28d9826a380cb 100644
--- a/third_party/skia/include/core/SkString.h
+++ b/third_party/skia/include/core/SkString.h
@@ -19,10 +19,7 @@
 #include <string.h>
 #include <atomic>
 #include <string>
-
-namespace skstd {
-    class string_view;
-}
+#include <string_view>
 
 /*  Some helper functions for C strings */
 static inline bool SkStrStartsWith(const char string[], const char prefixStr[]) {
@@ -126,7 +123,7 @@ class SK_API SkString {
                 SkString(const SkString&);
                 SkString(SkString&&);
     explicit    SkString(const std::string&);
-    explicit    SkString(skstd::string_view);
+    explicit    SkString(std::string_view);
                 ~SkString();
 
     bool        isEmpty() const { return 0 == fRec->fLength; }
@@ -220,11 +217,11 @@ class SK_API SkString {
     void prependScalar(SkScalar value) { this->insertScalar((size_t)-1, value); }
 
     void printf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void printVAList(const char format[], va_list);
+    void printVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
     void appendf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void appendVAList(const char format[], va_list);
+    void appendVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
     void prependf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
-    void prependVAList(const char format[], va_list);
+    void prependVAList(const char format[], va_list) SK_PRINTF_LIKE(2, 0);
 
     void remove(size_t offset, size_t length);
 
diff --git a/third_party/skia/include/core/SkStringView.h b/third_party/skia/include/core/SkStringView.h
deleted file mode 100644
index 184e681d26510..0000000000000
--- a/third_party/skia/include/core/SkStringView.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2021 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkStringView_DEFINED
-#define SkStringView_DEFINED
-
-#include <algorithm>
-#include <cstring>
-#include <string>
-
-namespace skstd {
-
-class string_view {
-public:
-    using value_type = char;
-    using traits_type = std::char_traits<value_type>;
-    using const_pointer = const value_type*;
-    using const_reference = const value_type&;
-    using iterator = const_pointer;
-    using const_iterator = iterator;
-    using size_type = size_t;
-    static constexpr size_type npos = size_type(-1);
-
-    constexpr string_view()
-        : fData(nullptr)
-        , fLength(0) {}
-
-    constexpr string_view(const string_view&) = default;
-
-    constexpr string_view(const_pointer data, size_type length)
-        : fData(data)
-        , fLength(length) {}
-
-    string_view(const_pointer data)
-        : string_view(data, strlen(data)) {}
-
-    string_view(const std::string& str)
-        : string_view(str.data(), str.length()) {}
-
-    constexpr string_view& operator=(const string_view&) = default;
-
-    constexpr iterator begin() const {
-        return fData;
-    }
-
-    constexpr iterator end() const {
-        return fData + fLength;
-    }
-
-    constexpr const_reference operator[](size_type idx) const {
-        return fData[idx];
-    }
-
-    constexpr const_reference front() const {
-        return fData[0];
-    }
-
-    constexpr const_reference back() const {
-        return fData[fLength - 1];
-    }
-
-    constexpr const_pointer data() const {
-        return fData;
-    }
-
-    constexpr size_type size() const {
-        return fLength;
-    }
-
-    constexpr size_type length() const {
-        return fLength;
-    }
-
-    constexpr bool empty() const {
-        return fLength == 0;
-    }
-
-    constexpr bool starts_with(string_view s) const {
-        if (s.length() > fLength) {
-            return false;
-        }
-        return s.length() == 0 || !memcmp(fData, s.fData, s.length());
-    }
-
-    constexpr bool starts_with(value_type c) const {
-        return !this->empty() && this->front() == c;
-    }
-
-    constexpr bool ends_with(string_view s) const {
-        if (s.length() > fLength) {
-            return false;
-        }
-        return s.length() == 0 || !memcmp(this->end() - s.length(), s.fData, s.length());
-    }
-
-    constexpr bool ends_with(value_type c) const {
-        return !this->empty() && this->back() == c;
-    }
-
-    size_type find(string_view needle, size_type pos = 0) const {
-        if (needle.length() == 0) {
-            return 0;
-        }
-        if (this->length() < needle.length()) {
-            return npos;
-        }
-        const char* match = nullptr;
-        const char* start = this->data() + pos;
-        const char* end = start + this->length() - needle.length() + 1;
-        while ((match = (const char*)(memchr(start, needle[0], (size_t)(end - start))))) {
-            if (!memcmp(match, needle.data(), needle.length())) {
-                return (size_type)(match - this->data());
-            } else {
-                start = match + 1;
-            }
-        }
-        return npos;
-    }
-
-    bool contains(string_view needle) const {
-        return this->find(needle) != npos;
-    }
-
-    constexpr string_view substr(size_type pos = 0, size_type count = npos) const {
-        if (pos > fLength) {
-            return {};
-        }
-        return string_view{fData + pos, std::min(count, fLength - pos)};
-    }
-
-    constexpr void swap(string_view& other) {
-        const_pointer tempData = fData;
-        fData = other.fData;
-        other.fData = tempData;
-
-        size_type tempLength = fLength;
-        fLength = other.fLength;
-        other.fLength = tempLength;
-    }
-
-    constexpr void remove_prefix(size_type n) {
-        fData += n;
-        fLength -= n;
-    }
-
-    constexpr void remove_suffix(size_type n) {
-        fLength -= n;
-    }
-
-private:
-    const_pointer fData;
-    size_type fLength;
-};
-
-bool operator==(string_view left, string_view right);
-
-bool operator!=(string_view left, string_view right);
-
-bool operator<(string_view left, string_view right);
-
-bool operator<=(string_view left, string_view right);
-
-bool operator>(string_view left, string_view right);
-
-bool operator>=(string_view left, string_view right);
-
-} // namespace skstd
-
-namespace std {
-    template<> struct hash<skstd::string_view> {
-        size_t operator()(const skstd::string_view& s) const {
-            size_t result = 0;
-            for (auto iter = s.begin(); iter != s.end(); ++iter) {
-                result = result * 101 + (size_t) *iter;
-            }
-            return result;
-        }
-    };
-} // namespace std
-
-#endif
diff --git a/third_party/skia/include/core/SkSurface.h b/third_party/skia/include/core/SkSurface.h
index 3718aaaab5709..14901ea5f39ec 100644
--- a/third_party/skia/include/core/SkSurface.h
+++ b/third_party/skia/include/core/SkSurface.h
@@ -910,6 +910,19 @@ class SK_API SkSurface : public SkRefCnt {
     };
 
 #if SK_SUPPORT_GPU
+    /** If a surface is GPU texture backed, is being drawn with MSAA, and there is a resolve
+        texture, this call will insert a resolve command into the stream of gpu commands. In order
+        for the resolve to actually have an effect, the work still needs to be flushed and submitted
+        to the GPU after recording the resolve command. If a resolve is not supported or the
+        SkSurface has no dirty work to resolve, then this call is a no-op.
+
+        This call is most useful when the SkSurface is created by wrapping a single sampled gpu
+        texture, but asking Skia to render with MSAA. If the client wants to use the wrapped texture
+        outside of Skia, the only way to trigger a resolve is either to call this command or use
+        SkSurface::flush.
+     */
+    void resolveMSAA();
+
     /** Issues pending SkSurface commands to the GPU-backed API objects and resolves any SkSurface
         MSAA. A call to GrDirectContext::submit is always required to ensure work is actually sent
         to the gpu. Some specific API details:
diff --git a/third_party/skia/include/core/SkTypeface.h b/third_party/skia/include/core/SkTypeface.h
index ad49a544bdfd7..d4a13877152d3 100644
--- a/third_party/skia/include/core/SkTypeface.h
+++ b/third_party/skia/include/core/SkTypeface.h
@@ -29,7 +29,12 @@ struct SkAdvancedTypefaceMetrics;
 struct SkScalerContextEffects;
 struct SkScalerContextRec;
 
-typedef uint32_t SkFontID;
+using SkTypefaceID = uint32_t;
+
+// SkFontID is deprecated, please use SkTypefaceID.
+using SkFontID = SkTypefaceID;
+
+
 /** Machine endian. */
 typedef uint32_t SkFontTableTag;
 
@@ -91,13 +96,13 @@ class SK_API SkTypeface : public SkWeakRefCnt {
     /** Return a 32bit value for this typeface, unique for the underlying font
         data. Will never return 0.
      */
-    SkFontID uniqueID() const { return fUniqueID; }
+    SkTypefaceID uniqueID() const { return fUniqueID; }
 
     /** Return the uniqueID for the specified typeface. If the face is null,
         resolve it to the default font and return its uniqueID. Will never
         return 0.
     */
-    static SkFontID UniqueID(const SkTypeface* face);
+    static SkTypefaceID UniqueID(const SkTypeface* face);
 
     /** Returns true if the two typefaces reference the same underlying font,
         handling either being null (treating null as the default font)
@@ -319,6 +324,15 @@ class SK_API SkTypeface : public SkWeakRefCnt {
      */
     std::unique_ptr<SkStreamAsset> openStream(int* ttcIndex) const;
 
+    /**
+     * Return a stream for the contents of the font data.
+     * Returns nullptr on failure or if the font data isn't already available in stream form.
+     * Use when the stream can be used opportunistically but the calling code would prefer
+     * to fall back to table access if creating the stream would be expensive.
+     * Otherwise acts the same as openStream.
+     */
+    std::unique_ptr<SkStreamAsset> openExistingStream(int* ttcIndex) const;
+
     /**
      *  Return a scalercontext for the given descriptor. It may return a
      *  stub scalercontext that will not crash, but will draw nothing.
@@ -377,6 +391,8 @@ class SK_API SkTypeface : public SkWeakRefCnt {
 
     virtual std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const = 0;
 
+    virtual std::unique_ptr<SkStreamAsset> onOpenExistingStream(int* ttcIndex) const;
+
     virtual bool onGlyphMaskNeedsCurrentColor() const = 0;
 
     virtual int onGetVariationDesignPosition(
@@ -443,7 +459,7 @@ class SK_API SkTypeface : public SkWeakRefCnt {
     friend class SkFont;             // getGlyphToUnicodeMap
 
 private:
-    SkFontID            fUniqueID;
+    SkTypefaceID        fUniqueID;
     SkFontStyle         fStyle;
     mutable SkRect      fBounds;
     mutable SkOnce      fBoundsOnce;
diff --git a/third_party/skia/include/core/SkTypes.h b/third_party/skia/include/core/SkTypes.h
index d97ff754eb9ad..97278d3e6f775 100644
--- a/third_party/skia/include/core/SkTypes.h
+++ b/third_party/skia/include/core/SkTypes.h
@@ -400,14 +400,6 @@ inline SkPmcolor GetSkPmcolor() {
 #  endif
 #endif
 
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
-    #define SK_PREFETCH(ptr) _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
-#elif defined(__GNUC__)
-    #define SK_PREFETCH(ptr) __builtin_prefetch(ptr)
-#else
-    #define SK_PREFETCH(ptr)
-#endif
-
 #ifndef SK_PRINTF_LIKE
 #  if defined(__clang__) || defined(__GNUC__)
 #    define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B))))
@@ -543,7 +535,7 @@ typedef unsigned U16CPU;
 /** @return false or true based on the condition
 */
 template <typename T> static constexpr bool SkToBool(const T& x) {
-    return 0 != x;  // NOLINT(modernize-use-nullptr)
+    return (bool)x;
 }
 
 static constexpr int16_t SK_MaxS16 = INT16_MAX;
diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
index e91837ec576eb..144bfb8a64c83 100644
--- a/third_party/skia/include/effects/SkImageFilters.h
+++ b/third_party/skia/include/effects/SkImageFilters.h
@@ -352,6 +352,26 @@ class SK_API SkImageFilters {
     static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
                                               const char* childShaderName,
                                               sk_sp<SkImageFilter> input);
+
+    /**
+     *  Create a filter that fills the output with the per-pixel evaluation of the SkShader produced
+     *  by the SkRuntimeShaderBuilder. The shader is defined in the image filter's local coordinate
+     *  system, so it will automatically be affected by SkCanvas' transform.
+     *
+     *  @param builder          The builder used to produce the runtime shader, that will in turn
+     *                          fill the result image
+     *  @param childShaderNames The names of the child shaders defined in the builder that will be
+     *                          bound to the input params (or the source image if the input param
+     *                          is null). If any name is null, or appears more than once, factory
+     *                          fails and returns nullptr.
+     *  @param inputs           The image filters that will be provided as input to the runtime
+     *                          shader. If any are null, the implicit source image is used instead.
+     *  @param inputCount       How many entries are present in 'childShaderNames' and 'inputs'.
+     */
+    static sk_sp<SkImageFilter> RuntimeShader(const SkRuntimeShaderBuilder& builder,
+                                              const char* childShaderNames[],
+                                              const sk_sp<SkImageFilter> inputs[],
+                                              int inputCount);
 #endif  // SK_ENABLE_SKSL
 
     enum class Dither : bool {
diff --git a/third_party/skia/include/effects/SkRuntimeEffect.h b/third_party/skia/include/effects/SkRuntimeEffect.h
index 17f09a195f6d5..cdda2b5561865 100644
--- a/third_party/skia/include/effects/SkRuntimeEffect.h
+++ b/third_party/skia/include/effects/SkRuntimeEffect.h
@@ -32,9 +32,11 @@ class SkRuntimeImageFilter;
 
 namespace SkSL {
 class DebugTrace;
+class ErrorReporter;
 class FunctionDefinition;
 struct Program;
 enum class ProgramKind : int8_t;
+struct ProgramSettings;
 }  // namespace SkSL
 
 namespace skvm {
@@ -167,6 +169,9 @@ class SK_API SkRuntimeEffect : public SkRefCnt {
 
     static Result MakeForShader(std::unique_ptr<SkSL::Program> program, const Options&);
     static Result MakeForShader(std::unique_ptr<SkSL::Program> program);
+    static sk_sp<SkRuntimeEffect> MakeForShader(std::unique_ptr<SkSL::Program> program,
+                                                const Options&, SkSL::ErrorReporter* errors);
+
 
     static Result MakeForBlender(std::unique_ptr<SkSL::Program> program, const Options&);
     static Result MakeForBlender(std::unique_ptr<SkSL::Program> program);
@@ -179,7 +184,7 @@ class SK_API SkRuntimeEffect : public SkRefCnt {
         ChildPtr(sk_sp<SkColorFilter> cf) : fChild(std::move(cf)) {}
         ChildPtr(sk_sp<SkBlender> b) : fChild(std::move(b)) {}
 
-        skstd::optional<ChildType> type() const;
+        std::optional<ChildType> type() const;
 
         SkShader* shader() const;
         SkColorFilter* colorFilter() const;
@@ -193,12 +198,10 @@ class SK_API SkRuntimeEffect : public SkRefCnt {
     sk_sp<SkShader> makeShader(sk_sp<SkData> uniforms,
                                sk_sp<SkShader> children[],
                                size_t childCount,
-                               const SkMatrix* localMatrix,
-                               bool isOpaque) const;
+                               const SkMatrix* localMatrix = nullptr) const;
     sk_sp<SkShader> makeShader(sk_sp<SkData> uniforms,
                                SkSpan<ChildPtr> children,
-                               const SkMatrix* localMatrix,
-                               bool isOpaque) const;
+                               const SkMatrix* localMatrix = nullptr) const;
 
     sk_sp<SkImage> makeImage(GrRecordingContext*,
                              sk_sp<SkData> uniforms,
@@ -255,11 +258,13 @@ class SK_API SkRuntimeEffect : public SkRefCnt {
 
 private:
     enum Flags {
-        kUsesSampleCoords_Flag   = 0x1,
-        kAllowColorFilter_Flag   = 0x2,
-        kAllowShader_Flag        = 0x4,
-        kAllowBlender_Flag       = 0x8,
+        kUsesSampleCoords_Flag   = 0x01,
+        kAllowColorFilter_Flag   = 0x02,
+        kAllowShader_Flag        = 0x04,
+        kAllowBlender_Flag       = 0x08,
         kSamplesOutsideMain_Flag = 0x10,
+        kUsesColorTransform_Flag = 0x20,
+        kAlwaysOpaque_Flag       = 0x40,
     };
 
     SkRuntimeEffect(std::unique_ptr<SkSL::Program> baseProgram,
@@ -270,22 +275,33 @@ class SK_API SkRuntimeEffect : public SkRefCnt {
                     std::vector<SkSL::SampleUsage>&& sampleUsages,
                     uint32_t flags);
 
+    sk_sp<SkRuntimeEffect> makeUnoptimizedClone();
+
     static Result MakeFromSource(SkString sksl, const Options& options, SkSL::ProgramKind kind);
 
     static Result MakeFromDSL(std::unique_ptr<SkSL::Program> program,
                               const Options& options,
                               SkSL::ProgramKind kind);
 
+    static sk_sp<SkRuntimeEffect> MakeFromDSL(std::unique_ptr<SkSL::Program> program,
+                                              const Options& options,
+                                              SkSL::ProgramKind kind,
+                                              SkSL::ErrorReporter* errors);
+
     static Result MakeInternal(std::unique_ptr<SkSL::Program> program,
                                const Options& options,
                                SkSL::ProgramKind kind);
 
+    static SkSL::ProgramSettings MakeSettings(const Options& options, bool optimize);
+
     uint32_t hash() const { return fHash; }
-    bool usesSampleCoords()   const { return (fFlags & kUsesSampleCoords_Flag); }
-    bool allowShader()        const { return (fFlags & kAllowShader_Flag);      }
-    bool allowColorFilter()   const { return (fFlags & kAllowColorFilter_Flag); }
-    bool allowBlender()       const { return (fFlags & kAllowBlender_Flag);     }
+    bool usesSampleCoords()   const { return (fFlags & kUsesSampleCoords_Flag);   }
+    bool allowShader()        const { return (fFlags & kAllowShader_Flag);        }
+    bool allowColorFilter()   const { return (fFlags & kAllowColorFilter_Flag);   }
+    bool allowBlender()       const { return (fFlags & kAllowBlender_Flag);       }
     bool samplesOutsideMain() const { return (fFlags & kSamplesOutsideMain_Flag); }
+    bool usesColorTransform() const { return (fFlags & kUsesColorTransform_Flag); }
+    bool alwaysOpaque()       const { return (fFlags & kAlwaysOpaque_Flag);       }
 
     const SkFilterColorProgram* getFilterColorProgram();
 
@@ -465,7 +481,7 @@ class SK_API SkRuntimeShaderBuilder : public SkRuntimeEffectBuilder {
     SkRuntimeShaderBuilder(const SkRuntimeShaderBuilder&) = default;
     ~SkRuntimeShaderBuilder();
 
-    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix, bool isOpaque);
+    sk_sp<SkShader> makeShader(const SkMatrix* localMatrix = nullptr);
     sk_sp<SkImage> makeImage(GrRecordingContext*,
                              const SkMatrix* localMatrix,
                              SkImageInfo resultInfo,
diff --git a/third_party/skia/include/gpu/BUILD.bazel b/third_party/skia/include/gpu/BUILD.bazel
index 1aa7951b946e8..9c81d2948c7d4 100644
--- a/third_party/skia/include/gpu/BUILD.bazel
+++ b/third_party/skia/include/gpu/BUILD.bazel
@@ -66,6 +66,7 @@ generated_cc_atom(
     deps = [
         ":GrDriverBugWorkarounds_hdr",
         ":GrTypes_hdr",
+        ":ShaderErrorHandler_hdr",
         "//include/core:SkData_hdr",
         "//include/core:SkString_hdr",
         "//include/core:SkTypes_hdr",
@@ -158,3 +159,10 @@ generated_cc_atom(
         "//include/core:SkYUVAInfo_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "ShaderErrorHandler_hdr",
+    hdrs = ["ShaderErrorHandler.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
diff --git a/third_party/skia/include/gpu/GrContextOptions.h b/third_party/skia/include/gpu/GrContextOptions.h
index 866cf36bf8d66..b769d6ca21dab 100644
--- a/third_party/skia/include/gpu/GrContextOptions.h
+++ b/third_party/skia/include/gpu/GrContextOptions.h
@@ -13,6 +13,7 @@
 #include "include/core/SkTypes.h"
 #include "include/gpu/GrDriverBugWorkarounds.h"
 #include "include/gpu/GrTypes.h"
+#include "include/gpu/ShaderErrorHandler.h"
 #include "include/private/GrTypesPriv.h"
 
 #include <vector>
@@ -70,22 +71,7 @@ struct SK_API GrContextOptions {
         PersistentCache& operator=(const PersistentCache&) = delete;
     };
 
-    /**
-     * Abstract class to report errors when compiling shaders. If fShaderErrorHandler is present,
-     * it will be called to report any compilation failures. Otherwise, failures will be reported
-     * via SkDebugf and asserts.
-     */
-    class SK_API ShaderErrorHandler {
-    public:
-        virtual ~ShaderErrorHandler() = default;
-
-        virtual void compileError(const char* shader, const char* errors) = 0;
-
-    protected:
-        ShaderErrorHandler() = default;
-        ShaderErrorHandler(const ShaderErrorHandler&) = delete;
-        ShaderErrorHandler& operator=(const ShaderErrorHandler&) = delete;
-    };
+    using ShaderErrorHandler = skgpu::ShaderErrorHandler;
 
     GrContextOptions() {}
 
@@ -270,12 +256,27 @@ struct SK_API GrContextOptions {
      */
     bool fEnableExperimentalHardwareTessellation = false;
 
+    /**
+     * If true, then add 1 pixel padding to all glyph masks in the atlas to support bi-lerp
+     * rendering of all glyphs. This must be set to true to use GrSlug.
+     */
+    #if defined(SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG)
+    bool fSupportBilerpFromGlyphAtlas = true;
+    #else
+    bool fSupportBilerpFromGlyphAtlas = false;
+    #endif
+
     /**
      * Uses a reduced variety of shaders. May perform less optimally in steady state but can reduce
      * jank due to shader compilations.
      */
     bool fReducedShaderVariations = false;
 
+    /**
+     * If true, then allow to enable MSAA on new Intel GPUs.
+     */
+    bool fAllowMSAAOnNewIntel = false;
+
 #if GR_TEST_UTILS
     /**
      * Private options that are only meant for testing within Skia's tools.
diff --git a/third_party/skia/include/gpu/GrContextThreadSafeProxy.h b/third_party/skia/include/gpu/GrContextThreadSafeProxy.h
index ed0b884d59661..1bf1f1f967312 100644
--- a/third_party/skia/include/gpu/GrContextThreadSafeProxy.h
+++ b/third_party/skia/include/gpu/GrContextThreadSafeProxy.h
@@ -21,7 +21,7 @@
 class GrBackendFormat;
 class GrCaps;
 class GrContextThreadSafeProxyPriv;
-class GrTextBlobCache;
+class GrTextBlobRedrawCoordinator;
 class GrThreadSafeCache;
 class GrThreadSafePipelineBuilder;
 class SkSurfaceCharacterization;
@@ -142,14 +142,14 @@ class SK_API GrContextThreadSafeProxy final : public SkNVRefCnt<GrContextThreadS
     // `init` method on GrContext_Base).
     void init(sk_sp<const GrCaps>, sk_sp<GrThreadSafePipelineBuilder>);
 
-    const GrBackendApi                      fBackend;
-    const GrContextOptions                  fOptions;
-    const uint32_t                          fContextID;
-    sk_sp<const GrCaps>                     fCaps;
-    std::unique_ptr<GrTextBlobCache>        fTextBlobCache;
-    std::unique_ptr<GrThreadSafeCache>      fThreadSafeCache;
-    sk_sp<GrThreadSafePipelineBuilder>      fPipelineBuilder;
-    std::atomic<bool>                       fAbandoned{false};
+    const GrBackendApi                           fBackend;
+    const GrContextOptions                       fOptions;
+    const uint32_t                               fContextID;
+    sk_sp<const GrCaps>                          fCaps;
+    std::unique_ptr<GrTextBlobRedrawCoordinator> fTextBlobRedrawCoordinator;
+    std::unique_ptr<GrThreadSafeCache>           fThreadSafeCache;
+    sk_sp<GrThreadSafePipelineBuilder>           fPipelineBuilder;
+    std::atomic<bool>                            fAbandoned{false};
 };
 
 #else // !SK_SUPPORT_GPU
diff --git a/third_party/skia/include/gpu/GrDirectContext.h b/third_party/skia/include/gpu/GrDirectContext.h
index 4ff25b0f5f34d..ff5168e4a637b 100644
--- a/third_party/skia/include/gpu/GrDirectContext.h
+++ b/third_party/skia/include/gpu/GrDirectContext.h
@@ -31,7 +31,6 @@ class GrResourceCache;
 class GrResourceProvider;
 class GrStrikeCache;
 class GrSurfaceProxy;
-class GrSwizzle;
 class GrTextureProxy;
 struct GrVkBackendContext;
 
@@ -42,7 +41,10 @@ class SkSurfaceProps;
 class SkTaskGroup;
 class SkTraceMemoryDump;
 
-namespace skgpu { namespace v1 { class SmallPathAtlasMgr; }}
+namespace skgpu {
+class Swizzle;
+namespace v1 { class SmallPathAtlasMgr; }
+}
 
 class SK_API GrDirectContext : public GrRecordingContext {
 public:
diff --git a/third_party/skia/include/gpu/GrRecordingContext.h b/third_party/skia/include/gpu/GrRecordingContext.h
index 6f893216444be..c287f731b8532 100644
--- a/third_party/skia/include/gpu/GrRecordingContext.h
+++ b/third_party/skia/include/gpu/GrRecordingContext.h
@@ -28,7 +28,7 @@ class GrProxyProvider;
 class GrRecordingContextPriv;
 class GrSubRunAllocator;
 class GrSurfaceProxy;
-class GrTextBlobCache;
+class GrTextBlobRedrawCoordinator;
 class GrThreadSafeCache;
 class SkArenaAlloc;
 class SkJSONWriter;
@@ -182,8 +182,8 @@ class GrRecordingContext : public GrImageContext {
     // same lifetime at the DDL itself.
     virtual void detachProgramData(SkTArray<ProgramData>*) {}
 
-    GrTextBlobCache* getTextBlobCache();
-    const GrTextBlobCache* getTextBlobCache() const;
+    GrTextBlobRedrawCoordinator* getTextBlobRedrawCoordinator();
+    const GrTextBlobRedrawCoordinator* getTextBlobRedrawCoordinator() const;
 
     GrThreadSafeCache* threadSafeCache();
     const GrThreadSafeCache* threadSafeCache() const;
diff --git a/third_party/skia/include/gpu/ShaderErrorHandler.h b/third_party/skia/include/gpu/ShaderErrorHandler.h
new file mode 100644
index 0000000000000..8960da5c5a212
--- /dev/null
+++ b/third_party/skia/include/gpu/ShaderErrorHandler.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_ShaderErrorHandler_DEFINED
+#define skgpu_ShaderErrorHandler_DEFINED
+
+#include "include/core/SkTypes.h"
+
+namespace skgpu {
+/**
+ * Abstract class to report errors when compiling shaders.
+ */
+class SK_API ShaderErrorHandler {
+public:
+    virtual ~ShaderErrorHandler() = default;
+
+    virtual void compileError(const char* shader, const char* errors) = 0;
+
+protected:
+    ShaderErrorHandler() = default;
+    ShaderErrorHandler(const ShaderErrorHandler&) = delete;
+    ShaderErrorHandler& operator=(const ShaderErrorHandler&) = delete;
+};
+
+/**
+ * Used when no error handler is set. Will report failures via SkDebugf and asserts.
+ */
+ShaderErrorHandler* DefaultShaderErrorHandler();
+
+}  // namespace skgpu
+
+#endif // skgpu_ShaderErrorHandler_DEFINED
diff --git a/third_party/skia/include/gpu/gl/GrGLTypes.h b/third_party/skia/include/gpu/gl/GrGLTypes.h
index 49f5ee7bf6b6d..d5167787c1e05 100644
--- a/third_party/skia/include/gpu/gl/GrGLTypes.h
+++ b/third_party/skia/include/gpu/gl/GrGLTypes.h
@@ -68,6 +68,7 @@ enum class GrGLFormat {
     kRGBA16F,
     kR16F,
     kRGB8,
+    kRGBX8,
     kRG8,
     kRGB10_A2,
     kRGBA4,
diff --git a/third_party/skia/include/ports/SkTypeface_win.h b/third_party/skia/include/ports/SkTypeface_win.h
index f659adf0e9f76..8437e7a5143ac 100644
--- a/third_party/skia/include/ports/SkTypeface_win.h
+++ b/third_party/skia/include/ports/SkTypeface_win.h
@@ -53,8 +53,8 @@ struct IDWriteFontCollection;
 struct IDWriteFontFallback;
 
 SK_API sk_sp<SkFontMgr> SkFontMgr_New_GDI();
-SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWrite(IDWriteFactory* factory = NULL,
-                                                  IDWriteFontCollection* collection = NULL);
+SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWrite(IDWriteFactory* factory = nullptr,
+                                                  IDWriteFontCollection* collection = nullptr);
 SK_API sk_sp<SkFontMgr> SkFontMgr_New_DirectWrite(IDWriteFactory* factory,
                                                   IDWriteFontCollection* collection,
                                                   IDWriteFontFallback* fallback);
diff --git a/third_party/skia/include/private/BUILD.bazel b/third_party/skia/include/private/BUILD.bazel
index d4d922889336f..134b7322c8380 100644
--- a/third_party/skia/include/private/BUILD.bazel
+++ b/third_party/skia/include/private/BUILD.bazel
@@ -45,7 +45,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrContext_Base_hdr",
-        ":GrSingleOwner_hdr",
+        ":SingleOwner_hdr",
     ],
 )
 
@@ -66,31 +66,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "GrResourceKey_hdr",
-    hdrs = ["GrResourceKey.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkOnce_hdr",
-        ":SkTemplates_hdr",
-        ":SkTo_hdr",
-        "//include/core:SkData_hdr",
-        "//include/core:SkString_hdr",
-        "//include/gpu:GrTypes_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "GrSingleOwner_hdr",
-    hdrs = ["GrSingleOwner.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkMutex_hdr",
-        ":SkThreadID_hdr",
-        "//include/core:SkTypes_hdr",
-    ],
-)
-
 generated_cc_atom(
     name = "GrTypesPriv_hdr",
     hdrs = ["GrTypesPriv.h"],
@@ -394,7 +369,6 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLDefines_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/core:SkString_hdr",
     ],
 )
@@ -503,7 +477,6 @@ generated_cc_atom(
     name = "SkTOptional_hdr",
     hdrs = ["SkTOptional.h"],
     visibility = ["//:__subpackages__"],
-    deps = ["//include/core:SkTypes_hdr"],
 )
 
 generated_cc_atom(
@@ -558,3 +531,27 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = ["//include/core:SkRefCnt_hdr"],
 )
+
+generated_cc_atom(
+    name = "SkUniquePaintParamsID_hdr",
+    hdrs = ["SkUniquePaintParamsID.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "SingleOwner_hdr",
+    hdrs = ["SingleOwner.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkMutex_hdr",
+        ":SkThreadID_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkStringView_hdr",
+    hdrs = ["SkStringView.h"],
+    visibility = ["//:__subpackages__"],
+)
diff --git a/third_party/skia/include/private/GrImageContext.h b/third_party/skia/include/private/GrImageContext.h
index 8a9f558f3d167..7d14181c96f59 100644
--- a/third_party/skia/include/private/GrImageContext.h
+++ b/third_party/skia/include/private/GrImageContext.h
@@ -9,7 +9,7 @@
 #define GrImageContext_DEFINED
 
 #include "include/private/GrContext_Base.h"
-#include "include/private/GrSingleOwner.h"
+#include "include/private/SingleOwner.h"
 
 class GrImageContextPriv;
 
@@ -33,7 +33,7 @@ class GrImageContext : public GrContext_Base {
     SK_API virtual bool abandoned();
 
     /** This is only useful for debug purposes */
-    GrSingleOwner* singleOwner() const { return &fSingleOwner; }
+    skgpu::SingleOwner* singleOwner() const { return &fSingleOwner; }
 
     GrImageContext* asImageContext() override { return this; }
 
@@ -47,7 +47,7 @@ class GrImageContext : public GrContext_Base {
     // This guard is passed to the GrDrawingManager and, from there to all the
     // GrSurfaceDrawContexts.  It is also passed to the GrResourceProvider and SkGpuDevice.
     // TODO: Move this down to GrRecordingContext.
-    mutable GrSingleOwner            fSingleOwner;
+    mutable skgpu::SingleOwner fSingleOwner;
 
     using INHERITED = GrContext_Base;
 };
diff --git a/third_party/skia/include/private/GrTypesPriv.h b/third_party/skia/include/private/GrTypesPriv.h
index cba4b4c79d5bd..671efe4440eb1 100644
--- a/third_party/skia/include/private/GrTypesPriv.h
+++ b/third_party/skia/include/private/GrTypesPriv.h
@@ -288,56 +288,6 @@ static inline GrQuadAAFlags SkToGrQuadAAFlags(unsigned flags) {
     return static_cast<GrQuadAAFlags>(flags);
 }
 
-/**
- * Types of shader-language-specific boxed variables we can create.
- */
-enum GrSLType {
-    kVoid_GrSLType,
-    kBool_GrSLType,
-    kBool2_GrSLType,
-    kBool3_GrSLType,
-    kBool4_GrSLType,
-    kShort_GrSLType,
-    kShort2_GrSLType,
-    kShort3_GrSLType,
-    kShort4_GrSLType,
-    kUShort_GrSLType,
-    kUShort2_GrSLType,
-    kUShort3_GrSLType,
-    kUShort4_GrSLType,
-    kFloat_GrSLType,
-    kFloat2_GrSLType,
-    kFloat3_GrSLType,
-    kFloat4_GrSLType,
-    kFloat2x2_GrSLType,
-    kFloat3x3_GrSLType,
-    kFloat4x4_GrSLType,
-    kHalf_GrSLType,
-    kHalf2_GrSLType,
-    kHalf3_GrSLType,
-    kHalf4_GrSLType,
-    kHalf2x2_GrSLType,
-    kHalf3x3_GrSLType,
-    kHalf4x4_GrSLType,
-    kInt_GrSLType,
-    kInt2_GrSLType,
-    kInt3_GrSLType,
-    kInt4_GrSLType,
-    kUInt_GrSLType,
-    kUInt2_GrSLType,
-    kUInt3_GrSLType,
-    kUInt4_GrSLType,
-    kTexture2DSampler_GrSLType,
-    kTextureExternalSampler_GrSLType,
-    kTexture2DRectSampler_GrSLType,
-    kTexture2D_GrSLType,
-    kSampler_GrSLType,
-    kInput_GrSLType,
-
-    kLast_GrSLType = kInput_GrSLType
-};
-static const int kGrSLTypeCount = kLast_GrSLType + 1;
-
 /**
  * The type of texture. Backends other than GL currently only use the 2D value but the type must
  * still be known at the API-neutral layer as it used to determine whether MIP maps, renderability,
@@ -368,186 +318,6 @@ enum GrShaderFlags {
 };
 SK_MAKE_BITFIELD_OPS(GrShaderFlags)
 
-/** Is the shading language type float (including vectors/matrices)? */
-static constexpr bool GrSLTypeIsFloatType(GrSLType type) {
-    switch (type) {
-        case kFloat_GrSLType:
-        case kFloat2_GrSLType:
-        case kFloat3_GrSLType:
-        case kFloat4_GrSLType:
-        case kFloat2x2_GrSLType:
-        case kFloat3x3_GrSLType:
-        case kFloat4x4_GrSLType:
-        case kHalf_GrSLType:
-        case kHalf2_GrSLType:
-        case kHalf3_GrSLType:
-        case kHalf4_GrSLType:
-        case kHalf2x2_GrSLType:
-        case kHalf3x3_GrSLType:
-        case kHalf4x4_GrSLType:
-            return true;
-
-        case kVoid_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
-        case kInt_GrSLType:
-        case kInt2_GrSLType:
-        case kInt3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt_GrSLType:
-        case kUInt2_GrSLType:
-        case kUInt3_GrSLType:
-        case kUInt4_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
-            return false;
-    }
-    SkUNREACHABLE;
-}
-
-/** Is the shading language type integral (including vectors)? */
-static constexpr bool GrSLTypeIsIntegralType(GrSLType type) {
-    switch (type) {
-        case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
-        case kInt_GrSLType:
-        case kInt2_GrSLType:
-        case kInt3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt_GrSLType:
-        case kUInt2_GrSLType:
-        case kUInt3_GrSLType:
-        case kUInt4_GrSLType:
-            return true;
-
-        case kFloat_GrSLType:
-        case kFloat2_GrSLType:
-        case kFloat3_GrSLType:
-        case kFloat4_GrSLType:
-        case kFloat2x2_GrSLType:
-        case kFloat3x3_GrSLType:
-        case kFloat4x4_GrSLType:
-        case kHalf_GrSLType:
-        case kHalf2_GrSLType:
-        case kHalf3_GrSLType:
-        case kHalf4_GrSLType:
-        case kHalf2x2_GrSLType:
-        case kHalf3x3_GrSLType:
-        case kHalf4x4_GrSLType:
-        case kVoid_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
-            return false;
-    }
-    SkUNREACHABLE;
-}
-
-/**
- * Is the shading language type supported as a uniform (ie, does it have a corresponding set
- * function on GrGLSLProgramDataManager)?
- */
-static constexpr bool GrSLTypeCanBeUniformValue(GrSLType type) {
-    return GrSLTypeIsFloatType(type) || GrSLTypeIsIntegralType(type);
-}
-
-/** If the type represents a single value or vector return the vector length, else -1. */
-static constexpr int GrSLTypeVecLength(GrSLType type) {
-    switch (type) {
-        case kFloat_GrSLType:
-        case kHalf_GrSLType:
-        case kBool_GrSLType:
-        case kShort_GrSLType:
-        case kUShort_GrSLType:
-        case kInt_GrSLType:
-        case kUInt_GrSLType:
-            return 1;
-
-        case kFloat2_GrSLType:
-        case kHalf2_GrSLType:
-        case kBool2_GrSLType:
-        case kShort2_GrSLType:
-        case kUShort2_GrSLType:
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
-            return 2;
-
-        case kFloat3_GrSLType:
-        case kHalf3_GrSLType:
-        case kBool3_GrSLType:
-        case kShort3_GrSLType:
-        case kUShort3_GrSLType:
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-            return 3;
-
-        case kFloat4_GrSLType:
-        case kHalf4_GrSLType:
-        case kBool4_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort4_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
-            return 4;
-
-        case kFloat2x2_GrSLType:
-        case kFloat3x3_GrSLType:
-        case kFloat4x4_GrSLType:
-        case kHalf2x2_GrSLType:
-        case kHalf3x3_GrSLType:
-        case kHalf4x4_GrSLType:
-        case kVoid_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
-            return -1;
-    }
-    SkUNREACHABLE;
-}
-
-static inline GrSLType GrSLCombinedSamplerTypeForTextureType(GrTextureType type) {
-    switch (type) {
-        case GrTextureType::k2D:
-            return kTexture2DSampler_GrSLType;
-        case GrTextureType::kRectangle:
-            return kTexture2DRectSampler_GrSLType;
-        case GrTextureType::kExternal:
-            return kTextureExternalSampler_GrSLType;
-        default:
-            SK_ABORT("Unexpected texture type");
-    }
-}
-
 /** Rectangle and external textures only support the clamp wrap mode and do not support
  *  MIP maps.
  */
@@ -564,56 +334,6 @@ static inline bool GrTextureTypeHasRestrictedSampling(GrTextureType type) {
     }
 }
 
-static constexpr bool GrSLTypeIsCombinedSamplerType(GrSLType type) {
-    switch (type) {
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-            return true;
-
-        case kVoid_GrSLType:
-        case kFloat_GrSLType:
-        case kFloat2_GrSLType:
-        case kFloat3_GrSLType:
-        case kFloat4_GrSLType:
-        case kFloat2x2_GrSLType:
-        case kFloat3x3_GrSLType:
-        case kFloat4x4_GrSLType:
-        case kHalf_GrSLType:
-        case kHalf2_GrSLType:
-        case kHalf3_GrSLType:
-        case kHalf4_GrSLType:
-        case kHalf2x2_GrSLType:
-        case kHalf3x3_GrSLType:
-        case kHalf4x4_GrSLType:
-        case kInt_GrSLType:
-        case kInt2_GrSLType:
-        case kInt3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt_GrSLType:
-        case kUInt2_GrSLType:
-        case kUInt3_GrSLType:
-        case kUInt4_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kShort_GrSLType:
-        case kShort2_GrSLType:
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort_GrSLType:
-        case kUShort2_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
-            return false;
-    }
-    SkUNREACHABLE;
-}
-
 //////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -883,6 +603,7 @@ enum class GrColorType {
     kAlpha_8xxx,
     kAlpha_F32xxx,
     kGray_8xxx,
+    kR_8xxx,
 
     // Types used to initialize backend textures.
     kRGB_888,
@@ -920,12 +641,13 @@ static constexpr SkColorType GrColorTypeToSkColorType(GrColorType ct) {
         case GrColorType::kAlpha_8xxx:       return kUnknown_SkColorType;
         case GrColorType::kAlpha_F32xxx:     return kUnknown_SkColorType;
         case GrColorType::kGray_8xxx:        return kUnknown_SkColorType;
+        case GrColorType::kR_8xxx:           return kUnknown_SkColorType;
         case GrColorType::kAlpha_16:         return kA16_unorm_SkColorType;
         case GrColorType::kRG_1616:          return kR16G16_unorm_SkColorType;
         case GrColorType::kRGBA_16161616:    return kR16G16B16A16_unorm_SkColorType;
         case GrColorType::kRG_F16:           return kR16G16_float_SkColorType;
         case GrColorType::kRGB_888:          return kUnknown_SkColorType;
-        case GrColorType::kR_8:              return kUnknown_SkColorType;
+        case GrColorType::kR_8:              return kR8_unorm_SkColorType;
         case GrColorType::kR_16:             return kUnknown_SkColorType;
         case GrColorType::kR_F16:            return kUnknown_SkColorType;
         case GrColorType::kGray_F16:         return kUnknown_SkColorType;
@@ -959,6 +681,7 @@ static constexpr GrColorType SkColorTypeToGrColorType(SkColorType ct) {
         case kA16_float_SkColorType:          return GrColorType::kAlpha_F16;
         case kR16G16_float_SkColorType:       return GrColorType::kRG_F16;
         case kR16G16B16A16_unorm_SkColorType: return GrColorType::kRGBA_16161616;
+        case kR8_unorm_SkColorType:           return GrColorType::kR_8;
     }
     SkUNREACHABLE;
 }
@@ -985,6 +708,7 @@ static constexpr uint32_t GrColorTypeChannelFlags(GrColorType ct) {
         case GrColorType::kAlpha_8xxx:       return kAlpha_SkColorChannelFlag;
         case GrColorType::kAlpha_F32xxx:     return kAlpha_SkColorChannelFlag;
         case GrColorType::kGray_8xxx:        return kGray_SkColorChannelFlag;
+        case GrColorType::kR_8xxx:           return kRed_SkColorChannelFlag;
         case GrColorType::kAlpha_16:         return kAlpha_SkColorChannelFlag;
         case GrColorType::kRG_1616:          return kRG_SkColorChannelFlags;
         case GrColorType::kRGBA_16161616:    return kRGBA_SkColorChannelFlags;
@@ -1135,6 +859,8 @@ static constexpr GrColorFormatDesc GrGetColorTypeDesc(GrColorType ct) {
             return GrColorFormatDesc::MakeAlpha(32, GrColorTypeEncoding::kFloat);
         case GrColorType::kGray_8xxx:
             return GrColorFormatDesc::MakeGray(8, GrColorTypeEncoding::kUnorm);
+        case GrColorType::kR_8xxx:
+            return GrColorFormatDesc::MakeR(8, GrColorTypeEncoding::kUnorm);
         case GrColorType::kAlpha_16:
             return GrColorFormatDesc::MakeAlpha(16, GrColorTypeEncoding::kUnorm);
         case GrColorType::kRG_1616:
@@ -1211,6 +937,7 @@ static constexpr size_t GrColorTypeBytesPerPixel(GrColorType ct) {
         case GrColorType::kAlpha_8xxx:       return 4;
         case GrColorType::kAlpha_F32xxx:     return 16;
         case GrColorType::kGray_8xxx:        return 4;
+        case GrColorType::kR_8xxx:           return 4;
         case GrColorType::kAlpha_16:         return 2;
         case GrColorType::kRG_1616:          return 4;
         case GrColorType::kRGBA_16161616:    return 8;
@@ -1325,6 +1052,7 @@ static constexpr const char* GrColorTypeToStr(GrColorType ct) {
         case GrColorType::kAlpha_8xxx:       return "kAlpha_8xxx";
         case GrColorType::kAlpha_F32xxx:     return "kAlpha_F32xxx";
         case GrColorType::kGray_8xxx:        return "kGray_8xxx";
+        case GrColorType::kR_8xxx:           return "kR_8xxx";
         case GrColorType::kAlpha_16:         return "kAlpha_16";
         case GrColorType::kRG_1616:          return "kRG_1616";
         case GrColorType::kRGBA_16161616:    return "kRGBA_16161616";
@@ -1349,6 +1077,14 @@ static constexpr const char* GrCompressionTypeToStr(SkImage::CompressionType com
     }
     SkUNREACHABLE;
 }
+
+static constexpr const char* GrSurfaceOriginToStr(GrSurfaceOrigin origin) {
+    switch (origin) {
+        case kTopLeft_GrSurfaceOrigin:    return "kTopLeft";
+        case kBottomLeft_GrSurfaceOrigin: return "kBottomLeft";
+    }
+    SkUNREACHABLE;
+}
 #endif
 
 #endif
diff --git a/third_party/skia/include/private/GrSingleOwner.h b/third_party/skia/include/private/SingleOwner.h
similarity index 70%
rename from third_party/skia/include/private/GrSingleOwner.h
rename to third_party/skia/include/private/SingleOwner.h
index f612bb5fca5e6..f60f7c83b969c 100644
--- a/third_party/skia/include/private/GrSingleOwner.h
+++ b/third_party/skia/include/private/SingleOwner.h
@@ -5,25 +5,30 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrSingleOwner_DEFINED
-#define GrSingleOwner_DEFINED
+#ifndef skgpu_SingleOwner_DEFINED
+#define skgpu_SingleOwner_DEFINED
 
 #include "include/core/SkTypes.h"
 
 #ifdef SK_DEBUG
 #include "include/private/SkMutex.h"
 #include "include/private/SkThreadID.h"
+#endif
+
+namespace skgpu {
 
-#define GR_ASSERT_SINGLE_OWNER(obj) \
-    GrSingleOwner::AutoEnforce debug_SingleOwner(obj, __FILE__, __LINE__);
+#ifdef SK_DEBUG
+
+#define SKGPU_ASSERT_SINGLE_OWNER(obj) \
+    skgpu::SingleOwner::AutoEnforce debug_SingleOwner(obj, __FILE__, __LINE__);
 
 // This is a debug tool to verify an object is only being used from one thread at a time.
-class GrSingleOwner {
+class SingleOwner {
 public:
-     GrSingleOwner() : fOwner(kIllegalThreadID), fReentranceCount(0) {}
+     SingleOwner() : fOwner(kIllegalThreadID), fReentranceCount(0) {}
 
      struct AutoEnforce {
-         AutoEnforce(GrSingleOwner* so, const char* file, int line)
+         AutoEnforce(SingleOwner* so, const char* file, int line)
                 : fFile(file), fLine(line), fSO(so) {
              fSO->enter(file, line);
          }
@@ -31,7 +36,7 @@ class GrSingleOwner {
 
          const char* fFile;
          int fLine;
-         GrSingleOwner* fSO;
+         SingleOwner* fSO;
      };
 
 private:
@@ -58,8 +63,10 @@ class GrSingleOwner {
      int fReentranceCount SK_GUARDED_BY(fMutex);
 };
 #else
-#define GR_ASSERT_SINGLE_OWNER(obj)
-class GrSingleOwner {}; // Provide a no-op implementation so we can pass pointers to constructors
+#define SKGPU_ASSERT_SINGLE_OWNER(obj)
+class SingleOwner {}; // Provide a no-op implementation so we can pass pointers to constructors
 #endif
 
+} // namespace skgpu
+
 #endif
diff --git a/third_party/skia/include/private/SkFloatingPoint.h b/third_party/skia/include/private/SkFloatingPoint.h
index 241d9f20f97ff..fbabd0ebc5728 100644
--- a/third_party/skia/include/private/SkFloatingPoint.h
+++ b/third_party/skia/include/private/SkFloatingPoint.h
@@ -26,11 +26,6 @@
 #endif
 #endif
 
-// For _POSIX_VERSION
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
-#include <unistd.h>
-#endif
-
 constexpr float SK_FloatSqrt2 = 1.41421356f;
 constexpr float SK_FloatPI    = 3.14159265f;
 constexpr double SK_DoublePI  = 3.14159265358979323846264338327950288;
diff --git a/third_party/skia/include/private/SkImageInfoPriv.h b/third_party/skia/include/private/SkImageInfoPriv.h
index 5e4abb82c1d71..70b9d715f06b6 100644
--- a/third_party/skia/include/private/SkImageInfoPriv.h
+++ b/third_party/skia/include/private/SkImageInfoPriv.h
@@ -35,6 +35,7 @@ static inline uint32_t SkColorTypeChannelFlags(SkColorType ct) {
         case kR16G16_float_SkColorType:       return kRG_SkColorChannelFlags;
         case kR16G16B16A16_unorm_SkColorType: return kRGBA_SkColorChannelFlags;
         case kSRGBA_8888_SkColorType:         return kRGBA_SkColorChannelFlags;
+        case kR8_unorm_SkColorType:           return kRed_SkColorChannelFlag;
     }
     SkUNREACHABLE;
 }
@@ -71,6 +72,7 @@ static int SkColorTypeShiftPerPixel(SkColorType ct) {
         case kR16G16_float_SkColorType:       return 2;
         case kR16G16B16A16_unorm_SkColorType: return 3;
         case kSRGBA_8888_SkColorType:         return 2;
+        case kR8_unorm_SkColorType:           return 0;
     }
     SkUNREACHABLE;
 }
@@ -110,11 +112,14 @@ static inline bool SkColorTypeIsNormalized(SkColorType ct) {
         case kA16_float_SkColorType:          /*subtle... alpha is always [0,1]*/
         case kR16G16_unorm_SkColorType:
         case kR16G16B16A16_unorm_SkColorType:
-        case kSRGBA_8888_SkColorType: return true;
+        case kSRGBA_8888_SkColorType:
+        case kR8_unorm_SkColorType:
+            return true;
 
         case kRGBA_F16_SkColorType:
         case kRGBA_F32_SkColorType:
-        case kR16G16_float_SkColorType:       return false;
+        case kR16G16_float_SkColorType:
+            return false;
     }
     SkUNREACHABLE;
 }
@@ -137,6 +142,7 @@ static inline int SkColorTypeMaxBitsPerChannel(SkColorType ct) {
         case kGray_8_SkColorType:
         case kR8G8_unorm_SkColorType:
         case kSRGBA_8888_SkColorType:
+        case kR8_unorm_SkColorType:
             return 8;
 
         case kRGBA_1010102_SkColorType:
diff --git a/third_party/skia/include/private/SkMutex.h b/third_party/skia/include/private/SkMutex.h
index 096f3ebc91df0..b7cdceb1e1d8d 100644
--- a/third_party/skia/include/private/SkMutex.h
+++ b/third_party/skia/include/private/SkMutex.h
@@ -18,6 +18,10 @@ class SK_CAPABILITY("mutex") SkMutex {
 public:
     constexpr SkMutex() = default;
 
+    ~SkMutex() {
+        this->assertNotHeld();
+    }
+
     void acquire() SK_ACQUIRE() {
         fSemaphore.wait();
         SkDEBUGCODE(fOwner = SkGetThreadID();)
@@ -33,6 +37,10 @@ class SK_CAPABILITY("mutex") SkMutex {
         SkASSERT(fOwner == SkGetThreadID());
     }
 
+    void assertNotHeld() {
+        SkASSERT(fOwner == kIllegalThreadID);
+    }
+
 private:
     SkSemaphore fSemaphore{1};
     SkDEBUGCODE(SkThreadID fOwner{kIllegalThreadID};)
diff --git a/third_party/skia/include/private/SkSLDefines.h b/third_party/skia/include/private/SkSLDefines.h
index 50024b3577e77..6e50a5b262594 100644
--- a/third_party/skia/include/private/SkSLDefines.h
+++ b/third_party/skia/include/private/SkSLDefines.h
@@ -22,7 +22,15 @@ class Expression;
 class Statement;
 
 using ComponentArray = SkSTArray<4, int8_t>; // for Swizzles
-using ExpressionArray = SkSTArray<2, std::unique_ptr<Expression>>;
+
+class ExpressionArray : public SkSTArray<2, std::unique_ptr<Expression>> {
+public:
+    using SkSTArray::SkSTArray;
+
+    /** Returns a new ExpressionArray containing a clone of every element. */
+    ExpressionArray clone() const;
+};
+
 using StatementArray = SkSTArray<2, std::unique_ptr<Statement>>;
 
 // Functions larger than this (measured in IR nodes) will not be inlined. This growth factor
diff --git a/third_party/skia/include/private/SkSLIRNode.h b/third_party/skia/include/private/SkSLIRNode.h
index 2e545c34998fd..56daafe622b57 100644
--- a/third_party/skia/include/private/SkSLIRNode.h
+++ b/third_party/skia/include/private/SkSLIRNode.h
@@ -41,7 +41,7 @@ class IRNode : public Poolable {
 public:
     virtual ~IRNode() {}
 
-    virtual String description() const = 0;
+    virtual std::string description() const = 0;
 
     // No copy construction or assignment
     IRNode(const IRNode&) = delete;
diff --git a/third_party/skia/include/private/SkSLLayout.h b/third_party/skia/include/private/SkSLLayout.h
index d3654dd43889a..1b00f0e7c67ed 100644
--- a/third_party/skia/include/private/SkSLLayout.h
+++ b/third_party/skia/include/private/SkSLLayout.h
@@ -61,9 +61,9 @@ struct Layout {
         return result;
     }
 
-    String description() const {
-        String result;
-        auto separator = [firstSeparator = true]() mutable -> String {
+    std::string description() const {
+        std::string result;
+        auto separator = [firstSeparator = true]() mutable -> std::string {
             if (firstSeparator) {
                 firstSeparator = false;
                 return "";
@@ -71,25 +71,26 @@ struct Layout {
                 return ", ";
             }};
         if (fLocation >= 0) {
-            result += separator() + "location = " + to_string(fLocation);
+            result += separator() + "location = " + std::to_string(fLocation);
         }
         if (fOffset >= 0) {
-            result += separator() + "offset = " + to_string(fOffset);
+            result += separator() + "offset = " + std::to_string(fOffset);
         }
         if (fBinding >= 0) {
-            result += separator() + "binding = " + to_string(fBinding);
+            result += separator() + "binding = " + std::to_string(fBinding);
         }
         if (fIndex >= 0) {
-            result += separator() + "index = " + to_string(fIndex);
+            result += separator() + "index = " + std::to_string(fIndex);
         }
         if (fSet >= 0) {
-            result += separator() + "set = " + to_string(fSet);
+            result += separator() + "set = " + std::to_string(fSet);
         }
         if (fBuiltin >= 0) {
-            result += separator() + "builtin = " + to_string(fBuiltin);
+            result += separator() + "builtin = " + std::to_string(fBuiltin);
         }
         if (fInputAttachmentIndex >= 0) {
-            result += separator() + "input_attachment_index = " + to_string(fInputAttachmentIndex);
+            result += separator() + "input_attachment_index = " +
+                      std::to_string(fInputAttachmentIndex);
         }
         if (fFlags & kOriginUpperLeft_Flag) {
             result += separator() + "origin_upper_left";
diff --git a/third_party/skia/include/private/SkSLModifiers.h b/third_party/skia/include/private/SkSLModifiers.h
index a881e57e0b54f..0104827f0a322 100644
--- a/third_party/skia/include/private/SkSLModifiers.h
+++ b/third_party/skia/include/private/SkSLModifiers.h
@@ -58,8 +58,8 @@ struct Modifiers {
     : fLayout(layout)
     , fFlags(flags) {}
 
-    String description() const {
-        String result = fLayout.description();
+    std::string description() const {
+        std::string result = fLayout.description();
 
         // SkSL extensions
         if (fFlags & kES3_Flag) {
diff --git a/third_party/skia/include/private/SkSLProgramKind.h b/third_party/skia/include/private/SkSLProgramKind.h
index a3f4e52d37c1e..96826a70bf4c7 100644
--- a/third_party/skia/include/private/SkSLProgramKind.h
+++ b/third_party/skia/include/private/SkSLProgramKind.h
@@ -21,6 +21,8 @@ enum class ProgramKind : int8_t {
     kRuntimeColorFilter,  // Runtime effect only suitable as SkColorFilter
     kRuntimeShader,       //   "       "     "      "     "  SkShader
     kRuntimeBlender,      //   "       "     "      "     "  SkBlender
+    kCustomMeshVertex,    // Vertex   portion of a custom mesh
+    kCustomMeshFragment,  // Fragment  "      "  "  "     "
     kGeneric,
 };
 
diff --git a/third_party/skia/include/private/SkSLString.h b/third_party/skia/include/private/SkSLString.h
index 7d828760da25e..6cf681680947d 100644
--- a/third_party/skia/include/private/SkSLString.h
+++ b/third_party/skia/include/private/SkSLString.h
@@ -8,11 +8,11 @@
 #ifndef SKSL_STRING
 #define SKSL_STRING
 
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLDefines.h"
 #include <cstring>
 #include <stdarg.h>
 #include <string>
+#include <string_view>
 
 #ifndef SKSL_STANDALONE
 #include "include/core/SkString.h"
@@ -20,61 +20,25 @@
 
 namespace SkSL {
 
-class String;
+bool stod(std::string_view s, SKSL_FLOAT* value);
+bool stoi(std::string_view s, SKSL_INT* value);
 
-class SK_API String : public std::string {
-public:
-    using std::string::string;
+namespace String {
 
-    explicit String(std::string s) : INHERITED(std::move(s)) {}
-    explicit String(skstd::string_view s) : INHERITED(s.data(), s.length()) {}
-    // TODO(johnstiles): add operator skstd::string_view
+std::string printf(const char* fmt, ...) SK_PRINTF_LIKE(1, 2);
+void appendf(std::string* str, const char* fmt, ...) SK_PRINTF_LIKE(2, 3);
+void vappendf(std::string* str, const char* fmt, va_list va) SK_PRINTF_LIKE(2, 0);
 
-    static String printf(const char* fmt, ...) SK_PRINTF_LIKE(1, 2);
-    void appendf(const char* fmt, ...) SK_PRINTF_LIKE(2, 3);
-    void vappendf(const char* fmt, va_list va);
+}  // namespace String
+}  // namespace SkSL
 
-    bool starts_with(const char prefix[]) const {
-        return skstd::string_view(data(), size()).starts_with(prefix);
-    }
-    bool ends_with(const char suffix[]) const {
-        return skstd::string_view(data(), size()).ends_with(suffix);
-    }
+namespace skstd {
 
-    bool consumeSuffix(const char suffix[]);
+// We use a custom to_string(float|double) which ignores locale settings and writes `1.0` instead
+// of `1.00000`.
+std::string to_string(float value);
+std::string to_string(double value);
 
-    String operator+(const char* s) const;
-    String operator+(const String& s) const;
-    String operator+(skstd::string_view s) const;
-    String& operator+=(char c);
-    String& operator+=(const char* s);
-    String& operator+=(const String& s);
-    String& operator+=(skstd::string_view s);
-    friend String operator+(const char* s1, const String& s2);
-
-private:
-    using INHERITED = std::string;
-};
-
-String operator+(skstd::string_view left, skstd::string_view right);
-
-String to_string(double value);
-String to_string(int32_t value);
-String to_string(uint32_t value);
-String to_string(int64_t value);
-String to_string(uint64_t value);
-
-bool stod(skstd::string_view s, SKSL_FLOAT* value);
-bool stoi(skstd::string_view s, SKSL_INT* value);
-
-} // namespace SkSL
-
-namespace std {
-    template<> struct hash<SkSL::String> {
-        size_t operator()(const SkSL::String& s) const {
-            return hash<std::string>{}(s);
-        }
-    };
-} // namespace std
+}  // namespace skstd
 
 #endif
diff --git a/third_party/skia/include/private/SkSLSymbol.h b/third_party/skia/include/private/SkSLSymbol.h
index 925d671974ddf..88aff6f8701d0 100644
--- a/third_party/skia/include/private/SkSLSymbol.h
+++ b/third_party/skia/include/private/SkSLSymbol.h
@@ -22,7 +22,6 @@ class Symbol : public IRNode {
         kExternal = (int) ProgramElement::Kind::kLast + 1,
         kField,
         kFunctionDeclaration,
-        kSymbolAlias,
         kType,
         kUnresolvedFunction,
         kVariable,
@@ -31,7 +30,7 @@ class Symbol : public IRNode {
         kLast = kVariable
     };
 
-    Symbol(int offset, Kind kind, skstd::string_view name, const Type* type = nullptr)
+    Symbol(int offset, Kind kind, std::string_view name, const Type* type = nullptr)
         : INHERITED(offset, (int) kind)
         , fName(name)
         , fType(type) {
@@ -49,7 +48,7 @@ class Symbol : public IRNode {
         return (Kind) fKind;
     }
 
-    skstd::string_view name() const {
+    std::string_view name() const {
         return fName;
     }
 
@@ -78,7 +77,7 @@ class Symbol : public IRNode {
     }
 
 private:
-    skstd::string_view fName;
+    std::string_view fName;
     const Type* fType;
 
     using INHERITED = IRNode;
diff --git a/third_party/skia/include/private/SkStringView.h b/third_party/skia/include/private/SkStringView.h
new file mode 100644
index 0000000000000..7d5ce0c559c97
--- /dev/null
+++ b/third_party/skia/include/private/SkStringView.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 Google LLC.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkStringView_DEFINED
+#define SkStringView_DEFINED
+
+#include <string.h>
+#include <string_view>
+
+namespace skstd {
+
+// C++20 additions
+inline constexpr bool starts_with(std::string_view str, std::string_view prefix) {
+    if (prefix.length() > str.length()) {
+        return false;
+    }
+    return prefix.length() == 0 || !memcmp(str.data(), prefix.data(), prefix.length());
+}
+
+inline constexpr bool starts_with(std::string_view str, std::string_view::value_type c) {
+    return !str.empty() && str.front() == c;
+}
+
+inline constexpr bool ends_with(std::string_view str, std::string_view suffix) {
+    if (suffix.length() > str.length()) {
+        return false;
+    }
+    return suffix.length() == 0 || !memcmp(str.data() + str.length() - suffix.length(),
+                                           suffix.data(), suffix.length());
+}
+
+inline constexpr bool ends_with(std::string_view str, std::string_view::value_type c) {
+    return !str.empty() && str.back() == c;
+}
+
+// C++23 additions
+inline constexpr bool contains(std::string_view str, std::string_view needle) {
+    return str.find(needle) != std::string_view::npos;
+}
+
+}  // namespace skstd
+
+#endif
diff --git a/third_party/skia/include/private/SkTLogic.h b/third_party/skia/include/private/SkTLogic.h
index a2c2f4cfdb357..dce0dc804becd 100644
--- a/third_party/skia/include/private/SkTLogic.h
+++ b/third_party/skia/include/private/SkTLogic.h
@@ -12,40 +12,10 @@
 #ifndef SkTLogic_DEFINED
 #define SkTLogic_DEFINED
 
-#include <cstddef>
+#include <iterator>
 #include <type_traits>
-#include <utility>
 #include "include/private/SkTo.h"
 
-namespace skstd {
-
-// C++17, <variant>
-struct monostate {};
-
-// C++17, <type_traits>
-template<typename...> struct conjunction : std::true_type { };
-template<typename T> struct conjunction<T> : T { };
-template<typename T, typename... Ts>
-struct conjunction<T, Ts...> : std::conditional<bool(T::value), conjunction<Ts...>, T>::type { };
-
-// C++17, std::data, std::size
-template<typename Container>
-constexpr auto data(Container& c) -> decltype(c.data()) { return c.data(); }
-template<typename Container>
-constexpr auto data(const Container& c) -> decltype(c.data()) { return c.data(); }
-template<typename Array, size_t N>
-constexpr auto data(Array(&a)[N]) -> decltype(a) { return a; }
-template<typename T>
-constexpr const T* data(std::initializer_list<T> i) { return i.begin(); }
-
-template<typename Container>
-constexpr auto size(Container& c) -> decltype(c.size()) { return c.size(); }
-template<typename Array, size_t N>
-constexpr size_t size(Array(&)[N]) { return N; }
-template<typename T>
-constexpr const T* size(std::initializer_list<T> i) { return i.end() - i.begin(); }
-}  // namespace skstd
-
 // The sknonstd namespace contains things we would like to be proposed and feel std-ish.
 namespace sknonstd {
 
@@ -81,6 +51,6 @@ template <typename D, typename S> using same_cv_t = typename same_cv<D, S>::type
 }  // namespace sknonstd
 
 template <typename Container>
-constexpr int SkCount(const Container& c) { return SkTo<int>(skstd::size(c)); }
+constexpr int SkCount(const Container& c) { return SkTo<int>(std::size(c)); }
 
 #endif
diff --git a/third_party/skia/include/private/SkTOptional.h b/third_party/skia/include/private/SkTOptional.h
index f610493b0a9e0..137b3cb2676c5 100644
--- a/third_party/skia/include/private/SkTOptional.h
+++ b/third_party/skia/include/private/SkTOptional.h
@@ -8,354 +8,13 @@
 #ifndef SkTOptional_DEFINED
 #define SkTOptional_DEFINED
 
-#include "include/core/SkTypes.h"
-
-#include <utility>
+#include <optional>
 
 namespace skstd {
 
-/**
- * An empty optional is represented with `nullopt`.
- */
-struct nullopt_t {
-    struct tag {};
-
-    // nullopt_t must not be default-constructible.
-    explicit constexpr nullopt_t(tag) {}
-};
-
-static constexpr nullopt_t nullopt{nullopt_t::tag{}};
-
-/**
- * Simple drop-in replacement for std::optional until we move to C++17. This does not have all of
- * std::optional's capabilities, but it covers our needs for the time being.
- */
-template<typename T>
-class optional {
-public:
-    optional(const T& value)
-        : fHasValue(true) {
-        new(&fPayload.fValue) T(value);
-    }
-
-    optional(T&& value)
-        : fHasValue(true) {
-        new(&fPayload.fValue) T(std::move(value));
-    }
-
-    optional() {}
-
-    optional(const optional& other) {
-        *this = other;
-    }
-
-    // Construction with nullopt is the same as default construction.
-    optional(nullopt_t) : optional() {}
-
-    // We need a non-const copy constructor because otherwise optional(nonConstSrc) isn't an exact
-    // match for the copy constructor, and we'd end up invoking the Args&&... template by mistake.
-    optional(optional& other) {
-        *this = other;
-    }
-
-    optional(optional&& other) {
-        *this = std::move(other);
-    }
-
-    template<typename... Args>
-    optional(Args&&... args) {
-        fHasValue = true;
-        new(&fPayload.fValue) T(std::forward<Args>(args)...);
-    }
-
-    ~optional() {
-        this->reset();
-    }
-
-    optional& operator=(const optional& other) {
-        if (this != &other) {
-            if (fHasValue) {
-                if (other.fHasValue) {
-                    fPayload.fValue = other.fPayload.fValue;
-                } else {
-                    this->reset();
-                }
-            } else {
-                if (other.fHasValue) {
-                    fHasValue = true;
-                    new (&fPayload.fValue) T(other.fPayload.fValue);
-                } else {
-                    // do nothing, no value on either side
-                }
-            }
-        }
-        return *this;
-    }
-
-    optional& operator=(optional&& other) {
-        if (this != &other) {
-            if (fHasValue) {
-                if (other.fHasValue) {
-                    fPayload.fValue = std::move(other.fPayload.fValue);
-                } else {
-                    this->reset();
-                }
-            } else {
-                if (other.fHasValue) {
-                    fHasValue = true;
-                    new (&fPayload.fValue) T(std::move(other.fPayload.fValue));
-                } else {
-                    // do nothing, no value on either side
-                }
-            }
-        }
-        return *this;
-    }
-
-    template<typename... Args>
-    optional& emplace(Args&&... args) {
-        this->reset();
-        fHasValue = true;
-        new(&fPayload.fValue) T(std::forward<Args>(args)...);
-        return *this;
-    }
-
-    template<typename U, typename... Args>
-    optional& emplace(std::initializer_list<U> il, Args&&... args) {
-        this->reset();
-        fHasValue = true;
-        new(&fPayload.fValue) T(il, std::forward<Args>(args)...);
-        return *this;
-    }
-
-    // Assignment to nullopt is the same as reset().
-    optional& operator=(nullopt_t) {
-        this->reset();
-        return *this;
-    }
-
-    T& operator*() & {
-        SkASSERT(fHasValue);
-        return fPayload.fValue;
-    }
-
-    const T& operator*() const& {
-        SkASSERT(fHasValue);
-        return fPayload.fValue;
-    }
-
-    T&& operator*() && {
-        SkASSERT(fHasValue);
-        return std::move(fPayload.fValue);
-    }
-
-    const T&& operator*() const&& {
-        SkASSERT(fHasValue);
-        return std::move(fPayload.fValue);
-    }
-
-    const T& value() const& {
-        SkASSERT_RELEASE(fHasValue);
-        return **this;
-    }
-
-    T& value() & {
-        SkASSERT_RELEASE(fHasValue);
-        return **this;
-    }
-
-    const T&& value() const&& {
-        SkASSERT_RELEASE(fHasValue);
-        return std::move(**this);
-    }
-
-    T&& value() && {
-        SkASSERT_RELEASE(fHasValue);
-        return std::move(**this);
-    }
-
-    T* operator->() {
-        return &**this;
-    }
-
-    const T* operator->() const {
-        return &**this;
-    }
-
-    template<typename U>
-    T value_or(U&& value) const& {
-        return this->has_value() ? **this : static_cast<T>(std::forward<U>(value));
-    }
-
-    template<typename U>
-    T value_or(U&& value) && {
-        return this->has_value() ? std::move(**this) : static_cast<T>(std::forward<U>(value));
-    }
-
-    bool has_value() const {
-        return fHasValue;
-    }
-
-    explicit operator bool() const {
-        return this->has_value();
-    }
-
-    void reset() {
-        if (fHasValue) {
-            fPayload.fValue.~T();
-            fHasValue = false;
-        }
-    }
-
-private:
-    union Payload {
-        T fValue;
-
-        Payload() {}
-
-        ~Payload() {}
-    } fPayload;
-
-    bool fHasValue = false;
-};
-
-// Comparison operators for optional x optional
-template <typename T, typename U> bool operator==(const optional<T>& a, const optional<U>& b) {
-    return (a.has_value() != b.has_value()) ? false :
-                            !a.has_value()  ? true :
-                                              (*a == *b);
-}
-
-template <typename T, typename U> bool operator!=(const optional<T>& a, const optional<U>& b) {
-    return (a.has_value() != b.has_value()) ? true :
-                            !a.has_value()  ? false :
-                                              (*a != *b);
-}
-
-template <typename T, typename U> bool operator<(const optional<T>& a, const optional<U>& b) {
-    return !b.has_value() ? false :
-           !a.has_value() ? true :
-                            (*a < *b);
-}
-
-template <typename T, typename U> bool operator<=(const optional<T>& a, const optional<U>& b) {
-    return !a.has_value() ? true :
-           !b.has_value() ? false :
-                            (*a <= *b);
-}
-
-template <typename T, typename U> bool operator>(const optional<T>& a, const optional<U>& b) {
-    return !a.has_value() ? false :
-           !b.has_value() ? true :
-                            (*a > *b);
-}
-
-template <typename T, typename U> bool operator>=(const optional<T>& a, const optional<U>& b) {
-    return !b.has_value() ? true :
-           !a.has_value() ? false :
-                            (*a >= *b);
-}
-
-// Comparison operators for optional x nullopt
-template <typename T> bool operator==(const optional<T>& a, nullopt_t) {
-    return !a.has_value();
-}
-
-template <typename T> bool operator!=(const optional<T>& a, nullopt_t) {
-    return a.has_value();
-}
-
-template <typename T> bool operator<(const optional<T>&, nullopt_t) {
-    return false;
-}
-
-template <typename T> bool operator<=(const optional<T>& a, nullopt_t) {
-    return !a.has_value();
-}
-
-template <typename T> bool operator>(const optional<T>& a, nullopt_t) {
-    return a.has_value();
-}
-
-template <typename T>
-bool operator>=(const optional<T>&, nullopt_t) {
-    return true;
-}
-
-// Comparison operators for nullopt x optional
-template <typename U> bool operator==(nullopt_t, const optional<U>& b) {
-    return !b.has_value();
-}
-
-template <typename U> bool operator!=(nullopt_t, const optional<U>& b) {
-    return b.has_value();
-}
-
-template <typename U> bool operator<(nullopt_t, const optional<U>& b) {
-  return b.has_value();
-}
-
-template <typename U> bool operator<=(nullopt_t, const optional<U>&) {
-    return true;
-}
-
-template <typename U> bool operator>(nullopt_t, const optional<U>&) {
-    return false;
-}
-
-template <typename U> bool operator>=(nullopt_t, const optional<U>& b) {
-    return !b.has_value();
-}
-
-// Comparison operators for optional x value
-template <typename T, typename U> bool operator==(const optional<T>& a, const U& b) {
-    return a.has_value() && (*a == b);
-}
-
-template <typename T, typename U> bool operator!=(const optional<T>& a, const U& b) {
-    return !a.has_value() || (*a != b);
-}
-
-template <typename T, typename U> bool operator<(const optional<T>& a, const U& b) {
-    return !a.has_value() || (*a < b);
-}
-
-template <typename T, typename U> bool operator<=(const optional<T>& a, const U& b) {
-    return !a.has_value() || (*a <= b);
-}
-
-template <typename T, typename U> bool operator>(const optional<T>& a, const U& b) {
-  return a.has_value() && (*a > b);
-}
-
-template <typename T, typename U> bool operator>=(const optional<T>& a, const U& b) {
-  return a.has_value() && (*a >= b);
-}
-
-// Comparison operators for value x optional
-template <typename T, typename U> bool operator==(const T& a, const optional<U>& b) {
-    return b.has_value() && (a == *b);
-}
-
-template <typename T, typename U> bool operator!=(const T& a, const optional<U>& b) {
-    return !b.has_value() || (a != *b);
-}
-
-template <typename T, typename U> bool operator<(const T& a, const optional<U>& b) {
-    return b.has_value() && (a < *b);
-}
-
-template <typename T, typename U> bool operator<=(const T& a, const optional<U>& b) {
-    return b.has_value() && (a <= *b);
-}
-
-template <typename T, typename U> bool operator>(const T& a, const optional<U>& b) {
-    return !b.has_value() || (a > *b);
-}
-
-template <typename T, typename U> bool operator>=(const T& a, const optional<U>& b) {
-    return !b.has_value() || (a >= *b);
-}
+template <typename T> using optional = std::optional<T>;
+using nullopt_t = std::nullopt_t;
+inline constexpr nullopt_t nullopt = std::nullopt;
 
 } // namespace skstd
 
diff --git a/third_party/skia/include/private/SkTemplates.h b/third_party/skia/include/private/SkTemplates.h
index 4221ee14d443b..cc7ed4d29b25d 100644
--- a/third_party/skia/include/private/SkTemplates.h
+++ b/third_party/skia/include/private/SkTemplates.h
@@ -35,14 +35,14 @@ template<typename T> inline void sk_ignore_unused_variable(const T&) { }
 /**
  *  Returns a pointer to a D which comes immediately after S[count].
  */
-template <typename D, typename S> static D* SkTAfter(S* ptr, size_t count = 1) {
+template <typename D, typename S> inline D* SkTAfter(S* ptr, size_t count = 1) {
     return reinterpret_cast<D*>(ptr + count);
 }
 
 /**
  *  Returns a pointer to a D which comes byteOffset bytes after S.
  */
-template <typename D, typename S> static D* SkTAddOffset(S* ptr, ptrdiff_t byteOffset) {
+template <typename D, typename S> inline D* SkTAddOffset(S* ptr, ptrdiff_t byteOffset) {
     // The intermediate char* has the same cv-ness as D as this produces better error messages.
     // This relies on the fact that reinterpret_cast can add constness, but cannot remove it.
     return reinterpret_cast<D*>(reinterpret_cast<sknonstd::same_cv_t<char, D>*>(ptr) + byteOffset);
diff --git a/third_party/skia/include/private/SkThreadAnnotations.h b/third_party/skia/include/private/SkThreadAnnotations.h
index 07652a3fbdcaa..fc2a4aacee6ff 100644
--- a/third_party/skia/include/private/SkThreadAnnotations.h
+++ b/third_party/skia/include/private/SkThreadAnnotations.h
@@ -78,11 +78,11 @@
 
 #if defined(SK_BUILD_FOR_GOOGLE3) && !defined(SK_BUILD_FOR_WASM_IN_GOOGLE3)
     extern "C" {
-        void __google_potentially_blocking_region_begin(void);
-        void __google_potentially_blocking_region_end  (void);
+        void __google_cxa_guard_acquire_begin(void);
+        void __google_cxa_guard_acquire_end  (void);
     }
-    #define SK_POTENTIALLY_BLOCKING_REGION_BEGIN __google_potentially_blocking_region_begin()
-    #define SK_POTENTIALLY_BLOCKING_REGION_END   __google_potentially_blocking_region_end()
+    #define SK_POTENTIALLY_BLOCKING_REGION_BEGIN __google_cxa_guard_acquire_begin()
+    #define SK_POTENTIALLY_BLOCKING_REGION_END   __google_cxa_guard_acquire_end()
 #else
     #define SK_POTENTIALLY_BLOCKING_REGION_BEGIN
     #define SK_POTENTIALLY_BLOCKING_REGION_END
diff --git a/third_party/skia/include/private/SkUniquePaintParamsID.h b/third_party/skia/include/private/SkUniquePaintParamsID.h
new file mode 100644
index 0000000000000..2cd89fd2f4df5
--- /dev/null
+++ b/third_party/skia/include/private/SkUniquePaintParamsID.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkUniquePaintParamsID_DEFINED
+#define SkUniquePaintParamsID_DEFINED
+
+#include "include/core/SkTypes.h"
+
+// This class boils down to a unique uint that can be used instead of a variable length
+// key derived from a PaintParams.
+class SkUniquePaintParamsID {
+public:
+    explicit SkUniquePaintParamsID(uint32_t id) : fID(id) {
+        SkASSERT(id != SK_InvalidUniqueID);
+    }
+
+    static SkUniquePaintParamsID InvalidID() { return SkUniquePaintParamsID(); }
+
+    SkUniquePaintParamsID() : fID(SK_InvalidUniqueID) {}
+
+    bool operator==(const SkUniquePaintParamsID &that) const { return fID == that.fID; }
+    bool operator!=(const SkUniquePaintParamsID &that) const { return !(*this == that); }
+
+    bool isValid() const { return fID != SK_InvalidUniqueID; }
+    uint32_t asUInt() const { return fID; }
+
+private:
+    uint32_t fID;
+};
+
+#endif // SkUniquePaintParamsID_DEFINED
diff --git a/third_party/skia/include/private/SkVx.h b/third_party/skia/include/private/SkVx.h
index 5b83ac0273e57..9990cba3a8504 100644
--- a/third_party/skia/include/private/SkVx.h
+++ b/third_party/skia/include/private/SkVx.h
@@ -28,6 +28,16 @@
 #include <initializer_list>  // std::initializer_list
 #include <utility>           // std::index_sequence
 
+// Users may disable SIMD with SKNX_NO_SIMD, which may be set via compiler flags.
+// The gn build has no option which sets SKNX_NO_SIMD.
+// Use SKVX_USE_SIMD internally to avoid confusing double negation.
+// Do not use 'defined' in a macro expansion.
+#if !defined(SKNX_NO_SIMD)
+    #define SKVX_USE_SIMD 1
+#else
+    #define SKVX_USE_SIMD 0
+#endif
+
 #if defined(__SSE__) || defined(__AVX__) || defined(__AVX2__)
     #include <immintrin.h>
 #elif defined(__ARM_NEON)
@@ -217,7 +227,7 @@ SINT Vec<2*N,T> join(const Vec<N,T>& lo, const Vec<N,T>& hi) {
 // We can slot in platform-specific implementations as overloads for particular Vec<N,T>,
 // or often integrate them directly into the recursion of style 3), allowing fine control.
 
-#if !defined(SKNX_NO_SIMD) && (defined(__clang__) || defined(__GNUC__))
+#if SKVX_USE_SIMD && (defined(__clang__) || defined(__GNUC__))
 
     // VExt<N,T> types have the same size as Vec<N,T> and support most operations directly.
     #if defined(__clang__)
@@ -448,21 +458,21 @@ SIT Vec<1,T> if_then_else(const Vec<1,M<T>>& cond, const Vec<1,T>& t, const Vec<
 SINT Vec<N,T> if_then_else(const Vec<N,M<T>>& cond, const Vec<N,T>& t, const Vec<N,T>& e) {
     // Specializations inline here so they can generalize what types the apply to.
     // (This header is used in C++14 contexts, so we have to kind of fake constexpr if.)
-#if defined(__AVX2__)
+#if SKVX_USE_SIMD && defined(__AVX2__)
     if /*constexpr*/ (N*sizeof(T) == 32) {
         return unchecked_bit_pun<Vec<N,T>>(_mm256_blendv_epi8(unchecked_bit_pun<__m256i>(e),
                                                               unchecked_bit_pun<__m256i>(t),
                                                               unchecked_bit_pun<__m256i>(cond)));
     }
 #endif
-#if defined(__SSE4_1__)
+#if SKVX_USE_SIMD && defined(__SSE4_1__)
     if /*constexpr*/ (N*sizeof(T) == 16) {
         return unchecked_bit_pun<Vec<N,T>>(_mm_blendv_epi8(unchecked_bit_pun<__m128i>(e),
                                                            unchecked_bit_pun<__m128i>(t),
                                                            unchecked_bit_pun<__m128i>(cond)));
     }
 #endif
-#if defined(__ARM_NEON)
+#if SKVX_USE_SIMD && defined(__ARM_NEON)
     if /*constexpr*/ (N*sizeof(T) == 16) {
         return unchecked_bit_pun<Vec<N,T>>(vbslq_u8(unchecked_bit_pun<uint8x16_t>(cond),
                                                     unchecked_bit_pun<uint8x16_t>(t),
@@ -480,7 +490,7 @@ SINT Vec<N,T> if_then_else(const Vec<N,M<T>>& cond, const Vec<N,T>& t, const Vec
 
 SIT  bool any(const Vec<1,T>& x) { return x.val != 0; }
 SINT bool any(const Vec<N,T>& x) {
-#if defined(__wasm_simd128__)
+#if SKVX_USE_SIMD && defined(__wasm_simd128__)
     if constexpr (N == 4 && sizeof(T) == 4) {
         return wasm_i32x4_any_true(unchecked_bit_pun<VExt<4,int>>(x));
     }
@@ -491,19 +501,19 @@ SINT bool any(const Vec<N,T>& x) {
 
 SIT  bool all(const Vec<1,T>& x) { return x.val != 0; }
 SINT bool all(const Vec<N,T>& x) {
-#if defined(__AVX2__)
+#if SKVX_USE_SIMD && defined(__AVX2__)
     if /*constexpr*/ (N*sizeof(T) == 32) {
         return _mm256_testc_si256(unchecked_bit_pun<__m256i>(x),
                                   _mm256_set1_epi32(-1));
     }
 #endif
-#if defined(__SSE4_1__)
+#if SKVX_USE_SIMD && defined(__SSE4_1__)
     if /*constexpr*/ (N*sizeof(T) == 16) {
         return _mm_testc_si128(unchecked_bit_pun<__m128i>(x),
                                _mm_set1_epi32(-1));
     }
 #endif
-#if defined(__wasm_simd128__)
+#if SKVX_USE_SIMD && defined(__wasm_simd128__)
     if /*constexpr*/ (N == 4 && sizeof(T) == 4) {
         return wasm_i32x4_all_true(unchecked_bit_pun<VExt<4,int>>(x));
     }
@@ -519,7 +529,7 @@ SI Vec<1,D> cast(const Vec<1,S>& src) { return (D)src.val; }
 
 template <typename D, int N, typename S>
 SI Vec<N,D> cast(const Vec<N,S>& src) {
-#if !defined(SKNX_NO_SIMD) && defined(__clang__)
+#if SKVX_USE_SIMD && defined(__clang__)
     return to_vec(__builtin_convertvector(to_vext(src), VExt<N,D>));
 #else
     return join(cast<D>(src.lo), cast<D>(src.hi));
@@ -555,7 +565,7 @@ SINT Vec<N,T> pin(const Vec<N,T>& x, const Vec<N,T>& lo, const Vec<N,T>& hi) {
 // The only real restriction is that the output also be a legal N=power-of-two sknx::Vec.
 template <int... Ix, int N, typename T>
 SI Vec<sizeof...(Ix),T> shuffle(const Vec<N,T>& x) {
-#if !defined(SKNX_NO_SIMD) && defined(__clang__)
+#if SKVX_USE_SIMD && defined(__clang__)
     // TODO: can we just always use { x[Ix]... }?
     return to_vec<sizeof...(Ix),T>(__builtin_shufflevector(to_vext(x), to_vext(x), Ix...));
 #else
@@ -607,12 +617,12 @@ SI Vec<1,int> lrint(const Vec<1,float>& x) {
     return (int)lrintf(x.val);
 }
 SIN Vec<N,int> lrint(const Vec<N,float>& x) {
-#if defined(__AVX__)
+#if SKVX_USE_SIMD && defined(__AVX__)
     if /*constexpr*/ (N == 8) {
         return unchecked_bit_pun<Vec<N,int>>(_mm256_cvtps_epi32(unchecked_bit_pun<__m256>(x)));
     }
 #endif
-#if defined(__SSE__)
+#if SKVX_USE_SIMD && defined(__SSE__)
     if /*constexpr*/ (N == 4) {
         return unchecked_bit_pun<Vec<N,int>>(_mm_cvtps_epi32(unchecked_bit_pun<__m128>(x)));
     }
@@ -650,13 +660,13 @@ SI Vec<1,uint16_t> to_half(const Vec<1,float>&    x) { return   to_half_finite_f
 SI Vec<1,float>  from_half(const Vec<1,uint16_t>& x) { return from_half_finite_ftz(x); }
 
 SIN Vec<N,uint16_t> to_half(const Vec<N,float>& x) {
-#if defined(__F16C__)
+#if SKVX_USE_SIMD && defined(__F16C__)
     if /*constexpr*/ (N == 8) {
         return unchecked_bit_pun<Vec<N,uint16_t>>(_mm256_cvtps_ph(unchecked_bit_pun<__m256>(x),
                                                                   _MM_FROUND_CUR_DIRECTION));
     }
 #endif
-#if defined(__aarch64__)
+#if SKVX_USE_SIMD && defined(__aarch64__)
     if /*constexpr*/ (N == 4) {
         return unchecked_bit_pun<Vec<N,uint16_t>>(vcvt_f16_f32(unchecked_bit_pun<float32x4_t>(x)));
 
@@ -670,12 +680,12 @@ SIN Vec<N,uint16_t> to_half(const Vec<N,float>& x) {
 }
 
 SIN Vec<N,float> from_half(const Vec<N,uint16_t>& x) {
-#if defined(__F16C__)
+#if SKVX_USE_SIMD && defined(__F16C__)
     if /*constexpr*/ (N == 8) {
         return unchecked_bit_pun<Vec<N,float>>(_mm256_cvtph_ps(unchecked_bit_pun<__m128i>(x)));
     }
 #endif
-#if defined(__aarch64__)
+#if SKVX_USE_SIMD && defined(__aarch64__)
     if /*constexpr*/ (N == 4) {
         return unchecked_bit_pun<Vec<N,float>>(vcvt_f32_f16(unchecked_bit_pun<float16x4_t>(x)));
     }
@@ -729,14 +739,14 @@ class ScaledDividerU32 {
     }
 
     Vec<4, uint32_t> divide(const Vec<4, uint32_t>& numerator) const {
-    #if !defined(SKNX_NO_SIMD) && defined(__ARM_NEON)
+#if SKVX_USE_SIMD && defined(__ARM_NEON)
         uint64x2_t hi = vmull_n_u32(vget_high_u32(to_vext(numerator)), fDivisorFactor);
         uint64x2_t lo = vmull_n_u32(vget_low_u32(to_vext(numerator)),  fDivisorFactor);
 
         return to_vec<4, uint32_t>(vcombine_u32(vshrn_n_u64(lo,32), vshrn_n_u64(hi,32)));
-    #else
+#else
         return cast<uint32_t>((cast<uint64_t>(numerator) * fDivisorFactor) >> 32);
-    #endif
+#endif
     }
 
     uint32_t half() const { return fHalf; }
@@ -746,34 +756,36 @@ class ScaledDividerU32 {
     const uint32_t fHalf;
 };
 
-#if !defined(SKNX_NO_SIMD) && defined(__ARM_NEON)
-    // With NEON we can do eight u8*u8 -> u16 in one instruction, vmull_u8 (read, mul-long).
-    SI Vec<8,uint16_t> mull(const Vec<8,uint8_t>& x,
-                            const Vec<8,uint8_t>& y) {
-        return to_vec<8,uint16_t>(vmull_u8(to_vext(x),
-                                           to_vext(y)));
-    }
+#if SKVX_USE_SIMD && defined(__ARM_NEON)
+// With NEON we can do eight u8*u8 -> u16 in one instruction, vmull_u8 (read, mul-long).
+SI Vec<8,uint16_t> mull(const Vec<8,uint8_t>& x,
+                        const Vec<8,uint8_t>& y) {
+    return to_vec<8,uint16_t>(vmull_u8(to_vext(x),
+                                        to_vext(y)));
+}
 
-    SIN std::enable_if_t<(N < 8), Vec<N,uint16_t>> mull(const Vec<N,uint8_t>& x,
-                                                        const Vec<N,uint8_t>& y) {
-        // N < 8 --> double up data until N == 8, returning the part we need.
-        return mull(join(x,x),
-                    join(y,y)).lo;
-    }
+SIN std::enable_if_t<(N < 8), Vec<N,uint16_t>> mull(const Vec<N,uint8_t>& x,
+                                                    const Vec<N,uint8_t>& y) {
+    // N < 8 --> double up data until N == 8, returning the part we need.
+    return mull(join(x,x),
+                join(y,y)).lo;
+}
+
+SIN std::enable_if_t<(N > 8), Vec<N,uint16_t>> mull(const Vec<N,uint8_t>& x,
+                                                    const Vec<N,uint8_t>& y) {
+    // N > 8 --> usual join(lo,hi) strategy to recurse down to N == 8.
+    return join(mull(x.lo, y.lo),
+                mull(x.hi, y.hi));
+}
 
-    SIN std::enable_if_t<(N > 8), Vec<N,uint16_t>> mull(const Vec<N,uint8_t>& x,
-                                                        const Vec<N,uint8_t>& y) {
-        // N > 8 --> usual join(lo,hi) strategy to recurse down to N == 8.
-        return join(mull(x.lo, y.lo),
-                    mull(x.hi, y.hi));
-    }
 #else
-    // Nothing special when we don't have NEON... just cast up to 16-bit and multiply.
-    SIN Vec<N,uint16_t> mull(const Vec<N,uint8_t>& x,
-                             const Vec<N,uint8_t>& y) {
-        return cast<uint16_t>(x)
-             * cast<uint16_t>(y);
-    }
+
+// Nothing special when we don't have NEON... just cast up to 16-bit and multiply.
+SIN Vec<N,uint16_t> mull(const Vec<N,uint8_t>& x,
+                            const Vec<N,uint8_t>& y) {
+    return cast<uint16_t>(x)
+            * cast<uint16_t>(y);
+}
 #endif
 
 // Allow floating point contraction. e.g., allow a*x + y to be compiled to a single FMA even though
@@ -831,8 +843,7 @@ SINT void strided_load4(const T* v,
     strided_load4(v, a.lo, b.lo, c.lo, d.lo);
     strided_load4(v + 4*(N/2), a.hi, b.hi, c.hi, d.hi);
 }
-#if !defined(SKNX_NO_SIMD)
-#if defined(__ARM_NEON)
+#if SKVX_USE_SIMD && defined(__ARM_NEON)
 #define IMPL_LOAD4_TRANSPOSED(N, T, VLD) \
 SI void strided_load4(const T* v, \
                       skvx::Vec<N,T>& a, \
@@ -845,22 +856,24 @@ SI void strided_load4(const T* v, \
     c = skvx::bit_pun<skvx::Vec<N,T>>(mat.val[2]); \
     d = skvx::bit_pun<skvx::Vec<N,T>>(mat.val[3]); \
 }
-IMPL_LOAD4_TRANSPOSED(2, uint32_t, vld4_u32);
-IMPL_LOAD4_TRANSPOSED(4, uint16_t, vld4_u16);
-IMPL_LOAD4_TRANSPOSED(8, uint8_t, vld4_u8);
-IMPL_LOAD4_TRANSPOSED(2, int32_t, vld4_s32);
-IMPL_LOAD4_TRANSPOSED(4, int16_t, vld4_s16);
-IMPL_LOAD4_TRANSPOSED(8, int8_t, vld4_s8);
-IMPL_LOAD4_TRANSPOSED(2, float, vld4_f32);
-IMPL_LOAD4_TRANSPOSED(4, uint32_t, vld4q_u32);
-IMPL_LOAD4_TRANSPOSED(8, uint16_t, vld4q_u16);
-IMPL_LOAD4_TRANSPOSED(16, uint8_t, vld4q_u8);
-IMPL_LOAD4_TRANSPOSED(4, int32_t, vld4q_s32);
-IMPL_LOAD4_TRANSPOSED(8, int16_t, vld4q_s16);
-IMPL_LOAD4_TRANSPOSED(16, int8_t, vld4q_s8);
-IMPL_LOAD4_TRANSPOSED(4, float, vld4q_f32);
+IMPL_LOAD4_TRANSPOSED(2, uint32_t, vld4_u32)
+IMPL_LOAD4_TRANSPOSED(4, uint16_t, vld4_u16)
+IMPL_LOAD4_TRANSPOSED(8, uint8_t, vld4_u8)
+IMPL_LOAD4_TRANSPOSED(2, int32_t, vld4_s32)
+IMPL_LOAD4_TRANSPOSED(4, int16_t, vld4_s16)
+IMPL_LOAD4_TRANSPOSED(8, int8_t, vld4_s8)
+IMPL_LOAD4_TRANSPOSED(2, float, vld4_f32)
+IMPL_LOAD4_TRANSPOSED(4, uint32_t, vld4q_u32)
+IMPL_LOAD4_TRANSPOSED(8, uint16_t, vld4q_u16)
+IMPL_LOAD4_TRANSPOSED(16, uint8_t, vld4q_u8)
+IMPL_LOAD4_TRANSPOSED(4, int32_t, vld4q_s32)
+IMPL_LOAD4_TRANSPOSED(8, int16_t, vld4q_s16)
+IMPL_LOAD4_TRANSPOSED(16, int8_t, vld4q_s8)
+IMPL_LOAD4_TRANSPOSED(4, float, vld4q_f32)
 #undef IMPL_LOAD4_TRANSPOSED
-#elif defined(__SSE__)
+
+#elif SKVX_USE_SIMD && defined(__SSE__)
+
 SI void strided_load4(const float* v,
                       Vec<4,float>& a,
                       Vec<4,float>& b,
@@ -878,7 +891,6 @@ SI void strided_load4(const float* v,
     d = bit_pun<Vec<4,float>>(d_);
 }
 #endif
-#endif
 
 // De-interleaving load of 2 vectors.
 //
@@ -892,31 +904,29 @@ SINT void strided_load2(const T* v, skvx::Vec<N,T>& a, skvx::Vec<N,T>& b) {
     strided_load2(v, a.lo, b.lo);
     strided_load2(v + 2*(N/2), a.hi, b.hi);
 }
-#if !defined(SKNX_NO_SIMD)
-#if defined(__ARM_NEON)
+#if SKVX_USE_SIMD && defined(__ARM_NEON)
 #define IMPL_LOAD2_TRANSPOSED(N, T, VLD) \
 SI void strided_load2(const T* v, skvx::Vec<N,T>& a, skvx::Vec<N,T>& b) { \
     auto mat = VLD(v); \
     a = skvx::bit_pun<skvx::Vec<N,T>>(mat.val[0]); \
     b = skvx::bit_pun<skvx::Vec<N,T>>(mat.val[1]); \
 }
-IMPL_LOAD2_TRANSPOSED(2, uint32_t, vld2_u32);
-IMPL_LOAD2_TRANSPOSED(4, uint16_t, vld2_u16);
-IMPL_LOAD2_TRANSPOSED(8, uint8_t, vld2_u8);
-IMPL_LOAD2_TRANSPOSED(2, int32_t, vld2_s32);
-IMPL_LOAD2_TRANSPOSED(4, int16_t, vld2_s16);
-IMPL_LOAD2_TRANSPOSED(8, int8_t, vld2_s8);
-IMPL_LOAD2_TRANSPOSED(2, float, vld2_f32);
-IMPL_LOAD2_TRANSPOSED(4, uint32_t, vld2q_u32);
-IMPL_LOAD2_TRANSPOSED(8, uint16_t, vld2q_u16);
-IMPL_LOAD2_TRANSPOSED(16, uint8_t, vld2q_u8);
-IMPL_LOAD2_TRANSPOSED(4, int32_t, vld2q_s32);
-IMPL_LOAD2_TRANSPOSED(8, int16_t, vld2q_s16);
-IMPL_LOAD2_TRANSPOSED(16, int8_t, vld2q_s8);
-IMPL_LOAD2_TRANSPOSED(4, float, vld2q_f32);
+IMPL_LOAD2_TRANSPOSED(2, uint32_t, vld2_u32)
+IMPL_LOAD2_TRANSPOSED(4, uint16_t, vld2_u16)
+IMPL_LOAD2_TRANSPOSED(8, uint8_t, vld2_u8)
+IMPL_LOAD2_TRANSPOSED(2, int32_t, vld2_s32)
+IMPL_LOAD2_TRANSPOSED(4, int16_t, vld2_s16)
+IMPL_LOAD2_TRANSPOSED(8, int8_t, vld2_s8)
+IMPL_LOAD2_TRANSPOSED(2, float, vld2_f32)
+IMPL_LOAD2_TRANSPOSED(4, uint32_t, vld2q_u32)
+IMPL_LOAD2_TRANSPOSED(8, uint16_t, vld2q_u16)
+IMPL_LOAD2_TRANSPOSED(16, uint8_t, vld2q_u8)
+IMPL_LOAD2_TRANSPOSED(4, int32_t, vld2q_s32)
+IMPL_LOAD2_TRANSPOSED(8, int16_t, vld2q_s16)
+IMPL_LOAD2_TRANSPOSED(16, int8_t, vld2q_s8)
+IMPL_LOAD2_TRANSPOSED(4, float, vld2q_f32)
 #undef IMPL_LOAD2_TRANSPOSED
 #endif
-#endif
 
 }  // namespace skvx
 
@@ -926,5 +936,6 @@ IMPL_LOAD2_TRANSPOSED(4, float, vld2q_f32);
 #undef SIT
 #undef SI
 #undef SKVX_ALWAYS_INLINE
+#undef SKVX_USE_SIMD
 
 #endif//SKVX_DEFINED
diff --git a/third_party/skia/include/private/chromium/BUILD.bazel b/third_party/skia/include/private/chromium/BUILD.bazel
index 9b3c79f20f3f8..8633eae549c7a 100644
--- a/third_party/skia/include/private/chromium/BUILD.bazel
+++ b/third_party/skia/include/private/chromium/BUILD.bazel
@@ -9,3 +9,14 @@ generated_cc_atom(
         "//include/core:SkRefCnt_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkChromeRemoteGlyphCache_hdr",
+    hdrs = ["SkChromeRemoteGlyphCache.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkData_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/utils:SkNoDrawCanvas_hdr",
+    ],
+)
diff --git a/third_party/skia/include/private/chromium/GrSlug.h b/third_party/skia/include/private/chromium/GrSlug.h
index 99d8ddcda57c9..a14b2c49c657a 100644
--- a/third_party/skia/include/private/chromium/GrSlug.h
+++ b/third_party/skia/include/private/chromium/GrSlug.h
@@ -12,14 +12,30 @@
 #include "include/core/SkRefCnt.h"
 
 class SkCanvas;
+class SkMatrix;
 class SkPaint;
+class SkReadBuffer;
 class SkTextBlob;
+class SkStrikeClient;
+class SkWriteBuffer;
+
+// You can use GrSlug to simulate drawTextBlob by defining the following at compile time.
+//    SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG
+// For Skia, add this to your args.gn file.
+//    extra_cflags = ["-D", "SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG"]
+
+// Internal infrastructure for using SubRuns.
+class SK_API GrTextReferenceFrame : public SkRefCnt {
+public:
+    ~GrTextReferenceFrame() override;
+    virtual const SkMatrix& initialPositionMatrix() const = 0;
+};
 
 // GrSlug encapsulates an SkTextBlob at a specific origin, using a specific paint. It can be
 // manipulated using matrix and clip changes to the canvas. If the canvas is transformed, then
 // the GrSlug will also transform with smaller glyphs using bi-linear interpolation to render. You
 // can think of a GrSlug as making a rubber stamp out of a SkTextBlob.
-class SK_API GrSlug : public SkRefCnt {
+class SK_API GrSlug : public GrTextReferenceFrame {
 public:
     ~GrSlug() override;
     // Return nullptr if the blob would not draw. This is not because of clipping, but because of
@@ -27,9 +43,15 @@ class SK_API GrSlug : public SkRefCnt {
     static sk_sp<GrSlug> ConvertBlob(
             SkCanvas* canvas, const SkTextBlob& blob, SkPoint origin, const SkPaint& paint);
 
+    // Set the client parameter to nullptr if no typeface ID translation is needed.
+    static sk_sp<GrSlug> MakeFromBuffer(SkReadBuffer& buffer, const SkStrikeClient* client);
+
     // Draw the GrSlug obeying the canvas's mapping and clipping.
     void draw(SkCanvas* canvas);
 
+    // Serialize the slug.
+    virtual void flatten(SkWriteBuffer&) const = 0;
+
     virtual SkRect sourceBounds() const = 0;
     virtual const SkPaint& paint() const = 0;
 };
diff --git a/third_party/skia/src/core/SkRemoteGlyphCache.h b/third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
similarity index 87%
rename from third_party/skia/src/core/SkRemoteGlyphCache.h
rename to third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
index f5c04902ff820..f1212f2d396db 100644
--- a/third_party/skia/src/core/SkRemoteGlyphCache.h
+++ b/third_party/skia/include/private/chromium/SkChromeRemoteGlyphCache.h
@@ -1,15 +1,12 @@
 /*
- * Copyright 2018 Google Inc.
+ * Copyright 2021 Google LLC.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#ifndef SkRemoteGlyphCache_DEFINED
-#define SkRemoteGlyphCache_DEFINED
-
-// Or uncomment this line:
-//#define SK_CAPTURE_DRAW_TEXT_BLOB
+#ifndef SkChromeRemoteGlyphCache_DEFINED
+#define SkChromeRemoteGlyphCache_DEFINED
 
 #include <memory>
 #include <vector>
@@ -18,10 +15,9 @@
 #include "include/core/SkRefCnt.h"
 #include "include/utils/SkNoDrawCanvas.h"
 
-class Deserializer;
-class Serializer;
-class SkAutoDescriptor;
+class GrSlug;
 struct SkPackedGlyphID;
+class SkAutoDescriptor;
 class SkStrikeCache;
 class SkStrikeClientImpl;
 class SkStrikeServer;
@@ -52,8 +48,7 @@ class SkStrikeServer {
 
         // Returns true if a handle has been deleted on the remote client. It is
         // invalid to use a handle id again with this manager once this returns true.
-        // TODO(khushalsagar): Make pure virtual once chrome implementation lands.
-        SK_SPI virtual bool isHandleDeleted(SkDiscardableHandleId) { return false; }
+        SK_SPI virtual bool isHandleDeleted(SkDiscardableHandleId) = 0;
     };
 
     SK_SPI explicit SkStrikeServer(DiscardableHandleManager* discardableHandleManager);
@@ -97,9 +92,10 @@ class SkStrikeClient {
 
         // (DEPRECATED) The original glyph could not be found and a fallback was used.
         kGlyphMetricsFallback = 4,
-        kGlyphPathFallback = 5,
+        kGlyphPathFallback    = 5,
 
-        kLast = kGlyphPath
+        kGlyphDrawable = 6,
+        kLast = kGlyphDrawable
     };
 
     // An interface to delete handles that may be pinned by the remote server.
@@ -111,12 +107,7 @@ class SkStrikeClient {
         // successful, subsequent attempts to delete the same handle are invalid.
         virtual bool deleteHandle(SkDiscardableHandleId) = 0;
 
-        // TODO: remove this old interface when Chrome has moved over to the one below.
-        virtual void notifyCacheMiss(CacheMissType type) { }
-
-        virtual void notifyCacheMiss(CacheMissType type, int fontSize) {
-            this->notifyCacheMiss(type);
-        }
+        virtual void notifyCacheMiss(CacheMissType type, int fontSize) = 0;
 
         struct ReadFailureData {
             size_t memorySize;
@@ -144,11 +135,15 @@ class SkStrikeClient {
     // Returns false if the data is invalid.
     SK_SPI bool readStrikeData(const volatile void* memory, size_t memorySize);
 
+    // Given a descriptor re-write the Rec mapping the typefaceID from the renderer to the
+    // corresponding typefaceID on the GPU.
+    SK_SPI bool translateTypefaceID(SkAutoDescriptor* descriptor) const;
+
+    // Given a buffer, unflatten into a slug making sure to do the typefaceID translation from
+    // renderer to GPU. Returns nullptr if there was a problem.
+    sk_sp<GrSlug> makeSlugFromBuffer(SkReadBuffer& buffer) const;
+
 private:
     std::unique_ptr<SkStrikeClientImpl> fImpl;
 };
-
-// For exposure to fuzzing only.
-bool SkFuzzDeserializeSkDescriptor(sk_sp<SkData> bytes, SkAutoDescriptor* ad);
-
-#endif  // SkRemoteGlyphCache_DEFINED
+#endif  // SkChromeRemoteGlyphCache_DEFINED
diff --git a/third_party/skia/include/sksl/BUILD.bazel b/third_party/skia/include/sksl/BUILD.bazel
index 9a0f95d0b6843..c3b554599b40c 100644
--- a/third_party/skia/include/sksl/BUILD.bazel
+++ b/third_party/skia/include/sksl/BUILD.bazel
@@ -48,7 +48,6 @@ generated_cc_atom(
     deps = [
         ":DSLWrapper_hdr",
         ":SkSLErrorReporter_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/core:SkTypes_hdr",
         "//include/private:SkTArray_hdr",
     ],
@@ -116,7 +115,6 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":DSLExpression_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/private:SkSLString_hdr",
     ],
 )
@@ -162,8 +160,14 @@ generated_cc_atom(
     hdrs = ["SkSLErrorReporter.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//include/core:SkStringView_hdr",
         "//include/core:SkTypes_hdr",
         "//include/private:SkSLString_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkSLDebugTrace_hdr",
+    hdrs = ["SkSLDebugTrace.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
diff --git a/third_party/skia/include/sksl/DSLCore.h b/third_party/skia/include/sksl/DSLCore.h
index 5363bda89074d..9a2215d83b169 100644
--- a/third_party/skia/include/sksl/DSLCore.h
+++ b/third_party/skia/include/sksl/DSLCore.h
@@ -52,9 +52,9 @@ void End();
  * Returns all global elements (functions and global variables) as a self-contained Program. The
  * optional source string is retained as the program's source. DSL programs do not normally have
  * sources, but when a DSL program is produced from parsed program text (as in DSLParser), it may be
- * important to retain it so that any skstd::string_views derived from it remain valid.
+ * important to retain it so that any std::string_views derived from it remain valid.
  */
-std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<SkSL::String> source = nullptr);
+std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<std::string> source = nullptr);
 
 /**
  * Returns the ErrorReporter which will be notified of any errors that occur during DSL calls. The
@@ -76,7 +76,7 @@ DSLExpression sk_Position();
 /**
  * #extension <name> : enable
  */
-void AddExtension(skstd::string_view name, PositionInfo pos = PositionInfo::Capture());
+void AddExtension(std::string_view name, PositionInfo pos = PositionInfo::Capture());
 
 /**
  * break;
@@ -143,8 +143,8 @@ DSLStatement For(DSLStatement initializer, DSLExpression test, DSLExpression nex
 DSLStatement If(DSLExpression test, DSLStatement ifTrue, DSLStatement ifFalse = DSLStatement(),
                 PositionInfo pos = PositionInfo::Capture());
 
-DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers,  skstd::string_view typeName,
-                            SkTArray<DSLField> fields, skstd::string_view varName = "",
+DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers,  std::string_view typeName,
+                            SkTArray<DSLField> fields, std::string_view varName = "",
                             int arraySize = 0, PositionInfo pos = PositionInfo::Capture());
 
 /**
diff --git a/third_party/skia/include/sksl/DSLExpression.h b/third_party/skia/include/sksl/DSLExpression.h
index 9ee0f6d2057dd..47d6f2311ac1a 100644
--- a/third_party/skia/include/sksl/DSLExpression.h
+++ b/third_party/skia/include/sksl/DSLExpression.h
@@ -8,7 +8,6 @@
 #ifndef SKSL_DSL_EXPRESSION
 #define SKSL_DSL_EXPRESSION
 
-#include "include/core/SkStringView.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkTArray.h"
 #include "include/sksl/DSLWrapper.h"
@@ -16,6 +15,7 @@
 
 #include <cstdint>
 #include <memory>
+#include <string_view>
 
 #if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::reinitializes)
 #define SK_CLANG_REINITIALIZES [[clang::reinitializes]]
@@ -118,7 +118,7 @@ class DSLExpression {
     /**
      * Creates an SkSL struct field access expression.
      */
-    DSLExpression field(skstd::string_view name, PositionInfo pos = PositionInfo::Capture());
+    DSLExpression field(std::string_view name, PositionInfo pos = PositionInfo::Capture());
 
     /**
      * Creates an SkSL array index expression.
@@ -258,7 +258,7 @@ class DSLPossibleExpression {
 
     DSLExpression a(PositionInfo pos = PositionInfo::Capture());
 
-    DSLExpression field(skstd::string_view name, PositionInfo pos = PositionInfo::Capture());
+    DSLExpression field(std::string_view name, PositionInfo pos = PositionInfo::Capture());
 
     DSLPossibleExpression operator=(DSLExpression expr);
 
diff --git a/third_party/skia/include/sksl/DSLFunction.h b/third_party/skia/include/sksl/DSLFunction.h
index aa40bdfb6d3b6..abdf38388ae73 100644
--- a/third_party/skia/include/sksl/DSLFunction.h
+++ b/third_party/skia/include/sksl/DSLFunction.h
@@ -27,11 +27,11 @@ class DSLType;
 class DSLFunction {
 public:
     template<class... Parameters>
-    DSLFunction(const DSLType& returnType, skstd::string_view name, Parameters&... parameters)
+    DSLFunction(const DSLType& returnType, std::string_view name, Parameters&... parameters)
         : DSLFunction(DSLModifiers(), returnType, name, parameters...) {}
 
     template<class... Parameters>
-    DSLFunction(const DSLModifiers& modifiers, const DSLType& returnType, skstd::string_view name,
+    DSLFunction(const DSLModifiers& modifiers, const DSLType& returnType, std::string_view name,
                 Parameters&... parameters) {
         SkTArray<DSLParameter*> parameterArray;
         parameterArray.reserve_back(sizeof...(parameters));
@@ -45,12 +45,12 @@ class DSLFunction {
         this->init(modifiers, returnType, name, std::move(parameterArray), PositionInfo());
     }
 
-    DSLFunction(const DSLType& returnType, skstd::string_view name,
+    DSLFunction(const DSLType& returnType, std::string_view name,
                 SkTArray<DSLParameter*> parameters, PositionInfo pos = PositionInfo::Capture()) {
         this->init(DSLModifiers(), returnType, name, std::move(parameters), pos);
     }
 
-    DSLFunction(const DSLModifiers& modifiers, const DSLType& returnType, skstd::string_view name,
+    DSLFunction(const DSLModifiers& modifiers, const DSLType& returnType, std::string_view name,
                 SkTArray<DSLParameter*> parameters, PositionInfo pos = PositionInfo::Capture()) {
         this->init(modifiers, returnType, name, std::move(parameters), pos);
     }
@@ -102,7 +102,7 @@ class DSLFunction {
         collectArgs(args, std::forward<RemainingArgs>(remaining)...);
     }
 
-    void init(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
+    void init(DSLModifiers modifiers, const DSLType& returnType, std::string_view name,
               SkTArray<DSLParameter*> params, PositionInfo pos);
 
     const SkSL::FunctionDeclaration* fDecl = nullptr;
diff --git a/third_party/skia/include/sksl/DSLModifiers.h b/third_party/skia/include/sksl/DSLModifiers.h
index 10c6aaafacad8..6906797a14d9e 100644
--- a/third_party/skia/include/sksl/DSLModifiers.h
+++ b/third_party/skia/include/sksl/DSLModifiers.h
@@ -49,7 +49,7 @@ class DSLModifiers {
 private:
     SkSL::Modifiers fModifiers;
 
-    friend DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
+    friend DSLType Struct(std::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
     friend class DSLCore;
     friend class DSLFunction;
     friend class DSLType;
diff --git a/third_party/skia/include/sksl/DSLSymbols.h b/third_party/skia/include/sksl/DSLSymbols.h
index 9eebeda7c384e..29c8ed70e4f00 100644
--- a/third_party/skia/include/sksl/DSLSymbols.h
+++ b/third_party/skia/include/sksl/DSLSymbols.h
@@ -8,11 +8,11 @@
 #ifndef SKSL_DSL_SYMBOLS
 #define SKSL_DSL_SYMBOLS
 
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLString.h"
 #include "include/sksl/DSLExpression.h"
 
 #include <memory>
+#include <string_view>
 
 namespace SkSL {
 
@@ -47,17 +47,17 @@ std::shared_ptr<SymbolTable> CurrentSymbolTable();
 /**
  * Returns an expression referring to the named symbol.
  */
-DSLPossibleExpression Symbol(skstd::string_view name, PositionInfo pos = PositionInfo::Capture());
+DSLPossibleExpression Symbol(std::string_view name, PositionInfo pos = PositionInfo::Capture());
 
 /**
  * Returns true if the name refers to a type (user or built-in) in the current symbol table.
  */
-bool IsType(skstd::string_view name);
+bool IsType(std::string_view name);
 
 /**
  * Returns true if the name refers to a builtin type.
  */
-bool IsBuiltinType(skstd::string_view name);
+bool IsBuiltinType(std::string_view name);
 
 /**
  * Adds a variable to the current symbol table.
diff --git a/third_party/skia/include/sksl/DSLType.h b/third_party/skia/include/sksl/DSLType.h
index 4e6150f34704f..5b1e4e96e7e7a 100644
--- a/third_party/skia/include/sksl/DSLType.h
+++ b/third_party/skia/include/sksl/DSLType.h
@@ -17,6 +17,7 @@
 
 namespace SkSL {
 
+class Compiler;
 class Type;
 
 namespace dsl {
@@ -85,9 +86,9 @@ class DSLType {
 
     DSLType(const SkSL::Type* type);
 
-    DSLType(skstd::string_view name);
+    DSLType(std::string_view name);
 
-    DSLType(skstd::string_view name,
+    DSLType(std::string_view name,
             DSLModifiers* modifiers,
             PositionInfo pos = PositionInfo::Capture());
 
@@ -173,11 +174,12 @@ class DSLType {
     TypeConstant fTypeConstant = kPoison_Type;
 
     friend DSLType Array(const DSLType& base, int count, PositionInfo pos);
-    friend DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
+    friend DSLType Struct(std::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
     friend class DSLCore;
     friend class DSLFunction;
     friend class DSLVarBase;
     friend class DSLWriter;
+    friend class SkSL::Compiler;
 };
 
 #define TYPE(T)                                                                                    \
@@ -222,11 +224,11 @@ DSLType Array(const DSLType& base, int count, PositionInfo pos = PositionInfo::C
 
 class DSLField {
 public:
-    DSLField(const DSLType type, skstd::string_view name,
+    DSLField(const DSLType type, std::string_view name,
              PositionInfo pos = PositionInfo::Capture())
         : DSLField(DSLModifiers(), type, name, pos) {}
 
-    DSLField(const DSLModifiers& modifiers, const DSLType type, skstd::string_view name,
+    DSLField(const DSLModifiers& modifiers, const DSLType type, std::string_view name,
              PositionInfo pos = PositionInfo::Capture())
         : fModifiers(modifiers)
         , fType(type)
@@ -236,18 +238,18 @@ class DSLField {
 private:
     DSLModifiers fModifiers;
     const DSLType fType;
-    skstd::string_view fName;
+    std::string_view fName;
     PositionInfo fPosition;
 
     friend class DSLCore;
-    friend DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
+    friend DSLType Struct(std::string_view name, SkSpan<DSLField> fields, PositionInfo pos);
 };
 
-DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields,
+DSLType Struct(std::string_view name, SkSpan<DSLField> fields,
                PositionInfo pos = PositionInfo::Capture());
 
 template<typename... Field>
-DSLType Struct(skstd::string_view name, Field... fields) {
+DSLType Struct(std::string_view name, Field... fields) {
     DSLField fieldTypes[] = {std::move(fields)...};
     return Struct(name, SkMakeSpan(fieldTypes), PositionInfo());
 }
diff --git a/third_party/skia/include/sksl/DSLVar.h b/third_party/skia/include/sksl/DSLVar.h
index 391474c5a9b46..27708404a29e2 100644
--- a/third_party/skia/include/sksl/DSLVar.h
+++ b/third_party/skia/include/sksl/DSLVar.h
@@ -35,11 +35,11 @@ class DSLVarBase {
      * name conflicts and the variable's name is only important when debugging shaders, the name
      * parameter is optional.
      */
-    DSLVarBase(DSLType type, skstd::string_view name, DSLExpression initialValue, PositionInfo pos);
+    DSLVarBase(DSLType type, std::string_view name, DSLExpression initialValue, PositionInfo pos);
 
     DSLVarBase(DSLType type, DSLExpression initialValue, PositionInfo pos);
 
-    DSLVarBase(const DSLModifiers& modifiers, DSLType type, skstd::string_view name,
+    DSLVarBase(const DSLModifiers& modifiers, DSLType type, std::string_view name,
                DSLExpression initialValue, PositionInfo pos);
 
     DSLVarBase(const DSLModifiers& modifiers, DSLType type, DSLExpression initialValue,
@@ -49,7 +49,7 @@ class DSLVarBase {
 
     virtual ~DSLVarBase();
 
-    skstd::string_view name() const {
+    std::string_view name() const {
         return fName;
     }
 
@@ -91,7 +91,7 @@ class DSLVarBase {
         return DSLExpression(*this, PositionInfo()).a();
     }
 
-    DSLExpression field(skstd::string_view name) {
+    DSLExpression field(std::string_view name) {
         return DSLExpression(*this, PositionInfo()).field(name);
     }
 
@@ -127,8 +127,8 @@ class DSLVarBase {
     int fUniformHandle = -1;
     std::unique_ptr<SkSL::Statement> fDeclaration;
     const SkSL::Variable* fVar = nullptr;
-    skstd::string_view fRawName; // for error reporting
-    skstd::string_view fName;
+    std::string_view fRawName; // for error reporting
+    std::string_view fName;
     DSLExpression fInitialValue;
     // true if we have attempted to create the SkSL var
     bool fInitialized = false;
@@ -150,25 +150,25 @@ class DSLVar : public DSLVarBase {
 public:
     DSLVar() = default;
 
-    DSLVar(DSLType type, skstd::string_view name = "var",
+    DSLVar(DSLType type, std::string_view name = "var",
            DSLExpression initialValue = DSLExpression(),
            PositionInfo pos = PositionInfo::Capture())
         : INHERITED(type, name, std::move(initialValue), pos) {}
 
     DSLVar(DSLType type, const char* name, DSLExpression initialValue = DSLExpression(),
            PositionInfo pos = PositionInfo::Capture())
-        : DSLVar(type, skstd::string_view(name), std::move(initialValue), pos) {}
+        : DSLVar(type, std::string_view(name), std::move(initialValue), pos) {}
 
     DSLVar(DSLType type, DSLExpression initialValue, PositionInfo pos = PositionInfo::Capture())
         : INHERITED(type, std::move(initialValue), pos) {}
 
-    DSLVar(const DSLModifiers& modifiers, DSLType type, skstd::string_view name = "var",
+    DSLVar(const DSLModifiers& modifiers, DSLType type, std::string_view name = "var",
            DSLExpression initialValue = DSLExpression(), PositionInfo pos = PositionInfo::Capture())
         : INHERITED(modifiers, type, name, std::move(initialValue), pos) {}
 
     DSLVar(const DSLModifiers& modifiers, DSLType type, const char* name,
            DSLExpression initialValue = DSLExpression(), PositionInfo pos = PositionInfo::Capture())
-        : DSLVar(modifiers, type, skstd::string_view(name), std::move(initialValue), pos) {}
+        : DSLVar(modifiers, type, std::string_view(name), std::move(initialValue), pos) {}
 
     DSLVar(DSLVar&&) = default;
 
@@ -198,25 +198,25 @@ class DSLGlobalVar : public DSLVarBase {
 public:
     DSLGlobalVar() = default;
 
-    DSLGlobalVar(DSLType type, skstd::string_view name = "var",
+    DSLGlobalVar(DSLType type, std::string_view name = "var",
            DSLExpression initialValue = DSLExpression(), PositionInfo pos = PositionInfo::Capture())
         : INHERITED(type, name, std::move(initialValue), pos) {}
 
     DSLGlobalVar(DSLType type, const char* name, DSLExpression initialValue = DSLExpression(),
                  PositionInfo pos = PositionInfo::Capture())
-        : DSLGlobalVar(type, skstd::string_view(name), std::move(initialValue), pos) {}
+        : DSLGlobalVar(type, std::string_view(name), std::move(initialValue), pos) {}
 
     DSLGlobalVar(DSLType type, DSLExpression initialValue,
                  PositionInfo pos = PositionInfo::Capture())
         : INHERITED(type, std::move(initialValue), pos) {}
 
-    DSLGlobalVar(const DSLModifiers& modifiers, DSLType type, skstd::string_view name = "var",
+    DSLGlobalVar(const DSLModifiers& modifiers, DSLType type, std::string_view name = "var",
            DSLExpression initialValue = DSLExpression(), PositionInfo pos = PositionInfo::Capture())
         : INHERITED(modifiers, type, name, std::move(initialValue), pos) {}
 
     DSLGlobalVar(const DSLModifiers& modifiers, DSLType type, const char* name,
            DSLExpression initialValue = DSLExpression(), PositionInfo pos = PositionInfo::Capture())
-        : DSLGlobalVar(modifiers, type, skstd::string_view(name), std::move(initialValue), pos) {}
+        : DSLGlobalVar(modifiers, type, std::string_view(name), std::move(initialValue), pos) {}
 
     DSLGlobalVar(const char* name);
 
@@ -254,7 +254,7 @@ class DSLGlobalVar : public DSLVarBase {
 private:
     DSLExpression eval(ExpressionArray args, PositionInfo pos);
 
-    std::unique_ptr<SkSL::Expression> methodCall(skstd::string_view methodName, PositionInfo pos);
+    std::unique_ptr<SkSL::Expression> methodCall(std::string_view methodName, PositionInfo pos);
 
     using INHERITED = DSLVarBase;
 };
@@ -266,20 +266,20 @@ class DSLParameter : public DSLVarBase {
 public:
     DSLParameter() = default;
 
-    DSLParameter(DSLType type, skstd::string_view name = "var",
+    DSLParameter(DSLType type, std::string_view name = "var",
                  PositionInfo pos = PositionInfo::Capture())
         : INHERITED(type, name, DSLExpression(), pos) {}
 
     DSLParameter(DSLType type, const char* name, PositionInfo pos = PositionInfo::Capture())
-        : DSLParameter(type, skstd::string_view(name), pos) {}
+        : DSLParameter(type, std::string_view(name), pos) {}
 
-    DSLParameter(const DSLModifiers& modifiers, DSLType type, skstd::string_view name = "var",
+    DSLParameter(const DSLModifiers& modifiers, DSLType type, std::string_view name = "var",
                  PositionInfo pos = PositionInfo::Capture())
         : INHERITED(modifiers, type, name, DSLExpression(), pos) {}
 
     DSLParameter(const DSLModifiers& modifiers, DSLType type, const char* name,
                  PositionInfo pos = PositionInfo::Capture())
-        : DSLParameter(modifiers, type, skstd::string_view(name), pos) {}
+        : DSLParameter(modifiers, type, std::string_view(name), pos) {}
 
     DSLParameter(DSLParameter&&) = default;
 
diff --git a/third_party/skia/include/sksl/SkSLErrorReporter.h b/third_party/skia/include/sksl/SkSLErrorReporter.h
index 48cc0958ec173..4be4c405f58e5 100644
--- a/third_party/skia/include/sksl/SkSLErrorReporter.h
+++ b/third_party/skia/include/sksl/SkSLErrorReporter.h
@@ -8,11 +8,11 @@
 #ifndef SKSL_ERROR_REPORTER
 #define SKSL_ERROR_REPORTER
 
-#include "include/core/SkStringView.h"
 #include "include/core/SkTypes.h"
 #include "include/private/SkSLString.h"
 
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace SkSL {
@@ -59,20 +59,20 @@ class ErrorReporter {
         SkASSERT(fPendingErrors.empty());
     }
 
-    void error(skstd::string_view msg, PositionInfo position);
+    void error(std::string_view msg, PositionInfo position);
 
     /**
      * Reports an error message at the given line of the source text. Errors reported
      * with a line of -1 will be queued until line number information can be determined.
      */
-    void error(int line, skstd::string_view msg);
+    void error(int line, std::string_view msg);
 
     const char* source() const { return fSource; }
 
     void setSource(const char* source) { fSource = source; }
 
     void reportPendingErrors(PositionInfo pos) {
-        for (const String& msg : fPendingErrors) {
+        for (const std::string& msg : fPendingErrors) {
             this->handleError(msg, pos);
         }
         fPendingErrors.clear();
@@ -90,13 +90,13 @@ class ErrorReporter {
     /**
      * Called when an error is reported.
      */
-    virtual void handleError(skstd::string_view msg, PositionInfo position) = 0;
+    virtual void handleError(std::string_view msg, PositionInfo position) = 0;
 
 private:
     PositionInfo position(int offset) const;
 
     const char* fSource = nullptr;
-    std::vector<String> fPendingErrors;
+    std::vector<std::string> fPendingErrors;
     int fErrorCount = 0;
 };
 
@@ -105,7 +105,7 @@ class ErrorReporter {
  */
 class TestingOnly_AbortErrorReporter : public ErrorReporter {
 public:
-    void handleError(skstd::string_view msg, PositionInfo pos) override {
+    void handleError(std::string_view msg, PositionInfo pos) override {
         SK_ABORT("%.*s", (int)msg.length(), msg.data());
     }
 };
diff --git a/third_party/skia/infra/bots/assets/armhf_sysroot/README.md b/third_party/skia/infra/bots/assets/armhf_sysroot/README.md
index 257acd7b7aa43..c92eb6189ebf0 100644
--- a/third_party/skia/infra/bots/assets/armhf_sysroot/README.md
+++ b/third_party/skia/infra/bots/assets/armhf_sysroot/README.md
@@ -1,9 +1,6 @@
-ARM (hard float) sysroot for cross-compiling c++ code on a x86_64 Linux bot.
+ARM (hard float) sysroot for cross-compiling c++ code on an x86_64 Linux bot.
 
-Run create_and_upload which installs the following debian packages and turns them
-into a toolchain:
+Run create_and_upload which installs some debian packages and turns them into a toolchain.
 
-    libstdc++-4.8-dev-armhf-cross libgcc-4.8-dev-armhf-cross binutils-arm-linux-gnueabihf
-
-Take a peak at `/usr/arm-linux-gnueabihf/include/c++/4.8.X` - you may need to update the
-include paths if that number changed from the previous release (currently 4.8.4).
\ No newline at end of file
+This has been updated in the past when moving up in supported C++ versions (e.g. to c++14, and
+then again to c++17).
diff --git a/third_party/skia/infra/bots/assets/armhf_sysroot/VERSION b/third_party/skia/infra/bots/assets/armhf_sysroot/VERSION
index c7930257dfef5..9a037142aa3c1 100644
--- a/third_party/skia/infra/bots/assets/armhf_sysroot/VERSION
+++ b/third_party/skia/infra/bots/assets/armhf_sysroot/VERSION
@@ -1 +1 @@
-7
\ No newline at end of file
+10
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/assets/armhf_sysroot/create.py b/third_party/skia/infra/bots/assets/armhf_sysroot/create.py
index e5759c7bffb6d..c227dd7967a0f 100755
--- a/third_party/skia/infra/bots/assets/armhf_sysroot/create.py
+++ b/third_party/skia/infra/bots/assets/armhf_sysroot/create.py
@@ -17,44 +17,37 @@
 import subprocess
 import sys
 
-from distutils import dir_util
-
 
 def create_asset(target_dir):
   """Create the asset."""
 
-  print("Installing some cross-compiling packages. Hit enter to continue.")
-  input()
+  print("Installing some cross-compiling packages. You may be asked for your sudo password")
   subprocess.check_call([
     "sudo","apt-get","install",
-    "libstdc++-6-dev-armhf-cross",
-    "libgcc-6-dev-armhf-cross",
+    "libstdc++-10-dev-armhf-cross",
+    "libgcc-10-dev-armhf-cross",
     "binutils-arm-linux-gnueabihf"
   ])
 
-
+  # shutil complains if the target directory exists already.
+  shutil.rmtree(target_dir)
   shutil.copytree('/usr/arm-linux-gnueabihf', target_dir)
-  shutil.copytree('/usr/lib/gcc-cross/arm-linux-gnueabihf/6',
+  shutil.copytree('/usr/lib/gcc-cross/arm-linux-gnueabihf/10',
                   os.path.join(target_dir, 'gcc-cross'))
 
-  # Libs needed to link:
-  shutil.copy('/usr/lib/x86_64-linux-gnu/libbfd-2.28-armhf.so',
+  # Libs needed to link. These were found by trial-and-error.
+  shutil.copy('/usr/lib/x86_64-linux-gnu/libbfd-2.37-armhf.so',
               os.path.join(target_dir, 'lib'))
-  shutil.copy('/usr/lib/x86_64-linux-gnu/libopcodes-2.28-armhf.so',
+  shutil.copy('/usr/lib/x86_64-linux-gnu/libopcodes-2.37-armhf.so',
+              os.path.join(target_dir, 'lib'))
+  shutil.copy('/usr/lib/x86_64-linux-gnu/libctf-armhf.so.0',
               os.path.join(target_dir, 'lib'))
 
-  # The file paths in libpthread.so and libc.so start off as absolute file
+  # The file paths in libc.so start off as absolute file
   # paths (e.g. /usr/arm-linux-gnueabihf/lib/libpthread.so.0), which won't
   # work on the bots. We use fileinput to replace just those lines (which
   # start with GROUP). fileinput redirects stdout, so printing here actually
   # writes to the file.
-  bad_libpthread = os.path.join(target_dir, "lib", "libpthread.so")
-  for line in fileinput.input(bad_libpthread, inplace=True):
-    if line.startswith("GROUP"):
-      print("GROUP ( libpthread.so.0 libpthread_nonshared.a )")
-    else:
-      print(line)
-
   bad_libc = os.path.join(target_dir, "lib", "libc.so")
   for line in fileinput.input(bad_libc, inplace=True):
     if line.startswith("GROUP"):
diff --git a/third_party/skia/infra/bots/assets/ios-dev-image-12.4/README.md b/third_party/skia/infra/bots/assets/ios-dev-image-12.4/README.md
deleted file mode 100644
index beb13de06626f..0000000000000
--- a/third_party/skia/infra/bots/assets/ios-dev-image-12.4/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-To create or update this asset, you will need a Mac with Xcode installed. Just
-run
-
-```shell
-./upload.py --target_dir \
-  /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/DeviceSup‌​port/12.4
-```
diff --git a/third_party/skia/infra/bots/assets/ios-dev-image-12.4/VERSION b/third_party/skia/infra/bots/assets/ios-dev-image-12.4/VERSION
deleted file mode 100644
index c227083464fb9..0000000000000
--- a/third_party/skia/infra/bots/assets/ios-dev-image-12.4/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/assets/skimage/VERSION b/third_party/skia/infra/bots/assets/skimage/VERSION
index abc4eff6ac830..801f1801027f3 100644
--- a/third_party/skia/infra/bots/assets/skimage/VERSION
+++ b/third_party/skia/infra/bots/assets/skimage/VERSION
@@ -1 +1 @@
-46
\ No newline at end of file
+47
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/assets/skp/VERSION b/third_party/skia/infra/bots/assets/skp/VERSION
index 52f6c1a7a0e66..6c0c8340ea7a0 100644
--- a/third_party/skia/infra/bots/assets/skp/VERSION
+++ b/third_party/skia/infra/bots/assets/skp/VERSION
@@ -1 +1 @@
-352
\ No newline at end of file
+362
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go b/third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go
index 0c0fc6989aafe..2a53adece2915 100644
--- a/third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go
+++ b/third_party/skia/infra/bots/gen_tasks_logic/compile_cas.go
@@ -46,6 +46,7 @@ var (
 		".clang-format",
 		".clang-tidy",
 		".vpython",
+		"bin/activate-emsdk",
 		"bin/fetch-clang-format",
 		"bin/fetch-gn",
 		"buildtools",
diff --git a/third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go b/third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go
index f71f4f7fbe1b4..a17a9eee89dc3 100644
--- a/third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go
+++ b/third_party/skia/infra/bots/gen_tasks_logic/dm_flags.go
@@ -6,7 +6,6 @@ package gen_tasks_logic
 
 import (
 	"fmt"
-	"log"
 	"sort"
 	"strconv"
 	"strings"
@@ -109,21 +108,19 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		return rv
 	}
 
-	skip := func(quad ...string) {
-		if len(quad) == 1 {
-			quad = strings.Fields(quad[0])
-		}
-		if len(quad) != 4 {
-			log.Fatalf("Invalid value for --skip: %+v", quad)
-		}
-		config := quad[0]
-		src := quad[1]
-		options := quad[2]
-		name := quad[3]
+	// When matching skip logic, _ is a wildcard that matches all parts for the field.
+	// For example, "8888 _ _ _" means everything that is part of an 8888 config and
+	// "_ skp _ SomeBigDraw" means the skp named SomeBigDraw on all config and options.
+	const ALL = "_"
+	// The inputs here are turned into a --skip flag which represents a
+	// "Space-separated config/src/srcOptions/name quadruples to skip."
+	// See DM.cpp for more, especially should_skip(). ~ negates the match.
+	skip := func(config, src, srcOptions, name string) {
+		// config is also called "sink" in DM
 		if config == "_" ||
 			hasConfig(config) ||
 			(config[0] == '~' && hasConfig(config[1:])) {
-			skipped = append(skipped, config, src, options, name)
+			skipped = append(skipped, config, src, srcOptions, name)
 		}
 	}
 
@@ -178,7 +175,15 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	sampleCount := 0
 	glPrefix := ""
 	if b.extraConfig("SwiftShader") {
-		configs = append(configs, "gles", "glesdft", "glesdmsaa")
+		configs = append(configs, "vk", "vkdmsaa")
+		// skbug.com/12820
+		skip(ALL, "gm", ALL, "ycbcrimage")
+		// skbug.com/12820
+		skip(ALL, "test", ALL, "VkYCbcrSampler_DrawImageWithYcbcrSampler")
+		// skbug.com/12826
+		skip(ALL, "test", ALL, "GrThreadSafeCache16Verts")
+		// skbug.com/12829
+		skip(ALL, "test", ALL, "image_subset")
 	} else if b.cpu() {
 		args = append(args, "--nogpu")
 
@@ -190,7 +195,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 
 		if b.extraConfig("BonusConfigs") {
 			configs = []string{
-				"g8", "565",
+				"r8", "565",
 				"pic-8888", "serialize-8888",
 				"linear-f16", "srgb-rgba", "srgb-f16", "narrow-rgba", "narrow-f16",
 				"p3-rgba", "p3-f16", "rec2020-rgba", "rec2020-f16"}
@@ -200,9 +205,9 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 			configs = []string{"pdf"}
 			args = append(args, "--rasterize_pdf") // Works only on Mac.
 			// Take ~forever to rasterize:
-			skip("pdf gm _ lattice2")
-			skip("pdf gm _ hairmodes")
-			skip("pdf gm _ longpathdash")
+			skip("pdf", "gm", ALL, "lattice2")
+			skip("pdf", "gm", ALL, "hairmodes")
+			skip("pdf", "gm", ALL, "longpathdash")
 		}
 
 	} else if b.gpu() {
@@ -243,7 +248,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		// The Tegra3 doesn't support MSAA
 		if b.gpu("Tegra3") ||
 			// We aren't interested in fixing msaa bugs on current iOS devices.
-			b.model("iPad4", "iPadPro", "iPhone6", "iPhone7") ||
+			b.model("iPad4", "iPadPro", "iPhone7") ||
 			// skia:5792
 			b.gpu("IntelHD530", "IntelIris540") {
 			configs = removeContains(configs, "msaa")
@@ -256,23 +261,23 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		if b.matchGpu("Intel") && b.isLinux() {
 			configs = append(configs, "gles", "glesdft", "srgb-gles", "gltestthreading")
 			// skbug.com/6333, skbug.com/6419, skbug.com/6702
-			skip("gltestthreading gm _ lcdblendmodes")
-			skip("gltestthreading gm _ lcdoverlap")
-			skip("gltestthreading gm _ textbloblooper")
+			skip("gltestthreading", "gm", ALL, "lcdblendmodes")
+			skip("gltestthreading", "gm", ALL, "lcdoverlap")
+			skip("gltestthreading", "gm", ALL, "textbloblooper")
 			// All of these GMs are flaky, too:
-			skip("gltestthreading gm _ savelayer_with_backdrop")
-			skip("gltestthreading gm _ persp_shaders_bw")
-			skip("gltestthreading gm _ dftext_blob_persp")
-			skip("gltestthreading gm _ dftext")
-			skip("gltestthreading gm _ gpu_blur_utils")
-			skip("gltestthreading gm _ gpu_blur_utils_ref")
-			skip("gltestthreading gm _ gpu_blur_utils_subset_rect")
-			skip("gltestthreading gm _ gpu_blur_utils_subset_rect_ref")
+			skip("gltestthreading", "gm", ALL, "savelayer_with_backdrop")
+			skip("gltestthreading", "gm", ALL, "persp_shaders_bw")
+			skip("gltestthreading", "gm", ALL, "dftext_blob_persp")
+			skip("gltestthreading", "gm", ALL, "dftext")
+			skip("gltestthreading", "gm", ALL, "gpu_blur_utils")
+			skip("gltestthreading", "gm", ALL, "gpu_blur_utils_ref")
+			skip("gltestthreading", "gm", ALL, "gpu_blur_utils_subset_rect")
+			skip("gltestthreading", "gm", ALL, "gpu_blur_utils_subset_rect_ref")
 			// skbug.com/7523 - Flaky on various GPUs
-			skip("gltestthreading gm _ orientation")
+			skip("gltestthreading", "gm", ALL, "orientation")
 			// These GMs only differ in the low bits
-			skip("gltestthreading gm _ stroketext")
-			skip("gltestthreading gm _ draw_image_set")
+			skip("gltestthreading", "gm", ALL, "stroketext")
+			skip("gltestthreading", "gm", ALL, "draw_image_set")
 		}
 
 		// CommandBuffer bot *only* runs the cmdbuffer_es2 configs.
@@ -286,7 +291,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		// Dawn bot *only* runs the dawn config
 		if b.extraConfig("Dawn") {
 			// tint:1045: Tint doesn't implement MatrixInverse yet.
-			skip("_", "gm", "_", "runtime_intrinsics_matrix")
+			skip(ALL, "gm", ALL, "runtime_intrinsics_matrix")
 			configs = []string{"dawn"}
 		}
 
@@ -295,14 +300,14 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 			args = append(args, "--nogpu") // disable non-Graphite tests
 
 			// TODO: re-enable - currently fails with "Failed to make lazy image"
-			skip("_", "gm", "_", "image_subset")
+			skip(ALL, "gm", ALL, "image_subset")
 
 			if b.extraConfig("ASAN") {
 				// skbug.com/12507 (Neon UB during JPEG compression on M1 ASAN Graphite bot)
-				skip("_", "gm", "_", "yuv420_odd_dim") // Oddly enough yuv420_odd_dim_repeat doesn't crash
-				skip("_", "gm", "_", "encode-alpha-jpeg")
-				skip("_", "gm", "_", "encode")
-				skip("_", "gm", "_", "jpg-color-cube")
+				skip(ALL, "gm", ALL, "yuv420_odd_dim") // Oddly enough yuv420_odd_dim_repeat doesn't crash
+				skip(ALL, "gm", ALL, "encode-alpha-jpeg")
+				skip(ALL, "gm", ALL, "encode")
+				skip(ALL, "gm", ALL, "jpg-color-cube")
 			}
 			configs = []string{"grmtl"}
 		}
@@ -336,53 +341,53 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 			}
 			if b.model("NUC5i7RYH") {
 				// skbug.com/7376
-				skip("_ test _ ProcessorCloneTest")
+				skip(ALL, "test", ALL, "ProcessorCloneTest")
 			}
 		}
 
-		if b.model("AndroidOne", "Nexus5", "Nexus7") {
+		if b.model("AndroidOne", "Nexus5", "Nexus7", "JioNext") {
 			// skbug.com/9019
-			skip("_ test _ ProcessorCloneTest")
-			skip("_ test _ Programs")
-			skip("_ test _ ProcessorOptimizationValidationTest")
+			skip(ALL, "test", ALL, "ProcessorCloneTest")
+			skip(ALL, "test", ALL, "Programs")
+			skip(ALL, "test", ALL, "ProcessorOptimizationValidationTest")
 		}
 
 		if b.model("GalaxyS20") {
 			// skbug.com/10595
-			skip("_ test _ ProcessorCloneTest")
+			skip(ALL, "test", ALL, "ProcessorCloneTest")
 		}
 
 		if b.extraConfig("CommandBuffer") && b.model("MacBook10.1") {
 			// skbug.com/9235
-			skip("_ test _ Programs")
+			skip(ALL, "test", ALL, "Programs")
 		}
 
 		if b.model("Spin513") {
 			// skbug.com/11876
-			skip("_ test _ Programs")
+			skip(ALL, "test", ALL, "Programs")
 			// skbug.com/12486
-			skip("_ test _ TestMockContext")
-			skip("_ test _ TestGpuRenderingContexts")
-			skip("_ test _ TestGpuAllContexts")
-			skip("_ test _ OverdrawSurface_Gpu")
-			skip("_ test _ ReplaceSurfaceBackendTexture")
-			skip("_ test _ SurfaceAttachStencil_Gpu")
-			skip("_ test _ SurfaceWrappedWithRelease_Gpu")
+			skip(ALL, "test", ALL, "TestMockContext")
+			skip(ALL, "test", ALL, "TestGpuRenderingContexts")
+			skip(ALL, "test", ALL, "TestGpuAllContexts")
+			skip(ALL, "test", ALL, "OverdrawSurface_Gpu")
+			skip(ALL, "test", ALL, "ReplaceSurfaceBackendTexture")
+			skip(ALL, "test", ALL, "SurfaceAttachStencil_Gpu")
+			skip(ALL, "test", ALL, "SurfaceWrappedWithRelease_Gpu")
 		}
 
 		if b.extraConfig("CommandBuffer") {
 			// skbug.com/10412
-			skip("_ test _ GLBackendAllocationTest")
-			skip("_ test _ InitialTextureClear")
+			skip(ALL, "test", ALL, "GLBackendAllocationTest")
+			skip(ALL, "test", ALL, "InitialTextureClear")
 			// skbug.com/12437
-			skip("_ test _ GrDDLImage_MakeSubset")
-			skip("_ test _ GrContext_oomed")
+			skip(ALL, "test", ALL, "GrDDLImage_MakeSubset")
+			skip(ALL, "test", ALL, "GrContext_oomed")
 		}
 
 		// skbug.com/9043 - these devices render this test incorrectly
 		// when opList splitting reduction is enabled
 		if b.gpu() && b.extraConfig("Vulkan") && (b.gpu("RadeonR9M470X", "RadeonHD7770")) {
-			skip("_", "tests", "_", "VkDrawableImportTest")
+			skip(ALL, "tests", ALL, "VkDrawableImportTest")
 		}
 		if b.extraConfig("Vulkan") {
 			configs = []string{"vk"}
@@ -412,31 +417,31 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 			if b.extraConfig("Vulkan") {
 				configs = append(configs, "vk1010102")
 				// Decoding transparent images to 1010102 just looks bad
-				skip("vk1010102 image _ _")
+				skip("vk1010102", "image", ALL, ALL)
 			} else {
 				configs = append(configs, "gl1010102", "gltestpersistentcache", "gltestglslcache", "gltestprecompile")
 				// Decoding transparent images to 1010102 just looks bad
-				skip("gl1010102 image _ _")
+				skip("gl1010102", "image", ALL, ALL)
 				// These tests produce slightly different pixels run to run on NV.
-				skip("gltestpersistentcache gm _ atlastext")
-				skip("gltestpersistentcache gm _ dftext")
-				skip("gltestpersistentcache gm _ glyph_pos_h_b")
-				skip("gltestpersistentcache gm _ glyph_pos_h_f")
-				skip("gltestpersistentcache gm _ glyph_pos_n_f")
-				skip("gltestglslcache gm _ atlastext")
-				skip("gltestglslcache gm _ dftext")
-				skip("gltestglslcache gm _ glyph_pos_h_b")
-				skip("gltestglslcache gm _ glyph_pos_h_f")
-				skip("gltestglslcache gm _ glyph_pos_n_f")
-				skip("gltestprecompile gm _ atlastext")
-				skip("gltestprecompile gm _ dftext")
-				skip("gltestprecompile gm _ glyph_pos_h_b")
-				skip("gltestprecompile gm _ glyph_pos_h_f")
-				skip("gltestprecompile gm _ glyph_pos_n_f")
+				skip("gltestpersistentcache", "gm", ALL, "atlastext")
+				skip("gltestpersistentcache", "gm", ALL, "dftext")
+				skip("gltestpersistentcache", "gm", ALL, "glyph_pos_h_b")
+				skip("gltestpersistentcache", "gm", ALL, "glyph_pos_h_f")
+				skip("gltestpersistentcache", "gm", ALL, "glyph_pos_n_f")
+				skip("gltestglslcache", "gm", ALL, "atlastext")
+				skip("gltestglslcache", "gm", ALL, "dftext")
+				skip("gltestglslcache", "gm", ALL, "glyph_pos_h_b")
+				skip("gltestglslcache", "gm", ALL, "glyph_pos_h_f")
+				skip("gltestglslcache", "gm", ALL, "glyph_pos_n_f")
+				skip("gltestprecompile", "gm", ALL, "atlastext")
+				skip("gltestprecompile", "gm", ALL, "dftext")
+				skip("gltestprecompile", "gm", ALL, "glyph_pos_h_b")
+				skip("gltestprecompile", "gm", ALL, "glyph_pos_h_f")
+				skip("gltestprecompile", "gm", ALL, "glyph_pos_n_f")
 				// Tessellation shaders do not yet participate in the persistent cache.
-				skip("gltestpersistentcache gm _ tessellation")
-				skip("gltestglslcache gm _ tessellation")
-				skip("gltestprecompile gm _ tessellation")
+				skip("gltestpersistentcache", "gm", ALL, "tessellation")
+				skip("gltestglslcache", "gm", ALL, "tessellation")
+				skip("gltestprecompile", "gm", ALL, "tessellation")
 			}
 		}
 
@@ -450,35 +455,35 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		if b.model("iPhone8") && b.extraConfig("Metal") {
 			configs = append(configs, "mtltestprecompile")
 			// avoid tests that can generate slightly different pixels per run
-			skip("mtltestprecompile gm _ atlastext")
-			skip("mtltestprecompile gm _ circular_arcs_hairline")
-			skip("mtltestprecompile gm _ dashcircle")
-			skip("mtltestprecompile gm _ dftext")
-			skip("mtltestprecompile gm _ fontmgr_bounds")
-			skip("mtltestprecompile gm _ fontmgr_bounds_1_-0.25")
-			skip("mtltestprecompile gm _ glyph_pos_h_b")
-			skip("mtltestprecompile gm _ glyph_pos_h_f")
-			skip("mtltestprecompile gm _ glyph_pos_n_f")
-			skip("mtltestprecompile gm _ persp_images")
-			skip("mtltestprecompile gm _ ovals")
-			skip("mtltestprecompile gm _ roundrects")
-			skip("mtltestprecompile gm _ shadow_utils_occl")
-			skip("mtltestprecompile gm _ strokedlines")
-			skip("mtltestprecompile gm _ strokerect")
-			skip("mtltestprecompile gm _ strokes3")
-			skip("mtltestprecompile gm _ texel_subset_linear_mipmap_nearest_down")
-			skip("mtltestprecompile gm _ texel_subset_linear_mipmap_linear_down")
-			skip("mtltestprecompile gm _ textblobmixedsizes_df")
-			skip("mtltestprecompile gm _ yuv420_odd_dim_repeat")
-			skip("mtltestprecompile svg _ A_large_blank_world_map_with_oceans_marked_in_blue.svg")
-			skip("mtltestprecompile svg _ Chalkboard.svg")
-			skip("mtltestprecompile svg _ Ghostscript_Tiger.svg")
-			skip("mtltestprecompile svg _ Seal_of_American_Samoa.svg")
-			skip("mtltestprecompile svg _ Seal_of_Illinois.svg")
-			skip("mtltestprecompile svg _ desk_motionmark_paths.svg")
-			skip("mtltestprecompile svg _ rg1024_green_grapes.svg")
-			skip("mtltestprecompile svg _ shapes-intro-02-f.svg")
-			skip("mtltestprecompile svg _ tiger-8.svg")
+			skip("mtltestprecompile", "gm", ALL, "atlastext")
+			skip("mtltestprecompile", "gm", ALL, "circular_arcs_hairline")
+			skip("mtltestprecompile", "gm", ALL, "dashcircle")
+			skip("mtltestprecompile", "gm", ALL, "dftext")
+			skip("mtltestprecompile", "gm", ALL, "fontmgr_bounds")
+			skip("mtltestprecompile", "gm", ALL, "fontmgr_bounds_1_-0.25")
+			skip("mtltestprecompile", "gm", ALL, "glyph_pos_h_b")
+			skip("mtltestprecompile", "gm", ALL, "glyph_pos_h_f")
+			skip("mtltestprecompile", "gm", ALL, "glyph_pos_n_f")
+			skip("mtltestprecompile", "gm", ALL, "persp_images")
+			skip("mtltestprecompile", "gm", ALL, "ovals")
+			skip("mtltestprecompile", "gm", ALL, "roundrects")
+			skip("mtltestprecompile", "gm", ALL, "shadow_utils_occl")
+			skip("mtltestprecompile", "gm", ALL, "strokedlines")
+			skip("mtltestprecompile", "gm", ALL, "strokerect")
+			skip("mtltestprecompile", "gm", ALL, "strokes3")
+			skip("mtltestprecompile", "gm", ALL, "texel_subset_linear_mipmap_nearest_down")
+			skip("mtltestprecompile", "gm", ALL, "texel_subset_linear_mipmap_linear_down")
+			skip("mtltestprecompile", "gm", ALL, "textblobmixedsizes_df")
+			skip("mtltestprecompile", "gm", ALL, "yuv420_odd_dim_repeat")
+			skip("mtltestprecompile", "svg", ALL, "A_large_blank_world_map_with_oceans_marked_in_blue.svg")
+			skip("mtltestprecompile", "svg", ALL, "Chalkboard.svg")
+			skip("mtltestprecompile", "svg", ALL, "Ghostscript_Tiger.svg")
+			skip("mtltestprecompile", "svg", ALL, "Seal_of_American_Samoa.svg")
+			skip("mtltestprecompile", "svg", ALL, "Seal_of_Illinois.svg")
+			skip("mtltestprecompile", "svg", ALL, "desk_motionmark_paths.svg")
+			skip("mtltestprecompile", "svg", ALL, "rg1024_green_grapes.svg")
+			skip("mtltestprecompile", "svg", ALL, "shapes-intro-02-f.svg")
+			skip("mtltestprecompile", "svg", ALL, "tiger-8.svg")
 		}
 		// Test reduced shader mode on iPhone 11 as representative iOS device
 		if b.model("iPhone11") && b.extraConfig("Metal") {
@@ -486,7 +491,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		}
 
 		if b.gpu("AppleM1") && !b.extraConfig("Metal") {
-			skip("_ test _ TransferPixelsFromTextureTest") // skia:11814
+			skip(ALL, "test", ALL, "TransferPixelsFromTextureTest") // skia:11814
 		}
 
 		if b.model(DONT_REDUCE_OPS_TASK_SPLITTING_MODELS...) {
@@ -501,7 +506,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		// Test rendering to wrapped dsts on a few bots
 		// Also test "narrow-glf16", which hits F16 surfaces and F16 vertex colors.
 		if b.extraConfig("BonusConfigs") {
-			configs = []string{"glbetex", "glbert", "narrow-glf16", "glreducedshaders"}
+			configs = []string{"glbetex", "glbert", "narrow-glf16", "glreducedshaders", "glr8"}
 		}
 
 		if b.os("ChromeOS") {
@@ -543,7 +548,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	tf := b.parts["test_filter"]
 	if tf != "" && tf != "All" {
 		// Expected format: shard_XX_YY
-		split := strings.Split(tf, "_")
+		split := strings.Split(tf, ALL)
 		if len(split) == 3 {
 			args = append(args, "--shard", split[1])
 			args = append(args, "--shards", split[2])
@@ -563,10 +568,10 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	args = append(args, "--src", "tests", "gm", "image", "lottie", "colorImage", "svg", "skp")
 	if b.gpu() {
 		// Don't run the "svgparse_*" svgs on GPU.
-		skip("_ svg _ svgparse_")
+		skip(ALL, "svg", ALL, "svgparse_")
 	} else if b.Name == "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN" {
 		// Only run the CPU SVGs on 8888.
-		skip("~8888 svg _ _")
+		skip("~8888", "svg", ALL, ALL)
 	} else {
 		// On CPU SVGs we only care about parsing. Only run them on the above bot.
 		removeFromArgs("svg")
@@ -613,130 +618,135 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	if b.extraConfig("TSAN") {
 		// skbug.com/10848
 		removeFromArgs("svg")
+		// skbug.com/12900 avoid OOM on
+		// Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan
+		if b.Name == "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan" {
+			skip("_", "test", "_", "_")
+		}
 	}
 
 	// TODO: ???
-	skip("f16 _ _ dstreadshuffle")
-	skip("srgb-gl image _ _")
-	skip("srgb-gles image _ _")
+	skip("f16", ALL, ALL, "dstreadshuffle")
+	skip("srgb-gl", "image", ALL, ALL)
+	skip("srgb-gles", "image", ALL, ALL)
 
-	// --src image --config g8 means "decode into Gray8", which isn't supported.
-	skip("g8 image _ _")
-	skip("g8 colorImage _ _")
+	// --src image --config r8 means "decode into R8", which isn't supported.
+	skip("r8", "image", ALL, ALL)
+	skip("r8", "colorImage", ALL, ALL)
 
 	if b.extraConfig("Valgrind") {
 		// These take 18+ hours to run.
-		skip("pdf gm _ fontmgr_iter")
-		skip("pdf _ _ PANO_20121023_214540.jpg")
-		skip("pdf skp _ worldjournal")
-		skip("pdf skp _ desk_baidu.skp")
-		skip("pdf skp _ desk_wikipedia.skp")
-		skip("_ svg _ _")
+		skip("pdf", "gm", ALL, "fontmgr_iter")
+		skip("pdf", ALL, ALL, "PANO_20121023_214540.jpg")
+		skip("pdf", "skp", ALL, "worldjournal")
+		skip("pdf", "skp", ALL, "desk_baidu.skp")
+		skip("pdf", "skp", ALL, "desk_wikipedia.skp")
+		skip(ALL, "svg", ALL, ALL)
 		// skbug.com/9171 and 8847
-		skip("_ test _ InitialTextureClear")
+		skip(ALL, "test", ALL, "InitialTextureClear")
 	}
 
 	if b.model("Pixel3") {
 		// skbug.com/10546
-		skip("vkddl gm _ compressed_textures_nmof")
-		skip("vkddl gm _ compressed_textures_npot")
-		skip("vkddl gm _ compressed_textures")
+		skip("vkddl", "gm", ALL, "compressed_textures_nmof")
+		skip("vkddl", "gm", ALL, "compressed_textures_npot")
+		skip("vkddl", "gm", ALL, "compressed_textures")
 	}
 
 	if b.model("TecnoSpark3Pro", "Wembley") {
 		// skbug.com/9421
-		skip("_ test _ InitialTextureClear")
+		skip(ALL, "test", ALL, "InitialTextureClear")
 	}
 
-	if b.model("Wembley") {
+	if b.model("Wembley", "JioNext") {
 		// These tests run forever on the Wembley.
-		skip("_ gm _ async_rescale_and_read")
+		skip(ALL, "gm", ALL, "async_rescale_and_read")
 	}
 
 	if b.os("iOS") {
-		skip(glPrefix + " skp _ _")
+		skip(glPrefix, "skp", ALL, ALL)
 	}
 
 	if b.matchOs("Mac", "iOS") {
 		// CG fails on questionable bmps
-		skip("_ image gen_platf rgba32abf.bmp")
-		skip("_ image gen_platf rgb24prof.bmp")
-		skip("_ image gen_platf rgb24lprof.bmp")
-		skip("_ image gen_platf 8bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 4bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 32bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 24bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "rgba32abf.bmp")
+		skip(ALL, "image", "gen_platf", "rgb24prof.bmp")
+		skip(ALL, "image", "gen_platf", "rgb24lprof.bmp")
+		skip(ALL, "image", "gen_platf", "8bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "4bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "32bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "24bpp-pixeldata-cropped.bmp")
 
 		// CG has unpredictable behavior on this questionable gif
 		// It's probably using uninitialized memory
-		skip("_ image gen_platf frame_larger_than_image.gif")
+		skip(ALL, "image", "gen_platf", "frame_larger_than_image.gif")
 
 		// CG has unpredictable behavior on incomplete pngs
 		// skbug.com/5774
-		skip("_ image gen_platf inc0.png")
-		skip("_ image gen_platf inc1.png")
-		skip("_ image gen_platf inc2.png")
-		skip("_ image gen_platf inc3.png")
-		skip("_ image gen_platf inc4.png")
-		skip("_ image gen_platf inc5.png")
-		skip("_ image gen_platf inc6.png")
-		skip("_ image gen_platf inc7.png")
-		skip("_ image gen_platf inc8.png")
-		skip("_ image gen_platf inc9.png")
-		skip("_ image gen_platf inc10.png")
-		skip("_ image gen_platf inc11.png")
-		skip("_ image gen_platf inc12.png")
-		skip("_ image gen_platf inc13.png")
-		skip("_ image gen_platf inc14.png")
-		skip("_ image gen_platf incInterlaced.png")
+		skip(ALL, "image", "gen_platf", "inc0.png")
+		skip(ALL, "image", "gen_platf", "inc1.png")
+		skip(ALL, "image", "gen_platf", "inc2.png")
+		skip(ALL, "image", "gen_platf", "inc3.png")
+		skip(ALL, "image", "gen_platf", "inc4.png")
+		skip(ALL, "image", "gen_platf", "inc5.png")
+		skip(ALL, "image", "gen_platf", "inc6.png")
+		skip(ALL, "image", "gen_platf", "inc7.png")
+		skip(ALL, "image", "gen_platf", "inc8.png")
+		skip(ALL, "image", "gen_platf", "inc9.png")
+		skip(ALL, "image", "gen_platf", "inc10.png")
+		skip(ALL, "image", "gen_platf", "inc11.png")
+		skip(ALL, "image", "gen_platf", "inc12.png")
+		skip(ALL, "image", "gen_platf", "inc13.png")
+		skip(ALL, "image", "gen_platf", "inc14.png")
+		skip(ALL, "image", "gen_platf", "incInterlaced.png")
 
 		// These images fail after Mac 10.13.1 upgrade.
-		skip("_ image gen_platf incInterlaced.gif")
-		skip("_ image gen_platf inc1.gif")
-		skip("_ image gen_platf inc0.gif")
-		skip("_ image gen_platf butterfly.gif")
+		skip(ALL, "image", "gen_platf", "incInterlaced.gif")
+		skip(ALL, "image", "gen_platf", "inc1.gif")
+		skip(ALL, "image", "gen_platf", "inc0.gif")
+		skip(ALL, "image", "gen_platf", "butterfly.gif")
 	}
 
 	// WIC fails on questionable bmps
 	if b.matchOs("Win") {
-		skip("_ image gen_platf pal8os2v2.bmp")
-		skip("_ image gen_platf pal8os2v2-16.bmp")
-		skip("_ image gen_platf rgba32abf.bmp")
-		skip("_ image gen_platf rgb24prof.bmp")
-		skip("_ image gen_platf rgb24lprof.bmp")
-		skip("_ image gen_platf 8bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 4bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 32bpp-pixeldata-cropped.bmp")
-		skip("_ image gen_platf 24bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "pal8os2v2.bmp")
+		skip(ALL, "image", "gen_platf", "pal8os2v2-16.bmp")
+		skip(ALL, "image", "gen_platf", "rgba32abf.bmp")
+		skip(ALL, "image", "gen_platf", "rgb24prof.bmp")
+		skip(ALL, "image", "gen_platf", "rgb24lprof.bmp")
+		skip(ALL, "image", "gen_platf", "8bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "4bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "32bpp-pixeldata-cropped.bmp")
+		skip(ALL, "image", "gen_platf", "24bpp-pixeldata-cropped.bmp")
 		if b.arch("x86_64") && b.cpu() {
 			// This GM triggers a SkSmallAllocator assert.
-			skip("_ gm _ composeshader_bitmap")
+			skip(ALL, "gm", ALL, "composeshader_bitmap")
 		}
 	}
 
 	if b.matchOs("Win", "Mac") {
 		// WIC and CG fail on arithmetic jpegs
-		skip("_ image gen_platf testimgari.jpg")
+		skip(ALL, "image", "gen_platf", "testimgari.jpg")
 		// More questionable bmps that fail on Mac, too. skbug.com/6984
-		skip("_ image gen_platf rle8-height-negative.bmp")
-		skip("_ image gen_platf rle4-height-negative.bmp")
+		skip(ALL, "image", "gen_platf", "rle8-height-negative.bmp")
+		skip(ALL, "image", "gen_platf", "rle4-height-negative.bmp")
 	}
 
 	// These PNGs have CRC errors. The platform generators seem to draw
 	// uninitialized memory without reporting an error, so skip them to
 	// avoid lots of images on Gold.
-	skip("_ image gen_platf error")
+	skip(ALL, "image", "gen_platf", "error")
 
 	if b.os("Android", "iOS") {
 		// This test crashes the N9 (perhaps because of large malloc/frees). It also
 		// is fairly slow and not platform-specific. So we just disable it on all of
 		// Android and iOS. skia:5438
-		skip("_ test _ GrStyledShape")
+		skip(ALL, "test", ALL, "GrStyledShape")
 	}
 
 	if internalHardwareLabel == "5" {
 		// http://b/118312149#comment9
-		skip("_ test _ SRGBReadWritePixels")
+		skip(ALL, "test", ALL, "SRGBReadWritePixels")
 	}
 
 	// skia:4095
@@ -811,37 +821,30 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	badSerializeGMs = append(badSerializeGMs, "analytic_antialias_convex")
 
 	for _, test := range badSerializeGMs {
-		skip("serialize-8888", "gm", "_", test)
+		skip("serialize-8888", "gm", ALL, test)
 	}
 
 	// We skip these to avoid out-of-memory failures.
 	if b.matchOs("Win", "Android") {
 		for _, test := range []string{"verylargebitmap", "verylarge_picture_image"} {
-			skip("serialize-8888", "gm", "_", test)
+			skip("serialize-8888", "gm", ALL, test)
 		}
 	}
-	if b.model("iPhone6") {
-		skip("_", "gm", "_", "verylargebitmap")
-		skip("_", "gm", "_", "verylarge_picture_image")
-		skip("_", "svg", "_", "A_large_blank_world_map_with_oceans_marked_in_blue.svg")
-		skip("_", "tests", "_", "ImageFilterBlurLargeImage_Gpu")
-		skip("_", "gm", "_", "wacky_yuv")
-	}
 	if b.matchOs("Mac") && b.cpu() {
 		// skia:6992
-		skip("pic-8888", "gm", "_", "encode-platform")
-		skip("serialize-8888", "gm", "_", "encode-platform")
+		skip("pic-8888", "gm", ALL, "encode-platform")
+		skip("serialize-8888", "gm", ALL, "encode-platform")
 	}
 
 	// skia:4769
-	skip("pic-8888", "gm", "_", "drawfilter")
+	skip("pic-8888", "gm", ALL, "drawfilter")
 
 	// skia:4703
 	for _, test := range []string{"image-cacherator-from-picture",
 		"image-cacherator-from-raster",
 		"image-cacherator-from-ctable"} {
-		skip("pic-8888", "gm", "_", test)
-		skip("serialize-8888", "gm", "_", test)
+		skip("pic-8888", "gm", ALL, test)
+		skip("serialize-8888", "gm", ALL, test)
 	}
 
 	// GM that requires raster-backed canvas
@@ -854,14 +857,14 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		"async_rescale_and_read_rose",
 		"async_rescale_and_read_no_bleed",
 		"async_rescale_and_read_alpha_type"} {
-		skip("pic-8888", "gm", "_", test)
-		skip("serialize-8888", "gm", "_", test)
+		skip("pic-8888", "gm", ALL, test)
+		skip("serialize-8888", "gm", ALL, test)
 
 		// GM requires canvas->makeSurface() to return a valid surface.
 		// TODO(borenet): These should be just outside of this block but are
 		// left here to match the recipe which has an indentation bug.
-		skip("pic-8888", "gm", "_", "blurrect_compare")
-		skip("serialize-8888", "gm", "_", "blurrect_compare")
+		skip("pic-8888", "gm", ALL, "blurrect_compare")
+		skip("serialize-8888", "gm", ALL, "blurrect_compare")
 	}
 
 	// Extensions for RAW images
@@ -874,113 +877,155 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	// Skip RAW images (and a few large PNGs) on GPU bots
 	// until we can resolve failures.
 	if b.gpu() {
-		skip("_ image _ interlaced1.png")
-		skip("_ image _ interlaced2.png")
-		skip("_ image _ interlaced3.png")
+		skip(ALL, "image", ALL, "interlaced1.png")
+		skip(ALL, "image", ALL, "interlaced2.png")
+		skip(ALL, "image", ALL, "interlaced3.png")
 		for _, rawExt := range r {
-			skip(fmt.Sprintf("_ image _ .%s", rawExt))
+			skip(ALL, "image", ALL, "."+rawExt)
 		}
 	}
 
 	// Skip memory intensive tests on 32-bit bots.
 	if b.os("Win8") && b.arch("x86") {
-		skip("_ image f16 _")
-		skip("_ image _ abnormal.wbmp")
-		skip("_ image _ interlaced1.png")
-		skip("_ image _ interlaced2.png")
-		skip("_ image _ interlaced3.png")
+		skip(ALL, "image", "f16", ALL)
+		skip(ALL, "image", ALL, "abnormal.wbmp")
+		skip(ALL, "image", ALL, "interlaced1.png")
+		skip(ALL, "image", ALL, "interlaced2.png")
+		skip(ALL, "image", ALL, "interlaced3.png")
 		for _, rawExt := range r {
-			skip(fmt.Sprintf("_ image _ .%s", rawExt))
+			skip(ALL, "image", ALL, "."+rawExt)
 		}
 	}
 
-	if b.model("Nexus5", "Nexus5x") && b.gpu() {
+	if b.model("Nexus5", "Nexus5x", "JioNext") && b.gpu() {
 		// skia:5876
-		skip("_", "gm", "_", "encode-platform")
+		skip(ALL, "gm", ALL, "encode-platform")
 	}
 
 	if b.model("AndroidOne") && b.gpu() { // skia:4697, skia:4704, skia:4694, skia:4705, skia:11133
-		skip("_", "gm", "_", "bigblurs")
-		skip("_", "gm", "_", "strict_constraint_no_red_allowed")
-		skip("_", "gm", "_", "fast_constraint_red_is_allowed")
-		skip("_", "gm", "_", "dropshadowimagefilter")
-		skip("_", "gm", "_", "filterfastbounds")
-		skip(glPrefix, "gm", "_", "imageblurtiled")
-		skip("_", "gm", "_", "imagefiltersclipped")
-		skip("_", "gm", "_", "imagefiltersscaled")
-		skip("_", "gm", "_", "imageresizetiled")
-		skip("_", "gm", "_", "matrixconvolution")
-		skip("_", "gm", "_", "strokedlines")
-		skip("_", "gm", "_", "runtime_intrinsics_matrix")
+		skip(ALL, "gm", ALL, "bigblurs")
+		skip(ALL, "gm", ALL, "strict_constraint_no_red_allowed")
+		skip(ALL, "gm", ALL, "fast_constraint_red_is_allowed")
+		skip(ALL, "gm", ALL, "dropshadowimagefilter")
+		skip(ALL, "gm", ALL, "filterfastbounds")
+		skip(glPrefix, "gm", ALL, "imageblurtiled")
+		skip(ALL, "gm", ALL, "imagefiltersclipped")
+		skip(ALL, "gm", ALL, "imagefiltersscaled")
+		skip(ALL, "gm", ALL, "imageresizetiled")
+		skip(ALL, "gm", ALL, "matrixconvolution")
+		skip(ALL, "gm", ALL, "strokedlines")
+		skip(ALL, "gm", ALL, "runtime_intrinsics_matrix")
 		if sampleCount > 0 {
 			glMsaaConfig := fmt.Sprintf("%smsaa%d", glPrefix, sampleCount)
-			skip(glMsaaConfig, "gm", "_", "imageblurtiled")
-			skip(glMsaaConfig, "gm", "_", "imagefiltersbase")
+			skip(glMsaaConfig, "gm", ALL, "imageblurtiled")
+			skip(glMsaaConfig, "gm", ALL, "imagefiltersbase")
 		}
 	}
 
 	if b.matchGpu("Adreno[3456]") { // disable broken tests on Adreno 3/4/5/6xx
-		skip("_", "tests", "_", "SkSLArrayCast_GPU")       // skia:12332
-		skip("_", "tests", "_", "SkSLArrayComparison_GPU") // skia:12332
+		skip(ALL, "tests", ALL, "SkSLArrayCast_GPU")       // skia:12332
+		skip(ALL, "tests", ALL, "SkSLArrayComparison_GPU") // skia:12332
+		skip(ALL, "tests", ALL, "SkSLCommaSideEffects_GPU")
+		skip(ALL, "tests", ALL, "SkSLIntrinsicMixFloat_GPU")
+		skip(ALL, "tests", ALL, "SkSLIntrinsicClampFloat_GPU")
 	}
 
 	if b.matchGpu("Adreno[345]") && !b.extraConfig("Vulkan") { // disable broken tests on Adreno 3/4/5xx GLSL
-		skip("_", "tests", "_", "DSLFPTest_SwitchStatement")  // skia:11891
-		skip("_", "tests", "_", "SkSLMatrixToVectorCast_GPU") // skia:12192
-		skip("_", "tests", "_", "SkSLStructsInFunctions_GPU") // skia:11929
+		skip(ALL, "tests", ALL, "DSLFPTest_SwitchStatement")  // skia:11891
+		skip(ALL, "tests", ALL, "SkSLMatrixToVectorCast_GPU") // skia:12192
+		skip(ALL, "tests", ALL, "SkSLStructsInFunctions_GPU") // skia:11929
+	}
+
+	if b.matchGpu("Adreno6") || b.matchGpu("MaliG77") || b.matchGpu("QuadroP400") {
+		skip(ALL, "tests", ALL, "SkSLRecursiveComparison_Arrays_GPU") // skia:12642
+		skip(ALL, "tests", ALL, "SkSLRecursiveComparison_Structs_GPU")
+		skip(ALL, "tests", ALL, "SkSLRecursiveComparison_Types_GPU")
+		skip(ALL, "tests", ALL, "SkSLRecursiveComparison_Vectors_GPU")
 	}
 
 	if b.matchGpu("Adreno6") && !b.extraConfig("Vulkan") { // disable broken tests on Adreno 6xx GLSL
-		skip("_", "tests", "_", "SkSLIntrinsicIsInf_GPU") // skia:12377
+		skip(ALL, "tests", ALL, "SkSLIntrinsicIsInf_GPU") // skia:12377
+	}
+
+	if b.matchGpu("Adreno[56]") && b.extraConfig("Vulkan") { // disable broken tests on Adreno 5/6xx Vulkan
+		skip(ALL, "tests", ALL, "SkSLInoutParameters_GPU")   // skia:12869
+		skip(ALL, "tests", ALL, "SkSLOutParams_GPU")         // skia:11919
+		skip(ALL, "tests", ALL, "SkSLOutParamsTricky_GPU")   // skia:11919
+		skip(ALL, "tests", ALL, "SkSLOutParamsNoInline_GPU") // skia:11919
 	}
 
 	if (b.matchGpu("Adreno3") || b.matchGpu("Mali400")) && !b.extraConfig("Vulkan") {
-		skip("_", "tests", "_", "SkSLMatrices") // skia:12456
+		skip(ALL, "tests", ALL, "SkSLMatrices") // skia:12456
+	}
+
+	if b.gpu("QuadroP400") {
+		skip(ALL, "tests", ALL, "SkSLCommaSideEffects")
+	}
+
+	if b.matchGpu("Mali400") || b.matchGpu("Tegra3") {
+		skip(ALL, "tests", ALL, "SkSLMatrixScalarMath") // skia:12681
 	}
 
 	if b.gpu("IntelIris6100", "IntelHD4400") && b.matchOs("Win") && !b.extraConfig("Vulkan") {
-		skip("_", "tests", "_", "SkSLVectorToMatrixCast_GPU") // skia:12179
+		skip(ALL, "tests", ALL, "SkSLVectorToMatrixCast_GPU") // skia:12179, vec4(mat2) crash
+		skip(ALL, "tests", ALL, "SkSLVectorScalarMath_GPU")   // skia:11919
+		skip(ALL, "tests", ALL, "SkSLMatrixFoldingES2_GPU")   // skia:11919
 	}
 
 	if b.matchGpu("Intel") && b.matchOs("Win") && !b.extraConfig("Vulkan") {
-		skip("_", "tests", "_", "SkSLReturnsValueOnEveryPathES3_GPU") // skia:12465
+		skip(ALL, "tests", ALL, "SkSLReturnsValueOnEveryPathES3_GPU") // skia:12465
 	}
 
-	if (b.extraConfig("Vulkan") && b.isLinux() && b.matchGpu("Intel")) ||
-		(b.extraConfig("ANGLE") && b.matchOs("Win") && b.matchGpu("IntelIris(540|655)")) {
-		skip("_", "tests", "_", "SkSLSwitchDefaultOnly_GPU") // skia:12465
+	if b.extraConfig("Vulkan") && b.isLinux() && b.matchGpu("Intel") {
+		skip(ALL, "tests", ALL, "SkSLSwitchDefaultOnly_GPU") // skia:12465
+	}
+
+	if b.extraConfig("ANGLE") && b.matchOs("Win") && b.matchGpu("IntelIris(540|655)") {
+		skip(ALL, "tests", ALL, "SkSLSwitchDefaultOnly_GPU") // skia:12465
+		skip(ALL, "tests", ALL, "SkSLVectorScalarMath_GPU")  // skia:11919
 	}
 
 	if b.gpu("Tegra3") {
 		// Tegra3 fails to compile break stmts inside a for loop (skia:12477)
-		skip("_", "tests", "_", "SkSLSwitch_GPU")
-		skip("_", "tests", "_", "SkSLSwitchDefaultOnly_GPU")
-		skip("_", "tests", "_", "SkSLSwitchWithFallthrough_GPU")
-		skip("_", "tests", "_", "SkSLSwitchWithLoops_GPU")
-		skip("_", "tests", "_", "SkSLLoopFloat_GPU")
-		skip("_", "tests", "_", "SkSLLoopInt_GPU")
+		skip(ALL, "tests", ALL, "SkSLSwitch_GPU")
+		skip(ALL, "tests", ALL, "SkSLSwitchDefaultOnly_GPU")
+		skip(ALL, "tests", ALL, "SkSLSwitchWithFallthrough_GPU")
+		skip(ALL, "tests", ALL, "SkSLSwitchWithLoops_GPU")
+		skip(ALL, "tests", ALL, "SkSLSwitchCaseFolding_GPU")
+		skip(ALL, "tests", ALL, "SkSLLoopFloat_GPU")
+		skip(ALL, "tests", ALL, "SkSLLoopInt_GPU")
+	}
+
+	if b.gpu("QuadroP400") || b.gpu("GTX660") || b.gpu("GTX960") || b.gpu("Tegra3") {
+		if !b.extraConfig("Vulkan") {
+			// Various Nvidia GPUs crash or generate errors when assembling weird matrices
+			skip(ALL, "tests", ALL, "SkSLMatrixConstructorsES2_GPU") // skia:12443
+			skip(ALL, "tests", ALL, "SkSLMatrixConstructorsES3_GPU") // skia:12443
+		}
+		skip(ALL, "tests", ALL, "SkSLMatrixFoldingES2_GPU") // skia:11919
 	}
 
-	if !b.extraConfig("Vulkan") &&
-		(b.gpu("QuadroP400") || b.gpu("GTX660") || b.gpu("GTX960") || b.gpu("Tegra3")) {
-		// Various Nvidia GPUs crash or generate errors when assembling weird matrices (skia:12443)
-		skip("_", "tests", "_", "SkSLMatrixConstructorsES2_GPU")
-		skip("_", "tests", "_", "SkSLMatrixConstructorsES3_GPU")
+	if b.gpu("PowerVRGE8320") || b.gpu("Tegra3") || b.gpu("Adreno308") {
+		skip(ALL, "tests", ALL, "SkSLVectorScalarMath_GPU") // skia:11919
+	}
+
+	if b.gpu("PowerVRGE8320") {
+		skip(ALL, "tests", ALL, "SkSLOutParamsAreDistinct_GPU")
 	}
 
 	if !b.extraConfig("Vulkan") && (b.gpu("RadeonR9M470X") || b.gpu("RadeonHD7770")) {
 		// Some AMD GPUs can get the wrong result when assembling non-square matrices (skia:12443)
-		skip("_", "tests", "_", "SkSLMatrixConstructorsES3_GPU")
+		skip(ALL, "tests", ALL, "SkSLMatrixConstructorsES3_GPU")
 	}
 
 	if b.matchGpu("Intel") { // some Intel GPUs don't return zero for the derivative of a uniform
-		skip("_", "tests", "_", "SkSLIntrinsicDFdy_GPU")
-		skip("_", "tests", "_", "SkSLIntrinsicDFdx_GPU")
-		skip("_", "tests", "_", "SkSLIntrinsicFwidth_GPU")
+		skip(ALL, "tests", ALL, "SkSLIntrinsicDFdy_GPU")
+		skip(ALL, "tests", ALL, "SkSLIntrinsicDFdx_GPU")
+		skip(ALL, "tests", ALL, "SkSLIntrinsicFwidth_GPU")
 	}
 
 	if b.matchOs("Mac") && b.matchGpu("Intel(Iris5100|HD6000)") {
-		skip("_", "tests", "_", "SkSLLoopFloat_GPU") // skia:12426
+		skip(ALL, "tests", ALL, "SkSLLoopFloat_GPU") // skia:12426
 	}
 
 	match := []string{}
@@ -1042,8 +1087,8 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 
 	if b.extraConfig("Vulkan") && b.isLinux() && b.gpu("IntelHD405") {
 		// skia:7322
-		skip("vk", "gm", "_", "skbug_257")
-		skip("vk", "gm", "_", "filltypespersp")
+		skip("vk", "gm", ALL, "skbug_257")
+		skip("vk", "gm", ALL, "filltypespersp")
 		match = append(match, "~^ClearOp$")
 		match = append(match, "~^CopySurface$")
 		match = append(match, "~^ImageNewShader_GPU$")
@@ -1088,7 +1133,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 
 	if b.gpu("IntelIris6100", "IntelHD4400") && b.extraConfig("ANGLE") {
 		// skia:6857
-		skip("angle_d3d9_es2", "gm", "_", "lighting")
+		skip("angle_d3d9_es2", "gm", ALL, "lighting")
 	}
 
 	if b.gpu("PowerVRGX6250") {
@@ -1115,6 +1160,10 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 		// skia:10247
 		match = append(match, "~VkPrepareForExternalIOQueueTransitionTest")
 	}
+	if b.matchExtraConfig("Graphite") {
+		// skia:12813
+		match = append(match, "~async_rescale_and_read")
+	}
 
 	if len(skipped) > 0 {
 		args = append(args, "--skip")
@@ -1131,7 +1180,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 	// TODO(borenet): Previously this was `'Nexus5' in bot or 'Nexus9' in bot`
 	// which also matched 'Nexus5x'. I added That here to maintain the
 	// existing behavior, but we should verify that it's needed.
-	if b.model("Nexus5", "Nexus5x", "Nexus9") {
+	if b.model("Nexus5", "Nexus5x", "Nexus9", "JioNext") {
 		args = append(args, "--noRAW_threading")
 	}
 
diff --git a/third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 4d0dc7535fd3b..1d6bec3a479f3 100644
--- a/third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/third_party/skia/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -291,7 +291,7 @@ type JobInfo struct {
 	// The name of the job.
 	Name string `json:"name"`
 
-	// The optinal CQ config of this job. If the CQ config is missing then the
+	// The optional CQ config of this job. If the CQ config is missing then the
 	// job will not be added to the CQ of this branch.
 	CQConfig *specs.CommitQueueJobConfig `json:"cq_config,omitempty"`
 }
@@ -650,6 +650,9 @@ func (b *taskBuilder) linuxGceDimensions(machineType string) {
 	)
 }
 
+// codesizeTaskNameRegexp captures the "CodeSize-<binary name>-" prefix of a CodeSize task name.
+var codesizeTaskNameRegexp = regexp.MustCompile("^CodeSize-[a-zA-Z0-9_]+-")
+
 // deriveCompileTaskName returns the name of a compile task based on the given
 // job name.
 func (b *jobBuilder) deriveCompileTaskName() string {
@@ -664,7 +667,7 @@ func (b *jobBuilder) deriveCompileTaskName() string {
 				"NoGPUThreads", "ProcDump", "DDL1", "DDL3", "OOPRDDL", "T8888",
 				"DDLTotal", "DDLRecord", "9x9", "BonusConfigs", "SkottieTracing", "SkottieWASM",
 				"GpuTess", "DMSAAStats", "Mskp", "Docker", "PDF", "SkVM", "Puppeteer",
-				"SkottieFrames", "RenderSKP", "CanvasPerf", "AllPathsVolatile", "WebGL2"}
+				"SkottieFrames", "RenderSKP", "CanvasPerf", "AllPathsVolatile", "WebGL2", "i5"}
 			keep := make([]string, 0, len(ec))
 			for _, part := range ec {
 				if !In(part, ignore) {
@@ -721,8 +724,10 @@ func (b *jobBuilder) deriveCompileTaskName() string {
 			log.Fatal(err)
 		}
 		return name
-	} else if b.parts["role"] == "BuildStats" {
+	} else if b.role("BuildStats") {
 		return strings.Replace(b.Name, "BuildStats", "Build", 1)
+	} else if b.role("CodeSize") {
+		return codesizeTaskNameRegexp.ReplaceAllString(b.Name, "Build-")
 	} else {
 		return b.Name
 	}
@@ -752,11 +757,13 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 			"Debian9":    DEFAULT_OS_LINUX_GCE, // Runs in Deb9 Docker.
 			"Debian10":   DEFAULT_OS_LINUX_GCE,
 			"Mac":        DEFAULT_OS_MAC,
+			"Mac10.12":   "Mac-10.12",
 			"Mac10.13":   "Mac-10.13.6",
-			"Mac10.14":   "Mac-10.14.3",
+			"Mac10.14":   "Mac-10.14",
 			"Mac10.15.1": "Mac-10.15.1",
 			"Mac10.15.7": "Mac-10.15.7", // Same as 'Mac', but explicit.
 			"Mac11":      "Mac-11.4",
+			"Mac12":      "Mac-12",
 			"Ubuntu18":   "Ubuntu-18.04",
 			"Win":        DEFAULT_OS_WIN,
 			"Win10":      "Windows-10-19044",
@@ -772,18 +779,6 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 			// ChOps-owned machines have Windows 10 21h1.
 			d["os"] = "Windows-10-19043"
 		}
-		if os == "Mac10.14" && b.parts["model"] == "VMware7.1" {
-			// ChOps VMs are at a newer version of MacOS.
-			d["os"] = "Mac-10.14.6"
-		}
-		if os == "Mac10.15" && b.parts["model"] == "VMware7.1" {
-			// ChOps VMs are at a newer version of MacOS.
-			d["os"] = "Mac-10.15.7"
-		}
-		if b.parts["model"] == "iPhone6" {
-			// This is the latest iOS that supports iPhone6.
-			d["os"] = "iOS-12.4.5"
-		}
 		if b.parts["model"] == "iPhone11" {
 			d["os"] = "iOS-13.6"
 		}
@@ -802,6 +797,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 				"GalaxyS7_G930FD": {"herolte", "R16NW_G930FXXS2ERH6"}, // This is Oreo.
 				"GalaxyS9":        {"starlte", "QP1A.190711.020"},     // This is Android10.
 				"GalaxyS20":       {"exynos990", "QP1A.190711.020"},
+				"JioNext":         {"msm8937", "RKQ1.210602.002"},
 				"Nexus5":          {"hammerhead", "M4B30Z_3437181"},
 				"Nexus7":          {"grouper", "LMY47V_1836172"}, // 2012 Nexus 7
 				"P30":             {"HWELE", "HUAWEIELE-L29"},
@@ -812,6 +808,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 				"Pixel4a":         {"sunfish", "AOSP.MASTER_7819821"}, // Pixel4a flashed with an Android HWASan build.
 				"Pixel4XL":        {"coral", "QD1A.190821.011.C4"},
 				"Pixel5":          {"redfin", "RD1A.200810.022.A4"},
+				"Pixel6":          {"oriole", "SD1A.210817.037"},
 				"TecnoSpark3Pro":  {"TECNO-KB8", "PPR1.180610.011"},
 				"Wembley":         {"wembley", "SP2A.211004.001"},
 			}[b.parts["model"]]
@@ -829,7 +826,6 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 		} else if b.os("iOS") {
 			device, ok := map[string]string{
 				"iPadMini4": "iPad5,1",
-				"iPhone6":   "iPhone7,2",
 				"iPhone7":   "iPhone9,1",
 				"iPhone8":   "iPhone10,1",
 				"iPhone11":  "iPhone12,1",
@@ -851,6 +847,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 					"GCE":            "x86-64-Haswell_GCE",
 					"MacBookAir7.2":  "x86-64-i5-5350U",
 					"MacBookPro11.5": "x86-64-i7-4870HQ",
+					"MacMini7.1":     "x86-64-i5-4278U",
 					"NUC5i7RYH":      "x86-64-i7-5557U",
 				},
 				"AVX512": {
@@ -879,6 +876,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 				d["machine_type"] = MACHINE_TYPE_MEDIUM
 			}
 		} else {
+			// It's a GPU job.
 			if b.matchOs("Win") {
 				gpu, ok := map[string]string{
 					// At some point this might use the device ID, but for now it's like Chromebooks.
@@ -892,7 +890,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 					"IntelIris655":  "8086:3ea5-26.20.100.7463",
 					"RadeonHD7770":  "1002:683d-26.20.13031.18002",
 					"RadeonR9M470X": "1002:6646-26.20.13031.18002",
-					"QuadroP400":    "10de:1cb3-30.0.14.7168",
+					"QuadroP400":    "10de:1cb3-30.0.15.1179",
 				}[b.parts["cpu_or_gpu_value"]]
 				if !ok {
 					log.Fatalf("Entry %q not found in Win GPU mapping.", b.parts["cpu_or_gpu_value"])
@@ -905,7 +903,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 					"IntelHD2000":   "8086:0102",
 					"IntelHD405":    "8086:22b1",
 					"IntelIris640":  "8086:5926",
-					"QuadroP400":    "10de:1cb3-430.14",
+					"QuadroP400":    "10de:1cb3-510.60.02",
 				}[b.parts["cpu_or_gpu_value"]]
 				if !ok {
 					log.Fatalf("Entry %q not found in Ubuntu GPU mapping.", b.parts["cpu_or_gpu_value"])
@@ -923,6 +921,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 					"IntelHD6000":   "8086:1626",
 					"IntelHD615":    "8086:591e",
 					"IntelIris5100": "8086:0a2e",
+					"IntelIrisPlus": "8086:8a53",
 					"RadeonHD8870M": "1002:6821-4.0.20-3.2.8",
 				}[b.parts["cpu_or_gpu_value"]]
 				if !ok {
@@ -934,10 +933,17 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 				} else {
 					d["gpu"] = gpu
 				}
-				// Yuck. We have two different types of MacMini7,1 with the same GPU but different CPUs.
+				// We have two different types of MacMini7,1 with the same GPU but different CPUs.
 				if b.gpu("IntelIris5100") {
-					// Run all tasks on Golo machines for now.
-					d["cpu"] = "x86-64-i7-4578U"
+					if b.extraConfig("i5") {
+						// If we say "i5", run on our MacMini7,1s in the Skolo:
+						d["cpu"] = "x86-64-i5-4278U"
+					} else {
+						// Otherwise, run on Golo machines, just because that's
+						// where those jobs have always run. Plus, some of them
+						// are Perf jobs, which we want to keep consistent.
+						d["cpu"] = "x86-64-i7-4578U"
+					}
 				}
 			} else if b.os("ChromeOS") {
 				version, ok := map[string]string{
@@ -958,7 +964,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 	} else {
 		d["gpu"] = "none"
 		if d["os"] == DEFAULT_OS_LINUX_GCE {
-			if b.extraConfig("CanvasKit", "CMake", "Docker", "PathKit") || b.role("BuildStats") {
+			if b.extraConfig("CanvasKit", "CMake", "Docker", "PathKit") || b.role("BuildStats", "CodeSize") {
 				b.linuxGceDimensions(MACHINE_TYPE_MEDIUM)
 				return
 			}
@@ -1111,41 +1117,14 @@ func (b *jobBuilder) createPushAppsFromSkiaDockerImage() {
 		)
 		b.dep(b.buildTaskDrivers("linux", "amd64"))
 		b.dep(b.createDockerImage(false))
-		b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin")
-		b.cas(CAS_EMPTY)
-		b.serviceAccount(b.cfg.ServiceAccountCompile)
-		b.linuxGceDimensions(MACHINE_TYPE_MEDIUM)
-		b.usesDocker()
-		b.cache(CACHES_DOCKER...)
-	})
-}
-
-// createPushAppsFromWASMDockerImage creates and pushes docker images of some apps
-// (eg: jsfiddle, skottie, particles) using the skia-wasm-release docker image.
-func (b *jobBuilder) createPushAppsFromWASMDockerImage() {
-	b.addTask(b.Name, func(b *taskBuilder) {
-		// TODO(borenet): Make this task not use Git.
-		b.usesGit()
-		b.cmd(
-			"./push_apps_from_wasm_image",
-			"--project_id", "skia-swarming-bots",
-			"--task_id", specs.PLACEHOLDER_TASK_ID,
-			"--task_name", b.Name,
-			"--workdir", ".",
-			"--repo", specs.PLACEHOLDER_REPO,
-			"--revision", specs.PLACEHOLDER_REVISION,
-			"--patch_issue", specs.PLACEHOLDER_ISSUE,
-			"--patch_set", specs.PLACEHOLDER_PATCHSET,
-			"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
-		)
-		b.dep(b.buildTaskDrivers("linux", "amd64"))
-		b.dep(b.createDockerImage(true))
-		b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin")
+		b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin", "bazelisk")
 		b.cas(CAS_EMPTY)
+		b.cipd(b.MustGetCipdPackageFromAsset("bazelisk"))
 		b.serviceAccount(b.cfg.ServiceAccountCompile)
 		b.linuxGceDimensions(MACHINE_TYPE_MEDIUM)
 		b.usesDocker()
 		b.cache(CACHES_DOCKER...)
+		b.timeout(2 * time.Hour)
 	})
 }
 
@@ -1186,8 +1165,6 @@ func (b *taskBuilder) maybeAddIosDevImage() {
 			// Other patch versions can be added to the same case.
 			case "11.4.1":
 				asset = "ios-dev-image-11.4"
-			case "12.4.5":
-				asset = "ios-dev-image-12.4"
 			case "13.3.1":
 				asset = "ios-dev-image-13.3"
 			case "13.4.1":
@@ -1465,6 +1442,48 @@ func (b *jobBuilder) buildstats() {
 	}
 }
 
+// codesize generates a codesize task, which takes binary produced by a
+// compile task, runs Bloaty against it, and uploads the resulting code size
+// statistics to the GCS bucket belonging to the codesize.skia.org service.
+func (b *jobBuilder) codesize() {
+	compileTaskName := b.compile()
+	bloatyCipdPkg := b.MustGetCipdPackageFromAsset("bloaty")
+
+	b.addTask(b.Name, func(b *taskBuilder) {
+		b.cas(CAS_EMPTY)
+		b.dep(b.buildTaskDrivers("linux", "amd64"), compileTaskName)
+		b.cmd("./codesize",
+			"--local=false",
+			"--project_id", "skia-swarming-bots",
+			"--task_id", specs.PLACEHOLDER_TASK_ID,
+			"--task_name", b.Name,
+			"--compile_task_name", compileTaskName,
+			// Note: the binary name cannot contain dashes, otherwise the naming
+			// schema logic will partition it into multiple parts.
+			//
+			// If we ever need to define a CodeSize-* task for a binary with
+			// dashes in its name (e.g. "my-binary"), a potential workaround is to
+			// create a mapping from a new, non-dashed binary name (e.g. "my_binary")
+			// to the actual binary name with dashes. This mapping can be hardcoded
+			// in this function; no changes to the task driver would be necessary.
+			"--binary_name", b.parts["binary_name"],
+			"--bloaty_cipd_version", bloatyCipdPkg.Version,
+			"--repo", specs.PLACEHOLDER_REPO,
+			"--revision", specs.PLACEHOLDER_REVISION,
+			"--patch_issue", specs.PLACEHOLDER_ISSUE,
+			"--patch_set", specs.PLACEHOLDER_PATCHSET,
+			"--patch_server", specs.PLACEHOLDER_CODEREVIEW_SERVER,
+		)
+		b.linuxGceDimensions(MACHINE_TYPE_SMALL)
+		b.cache(CACHES_WORKDIR...)
+		b.cipd(CIPD_PKG_LUCI_AUTH)
+		b.asset("bloaty")
+		b.serviceAccount("skia-external-codesize@skia-swarming-bots.iam.gserviceaccount.com")
+		b.timeout(20 * time.Minute)
+		b.attempts(1)
+	})
+}
+
 // doUpload indicates whether the given Job should upload its results.
 func (b *jobBuilder) doUpload() bool {
 	for _, s := range b.cfg.NoUpload {
diff --git a/third_party/skia/infra/bots/gen_tasks_logic/job_builder.go b/third_party/skia/infra/bots/gen_tasks_logic/job_builder.go
index 892278952c767..e9925a79ed649 100644
--- a/third_party/skia/infra/bots/gen_tasks_logic/job_builder.go
+++ b/third_party/skia/infra/bots/gen_tasks_logic/job_builder.go
@@ -121,9 +121,6 @@ func (b *jobBuilder) genTasksForJob() {
 	if b.extraConfig("PushAppsFromSkiaDockerImage") {
 		b.createPushAppsFromSkiaDockerImage()
 		return
-	} else if b.extraConfig("PushAppsFromWASMDockerImage") {
-		b.createPushAppsFromWASMDockerImage()
-		return
 	} else if b.extraConfig("PushBazelAppsFromWASMDockerImage") {
 		b.createPushBazelAppsFromWASMDockerImage()
 		return
@@ -166,6 +163,11 @@ func (b *jobBuilder) genTasksForJob() {
 		return
 	}
 
+	if b.role("CodeSize") {
+		b.codesize()
+		return
+	}
+
 	// Valgrind runs at a low priority so that it doesn't occupy all the bots.
 	if b.extraConfig("Valgrind") {
 		// Priority of 0.085 should result in Valgrind tasks with a blamelist of ~10 commits having the
@@ -226,7 +228,7 @@ func (b *jobBuilder) finish() {
 		b.trigger(specs.TRIGGER_NIGHTLY)
 	} else if b.frequency("Weekly") {
 		b.trigger(specs.TRIGGER_WEEKLY)
-	} else if b.extraConfig("Flutter", "CommandBuffer", "CreateDockerImage") {
+	} else if b.extraConfig("Flutter", "CommandBuffer", "CreateDockerImage", "PushAppsFromSkiaDockerImage", "PushBazelAppsFromWASMDockerImage") {
 		b.trigger(specs.TRIGGER_MAIN_ONLY)
 	} else if b.frequency("OnDemand") || b.role("Canary") {
 		b.trigger(specs.TRIGGER_ON_DEMAND)
diff --git a/third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go b/third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go
index c346bcdbb6efc..93d003601765d 100644
--- a/third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go
+++ b/third_party/skia/infra/bots/gen_tasks_logic/nano_flags.go
@@ -161,7 +161,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 			configs = []string{"gles"}
 		}
 		if b.extraConfig("SwiftShader") {
-			configs = []string{"gles", "glesdmsaa"}
+			configs = []string{"vk", "vkdmsaa"}
 		}
 	}
 
diff --git a/third_party/skia/infra/bots/jobs.json b/third_party/skia/infra/bots/jobs.json
index 9fd1b76cbc4a4..9ae1d09c2cf5a 100644
--- a/third_party/skia/infra/bots/jobs.json
+++ b/third_party/skia/infra/bots/jobs.json
@@ -141,6 +141,7 @@
     "name": "Build-Mac-Clang-arm64-Debug-Graphite_NoGpu",
     "cq_config": {}
   },
+  {"name": "Build-Mac-Clang-arm64-Debug-ASAN"},
   {"name": "Build-Mac-Clang-arm64-Debug-ASAN_Graphite"},
   {"name": "Build-Mac-Clang-arm64-Debug-iOS_Graphite"},
   {"name": "Build-Win-Clang-arm64-Release"},
@@ -222,6 +223,22 @@
   {"name": "Canary-Chromium"},
   {"name": "Canary-Flutter"},
   {"name": "Canary-G3"},
+  {
+    "name": "CodeSize-dm-Debian10-Clang-x86_64-Debug",
+    "cq_config": {}
+  },
+  {
+    "name": "CodeSize-dm-Debian10-Clang-x86_64-Release",
+    "cq_config": {}
+  },
+  {
+    "name": "CodeSize-fm-Debian10-Clang-x86_64-Debug",
+    "cq_config": {}
+  },
+  {
+    "name": "CodeSize-fm-Debian10-Clang-x86_64-Release",
+    "cq_config": {}
+  },
   {"name": "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All"},
   {"name": "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN"},
   {"name": "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-MSAN"},
@@ -263,7 +280,6 @@
   {"name": "Housekeeper-PerCommit-IsolateSVG"},
   {"name": "Housekeeper-PerCommit-IsolateSkImage"},
   {"name": "Housekeeper-PerCommit-PushAppsFromSkiaDockerImage"},
-  {"name": "Housekeeper-PerCommit-PushAppsFromWASMDockerImage"},
   {"name": "Housekeeper-PerCommit-PushBazelAppsFromWASMDockerImage"},
   {
     "name": "Housekeeper-PerCommit-RunGnToBp",
@@ -283,6 +299,7 @@
   {"name": "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench"},
   {"name": "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench"},
   {"name": "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"},
+  {"name": "Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android"},
   {"name": "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"},
   {"name": "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android"},
   {"name": "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan"},
@@ -306,6 +323,7 @@
   {"name": "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"},
   {"name": "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android"},
   {"name": "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"},
+  {"name": "Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan"},
   {"name": "Perf-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android"},
   {"name": "Perf-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All"},
   {"name": "Perf-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All"},
@@ -350,12 +368,7 @@
   {"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Skpbench"},
   {"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-AllPathsVolatile_Skpbench"},
   {"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal_AllPathsVolatile_Skpbench"},
-  {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"},
-  {
-    "name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN",
-    "cq_config": {}
-  },
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats"},
@@ -405,8 +418,6 @@
   {"name": "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All"},
   {"name": "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All"},
   {"name": "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal"},
-  {"name": "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All"},
-  {"name": "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal"},
   {"name": "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All"},
   {"name": "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal"},
   {"name": "Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All"},
@@ -431,6 +442,8 @@
     "cq_config": {}
   },
   {"name": "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts"},
+  {"name": "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android"},
+  {"name": "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android"},
   {"name": "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android"},
   {"name": "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"},
   {"name": "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android"},
@@ -468,6 +481,9 @@
   {"name": "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android"},
   {"name": "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android"},
   {"name": "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"},
+  {"name": "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android"},
+  {"name": "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android"},
+  {"name": "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan"},
   {"name": "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android"},
   {"name": "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android"},
   {"name": "Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All"},
@@ -560,6 +576,7 @@
       ]
     }
   },
+  {"name": "Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All"},
   {"name": "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer"},
   {"name": "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All"},
@@ -571,10 +588,12 @@
   {"name": "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer"},
   {"name": "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All"},
   {"name": "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN"},
+  {"name": "Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All"},
   {"name": "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer"},
   {"name": "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All"},
   {"name": "Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"},
+  {"name": "Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All"},
   {"name": "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer"},
@@ -596,6 +615,8 @@
   {"name": "Test-Mac10.15.7-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"},
   {"name": "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal"},
   {"name": "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal"},
+  {"name": "Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"},
+  {"name": "Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5"},
   {"name": "Test-Mac11-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All"},
   {"name": "Test-Mac11-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts"},
   {"name": "Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All"},
@@ -603,18 +624,18 @@
   {"name": "Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-Metal"},
   {"name": "Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite"},
   {"name": "Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal"},
-  {
-    "name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN",
-    "cq_config": {}
-  },
+  {"name": "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All"},
+  {"name": "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal"},
+  {"name": "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All"},
+  {"name": "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal"},
+  {"name": "Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN"},
+  {"name": "Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"},
-  {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN"},
   {
     "name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan",
     "cq_config": {}
   },
-  {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext"},
   {
@@ -626,11 +647,8 @@
     "cq_config": {}
   },
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN"},
-  {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN"},
-  {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext"},
-  {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41"},
@@ -743,10 +761,6 @@
   {"name": "Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Debug-All-Metal"},
   {"name": "Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All"},
   {"name": "Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal"},
-  {"name": "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All"},
-  {"name": "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal"},
-  {"name": "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All"},
-  {"name": "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal"},
   {"name": "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All"},
   {"name": "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal"},
   {"name": "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All"},
@@ -759,4 +773,4 @@
   {"name": "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal"},
   {"name": "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All"},
   {"name": "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal"}
-]
\ No newline at end of file
+]
diff --git a/third_party/skia/infra/bots/recipe_modules/build/canvaskit.py b/third_party/skia/infra/bots/recipe_modules/build/canvaskit.py
index dba17a7bde4c4..312c754bb5077 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/canvaskit.py
+++ b/third_party/skia/infra/bots/recipe_modules/build/canvaskit.py
@@ -2,11 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-DOCKER_IMAGE = 'gcr.io/skia-public/canvaskit-emsdk:2.0.20_v1'
+DOCKER_IMAGE = 'gcr.io/skia-public/canvaskit-emsdk:3.1.3_v1'
 INNER_BUILD_SCRIPT = '/SRC/skia/infra/canvaskit/build_canvaskit.sh'
 
 
 def compile_fn(api, checkout_root, _ignore):
+  skia_dir = checkout_root.join('skia')
   out_dir = api.vars.cache_dir.join('docker', 'canvaskit')
   configuration = api.vars.builder_cfg.get('configuration', '')
   extra = api.vars.builder_cfg.get('extra_config', '')
@@ -18,7 +19,14 @@ def compile_fn(api, checkout_root, _ignore):
   # param. Instead, we use a "canvaskit" subdirectory in the "docker" named_cache.
   api.file.ensure_directory('mkdirs out_dir', out_dir, mode=0o777)
 
-  # This uses the emscriptem sdk docker image and says "run the
+  # Download the emsdk binaries (we won't actually use the ones on the Docker
+  # image anymore, now that we have proper GN support)
+  with api.context(cwd=skia_dir):
+    api.run(api.python, 'activate-emsdk',
+            script=skia_dir.join('bin', 'activate-emsdk'),
+            infra_step=True)
+
+  # This uses the emscripten sdk docker image and says "run the
   # build_canvaskit.sh helper script in there". Additionally, it binds two
   # folders: the Skia checkout to /SRC and the output directory to /OUT
   # The called helper script will make the compile happen and put the
diff --git a/third_party/skia/infra/bots/recipe_modules/build/chromebook.py b/third_party/skia/infra/bots/recipe_modules/build/chromebook.py
index 2dc8db4c902a5..b29f3c78f0c27 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/chromebook.py
+++ b/third_party/skia/infra/bots/recipe_modules/build/chromebook.py
@@ -5,23 +5,12 @@
 from . import util
 import os
 
-IMAGES = {
-    # Used to build ChromeOS for Pixelbook in Debian9, to align GLIBC versions.
-    'Debian9': (
-        'gcr.io/skia-public/debian9@sha256:'
-        '7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3'),
-}
-
 def compile_fn(api, checkout_root, out_dir):
   skia_dir      = checkout_root.join('skia')
   configuration = api.vars.builder_cfg.get('configuration')
   target_arch   = api.vars.builder_cfg.get('target_arch')
-  os_name = api.vars.builder_cfg.get('os', '')
-  builder_name = api.vars.builder_name
 
-  # Currently we mount this directory to /SRC in Docker.
-  # TODO(westont): Add docker module API to match binding to actual structure.
-  top_level = '/SRC' if 'Docker' in builder_name else str(api.vars.workdir)
+  top_level = str(api.vars.workdir)
 
   clang_linux = os.path.join(top_level, 'clang_linux')
   # This is a pretty typical arm-linux-gnueabihf sysroot
@@ -58,8 +47,8 @@ def compile_fn(api, checkout_root, out_dir):
       '--sysroot=%s' % sysroot_dir,
       '-I%s' % os.path.join(gl_dir, 'include'),
       '-I%s' % os.path.join(sysroot_dir, 'include'),
-      '-I%s' % os.path.join(sysroot_dir, 'include', 'c++', '6'),
-      '-I%s' % os.path.join(sysroot_dir, 'include', 'c++', '6', 'arm-linux-gnueabihf'),
+      '-I%s' % os.path.join(sysroot_dir, 'include', 'c++', '10'),
+      '-I%s' % os.path.join(sysroot_dir, 'include', 'c++', '10', 'arm-linux-gnueabihf'),
       '-DMESA_EGL_NO_X11_HEADERS',
       '-U_GLIBCXX_DEBUG',
     ]
@@ -99,15 +88,6 @@ def compile_fn(api, checkout_root, out_dir):
 
   gn = skia_dir.join('bin', 'gn')
 
-  if os_name == 'Debian9' and 'Docker' in builder_name:
-    script = api.build.resource('docker-chromeos-compile.sh')
-    image_hash = IMAGES[os_name]
-    # Invalidate incremental build cache if image changes.
-    args['extra_cflags'].append('-DREBUILD_IF_CHANGED_docker_image=%s' % image_hash)
-    api.docker.run('Run build script in Docker', image_hash,
-                   checkout_root, out_dir, script, args=[util.py_to_gn(args)])
-    return
-
   with api.context(cwd=skia_dir, env=env):
     api.run(api.python, 'fetch-gn',
             script=skia_dir.join('bin', 'fetch-gn'),
diff --git a/third_party/skia/infra/bots/recipe_modules/build/default.py b/third_party/skia/infra/bots/recipe_modules/build/default.py
index 5b389da554984..ed29b33f61849 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/default.py
+++ b/third_party/skia/infra/bots/recipe_modules/build/default.py
@@ -25,7 +25,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
   Args:
     swiftshader_root: root of the SwiftShader checkout.
     cc, cxx: compiler binaries to use
-    out: target directory for libEGL.so and libGLESv2.so
+    out: target directory for libvk_swiftshader.so
   """
   swiftshader_opts = [
       '-DSWIFTSHADER_BUILD_TESTS=OFF',
@@ -48,8 +48,6 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
   san = None
   if 'MSAN' in extra_tokens:
     san = ('msan','memory')
-  elif 'TSAN' in extra_tokens:
-    san = ('tsan','thread')
 
   if san:
     short,full = san
@@ -62,6 +60,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
       '-lc++abi',
       '-I%s/include' % libcxx,
       '-I%s/include/c++/v1' % libcxx,
+      '-Wno-unused-command-line-argument'  # Are -lc++abi and -Llibcxx/lib always unused?
     ])
     swiftshader_opts.extend([
       '-DSWIFTSHADER_{}=ON'.format(short.upper()),
@@ -76,12 +75,7 @@ def compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, out):
             cmd=['cmake'] + swiftshader_opts + [swiftshader_root, '-GNinja'])
     # See https://swiftshader-review.googlesource.com/c/SwiftShader/+/56452 for when the
     # deprecated targets were added. See skbug.com/12386 for longer-term plans.
-    api.run(api.step, 'swiftshader ninja',
-            cmd=['ninja', '-C', out, 'libEGL_deprecated.so', 'libGLESv2_deprecated.so'])
-    api.run(api.step, 'rename legacy libEGL binary',
-            cmd=['cp', 'libEGL_deprecated.so', 'libEGL.so'])
-    api.run(api.step, 'rename legacy libGLESv2 binary',
-            cmd=['cp', 'libGLESv2_deprecated.so', 'libGLESv2.so'])
+    api.run(api.step, 'swiftshader ninja', cmd=['ninja', '-C', out, 'vk_swiftshader'])
 
 
 def compile_fn(api, checkout_root, out_dir):
@@ -133,9 +127,9 @@ def compile_fn(api, checkout_root, out_dir):
       api.step('select xcode', [
           'sudo', 'xcode-select', '-switch', xcode_app_path])
       if 'iOS' in extra_tokens:
-        # Need to verify compilation for Metal on 9.0 and above
-        env['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
-        args['ios_min_target'] = '"9.0"'
+        # Our current min-spec for Skia is iOS 11
+        env['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+        args['ios_min_target'] = '"11.0"'
       else:
         # We have some bots on 10.13.
         env['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
@@ -240,16 +234,9 @@ def compile_fn(api, checkout_root, out_dir):
     swiftshader_root = skia_dir.join('third_party', 'externals', 'swiftshader')
     swiftshader_out = out_dir.join('swiftshader_out')
     compile_swiftshader(api, extra_tokens, swiftshader_root, cc, cxx, swiftshader_out)
-    args['skia_use_egl'] = 'true'
-    extra_cflags.extend([
-        '-DGR_EGL_TRY_GLES3_THEN_GLES2',
-        '-I%s' % skia_dir.join(
-            'third_party', 'externals', 'egl-registry', 'api'),
-        '-I%s' % skia_dir.join(
-            'third_party', 'externals', 'opengl-registry', 'api'),
-    ])
-    extra_ldflags.extend([
-        '-L%s' % swiftshader_out,
+    args['skia_use_vulkan'] = 'true'
+    extra_cflags.extend(['-DSK_GPU_TOOLS_VK_LIBRARY_NAME=%s' %
+        api.vars.swarming_out_dir.join('swiftshader_out', 'libvk_swiftshader.so'),
     ])
   if 'CommandBuffer' in extra_tokens:
     # CommandBuffer runs against GLES version of CommandBuffer also, so
@@ -293,7 +280,12 @@ def compile_fn(api, checkout_root, out_dir):
   if 'Vulkan' in extra_tokens and not 'Android' in extra_tokens:
     args['skia_use_vulkan'] = 'true'
     args['skia_enable_vulkan_debug_layers'] = 'true'
-    args['skia_use_gl'] = 'false'
+    # When running TSAN with Vulkan on NVidia, we experienced some timeouts. We found
+    # a workaround (in GrContextFactory) that requires GL (in addition to Vulkan).
+    if 'TSAN' in extra_tokens:
+      args['skia_use_gl'] = 'true'
+    else:
+      args['skia_use_gl'] = 'false'
   if 'Direct3D' in extra_tokens:
     args['skia_use_direct3d'] = 'true'
     args['skia_use_gl'] = 'false'
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json
index 272dfd90a0b3c..7f45d4f3a552c 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-arm-Release-Chromebook_GLES.json
@@ -37,7 +37,7 @@
       "[START_DIR]/cache/work/skia/bin/gn",
       "gen",
       "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-arm-Release-Chromebook_GLES/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_arm_gles/include\",\"-I[START_DIR]/armhf_sysroot/include\",\"-I[START_DIR]/armhf_sysroot/include/c++/6\",\"-I[START_DIR]/armhf_sysroot/include/c++/6/arm-linux-gnueabihf\",\"-DMESA_EGL_NO_X11_HEADERS\",\"-U_GLIBCXX_DEBUG\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\",\"--sysroot=[START_DIR]/armhf_sysroot\",\"-static-libstdc++\",\"-static-libgcc\",\"-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\" werror=true"
+      "--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++/10\",\"-I[START_DIR]/armhf_sysroot/include/c++/10/arm-linux-gnueabihf\",\"-DMESA_EGL_NO_X11_HEADERS\",\"-U_GLIBCXX_DEBUG\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\"] extra_ldflags=[\"--target=armv7a-linux-gnueabihf\",\"--sysroot=[START_DIR]/armhf_sysroot\",\"-static-libstdc++\",\"-static-libgcc\",\"-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\" werror=true"
     ],
     "cwd": "[START_DIR]/cache/work/skia",
     "env": {
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN.json
index 2cf12fc221a62..8bd8982bb4ae9 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN.json
@@ -39,8 +39,8 @@
       "-DSWIFTSHADER_WARNINGS_AS_ERRORS=OFF",
       "-DREACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION=OFF",
       "-DSWIFTSHADER_MSAN=ON",
-      "-DCMAKE_C_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1",
-      "-DCMAKE_CXX_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1",
+      "-DCMAKE_C_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1 -Wno-unused-command-line-argument",
+      "-DCMAKE_CXX_FLAGS=-fsanitize=memory -stdlib=libc++ -L[START_DIR]/clang_linux/msan/lib -lc++abi -I[START_DIR]/clang_linux/msan/include -I[START_DIR]/clang_linux/msan/include/c++/v1 -Wno-unused-command-line-argument",
       "[START_DIR]/cache/work/skia/third_party/externals/swiftshader",
       "-GNinja"
     ],
@@ -59,8 +59,7 @@
       "ninja",
       "-C",
       "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out",
-      "libEGL_deprecated.so",
-      "libGLESv2_deprecated.so"
+      "vk_swiftshader"
     ],
     "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out",
     "env": {
@@ -72,38 +71,6 @@
     },
     "name": "swiftshader ninja"
   },
-  {
-    "cmd": [
-      "cp",
-      "libEGL_deprecated.so",
-      "libEGL.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libEGL binary"
-  },
-  {
-    "cmd": [
-      "cp",
-      "libGLESv2_deprecated.so",
-      "libGLESv2.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libGLESv2 binary"
-  },
   {
     "cmd": [
       "python",
@@ -139,7 +106,7 @@
       "[START_DIR]/cache/work/skia/bin/gn",
       "gen",
       "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug",
-      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-O1\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN/Debug/swiftshader_out\"] sanitize=\"MSAN\" skia_use_egl=true skia_use_fontconfig=false target_cpu=\"x86_64\" werror=true"
+      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-O1\", \"-DSK_GPU_TOOLS_VK_LIBRARY_NAME=[START_DIR]/[SWARM_OUT_DIR]/swiftshader_out/libvk_swiftshader.so\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/msan\"] sanitize=\"MSAN\" skia_use_fontconfig=false skia_use_vulkan=true target_cpu=\"x86_64\" werror=true"
     ],
     "cwd": "[START_DIR]/cache/work/skia",
     "env": {
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN.json
deleted file mode 100644
index f704c0d5eb4ba..0000000000000
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN.json
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "Get clang_linux VERSION",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@VERSION@42@@@",
-      "@@@STEP_LOG_END@VERSION@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out"
-    ],
-    "infra_step": true,
-    "name": "makedirs swiftshader_out"
-  },
-  {
-    "cmd": [
-      "cmake",
-      "-DSWIFTSHADER_BUILD_TESTS=OFF",
-      "-DSWIFTSHADER_WARNINGS_AS_ERRORS=OFF",
-      "-DREACTOR_ENABLE_MEMORY_SANITIZER_INSTRUMENTATION=OFF",
-      "-DSWIFTSHADER_TSAN=ON",
-      "-DCMAKE_C_FLAGS=-fsanitize=thread -stdlib=libc++ -L[START_DIR]/clang_linux/tsan/lib -lc++abi -I[START_DIR]/clang_linux/tsan/include -I[START_DIR]/clang_linux/tsan/include/c++/v1",
-      "-DCMAKE_CXX_FLAGS=-fsanitize=thread -stdlib=libc++ -L[START_DIR]/clang_linux/tsan/lib -lc++abi -I[START_DIR]/clang_linux/tsan/include -I[START_DIR]/clang_linux/tsan/include/c++/v1",
-      "[START_DIR]/cache/work/skia/third_party/externals/swiftshader",
-      "-GNinja"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "swiftshader cmake"
-  },
-  {
-    "cmd": [
-      "ninja",
-      "-C",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-      "libEGL_deprecated.so",
-      "libGLESv2_deprecated.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "swiftshader ninja"
-  },
-  {
-    "cmd": [
-      "cp",
-      "libEGL_deprecated.so",
-      "libEGL.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libEGL binary"
-  },
-  {
-    "cmd": [
-      "cp",
-      "libGLESv2_deprecated.so",
-      "libGLESv2.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libGLESv2 binary"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[START_DIR]/cache/work/skia/bin/fetch-gn"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia",
-    "env": {
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "infra_step": true,
-    "name": "fetch-gn"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/ccache_linux/bin/ccache",
-      "-s"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia",
-    "env": {
-      "CCACHE_COMPILERCHECK": "content",
-      "CCACHE_DIR": "[START_DIR]/cache/ccache",
-      "CCACHE_MAXFILES": "0",
-      "CCACHE_MAXSIZE": "75G",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "name": "ccache stats-start"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cache/work/skia/bin/gn",
-      "gen",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug",
-      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-O1\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/tsan\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out\"] sanitize=\"TSAN\" skia_use_egl=true target_cpu=\"x86_64\" werror=true"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia",
-    "env": {
-      "CCACHE_COMPILERCHECK": "content",
-      "CCACHE_DIR": "[START_DIR]/cache/ccache",
-      "CCACHE_MAXFILES": "0",
-      "CCACHE_MAXSIZE": "75G",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "name": "gn gen"
-  },
-  {
-    "cmd": [
-      "ninja",
-      "-C",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia",
-    "env": {
-      "CCACHE_COMPILERCHECK": "content",
-      "CCACHE_DIR": "[START_DIR]/cache/ccache",
-      "CCACHE_MAXFILES": "0",
-      "CCACHE_MAXSIZE": "75G",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "name": "ninja"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/ccache_linux/bin/ccache",
-      "-s"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia",
-    "env": {
-      "CCACHE_COMPILERCHECK": "content",
-      "CCACHE_DIR": "[START_DIR]/cache/ccache",
-      "CCACHE_MAXFILES": "0",
-      "CCACHE_MAXSIZE": "75G",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "name": "ccache stats-end"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print('Copying build product %s to %s' % (f, dst_path))\n    shutil.move(f, dst_path)\n",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug",
-      "[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
-    ],
-    "infra_step": true,
-    "name": "copy build products",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@import errno@@@",
-      "@@@STEP_LOG_LINE@python.inline@import glob@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os@@@",
-      "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
-      "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
-      "@@@STEP_LOG_LINE@python.inline@build_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(dst)@@@",
-      "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  if e.errno != errno.EEXIST:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@for pattern in build_products:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  path = os.path.join(src, pattern)@@@",
-      "@@@STEP_LOG_LINE@python.inline@  for f in glob.glob(path):@@@",
-      "@@@STEP_LOG_LINE@python.inline@    dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if not os.path.isdir(os.path.dirname(dst_path)):@@@",
-      "@@@STEP_LOG_LINE@python.inline@      os.makedirs(os.path.dirname(dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print('Copying build product %s to %s' % (f, dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    shutil.move(f, dst_path)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print('Copying build product %s to %s' % (f, dst_path))\n    shutil.move(f, dst_path)\n",
-      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN/Debug/swiftshader_out",
-      "[START_DIR]/[SWARM_OUT_DIR]/swiftshader_out"
-    ],
-    "infra_step": true,
-    "name": "copy build products (2)",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@import errno@@@",
-      "@@@STEP_LOG_LINE@python.inline@import glob@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os@@@",
-      "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
-      "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
-      "@@@STEP_LOG_LINE@python.inline@build_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(dst)@@@",
-      "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  if e.errno != errno.EEXIST:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@for pattern in build_products:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  path = os.path.join(src, pattern)@@@",
-      "@@@STEP_LOG_LINE@python.inline@  for f in glob.glob(path):@@@",
-      "@@@STEP_LOG_LINE@python.inline@    dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if not os.path.isdir(os.path.dirname(dst_path)):@@@",
-      "@@@STEP_LOG_LINE@python.inline@      os.makedirs(os.path.dirname(dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print('Copying build product %s to %s' % (f, dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    shutil.move(f, dst_path)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN.json
similarity index 55%
rename from third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
rename to third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN.json
index 075472ee2a87a..886059c971ff0 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN.json
@@ -17,107 +17,93 @@
       "@@@STEP_LOG_END@VERSION@@@"
     ]
   },
-  {
-    "cmd": [],
-    "name": "Docker setup"
-  },
   {
     "cmd": [
       "python",
       "-u",
-      "import os\nprint('%d:%d' % (os.getuid(), os.getgid()))\n"
-    ],
-    "name": "Docker setup.Get uid and gid",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os@@@",
-      "@@@STEP_LOG_LINE@python.inline@print('%d:%d' % (os.getuid(), os.getgid()))@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug"
+      "[START_DIR]/cache/work/skia/bin/fetch-gn"
     ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
     "infra_step": true,
-    "name": "Docker setup.mkdirs out_dir",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "name": "fetch-gn"
   },
   {
     "cmd": [
-      "chmod",
-      "777",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug"
+      "[START_DIR]/ccache_linux/bin/ccache",
+      "-s"
     ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 777 [START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CCACHE_COMPILERCHECK": "content",
+      "CCACHE_DIR": "[START_DIR]/cache/ccache",
+      "CCACHE_MAXFILES": "0",
+      "CCACHE_MAXSIZE": "75G",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "name": "ccache stats-start"
   },
   {
     "cmd": [
-      "chmod",
-      "755",
-      "[START_DIR]/cache/work"
+      "[START_DIR]/cache/work/skia/bin/gn",
+      "gen",
+      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN/Debug",
+      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-O1\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/tsan\"] sanitize=\"TSAN\" skia_enable_vulkan_debug_layers=true skia_use_gl=true skia_use_vulkan=true target_cpu=\"x86_64\" werror=true"
     ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 755 [START_DIR]/cache/work",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CCACHE_COMPILERCHECK": "content",
+      "CCACHE_DIR": "[START_DIR]/cache/ccache",
+      "CCACHE_MAXFILES": "0",
+      "CCACHE_MAXSIZE": "75G",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "name": "gn gen"
   },
   {
     "cmd": [
-      "chmod",
-      "0755",
-      "RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh"
+      "ninja",
+      "-C",
+      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN/Debug"
     ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 0755 RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CCACHE_COMPILERCHECK": "content",
+      "CCACHE_DIR": "[START_DIR]/cache/ccache",
+      "CCACHE_MAXFILES": "0",
+      "CCACHE_MAXSIZE": "75G",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "name": "ninja"
   },
   {
     "cmd": [
-      "docker",
-      "run",
-      "--shm-size=2gb",
-      "--rm",
-      "--user",
-      "13:17",
-      "--mount",
-      "type=bind,source=[START_DIR]/cache/work,target=/SRC",
-      "--mount",
-      "type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug,target=/OUT",
-      "gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3",
-      "/SRC/../RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
-      "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
+      "[START_DIR]/ccache_linux/bin/ccache",
+      "-s"
     ],
+    "cwd": "[START_DIR]/cache/work/skia",
     "env": {
+      "CCACHE_COMPILERCHECK": "content",
+      "CCACHE_DIR": "[START_DIR]/cache/ccache",
+      "CCACHE_MAXFILES": "0",
+      "CCACHE_MAXSIZE": "75G",
       "CHROME_HEADLESS": "1",
-      "DOCKER_CONFIG": "/home/chrome-bot/.docker",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
-    "name": "Run build script in Docker"
+    "name": "ccache stats-end"
   },
   {
     "cmd": [
       "python",
       "-u",
       "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print('Copying build product %s to %s' % (f, dst_path))\n    shutil.move(f, dst_path)\n",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker/Debug",
+      "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN/Debug",
       "[START_DIR]/[SWARM_OUT_DIR]/out/Debug"
     ],
     "infra_step": true,
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SwiftShader.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SwiftShader.json
index da7e2f1f02012..b6ea933f562fa 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SwiftShader.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-Clang-x86_64-Release-SwiftShader.json
@@ -56,8 +56,7 @@
       "ninja",
       "-C",
       "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out",
-      "libEGL_deprecated.so",
-      "libGLESv2_deprecated.so"
+      "vk_swiftshader"
     ],
     "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out",
     "env": {
@@ -69,38 +68,6 @@
     },
     "name": "swiftshader ninja"
   },
-  {
-    "cmd": [
-      "cp",
-      "libEGL_deprecated.so",
-      "libEGL.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libEGL binary"
-  },
-  {
-    "cmd": [
-      "cp",
-      "libGLESv2_deprecated.so",
-      "libGLESv2.so"
-    ],
-    "cwd": "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out",
-    "env": {
-      "CC": "[START_DIR]/clang_linux/bin/clang",
-      "CHROME_HEADLESS": "1",
-      "CXX": "[START_DIR]/clang_linux/bin/clang++",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]:[START_DIR]/cmake_linux/bin",
-      "SWIFTSHADER_MSAN_INSTRUMENTED_LIBCXX_PATH": "/totally/phony/path"
-    },
-    "name": "rename legacy libGLESv2 binary"
-  },
   {
     "cmd": [
       "python",
@@ -136,7 +103,7 @@
       "[START_DIR]/cache/work/skia/bin/gn",
       "gen",
       "[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release",
-      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-DGR_EGL_TRY_GLES3_THEN_GLES2\", \"-I[START_DIR]/cache/work/skia/third_party/externals/egl-registry/api\", \"-I[START_DIR]/cache/work/skia/third_party/externals/opengl-registry/api\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\", \"-L[START_DIR]/cache/work/skia/out/Build-Debian10-Clang-x86_64-Release-SwiftShader/Release/swiftshader_out\"] is_debug=false skia_use_egl=true target_cpu=\"x86_64\" werror=true"
+      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cc_wrapper=\"[START_DIR]/ccache_linux/bin/ccache\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\", \"-DPLACEHOLDER_clang_linux_version=42\", \"-DSK_GPU_TOOLS_VK_LIBRARY_NAME=[START_DIR]/[SWARM_OUT_DIR]/swiftshader_out/libvk_swiftshader.so\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\", \"-L[START_DIR]/clang_linux/lib\"] is_debug=false skia_use_vulkan=true target_cpu=\"x86_64\" werror=true"
     ],
     "cwd": "[START_DIR]/cache/work/skia",
     "env": {
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json
index 760760b589446..0f40821b6372c 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Debug-PathKit.json
@@ -23,7 +23,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/pathkit:/OUT",
-      "gcr.io/skia-public/emsdk-base:2.0.20_v1",
+      "gcr.io/skia-public/emsdk-base:3.1.3_v1",
       "/SRC/skia/infra/pathkit/build_pathkit.sh",
       "debug",
       "asm.js"
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json
index c35f9bcff3aa8..40c9cb0848cab 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-asmjs-Release-PathKit.json
@@ -23,7 +23,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/pathkit:/OUT",
-      "gcr.io/skia-public/emsdk-base:2.0.20_v1",
+      "gcr.io/skia-public/emsdk-base:3.1.3_v1",
       "/SRC/skia/infra/pathkit/build_pathkit.sh",
       "asm.js"
     ],
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json
index 3eb5b89714429..95f1eb1868826 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-CanvasKit.json
@@ -14,6 +14,20 @@
     "infra_step": true,
     "name": "mkdirs out_dir"
   },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/cache/work/skia/bin/activate-emsdk"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "activate-emsdk"
+  },
   {
     "cmd": [
       "docker",
@@ -23,7 +37,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/canvaskit:/OUT",
-      "gcr.io/skia-public/canvaskit-emsdk:2.0.20_v1",
+      "gcr.io/skia-public/canvaskit-emsdk:3.1.3_v1",
       "/SRC/skia/infra/canvaskit/build_canvaskit.sh",
       "debug"
     ],
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json
index b8c9d5f17151a..8c1c20d187fe8 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Debug-PathKit.json
@@ -23,7 +23,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/pathkit:/OUT",
-      "gcr.io/skia-public/emsdk-base:2.0.20_v1",
+      "gcr.io/skia-public/emsdk-base:3.1.3_v1",
       "/SRC/skia/infra/pathkit/build_pathkit.sh",
       "debug"
     ],
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json
index 3c0a9a0b76a25..c57b840561fc9 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU.json
@@ -14,6 +14,20 @@
     "infra_step": true,
     "name": "mkdirs out_dir"
   },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "[START_DIR]/cache/work/skia/bin/activate-emsdk"
+    ],
+    "cwd": "[START_DIR]/cache/work/skia",
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "activate-emsdk"
+  },
   {
     "cmd": [
       "docker",
@@ -23,7 +37,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/canvaskit:/OUT",
-      "gcr.io/skia-public/canvaskit-emsdk:2.0.20_v1",
+      "gcr.io/skia-public/canvaskit-emsdk:3.1.3_v1",
       "/SRC/skia/infra/canvaskit/build_canvaskit.sh",
       "cpu"
     ],
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json
index 79354aa2235d8..1431b0708846b 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-EMCC-wasm-Release-PathKit.json
@@ -23,7 +23,7 @@
       "[START_DIR]/cache/work:/SRC",
       "--volume",
       "[START_DIR]/cache/docker/pathkit:/OUT",
-      "gcr.io/skia-public/emsdk-base:2.0.20_v1",
+      "gcr.io/skia-public/emsdk-base:3.1.3_v1",
       "/SRC/skia/infra/pathkit/build_pathkit.sh"
     ],
     "env": {
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
deleted file mode 100644
index abf5b2f6e0d9f..0000000000000
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker.json
+++ /dev/null
@@ -1,156 +0,0 @@
-[
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/cache/work/skia/infra/bots/assets/clang_linux/VERSION",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "Get clang_linux VERSION",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@VERSION@42@@@",
-      "@@@STEP_LOG_END@VERSION@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "Docker setup"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import os\nprint('%d:%d' % (os.getuid(), os.getgid()))\n"
-    ],
-    "name": "Docker setup.Get uid and gid",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os@@@",
-      "@@@STEP_LOG_LINE@python.inline@print('%d:%d' % (os.getuid(), os.getgid()))@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release"
-    ],
-    "infra_step": true,
-    "name": "Docker setup.mkdirs out_dir",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "chmod",
-      "777",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release"
-    ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 777 [START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "chmod",
-      "755",
-      "[START_DIR]/cache/work"
-    ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 755 [START_DIR]/cache/work",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "chmod",
-      "0755",
-      "RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh"
-    ],
-    "infra_step": true,
-    "name": "Docker setup.chmod 0755 RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "docker",
-      "run",
-      "--shm-size=2gb",
-      "--rm",
-      "--user",
-      "13:17",
-      "--mount",
-      "type=bind,source=[START_DIR]/cache/work,target=/SRC",
-      "--mount",
-      "type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release,target=/OUT",
-      "gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3",
-      "/SRC/../RECIPE_MODULE[skia::build]/resources/docker-chromeos-compile.sh",
-      "cc=\"/SRC/clang_linux/bin/clang\" cxx=\"/SRC/clang_linux/bin/clang++\" extra_asmflags=[] extra_cflags=[\"-DMESA_EGL_NO_X11_HEADERS\",\"-I/SRC/chromebook_x86_64_gles/include\",\"-DREBUILD_IF_CHANGED_clang_linux_version=42\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/debian9@sha256:7bdcb25e8c37597acd254b0c5b4ff8d004745eddede3363213bcc06fb0feace3\"] extra_ldflags=[\"-L/SRC/chromebook_x86_64_gles/lib\",\"-static-libstdc++\",\"-static-libgcc\",\"-fuse-ld=lld\"] is_debug=false skia_use_egl=true skia_use_fontconfig=false skia_use_system_freetype2=false target_cpu=\"x86_64\" werror=true"
-    ],
-    "env": {
-      "CHROME_HEADLESS": "1",
-      "DOCKER_CONFIG": "/home/chrome-bot/.docker",
-      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
-    },
-    "name": "Run build script in Docker"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "import errno\nimport glob\nimport os\nimport shutil\nimport sys\n\nsrc = sys.argv[1]\ndst = sys.argv[2]\nbuild_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']\n\ntry:\n  os.makedirs(dst)\nexcept OSError as e:\n  if e.errno != errno.EEXIST:\n    raise\n\nfor pattern in build_products:\n  path = os.path.join(src, pattern)\n  for f in glob.glob(path):\n    dst_path = os.path.join(dst, os.path.relpath(f, src))\n    if not os.path.isdir(os.path.dirname(dst_path)):\n      os.makedirs(os.path.dirname(dst_path))\n    print('Copying build product %s to %s' % (f, dst_path))\n    shutil.move(f, dst_path)\n",
-      "[START_DIR]/cache/work/skia/out/Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker/Release",
-      "[START_DIR]/[SWARM_OUT_DIR]/out/Release"
-    ],
-    "infra_step": true,
-    "name": "copy build products",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@import errno@@@",
-      "@@@STEP_LOG_LINE@python.inline@import glob@@@",
-      "@@@STEP_LOG_LINE@python.inline@import os@@@",
-      "@@@STEP_LOG_LINE@python.inline@import shutil@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1]@@@",
-      "@@@STEP_LOG_LINE@python.inline@dst = sys.argv[2]@@@",
-      "@@@STEP_LOG_LINE@python.inline@build_products = ['dm', 'dm.exe', 'dm.app', 'fm', 'fm.exe', 'nanobench.app', 'get_images_from_skps', 'get_images_from_skps.exe', 'nanobench', 'nanobench.exe', 'skpbench', 'skpbench.exe', '*.so', '*.dll', '*.dylib', 'skia_launcher', 'skottie_tool', 'lib/*.so', 'run_testlab']@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(dst)@@@",
-      "@@@STEP_LOG_LINE@python.inline@except OSError as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  if e.errno != errno.EEXIST:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@for pattern in build_products:@@@",
-      "@@@STEP_LOG_LINE@python.inline@  path = os.path.join(src, pattern)@@@",
-      "@@@STEP_LOG_LINE@python.inline@  for f in glob.glob(path):@@@",
-      "@@@STEP_LOG_LINE@python.inline@    dst_path = os.path.join(dst, os.path.relpath(f, src))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if not os.path.isdir(os.path.dirname(dst_path)):@@@",
-      "@@@STEP_LOG_LINE@python.inline@      os.makedirs(os.path.dirname(dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print('Copying build product %s to %s' % (f, dst_path))@@@",
-      "@@@STEP_LOG_LINE@python.inline@    shutil.move(f, dst_path)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
index edff59156bc69..c9bceb91bdf50 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Clang-arm64-Debug-iOS.json
@@ -60,7 +60,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ccache stats-start"
@@ -70,7 +70,7 @@
       "[START_DIR]/cache/work/skia/bin/gn",
       "gen",
       "[START_DIR]/cache/work/skia/out/Build-Mac-Clang-arm64-Debug-iOS/Debug",
-      "--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DREBUILD_IF_CHANGED_xcode_build_version=12c33\", \"-O1\"] ios_min_target=\"9.0\" skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
+      "--args=cc=\"clang\" cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" cxx=\"clang++\" extra_cflags=[\"-DREBUILD_IF_CHANGED_xcode_build_version=12c33\", \"-O1\"] ios_min_target=\"11.0\" skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
     ],
     "cwd": "[START_DIR]/cache/work/skia",
     "env": {
@@ -79,7 +79,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "gn gen"
@@ -97,7 +97,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ninja"
@@ -114,7 +114,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ccache stats-end"
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Xcode11.4.1-arm64-Debug-iOS.json b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Xcode11.4.1-arm64-Debug-iOS.json
index a4e79ae8ffabe..d2798e8eeb7c2 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Xcode11.4.1-arm64-Debug-iOS.json
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.expected/Build-Mac-Xcode11.4.1-arm64-Debug-iOS.json
@@ -60,7 +60,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ccache stats-start"
@@ -70,7 +70,7 @@
       "[START_DIR]/cache/work/skia/bin/gn",
       "gen",
       "[START_DIR]/cache/work/skia/out/Build-Mac-Xcode11.4.1-arm64-Debug-iOS/Debug",
-      "--args=cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" extra_cflags=[\"-DREBUILD_IF_CHANGED_xcode_build_version=11e503a\", \"-O1\"] ios_min_target=\"9.0\" skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
+      "--args=cc_wrapper=\"[START_DIR]/ccache_mac/bin/ccache\" extra_cflags=[\"-DREBUILD_IF_CHANGED_xcode_build_version=11e503a\", \"-O1\"] ios_min_target=\"11.0\" skia_ios_identity=\".*GS9WA.*\" skia_ios_profile=\"[START_DIR]/provisioning_profile_ios/Upstream_Testing_Provisioning_Profile.mobileprovision\" target_cpu=\"arm64\" target_os=\"ios\" werror=true"
     ],
     "cwd": "[START_DIR]/cache/work/skia",
     "env": {
@@ -79,7 +79,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "gn gen"
@@ -97,7 +97,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ninja"
@@ -114,7 +114,7 @@
       "CCACHE_MAXFILES": "0",
       "CCACHE_MAXSIZE": "50G",
       "CHROME_HEADLESS": "1",
-      "IPHONEOS_DEPLOYMENT_TARGET": "9.0",
+      "IPHONEOS_DEPLOYMENT_TARGET": "11.0",
       "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
     },
     "name": "ccache stats-end"
diff --git a/third_party/skia/infra/bots/recipe_modules/build/examples/full.py b/third_party/skia/infra/bots/recipe_modules/build/examples/full.py
index dc2ae8f55322c..1a4171c1aa1cf 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/examples/full.py
+++ b/third_party/skia/infra/bots/recipe_modules/build/examples/full.py
@@ -35,20 +35,18 @@ def RunSteps(api):
   'Build-Debian10-Clang-arm-Release-Android_API26',
   'Build-Debian10-Clang-arm-Release-Android_ASAN',
   'Build-Debian10-Clang-arm-Release-Chromebook_GLES',
-  'Build-Debian9-Clang-x86_64-Debug-Chromebook_GLES_Docker',
-  'Build-Debian9-Clang-x86_64-Release-Chromebook_GLES_Docker',
   'Build-Debian10-Clang-arm-Release-Flutter_Android',
   'Build-Debian10-Clang-arm64-Debug-Android_HWASAN',
   'Build-Debian10-Clang-arm64-Release-Android_Wuffs',
   'Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES',
   'Build-Debian10-Clang-x86_64-Debug-Coverage',
   'Build-Debian10-Clang-x86_64-Debug-MSAN',
-  'Build-Debian10-Clang-x86_64-Debug-TSAN',
   'Build-Debian10-Clang-x86_64-Debug-SK_CPU_LIMIT_SSE41',
   'Build-Debian10-Clang-x86_64-Debug-SafeStack',
   'Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN',
-  'Build-Debian10-Clang-x86_64-Debug-SwiftShader_TSAN',
+  'Build-Debian10-Clang-x86_64-Debug-TSAN',
   'Build-Debian10-Clang-x86_64-Debug-Tidy',
+  'Build-Debian10-Clang-x86_64-Debug-Vulkan_TSAN',
   'Build-Debian10-Clang-x86_64-Debug-Wuffs',
   'Build-Debian10-Clang-x86_64-Release-ANGLE',
   'Build-Debian10-Clang-x86_64-Release-ASAN',
diff --git a/third_party/skia/infra/bots/recipe_modules/build/pathkit.py b/third_party/skia/infra/bots/recipe_modules/build/pathkit.py
index 513fc8d97ad74..a3a20a633fc32 100644
--- a/third_party/skia/infra/bots/recipe_modules/build/pathkit.py
+++ b/third_party/skia/infra/bots/recipe_modules/build/pathkit.py
@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-base:2.0.20_v1'
+DOCKER_IMAGE = 'gcr.io/skia-public/emsdk-base:3.1.3_v1'
 INNER_BUILD_SCRIPT = '/SRC/skia/infra/pathkit/build_pathkit.sh'
 
 def compile_fn(api, checkout_root, _ignore):
diff --git a/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json b/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
index e648ca3df5dec..15b57fb9acda3 100644
--- a/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
+++ b/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
@@ -27,6 +27,18 @@
         "project"
       ]
     },
+    "CodeSize": {
+      "keys": [
+        "binary_name",
+        "os",
+        "compiler",
+        "target_arch",
+        "configuration"
+      ],
+      "optional_keys": [
+        "extra_config"
+      ]
+    },
     "Housekeeper": {
       "keys": [
         "frequency"
diff --git a/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py b/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py
index 499a6b39b772d..c20c60b3c3458 100644
--- a/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py
+++ b/third_party/skia/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.py
@@ -23,6 +23,7 @@
 BUILDER_ROLE_BUILD = 'Build'
 BUILDER_ROLE_BUILDSTATS = 'BuildStats'
 BUILDER_ROLE_CANARY = 'Canary'
+BUILDER_ROLE_CODESIZE = 'CodeSize'
 BUILDER_ROLE_HOUSEKEEPER = 'Housekeeper'
 BUILDER_ROLE_INFRA = 'Infra'
 BUILDER_ROLE_PERF = 'Perf'
@@ -32,6 +33,7 @@
 BUILDER_ROLES = (BUILDER_ROLE_BUILD,
                  BUILDER_ROLE_BUILDSTATS,
                  BUILDER_ROLE_CANARY,
+                 BUILDER_ROLE_CODESIZE,
                  BUILDER_ROLE_HOUSEKEEPER,
                  BUILDER_ROLE_INFRA,
                  BUILDER_ROLE_PERF,
diff --git a/third_party/skia/infra/bots/recipe_modules/flavor/android.py b/third_party/skia/infra/bots/recipe_modules/flavor/android.py
index bcfe97639bf5d..37be291abeb5f 100644
--- a/third_party/skia/infra/bots/recipe_modules/flavor/android.py
+++ b/third_party/skia/infra/bots/recipe_modules/flavor/android.py
@@ -43,7 +43,7 @@ def __init__(self, m, app_name):
     # on the list, we fail the task to avoid perf inconsistencies.
     self.cant_root = ['GalaxyS7_G930FD', 'GalaxyS9',
                       'GalaxyS20', 'MotoG4', 'NVIDIA_Shield',
-                      'P30', 'Pixel4','Pixel4XL', 'Pixel5', 'TecnoSpark3Pro']
+                      'P30', 'Pixel4','Pixel4XL', 'Pixel5', 'TecnoSpark3Pro', 'JioNext']
 
     # Maps device type -> CPU ids that should be scaled for nanobench.
     # Many devices have two (or more) different CPUs (e.g. big.LITTLE
@@ -69,7 +69,8 @@ def __init__(self, m, app_name):
     self.disable_for_nanobench = {
       'Nexus5x': range(0, 4),
       'Pixel': range(0, 2),
-      'Pixel2XL': range(0, 4)
+      'Pixel2XL': range(0, 4),
+      'Pixel6': range(4,8), # Only use the 4 small cores.
     }
 
     self.gpu_scaling = {
@@ -140,7 +141,7 @@ def _scale_for_dm(self):
       # AndroidOne doesn't support ondemand governor. hotplug is similar.
       if device == 'AndroidOne':
         self._set_governor(i, 'hotplug')
-      elif device in ['Pixel3a', 'Pixel4', 'Pixel4a', 'Wembley']:
+      elif device in ['Pixel3a', 'Pixel4', 'Pixel4a', 'Wembley', 'Pixel6']:
         # Pixel3a/4/4a have userspace powersave performance schedutil.
         # performance seems like a reasonable choice.
         self._set_governor(i, 'performance')
@@ -153,9 +154,13 @@ def _scale_for_nanobench(self):
       self.m.vars.internal_hardware_label):
       return
 
+    # Set to 'powersave' for Pixel6.
     for i in self.cpus_to_scale.get(device, [0]):
-      self._set_governor(i, 'userspace')
-      self._scale_cpu(i, 0.6)
+      if device in ['Pixel6']:
+        self._set_governor(i, 'powersave')
+      else:
+        self._set_governor(i, 'userspace')
+        self._scale_cpu(i, 0.6)
 
     for i in self.disable_for_nanobench.get(device, []):
       self._set_cpu_online(i, 0) # disable
diff --git a/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json b/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json
new file mode 100644
index 0000000000000..c8476e0ad7efc
--- /dev/null
+++ b/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android.json
@@ -0,0 +1,1335 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "import os\nprint(os.environ.get('SWARMING_BOT_ID', ''))\n"
+    ],
+    "name": "get swarming bot id",
+    "~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": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "file.txt",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push file.txt file.txt"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "cat",
+      "file.txt"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "read file.txt"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "file.txt"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm file.txt",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "rmtree",
+      "results_dir"
+    ],
+    "infra_step": true,
+    "name": "rmtree results_dir"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "ensure-directory",
+      "--mode",
+      "0777",
+      "results_dir"
+    ],
+    "infra_step": true,
+    "name": "makedirs results_dir"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "device_results_dir"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm device_results_dir",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "mkdir",
+      "-p",
+      "device_results_dir"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "mkdir device_results_dir"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "mkdir",
+      "-p",
+      "/sdcard/revenge_of_the_skiabot/resources"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n  raise Exception('adb root failed')\n\nsubprocess.check_output([\n    ADB, 'shell',\n    'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n        gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n    ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n        cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n  raise Exception('(actual, expected) (%s, %s)'\n                  % (actual_gov, gov))\n",
+      "/opt/infra-android/tools/adb",
+      "0",
+      "powersave"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "Set CPU 0's governor to powersave",
+    "timeout": 30,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(log)@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('adb root failed')@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@",
+      "@@@STEP_LOG_LINE@python.inline@    ADB, 'shell',@@@",
+      "@@@STEP_LOG_LINE@python.inline@    'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@",
+      "@@@STEP_LOG_LINE@python.inline@        gov, cpu)]).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@",
+      "@@@STEP_LOG_LINE@python.inline@    ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@",
+      "@@@STEP_LOG_LINE@python.inline@        cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('(actual, expected) (%s, %s)'@@@",
+      "@@@STEP_LOG_LINE@python.inline@                  % (actual_gov, gov))@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n  raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n  print('CPU %d online already %d' % (cpu, value))\n  sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n  raise Exception('(actual, expected) (%s, %d)'\n                  % (actual_status, value))\n",
+      "/opt/infra-android/tools/adb",
+      "4",
+      "0"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "Disabling CPU 4",
+    "timeout": 30,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(log)@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('adb root failed')@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@",
+      "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@",
+      "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print('CPU %d online already %d' % (cpu, value))@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit()@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@",
+      "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('(actual, expected) (%s, %d)'@@@",
+      "@@@STEP_LOG_LINE@python.inline@                  % (actual_status, value))@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n  raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n  print('CPU %d online already %d' % (cpu, value))\n  sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n  raise Exception('(actual, expected) (%s, %d)'\n                  % (actual_status, value))\n",
+      "/opt/infra-android/tools/adb",
+      "5",
+      "0"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "Disabling CPU 5",
+    "timeout": 30,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(log)@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('adb root failed')@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@",
+      "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@",
+      "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print('CPU %d online already %d' % (cpu, value))@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit()@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@",
+      "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('(actual, expected) (%s, %d)'@@@",
+      "@@@STEP_LOG_LINE@python.inline@                  % (actual_status, value))@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n  raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n  print('CPU %d online already %d' % (cpu, value))\n  sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n  raise Exception('(actual, expected) (%s, %d)'\n                  % (actual_status, value))\n",
+      "/opt/infra-android/tools/adb",
+      "6",
+      "0"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "Disabling CPU 6",
+    "timeout": 30,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(log)@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('adb root failed')@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@",
+      "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@",
+      "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print('CPU %d online already %d' % (cpu, value))@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit()@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@",
+      "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('(actual, expected) (%s, %d)'@@@",
+      "@@@STEP_LOG_LINE@python.inline@                  % (actual_status, value))@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n  raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n  print('CPU %d online already %d' % (cpu, value))\n  sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n  raise Exception('(actual, expected) (%s, %d)'\n                  % (actual_status, value))\n",
+      "/opt/infra-android/tools/adb",
+      "7",
+      "0"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "Disabling CPU 7",
+    "timeout": 30,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@import time@@@",
+      "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(log)@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('adb root failed')@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@",
+      "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@",
+      "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print('CPU %d online already %d' % (cpu, value))@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit()@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@",
+      "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@",
+      "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('(actual, expected) (%s, %d)'@@@",
+      "@@@STEP_LOG_LINE@python.inline@                  % (actual_status, value))@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/build/nanobench",
+      "/data/local/tmp/"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push nanobench"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/skia/resources",
+      "*"
+    ],
+    "infra_step": true,
+    "name": "ls [START_DIR]/skia/resources/*",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skia/resources/bar.jpg@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skia/resources/foo.png@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/skia/resources/bar.jpg",
+      "[START_DIR]/skia/resources/foo.png",
+      "/sdcard/revenge_of_the_skiabot/resources"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push --sync [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@VERSION@42@@@",
+      "@@@STEP_LOG_END@VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@SKP_VERSION@42@@@",
+      "@@@STEP_LOG_END@SKP_VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "cat",
+      "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/skps"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/skps",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "mkdir",
+      "-p",
+      "/sdcard/revenge_of_the_skiabot/skps"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/skp",
+      "*"
+    ],
+    "infra_step": true,
+    "name": "ls [START_DIR]/skp/*",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skp/bar.jpg@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skp/foo.png@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/skp/bar.jpg",
+      "[START_DIR]/skp/foo.png",
+      "/sdcard/revenge_of_the_skiabot/skps"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push --sync [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/tmp/SKP_VERSION",
+      "/sdcard/revenge_of_the_skiabot/SKP_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@VERSION@42@@@",
+      "@@@STEP_LOG_END@VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@",
+      "@@@STEP_LOG_END@SK_IMAGE_VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "cat",
+      "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/images"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/images",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "mkdir",
+      "-p",
+      "/sdcard/revenge_of_the_skiabot/images"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "mkdir /sdcard/revenge_of_the_skiabot/images"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/skimage",
+      "*"
+    ],
+    "infra_step": true,
+    "name": "ls [START_DIR]/skimage/*",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skimage/bar.jpg@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/skimage/foo.png@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/skimage/bar.jpg",
+      "[START_DIR]/skimage/foo.png",
+      "/sdcard/revenge_of_the_skiabot/images"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push --sync [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/tmp/SK_IMAGE_VERSION",
+      "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@VERSION@42@@@",
+      "@@@STEP_LOG_END@VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-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",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@SVG_VERSION@42@@@",
+      "@@@STEP_LOG_END@SVG_VERSION@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "cat",
+      "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n  output = subprocess.check_output(\n      cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n  output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n  raise Exception('%s exists despite being deleted' % path)\n",
+      "/opt/infra-android/tools/adb",
+      "/sdcard/revenge_of_the_skiabot/svgs"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "rm /sdcard/revenge_of_the_skiabot/svgs",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Remove the path.@@@",
+      "@@@STEP_LOG_LINE@python.inline@adb = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Removing %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'rm', '-rf', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(cmd)@@@",
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@# Verify that the path was deleted.@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Checking for existence of %s' % path)@@@",
+      "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = subprocess.check_output(@@@",
+      "@@@STEP_LOG_LINE@python.inline@      cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  output = e.output.decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@print(output)@@@",
+      "@@@STEP_LOG_LINE@python.inline@print('======')@@@",
+      "@@@STEP_LOG_LINE@python.inline@if 'No such file or directory' not in output:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  raise Exception('%s exists despite being deleted' % path)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "shell",
+      "mkdir",
+      "-p",
+      "/sdcard/revenge_of_the_skiabot/svgs"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[START_DIR]/svg",
+      "*"
+    ],
+    "infra_step": true,
+    "name": "ls [START_DIR]/svg/*",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/svg/bar.jpg@@@",
+      "@@@STEP_LOG_LINE@glob@[START_DIR]/svg/foo.png@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/svg/bar.jpg",
+      "[START_DIR]/svg/foo.png",
+      "/sdcard/revenge_of_the_skiabot/svgs"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push --sync [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/tmp/SVG_VERSION",
+      "/sdcard/revenge_of_the_skiabot/SVG_VERSION"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "set -x; LD_LIBRARY_PATH=/data/local/tmp/ /data/local/tmp/nanobench --some-flag; echo $? >/data/local/tmp/rc",
+      "[START_DIR]/tmp/nanobench.sh"
+    ],
+    "infra_step": true,
+    "name": "write nanobench.sh",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@nanobench.sh@set -x; LD_LIBRARY_PATH=/data/local/tmp/ /data/local/tmp/nanobench --some-flag; echo $? >/data/local/tmp/rc@@@",
+      "@@@STEP_LOG_END@nanobench.sh@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "push",
+      "[START_DIR]/tmp/nanobench.sh",
+      "/data/local/tmp/"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "push nanobench.sh"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "logcat",
+      "-c"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "clear log"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh      = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n  sys.exit(int(subprocess.check_output([\n      '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n  print(\"Couldn't read the return code.  Probably killed for OOM.\")\n  sys.exit(1)\n",
+      "/data/local/tmp/",
+      "nanobench.sh"
+    ],
+    "name": "nanobench",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@sh      = sys.argv[2]@@@",
+      "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@",
+      "@@@STEP_LOG_LINE@python.inline@try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit(int(subprocess.check_output([@@@",
+      "@@@STEP_LOG_LINE@python.inline@      '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@",
+      "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print(\"Couldn't read the return code.  Probably killed for OOM.\")@@@",
+      "@@@STEP_LOG_LINE@python.inline@  sys.exit(1)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [],
+    "name": "adb pull"
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "pull",
+      "/sdcard/revenge_of_the_skiabot/perf",
+      "[CLEANUP]/adb_pull_tmp_1"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "adb pull.pull /sdcard/revenge_of_the_skiabot/perf",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "glob",
+      "[CLEANUP]/adb_pull_tmp_1",
+      "perf/*"
+    ],
+    "infra_step": true,
+    "name": "adb pull.list pulled files",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/1.png@@@",
+      "@@@STEP_LOG_LINE@glob@[CLEANUP]/adb_pull_tmp_1/2.png@@@",
+      "@@@STEP_LOG_END@glob@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CLEANUP]/adb_pull_tmp_1/1.png",
+      "[START_DIR]/[SWARM_OUT_DIR]"
+    ],
+    "infra_step": true,
+    "name": "adb pull.copy 1.png",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "vpython",
+      "-u",
+      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+      "--json-output",
+      "/path/to/tmp/json",
+      "copy",
+      "[CLEANUP]/adb_pull_tmp_1/2.png",
+      "[START_DIR]/[SWARM_OUT_DIR]"
+    ],
+    "infra_step": true,
+    "name": "adb pull.copy 2.png",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output([\n    '/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8', errors='ignore')\nfor line in log.split('\\n'):\n  tokens = line.split()\n  if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n    addr, path = tokens[-2:]\n    local = os.path.join(out, os.path.basename(path))\n    if os.path.exists(local):\n      try:\n        sym = subprocess.check_output([\n            'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n        line = line.replace(addr, addr + ' ' + sym.strip())\n      except subprocess.CalledProcessError:\n        pass\n  print(line)\n",
+      "[START_DIR]/build"
+    ],
+    "env": {
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "dump log",
+    "timeout": 300,
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import os@@@",
+      "@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
+      "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([@@@",
+      "@@@STEP_LOG_LINE@python.inline@    '/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8', errors='ignore')@@@",
+      "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  tokens = line.split()@@@",
+      "@@@STEP_LOG_LINE@python.inline@  if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@",
+      "@@@STEP_LOG_LINE@python.inline@    addr, path = tokens[-2:]@@@",
+      "@@@STEP_LOG_LINE@python.inline@    local = os.path.join(out, os.path.basename(path))@@@",
+      "@@@STEP_LOG_LINE@python.inline@    if os.path.exists(local):@@@",
+      "@@@STEP_LOG_LINE@python.inline@      try:@@@",
+      "@@@STEP_LOG_LINE@python.inline@        sym = subprocess.check_output([@@@",
+      "@@@STEP_LOG_LINE@python.inline@            'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@",
+      "@@@STEP_LOG_LINE@python.inline@        line = line.replace(addr, addr + ' ' + sym.strip())@@@",
+      "@@@STEP_LOG_LINE@python.inline@      except subprocess.CalledProcessError:@@@",
+      "@@@STEP_LOG_LINE@python.inline@        pass@@@",
+      "@@@STEP_LOG_LINE@python.inline@  print(line)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "/opt/infra-android/tools/adb",
+      "kill-server"
+    ],
+    "cwd": "[START_DIR]/skia",
+    "env": {
+      "ADB_VENDOR_KEYS": "/home/chrome-bot/.android/chrome_infrastructure_adbkey",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "kill adb server"
+  },
+  {
+    "name": "$result"
+  }
+]
\ No newline at end of file
diff --git a/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.py b/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.py
index ddfab4950f568..07dc1ff0c08ed 100644
--- a/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/third_party/skia/infra/bots/recipe_modules/flavor/examples/full.py
@@ -86,6 +86,7 @@ def RunSteps(api):
   'Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android',
   'Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp',
   'Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan',
+  'Perf-Android-Clang-Pixel6-GPU-Adreno620-arm64-Release-All-Android',
   'Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All',
   'Perf-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN',
   'Perf-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN',
diff --git a/third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1 b/third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1
index 537b7cd4e986a..3338c836b583d 100644
--- a/third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1
+++ b/third_party/skia/infra/bots/recipe_modules/flavor/resources/win_run_and_check_log.ps1
@@ -34,8 +34,7 @@ $faults = Get-EventLog -LogName Application -InstanceId 1000 -EntryType Error `
   -After $begin -Before $end -ErrorAction SilentlyContinue
 
 if ($faults) {
-  Write-Host 'If the message below is unrelated to this run, `
-    please file a bug and assign to dogben.'
+  Write-Host 'First fault message:'
   Write-Host $faults[0].Message
   if ($res -eq 0) {
     $res = 2
diff --git a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit.json b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit.json
index 1f2df7bf78be5..940ad12a3f473 100644
--- a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit.json
+++ b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Debug-All-PathKit.json
@@ -81,10 +81,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/asmjs",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -98,10 +98,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.js",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -110,10 +110,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json
index 70213f137f9fa..81a3c05a37a2b 100644
--- a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json
+++ b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit.json
@@ -81,10 +81,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/asmjs",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -98,10 +98,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.js",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -110,10 +110,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -128,10 +128,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test (2)",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/asmjs (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -145,10 +145,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.js.mem",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js.mem"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js.mem"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.js.mem [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js.mem",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.js.mem [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js.mem",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -157,10 +157,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js.mem"
+      "[START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js.mem"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-asmjs/bin/test/pathkit.js.mem",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/asmjs/pathkit.js.mem",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit.json b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit.json
index 05b4138721992..1f838c435c53d 100644
--- a/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit.json
+++ b/third_party/skia/infra/bots/recipes/test_pathkit.expected/Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Debug-All-PathKit.json
@@ -81,10 +81,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -98,10 +98,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.js",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -110,10 +110,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -128,10 +128,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test (2)",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/wasm (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -145,10 +145,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.wasm",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.wasm [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.wasm [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -157,10 +157,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/third_party/skia/infra/bots/recipes/test_pathkit.expected/pathkit_trybot.json b/third_party/skia/infra/bots/recipes/test_pathkit.expected/pathkit_trybot.json
index f9096d280daf3..4dd85ca3a5395 100644
--- a/third_party/skia/infra/bots/recipes/test_pathkit.expected/pathkit_trybot.json
+++ b/third_party/skia/infra/bots/recipes/test_pathkit.expected/pathkit_trybot.json
@@ -81,10 +81,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -98,10 +98,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.js",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.js [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -110,10 +110,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.js",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.js",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -128,10 +128,10 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test"
+      "[START_DIR]/skia/modules/pathkit/build/wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test (2)",
+    "name": "Docker setup.mkdirs [START_DIR]/skia/modules/pathkit/build/wasm (2)",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -145,10 +145,10 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/build/pathkit.wasm",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.cp [START_DIR]/build/pathkit.wasm [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm",
+    "name": "Docker setup.cp [START_DIR]/build/pathkit.wasm [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -157,10 +157,10 @@
     "cmd": [
       "chmod",
       "644",
-      "[START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm"
+      "[START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm"
     ],
     "infra_step": true,
-    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/npm-wasm/bin/test/pathkit.wasm",
+    "name": "Docker setup.chmod 644 [START_DIR]/skia/modules/pathkit/build/wasm/pathkit.wasm",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
diff --git a/third_party/skia/infra/bots/recipes/test_pathkit.py b/third_party/skia/infra/bots/recipes/test_pathkit.py
index a2850c7b1d391..3acc99f621ae6 100644
--- a/third_party/skia/infra/bots/recipes/test_pathkit.py
+++ b/third_party/skia/infra/bots/recipes/test_pathkit.py
@@ -36,10 +36,10 @@ def RunSteps(api):
   # The karma script is configured to look in ./npm-(asmjs|wasm)/bin/test/ for
   # the test files to load, so we must copy them there (see Set up for docker).
   copy_dest = checkout_root.join('skia', 'modules', 'pathkit',
-                                 'npm-wasm', 'bin', 'test')
+                                 'build', 'wasm')
   if 'asmjs' in api.vars.builder_name:
     copy_dest = checkout_root.join('skia', 'modules', 'pathkit',
-                                   'npm-asmjs', 'bin', 'test')
+                                   'build', 'asmjs')
 
   base_dir = api.vars.build_dir
   bundle_name = 'pathkit.wasm'
diff --git a/third_party/skia/infra/bots/task_drivers/codesize/codesize.go b/third_party/skia/infra/bots/task_drivers/codesize/codesize.go
new file mode 100644
index 0000000000000..e0e5732d5feaf
--- /dev/null
+++ b/third_party/skia/infra/bots/task_drivers/codesize/codesize.go
@@ -0,0 +1,303 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This task driver takes a binary (e.g. "dm") built by a Build-* task (e.g.
+// "Build-Debian10-Clang-x86_64-Release"), runs Bloaty against the binary, and uploads the resulting
+// code size statistics to the GCS bucket belonging to the https://codesize.skia.org service.
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"flag"
+	"fmt"
+	"os"
+	"strconv"
+	"time"
+
+	"cloud.google.com/go/storage"
+	"google.golang.org/api/option"
+
+	"go.skia.org/infra/go/auth"
+	"go.skia.org/infra/go/exec"
+	"go.skia.org/infra/go/gcs"
+	"go.skia.org/infra/go/gcs/gcsclient"
+	"go.skia.org/infra/go/gerrit"
+	"go.skia.org/infra/go/gitiles"
+	"go.skia.org/infra/go/now"
+	"go.skia.org/infra/go/skerr"
+	"go.skia.org/infra/task_driver/go/lib/auth_steps"
+	"go.skia.org/infra/task_driver/go/lib/checkout"
+	"go.skia.org/infra/task_driver/go/td"
+	"go.skia.org/infra/task_scheduler/go/types"
+)
+
+const gcsBucketName = "skia-codesize"
+
+// BloatyOutputMetadata contains the Bloaty version and command-line arguments used, and metadata
+// about the task where Bloaty was invoked. This struct is serialized into a JSON file that is
+// uploaded to GCS alongside the Bloaty output file.
+//
+// TODO(lovisolo): Move this struct to the buildbot repository.
+type BloatyOutputMetadata struct {
+	Version   int    `json:"version"` // Schema version of this file, starting at 1.
+	Timestamp string `json:"timestamp"`
+
+	SwarmingTaskID string `json:"swarming_task_id"`
+	SwarmingServer string `json:"swarming_server"`
+
+	TaskID          string `json:"task_id"`
+	TaskName        string `json:"task_name"`
+	CompileTaskName string `json:"compile_task_name"`
+	BinaryName      string `json:"binary_name"`
+
+	BloatyCipdVersion string   `json:"bloaty_cipd_version"`
+	BloatyArgs        []string `json:"bloaty_args"`
+
+	PatchIssue  string `json:"patch_issue"`
+	PatchServer string `json:"patch_server"`
+	PatchSet    string `json:"patch_set"`
+	Repo        string `json:"repo"`
+	Revision    string `json:"revision"`
+
+	CommitTimestamp string `json:"commit_timestamp"`
+	Author          string `json:"author"`
+	Subject         string `json:"subject"`
+}
+
+func main() {
+	var (
+		projectID         = flag.String("project_id", "", "ID of the Google Cloud project.")
+		taskID            = flag.String("task_id", "", "ID of this task.")
+		taskName          = flag.String("task_name", "", "Name of the task.")
+		compileTaskName   = flag.String("compile_task_name", "", "Name of the compile task that produced the binary to analyze.")
+		binaryName        = flag.String("binary_name", "", "Name of the binary to analyze (e.g. \"dm\").")
+		bloatyCIPDVersion = flag.String("bloaty_cipd_version", "", "Version of the \"bloaty\" CIPD package used.")
+		output            = flag.String("o", "", "If provided, dump a JSON blob of step data to the given file. Prints to stdout if '-' is given.")
+		local             = flag.Bool("local", true, "True if running locally (as opposed to on the bots).")
+
+		checkoutFlags = checkout.SetupFlags(nil)
+	)
+	ctx := td.StartRun(projectID, taskID, taskName, output, local)
+	defer td.EndRun(ctx)
+
+	// The repository state contains the commit hash and patch/patchset if available.
+	repoState, err := checkout.GetRepoState(checkoutFlags)
+	if err != nil {
+		td.Fatal(ctx, skerr.Wrap(err))
+	}
+
+	// Make an HTTP client with the required permissions to hit GCS, Gerrit and Gitiles.
+	httpClient, err := auth_steps.InitHttpClient(ctx, *local, auth.ScopeReadWrite, gerrit.AuthScope, auth.ScopeUserinfoEmail)
+	if err != nil {
+		td.Fatal(ctx, skerr.Wrap(err))
+	}
+
+	// Make a GCS client with the required permissions to upload to the codesize.skia.org GCS bucket.
+	store, err := storage.NewClient(ctx, option.WithHTTPClient(httpClient))
+	if err != nil {
+		td.Fatal(ctx, skerr.Wrap(err))
+	}
+	gcsClient := gcsclient.New(store, gcsBucketName)
+
+	// Make a Gerrit client.
+	gerrit, err := gerrit.NewGerrit(repoState.Server, httpClient)
+	if err != nil {
+		td.Fatal(ctx, skerr.Wrap(err))
+	}
+
+	// Make a Gitiles client.
+	gitilesRepo := gitiles.NewRepo(repoState.Repo, httpClient)
+
+	args := runStepsArgs{
+		repoState:         repoState,
+		gerrit:            gerrit,
+		gitilesRepo:       gitilesRepo,
+		gcsClient:         gcsClient,
+		swarmingTaskID:    os.Getenv("SWARMING_TASK_ID"),
+		swarmingServer:    os.Getenv("SWARMING_SERVER"),
+		taskID:            *taskID,
+		taskName:          *taskName,
+		compileTaskName:   *compileTaskName,
+		binaryName:        *binaryName,
+		bloatyCIPDVersion: *bloatyCIPDVersion,
+	}
+
+	if err := runSteps(ctx, args); err != nil {
+		td.Fatal(ctx, skerr.Wrap(err))
+	}
+}
+
+// runStepsArgs contains the input arguments to the runSteps function.
+type runStepsArgs struct {
+	repoState         types.RepoState
+	gerrit            *gerrit.Gerrit
+	gitilesRepo       gitiles.GitilesRepo
+	gcsClient         gcs.GCSClient
+	swarmingTaskID    string
+	swarmingServer    string
+	taskID            string
+	taskName          string
+	compileTaskName   string
+	binaryName        string
+	bloatyCIPDVersion string
+}
+
+// runSteps runs the main steps of this task driver.
+func runSteps(ctx context.Context, args runStepsArgs) error {
+	var (
+		author          string
+		subject         string
+		commitTimestamp string
+	)
+
+	// Read the CL subject, author and timestamp. We talk to Gerrit when running as a tryjob, or to
+	// Gitiles when running as a post-submit task.
+	if args.repoState.IsTryJob() {
+		issue, err := strconv.ParseInt(args.repoState.Issue, 10, 64)
+		if err != nil {
+			return skerr.Wrap(err)
+		}
+		patchset, err := strconv.ParseInt(args.repoState.Patchset, 10, 64)
+		if err != nil {
+			return skerr.Wrap(err)
+		}
+		changeInfo, err := args.gerrit.GetIssueProperties(ctx, issue)
+		if err != nil {
+			return skerr.Wrap(err)
+		}
+		// This matches the format of the author field returned by Gitiles.
+		author = fmt.Sprintf("%s (%s)", changeInfo.Owner.Name, changeInfo.Owner.Email)
+		subject = changeInfo.Subject
+		for _, revision := range changeInfo.Revisions {
+			if revision.Number == patchset {
+				commitTimestamp = revision.CreatedString
+				break
+			}
+		}
+	} else {
+		longCommit, err := args.gitilesRepo.Details(ctx, args.repoState.Revision)
+		if err != nil {
+			return skerr.Wrap(err)
+		}
+		author = longCommit.Author
+		subject = longCommit.Subject
+		commitTimestamp = longCommit.Timestamp.Format(time.RFC3339)
+	}
+
+	// Run Bloaty and capture its output.
+	bloatyOutput, bloatyArgs, err := runBloaty(ctx, args.binaryName)
+	if err != nil {
+		return skerr.Wrap(err)
+	}
+
+	// Build metadata structure.
+	metadata := &BloatyOutputMetadata{
+		Version:           1,
+		Timestamp:         now.Now(ctx).Format(time.RFC3339),
+		SwarmingTaskID:    args.swarmingTaskID,
+		SwarmingServer:    args.swarmingServer,
+		TaskID:            args.taskID,
+		TaskName:          args.taskName,
+		CompileTaskName:   args.compileTaskName,
+		BinaryName:        args.binaryName,
+		BloatyCipdVersion: args.bloatyCIPDVersion,
+		BloatyArgs:        bloatyArgs,
+		PatchIssue:        args.repoState.Issue,
+		PatchServer:       args.repoState.Server,
+		PatchSet:          args.repoState.Patchset,
+		Repo:              args.repoState.Repo,
+		Revision:          args.repoState.Revision,
+		CommitTimestamp:   commitTimestamp,
+		Author:            author,
+		Subject:           subject,
+	}
+
+	gcsDir := computeTargetGCSDirectory(ctx, args.repoState, args.taskID, args.compileTaskName)
+
+	// Upload Bloaty output TSV file to GCS.
+	if err = uploadFileToGCS(ctx, args.gcsClient, fmt.Sprintf("%s/%s.tsv", gcsDir, args.binaryName), []byte(bloatyOutput)); err != nil {
+		return skerr.Wrap(err)
+	}
+
+	// Upload pretty-printed JSON metadata file to GCS.
+	jsonMetadata, err := json.MarshalIndent(metadata, "", "  ")
+	if err != nil {
+		return skerr.Wrap(err)
+	}
+	if err = uploadFileToGCS(ctx, args.gcsClient, fmt.Sprintf("%s/%s.json", gcsDir, args.binaryName), jsonMetadata); err != nil {
+		return skerr.Wrap(err)
+	}
+
+	return nil
+}
+
+// runBloaty runs Bloaty against the given binary and returns the Bloaty output in TSV format and
+// the Bloaty command-line arguments used.
+func runBloaty(ctx context.Context, binaryName string) (string, []string, error) {
+	err := td.Do(ctx, td.Props("List files under $PWD/build (for debugging purposes)"), func(ctx context.Context) error {
+		runCmd := &exec.Command{
+			Name:       "ls",
+			Args:       []string{"build"},
+			InheritEnv: true,
+			LogStdout:  true,
+			LogStderr:  true,
+		}
+		_, err := exec.RunCommand(ctx, runCmd)
+		return err
+	})
+	if err != nil {
+		return "", []string{}, skerr.Wrap(err)
+	}
+
+	runCmd := &exec.Command{
+		Name: "bloaty/bloaty",
+		Args: []string{
+			"build/" + binaryName,
+			"-d",
+			"compileunits,symbols",
+			"-n",
+			"0",
+			"--tsv",
+		},
+		InheritEnv: true,
+		LogStdout:  true,
+		LogStderr:  true,
+	}
+
+	var bloatyOutput string
+
+	if err := td.Do(ctx, td.Props(fmt.Sprintf("Run Bloaty against binary %q", binaryName)), func(ctx context.Context) error {
+		bloatyOutput, err = exec.RunCommand(ctx, runCmd)
+		return err
+	}); err != nil {
+		return "", []string{}, skerr.Wrap(err)
+	}
+
+	return bloatyOutput, runCmd.Args, nil
+}
+
+// computeTargetGCSDirectory computs the target GCS directory where to upload the Bloaty output file
+// and JSON metadata file.
+func computeTargetGCSDirectory(ctx context.Context, repoState types.RepoState, taskID, compileTaskName string) string {
+	yearMonthDate := now.Now(ctx).Format("2006/01/02") // YYYY/MM/DD.
+	if repoState.IsTryJob() {
+		// Example: 2022/01/31/tryjob/12345/3/CkPp9ElAaEXyYWNHpXHU/Build-Debian10-Clang-x86_64-Release
+		return fmt.Sprintf("%s/tryjob/%s/%s/%s/%s", yearMonthDate, repoState.Patch.Issue, repoState.Patch.Patchset, taskID, compileTaskName)
+	} else {
+		// Example: 2022/01/31/033ccea12c0949d0f712471bfcb4ed6daf69aaff/Build-Debian10-Clang-x86_64-Release
+		return fmt.Sprintf("%s/%s/%s", yearMonthDate, repoState.Revision, compileTaskName)
+	}
+}
+
+// uploadFileToGCS uploads a file to the codesize.skia.org GCS bucket.
+func uploadFileToGCS(ctx context.Context, gcsClient gcs.GCSClient, path string, contents []byte) error {
+	gcsURL := fmt.Sprintf("gs://%s/%s", gcsBucketName, path)
+	return td.Do(ctx, td.Props(fmt.Sprintf("Upload %s", gcsURL)), func(ctx context.Context) error {
+		if err := gcsClient.SetFileContents(ctx, path, gcs.FILE_WRITE_OPTS_TEXT, contents); err != nil {
+			return fmt.Errorf("Could not write task to %s: %s", gcsURL, err)
+		}
+		return nil
+	})
+}
diff --git a/third_party/skia/infra/bots/task_drivers/codesize/codesize_test.go b/third_party/skia/infra/bots/task_drivers/codesize/codesize_test.go
new file mode 100644
index 0000000000000..5dd48d450bbe9
--- /dev/null
+++ b/third_party/skia/infra/bots/task_drivers/codesize/codesize_test.go
@@ -0,0 +1,256 @@
+// Copyright 2022 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package main
+
+import (
+	"context"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.skia.org/infra/go/exec"
+	"go.skia.org/infra/go/gcs"
+	"go.skia.org/infra/go/gcs/test_gcsclient"
+	"go.skia.org/infra/go/gerrit"
+	gerrit_testutils "go.skia.org/infra/go/gerrit/testutils"
+	"go.skia.org/infra/go/git"
+	git_testutils "go.skia.org/infra/go/git/testutils"
+	"go.skia.org/infra/go/gitiles"
+	gitiles_testutils "go.skia.org/infra/go/gitiles/testutils"
+	"go.skia.org/infra/go/mockhttpclient"
+	"go.skia.org/infra/go/now"
+	"go.skia.org/infra/go/testutils"
+	"go.skia.org/infra/task_driver/go/td"
+	"go.skia.org/infra/task_scheduler/go/types"
+)
+
+func TestRunSteps_PostSubmit_Success(t *testing.T) {
+	// An empty inputPatch indicates this is a post-submit task.
+	inputPatch := types.Patch{}
+
+	// The revision is assigned deterministically by the GitBuilder in test().
+	const (
+		expectedBloatyFileGCSPath       = "2022/01/31/693abc06538769c662ca1871d347323b133a5d3c/Build-Debian10-Clang-x86_64-Release/dm.tsv"
+		expectedJSONMetadataFileGCSPath = "2022/01/31/693abc06538769c662ca1871d347323b133a5d3c/Build-Debian10-Clang-x86_64-Release/dm.json"
+	)
+
+	// The revision and author are assigned deterministically by the GitBuilder in test().
+	const expectedJSONMetadataFileContents = `{
+  "version": 1,
+  "timestamp": "2022-01-31T00:00:00Z",
+  "swarming_task_id": "58dccb0d6a3f0411",
+  "swarming_server": "https://chromium-swarm.appspot.com",
+  "task_id": "CkPp9ElAaEXyYWNHpXHU",
+  "task_name": "CodeSize-dm-Debian10-Clang-x86_64-Release",
+  "compile_task_name": "Build-Debian10-Clang-x86_64-Release",
+  "binary_name": "dm",
+  "bloaty_cipd_version": "1",
+  "bloaty_args": [
+    "build/dm",
+    "-d",
+    "compileunits,symbols",
+    "-n",
+    "0",
+    "--tsv"
+  ],
+  "patch_issue": "",
+  "patch_server": "",
+  "patch_set": "",
+  "repo": "https://skia.googlesource.com/skia.git",
+  "revision": "693abc06538769c662ca1871d347323b133a5d3c",
+  "commit_timestamp": "2022-01-30T23:59:00Z",
+  "author": "test (test@google.com)",
+  "subject": "Fake commit subject"
+}`
+
+	test(t, inputPatch, expectedBloatyFileGCSPath, expectedJSONMetadataFileGCSPath, expectedJSONMetadataFileContents)
+}
+
+func TestRunSteps_Tryjob_Success(t *testing.T) {
+	inputPatch := types.Patch{
+		Issue:     "12345",
+		PatchRepo: "https://skia.googlesource.com/skia.git",
+		Patchset:  "3",
+		Server:    "https://skia-review.googlesource.com",
+	}
+
+	const (
+		expectedBloatyFileGCSPath       = "2022/01/31/tryjob/12345/3/CkPp9ElAaEXyYWNHpXHU/Build-Debian10-Clang-x86_64-Release/dm.tsv"
+		expectedJSONMetadataFileGCSPath = "2022/01/31/tryjob/12345/3/CkPp9ElAaEXyYWNHpXHU/Build-Debian10-Clang-x86_64-Release/dm.json"
+	)
+
+	// The revision and author are assigned deterministically by the GitBuilder in test().
+	const expectedJSONMetadataFileContents = `{
+  "version": 1,
+  "timestamp": "2022-01-31T00:00:00Z",
+  "swarming_task_id": "58dccb0d6a3f0411",
+  "swarming_server": "https://chromium-swarm.appspot.com",
+  "task_id": "CkPp9ElAaEXyYWNHpXHU",
+  "task_name": "CodeSize-dm-Debian10-Clang-x86_64-Release",
+  "compile_task_name": "Build-Debian10-Clang-x86_64-Release",
+  "binary_name": "dm",
+  "bloaty_cipd_version": "1",
+  "bloaty_args": [
+    "build/dm",
+    "-d",
+    "compileunits,symbols",
+    "-n",
+    "0",
+    "--tsv"
+  ],
+  "patch_issue": "12345",
+  "patch_server": "https://skia-review.googlesource.com",
+  "patch_set": "3",
+  "repo": "https://skia.googlesource.com/skia.git",
+  "revision": "693abc06538769c662ca1871d347323b133a5d3c",
+  "commit_timestamp": "2022-01-30T23:59:00Z",
+  "author": "test (test@google.com)",
+  "subject": "Fake commit subject"
+}`
+
+	test(t, inputPatch, expectedBloatyFileGCSPath, expectedJSONMetadataFileGCSPath, expectedJSONMetadataFileContents)
+}
+
+func test(t *testing.T, patch types.Patch, expectedBloatyFileGCSPath, expectedJSONMetadataFileGCSPath, expectedJSONMetadataFileContents string) {
+	const expectedBloatyFileContents = "I'm a fake Bloaty output!"
+
+	fakeNow := time.Date(2022, time.January, 31, 0, 0, 0, 0, time.UTC)
+	commitTimestamp := time.Date(2022, time.January, 30, 23, 59, 0, 0, time.UTC)
+
+	repoState := types.RepoState{
+		Patch: patch,
+		Repo:  "https://skia.googlesource.com/skia.git",
+	}
+
+	// Seed a fake Git repository.
+	gitBuilder := git_testutils.GitInit(t, context.Background())
+	defer gitBuilder.Cleanup()
+	gitBuilder.Add(context.Background(), "README.md", "I'm a fake repository.")
+	repoState.Revision = gitBuilder.CommitMsgAt(context.Background(), "Fake commit subject", commitTimestamp)
+
+	// Mock a Gerrit client.
+	tmp, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer testutils.RemoveAll(t, tmp)
+	mockGerrit := gerrit_testutils.NewGerrit(t, tmp)
+	mockGerrit.MockGetIssueProperties(&gerrit.ChangeInfo{
+		Issue: 12345,
+		Owner: &gerrit.Person{
+			Name:  "test",
+			Email: "test@google.com",
+		},
+		Subject: "Fake commit subject",
+		// We ignore the patchset commit hashes, their values do not matter.
+		Revisions: map[string]*gerrit.Revision{
+			"commit hash for patchset 1": {
+				Number:        1,
+				CreatedString: commitTimestamp.Add(-2 * time.Hour).Format(time.RFC3339),
+			},
+			"commit hash for patchset 2": {
+				Number:        2,
+				CreatedString: commitTimestamp.Add(-time.Hour).Format(time.RFC3339),
+			},
+			"commit hash for patchset 3": {
+				Number:        3,
+				CreatedString: commitTimestamp.Format(time.RFC3339),
+			},
+			"commit hash for patchset 4": {
+				Number:        4,
+				CreatedString: commitTimestamp.Add(time.Hour).Format(time.RFC3339),
+			},
+		},
+	})
+
+	// Mock a Gitiles client.
+	urlMock := mockhttpclient.NewURLMock()
+	mockRepo := gitiles_testutils.NewMockRepo(t, gitBuilder.RepoUrl(), git.GitDir(gitBuilder.Dir()), urlMock)
+	mockRepo.MockGetCommit(context.Background(), repoState.Revision)
+	mockGitiles := gitiles.NewRepo(gitBuilder.RepoUrl(), urlMock.Client())
+
+	// Mock "bloaty" invocations.
+	commandCollector := exec.CommandCollector{}
+	commandCollector.SetDelegateRun(func(ctx context.Context, cmd *exec.Command) error {
+		if filepath.Base(cmd.Name) == "bloaty" {
+			cmd.CombinedOutput.Write([]byte(expectedBloatyFileContents))
+			return nil
+		}
+		// "ls" and any other commands directly executed by the task driver produce no mock outputs.
+		return nil
+	})
+
+	mockGCSClient := test_gcsclient.NewMockClient()
+	defer mockGCSClient.AssertExpectations(t)
+
+	// Mock the GCS client call to upload the Bloaty output.
+	mockGCSClient.On(
+		"SetFileContents",
+		testutils.AnyContext,
+		expectedBloatyFileGCSPath,
+		gcs.FILE_WRITE_OPTS_TEXT,
+		[]byte(expectedBloatyFileContents),
+	).Return(nil)
+
+	// Mock the GCS client call to upload the JSON metadata file.
+	mockGCSClient.On(
+		"SetFileContents",
+		testutils.AnyContext,
+		expectedJSONMetadataFileGCSPath,
+		gcs.FILE_WRITE_OPTS_TEXT,
+		[]byte(expectedJSONMetadataFileContents),
+	).Return(nil)
+
+	// Realistic but arbitrary arguments.
+	args := runStepsArgs{
+		repoState:         repoState,
+		gerrit:            mockGerrit.Gerrit,
+		gitilesRepo:       mockGitiles,
+		gcsClient:         mockGCSClient,
+		swarmingTaskID:    "58dccb0d6a3f0411",
+		swarmingServer:    "https://chromium-swarm.appspot.com",
+		taskID:            "CkPp9ElAaEXyYWNHpXHU",
+		taskName:          "CodeSize-dm-Debian10-Clang-x86_64-Release",
+		compileTaskName:   "Build-Debian10-Clang-x86_64-Release",
+		binaryName:        "dm",
+		bloatyCIPDVersion: "1",
+	}
+
+	res := td.RunTestSteps(t, false, func(ctx context.Context) error {
+		ctx = now.TimeTravelingContext(fakeNow).WithContext(ctx)
+		ctx = td.WithExecRunFn(ctx, commandCollector.Run)
+
+		return runSteps(ctx, args)
+	})
+
+	require.Empty(t, res.Errors)
+	require.Empty(t, res.Exceptions)
+
+	// Filter out all Git commands.
+	var commands []*exec.Command
+	for _, c := range commandCollector.Commands() {
+		if filepath.Base(c.Name) != "git" {
+			commands = append(commands, c)
+		}
+	}
+
+	// We expect one "ls" command and one "bloaty" command.
+	require.Len(t, commands, 2)
+
+	// Assert that "ls build" was executed to list the contents of the directory with the binaries
+	// built by the compile task, for debugging purposes.
+	lsCmd := commands[0]
+	assert.Equal(t, "ls", lsCmd.Name)
+	assert.Equal(t, []string{"build"}, lsCmd.Args)
+
+	// Assert that Bloaty was invoked with the expected arguments.
+	bloatyCmd := commands[1]
+	assert.Equal(t, "bloaty/bloaty", bloatyCmd.Name)
+	assert.Equal(t, []string{"build/dm", "-d", "compileunits,symbols", "-n", "0", "--tsv"}, bloatyCmd.Args)
+
+	// Assert that two files were uploaded to GCS.
+	mockGCSClient.AssertNumberOfCalls(t, "SetFileContents", 2)
+}
diff --git a/third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go b/third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go
index 4704fa404c268..ae9badc4b695f 100644
--- a/third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go
+++ b/third_party/skia/infra/bots/task_drivers/compile_wasm_gm_tests/compile_wasm_gm_tests.go
@@ -20,7 +20,7 @@ import (
 	"go.skia.org/infra/task_driver/go/td"
 )
 
-const dockerImage = "gcr.io/skia-public/canvaskit-emsdk:2.0.10_v2"
+const dockerImage = "gcr.io/skia-public/canvaskit-emsdk:3.1.3_v1"
 const innerBuildScript = "/SRC/infra/canvaskit/build_gmtests.sh"
 
 func main() {
diff --git a/third_party/skia/infra/bots/task_drivers/fm_driver/fm_driver.go b/third_party/skia/infra/bots/task_drivers/fm_driver/fm_driver.go
index 0515764256950..8a201cfd8deeb 100644
--- a/third_party/skia/infra/bots/task_drivers/fm_driver/fm_driver.go
+++ b/third_party/skia/infra/bots/task_drivers/fm_driver/fm_driver.go
@@ -473,7 +473,7 @@ func main() {
 			run(tests, F{"race": "0"}) // Several unit tests are not reentrant.
 
 			if model == "GCE" {
-				run(gms, F{"ct": "g8", "legacy": "true"})                     // --config g8
+				run(gms, F{"ct": "r8", "legacy": "true"})                     // --config r8
 				run(gms, F{"ct": "565", "legacy": "true"})                    // --config 565
 				run(gms, F{"ct": "8888", "legacy": "true"})                   // --config 8888
 				run(gms, F{"ct": "f16"})                                      // --config esrgb
diff --git a/third_party/skia/infra/bots/task_drivers/g3_canary/PROD.md b/third_party/skia/infra/bots/task_drivers/g3_canary/PROD.md
index b0464d2bb1ec4..abacee9c6dd5f 100644
--- a/third_party/skia/infra/bots/task_drivers/g3_canary/PROD.md
+++ b/third_party/skia/infra/bots/task_drivers/g3_canary/PROD.md
@@ -11,7 +11,7 @@ g3_canary_infra_failures
 ------------------------
 
 Happens when the skia_try_service in G3 returns an exception.
-Check the skia_try_service's error logs in [go/skia-borg-jobs](go/skia-borg-jobs).
+Check the skia_try_service's error logs in [go/skia-borg-jobs](go/skia-borg-jobs)
 
 For errors that do not seem to be transient, restarting the borg job has worked
 in the past:
diff --git a/third_party/skia/infra/bots/task_drivers/g3_canary/g3_canary.go b/third_party/skia/infra/bots/task_drivers/g3_canary/g3_canary.go
index c07759f540ad6..7dd329480f3e7 100644
--- a/third_party/skia/infra/bots/task_drivers/g3_canary/g3_canary.go
+++ b/third_party/skia/infra/bots/task_drivers/g3_canary/g3_canary.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"strconv"
 	"time"
 
@@ -22,6 +23,7 @@ import (
 	"go.skia.org/infra/go/httputils"
 	"go.skia.org/infra/go/skerr"
 	"go.skia.org/infra/go/sklog"
+	"go.skia.org/infra/promk/go/pushgateway"
 	"go.skia.org/infra/task_driver/go/lib/auth_steps"
 	"go.skia.org/infra/task_driver/go/lib/checkout"
 	"go.skia.org/infra/task_driver/go/td"
@@ -35,6 +37,12 @@ const (
 	MergeConflictErrorMsg   = "G3 tryjob failed because the change is causing a merge conflict when applying it to the Skia hash in G3."
 
 	PatchingInformation = "Tip: If needed, could try patching in the CL into a local G3 client with \"g4 patch\" and then hacking on it."
+
+	// Metric constants for pushgateway.
+	jobName                    = "g3-canary"
+	metricName                 = "g3_canary_infra_failure"
+	metricValue_NoInfraFailure = "0"
+	metricValue_InfraFailure   = "1"
 )
 
 type CanaryStatusType string
@@ -122,7 +130,7 @@ func main() {
 	td.StepText(ctx, "Canary roll doc", "https://goto.google.com/autoroller-canary-bots")
 
 	// Wait for the canary roll to finish.
-	if err := waitForCanaryRoll(ctx, taskFileName, taskStoragePath, gcsClient); err != nil {
+	if err := waitForCanaryRoll(ctx, taskFileName, taskStoragePath, client, gcsClient); err != nil {
 		td.Fatal(ctx, skerr.Wrap(err))
 	}
 }
@@ -154,10 +162,13 @@ func triggerCanaryRoll(ctx context.Context, issue, patchset, taskFileName, taskS
 	return nil
 }
 
-func waitForCanaryRoll(parentCtx context.Context, taskFileName, taskStoragePath string, gcsClient gcs.GCSClient) error {
+func waitForCanaryRoll(parentCtx context.Context, taskFileName, taskStoragePath string, httpClient *http.Client, gcsClient gcs.GCSClient) error {
 	ctx := td.StartStep(parentCtx, td.Props("Wait for canary roll"))
 	defer td.EndStep(ctx)
 
+	// For updating g3_canary_infra_failure metric after run completes.
+	pg := pushgateway.New(httpClient, jobName, pushgateway.DefaultPushgatewayURL)
+
 	// For writing to the step's log stream.
 	stdout := td.NewLogStream(ctx, "stdout", td.SeverityInfo)
 	// Lets add the roll link only once to step data.
@@ -196,20 +207,24 @@ func waitForCanaryRoll(parentCtx context.Context, taskFileName, taskStoragePath
 			time.Sleep(30 * time.Second)
 			continue
 		case ExceptionStatus:
-			if task.Error == "" {
-				return td.FailStep(ctx, fmt.Errorf("Run failed with: %s", task.Error))
-			} else {
-				// Use a general purpose error message.
-				return td.FailStep(ctx, errors.New(InfraFailureErrorMsg))
+			if task.Error != "" {
+				sklog.Errorf("Run failed with: %s", task.Error)
 			}
+			pg.Push(ctx, metricName, metricValue_InfraFailure)
+			// Use a general purpose error message.
+			return td.FailStep(ctx, errors.New(InfraFailureErrorMsg))
 		case MissingApprovalStatus:
+			pg.Push(ctx, metricName, metricValue_NoInfraFailure)
 			return td.FailStep(ctx, errors.New(MissingApprovalErrorMsg))
 		case MergeConflictStatus:
+			pg.Push(ctx, metricName, metricValue_NoInfraFailure)
 			return td.FailStep(ctx, errors.New(MergeConflictErrorMsg))
 		case FailureStatus:
+			pg.Push(ctx, metricName, metricValue_NoInfraFailure)
 			return td.FailStep(ctx, fmt.Errorf("Run failed G3 TAP.\n%s", PatchingInformation))
 		case SuccessStatus:
 			// Run passed G3 TAP.
+			pg.Push(ctx, metricName, metricValue_NoInfraFailure)
 			return nil
 		}
 	}
diff --git a/third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go b/third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
index 3459214fcda7c..9086eddd0dc11 100644
--- a/third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
+++ b/third_party/skia/infra/bots/task_drivers/push_apps_from_skia_image/push_apps_from_skia_image.go
@@ -13,30 +13,34 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
+	"path/filepath"
 
 	"cloud.google.com/go/pubsub"
 	"google.golang.org/api/option"
 
 	"go.skia.org/infra/go/auth"
+	"go.skia.org/infra/go/common"
 	docker_pubsub "go.skia.org/infra/go/docker/build/pubsub"
-	"go.skia.org/infra/go/util"
+	sk_exec "go.skia.org/infra/go/exec"
 	"go.skia.org/infra/task_driver/go/lib/auth_steps"
+	"go.skia.org/infra/task_driver/go/lib/bazel"
 	"go.skia.org/infra/task_driver/go/lib/checkout"
 	"go.skia.org/infra/task_driver/go/lib/docker"
 	"go.skia.org/infra/task_driver/go/lib/golang"
 	"go.skia.org/infra/task_driver/go/lib/os_steps"
 	"go.skia.org/infra/task_driver/go/td"
+	"go.skia.org/infra/task_scheduler/go/types"
 )
 
 var (
 	// Required properties for this task.
-	projectId = flag.String("project_id", "", "ID of the Google Cloud project.")
-	taskId    = flag.String("task_id", "", "ID of this task.")
-	taskName  = flag.String("task_name", "", "Name of the task.")
-	workdir   = flag.String("workdir", ".", "Working directory")
+	projectId     = flag.String("project_id", "", "ID of the Google Cloud project.")
+	taskId        = flag.String("task_id", "", "ID of this task.")
+	taskName      = flag.String("task_name", "", "Name of the task.")
+	workdir       = flag.String("workdir", ".", "Working directory")
+	infraRevision = flag.String("infra_revision", "origin/main", "Specifies which revision of the infra repo the images should be built off")
 
 	checkoutFlags = checkout.SetupFlags(nil)
 
@@ -50,40 +54,59 @@ const (
 	apiImageName     = "api"
 )
 
-var (
-	infraCommonEnv = []string{
-		"SKIP_BUILD=1",
-		"ROOT=/OUT",
+func buildPushFiddlerImage(ctx context.Context, dkr *docker.Docker, tag, infraCheckoutDir string, topic *pubsub.Topic) error {
+	// Run skia-release image and extract products out of /tmp/skia/skia. See
+	// https://skia.googlesource.com/skia/+/0e845dc8b05cb2d40d1c880184e33dd76081283a/docker/skia-release/Dockerfile#33
+	productsDir, err := os_steps.TempDir(ctx, "", "")
+	if err != nil {
+		return err
+	}
+	volumes := []string{
+		fmt.Sprintf("%s:/OUT", productsDir),
 	}
-	infraCommonBuildArgs = map[string]string{
-		"SKIA_IMAGE_NAME": "skia-release",
+	skiaCopyCmd := []string{"/bin/sh", "-c", "cd /tmp; tar cvzf skia.tar.gz --directory=/tmp/skia skia; cp /tmp/skia.tar.gz /OUT/"}
+	releaseImg := fmt.Sprintf("gcr.io/skia-public/skia-release:%s", tag)
+	if err := dkr.Run(ctx, releaseImg, skiaCopyCmd, volumes, nil); err != nil {
+		return err
 	}
-)
 
-func buildPushFiddlerImage(ctx context.Context, tag, repo, configDir string, topic *pubsub.Topic) error {
-	tempDir, err := os_steps.TempDir(ctx, "", "")
+	err = td.Do(ctx, td.Props("Build "+fiddlerImageName+" image").Infra(), func(ctx context.Context) error {
+		runCmd := &sk_exec.Command{
+			Name:       "make",
+			Args:       []string{"release-fiddler-ci"},
+			InheritEnv: true,
+			Env: []string{
+				"COPY_FROM_DIR=" + productsDir,
+				"STABLE_DOCKER_TAG=" + tag,
+			},
+			Dir:       filepath.Join(infraCheckoutDir, "fiddlek"),
+			LogStdout: true,
+			LogStderr: true,
+		}
+		_, err := sk_exec.RunCommand(ctx, runCmd)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
-	image := fmt.Sprintf("gcr.io/skia-public/%s", fiddlerImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/fiddlek && ./build_fiddler_release"}
-	volumes := []string{fmt.Sprintf("%s:/OUT", tempDir)}
-	err = docker.BuildPushImageFromInfraImage(ctx, "Fiddler", image, tag, repo, configDir, tempDir, "prod", topic, cmd, volumes, infraCommonEnv, infraCommonBuildArgs)
-	if err != nil {
+	if err := docker.PublishToTopic(ctx, "gcr.io/skia-public/"+fiddlerImageName, tag, common.REPO_SKIA, topic); err != nil {
 		return err
 	}
-	return cleanupTempFiles(ctx, configDir, volumes)
+
+	return cleanupTempFiles(ctx, dkr, releaseImg, volumes)
 }
 
-func cleanupTempFiles(ctx context.Context, configDir string, volumes []string) error {
+func cleanupTempFiles(ctx context.Context, dkr *docker.Docker, image string, volumes []string) error {
 	// Remove all temporary files from the host machine. Swarming gets upset if there are root-owned
 	// files it cannot clean up.
-	const infraImageWithTag = "gcr.io/skia-public/infra:prod"
 	cleanupCmd := []string{"/bin/sh", "-c", "rm -rf /OUT/*"}
-	return docker.Run(ctx, infraImageWithTag, configDir, cleanupCmd, volumes, nil)
+	return dkr.Run(ctx, image, cleanupCmd, volumes, nil)
 }
 
-func buildPushApiImage(ctx context.Context, tag, repo, configDir, checkoutDir string, topic *pubsub.Topic) error {
+func buildPushApiImage(ctx context.Context, dkr *docker.Docker, tag, checkoutDir, infraCheckoutDir string, topic *pubsub.Topic) error {
 	tempDir, err := os_steps.TempDir(ctx, "", "")
 	if err != nil {
 		return err
@@ -101,20 +124,38 @@ func buildPushApiImage(ctx context.Context, tag, repo, configDir, checkoutDir st
 		"OUTPUT_DIRECTORY=/OUT",
 	}
 	doxygenCmd := []string{"/bin/sh", "-c", "cd /CHECKOUT/tools/doxygen && doxygen ProdDoxyfile"}
-	if err := docker.Run(ctx, "gcr.io/skia-public/doxygen:testing-slim", configDir, doxygenCmd, volumes, env); err != nil {
+	doxygenImg := "gcr.io/skia-public/doxygen:testing-slim"
+	if err := dkr.Run(ctx, doxygenImg, doxygenCmd, volumes, env); err != nil {
 		return err
 	}
 
-	image := fmt.Sprintf("gcr.io/skia-public/%s", apiImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/api && make release_ci"}
-	infraEnv := util.CopyStringSlice(infraCommonEnv)
-	infraEnv = append(infraEnv, "DOXYGEN_HTML=/OUT/html")
-	infraVolumes := []string{fmt.Sprintf("%s:/OUT", tempDir)}
-	err = docker.BuildPushImageFromInfraImage(ctx, "Api", image, tag, repo, configDir, tempDir, "prod", topic, cmd, infraVolumes, infraEnv, infraCommonBuildArgs)
+	err = td.Do(ctx, td.Props("Build "+apiImageName+" image").Infra(), func(ctx context.Context) error {
+		runCmd := &sk_exec.Command{
+			Name:       "make",
+			Args:       []string{"release-api-ci"},
+			InheritEnv: true,
+			Env: []string{
+				"COPY_FROM_DIR=" + filepath.Join(tempDir, "html"),
+				"STABLE_DOCKER_TAG=" + tag,
+			},
+			Dir:       filepath.Join(infraCheckoutDir, "api"),
+			LogStdout: true,
+			LogStderr: true,
+		}
+		_, err := sk_exec.RunCommand(ctx, runCmd)
+		if err != nil {
+			return err
+		}
+		return nil
+	})
 	if err != nil {
 		return err
 	}
-	return cleanupTempFiles(ctx, configDir, volumes)
+	if err := docker.PublishToTopic(ctx, "gcr.io/skia-public/"+apiImageName, tag, common.REPO_SKIA, topic); err != nil {
+		return err
+	}
+
+	return cleanupTempFiles(ctx, dkr, doxygenImg, volumes)
 }
 
 func main() {
@@ -122,25 +163,46 @@ func main() {
 	ctx := td.StartRun(projectId, taskId, taskName, output, local)
 	defer td.EndRun(ctx)
 
+	if *infraRevision == "" {
+		td.Fatalf(ctx, "Must specify --infra_revision")
+	}
+
 	rs, err := checkout.GetRepoState(checkoutFlags)
 	if err != nil {
 		td.Fatal(ctx, err)
 	}
-
 	wd, err := os_steps.Abs(ctx, *workdir)
 	if err != nil {
 		td.Fatal(ctx, err)
 	}
-
-	// Check out the code.
+	// Check out the Skia repo code.
 	co, err := checkout.EnsureGitCheckout(ctx, path.Join(wd, "repo"), rs)
 	if err != nil {
 		td.Fatal(ctx, err)
 	}
+	skiaCheckoutDir := co.Dir()
+
+	// Checkout out the Skia infra repo at the specified commit.
+	infraRS := types.RepoState{
+		Repo:     common.REPO_SKIA_INFRA,
+		Revision: *infraRevision,
+	}
+	infraCheckoutDir := filepath.Join("infra_repo")
+	if _, err := checkout.EnsureGitCheckout(ctx, infraCheckoutDir, infraRS); err != nil {
+		td.Fatal(ctx, err)
+	}
 
 	// Setup go.
 	ctx = golang.WithEnv(ctx, wd)
 
+	// Ensure that the bazel cache is setup.
+	opts := bazel.BazelOptions{
+		CachePath: "/mnt/pd0/bazel_cache",
+	}
+	if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
+		td.Fatal(ctx, err)
+	}
+
 	// Create token source with scope for cloud registry (storage) and pubsub.
 	ts, err := auth_steps.Init(ctx, *local, auth.ScopeUserinfoEmail, auth.ScopeFullControl, pubsub.ScopePubSub)
 	if err != nil {
@@ -159,30 +221,18 @@ func main() {
 	if rs.Issue != "" && rs.Patchset != "" {
 		tag = fmt.Sprintf("%s_%s", rs.Issue, rs.Patchset)
 	}
-	// Add the tag to infraCommonBuildArgs.
-	infraCommonBuildArgs["SKIA_IMAGE_TAG"] = tag
 
-	// Create a temporary config dir for Docker.
-	configDir, err := ioutil.TempDir("", "")
+	// Instantiate docker.
+	dkr, err := docker.New(ctx, ts)
 	if err != nil {
 		td.Fatal(ctx, err)
 	}
-	defer util.RemoveAll(configDir)
-
-	// Login to docker (required to push to docker).
-	token, err := ts.Token()
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-	if err := docker.Login(ctx, token.AccessToken, "gcr.io/skia-public/", configDir); err != nil {
-		td.Fatal(ctx, err)
-	}
 
 	// Build and push all apps of interest below.
-	if err := buildPushFiddlerImage(ctx, tag, rs.Repo, configDir, topic); err != nil {
+	if err := buildPushApiImage(ctx, dkr, tag, skiaCheckoutDir, infraCheckoutDir, topic); err != nil {
 		td.Fatal(ctx, err)
 	}
-	if err := buildPushApiImage(ctx, tag, rs.Repo, configDir, co.Dir(), topic); err != nil {
+	if err := buildPushFiddlerImage(ctx, dkr, tag, infraCheckoutDir, topic); err != nil {
 		td.Fatal(ctx, err)
 	}
 }
diff --git a/third_party/skia/infra/bots/task_drivers/push_apps_from_wasm_image/push_apps_from_wasm_image.go b/third_party/skia/infra/bots/task_drivers/push_apps_from_wasm_image/push_apps_from_wasm_image.go
deleted file mode 100644
index 3ee7f36e2ccb8..0000000000000
--- a/third_party/skia/infra/bots/task_drivers/push_apps_from_wasm_image/push_apps_from_wasm_image.go
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2021 Google Inc.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// This executable builds the Docker images based off the WASM executables in the
-// gcr.io/skia-public/skia-wasm-release image. It then issues a PubSub notification to have those apps
-// tagged and deployed by docker_pushes_watcher.
-// See //docker_pushes_watcher/README.md in the infra repo for more.
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io/ioutil"
-
-	"cloud.google.com/go/pubsub"
-	"google.golang.org/api/option"
-
-	"go.skia.org/infra/go/auth"
-	docker_pubsub "go.skia.org/infra/go/docker/build/pubsub"
-	"go.skia.org/infra/go/util"
-	"go.skia.org/infra/task_driver/go/lib/auth_steps"
-	"go.skia.org/infra/task_driver/go/lib/checkout"
-	"go.skia.org/infra/task_driver/go/lib/docker"
-	"go.skia.org/infra/task_driver/go/lib/golang"
-	"go.skia.org/infra/task_driver/go/lib/os_steps"
-	"go.skia.org/infra/task_driver/go/td"
-)
-
-var (
-	// Required properties for this task.
-	projectId = flag.String("project_id", "", "ID of the Google Cloud project.")
-	taskId    = flag.String("task_id", "", "ID of this task.")
-	taskName  = flag.String("task_name", "", "Name of the task.")
-	workdir   = flag.String("workdir", ".", "Working directory")
-
-	checkoutFlags = checkout.SetupFlags(nil)
-
-	// Optional flags.
-	local  = flag.Bool("local", false, "True if running locally (as opposed to on the bots)")
-	output = flag.String("o", "", "If provided, dump a JSON blob of step data to the given file. Prints to stdout if '-' is given.")
-)
-
-const (
-	debuggerImageName  = "debugger-app"
-	particlesImageName = "particles"
-	shaderImageName    = "shaders"
-	skottieImageName   = "skottie"
-)
-
-var (
-	infraCommonEnv = []string{
-		"SKIP_BUILD=1",
-		"ROOT=/WORKSPACE",
-	}
-)
-
-func buildPushSkottieImage(ctx context.Context, tag, repo, wasmProductsDir, configDir string, topic *pubsub.Topic) error {
-	tempDir, err := os_steps.TempDir(ctx, "", "")
-	if err != nil {
-		return err
-	}
-	image := fmt.Sprintf("gcr.io/skia-public/%s", skottieImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/skottie && make release_ci"}
-	volumes := []string{
-		fmt.Sprintf("%s:/OUT", wasmProductsDir),
-		fmt.Sprintf("%s:/WORKSPACE", tempDir),
-	}
-	return docker.BuildPushImageFromInfraImage(ctx, "Skottie", image, tag, repo, configDir, tempDir, "prod", topic, cmd, volumes, infraCommonEnv, nil)
-}
-
-func buildPushParticlesImage(ctx context.Context, tag, repo, wasmProductsDir, configDir string, topic *pubsub.Topic) error {
-	tempDir, err := os_steps.TempDir(ctx, "", "")
-	if err != nil {
-		return err
-	}
-	image := fmt.Sprintf("gcr.io/skia-public/%s", particlesImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/particles && make release_ci"}
-	volumes := []string{
-		fmt.Sprintf("%s:/OUT", wasmProductsDir),
-		fmt.Sprintf("%s:/WORKSPACE", tempDir),
-	}
-	return docker.BuildPushImageFromInfraImage(ctx, "Particles", image, tag, repo, configDir, tempDir, "prod", topic, cmd, volumes, infraCommonEnv, nil)
-}
-
-func buildPushDebuggerImage(ctx context.Context, tag, repo, wasmProductsDir, configDir string, topic *pubsub.Topic) error {
-	tempDir, err := os_steps.TempDir(ctx, "", "")
-	if err != nil {
-		return err
-	}
-	image := fmt.Sprintf("gcr.io/skia-public/%s", debuggerImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/debugger-app && make release_ci"}
-	volumes := []string{
-		fmt.Sprintf("%s:/OUT", wasmProductsDir),
-		fmt.Sprintf("%s:/WORKSPACE", tempDir),
-	}
-	return docker.BuildPushImageFromInfraImage(ctx, "Debugger-App", image, tag, repo, configDir, tempDir, "prod", topic, cmd, volumes, infraCommonEnv, nil)
-}
-
-func buildPushShadersImage(ctx context.Context, tag, repo, wasmProductsDir, configDir string, topic *pubsub.Topic) error {
-	tempDir, err := os_steps.TempDir(ctx, "", "")
-	if err != nil {
-		return err
-	}
-	image := fmt.Sprintf("gcr.io/skia-public/%s", shaderImageName)
-	cmd := []string{"/bin/sh", "-c", "cd /home/skia/golib/src/go.skia.org/infra/shaders && make release_ci"}
-	volumes := []string{
-		fmt.Sprintf("%s:/OUT", wasmProductsDir),
-		fmt.Sprintf("%s:/WORKSPACE", tempDir),
-	}
-	return docker.BuildPushImageFromInfraImage(ctx, "Shaders", image, tag, repo, configDir, tempDir, "prod", topic, cmd, volumes, infraCommonEnv, nil)
-}
-
-func main() {
-	// Setup.
-	ctx := td.StartRun(projectId, taskId, taskName, output, local)
-	defer td.EndRun(ctx)
-
-	rs, err := checkout.GetRepoState(checkoutFlags)
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	wd, err := os_steps.Abs(ctx, *workdir)
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	// Setup go.
-	ctx = golang.WithEnv(ctx, wd)
-
-	// Create token source with scope for cloud registry (storage) and pubsub.
-	ts, err := auth_steps.Init(ctx, *local, auth.ScopeUserinfoEmail, auth.ScopeFullControl, pubsub.ScopePubSub)
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	// Create pubsub client.
-	client, err := pubsub.NewClient(ctx, docker_pubsub.TOPIC_PROJECT_ID, option.WithTokenSource(ts))
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-	topic := client.Topic(docker_pubsub.TOPIC)
-
-	// Figure out which tag to use for docker build and push.
-	tag := rs.Revision
-	if rs.Issue != "" && rs.Patchset != "" {
-		tag = fmt.Sprintf("%s_%s", rs.Issue, rs.Patchset)
-	}
-
-	// Create a temporary config dir for Docker.
-	configDir, err := ioutil.TempDir("", "")
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-	defer util.RemoveAll(configDir)
-
-	// Login to docker (required to push to docker).
-	token, err := ts.Token()
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-	if err := docker.Login(ctx, token.AccessToken, "gcr.io/skia-public/", configDir); err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	// Run skia-wasm-release image and extract wasm products out of it.
-	wasmProductsDir, err := os_steps.TempDir(ctx, "", "")
-	if err != nil {
-		td.Fatal(ctx, err)
-	}
-	// Run Doxygen pointing to the location of the checkout and the out dir.
-	volumes := []string{
-		fmt.Sprintf("%s:/OUT", wasmProductsDir),
-	}
-	wasmCopyCmd := []string{"/bin/sh", "-c", "cp -r /tmp/* /OUT"}
-	releaseImg := fmt.Sprintf("gcr.io/skia-public/skia-wasm-release:%s", tag)
-	if err := docker.Run(ctx, releaseImg, configDir, wasmCopyCmd, volumes, nil); err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	// Build and push all apps of interest below.
-	if err := buildPushSkottieImage(ctx, tag, rs.Repo, wasmProductsDir, configDir, topic); err != nil {
-		td.Fatal(ctx, err)
-	}
-	if err := buildPushParticlesImage(ctx, tag, rs.Repo, wasmProductsDir, configDir, topic); err != nil {
-		td.Fatal(ctx, err)
-	}
-	if err := buildPushDebuggerImage(ctx, tag, rs.Repo, wasmProductsDir, configDir, topic); err != nil {
-		td.Fatal(ctx, err)
-	}
-	if err := buildPushShadersImage(ctx, tag, rs.Repo, wasmProductsDir, configDir, topic); err != nil {
-		td.Fatal(ctx, err)
-	}
-
-	// Remove all temporary files from the host machine. Swarming gets upset if there are root-owned
-	// files it cannot clean up.
-	cleanupCmd := []string{"/bin/sh", "-c", "rm -rf /OUT/*"}
-	if err := docker.Run(ctx, releaseImg, configDir, cleanupCmd, volumes, nil); err != nil {
-		td.Fatal(ctx, err)
-	}
-}
diff --git a/third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go b/third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
index bd87fa524acb0..7739f55d01531 100644
--- a/third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
+++ b/third_party/skia/infra/bots/task_drivers/push_bazel_apps_from_wasm_image/push_bazel_apps_from_wasm_image.go
@@ -11,7 +11,6 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"path/filepath"
@@ -20,9 +19,11 @@ import (
 	"google.golang.org/api/option"
 
 	"go.skia.org/infra/go/auth"
+	"go.skia.org/infra/go/common"
 	docker_pubsub "go.skia.org/infra/go/docker/build/pubsub"
 	sk_exec "go.skia.org/infra/go/exec"
 	"go.skia.org/infra/task_driver/go/lib/auth_steps"
+	"go.skia.org/infra/task_driver/go/lib/bazel"
 	"go.skia.org/infra/task_driver/go/lib/checkout"
 	"go.skia.org/infra/task_driver/go/lib/docker"
 	"go.skia.org/infra/task_driver/go/lib/golang"
@@ -44,10 +45,6 @@ var (
 	output = flag.String("o", "", "If provided, dump a JSON blob of step data to the given file. Prints to stdout if '-' is given.")
 )
 
-const (
-	infraRepo = "https://skia.googlesource.com/buildbot.git"
-)
-
 func main() {
 	// Setup.
 	ctx := td.StartRun(projectId, taskId, taskName, output, local)
@@ -69,7 +66,7 @@ func main() {
 		}
 		// Check out the Skia infra repo at the specified commit.
 		rs := types.RepoState{
-			Repo:     infraRepo,
+			Repo:     common.REPO_SKIA_INFRA,
 			Revision: *infraRevision,
 		}
 		checkoutDir = filepath.Join("repo")
@@ -114,8 +111,30 @@ func main() {
 		td.Fatal(ctx, err)
 	}
 
-	// TODO(kjlubick) Build and push all apps of interest as they are ported.
-	if err := buildPushJSFiddle(ctx, wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
+	opts := bazel.BazelOptions{
+		CachePath: "/mnt/pd0/bazel_cache",
+	}
+	if err := bazel.EnsureBazelRCFile(ctx, opts); err != nil {
+		td.Fatal(ctx, err)
+	}
+
+	if err := buildPush(ctx, "debugger-app", wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
+		td.Fatal(ctx, err)
+	}
+
+	if err := buildPush(ctx, "jsfiddle", wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
+		td.Fatal(ctx, err)
+	}
+
+	if err := buildPush(ctx, "particles", wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
+		td.Fatal(ctx, err)
+	}
+
+	if err := buildPush(ctx, "shaders", wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
+		td.Fatal(ctx, err)
+	}
+
+	if err := buildPush(ctx, "skottie", wasmProductsDir, checkoutDir, *skiaRevision, topic); err != nil {
 		td.Fatal(ctx, err)
 	}
 
@@ -127,8 +146,11 @@ func main() {
 	}
 }
 
-func buildPushJSFiddle(ctx context.Context, wasmProductsDir, checkoutDir, skiaRevision string, topic *pubsub.Topic) error {
-	err := td.Do(ctx, td.Props("Build jsfiddle image").Infra(), func(ctx context.Context) error {
+// buildPush pushes the app in the given skia-infra folder using `make bazel_release_ci`.
+// By convention, all of these apps should have the k8s deployment name be the same as the app
+// name and be built using the same Make target.
+func buildPush(ctx context.Context, appName, wasmProductsDir, checkoutDir, skiaRevision string, topic *pubsub.Topic) error {
+	err := td.Do(ctx, td.Props("Build "+appName+" image").Infra(), func(ctx context.Context) error {
 		runCmd := &sk_exec.Command{
 			Name:       "make",
 			Args:       []string{"bazel_release_ci"},
@@ -137,7 +159,7 @@ func buildPushJSFiddle(ctx context.Context, wasmProductsDir, checkoutDir, skiaRe
 				"COPY_FROM_DIR=" + wasmProductsDir,
 				"STABLE_DOCKER_TAG=" + skiaRevision,
 			},
-			Dir:       filepath.Join(checkoutDir, "jsfiddle"),
+			Dir:       filepath.Join(checkoutDir, appName),
 			LogStdout: true,
 			LogStderr: true,
 		}
@@ -150,29 +172,5 @@ func buildPushJSFiddle(ctx context.Context, wasmProductsDir, checkoutDir, skiaRe
 	if err != nil {
 		return err
 	}
-	return publishToTopic(ctx, "jsfiddle", skiaRevision, "skia", topic)
-}
-
-func publishToTopic(ctx context.Context, image, tag, repo string, topic *pubsub.Topic) error {
-	return td.Do(ctx, td.Props(fmt.Sprintf("Publish pubsub msg to %s", docker_pubsub.TOPIC)).Infra(), func(ctx context.Context) error {
-		// Publish to the pubsub topic which is subscribed to by
-		// https://github.com/google/skia-buildbot/blob/cd593cf6c534ba7a1bd2d88a488d37840663230d/docker_pushes_watcher/go/docker_pushes_watcher/main.go#L335
-		b, err := json.Marshal(&docker_pubsub.BuildInfo{
-			ImageName: image,
-			Tag:       tag,
-			Repo:      repo,
-		})
-		if err != nil {
-			return err
-		}
-		msg := &pubsub.Message{
-			Data: b,
-		}
-		res := topic.Publish(ctx, msg)
-		// Synchronously wait to make sure the publishing actually happens.
-		if _, err := res.Get(ctx); err != nil {
-			return err
-		}
-		return nil
-	})
+	return docker.PublishToTopic(ctx, "gcr.io/skia-public/"+appName, skiaRevision, common.REPO_SKIA, topic)
 }
diff --git a/third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go b/third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
index 80d418dbe63cb..80741ec7f73cf 100644
--- a/third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
+++ b/third_party/skia/infra/bots/task_drivers/recreate_skps/recreate_skps.go
@@ -9,7 +9,6 @@ import (
 	"context"
 	"flag"
 	"fmt"
-	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -19,6 +18,7 @@ import (
 	"go.skia.org/infra/go/gerrit"
 	"go.skia.org/infra/go/git/git_common"
 	"go.skia.org/infra/go/sklog"
+	"go.skia.org/infra/promk/go/pushgateway"
 	"go.skia.org/infra/task_driver/go/lib/auth_steps"
 	"go.skia.org/infra/task_driver/go/lib/checkout"
 	"go.skia.org/infra/task_driver/go/lib/gerrit_steps"
@@ -27,6 +27,15 @@ import (
 	"go.skia.org/infra/task_scheduler/go/types"
 )
 
+const (
+	// Metric constants for pushgateway.
+	jobName                       = "recreate-skps"
+	buildFailureMetricName        = "recreate_skps_build_failure"
+	creatingSKPsFailureMetricName = "recreate_skps_creation_failure"
+	metricValue_NoFailure         = "0"
+	metricValue_Failure           = "1"
+)
+
 func botUpdate(ctx context.Context, checkoutRoot, gitCacheDir, skiaRev, patchRef, depotToolsDir string, local bool) error {
 	return td.Do(ctx, td.Props("bot_update").Infra(), func(ctx context.Context) error {
 		tmp, err := os_steps.TempDir(ctx, "", "")
@@ -140,14 +149,12 @@ func main() {
 	defer td.EndRun(ctx)
 
 	// Setup.
-	var client *http.Client
+	client, err := auth_steps.InitHttpClient(ctx, *local, gerrit.AuthScope)
+	if err != nil {
+		td.Fatal(ctx, err)
+	}
 	var g gerrit.GerritInterface
 	if !*dryRun {
-		var err error
-		client, err = auth_steps.InitHttpClient(ctx, *local, gerrit.AuthScope)
-		if err != nil {
-			td.Fatal(ctx, err)
-		}
 		g, err = gerrit.NewGerrit("https://skia-review.googlesource.com", client)
 		if err != nil {
 			td.Fatal(ctx, err)
@@ -205,6 +212,9 @@ func main() {
 		}
 	}
 
+	// For updating metrics.
+	pg := pushgateway.New(client, jobName, pushgateway.DefaultPushgatewayURL)
+
 	chromiumDir := filepath.Join(checkoutRoot, "src")
 	outDir := filepath.Join(chromiumDir, "out", "Release")
 
@@ -234,8 +244,12 @@ func main() {
 			}
 			return nil
 		}); err != nil {
+			// Report that the build failed.
+			pg.Push(ctx, buildFailureMetricName, metricValue_Failure)
 			td.Fatal(ctx, err)
 		}
+		// Report that the build was successful.
+		pg.Push(ctx, buildFailureMetricName, metricValue_NoFailure)
 	}
 
 	// Capture and upload the SKPs.
@@ -262,8 +276,12 @@ func main() {
 	}
 	sklog.Infof("Running command: %s %s", command.Name, strings.Join(command.Args, " "))
 	if err := exec.Run(ctx, command); err != nil {
+		// Creating SKP asset in RecreateSKPs failed.
+		pg.Push(ctx, creatingSKPsFailureMetricName, metricValue_Failure)
 		td.Fatal(ctx, err)
 	}
+	// Report that the asset creation was successful.
+	pg.Push(ctx, creatingSKPsFailureMetricName, metricValue_NoFailure)
 	if *dryRun {
 		return
 	}
diff --git a/third_party/skia/infra/bots/tasks.json b/third_party/skia/infra/bots/tasks.json
index c0c2f009d0839..76c18a5fb60cc 100755
--- a/third_party/skia/infra/bots/tasks.json
+++ b/third_party/skia/infra/bots/tasks.json
@@ -356,6 +356,11 @@
         "Build-Mac-Clang-arm64-Debug"
       ]
     },
+    "Build-Mac-Clang-arm64-Debug-ASAN": {
+      "tasks": [
+        "Build-Mac-Clang-arm64-Debug-ASAN"
+      ]
+    },
     "Build-Mac-Clang-arm64-Debug-ASAN_Graphite": {
       "tasks": [
         "Build-Mac-Clang-arm64-Debug-ASAN_Graphite"
@@ -748,6 +753,26 @@
       ],
       "trigger": "on demand"
     },
+    "CodeSize-dm-Debian10-Clang-x86_64-Debug": {
+      "tasks": [
+        "CodeSize-dm-Debian10-Clang-x86_64-Debug"
+      ]
+    },
+    "CodeSize-dm-Debian10-Clang-x86_64-Release": {
+      "tasks": [
+        "CodeSize-dm-Debian10-Clang-x86_64-Release"
+      ]
+    },
+    "CodeSize-fm-Debian10-Clang-x86_64-Debug": {
+      "tasks": [
+        "CodeSize-fm-Debian10-Clang-x86_64-Debug"
+      ]
+    },
+    "CodeSize-fm-Debian10-Clang-x86_64-Release": {
+      "tasks": [
+        "CodeSize-fm-Debian10-Clang-x86_64-Release"
+      ]
+    },
     "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "tasks": [
         "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All"
@@ -887,17 +912,14 @@
     "Housekeeper-PerCommit-PushAppsFromSkiaDockerImage": {
       "tasks": [
         "Housekeeper-PerCommit-PushAppsFromSkiaDockerImage"
-      ]
-    },
-    "Housekeeper-PerCommit-PushAppsFromWASMDockerImage": {
-      "tasks": [
-        "Housekeeper-PerCommit-PushAppsFromWASMDockerImage"
-      ]
+      ],
+      "trigger": "main"
     },
     "Housekeeper-PerCommit-PushBazelAppsFromWASMDockerImage": {
       "tasks": [
         "Housekeeper-PerCommit-PushBazelAppsFromWASMDockerImage"
-      ]
+      ],
+      "trigger": "main"
     },
     "Housekeeper-PerCommit-RunGnToBp": {
       "tasks": [
@@ -975,6 +997,11 @@
         "Upload-Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan"
       ]
     },
+    "Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android": {
+      "tasks": [
+        "Upload-Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android"
+      ]
+    },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
       "tasks": [
         "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"
@@ -1090,6 +1117,11 @@
         "Upload-Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"
       ]
     },
+    "Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan": {
+      "tasks": [
+        "Upload-Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan"
+      ]
+    },
     "Perf-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android": {
       "tasks": [
         "Upload-Perf-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android"
@@ -1314,21 +1346,11 @@
         "Upload-Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Skpbench"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
-      "tasks": [
-        "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN"
-      ]
-    },
     "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "tasks": [
         "Upload-Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
-      "tasks": [
-        "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN"
-      ]
-    },
     "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats": {
       "tasks": [
         "Upload-Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats"
@@ -1575,16 +1597,6 @@
         "Upload-Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal"
       ]
     },
-    "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All": {
-      "tasks": [
-        "Upload-Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All"
-      ]
-    },
-    "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal": {
-      "tasks": [
-        "Upload-Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal"
-      ]
-    },
     "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
       "tasks": [
         "Upload-Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All"
@@ -1690,6 +1702,16 @@
         "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan"
       ]
     },
+    "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android": {
+      "tasks": [
+        "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android"
+      ]
+    },
+    "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android": {
+      "tasks": [
+        "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android"
+      ]
+    },
     "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
       "tasks": [
         "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android"
@@ -1875,6 +1897,21 @@
         "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"
       ]
     },
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android": {
+      "tasks": [
+        "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android"
+      ]
+    },
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android": {
+      "tasks": [
+        "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android"
+      ]
+    },
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan": {
+      "tasks": [
+        "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan"
+      ]
+    },
     "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android": {
       "tasks": [
         "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android"
@@ -2190,6 +2227,11 @@
         "Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker"
       ]
     },
+    "Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "tasks": [
+        "Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ]
+    },
     "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
       "tasks": [
         "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All"
@@ -2247,6 +2289,11 @@
         "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN"
       ]
     },
+    "Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "tasks": [
+        "Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ]
+    },
     "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
       "tasks": [
         "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All"
@@ -2268,6 +2315,11 @@
         "Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"
       ]
     },
+    "Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "tasks": [
+        "Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ]
+    },
     "Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "tasks": [
         "Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"
@@ -2354,6 +2406,16 @@
         "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal"
       ]
     },
+    "Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "tasks": [
+        "Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts"
+      ]
+    },
+    "Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5": {
+      "tasks": [
+        "Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5"
+      ]
+    },
     "Test-Mac10.15.7-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "tasks": [
         "Test-Mac10.15.7-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts"
@@ -2394,34 +2456,49 @@
         "Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Metal"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN"
+        "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1"
+        "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"
+        "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN"
+        "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
+    "Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan"
+        "Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN"
+      ]
+    },
+    "Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts": {
+      "tasks": [
+        "Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
+      "tasks": [
+        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1"
+      ]
+    },
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
+      "tasks": [
+        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"
+      ]
+    },
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
       "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN"
+        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan"
       ]
     },
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan": {
@@ -2449,31 +2526,16 @@
         "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": {
-      "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan"
-      ]
-    },
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN": {
       "tasks": [
         "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
-      "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan"
-      ]
-    },
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": {
       "tasks": [
         "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan": {
-      "tasks": [
-        "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan"
-      ]
-    },
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41": {
       "priority": 0.085,
       "tasks": [
@@ -2977,26 +3039,6 @@
         "Test-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal"
       ]
     },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All": {
-      "tasks": [
-        "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All"
-      ]
-    },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal": {
-      "tasks": [
-        "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal"
-      ]
-    },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All": {
-      "tasks": [
-        "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All"
-      ]
-    },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal": {
-      "tasks": [
-        "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal"
-      ]
-    },
     "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All": {
       "tasks": [
         "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All"
@@ -3081,22 +3123,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3177,22 +3219,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3273,27 +3315,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/armhf_sysroot",
           "path": "armhf_sysroot",
-          "version": "version:7"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/chromebook_arm_gles",
@@ -3379,22 +3421,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3475,22 +3517,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3571,22 +3613,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3667,27 +3709,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/armhf_sysroot",
           "path": "armhf_sysroot",
-          "version": "version:7"
+          "version": "version:10"
         },
         {
           "name": "skia/bots/chromebook_arm_gles",
@@ -3773,22 +3815,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3869,22 +3911,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -3965,22 +4007,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4061,22 +4103,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4157,22 +4199,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4253,22 +4295,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4349,22 +4391,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4445,22 +4487,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4541,22 +4583,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4637,22 +4679,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4737,22 +4779,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -4838,22 +4880,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -4934,22 +4976,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -5030,22 +5072,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -5126,22 +5168,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -5226,22 +5268,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5331,22 +5373,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5436,22 +5478,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5537,22 +5579,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/chromebook_x86_64_gles",
@@ -5642,22 +5684,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5747,22 +5789,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5852,22 +5894,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -5957,22 +5999,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6062,22 +6104,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6172,22 +6214,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6282,22 +6324,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6387,22 +6429,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6492,22 +6534,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6597,22 +6639,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6702,22 +6744,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6807,22 +6849,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -6933,32 +6975,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7044,22 +7086,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/chromebook_x86_64_gles",
@@ -7149,22 +7191,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7254,22 +7296,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7372,32 +7414,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7486,22 +7528,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7591,22 +7633,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7696,22 +7738,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7801,22 +7843,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -7906,22 +7948,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8011,22 +8053,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8121,22 +8163,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8226,22 +8268,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8331,22 +8373,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8436,22 +8478,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8545,22 +8587,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8650,22 +8692,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8755,22 +8797,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8860,22 +8902,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -8965,22 +9007,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9070,22 +9112,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9175,22 +9217,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9280,22 +9322,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9367,7 +9409,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -9434,22 +9476,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9539,22 +9581,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9644,22 +9686,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9749,22 +9791,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9854,22 +9896,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -9959,22 +10001,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -10064,22 +10106,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -10182,32 +10224,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/android_ndk_linux",
@@ -10296,22 +10338,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -10374,7 +10416,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-ASAN_Graphite": {
+    "Build-Mac-Clang-arm64-Debug-ASAN": {
       "caches": [
         {
           "name": "ccache",
@@ -10404,22 +10446,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -10438,102 +10480,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-ASAN_Graphite\",\"swarm_out_dir\":\"build\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cores:12",
-        "cpu:x86-64",
-        "os:Mac-10.15.7",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 3600000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "idempotent": true,
-      "io_timeout_ns": 3600000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "build"
-      ],
-      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Build-Mac-Clang-arm64-Debug-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "compile",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/mac-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/mac-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/android_ndk_darwin",
-          "path": "android_ndk_darwin",
-          "version": "version:10"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Android\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -10577,7 +10524,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-Graphite": {
+    "Build-Mac-Clang-arm64-Debug-ASAN_Graphite": {
       "caches": [
         {
           "name": "ccache",
@@ -10607,22 +10554,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -10641,7 +10588,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Graphite\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-ASAN_Graphite\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -10685,19 +10632,11 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-Graphite_NoGpu": {
+    "Build-Mac-Clang-arm64-Debug-Android": {
       "caches": [
-        {
-          "name": "ccache",
-          "path": "cache/ccache"
-        },
         {
           "name": "vpython",
           "path": "cache/vpython"
-        },
-        {
-          "name": "xcode",
-          "path": "cache/Xcode.app"
         }
       ],
       "casSpec": "compile",
@@ -10715,32 +10654,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/mac_toolchain/${platform}",
-          "path": "mac_toolchain",
-          "version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/ccache_mac",
-          "path": "ccache_mac",
-          "version": "version:1"
+          "name": "skia/bots/android_ndk_darwin",
+          "path": "android_ndk_darwin",
+          "version": "version:10"
         }
       ],
       "command": [
@@ -10749,7 +10683,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Graphite_NoGpu\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Android\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -10793,7 +10727,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-Metal": {
+    "Build-Mac-Clang-arm64-Debug-Graphite": {
       "caches": [
         {
           "name": "ccache",
@@ -10823,22 +10757,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -10857,7 +10791,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Graphite\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -10901,7 +10835,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-iOS": {
+    "Build-Mac-Clang-arm64-Debug-Graphite_NoGpu": {
       "caches": [
         {
           "name": "ccache",
@@ -10931,22 +10865,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -10957,11 +10891,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -10970,7 +10899,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Graphite_NoGpu\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11014,7 +10943,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-iOS_Graphite": {
+    "Build-Mac-Clang-arm64-Debug-Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -11044,22 +10973,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11070,11 +10999,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -11083,7 +11007,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Graphite\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11127,7 +11051,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Debug-iOS_Metal": {
+    "Build-Mac-Clang-arm64-Debug-iOS": {
       "caches": [
         {
           "name": "ccache",
@@ -11157,22 +11081,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11196,7 +11120,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11240,7 +11164,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release": {
+    "Build-Mac-Clang-arm64-Debug-iOS_Graphite": {
       "caches": [
         {
           "name": "ccache",
@@ -11270,22 +11194,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11296,6 +11220,11 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
         }
       ],
       "command": [
@@ -11304,7 +11233,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Graphite\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11348,7 +11277,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release-Graphite": {
+    "Build-Mac-Clang-arm64-Debug-iOS_Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -11378,22 +11307,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11404,6 +11333,11 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
         }
       ],
       "command": [
@@ -11412,7 +11346,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-Graphite\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Debug-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11456,7 +11390,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release-Metal": {
+    "Build-Mac-Clang-arm64-Release": {
       "caches": [
         {
           "name": "ccache",
@@ -11486,22 +11420,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11520,7 +11454,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11564,7 +11498,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release-iOS": {
+    "Build-Mac-Clang-arm64-Release-Graphite": {
       "caches": [
         {
           "name": "ccache",
@@ -11594,22 +11528,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11620,11 +11554,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -11633,7 +11562,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-Graphite\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11677,7 +11606,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release-iOS_Graphite": {
+    "Build-Mac-Clang-arm64-Release-Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -11707,22 +11636,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11733,11 +11662,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -11746,7 +11670,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Graphite\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11790,7 +11714,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-arm64-Release-iOS_Metal": {
+    "Build-Mac-Clang-arm64-Release-iOS": {
       "caches": [
         {
           "name": "ccache",
@@ -11820,22 +11744,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11859,7 +11783,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -11903,7 +11827,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x64-Release-iOS": {
+    "Build-Mac-Clang-arm64-Release-iOS_Graphite": {
       "caches": [
         {
           "name": "ccache",
@@ -11933,22 +11857,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -11972,7 +11896,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Graphite\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12016,7 +11940,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Debug": {
+    "Build-Mac-Clang-arm64-Release-iOS_Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -12046,22 +11970,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12072,6 +11996,11 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
         }
       ],
       "command": [
@@ -12080,7 +12009,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-arm64-Release-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12124,7 +12053,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Debug-ASAN": {
+    "Build-Mac-Clang-x64-Release-iOS": {
       "caches": [
         {
           "name": "ccache",
@@ -12154,22 +12083,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12180,6 +12109,11 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
         }
       ],
       "command": [
@@ -12188,7 +12122,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12232,7 +12166,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Debug-ASAN_Metal": {
+    "Build-Mac-Clang-x86_64-Debug": {
       "caches": [
         {
           "name": "ccache",
@@ -12262,22 +12196,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12296,7 +12230,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12340,34 +12274,22 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
+    "Build-Mac-Clang-x86_64-Debug-ASAN": {
       "caches": [
         {
           "name": "ccache",
           "path": "cache/ccache"
         },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
         {
           "name": "vpython",
           "path": "cache/vpython"
         },
-        {
-          "name": "work",
-          "path": "cache/work"
-        },
         {
           "name": "xcode",
           "path": "cache/Xcode.app"
         }
       ],
-      "casSpec": "run-recipe",
+      "casSpec": "compile",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/mac-amd64",
@@ -12379,40 +12301,25 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/3pp/tools/git/mac-amd64",
-          "path": "cipd_bin_packages",
-          "version": "version:2@2.34.1.chromium.6"
-        },
-        {
-          "name": "infra/tools/git/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/git-credential-luci/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12430,8 +12337,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "sync_and_compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
+        "compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12463,18 +12370,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 7200000000000,
+      "execution_timeout_ns": 3600000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 7200000000000,
+      "idempotent": true,
+      "io_timeout_ns": 3600000000000,
       "max_attempts": 2,
       "outputs": [
         "build"
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Debug-Metal": {
+    "Build-Mac-Clang-x86_64-Debug-ASAN_Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -12504,22 +12412,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12538,7 +12446,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-ASAN_Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12582,22 +12490,34 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Release": {
+    "Build-Mac-Clang-x86_64-Debug-CommandBuffer": {
       "caches": [
         {
           "name": "ccache",
           "path": "cache/ccache"
         },
+        {
+          "name": "git",
+          "path": "cache/git"
+        },
+        {
+          "name": "git_cache",
+          "path": "cache/git_cache"
+        },
         {
           "name": "vpython",
           "path": "cache/vpython"
         },
+        {
+          "name": "work",
+          "path": "cache/work"
+        },
         {
           "name": "xcode",
           "path": "cache/Xcode.app"
         }
       ],
-      "casSpec": "compile",
+      "casSpec": "run-recipe",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/mac-amd64",
@@ -12609,25 +12529,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/3pp/tools/git/mac-amd64",
+          "path": "cipd_bin_packages",
+          "version": "version:2@2.34.1.chromium.6"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12645,8 +12580,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
+        "sync_and_compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Debug-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -12678,46 +12613,33 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 3600000000000,
+      "execution_timeout_ns": 7200000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "idempotent": true,
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 7200000000000,
       "max_attempts": 2,
       "outputs": [
         "build"
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
+    "Build-Mac-Clang-x86_64-Debug-Metal": {
       "caches": [
         {
           "name": "ccache",
           "path": "cache/ccache"
         },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
         {
           "name": "vpython",
           "path": "cache/vpython"
         },
-        {
-          "name": "work",
-          "path": "cache/work"
-        },
         {
           "name": "xcode",
           "path": "cache/Xcode.app"
         }
       ],
-      "casSpec": "run-recipe",
+      "casSpec": "compile",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/mac-amd64",
@@ -12729,40 +12651,25 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/3pp/tools/git/mac-amd64",
-          "path": "cipd_bin_packages",
-          "version": "version:2@2.34.1.chromium.6"
-        },
-        {
-          "name": "infra/tools/git/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/git-credential-luci/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12780,8 +12687,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "sync_and_compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
+        "compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Debug-Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12813,18 +12720,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 7200000000000,
+      "execution_timeout_ns": 3600000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 7200000000000,
+      "idempotent": true,
+      "io_timeout_ns": 3600000000000,
       "max_attempts": 2,
       "outputs": [
         "build"
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Release-Metal": {
+    "Build-Mac-Clang-x86_64-Release": {
       "caches": [
         {
           "name": "ccache",
@@ -12854,22 +12762,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12888,7 +12796,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -12932,22 +12840,34 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Release-TSAN": {
+    "Build-Mac-Clang-x86_64-Release-CommandBuffer": {
       "caches": [
         {
           "name": "ccache",
           "path": "cache/ccache"
         },
+        {
+          "name": "git",
+          "path": "cache/git"
+        },
+        {
+          "name": "git_cache",
+          "path": "cache/git_cache"
+        },
         {
           "name": "vpython",
           "path": "cache/vpython"
         },
+        {
+          "name": "work",
+          "path": "cache/work"
+        },
         {
           "name": "xcode",
           "path": "cache/Xcode.app"
         }
       ],
-      "casSpec": "compile",
+      "casSpec": "run-recipe",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/mac-amd64",
@@ -12959,25 +12879,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/3pp/tools/git/mac-amd64",
+          "path": "cipd_bin_packages",
+          "version": "version:2@2.34.1.chromium.6"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -12995,8 +12930,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN\",\"swarm_out_dir\":\"build\"}",
+        "sync_and_compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Build-Mac-Clang-x86_64-Release-CommandBuffer\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"build\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -13028,19 +12963,18 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 3600000000000,
+      "execution_timeout_ns": 7200000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "idempotent": true,
-      "io_timeout_ns": 3600000000000,
+      "io_timeout_ns": 7200000000000,
       "max_attempts": 2,
       "outputs": [
         "build"
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Clang-x86_64-Release-TSAN_Metal": {
+    "Build-Mac-Clang-x86_64-Release-Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -13070,22 +13004,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -13104,7 +13038,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13148,7 +13082,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Xcode11.4.1-arm64-Debug-iOS": {
+    "Build-Mac-Clang-x86_64-Release-TSAN": {
       "caches": [
         {
           "name": "ccache",
@@ -13178,22 +13112,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -13204,11 +13138,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -13217,7 +13146,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Debug-iOS\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13261,7 +13190,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal": {
+    "Build-Mac-Clang-x86_64-Release-TSAN_Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -13291,22 +13220,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -13317,11 +13246,6 @@
           "name": "skia/bots/ccache_mac",
           "path": "ccache_mac",
           "version": "version:1"
-        },
-        {
-          "name": "skia/bots/provisioning_profile_ios",
-          "path": "provisioning_profile_ios",
-          "version": "version:6"
         }
       ],
       "command": [
@@ -13330,7 +13254,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Clang-x86_64-Release-TSAN_Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13374,7 +13298,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Xcode11.4.1-arm64-Release-iOS": {
+    "Build-Mac-Xcode11.4.1-arm64-Debug-iOS": {
       "caches": [
         {
           "name": "ccache",
@@ -13404,22 +13328,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -13443,7 +13367,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Debug-iOS\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13487,7 +13411,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal": {
+    "Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal": {
       "caches": [
         {
           "name": "ccache",
@@ -13517,22 +13441,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/mac_toolchain/${platform}",
@@ -13556,7 +13480,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13600,49 +13524,67 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-arm64-Debug": {
+    "Build-Mac-Xcode11.4.1-arm64-Release-iOS": {
       "caches": [
+        {
+          "name": "ccache",
+          "path": "cache/ccache"
+        },
         {
           "name": "vpython",
           "path": "cache/vpython"
+        },
+        {
+          "name": "xcode",
+          "path": "cache/Xcode.app"
         }
       ],
       "casSpec": "compile",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/clang_win",
-          "path": "clang_win",
-          "version": "version:16"
+          "name": "infra/tools/mac_toolchain/${platform}",
+          "path": "mac_toolchain",
+          "version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
+        },
+        {
+          "name": "skia/bots/ccache_mac",
+          "path": "ccache_mac",
+          "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
         }
       ],
       "command": [
@@ -13651,18 +13593,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Release-iOS\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateWinToolchain"
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-highcpu-64",
-        "os:Windows-Server-17763",
+        "cores:12",
+        "cpu:x86-64",
+        "os:Mac-10.15.7",
         "pool:Skia"
       ],
       "environment": {
@@ -13697,7 +13637,120 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-arm64-Debug-ANGLE": {
+    "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal": {
+      "caches": [
+        {
+          "name": "ccache",
+          "path": "cache/ccache"
+        },
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        },
+        {
+          "name": "xcode",
+          "path": "cache/Xcode.app"
+        }
+      ],
+      "casSpec": "compile",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/mac-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/mac_toolchain/${platform}",
+          "path": "mac_toolchain",
+          "version": "git_revision:796d2b92cff93fc2059623ce0a66284373ceea0a"
+        },
+        {
+          "name": "skia/bots/ccache_mac",
+          "path": "ccache_mac",
+          "version": "version:1"
+        },
+        {
+          "name": "skia/bots/provisioning_profile_ios",
+          "path": "provisioning_profile_ios",
+          "version": "version:6"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal\",\"swarm_out_dir\":\"build\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cores:12",
+        "cpu:x86-64",
+        "os:Mac-10.15.7",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 3600000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "idempotent": true,
+      "io_timeout_ns": 3600000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "build"
+      ],
+      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "Build-Win-Clang-arm64-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -13719,22 +13772,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -13748,7 +13801,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13794,7 +13847,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-arm64-Release": {
+    "Build-Win-Clang-arm64-Debug-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -13816,22 +13869,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -13845,7 +13898,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13891,7 +13944,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-arm64-Release-ANGLE": {
+    "Build-Win-Clang-arm64-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -13913,22 +13966,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -13942,7 +13995,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -13988,7 +14041,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-arm64-Release-Android": {
+    "Build-Win-Clang-arm64-Release-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -14010,27 +14063,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/android_ndk_windows",
-          "path": "n",
-          "version": "version:11"
+          "name": "skia/bots/clang_win",
+          "path": "clang_win",
+          "version": "version:16"
         }
       ],
       "command": [
@@ -14039,11 +14092,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-Android\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateWinToolchain"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -14084,7 +14138,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86-Debug": {
+    "Build-Win-Clang-arm64-Release-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -14106,27 +14160,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/clang_win",
-          "path": "clang_win",
-          "version": "version:16"
+          "name": "skia/bots/android_ndk_windows",
+          "path": "n",
+          "version": "version:11"
         }
       ],
       "command": [
@@ -14135,12 +14189,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-arm64-Release-Android\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateWinToolchain"
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -14181,7 +14234,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86-Debug-Exceptions": {
+    "Build-Win-Clang-x86-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -14203,22 +14256,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14232,7 +14285,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug-Exceptions\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14278,7 +14331,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86-Release": {
+    "Build-Win-Clang-x86-Debug-Exceptions": {
       "caches": [
         {
           "name": "vpython",
@@ -14300,22 +14353,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14329,7 +14382,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Debug-Exceptions\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14375,7 +14428,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug": {
+    "Build-Win-Clang-x86-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -14397,22 +14450,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14426,7 +14479,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14472,7 +14525,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-ANGLE": {
+    "Build-Win-Clang-x86_64-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -14494,22 +14547,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14523,7 +14576,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14569,7 +14622,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-ASAN": {
+    "Build-Win-Clang-x86_64-Debug-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -14591,22 +14644,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14620,7 +14673,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14666,7 +14719,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-Dawn": {
+    "Build-Win-Clang-x86_64-Debug-ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -14688,22 +14741,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14717,7 +14770,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Dawn\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-ASAN\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14763,7 +14816,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-Direct3D": {
+    "Build-Win-Clang-x86_64-Debug-Dawn": {
       "caches": [
         {
           "name": "vpython",
@@ -14785,22 +14838,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14814,7 +14867,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Direct3D\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Dawn\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14860,7 +14913,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-Vulkan": {
+    "Build-Win-Clang-x86_64-Debug-Direct3D": {
       "caches": [
         {
           "name": "vpython",
@@ -14882,22 +14935,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -14911,7 +14964,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Direct3D\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -14957,7 +15010,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Debug-Wuffs": {
+    "Build-Win-Clang-x86_64-Debug-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -14979,22 +15032,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15008,7 +15061,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15054,7 +15107,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release": {
+    "Build-Win-Clang-x86_64-Debug-Wuffs": {
       "caches": [
         {
           "name": "vpython",
@@ -15076,22 +15129,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15105,7 +15158,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15151,7 +15204,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release-ANGLE": {
+    "Build-Win-Clang-x86_64-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -15173,22 +15226,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15202,7 +15255,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15248,7 +15301,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release-Dawn": {
+    "Build-Win-Clang-x86_64-Release-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -15270,22 +15323,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15299,7 +15352,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Dawn\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15345,7 +15398,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release-Direct3D": {
+    "Build-Win-Clang-x86_64-Release-Dawn": {
       "caches": [
         {
           "name": "vpython",
@@ -15367,22 +15420,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15396,7 +15449,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Direct3D\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Dawn\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15442,7 +15495,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release-Shared": {
+    "Build-Win-Clang-x86_64-Release-Direct3D": {
       "caches": [
         {
           "name": "vpython",
@@ -15464,22 +15517,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15493,7 +15546,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Direct3D\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15539,7 +15592,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-Clang-x86_64-Release-Vulkan": {
+    "Build-Win-Clang-x86_64-Release-Shared": {
       "caches": [
         {
           "name": "vpython",
@@ -15561,22 +15614,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_win",
@@ -15590,7 +15643,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15636,7 +15689,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-arm64-Debug": {
+    "Build-Win-Clang-x86_64-Release-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -15658,22 +15711,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_win",
+          "path": "clang_win",
+          "version": "version:16"
         }
       ],
       "command": [
@@ -15682,7 +15740,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-Clang-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15728,7 +15786,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-arm64-Debug-ANGLE": {
+    "Build-Win-MSVC-arm64-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -15750,22 +15808,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -15774,7 +15832,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15820,7 +15878,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-arm64-Release": {
+    "Build-Win-MSVC-arm64-Debug-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -15842,22 +15900,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -15866,7 +15924,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Debug-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -15912,7 +15970,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-arm64-Release-ANGLE": {
+    "Build-Win-MSVC-arm64-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -15934,22 +15992,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -15958,7 +16016,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16004,7 +16062,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86-Debug": {
+    "Build-Win-MSVC-arm64-Release-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -16026,22 +16084,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16050,7 +16108,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-arm64-Release-ANGLE\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16096,7 +16154,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86-Release": {
+    "Build-Win-MSVC-x86-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -16118,22 +16176,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16142,7 +16200,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16188,7 +16246,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Debug": {
+    "Build-Win-MSVC-x86-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -16210,22 +16268,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16234,7 +16292,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16280,7 +16338,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Debug-Direct3D": {
+    "Build-Win-MSVC-x86_64-Debug": {
       "caches": [
         {
           "name": "vpython",
@@ -16302,22 +16360,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16326,7 +16384,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Direct3D\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16372,7 +16430,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Debug-Vulkan": {
+    "Build-Win-MSVC-x86_64-Debug-Direct3D": {
       "caches": [
         {
           "name": "vpython",
@@ -16394,22 +16452,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16418,7 +16476,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Direct3D\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16464,7 +16522,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Debug-Wuffs": {
+    "Build-Win-MSVC-x86_64-Debug-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -16486,22 +16544,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16510,7 +16568,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Vulkan\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16556,7 +16614,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Release": {
+    "Build-Win-MSVC-x86_64-Debug-Wuffs": {
       "caches": [
         {
           "name": "vpython",
@@ -16578,22 +16636,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16602,7 +16660,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Debug-Wuffs\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16648,7 +16706,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Release-Direct3D": {
+    "Build-Win-MSVC-x86_64-Release": {
       "caches": [
         {
           "name": "vpython",
@@ -16670,22 +16728,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16694,7 +16752,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Direct3D\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16740,7 +16798,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Release-Shared": {
+    "Build-Win-MSVC-x86_64-Release-Direct3D": {
       "caches": [
         {
           "name": "vpython",
@@ -16762,22 +16820,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16786,7 +16844,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Direct3D\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16832,7 +16890,7 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Build-Win-MSVC-x86_64-Release-Vulkan": {
+    "Build-Win-MSVC-x86_64-Release-Shared": {
       "caches": [
         {
           "name": "vpython",
@@ -16854,22 +16912,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -16878,7 +16936,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compile",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Shared\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
@@ -16924,76 +16982,44 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "BuildStats-Debian10-Clang-x86_64-Release": {
+    "Build-Win-MSVC-x86_64-Release-Vulkan": {
       "caches": [
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
         {
           "name": "vpython",
           "path": "cache/vpython"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
         }
       ],
-      "casSpec": "run-recipe",
+      "casSpec": "compile",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/3pp/tools/git/linux-amd64",
-          "path": "cipd_bin_packages",
-          "version": "version:2@2.34.1.chromium.6"
-        },
-        {
-          "name": "infra/tools/git/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/git-credential-luci/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/bloaty",
-          "path": "bloaty",
-          "version": "version:1"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -17001,21 +17027,20 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "compile",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Build-Win-MSVC-x86_64-Release-Vulkan\",\"swarm_out_dir\":\"build\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateWinToolchain"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "gpu:none",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "machine_type:n1-highcpu-64",
+        "os:Windows-Server-17763",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -17041,136 +17066,15 @@
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
+      "idempotent": true,
       "io_timeout_ns": 3600000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
-    },
-    "BuildStats-Debian10-Clang-x86_64-Release-Vulkan": {
-      "caches": [
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        },
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        },
-        {
-          "name": "work",
-          "path": "cache/work"
-        }
-      ],
-      "casSpec": "run-recipe",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/3pp/tools/git/linux-amd64",
-          "path": "cipd_bin_packages",
-          "version": "version:2@2.34.1.chromium.6"
-        },
-        {
-          "name": "infra/tools/git/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/git-credential-luci/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/bloaty",
-          "path": "bloaty",
-          "version": "version:1"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "build"
       ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 3600000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 3600000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "perf"
-      ]
+      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "BuildStats-Debian10-EMCC-asmjs-Release-PathKit": {
+    "BuildStats-Debian10-Clang-x86_64-Release": {
       "caches": [
         {
           "name": "git",
@@ -17209,32 +17113,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17248,11 +17152,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-asmjs-Release-PathKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-Clang-x86_64-Release\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-asmjs-Release-PathKit",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17293,7 +17197,7 @@
         "perf"
       ]
     },
-    "BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit": {
+    "BuildStats-Debian10-Clang-x86_64-Release-Vulkan": {
       "caches": [
         {
           "name": "git",
@@ -17332,32 +17236,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17371,11 +17275,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-Clang-x86_64-Release-Vulkan\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Debug-CanvasKit",
+        "Build-Debian10-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17416,7 +17320,7 @@
         "perf"
       ]
     },
-    "BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit_CPU": {
+    "BuildStats-Debian10-EMCC-asmjs-Release-PathKit": {
       "caches": [
         {
           "name": "git",
@@ -17455,32 +17359,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17494,11 +17398,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit_CPU\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-asmjs-Release-PathKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Debug-CanvasKit_CPU",
+        "Build-Debian10-EMCC-asmjs-Release-PathKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17539,7 +17443,7 @@
         "perf"
       ]
     },
-    "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit": {
+    "BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit": {
       "caches": [
         {
           "name": "git",
@@ -17578,32 +17482,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17617,11 +17521,257 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "compute_buildstats",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Build-Debian10-EMCC-wasm-Debug-CanvasKit",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 3600000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 3600000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit_CPU": {
+      "caches": [
+        {
+          "name": "git",
+          "path": "cache/git"
+        },
+        {
+          "name": "git_cache",
+          "path": "cache/git_cache"
+        },
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        },
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "run-recipe",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/3pp/tools/git/linux-amd64",
+          "path": "cipd_bin_packages",
+          "version": "version:2@2.34.1.chromium.6"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "compute_buildstats",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Debug-CanvasKit_CPU\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-EMCC-wasm-Debug-CanvasKit_CPU",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 3600000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 3600000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit": {
+      "caches": [
+        {
+          "name": "git",
+          "path": "cache/git"
+        },
+        {
+          "name": "git_cache",
+          "path": "cache/git_cache"
+        },
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        },
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "run-recipe",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/3pp/tools/git/linux-amd64",
+          "path": "cipd_bin_packages",
+          "version": "version:2@2.34.1.chromium.6"
+        },
+        {
+          "name": "infra/tools/git/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/git-credential-luci/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "compute_buildstats",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -17701,32 +17851,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17824,32 +17974,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -17947,32 +18097,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bloaty",
@@ -18037,7 +18187,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -18087,7 +18237,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -18137,7 +18287,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -18187,7 +18337,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -18225,18 +18375,266 @@
       "max_attempts": 1,
       "service_account": "skia-g3-framework-compile@skia-swarming-bots.iam.gserviceaccount.com"
     },
+    "CodeSize-dm-Debian10-Clang-x86_64-Debug": {
+      "caches": [
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "empty",
+      "cipd_packages": [
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "./codesize",
+        "--local=false",
+        "--project_id",
+        "skia-swarming-bots",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "CodeSize-dm-Debian10-Clang-x86_64-Debug",
+        "--compile_task_name",
+        "Build-Debian10-Clang-x86_64-Debug",
+        "--binary_name",
+        "dm",
+        "--bloaty_cipd_version",
+        "version:1",
+        "--repo",
+        "<(REPO)",
+        "--revision",
+        "<(REVISION)",
+        "--patch_issue",
+        "<(ISSUE)",
+        "--patch_set",
+        "<(PATCHSET)",
+        "--patch_server",
+        "<(CODEREVIEW_SERVER)"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 1200000000000,
+      "io_timeout_ns": 1200000000000,
+      "max_attempts": 1,
+      "service_account": "skia-external-codesize@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "CodeSize-dm-Debian10-Clang-x86_64-Release": {
+      "caches": [
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "empty",
+      "cipd_packages": [
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "./codesize",
+        "--local=false",
+        "--project_id",
+        "skia-swarming-bots",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "CodeSize-dm-Debian10-Clang-x86_64-Release",
+        "--compile_task_name",
+        "Build-Debian10-Clang-x86_64-Release",
+        "--binary_name",
+        "dm",
+        "--bloaty_cipd_version",
+        "version:1",
+        "--repo",
+        "<(REPO)",
+        "--revision",
+        "<(REVISION)",
+        "--patch_issue",
+        "<(ISSUE)",
+        "--patch_set",
+        "<(PATCHSET)",
+        "--patch_server",
+        "<(CODEREVIEW_SERVER)"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 1200000000000,
+      "io_timeout_ns": 1200000000000,
+      "max_attempts": 1,
+      "service_account": "skia-external-codesize@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "CodeSize-fm-Debian10-Clang-x86_64-Debug": {
+      "caches": [
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "empty",
+      "cipd_packages": [
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "./codesize",
+        "--local=false",
+        "--project_id",
+        "skia-swarming-bots",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "CodeSize-fm-Debian10-Clang-x86_64-Debug",
+        "--compile_task_name",
+        "Build-Debian10-Clang-x86_64-Debug",
+        "--binary_name",
+        "fm",
+        "--bloaty_cipd_version",
+        "version:1",
+        "--repo",
+        "<(REPO)",
+        "--revision",
+        "<(REVISION)",
+        "--patch_issue",
+        "<(ISSUE)",
+        "--patch_set",
+        "<(PATCHSET)",
+        "--patch_server",
+        "<(CODEREVIEW_SERVER)"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 1200000000000,
+      "io_timeout_ns": 1200000000000,
+      "max_attempts": 1,
+      "service_account": "skia-external-codesize@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "CodeSize-fm-Debian10-Clang-x86_64-Release": {
+      "caches": [
+        {
+          "name": "work",
+          "path": "cache/work"
+        }
+      ],
+      "casSpec": "empty",
+      "cipd_packages": [
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bloaty",
+          "path": "bloaty",
+          "version": "version:1"
+        }
+      ],
+      "command": [
+        "./codesize",
+        "--local=false",
+        "--project_id",
+        "skia-swarming-bots",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "CodeSize-fm-Debian10-Clang-x86_64-Release",
+        "--compile_task_name",
+        "Build-Debian10-Clang-x86_64-Release",
+        "--binary_name",
+        "fm",
+        "--bloaty_cipd_version",
+        "version:1",
+        "--repo",
+        "<(REPO)",
+        "--revision",
+        "<(REVISION)",
+        "--patch_issue",
+        "<(ISSUE)",
+        "--patch_set",
+        "<(PATCHSET)",
+        "--patch_server",
+        "<(CODEREVIEW_SERVER)"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 1200000000000,
+      "io_timeout_ns": 1200000000000,
+      "max_attempts": 1,
+      "service_account": "skia-external-codesize@skia-swarming-bots.iam.gserviceaccount.com"
+    },
     "FM-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "casSpec": "test",
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18287,12 +18685,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18351,12 +18749,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18415,12 +18813,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18474,12 +18872,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18524,12 +18922,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18574,12 +18972,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18624,12 +19022,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18675,12 +19073,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18726,12 +19124,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -18818,27 +19216,27 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -18929,12 +19327,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -19034,32 +19432,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -19145,32 +19543,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -19249,12 +19647,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -19317,12 +19715,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -19385,12 +19783,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -19451,22 +19849,22 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -19550,32 +19948,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ccache_linux",
@@ -19669,12 +20067,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -19752,12 +20150,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -19858,32 +20256,32 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -19973,7 +20371,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -20021,7 +20419,7 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         }
       ],
       "command": [
@@ -20088,12 +20486,17 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/bazelisk",
+          "path": "bazelisk",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -20132,83 +20535,12 @@
       "env_prefixes": {
         "PATH": [
           "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ]
-      },
-      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Housekeeper-PerCommit-PushAppsFromWASMDockerImage": {
-      "caches": [
-        {
-          "name": "docker",
-          "path": "cache/docker"
-        },
-        {
-          "name": "git",
-          "path": "cache/git"
-        },
-        {
-          "name": "git_cache",
-          "path": "cache/git_cache"
-        }
-      ],
-      "casSpec": "empty",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/git/linux-amd64",
-          "path": "cipd_bin_packages",
-          "version": "version:2@2.34.1.chromium.6"
-        },
-        {
-          "name": "infra/tools/git/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/git-credential-luci/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        }
-      ],
-      "command": [
-        "./push_apps_from_wasm_image",
-        "--project_id",
-        "skia-swarming-bots",
-        "--task_id",
-        "<(TASK_ID)",
-        "--task_name",
-        "Housekeeper-PerCommit-PushAppsFromWASMDockerImage",
-        "--workdir",
-        ".",
-        "--repo",
-        "<(REPO)",
-        "--revision",
-        "<(REVISION)",
-        "--patch_issue",
-        "<(ISSUE)",
-        "--patch_set",
-        "<(PATCHSET)",
-        "--patch_server",
-        "<(CODEREVIEW_SERVER)"
-      ],
-      "dependencies": [
-        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64",
-        "Housekeeper-PerCommit-CreateDockerImage_Skia_WASM_Release"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
-      ],
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
+          "cipd_bin_packages/bin",
+          "bazelisk"
         ]
       },
+      "execution_timeout_ns": 7200000000000,
+      "io_timeout_ns": 7200000000000,
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
     "Housekeeper-PerCommit-PushBazelAppsFromWASMDockerImage": {
@@ -20236,12 +20568,12 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/bazelisk",
@@ -20305,12 +20637,12 @@
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -20396,27 +20728,27 @@
         {
           "name": "infra/tools/git/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/git-credential-luci/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/go",
@@ -20499,22 +20831,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -20592,22 +20924,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/lottie-samples",
@@ -20690,22 +21022,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -20783,22 +21115,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -20875,22 +21207,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -20967,22 +21299,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21059,22 +21391,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21152,22 +21484,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21244,22 +21576,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21336,22 +21668,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21429,22 +21761,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21522,22 +21854,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21615,22 +21947,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21686,6 +22018,104 @@
         "perf"
       ]
     },
+    "Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/text_blob_traces",
+          "path": "text_blob_traces",
+          "version": "version:0"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android\",\"do_upload\":\"true\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"nonrendering\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SnapdragonQM215\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"JioNext\\\",\\\"os\\\",\\\"Android\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\",\"textTraces\":\"true\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-arm-Release-Android",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:RKQ1.210602.002",
+        "device_type:msm8937",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
     "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
       "caches": [
         {
@@ -21708,22 +22138,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21801,22 +22231,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21894,22 +22324,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -21987,22 +22417,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22079,22 +22509,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22171,22 +22601,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22263,22 +22693,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22356,22 +22786,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22449,22 +22879,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22542,22 +22972,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22635,22 +23065,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22728,22 +23158,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -22821,22 +23251,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/text_blob_traces",
@@ -22919,22 +23349,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23012,22 +23442,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23105,22 +23535,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23198,22 +23628,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23290,22 +23720,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23382,22 +23812,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23475,22 +23905,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23567,22 +23997,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23659,22 +24089,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23752,22 +24182,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23823,6 +24253,99 @@
         "perf"
       ]
     },
+    "Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG78\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel6\\\",\\\"os\\\",\\\"Android\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:SD1A.210817.037",
+        "device_type:oriole",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
     "Perf-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android": {
       "caches": [
         {
@@ -23845,22 +24368,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -23938,22 +24461,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -24031,22 +24554,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -24124,22 +24647,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -24217,22 +24740,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -24310,22 +24833,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -24335,12 +24858,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24420,22 +24943,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -24445,12 +24968,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24530,32 +25053,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24635,32 +25158,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24740,32 +25263,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24845,32 +25368,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -24950,22 +25473,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/lottie-samples",
@@ -24975,12 +25498,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25060,32 +25583,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25165,32 +25688,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25269,32 +25792,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25308,7 +25831,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -25374,22 +25897,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -25399,12 +25922,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25483,22 +26006,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -25513,12 +26036,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25597,22 +26120,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -25632,12 +26155,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25716,22 +26239,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -25741,12 +26264,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25825,22 +26348,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/lottie-samples",
@@ -25855,12 +26378,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -25939,22 +26462,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -25969,12 +26492,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26053,22 +26576,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -26078,12 +26601,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26162,22 +26685,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -26187,12 +26710,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26271,22 +26794,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -26362,22 +26885,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -26437,7 +26960,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -26447,7 +26970,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -26507,7 +27030,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -26517,7 +27040,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -26579,7 +27102,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -26667,22 +27190,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/lottie-samples",
@@ -26697,12 +27220,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26781,32 +27304,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26885,32 +27408,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -26989,32 +27512,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27093,32 +27616,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27197,32 +27720,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27301,32 +27824,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27406,32 +27929,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27511,32 +28034,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27615,32 +28138,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27719,32 +28242,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27823,32 +28346,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -27927,32 +28450,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -28031,22 +28554,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mskp",
@@ -28056,7 +28579,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -28130,22 +28653,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mskp",
@@ -28155,7 +28678,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -28229,22 +28752,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mskp",
@@ -28254,7 +28777,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -28306,7 +28829,7 @@
         "perf"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
+    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -28328,37 +28851,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -28372,15 +28890,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"glreducedshaders\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -28410,12 +28928,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "perf"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats": {
       "caches": [
         {
           "name": "vpython",
@@ -28437,32 +28955,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -28476,7 +28994,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"glreducedshaders\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--sourceType\\\",\\\"skp\\\",\\\"--clip\\\",\\\"0,0,1600,16384\\\",\\\"--GPUbenchTileW\\\",\\\"1600\\\",\\\"--GPUbenchTileH\\\",\\\"512\\\",\\\"--samples\\\",\\\"1\\\",\\\"--loops\\\",\\\"1\\\",\\\"--config\\\",\\\"gldmsaa\\\",\\\"--dmsaaStatsDump\\\",\\\"--match\\\",\\\"~svg\\\",\\\"~chalkboard\\\",\\\"~motionmark\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DMSAAStats\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -28484,7 +29002,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -28519,7 +29037,7 @@
         "perf"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {
+    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": {
       "caches": [
         {
           "name": "vpython",
@@ -28541,42 +29059,42 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
           "path": "svg",
           "version": "version:14"
+        },
+        {
+          "name": "skia/bots/valgrind",
+          "path": "valgrind",
+          "version": "version:9"
         }
       ],
       "command": [
@@ -28585,17 +29103,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-ASAN",
+        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
-        "pool:Skia"
+        "pool:Skia",
+        "valgrind:1"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -28617,18 +29136,18 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 172800000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 14400000000000,
+      "io_timeout_ns": 32400000000000,
       "max_attempts": 1,
       "outputs": [
         "perf"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats": {
+    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -28650,32 +29169,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -28689,15 +29213,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DMSAAStats\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--sourceType\\\",\\\"skp\\\",\\\"--clip\\\",\\\"0,0,1600,16384\\\",\\\"--GPUbenchTileW\\\",\\\"1600\\\",\\\"--GPUbenchTileH\\\",\\\"512\\\",\\\"--samples\\\",\\\"1\\\",\\\"--loops\\\",\\\"1\\\",\\\"--config\\\",\\\"gldmsaa\\\",\\\"--dmsaaStatsDump\\\",\\\"--match\\\",\\\"~svg\\\",\\\"~chalkboard\\\",\\\"~motionmark\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DMSAAStats\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -28732,232 +29256,151 @@
         "perf"
       ]
     },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "perf",
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL1": {
+      "casSpec": "puppeteer",
       "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
+          "name": "skia/bots/node",
+          "path": "node",
+          "version": "version:3"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
-        },
-        {
-          "name": "skia/bots/valgrind",
-          "path": "valgrind",
-          "version": "version:9"
+          "version": "version:362"
         }
       ],
       "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
+        "./perf_puppeteer_canvas",
+        "--project_id",
+        "skia-swarming-bots",
+        "--git_hash",
+        "<(REVISION)",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL1",
+        "--canvaskit_bin_path",
+        "./build",
+        "--node_bin_path",
+        "./node/node/bin",
+        "--benchmark_path",
+        "./tools/perf-canvaskit-puppeteer",
+        "--output_path",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"do_upload\":\"false\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
+        "--os_trace",
+        "Ubuntu18",
+        "--model_trace",
+        "Golo",
+        "--cpu_or_gpu_trace",
+        "GPU",
+        "--cpu_or_gpu_value_trace",
+        "QuadroP400",
+        "--webgl_version",
+        "1"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
-        "pool:Skia",
-        "valgrind:1"
+        "pool:Skia"
       ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
       "env_prefixes": {
         "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
+          "node/node/bin"
         ]
       },
-      "execution_timeout_ns": 32400000000000,
-      "expiration_ns": 172800000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 32400000000000,
-      "max_attempts": 1,
+      "execution_timeout_ns": 3600000000000,
+      "io_timeout_ns": 3600000000000,
       "outputs": [
         "perf"
-      ]
-    },
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
       ],
-      "casSpec": "perf",
+      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL2": {
+      "casSpec": "puppeteer",
       "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
+          "name": "skia/bots/node",
+          "path": "node",
+          "version": "version:3"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "version:362"
         }
       ],
       "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
+        "./perf_puppeteer_canvas",
+        "--project_id",
+        "skia-swarming-bots",
+        "--git_hash",
+        "<(REVISION)",
+        "--task_id",
+        "<(TASK_ID)",
+        "--task_name",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL2",
+        "--canvaskit_bin_path",
+        "./build",
+        "--node_bin_path",
+        "./node/node/bin",
+        "--benchmark_path",
+        "./tools/perf-canvaskit-puppeteer",
+        "--output_path",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
+        "--os_trace",
+        "Ubuntu18",
+        "--model_trace",
+        "Golo",
+        "--cpu_or_gpu_trace",
+        "GPU",
+        "--cpu_or_gpu_value_trace",
+        "QuadroP400",
+        "--webgl_version",
+        "2"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
       "env_prefixes": {
         "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
+          "node/node/bin"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "execution_timeout_ns": 3600000000000,
+      "io_timeout_ns": 3600000000000,
       "outputs": [
         "perf"
-      ]
+      ],
+      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL1": {
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL1": {
       "casSpec": "puppeteer",
       "cipd_packages": [
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -28967,11 +29410,11 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
-        "./perf_puppeteer_canvas",
+        "./perf_puppeteer_render_skps",
         "--project_id",
         "skia-swarming-bots",
         "--git_hash",
@@ -28979,9 +29422,11 @@
         "--task_id",
         "<(TASK_ID)",
         "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL1",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL1",
         "--canvaskit_bin_path",
         "./build",
+        "--skps_path",
+        "./skp",
         "--node_bin_path",
         "./node/node/bin",
         "--benchmark_path",
@@ -29004,7 +29449,7 @@
         "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -29020,13 +29465,13 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL2": {
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL2": {
       "casSpec": "puppeteer",
       "cipd_packages": [
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -29036,11 +29481,11 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
-        "./perf_puppeteer_canvas",
+        "./perf_puppeteer_render_skps",
         "--project_id",
         "skia-swarming-bots",
         "--git_hash",
@@ -29048,9 +29493,11 @@
         "--task_id",
         "<(TASK_ID)",
         "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_CanvasPerf_WebGL2",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL2",
         "--canvaskit_bin_path",
         "./build",
+        "--skps_path",
+        "./skp",
         "--node_bin_path",
         "./node/node/bin",
         "--benchmark_path",
@@ -29073,7 +29520,7 @@
         "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -29089,13 +29536,13 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL1": {
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL1": {
       "casSpec": "puppeteer",
       "cipd_packages": [
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -29103,13 +29550,13 @@
           "version": "version:3"
         },
         {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
+          "name": "skia/internal/lotties_with_assets",
+          "path": "lotties_with_assets",
+          "version": "version:1"
         }
       ],
       "command": [
-        "./perf_puppeteer_render_skps",
+        "./perf_puppeteer_skottie_frames",
         "--project_id",
         "skia-swarming-bots",
         "--git_hash",
@@ -29117,11 +29564,11 @@
         "--task_id",
         "<(TASK_ID)",
         "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL1",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL1",
         "--canvaskit_bin_path",
         "./build",
-        "--skps_path",
-        "./skp",
+        "--lotties_path",
+        "./lotties_with_assets",
         "--node_bin_path",
         "./node/node/bin",
         "--benchmark_path",
@@ -29144,7 +29591,7 @@
         "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -29160,13 +29607,13 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL2": {
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL2": {
       "casSpec": "puppeteer",
       "cipd_packages": [
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -29174,13 +29621,13 @@
           "version": "version:3"
         },
         {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
+          "name": "skia/internal/lotties_with_assets",
+          "path": "lotties_with_assets",
+          "version": "version:1"
         }
       ],
       "command": [
-        "./perf_puppeteer_render_skps",
+        "./perf_puppeteer_skottie_frames",
         "--project_id",
         "skia-swarming-bots",
         "--git_hash",
@@ -29188,11 +29635,11 @@
         "--task_id",
         "<(TASK_ID)",
         "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_RenderSKP_WebGL2",
+        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL2",
         "--canvaskit_bin_path",
         "./build",
-        "--skps_path",
-        "./skp",
+        "--lotties_path",
+        "./lotties_with_assets",
         "--node_bin_path",
         "./node/node/bin",
         "--benchmark_path",
@@ -29215,7 +29662,7 @@
         "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -29231,13 +29678,49 @@
       ],
       "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL1": {
-      "casSpec": "puppeteer",
+    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-SkottieWASM": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "skottie-wasm",
       "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/lottie-samples",
+          "path": "lottie-samples",
+          "version": "version:2"
         },
         {
           "name": "skia/bots/node",
@@ -29245,70 +29728,113 @@
           "version": "version:3"
         },
         {
-          "name": "skia/internal/lotties_with_assets",
-          "path": "lotties_with_assets",
-          "version": "version:1"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
-        "./perf_puppeteer_skottie_frames",
-        "--project_id",
-        "skia-swarming-bots",
-        "--git_hash",
-        "<(REVISION)",
-        "--task_id",
-        "<(TASK_ID)",
-        "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL1",
-        "--canvaskit_bin_path",
-        "./build",
-        "--lotties_path",
-        "./lotties_with_assets",
-        "--node_bin_path",
-        "./node/node/bin",
-        "--benchmark_path",
-        "./tools/perf-canvaskit-puppeteer",
-        "--output_path",
-        "perf",
-        "--os_trace",
-        "Ubuntu18",
-        "--model_trace",
-        "Golo",
-        "--cpu_or_gpu_trace",
-        "GPU",
-        "--cpu_or_gpu_value_trace",
-        "QuadroP400",
-        "--webgl_version",
-        "1"
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf_skottiewasm_lottieweb",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-SkottieWASM\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
       ],
       "dependencies": [
         "Build-Debian10-EMCC-wasm-Release-CanvasKit",
-        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
       "env_prefixes": {
         "PATH": [
-          "node/node/bin"
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 3600000000000,
-      "io_timeout_ns": 3600000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
       "outputs": [
         "perf"
-      ],
-      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL2": {
-      "casSpec": "puppeteer",
+    "Perf-Ubuntu18-none-Golo-GPU-QuadroP400-x86_64-Release-All-LottieWeb": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "lottie-web",
       "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/lottie-samples",
+          "path": "lottie-samples",
+          "version": "version:2"
         },
         {
           "name": "skia/bots/node",
@@ -29316,121 +29842,627 @@
           "version": "version:3"
         },
         {
-          "name": "skia/internal/lotties_with_assets",
-          "path": "lotties_with_assets",
-          "version": "version:1"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
-        "./perf_puppeteer_skottie_frames",
-        "--project_id",
-        "skia-swarming-bots",
-        "--git_hash",
-        "<(REVISION)",
-        "--task_id",
-        "<(TASK_ID)",
-        "--task_name",
-        "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-Puppeteer_SkottieFrames_WebGL2",
-        "--canvaskit_bin_path",
-        "./build",
-        "--lotties_path",
-        "./lotties_with_assets",
-        "--node_bin_path",
-        "./node/node/bin",
-        "--benchmark_path",
-        "./tools/perf-canvaskit-puppeteer",
-        "--output_path",
-        "perf",
-        "--os_trace",
-        "Ubuntu18",
-        "--model_trace",
-        "Golo",
-        "--cpu_or_gpu_trace",
-        "GPU",
-        "--cpu_or_gpu_value_trace",
-        "QuadroP400",
-        "--webgl_version",
-        "2"
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf_skottiewasm_lottieweb",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-none-Golo-GPU-QuadroP400-x86_64-Release-All-LottieWeb\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
-        "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
       "env_prefixes": {
         "PATH": [
-          "node/node/bin"
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 3600000000000,
-      "io_timeout_ns": 3600000000000,
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
       "outputs": [
         "perf"
+      ]
+    },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
       ],
-      "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:1002:6646-26.20.13031.18002",
+        "os:Windows-10-19044",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
     },
-    "Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-SkottieWASM": {
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "skottie-wasm",
+      "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:1002:6646-26.20.13031.18002",
+        "os:Windows-10-19044",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-AllPathsVolatile_Skpbench": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "skpbench",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/mskp",
+          "path": "mskp",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "skpbench",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:1002:6646-26.20.13031.18002",
+        "os:Windows-10-19044",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:1002:6646-26.20.13031.18002",
+        "os:Windows-10-19044",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "skpbench",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/mskp",
+          "path": "mskp",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "skpbench",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:1002:6646-26.20.13031.18002",
+        "os:Windows-10-19044",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/lottie-samples",
-          "path": "lottie-samples",
-          "version": "version:2"
-        },
-        {
-          "name": "skia/bots/node",
-          "path": "node",
-          "version": "version:3"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -29443,17 +30475,17 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf_skottiewasm_lottieweb",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-EMCC-Golo-GPU-QuadroP400-wasm-Release-All-SkottieWASM\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -29487,64 +30519,54 @@
         "perf"
       ]
     },
-    "Perf-Ubuntu18-none-Golo-GPU-QuadroP400-x86_64-Release-All-LottieWeb": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "lottie-web",
+      "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/windows-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/windows-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/lottie-samples",
-          "path": "lottie-samples",
-          "version": "version:2"
-        },
-        {
-          "name": "skia/bots/node",
-          "path": "node",
-          "version": "version:3"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -29557,16 +30579,17 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf_skottiewasm_lottieweb",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Ubuntu18-none-Golo-GPU-QuadroP400-x86_64-Release-All-LottieWeb\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"angle_gl_es2\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa8\\\",\\\"angle_gl_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -29600,14 +30623,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "skpbench",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -29622,37 +30645,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
+          "name": "skia/bots/mskp",
+          "path": "mskp",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -29660,8 +30678,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skpbench",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -29669,8 +30687,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -29704,7 +30722,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -29726,32 +30744,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -29765,16 +30783,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -29808,7 +30826,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-AllPathsVolatile_Skpbench": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -29830,22 +30848,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mskp",
@@ -29855,7 +30873,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -29864,16 +30882,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -29907,14 +30925,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "skpbench",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -29929,37 +30947,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
+          "name": "skia/bots/mskp",
+          "path": "mskp",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -29967,8 +30980,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonR9M470X\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"AlphaR2\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skpbench",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -29976,8 +30989,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -30011,7 +31024,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench": {
+    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9": {
       "caches": [
         {
           "name": "vpython",
@@ -30033,22 +31046,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mskp",
@@ -30058,7 +31071,7 @@
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         }
       ],
       "command": [
@@ -30067,7 +31080,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -30075,8 +31088,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6646-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -30110,7 +31123,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -30132,32 +31145,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -30171,7 +31184,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -30179,8 +31192,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:162b-20.19.15.4963",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30214,7 +31227,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -30236,32 +31249,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -30275,7 +31288,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"angle_gl_es2\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa8\\\",\\\"angle_gl_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -30283,8 +31296,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:162b-20.19.15.4963",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30318,14 +31331,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "skpbench",
+      "casSpec": "perf",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -30340,32 +31353,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/mskp",
-          "path": "mskp",
-          "version": "version:5"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -30373,8 +31391,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -30382,8 +31400,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:1926-26.20.100.7463",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30417,7 +31435,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -30439,32 +31457,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -30478,16 +31496,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:1926-26.20.100.7463",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30521,14 +31539,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench": {
+    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "skpbench",
+      "casSpec": "perf",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -30543,32 +31561,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/mskp",
-          "path": "mskp",
-          "version": "version:5"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -30576,8 +31599,8 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_AllPathsVolatile_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -30585,8 +31608,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:1926-26.20.100.7463",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30620,14 +31643,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench": {
+    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "skpbench",
+      "casSpec": "perf",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -30642,32 +31665,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/mskp",
-          "path": "mskp",
-          "version": "version:5"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -30675,17 +31703,17 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:3ea5-26.20.100.7463",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30719,14 +31747,14 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9": {
+    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "skpbench",
+      "casSpec": "perf",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/windows-amd64",
@@ -30741,32 +31769,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/mskp",
-          "path": "mskp",
-          "version": "version:5"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -30774,17 +31807,17 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "skpbench",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_Skpbench_DDLTotal_9x9\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "gpu:8086:3ea5-26.20.100.7463",
+        "os:Windows-10-19044",
         "pool:Skia"
       ],
       "environment": {
@@ -30818,7 +31851,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -30840,32 +31873,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -30879,15 +31912,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
+        "gpu:8086:3ea5-26.20.100.7463",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -30922,7 +31955,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -30944,32 +31977,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -30983,15 +32016,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:162b-20.19.15.4963",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31026,7 +32059,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All": {
+    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -31048,32 +32081,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31087,15 +32120,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-26.20.100.7463",
+        "gpu:8086:0a16-20.19.15.4963",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31130,7 +32163,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -31152,32 +32185,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31191,15 +32224,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-26.20.100.7463",
+        "gpu:10de:11c0-26.21.14.4120",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31234,7 +32267,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -31256,32 +32289,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31295,15 +32328,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1926-26.20.100.7463",
+        "gpu:10de:11c0-26.21.14.4120",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31338,7 +32371,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All": {
+    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -31360,32 +32393,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31399,15 +32432,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--match\\\",\\\"~compositing_images\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-26.20.100.7463",
+        "gpu:10de:11c0-26.21.14.4120",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31442,7 +32475,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -31464,32 +32497,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31503,15 +32536,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-26.20.100.7463",
+        "gpu:1002:683d-26.20.13031.18002",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31546,7 +32579,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -31568,32 +32601,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31607,15 +32640,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:3ea5-26.20.100.7463",
+        "gpu:1002:683d-26.20.13031.18002",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31650,7 +32683,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All": {
+    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -31672,32 +32705,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31711,15 +32744,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
+        "gpu:1002:683d-26.20.13031.18002",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31754,7 +32787,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -31776,32 +32809,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31815,15 +32848,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0a16-20.19.15.4963",
+        "gpu:10de:1401-27.21.14.5671",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31858,7 +32891,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
       "caches": [
         {
           "name": "vpython",
@@ -31880,32 +32913,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -31919,15 +32952,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-Clang-x86_64-Release-ANGLE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-26.21.14.4120",
+        "gpu:10de:1401-27.21.14.5671",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -31962,7 +32995,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE": {
+    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -31984,32 +33017,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32023,15 +33056,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-26.21.14.4120",
+        "gpu:10de:1401-27.21.14.5671",
         "os:Windows-10-19044",
         "pool:Skia"
       ],
@@ -32066,7 +33099,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -32088,32 +33121,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32127,16 +33160,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--match\\\",\\\"~compositing_images\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-MSVC-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:11c0-26.21.14.4120",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -32170,7 +33203,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All": {
+    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -32192,32 +33225,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32231,16 +33264,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
+        "Build-Win-MSVC-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "gpu:10de:1cb3-30.0.15.1179",
+        "os:Windows-10-19043",
         "pool:Skia"
       ],
       "environment": {
@@ -32274,7 +33307,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE": {
+    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -32296,32 +33329,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32335,16 +33368,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN\",\"do_upload\":\"false\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"nonrendering\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~^floor2int_undef$\\\",\\\"~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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
+        "Build-Win-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-Server-17763",
         "pool:Skia"
       ],
       "environment": {
@@ -32373,12 +33407,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan": {
+    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs": {
       "caches": [
         {
           "name": "vpython",
@@ -32400,32 +33434,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32439,16 +33473,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleA-GPU-RadeonHD7770-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD7770\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs\",\"do_upload\":\"false\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~^floor2int_undef$\\\",\\\"~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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
+        "Build-Win-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:683d-26.20.13031.18002",
-        "os:Windows-10-19044",
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-Server-17763",
         "pool:Skia"
       ],
       "environment": {
@@ -32477,12 +33512,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All": {
+    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -32504,32 +33539,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -32543,7 +33578,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"do_upload\":\"true\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"nonrendering\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Win2019\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -32551,8 +33586,9 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19044",
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Windows-Server-17763",
         "pool:Skia"
       ],
       "environment": {
@@ -32586,7 +33622,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE": {
+    "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -32596,49 +33632,39 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "skia/bots/ios-dev-image-13.6",
+          "path": "ios-dev-image-13.6",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -32647,16 +33673,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa8\\\",\\\"angle_d3d11_es3_msaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7800\\\",\\\"model\\\",\\\"iPadPro\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-ANGLE",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19044",
+        "device_type:iPad6,3",
+        "os:iOS-13.6",
         "pool:Skia"
       ],
       "environment": {
@@ -32690,7 +33719,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan": {
+    "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -32700,49 +33729,136 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
+          "name": "skia/bots/ios-dev-image-13.6",
+          "path": "ios-dev-image-13.6",
+          "version": "version:0"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "perf",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7800\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPadPro\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_type:iPad6,3",
+        "os:iOS-13.6",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "perf"
+      ]
+    },
+    "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "perf",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
         },
         {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -32751,16 +33867,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:10de:1401-27.21.14.5671",
-        "os:Windows-10-19044",
+        "device_type:iPhone9,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -32794,7 +33913,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -32804,49 +33923,39 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -32855,16 +33964,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"srgb-gl\\\",\\\"narrow-gl\\\",\\\"glmsaa8\\\",\\\"gldmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "device_type:iPhone9,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -32898,7 +34010,7 @@
         "perf"
       ]
     },
-    "Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan": {
+    "Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -32908,49 +34020,39 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -32959,16 +34061,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa8\\\",\\\"vkdmsaa\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release-Vulkan",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
-        "os:Windows-10-19043",
+        "device_type:iPhone10,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -33002,112 +34107,7 @@
         "perf"
       ]
     },
-    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "perf",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN\",\"do_upload\":\"false\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"nonrendering\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~^floor2int_undef$\\\",\\\"~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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-Server-17763",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
-      "outputs": [
-        "perf"
-      ]
-    },
-    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs": {
+    "Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -33117,49 +34117,39 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -33168,17 +34158,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Debug-All-ASAN_BonusConfigs\",\"do_upload\":\"false\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--loops\\\",\\\"1\\\",\\\"--samples\\\",\\\"1\\\",\\\"--keepAlive\\\",\\\"true\\\",\\\"--match\\\",\\\"~^floor2int_undef$\\\",\\\"~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\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Debug-ASAN",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-Server-17763",
+        "device_type:iPhone10,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -33207,12 +34199,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "perf"
       ]
     },
-    "Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -33222,49 +34214,39 @@
       "casSpec": "perf",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/windows-amd64",
+          "name": "infra/3pp/tools/cpython/linux-arm64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/windows-amd64",
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "name": "skia/bots/ios-dev-image-13.6",
+          "path": "ios-dev-image-13.6",
+          "version": "version:0"
         }
       ],
       "command": [
@@ -33273,17 +34255,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"do_upload\":\"true\",\"images\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"nonrendering\\\",\\\"--internalSamples\\\",\\\"8\\\",\\\"--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\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Win2019\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Win-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Build-Mac-Xcode11.4.1-arm64-Release-iOS",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Windows-Server-17763",
+        "device_type:iPhone12,1",
+        "os:iOS-13.6",
         "pool:Skia"
       ],
       "environment": {
@@ -33317,7 +34301,7 @@
         "perf"
       ]
     },
-    "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All": {
+    "Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -33339,22 +34323,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -33368,18 +34352,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7800\\\",\\\"model\\\",\\\"iPadPro\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPad6,3",
+        "device_type:iPhone12,1",
         "os:iOS-13.6",
         "pool:Skia"
       ],
@@ -33414,14 +34398,14 @@
         "perf"
       ]
     },
-    "Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33433,30 +34417,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.6",
-          "path": "ios-dev-image-13.6",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33464,20 +34448,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPadPro-GPU-PowerVRGT7800-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7800\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPadPro\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Mali400MP2\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"AndroidOne\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"bigblurs\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"dropshadowimagefilter\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"filterfastbounds\\\",\\\"gles\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersclipped\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersscaled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imageresizetiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"matrixconvolution\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersbase\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixScalarMath\\\",\\\"--match\\\",\\\"~WritePixels\\\",\\\"~PremulAlphaRoundTrip_Gpu\\\",\\\"~ReimportImageTextureWithMipLevels\\\",\\\"~MorphologyFilterRadiusWithMirrorCTM_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Debian10-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPad6,3",
-        "os:iOS-13.6",
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33508,17 +34493,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All": {
+    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33530,30 +34516,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33561,20 +34547,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Mali400MP2\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"AndroidOne\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"bigblurs\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"dropshadowimagefilter\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"filterfastbounds\\\",\\\"gles\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersclipped\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersscaled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imageresizetiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"matrixconvolution\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersbase\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixScalarMath\\\",\\\"--match\\\",\\\"~WritePixels\\\",\\\"~PremulAlphaRoundTrip_Gpu\\\",\\\"~ReimportImageTextureWithMipLevels\\\",\\\"~MorphologyFilterRadiusWithMirrorCTM_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Debian10-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
+        "device_os:MOB30Q",
+        "device_type:sprout",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33605,17 +34592,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal": {
+    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33627,30 +34615,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33658,20 +34646,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
+        "device_os:QP1A.190711.020",
+        "device_type:exynos990",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33702,17 +34691,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
+    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33724,30 +34714,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33755,20 +34745,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"--match\\\",\\\"~VkPrepareForExternalIOQueueTransitionTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone9,1",
-        "os:iOS-13.3.1",
+        "device_os:QP1A.190711.020",
+        "device_type:exynos990",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33799,17 +34790,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal": {
+    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33821,30 +34813,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33852,20 +34844,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone9,1",
-        "os:iOS-13.3.1",
+        "device_os:QP1A.190711.020",
+        "device_type:exynos990",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33896,17 +34889,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All": {
+    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -33918,30 +34912,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -33949,20 +34943,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_NativeFonts\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone10,1",
-        "os:iOS-13.3.1",
+        "device_os:QP1A.190711.020",
+        "device_type:exynos990",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -33993,17 +34988,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal": {
+    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -34015,30 +35011,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34046,20 +35042,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"--match\\\",\\\"~VkPrepareForExternalIOQueueTransitionTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone10,1",
-        "os:iOS-13.3.1",
+        "device_os:QP1A.190711.020",
+        "device_type:exynos990",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -34090,17 +35087,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -34112,30 +35110,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.6",
-          "path": "ios-dev-image-13.6",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34143,20 +35141,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"srgb-gles\\\",\\\"narrow-gles\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Release-iOS",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone12,1",
-        "os:iOS-13.6",
+        "device_os:R16NW_G930FXXS2ERH6",
+        "device_type:herolte",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -34187,17 +35186,18 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "perf",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-arm64",
@@ -34209,30 +35209,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.6",
-          "path": "ios-dev-image-13.6",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34240,20 +35240,21 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "perf",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\",\"do_upload\":\"true\",\"nanobench_flags\":\"[\\\"nanobench\\\",\\\"--pre_log\\\",\\\"--gpuStatsDump\\\",\\\"true\\\",\\\"--scales\\\",\\\"1.0\\\",\\\"1.1\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--internalSamples\\\",\\\"4\\\",\\\"--match\\\",\\\"~blurroundrect\\\",\\\"~patch_grid\\\",\\\"~desk_carsvg\\\",\\\"~keymobi\\\",\\\"~path_hairline\\\",\\\"~GLInstancedArraysBench\\\",\\\"~compositing_images_tile_size\\\",\\\"~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\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\"]\",\"nanobench_properties\":\"{\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\"}\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"svgs\":\"true\",\"swarm_out_dir\":\"perf\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone12,1",
-        "os:iOS-13.6",
+        "device_os:R16NW_G930FXXS2ERH6",
+        "device_type:herolte",
+        "os:Android",
         "pool:Skia"
       ],
       "environment": {
@@ -34284,10 +35285,11 @@
       "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
-        "perf"
-      ]
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -34314,22 +35316,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34338,19 +35340,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Mali400MP2\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"AndroidOne\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"bigblurs\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"dropshadowimagefilter\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"filterfastbounds\\\",\\\"gles\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersclipped\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersscaled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imageresizetiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"matrixconvolution\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersbase\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"--match\\\",\\\"~WritePixels\\\",\\\"~PremulAlphaRoundTrip_Gpu\\\",\\\"~ReimportImageTextureWithMipLevels\\\",\\\"~MorphologyFilterRadiusWithMirrorCTM_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Debug-Android",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:R16NW_G930FXXS2ERH6",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34386,7 +35388,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
+    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -34413,22 +35415,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34437,19 +35439,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Mali400MP2\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"AndroidOne\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"bigblurs\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"dropshadowimagefilter\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"filterfastbounds\\\",\\\"gles\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersclipped\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersscaled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"imageresizetiled\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"matrixconvolution\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imageblurtiled\\\",\\\"glesmsaa4\\\",\\\"gm\\\",\\\"_\\\",\\\"imagefiltersbase\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"--match\\\",\\\"~WritePixels\\\",\\\"~PremulAlphaRoundTrip_Gpu\\\",\\\"~ReimportImageTextureWithMipLevels\\\",\\\"~MorphologyFilterRadiusWithMirrorCTM_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Release-Android",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:MOB30Q",
-        "device_type:sprout",
+        "device_os:R16NW_G930FXXS2ERH6",
+        "device_type:herolte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34485,7 +35487,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android": {
+    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -34512,22 +35514,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34536,7 +35538,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -34548,7 +35550,7 @@
       ],
       "dimensions": [
         "device_os:QP1A.190711.020",
-        "device_type:exynos990",
+        "device_type:starlte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34584,7 +35586,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -34611,22 +35613,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34635,7 +35637,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~VkPrepareForExternalIOQueueTransitionTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -34647,7 +35649,7 @@
       ],
       "dimensions": [
         "device_os:QP1A.190711.020",
-        "device_type:exynos990",
+        "device_type:starlte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34683,7 +35685,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android": {
+    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -34710,22 +35712,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34734,7 +35736,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -34746,7 +35748,7 @@
       ],
       "dimensions": [
         "device_os:QP1A.190711.020",
-        "device_type:exynos990",
+        "device_type:starlte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34782,7 +35784,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts": {
+    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -34809,22 +35811,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34833,11 +35835,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_NativeFonts\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -34845,7 +35847,7 @@
       ],
       "dimensions": [
         "device_os:QP1A.190711.020",
-        "device_type:exynos990",
+        "device_type:starlte",
         "os:Android",
         "pool:Skia"
       ],
@@ -34881,7 +35883,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -34908,22 +35910,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -34932,19 +35934,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG77\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS20\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~VkPrepareForExternalIOQueueTransitionTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno308\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"JioNext\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode-platform\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"--noRAW_threading\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-JioNext-GPU-Adreno308-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:exynos990",
+        "device_os:RKQ1.210602.002",
+        "device_type:msm8937",
         "os:Android",
         "pool:Skia"
       ],
@@ -34980,7 +35982,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android": {
+    "Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35007,22 +36009,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35031,19 +36033,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno308\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"JioNext\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode-platform\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrices\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"--noRAW_threading\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-JioNext-GPU-Adreno308-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
-        "device_type:herolte",
+        "device_os:RKQ1.210602.002",
+        "device_type:msm8937",
         "os:Android",
         "pool:Skia"
       ],
@@ -35079,7 +36081,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35106,22 +36108,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35130,19 +36132,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Tegra3\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Nexus7\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixScalarMath\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitch_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithFallthrough_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithLoops_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchCaseFolding_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopInt_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
-        "device_type:herolte",
+        "device_os:LMY47V_1836172",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -35178,7 +36180,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
+    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35205,22 +36207,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35229,19 +36231,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Tegra3\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Nexus7\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixScalarMath\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitch_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithFallthrough_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithLoops_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchCaseFolding_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopInt_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
+        "Build-Debian10-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
-        "device_type:herolte",
+        "device_os:LMY47V_1836172",
+        "device_type:grouper",
         "os:Android",
         "pool:Skia"
       ],
@@ -35277,7 +36279,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35304,22 +36306,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35328,19 +36330,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT880\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS7_G930FD\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:R16NW_G930FXXS2ERH6",
-        "device_type:herolte",
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
         "os:Android",
         "pool:Skia"
       ],
@@ -35376,7 +36378,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android": {
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -35403,22 +36405,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35427,19 +36429,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_DDL1_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:starlte",
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
         "os:Android",
         "pool:Skia"
       ],
@@ -35475,7 +36477,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -35502,22 +36504,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35526,7 +36528,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_DDL3_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -35537,8 +36539,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:starlte",
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
         "os:Android",
         "pool:Skia"
       ],
@@ -35574,7 +36576,205 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android": {
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "test",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "test",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Housekeeper-PerCommit-IsolateSKP",
+        "Housekeeper-PerCommit-IsolateSVG",
+        "Housekeeper-PerCommit-IsolateSkImage"
+      ],
+      "dimensions": [
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
+        "os:Android",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35601,22 +36801,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35625,7 +36825,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -35636,8 +36836,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:starlte",
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
         "os:Android",
         "pool:Skia"
       ],
@@ -35673,7 +36873,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -35700,22 +36900,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35724,7 +36924,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG72\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"GalaxyS9\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -35735,8 +36935,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:starlte",
+        "device_os:HUAWEIELE-L29",
+        "device_type:HWELE",
         "os:Android",
         "pool:Skia"
       ],
@@ -35772,7 +36972,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android": {
+    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35799,22 +36999,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35823,19 +37023,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Tegra3\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Nexus7\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitch_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithFallthrough_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithLoops_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopInt_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glestestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Debug-Android",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
-        "device_type:grouper",
+        "device_os:PPR1.180610.009",
+        "device_type:taimen",
         "os:Android",
         "pool:Skia"
       ],
@@ -35871,7 +37071,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
+    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -35898,22 +37098,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -35922,19 +37122,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Tegra3\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Nexus7\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorOptimizationValidationTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitch_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithFallthrough_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchWithLoops_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopInt_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Release-Android",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:LMY47V_1836172",
-        "device_type:grouper",
+        "device_os:PPR1.180610.009",
+        "device_type:taimen",
         "os:Android",
         "pool:Skia"
       ],
@@ -35970,7 +37170,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android": {
+    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -35997,22 +37197,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36021,19 +37221,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glestestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PPR1.180610.009",
+        "device_type:taimen",
         "os:Android",
         "pool:Skia"
       ],
@@ -36069,7 +37269,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan": {
+    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36096,22 +37296,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36120,19 +37320,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_DDL1_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PPR1.180610.009",
+        "device_type:taimen",
         "os:Android",
         "pool:Skia"
       ],
@@ -36168,7 +37368,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -36195,22 +37395,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36219,19 +37419,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_DDL3_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36267,7 +37467,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36294,22 +37494,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36318,7 +37518,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_DDL1_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -36329,8 +37529,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36366,7 +37566,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36393,22 +37593,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36417,7 +37617,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_DDL3_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures_nmof\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures_npot\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -36428,107 +37628,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
-        "os:Android",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
-      ],
-      "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36564,7 +37665,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36591,22 +37692,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36615,19 +37716,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG76\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"P30\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:HUAWEIELE-L29",
-        "device_type:HWELE",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36663,7 +37764,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36690,22 +37791,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36714,19 +37815,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glestestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
-        "device_type:taimen",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36762,7 +37863,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -36789,22 +37890,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36813,19 +37914,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
-        "device_type:taimen",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36861,7 +37962,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
+    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -36888,22 +37989,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -36912,19 +38013,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"glestestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"DSLFPTest_SwitchStatement\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixToVectorCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLStructsInFunctions_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
-        "device_type:taimen",
+        "device_os:PQ1A.190105.004",
+        "device_type:blueline",
         "os:Android",
         "pool:Skia"
       ],
@@ -36960,7 +38061,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -36987,22 +38088,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37011,19 +38112,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno540\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel2XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PPR1.180610.009",
-        "device_type:taimen",
+        "device_os:QP1A.190711.020",
+        "device_type:sargo",
         "os:Android",
         "pool:Skia"
       ],
@@ -37059,7 +38160,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android": {
+    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -37086,22 +38187,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37110,19 +38211,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:QP1A.190711.020",
+        "device_type:sargo",
         "os:Android",
         "pool:Skia"
       ],
@@ -37158,7 +38259,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan": {
+    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -37185,22 +38286,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37209,19 +38310,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_DDL1_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:QP1A.190711.020",
+        "device_type:sargo",
         "os:Android",
         "pool:Skia"
       ],
@@ -37257,7 +38358,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan": {
+    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -37284,22 +38385,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37308,19 +38409,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_DDL3_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures_nmof\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures_npot\\\",\\\"vkddl\\\",\\\"gm\\\",\\\"_\\\",\\\"compressed_textures\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:QP1A.190711.020",
+        "device_type:sargo",
         "os:Android",
         "pool:Skia"
       ],
@@ -37356,7 +38457,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan": {
+    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30": {
       "caches": [
         {
           "name": "vpython",
@@ -37383,22 +38484,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37407,19 +38508,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"DDL\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_API30\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android_API30",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:RPB2.200611.009",
+        "device_type:flame",
         "os:Android",
         "pool:Skia"
       ],
@@ -37455,7 +38556,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -37482,22 +38583,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37506,7 +38607,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -37517,8 +38618,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:RPB2.200611.009",
+        "device_type:flame",
         "os:Android",
         "pool:Skia"
       ],
@@ -37554,7 +38655,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android": {
+    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30": {
       "caches": [
         {
           "name": "vpython",
@@ -37581,22 +38682,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37605,19 +38706,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_API30\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
+        "Build-Debian10-Clang-arm64-Release-Android_API30",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:RPB2.200611.009",
+        "device_type:flame",
         "os:Android",
         "pool:Skia"
       ],
@@ -37653,7 +38754,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -37680,22 +38781,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37704,7 +38805,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno630\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -37715,8 +38816,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:PQ1A.190105.004",
-        "device_type:blueline",
+        "device_os:RPB2.200611.009",
+        "device_type:flame",
         "os:Android",
         "pool:Skia"
       ],
@@ -37752,7 +38853,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android": {
+    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -37779,22 +38880,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37803,7 +38904,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -37814,8 +38915,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:sargo",
+        "device_os:QD1A.190821.011.C4",
+        "device_type:coral",
         "os:Android",
         "pool:Skia"
       ],
@@ -37851,7 +38952,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -37878,22 +38979,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -37902,7 +39003,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -37913,8 +39014,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:sargo",
+        "device_os:QD1A.190821.011.C4",
+        "device_type:coral",
         "os:Android",
         "pool:Skia"
       ],
@@ -37950,7 +39051,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android": {
+    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -37977,22 +39078,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38001,7 +39102,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -38012,8 +39113,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:sargo",
+        "device_os:QD1A.190821.011.C4",
+        "device_type:coral",
         "os:Android",
         "pool:Skia"
       ],
@@ -38049,7 +39150,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -38076,22 +39177,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38100,7 +39201,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno615\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel3a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -38111,8 +39212,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QP1A.190711.020",
-        "device_type:sargo",
+        "device_os:QD1A.190821.011.C4",
+        "device_type:coral",
         "os:Android",
         "pool:Skia"
       ],
@@ -38148,7 +39249,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30": {
+    "Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -38167,30 +39268,25 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38199,19 +39295,20 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_API30\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_API30\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Snapdragon730G\\\",\\\"extra_config\\\",\\\"Android_HWASAN\\\",\\\"model\\\",\\\"Pixel4a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_API30",
+        "Build-Debian10-Clang-arm64-Debug-Android_HWASAN",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RPB2.200611.009",
-        "device_type:flame",
+        "android_hwasan_build:1",
+        "device_os:AOSP.MASTER_7819821",
+        "device_type:sunfish",
         "os:Android",
         "pool:Skia"
       ],
@@ -38241,13 +39338,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -38266,30 +39362,25 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38298,19 +39389,20 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno618\\\",\\\"extra_config\\\",\\\"Android_HWASAN\\\",\\\"model\\\",\\\"Pixel4a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android_HWASAN",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RPB2.200611.009",
-        "device_type:flame",
+        "android_hwasan_build:1",
+        "device_os:AOSP.MASTER_7819821",
+        "device_type:sunfish",
         "os:Android",
         "pool:Skia"
       ],
@@ -38340,13 +39432,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30": {
+    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -38373,22 +39464,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38397,19 +39488,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_API30\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_API30\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_API30",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RPB2.200611.009",
-        "device_type:flame",
+        "device_os:RD1A.200810.022.A4",
+        "device_type:redfin",
         "os:Android",
         "pool:Skia"
       ],
@@ -38445,7 +39536,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -38472,22 +39563,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38496,19 +39587,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RPB2.200611.009",
-        "device_type:flame",
+        "device_os:RD1A.200810.022.A4",
+        "device_type:redfin",
         "os:Android",
         "pool:Skia"
       ],
@@ -38544,7 +39635,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android": {
+    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -38571,22 +39662,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38595,19 +39686,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLInoutParameters_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParams_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsTricky_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsNoInline_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QD1A.190821.011.C4",
-        "device_type:coral",
+        "device_os:RD1A.200810.022.A4",
+        "device_type:redfin",
         "os:Android",
         "pool:Skia"
       ],
@@ -38643,7 +39734,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -38670,22 +39761,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38694,19 +39785,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Debug-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG78\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel6\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_Vulkan",
+        "Build-Debian10-Clang-arm64-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QD1A.190821.011.C4",
-        "device_type:coral",
+        "device_os:SD1A.210817.037",
+        "device_type:oriole",
         "os:Android",
         "pool:Skia"
       ],
@@ -38742,7 +39833,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android": {
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -38769,22 +39860,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38793,7 +39884,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG78\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel6\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -38804,8 +39895,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QD1A.190821.011.C4",
-        "device_type:coral",
+        "device_os:SD1A.210817.037",
+        "device_type:oriole",
         "os:Android",
         "pool:Skia"
       ],
@@ -38841,7 +39932,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
+    "Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -38868,22 +39959,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38892,7 +39983,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno640\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel4XL\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliG78\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel6\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -38903,8 +39994,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:QD1A.190821.011.C4",
-        "device_type:coral",
+        "device_os:SD1A.210817.037",
+        "device_type:oriole",
         "os:Android",
         "pool:Skia"
       ],
@@ -38940,7 +40031,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN": {
+    "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -38959,25 +40050,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -38986,20 +40082,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Snapdragon730G\\\",\\\"extra_config\\\",\\\"Android_HWASAN\\\",\\\"model\\\",\\\"Pixel4a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4a-CPU-Snapdragon730G-arm64-Debug-All-Android_HWASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGE8320\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Wembley\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsAreDistinct_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~ProcessorCloneTest\\\",\\\"~ProcessorOptimizationValidationTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_HWASAN",
+        "Build-Debian10-Clang-arm-Debug-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "android_hwasan_build:1",
-        "device_os:AOSP.MASTER_7819821",
-        "device_type:sunfish",
+        "device_os:SP2A.211004.001",
+        "device_type:wembley",
         "os:Android",
         "pool:Skia"
       ],
@@ -39029,12 +40124,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN": {
+    "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -39053,25 +40149,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39080,20 +40181,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno618\\\",\\\"extra_config\\\",\\\"Android_HWASAN\\\",\\\"model\\\",\\\"Pixel4a\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel4a-GPU-Adreno618-arm64-Debug-All-Android_HWASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGE8320\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Wembley\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLOutParamsAreDistinct_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~ProcessorCloneTest\\\",\\\"~ProcessorOptimizationValidationTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android_HWASAN",
+        "Build-Debian10-Clang-arm-Release-Android",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "android_hwasan_build:1",
-        "device_os:AOSP.MASTER_7819821",
-        "device_type:sunfish",
+        "device_os:SP2A.211004.001",
+        "device_type:wembley",
         "os:Android",
         "pool:Skia"
       ],
@@ -39123,12 +40223,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android": {
+    "Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39155,22 +40256,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39179,21 +40280,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT860\\\",\\\"model\\\",\\\"Kevin\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Debug-Android",
+        "Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RD1A.200810.022.A4",
-        "device_type:redfin",
-        "os:Android",
-        "pool:Skia"
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia",
+        "release_version:14092.77.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39227,7 +40328,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android": {
+    "Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39254,22 +40355,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39278,21 +40379,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT860\\\",\\\"model\\\",\\\"Kevin\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android",
+        "Build-Debian10-Clang-arm-Release-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RD1A.200810.022.A4",
-        "device_type:redfin",
-        "os:Android",
-        "pool:Skia"
+        "gpu:MaliT860",
+        "os:ChromeOS",
+        "pool:Skia",
+        "release_version:14092.77.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39326,7 +40427,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan": {
+    "Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39353,22 +40454,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39377,21 +40478,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno620\\\",\\\"extra_config\\\",\\\"Android_Vulkan\\\",\\\"model\\\",\\\"Pixel5\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~WritePixelsMSAA_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelUHDGraphics605\\\",\\\"model\\\",\\\"Sparky360\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm64-Release-Android_Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:RD1A.200810.022.A4",
-        "device_type:redfin",
-        "os:Android",
-        "pool:Skia"
+        "gpu:IntelUHDGraphics605",
+        "os:ChromeOS",
+        "pool:Skia",
+        "release_version:14233.0.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39425,7 +40526,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android": {
+    "Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39452,22 +40553,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39476,21 +40577,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGE8320\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Wembley\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~ProcessorCloneTest\\\",\\\"~ProcessorOptimizationValidationTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Debug-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelUHDGraphics605\\\",\\\"model\\\",\\\"Sparky360\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Debug-Android",
+        "Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:SP2A.211004.001",
-        "device_type:wembley",
-        "os:Android",
-        "pool:Skia"
+        "gpu:IntelUHDGraphics605",
+        "os:ChromeOS",
+        "pool:Skia",
+        "release_version:14233.0.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39524,7 +40625,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android": {
+    "Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39551,22 +40652,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39575,21 +40676,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGE8320\\\",\\\"extra_config\\\",\\\"Android\\\",\\\"model\\\",\\\"Wembley\\\",\\\"os\\\",\\\"Android\\\",\\\"style\\\",\\\"default\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~ProcessorCloneTest\\\",\\\"~ProcessorOptimizationValidationTest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Android-Clang-Wembley-GPU-PowerVRGE8320-arm-Release-All-Android\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno618\\\",\\\"model\\\",\\\"Spin513\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestMockContext\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestGpuRenderingContexts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestGpuAllContexts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"OverdrawSurface_Gpu\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ReplaceSurfaceBackendTexture\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"SurfaceAttachStencil_Gpu\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"SurfaceWrappedWithRelease_Gpu\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicMixFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicClampFloat_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Release-Android",
+        "Build-Debian10-Clang-arm-Release-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_os:SP2A.211004.001",
-        "device_type:wembley",
-        "os:Android",
-        "pool:Skia"
+        "gpu:Adreno618",
+        "os:ChromeOS",
+        "pool:Skia",
+        "release_version:14150.39.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39623,7 +40724,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All": {
+    "Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39650,22 +40751,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39674,21 +40775,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT860\\\",\\\"model\\\",\\\"Kevin\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonVega3\\\",\\\"model\\\",\\\"Spin514\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Debug-Chromebook_GLES",
+        "Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:MaliT860",
+        "gpu:RadeonVega3",
         "os:ChromeOS",
         "pool:Skia",
-        "release_version:14092.77.0"
+        "release_version:14233.0.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39722,7 +40823,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All": {
+    "Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39749,22 +40850,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -39773,21 +40874,21 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"MaliT860\\\",\\\"model\\\",\\\"Kevin\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Kevin-GPU-MaliT860-arm-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonVega3\\\",\\\"model\\\",\\\"Spin514\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Release-Chromebook_GLES",
+        "Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "gpu:MaliT860",
+        "gpu:RadeonVega3",
         "os:ChromeOS",
         "pool:Skia",
-        "release_version:14092.77.0"
+        "release_version:14233.0.0"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39821,7 +40922,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39831,12 +40932,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39848,22 +40949,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -39872,21 +40988,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelUHDGraphics605\\\",\\\"model\\\",\\\"Sparky360\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "Build-Debian10-Clang-x86-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:IntelUHDGraphics605",
-        "os:ChromeOS",
-        "pool:Skia",
-        "release_version:14233.0.0"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -39908,19 +41021,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 14400000000000,
+      "io_timeout_ns": 21600000000000,
       "max_attempts": 2,
       "outputs": [
         "test"
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -39930,12 +41043,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -39947,121 +41060,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelUHDGraphics605\\\",\\\"model\\\",\\\"Sparky360\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Sparky360-GPU-IntelUHDGraphics605-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
-      ],
-      "dimensions": [
-        "gpu:IntelUHDGraphics605",
-        "os:ChromeOS",
-        "pool:Skia",
-        "release_version:14233.0.0"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
         },
         {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
         },
         {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -40070,21 +41099,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Adreno618\\\",\\\"model\\\",\\\"Spin513\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestMockContext\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestGpuRenderingContexts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TestGpuAllContexts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"OverdrawSurface_Gpu\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ReplaceSurfaceBackendTexture\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"SurfaceAttachStencil_Gpu\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"SurfaceWrappedWithRelease_Gpu\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLArrayComparison_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicIsInf_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin513-GPU-Adreno618-arm-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-arm-Release-Chromebook_GLES",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "Build-Debian10-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:Adreno618",
-        "os:ChromeOS",
-        "pool:Skia",
-        "release_version:14150.39.0"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -40118,7 +41144,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs": {
       "caches": [
         {
           "name": "vpython",
@@ -40128,12 +41154,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -40145,22 +41171,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -40169,21 +41210,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonVega3\\\",\\\"model\\\",\\\"Spin514\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"r8\\\",\\\"565\\\",\\\"pic-8888\\\",\\\"serialize-8888\\\",\\\"linear-f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"p3-rgba\\\",\\\"p3-f16\\\",\\\"rec2020-rgba\\\",\\\"rec2020-f16\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"r8\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"r8\\\",\\\"colorImage\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_batch_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"c_gms\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype_xfermodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_0.75_0\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_match\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_iter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemasksubset\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_domain\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapfilters\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapshaders\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"convex_poly_clip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"extractalpha\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_checkerboard_32_32_g8\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_image_mandrill_64\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadows\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"simpleaaclip_aaclip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"composeshader_bitmap\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes_npot\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"typefacerendering_pfaMac\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"parsedpaths\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"all_bitmap_configs\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"makecolorspace\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"readpixels\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_rect_to_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_alpha_only\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"compositor_quads_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_qtr\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_effect_image\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ctmpatheffect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"analytic_antialias_convex\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Chromebook_GLES",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "Build-Debian10-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:RadeonVega3",
-        "os:ChromeOS",
-        "pool:Skia",
-        "release_version:14233.0.0"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -40217,7 +41255,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -40227,12 +41265,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -40244,22 +41282,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -40268,21 +41321,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonVega3\\\",\\\"model\\\",\\\"Spin514\\\",\\\"os\\\",\\\"ChromeOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-ChromeOS-Clang-Spin514-GPU-RadeonVega3-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Chromebook_GLES",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "Build-Debian10-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:RadeonVega3",
-        "os:ChromeOS",
-        "pool:Skia",
-        "release_version:14233.0.0"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -40316,7 +41366,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
       "caches": [
         {
           "name": "vpython",
@@ -40343,32 +41393,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40382,11 +41432,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_USE_DISCARDABLE_SCALEDIMAGECACHE\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -40415,19 +41465,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 21600000000000,
+      "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
         "test"
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": {
       "caches": [
         {
           "name": "vpython",
@@ -40454,32 +41504,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40493,11 +41543,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SafeStack\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-SafeStack",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -40538,7 +41588,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM": {
       "caches": [
         {
           "name": "vpython",
@@ -40565,32 +41615,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40604,7 +41654,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"g8\\\",\\\"565\\\",\\\"pic-8888\\\",\\\"serialize-8888\\\",\\\"linear-f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"p3-rgba\\\",\\\"p3-f16\\\",\\\"rec2020-rgba\\\",\\\"rec2020-f16\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"g8\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"g8\\\",\\\"colorImage\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_batch_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"c_gms\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype_xfermodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_0.75_0\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_match\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_iter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemasksubset\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_domain\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapfilters\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapshaders\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"convex_poly_clip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"extractalpha\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_checkerboard_32_32_g8\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_image_mandrill_64\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadows\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"simpleaaclip_aaclip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"composeshader_bitmap\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes_npot\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"typefacerendering_pfaMac\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"parsedpaths\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"all_bitmap_configs\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"makecolorspace\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"readpixels\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_rect_to_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_alpha_only\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"compositor_quads_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_qtr\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_effect_image\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ctmpatheffect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"analytic_antialias_convex\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SkVM\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--skvm\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -40649,7 +41699,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs": {
       "caches": [
         {
           "name": "vpython",
@@ -40676,32 +41726,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40715,11 +41765,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Wuffs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-Wuffs",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -40760,7 +41810,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -40787,32 +41837,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40826,11 +41876,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_USE_DISCARDABLE_SCALEDIMAGECACHE\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"0\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SK_USE_DISCARDABLE_SCALEDIMAGECACHE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -40871,7 +41921,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs": {
       "caches": [
         {
           "name": "vpython",
@@ -40898,32 +41948,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -40937,11 +41987,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SafeStack\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"r8\\\",\\\"565\\\",\\\"pic-8888\\\",\\\"serialize-8888\\\",\\\"linear-f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"p3-rgba\\\",\\\"p3-f16\\\",\\\"rec2020-rgba\\\",\\\"rec2020-f16\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"r8\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"r8\\\",\\\"colorImage\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_batch_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"c_gms\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype_xfermodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_0.75_0\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_match\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_iter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemasksubset\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_domain\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapfilters\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapshaders\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"convex_poly_clip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"extractalpha\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_checkerboard_32_32_g8\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_image_mandrill_64\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadows\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"simpleaaclip_aaclip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"composeshader_bitmap\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes_npot\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"typefacerendering_pfaMac\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"parsedpaths\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"all_bitmap_configs\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"makecolorspace\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"readpixels\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_rect_to_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_alpha_only\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"compositor_quads_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_qtr\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_effect_image\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ctmpatheffect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"analytic_antialias_convex\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-SafeStack",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -40982,7 +42032,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
       "caches": [
         {
           "name": "vpython",
@@ -41009,32 +42059,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41048,11 +42098,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SkVM\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--skvm\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SkVM\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Fast\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Release-Fast",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41093,7 +42143,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
       "caches": [
         {
           "name": "vpython",
@@ -41120,32 +42170,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41159,11 +42209,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Wuffs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SKNX_NO_SIMD\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Wuffs",
+        "Build-Debian10-Clang-x86_64-Release-SKNX_NO_SIMD",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41204,7 +42254,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": {
       "caches": [
         {
           "name": "vpython",
@@ -41231,32 +42281,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41270,11 +42320,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_CPU_LIMIT_SSE2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41315,7 +42365,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": {
       "caches": [
         {
           "name": "vpython",
@@ -41342,32 +42392,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41381,11 +42431,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"g8\\\",\\\"565\\\",\\\"pic-8888\\\",\\\"serialize-8888\\\",\\\"linear-f16\\\",\\\"srgb-rgba\\\",\\\"srgb-f16\\\",\\\"narrow-rgba\\\",\\\"narrow-f16\\\",\\\"p3-rgba\\\",\\\"p3-f16\\\",\\\"rec2020-rgba\\\",\\\"rec2020-f16\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"g8\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"g8\\\",\\\"colorImage\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_batch_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"strict_constraint_no_red_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fast_constraint_red_is_allowed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"c_gms\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"colortype_xfermodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_0.75_0\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_match\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_iter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemasksubset\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_domain\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_crop_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"imagemakewithfilter_ref\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapfilters\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"bitmapshaders\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"convex_poly_clip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"extractalpha\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_checkerboard_32_32_g8\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"filterbitmap_image_mandrill_64\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadows\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"simpleaaclip_aaclip\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"composeshader_bitmap\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes_npot\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"scaled_tilemodes\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"typefacerendering_pfaMac\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"parsedpaths\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ImageGeneratorExternal_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"all_bitmap_configs\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"makecolorspace\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"readpixels\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_rect_to_rect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set_alpha_only\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"compositor_quads_shader\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv_formats_qtr\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_effect_image\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"ctmpatheffect\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"analytic_antialias_convex\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"drawfilter\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-picture\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-raster\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"image-cacherator-from-ctable\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_bw\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"complexclip4_aa\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"p3\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up_large\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_text_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_up\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_dog_down\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_rose\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_no_bleed\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"async_rescale_and_read_alpha_type\\\",\\\"pic-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"serialize-8888\\\",\\\"gm\\\",\\\"_\\\",\\\"blurrect_compare\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41426,7 +42476,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
       "caches": [
         {
           "name": "vpython",
@@ -41453,32 +42503,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41492,11 +42542,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Fast\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-Fast\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_FORCE_RASTER_PIPELINE_BLITTER\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Fast",
+        "Build-Debian10-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41537,7 +42587,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD": {
+    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM": {
       "caches": [
         {
           "name": "vpython",
@@ -41564,32 +42614,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41603,11 +42653,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SKNX_NO_SIMD\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SKNX_NO_SIMD\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SkVM\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--skvm\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SKNX_NO_SIMD",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -41648,7 +42698,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2": {
+    "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -41675,32 +42725,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41714,16 +42764,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_CPU_LIMIT_SSE2\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE2\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX512\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE2",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
+        "cpu:x86-64-Skylake_GCE",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -41759,7 +42808,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41": {
+    "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -41786,32 +42835,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41825,16 +42874,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX512\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SK_CPU_LIMIT_SSE41",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
+        "cpu:x86-64-Skylake_GCE",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -41870,7 +42918,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER": {
+    "Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -41897,32 +42945,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -41936,16 +42984,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SK_FORCE_RASTER_PIPELINE_BLITTER\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SK_FORCE_RASTER_PIPELINE_BLITTER\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Rome\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
+        "cpu:x86-64-AMD_Rome_GCE",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -41981,7 +43028,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM": {
+    "Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -42008,32 +43055,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42047,7 +43094,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"SkVM\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--skvm\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Release-All-SkVM\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Rome\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -42055,8 +43102,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
+        "cpu:x86-64-AMD_Rome_GCE",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -42092,7 +43138,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All": {
+    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader": {
       "caches": [
         {
           "name": "vpython",
@@ -42119,32 +43165,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42158,15 +43204,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX512\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"ycbcrimage\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"VkYCbcrSampler_DrawImageWithYcbcrSampler\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrThreadSafeCache16Verts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-SwiftShader",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Skylake_GCE",
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -42202,7 +43249,117 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All": {
+    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "test",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader_MSAN\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"ycbcrimage\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"VkYCbcrSampler_DrawImageWithYcbcrSampler\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrThreadSafeCache16Verts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~Once\\\",\\\"~Shared\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 32400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 32400000000000,
+      "max_attempts": 1,
+      "outputs": [
+        "test"
+      ]
+    },
+    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader": {
       "caches": [
         {
           "name": "vpython",
@@ -42229,32 +43386,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42268,15 +43425,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX512\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-AVX512-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"ycbcrimage\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"VkYCbcrSampler_DrawImageWithYcbcrSampler\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrThreadSafeCache16Verts\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-SwiftShader",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Skylake_GCE",
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
         "os:Debian-10.3",
         "pool:Skia"
       ],
@@ -42312,7 +43470,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All": {
+    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -42339,32 +43497,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/mesa_intel_driver_linux",
+          "path": "mesa_intel_driver_linux",
+          "version": "version:15"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42378,7 +43541,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Rome\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -42386,8 +43549,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-AMD_Rome_GCE",
-        "os:Debian-10.3",
+        "gpu:8086:22b1",
+        "os:Debian-10.10",
         "pool:Skia"
       ],
       "environment": {
@@ -42422,7 +43585,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All": {
+    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -42449,32 +43612,42 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/mesa_intel_driver_linux",
+          "path": "mesa_intel_driver_linux",
+          "version": "version:15"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42488,16 +43661,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"Rome\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-CPU-Rome-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"skbug_257\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"filltypespersp\\\",\\\"--match\\\",\\\"~^ClearOp$\\\",\\\"~^CopySurface$\\\",\\\"~^ImageNewShader_GPU$\\\",\\\"~^InitialTextureClear$\\\",\\\"~^PinnedImageTest$\\\",\\\"~^ReadPixels_Gpu$\\\",\\\"~^ReadPixels_Texture$\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^VkUploadPixelsTests$\\\",\\\"~^WritePixelsNonTexture_Gpu$\\\",\\\"~^WritePixelsNonTextureMSAA_Gpu$\\\",\\\"~^WritePixels_Gpu$\\\",\\\"~^WritePixelsMSAA_Gpu$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-AMD_Rome_GCE",
-        "os:Debian-10.3",
+        "gpu:8086:22b1",
+        "os:Debian-10.10",
         "pool:Skia"
       ],
       "environment": {
@@ -42532,7 +43705,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader": {
+    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -42559,32 +43732,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/mesa_intel_driver_linux",
+          "path": "mesa_intel_driver_linux",
+          "version": "version:15"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42598,17 +43776,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-SwiftShader",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
+        "gpu:8086:22b1",
+        "os:Debian-10.10",
         "pool:Skia"
       ],
       "environment": {
@@ -42643,7 +43820,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN": {
+    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -42662,40 +43839,50 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
+        },
+        {
+          "name": "skia/bots/mesa_intel_driver_linux",
+          "path": "mesa_intel_driver_linux",
+          "version": "version:15"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42709,17 +43896,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader_MSAN\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~Once\\\",\\\"~Shared\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Debug-All-SwiftShader_MSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"skbug_257\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"filltypespersp\\\",\\\"--match\\\",\\\"~^ClearOp$\\\",\\\"~^CopySurface$\\\",\\\"~^ImageNewShader_GPU$\\\",\\\"~^InitialTextureClear$\\\",\\\"~^PinnedImageTest$\\\",\\\"~^ReadPixels_Gpu$\\\",\\\"~^ReadPixels_Texture$\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^VkUploadPixelsTests$\\\",\\\"~^WritePixelsNonTexture_Gpu$\\\",\\\"~^WritePixelsNonTextureMSAA_Gpu$\\\",\\\"~^WritePixels_Gpu$\\\",\\\"~^WritePixelsMSAA_Gpu$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-SwiftShader_MSAN",
+        "Build-Debian10-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
+        "gpu:8086:22b1",
+        "os:Debian-10.10",
         "pool:Skia"
       ],
       "environment": {
@@ -42742,18 +43928,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 32400000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 32400000000000,
-      "max_attempts": 1,
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -42780,32 +43967,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/mesa_intel_driver_linux",
+          "path": "mesa_intel_driver_linux",
+          "version": "version:15"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42819,17 +44011,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"SwiftShader\\\",\\\"extra_config\\\",\\\"SwiftShader\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"glesdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-GCE-GPU-SwiftShader-x86_64-Release-All-SwiftShader\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-SwiftShader",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
+        "gpu:8086:5926",
+        "os:Debian-10.10",
         "pool:Skia"
       ],
       "environment": {
@@ -42864,7 +44055,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -42883,30 +44074,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -42916,12 +44112,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -42935,15 +44131,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:5926",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -42973,13 +44169,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1": {
       "caches": [
         {
           "name": "vpython",
@@ -43006,27 +44201,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43036,12 +44226,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43055,15 +44245,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"skbug_257\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"filltypespersp\\\",\\\"--match\\\",\\\"~^ClearOp$\\\",\\\"~^CopySurface$\\\",\\\"~^ImageNewShader_GPU$\\\",\\\"~^InitialTextureClear$\\\",\\\"~^PinnedImageTest$\\\",\\\"~^ReadPixels_Gpu$\\\",\\\"~^ReadPixels_Texture$\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^VkUploadPixelsTests$\\\",\\\"~^WritePixelsNonTexture_Gpu$\\\",\\\"~^WritePixelsNonTextureMSAA_Gpu$\\\",\\\"~^WritePixels_Gpu$\\\",\\\"~^WritePixelsMSAA_Gpu$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL1\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:5926",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -43099,7 +44289,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -43126,22 +44316,27 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43151,12 +44346,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43170,15 +44365,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL1_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:5926",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -43214,7 +44409,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -43233,35 +44428,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43271,12 +44461,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43290,15 +44480,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD405\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC5PPYH\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--dontReduceOpsTaskSplitting\\\",\\\"true\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"skbug_257\\\",\\\"vk\\\",\\\"gm\\\",\\\"_\\\",\\\"filltypespersp\\\",\\\"--match\\\",\\\"~^ClearOp$\\\",\\\"~^CopySurface$\\\",\\\"~^ImageNewShader_GPU$\\\",\\\"~^InitialTextureClear$\\\",\\\"~^PinnedImageTest$\\\",\\\"~^ReadPixels_Gpu$\\\",\\\"~^ReadPixels_Texture$\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^VkUploadPixelsTests$\\\",\\\"~^WritePixelsNonTexture_Gpu$\\\",\\\"~^WritePixelsNonTextureMSAA_Gpu$\\\",\\\"~^WritePixels_Gpu$\\\",\\\"~^WritePixelsMSAA_Gpu$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_ASAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:22b1",
+        "gpu:8086:5926",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -43328,13 +44518,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -43353,30 +44542,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43386,12 +44580,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43405,11 +44599,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -43443,13 +44637,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -43471,33 +44664,28 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
           "version": "version:20"
         },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
-        },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
           "path": "mesa_intel_driver_linux",
@@ -43506,12 +44694,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43525,11 +44713,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -43568,7 +44756,7 @@
         "test"
       ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -43587,30 +44775,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43620,12 +44813,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43639,11 +44832,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL1\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -43677,13 +44870,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -43710,27 +44902,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -43740,12 +44927,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43759,11 +44946,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL1_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -43803,7 +44990,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -43825,22 +45012,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -43855,12 +45042,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43874,11 +45061,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_ASAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Debian10-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -43917,7 +45104,7 @@
         "test"
       ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -43939,22 +45126,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -43974,12 +45161,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -43993,11 +45180,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-DDL3_ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_TSAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -44036,7 +45223,7 @@
         "test"
       ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -44058,22 +45245,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -44088,12 +45275,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44107,11 +45294,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Debian10-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -44150,7 +45337,7 @@
         "test"
       ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -44172,22 +45359,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
@@ -44207,12 +45394,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44226,11 +45413,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--gpuResourceCacheLimit\\\",\\\"16777216\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Debug-All-OOPRDDL_ASAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -44269,7 +45456,7 @@
         "test"
       ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -44288,30 +45475,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44321,12 +45508,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44340,11 +45527,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -44378,13 +45565,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN": {
+    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -44403,30 +45589,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44436,12 +45627,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44455,11 +45646,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN",
+        "Build-Debian10-Clang-x86_64-Release-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -44493,12 +45684,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan": {
+    "Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -44517,35 +45709,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44555,12 +45742,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44574,15 +45761,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"DDL3_TSAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-DDL3_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelBayTrail\\\",\\\"model\\\",\\\"NUCDE3815TYKHE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:5926",
+        "gpu:8086:0f31",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -44612,12 +45799,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN": {
+    "Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -44636,30 +45824,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44669,12 +45857,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44688,15 +45876,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelBayTrail\\\",\\\"model\\\",\\\"NUCDE3815TYKHE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:5926",
+        "gpu:8086:0f31",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -44726,12 +45914,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
+    "Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -44750,35 +45939,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44788,12 +45972,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44807,15 +45991,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN_Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD2000\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:5926",
+        "gpu:8086:0102",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -44845,12 +46029,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN": {
+    "Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -44869,30 +46054,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/mesa_intel_driver_linux",
@@ -44902,12 +46087,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -44921,15 +46106,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"TSAN\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD2000\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:5926",
+        "gpu:8086:0102",
         "os:Debian-10.10",
         "pool:Skia"
       ],
@@ -44959,19 +46144,20 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan": {
+    "Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "pathkit",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -44991,47 +46177,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
-        },
-        {
-          "name": "skia/bots/mesa_intel_driver_linux",
-          "path": "mesa_intel_driver_linux",
-          "version": "version:15"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -45039,18 +46200,20 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris640\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"NUC7i5BNK\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~VkHeapTests\\\",\\\"~Programs\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUC7i5BNK-GPU-IntelIris640-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test_pathkit",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-Vulkan",
+        "Build-Debian10-EMCC-asmjs-Release-PathKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:5926",
-        "os:Debian-10.10",
-        "pool:Skia"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45084,14 +46247,14 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All": {
+    "Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "canvaskit",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45111,42 +46274,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/mesa_intel_driver_linux",
-          "path": "mesa_intel_driver_linux",
-          "version": "version:15"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -45154,18 +46297,20 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelBayTrail\\\",\\\"model\\\",\\\"NUCDE3815TYKHE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test_canvaskit",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Debian-10.10",
-        "pool:Skia"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45199,14 +46344,14 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All": {
+    "Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "pathkit",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45226,42 +46371,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/mesa_intel_driver_linux",
-          "path": "mesa_intel_driver_linux",
-          "version": "version:15"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -45269,18 +46394,20 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelBayTrail\\\",\\\"model\\\",\\\"NUCDE3815TYKHE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test_pathkit",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-EMCC-wasm-Release-PathKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0f31",
-        "os:Debian-10.10",
-        "pool:Skia"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45314,14 +46441,14 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All": {
+    "Test-Debian10-EMCC-GCE-GPU-AVX2-wasm-Release-All-CanvasKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "canvaskit",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45341,42 +46468,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/mesa_intel_driver_linux",
-          "path": "mesa_intel_driver_linux",
-          "version": "version:15"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -45384,18 +46491,20 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD2000\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test_canvaskit",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-GPU-AVX2-wasm-Release-All-CanvasKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0102",
-        "os:Debian-10.10",
-        "pool:Skia"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45429,7 +46538,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All": {
+    "Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker": {
       "caches": [
         {
           "name": "vpython",
@@ -45456,37 +46565,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/mesa_intel_driver_linux",
-          "path": "mesa_intel_driver_linux",
-          "version": "version:15"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -45500,17 +46604,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD2000\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"gltestthreading\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdblendmodes\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"lcdoverlap\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"textbloblooper\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"savelayer_with_backdrop\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_shaders_bw\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext_blob_persp\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"gpu_blur_utils_subset_rect_ref\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"orientation\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"stroketext\\\",\\\"gltestthreading\\\",\\\"gm\\\",\\\"_\\\",\\\"draw_image_set\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-Clang-ShuttleA-GPU-IntelHD2000-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-GCC-x86-Debug-Docker",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:0102",
-        "os:Debian-10.10",
-        "pool:Skia"
+        "cpu:x86-64-Haswell_GCE",
+        "machine_type:n1-standard-16",
+        "os:Debian-10.3",
+        "pool:Skia",
+        "docker_installed:true"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45532,26 +46638,26 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
+      "execution_timeout_ns": 21600000000000,
       "expiration_ns": 72000000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 14400000000000,
+      "io_timeout_ns": 21600000000000,
       "max_attempts": 2,
       "outputs": [
         "test"
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit": {
+    "Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "pathkit",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45571,22 +46677,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -45594,12 +46715,12 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test_pathkit",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-asmjs-Release-All-PathKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-asmjs-Release-PathKit",
+        "Build-Debian10-GCC-x86-Release-Docker",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -45641,14 +46762,14 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit": {
+    "Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "canvaskit",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45668,22 +46789,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -45691,12 +46827,12 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test_canvaskit",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-CanvasKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-CanvasKit_CPU",
+        "Build-Debian10-GCC-x86_64-Debug-Docker",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -45738,14 +46874,14 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit": {
+    "Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "pathkit",
+      "casSpec": "test",
       "cipd_packages": [
         {
           "name": "infra/3pp/tools/cpython/linux-amd64",
@@ -45765,22 +46901,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -45788,12 +46939,12 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test_pathkit",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-CPU-AVX2-wasm-Release-All-PathKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-PathKit",
+        "Build-Debian10-GCC-x86_64-Release-Docker",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -45835,22 +46986,22 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-EMCC-GCE-GPU-AVX2-wasm-Release-All-CanvasKit": {
+    "Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "canvaskit",
+      "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -45862,22 +47013,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
         }
       ],
       "command": [
@@ -45885,20 +47051,18 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test_canvaskit",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-EMCC-GCE-GPU-AVX2-wasm-Release-All-CanvasKit\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.12-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "cpu:x86-64-i5-4278U",
+        "os:Mac-10.12",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -45932,7 +47096,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker": {
+    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -45942,12 +47106,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -45959,32 +47123,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -45998,19 +47162,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Debug-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-GCC-x86-Debug-Docker",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "gpu:8086:591e",
+        "os:Mac-10.13.6",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -46032,19 +47194,19 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 21600000000000,
+      "execution_timeout_ns": 14400000000000,
       "expiration_ns": 72000000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 21600000000000,
+      "io_timeout_ns": 14400000000000,
       "max_attempts": 2,
       "outputs": [
         "test"
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker": {
+    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": {
       "caches": [
         {
           "name": "vpython",
@@ -46054,12 +47216,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -46071,32 +47233,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46110,19 +47272,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--threads\\\",\\\"4\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86-Release-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-GCC-x86-Release-Docker",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "gpu:8086:591e",
+        "os:Mac-10.13.6",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -46156,7 +47316,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker": {
+    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -46166,12 +47326,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -46183,32 +47343,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46222,19 +47382,17 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Debug-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-GCC-x86_64-Debug-Docker",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "gpu:8086:591e",
+        "os:Mac-10.13.6",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -46268,7 +47426,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker": {
+    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -46278,12 +47436,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -46295,32 +47453,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46334,19 +47492,127 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"GCC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"Docker\\\",\\\"model\\\",\\\"GCE\\\",\\\"os\\\",\\\"Debian10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Debian10-GCC-GCE-CPU-AVX2-x86_64-Release-All-Docker\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-GCC-x86_64-Release-Docker",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-standard-16",
-        "os:Debian-10.3",
-        "pool:Skia",
-        "docker_installed:true"
+        "gpu:8086:591e",
+        "os:Mac-10.13.6",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 2,
+      "outputs": [
+        "test"
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+    },
+    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "test",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/mac-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-x86_64-Debug",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "cpu:x86-64-i7-4870HQ",
+        "os:Mac-10.13.6",
+        "pool:Skia"
       ],
       "environment": {
         "RECIPES_USE_PY3": "true",
@@ -46380,7 +47646,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF": {
       "caches": [
         {
           "name": "vpython",
@@ -46407,32 +47673,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46446,7 +47712,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"PDF\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--rasterize_pdf\\\",\\\"--config\\\",\\\"pdf\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"lattice2\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"hairmodes\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"longpathdash\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -46454,227 +47720,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:591e",
-        "os:Mac-10.13.6",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/mac-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/mac-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"Programs\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:591e",
-        "os:Mac-10.13.6",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/mac-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/mac-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/skimage",
-          "path": "skimage",
-          "version": "version:46"
-        },
-        {
-          "name": "skia/bots/skp",
-          "path": "skp",
-          "version": "version:352"
-        },
-        {
-          "name": "skia/bots/svg",
-          "path": "svg",
-          "version": "version:14"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
-        "Housekeeper-PerCommit-BundleRecipes"
-      ],
-      "dimensions": [
-        "gpu:8086:591e",
+        "cpu:x86-64-i7-4870HQ",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -46710,7 +47756,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -46737,32 +47783,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46776,7 +47822,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD615\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBook10.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~^SRGBReadWritePixels$\\\",\\\"~^GrMeshTest$\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBook10.1-GPU-IntelHD615-x86_64-Release-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -46784,7 +47830,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:591e",
+        "cpu:x86-64-i7-4870HQ",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -46820,7 +47866,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -46839,40 +47885,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46886,15 +47927,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"ASAN\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-4870HQ",
+        "gpu:1002:6821-4.0.20-3.2.8",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -46924,13 +47965,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer": {
       "caches": [
         {
           "name": "vpython",
@@ -46957,32 +47997,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -46996,15 +48036,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"PDF\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--rasterize_pdf\\\",\\\"--config\\\",\\\"pdf\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"lattice2\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"hairmodes\\\",\\\"pdf\\\",\\\"gm\\\",\\\"_\\\",\\\"longpathdash\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Debug-All-PDF\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"cmdbuffer_es2_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-4870HQ",
+        "gpu:1002:6821-4.0.20-3.2.8",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47040,7 +48080,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -47067,32 +48107,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47106,7 +48146,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-CPU-AVX2-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -47114,7 +48154,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-4870HQ",
+        "gpu:1002:6821-4.0.20-3.2.8",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47150,7 +48190,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN": {
+    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -47172,32 +48212,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47211,11 +48251,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"ASAN\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"TSAN\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-ASAN",
+        "Build-Mac-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -47254,7 +48294,7 @@
         "test"
       ]
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer": {
+    "Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -47281,32 +48321,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47320,15 +48360,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"cmdbuffer_es2_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
+        "cpu:x86-64-i5-4278U",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47364,7 +48404,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All": {
+    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -47391,32 +48431,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47430,15 +48470,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
+        "cpu:x86-64-i7-4578U",
+        "gpu:8086:0a2e",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47474,7 +48515,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN": {
+    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": {
       "caches": [
         {
           "name": "vpython",
@@ -47493,35 +48534,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47535,15 +48581,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"TSAN\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-TSAN",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
+        "cpu:x86-64-i7-4578U",
+        "gpu:8086:0a2e",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47573,12 +48620,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All": {
+    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -47605,32 +48653,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47644,11 +48692,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -47689,7 +48737,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer": {
+    "Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -47716,32 +48764,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47755,16 +48803,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"VMware7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-4578U",
-        "gpu:8086:0a2e",
+        "cpu:x86-64",
         "os:Mac-10.13.6",
         "pool:Skia"
       ],
@@ -47800,7 +48847,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All": {
+    "Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -47827,32 +48874,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47866,17 +48913,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.14\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.14-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64-i7-4578U",
-        "gpu:8086:0a2e",
-        "os:Mac-10.13.6",
+        "cpu:x86-64-i5-4278U",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "environment": {
@@ -47911,7 +48957,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
+    "Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -47938,32 +48984,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -47977,7 +49023,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"VMware7.1\\\",\\\"os\\\",\\\"Mac10.13\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.13-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"VMware7.1\\\",\\\"os\\\",\\\"Mac10.14\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -47986,7 +49032,7 @@
       ],
       "dimensions": [
         "cpu:x86-64",
-        "os:Mac-10.13.6",
+        "os:Mac-10.14",
         "pool:Skia"
       ],
       "environment": {
@@ -48021,7 +49067,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -48048,32 +49094,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48087,7 +49133,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"VMware7.1\\\",\\\"os\\\",\\\"Mac10.14\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.14-Clang-VMware7.1-CPU-AVX-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -48095,8 +49141,8 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "cpu:x86-64",
-        "os:Mac-10.14.6",
+        "gpu:8086:1626",
+        "os:Mac-10.15.1",
         "pool:Skia"
       ],
       "environment": {
@@ -48131,7 +49177,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -48150,40 +49196,35 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48197,11 +49238,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"ASAN_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Debug-ASAN_Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -48235,13 +49276,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": {
       "caches": [
         {
           "name": "vpython",
@@ -48260,35 +49300,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48302,11 +49347,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"ASAN_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-ASAN_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-ASAN_Metal",
+        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -48340,12 +49385,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -48372,32 +49418,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48411,11 +49457,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"CommandBuffer\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"cmdbuffer_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GLBackendAllocationTest\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrDDLImage_MakeSubset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrContext_oomed\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-CommandBuffer\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL1_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-CommandBuffer",
+        "Build-Mac-Clang-x86_64-Debug-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -48455,7 +49501,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -48482,32 +49528,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48521,7 +49567,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL1_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL1_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL3_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -48565,7 +49611,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -48592,32 +49638,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48631,7 +49677,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL3_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-DDL3_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -48675,7 +49721,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -48702,32 +49748,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48741,11 +49787,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-Metal",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -48785,7 +49831,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -48812,32 +49858,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48851,11 +49897,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"OOPRDDL_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Debug-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -48895,7 +49941,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -48922,32 +49968,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -48961,11 +50007,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"OOPRDDL_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-OOPRDDL_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-Metal",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -49005,7 +50051,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49032,32 +50078,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49071,11 +50117,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL1_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release",
+        "Build-Mac-Clang-x86_64-Release-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -49115,7 +50161,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49142,32 +50188,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49181,7 +50227,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL1_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL1_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL3_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -49225,7 +50271,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49252,32 +50298,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49291,7 +50337,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"DDL3_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-DDL3_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -49335,7 +50381,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49362,32 +50408,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49401,7 +50447,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"OOPRDDL_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -49445,7 +50491,111 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal": {
+    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal": {
+      "caches": [
+        {
+          "name": "vpython",
+          "path": "cache/vpython"
+        }
+      ],
+      "casSpec": "test",
+      "cipd_packages": [
+        {
+          "name": "infra/3pp/tools/cpython/mac-amd64",
+          "path": "cipd_bin_packages/cpython",
+          "version": "version:2@2.7.18.chromium.39"
+        },
+        {
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
+          "path": "cipd_bin_packages/cpython3",
+          "version": "version:2@3.8.10.chromium.19"
+        },
+        {
+          "name": "infra/tools/luci-auth/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/kitchen/${platform}",
+          "path": ".",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython-native/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "infra/tools/luci/vpython/${platform}",
+          "path": "cipd_bin_packages",
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:47"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:362"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:14"
+        }
+      ],
+      "command": [
+        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
+        "-u",
+        "skia/infra/bots/run_recipe.py",
+        "${ISOLATED_OUTDIR}",
+        "test",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"TSAN_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "skia"
+      ],
+      "dependencies": [
+        "Build-Mac-Clang-x86_64-Release-TSAN_Metal",
+        "Housekeeper-PerCommit-BundleRecipes"
+      ],
+      "dimensions": [
+        "gpu:8086:1626",
+        "os:Mac-10.15.1",
+        "pool:Skia"
+      ],
+      "environment": {
+        "RECIPES_USE_PY3": "true",
+        "VPYTHON_LOG_TRACE": "1"
+      },
+      "env_prefixes": {
+        "PATH": [
+          "cipd_bin_packages/cpython",
+          "cipd_bin_packages/cpython/bin",
+          "cipd_bin_packages/cpython3",
+          "cipd_bin_packages/cpython3/bin",
+          "cipd_bin_packages",
+          "cipd_bin_packages/bin"
+        ],
+        "VPYTHON_DEFAULT_SPEC": [
+          "skia/.vpython"
+        ],
+        "VPYTHON_VIRTUALENV_ROOT": [
+          "cache/vpython"
+        ]
+      },
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_tags": {
+        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
+      },
+      "io_timeout_ns": 14400000000000,
+      "max_attempts": 1,
+      "outputs": [
+        "test"
+      ]
+    },
+    "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49472,32 +50622,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49511,16 +50661,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"OOPRDDL_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"mtlooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-OOPRDDL_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~SurfacePartialDraw_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-Metal",
+        "Build-Mac-Clang-x86_64-Debug-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1626",
-        "os:Mac-10.15.1",
+        "gpu:1002:6821-4.0.20-3.2.8",
+        "os:Mac-10.15.7",
         "pool:Skia"
       ],
       "environment": {
@@ -49555,7 +50705,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal": {
+    "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -49574,35 +50724,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49616,16 +50771,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD6000\\\",\\\"extra_config\\\",\\\"TSAN_Metal\\\",\\\"model\\\",\\\"MacBookAir7.2\\\",\\\"os\\\",\\\"Mac10.15.1\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--match\\\",\\\"~^ProcessorCloneTest$\\\",\\\"~^GrMeshTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Release-All-TSAN_Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~SurfacePartialDraw_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-TSAN_Metal",
+        "Build-Mac-Clang-x86_64-Release-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:8086:1626",
-        "os:Mac-10.15.1",
+        "gpu:1002:6821-4.0.20-3.2.8",
+        "os:Mac-10.15.7",
         "pool:Skia"
       ],
       "environment": {
@@ -49654,12 +50809,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal": {
+    "Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -49686,32 +50842,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49725,15 +50881,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~SurfacePartialDraw_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AVX2\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacMini7.1-CPU-AVX2-x86_64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Debug-Metal",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
+        "cpu:x86-64-i5-4278U",
         "os:Mac-10.15.7",
         "pool:Skia"
       ],
@@ -49769,7 +50925,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal": {
+    "Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5": {
       "caches": [
         {
           "name": "vpython",
@@ -49796,32 +50952,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -49835,15 +50991,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"RadeonHD8870M\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro11.5\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~WritePixelsNonTextureMSAA_Gpu\\\",\\\"~SurfacePartialDraw_Gpu\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacBookPro11.5-GPU-RadeonHD8870M-x86_64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris5100\\\",\\\"extra_config\\\",\\\"NativeFonts_i5\\\",\\\"model\\\",\\\"MacMini7.1\\\",\\\"os\\\",\\\"Mac10.15.7\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLLoopFloat_GPU\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac10.15.7-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-All-NativeFonts_i5\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-x86_64-Release-Metal",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:1002:6821-4.0.20-3.2.8",
+        "cpu:x86-64-i5-4278U",
+        "gpu:8086:0a2e",
         "os:Mac-10.15.7",
         "pool:Skia"
       ],
@@ -49906,32 +51063,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50016,32 +51173,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50126,32 +51283,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50236,32 +51393,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50341,32 +51498,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50380,7 +51537,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-ASAN_Graphite\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"ASAN_Graphite\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac11\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"grmtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode-alpha-jpeg\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"jpg-color-cube\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TransferPixelsFromTextureTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-ASAN_Graphite\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-ASAN_Graphite\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"ASAN_Graphite\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac11\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"grmtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode-alpha-jpeg\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"encode\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"jpg-color-cube\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TransferPixelsFromTextureTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~async_rescale_and_read\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-ASAN_Graphite\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -50450,32 +51607,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50555,32 +51712,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50594,7 +51751,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"Graphite\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac11\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"grmtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TransferPixelsFromTextureTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"Graphite\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac11\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"grmtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"image_subset\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TransferPixelsFromTextureTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~async_rescale_and_read\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -50664,32 +51821,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50747,7 +51904,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -50757,49 +51914,49 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50813,16 +51970,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ASAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIrisPlus\\\",\\\"model\\\",\\\"MacBookPro16,2\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Mac-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:8086:8a53",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -50851,12 +52008,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -50866,12 +52024,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -50883,32 +52041,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -50922,16 +52080,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL1\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIrisPlus\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro16,2\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Mac-Clang-x86_64-Debug-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:8086:8a53",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -50966,7 +52124,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -50976,12 +52134,12 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -50993,37 +52151,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51037,16 +52190,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL1_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIrisPlus\\\",\\\"model\\\",\\\"MacBookPro16,2\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
+        "Build-Mac-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:8086:8a53",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -51081,7 +52234,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN": {
+    "Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -51091,49 +52244,49 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51147,16 +52300,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_ASAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIrisPlus\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"MacBookPro16,2\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacBookPro16,2-GPU-IntelIrisPlus-x86_64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Mac-Clang-x86_64-Release-Metal",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "gpu:8086:8a53",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -51185,12 +52338,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
+    "Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN": {
       "caches": [
         {
           "name": "vpython",
@@ -51200,54 +52354,44 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51261,16 +52405,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"CPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"NativeFonts_ASAN\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nogpu\\\",\\\"--config\\\",\\\"8888\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"--skip\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Debug-All-NativeFonts_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
+        "Build-Mac-Clang-arm64-Debug-ASAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "cpu:arm64-64-Apple_M1",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -51299,13 +52443,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN": {
+    "Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts": {
       "caches": [
         {
           "name": "vpython",
@@ -51315,49 +52458,49 @@
       "casSpec": "test",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
+          "name": "infra/3pp/tools/cpython/mac-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
+          "name": "infra/3pp/tools/cpython3/mac-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51371,16 +52514,16 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_ASAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_ASAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleM1\\\",\\\"extra_config\\\",\\\"NativeFonts\\\",\\\"model\\\",\\\"MacMini9.1\\\",\\\"os\\\",\\\"Mac12\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"TransferPixelsFromTextureTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Mac12-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-NativeFonts\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-ASAN",
+        "Build-Mac-Clang-arm64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
-        "os:Ubuntu-18.04",
+        "cpu:arm64-64-Apple_M1",
+        "os:Mac-12",
         "pool:Skia"
       ],
       "environment": {
@@ -51409,12 +52552,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1": {
       "caches": [
         {
           "name": "vpython",
@@ -51441,37 +52585,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51485,15 +52624,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL1\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"gl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -51529,7 +52668,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -51548,35 +52687,45 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51590,15 +52739,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"PreAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL1_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--config\\\",\\\"vk\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Debug",
+        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -51631,9 +52780,10 @@
       "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -51660,22 +52810,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -51685,12 +52835,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51704,7 +52854,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"vk1010102\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -51712,7 +52862,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -51748,7 +52898,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -51775,32 +52925,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/linux_vulkan_sdk",
+          "path": "linux_vulkan_sdk",
+          "version": "version:5"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51814,15 +52969,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-OOPRDDL_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -51858,7 +53013,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext": {
       "caches": [
         {
           "name": "vpython",
@@ -51880,37 +53035,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -51924,15 +53074,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_TSAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"PreAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-PreAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN",
+        "Build-Debian10-Clang-x86_64-Debug",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -51962,12 +53112,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -51986,30 +53136,30 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -52019,12 +53169,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52038,15 +53188,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"vk1010102\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Debug-Vulkan",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52076,12 +53226,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -52100,40 +53251,40 @@
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
+        {
+          "name": "infra/gsutil",
+          "path": "cipd_bin_packages",
+          "version": "version:4.46"
+        },
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52147,15 +53298,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52185,12 +53336,13 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
-      ]
+      ],
+      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -52212,42 +53364,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/clang_linux",
           "path": "clang_linux",
           "version": "version:20"
         },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
-        },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52261,15 +53408,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"vkooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"DDL3_TSAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-DDL3_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52304,7 +53451,7 @@
         "test"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN": {
       "caches": [
         {
           "name": "vpython",
@@ -52326,32 +53473,37 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
+        },
+        {
+          "name": "skia/bots/clang_linux",
+          "path": "clang_linux",
+          "version": "version:20"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52365,15 +53517,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"PreAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"OOPRDDL_TSAN\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"DDL\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--skpViewportSize\\\",\\\"2048\\\",\\\"--gpuThreads\\\",\\\"0\\\",\\\"--config\\\",\\\"glooprddl\\\",\\\"--src\\\",\\\"gm\\\",\\\"skp\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-OOPRDDL_TSAN\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release",
+        "Build-Debian10-Clang-x86_64-Release-TSAN",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52403,12 +53555,12 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
+      "max_attempts": 1,
       "outputs": [
         "test"
       ]
     },
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan": {
+    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext": {
       "caches": [
         {
           "name": "vpython",
@@ -52430,42 +53582,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/clang_linux",
-          "path": "clang_linux",
-          "version": "version:20"
-        },
-        {
-          "name": "skia/bots/linux_vulkan_sdk",
-          "path": "linux_vulkan_sdk",
-          "version": "version:5"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52479,15 +53621,15 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"TSAN_Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-TSAN_Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"PreAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-PreAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Debian10-Clang-x86_64-Release-TSAN_Vulkan",
+        "Build-Debian10-Clang-x86_64-Release",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52517,7 +53659,7 @@
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
       "io_timeout_ns": 14400000000000,
-      "max_attempts": 1,
+      "max_attempts": 2,
       "outputs": [
         "test"
       ]
@@ -52544,32 +53686,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52588,7 +53730,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--abandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--abandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_AbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -52596,7 +53738,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia",
         "valgrind:1"
@@ -52654,32 +53796,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52698,7 +53840,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"~multipicturedraw_\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"~multipicturedraw_\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--preAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_PreAbandonGpuContext_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -52706,7 +53848,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia",
         "valgrind:1"
@@ -52764,32 +53906,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52808,7 +53950,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Valgrind_SK_CPU_LIMIT_SSE41\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"gl1010102\\\",\\\"gltestpersistentcache\\\",\\\"gltestglslcache\\\",\\\"gltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"gl1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"gltestpersistentcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestglslcache\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"gltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"tessellation\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"InitialTextureClear\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~Threaded\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -52816,7 +53958,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia",
         "valgrind:1"
@@ -52879,22 +54021,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/linux_vulkan_sdk",
@@ -52904,12 +54046,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -52923,7 +54065,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"vk1010102\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Ubuntu18\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"vk1010102\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"vk1010102\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -52931,7 +54073,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -52973,7 +54115,7 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/node",
@@ -52983,7 +54125,7 @@
         {
           "name": "skia/tools/goldctl/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -53042,7 +54184,7 @@
         "Housekeeper-PerCommit-BuildTaskDrivers_linux_amd64"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-430.14",
+        "gpu:10de:1cb3-510.60.02",
         "os:Ubuntu-18.04",
         "pool:Skia"
       ],
@@ -53078,32 +54220,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53182,32 +54324,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53286,32 +54428,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53390,32 +54532,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53494,32 +54636,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53598,32 +54740,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53702,32 +54844,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53741,7 +54883,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -53749,7 +54891,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -53806,32 +54948,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53845,7 +54987,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -53853,7 +54995,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -53910,32 +55052,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -53949,7 +55091,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"glbetex\\\",\\\"glbert\\\",\\\"narrow-glf16\\\",\\\"glreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"glbetex\\\",\\\"glbert\\\",\\\"narrow-glf16\\\",\\\"glreducedshaders\\\",\\\"glr8\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -53957,7 +55099,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54014,32 +55156,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54053,7 +55195,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Dawn\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Dawn\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"dawn\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Dawn\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Dawn\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Dawn\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"dawn\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"runtime_intrinsics_matrix\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Dawn\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54061,7 +55203,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54118,32 +55260,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54157,7 +55299,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-GpuTess\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"GpuTess\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--pr\\\",\\\"atlas\\\",\\\"tess\\\",\\\"--hwtess\\\",\\\"--alwaysHwTess\\\",\\\"--maxTessellationSegments\\\",\\\"16\\\",\\\"--config\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-GpuTess\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-GpuTess\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"GpuTess\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--pr\\\",\\\"atlas\\\",\\\"tess\\\",\\\"--hwtess\\\",\\\"--alwaysHwTess\\\",\\\"--maxTessellationSegments\\\",\\\"16\\\",\\\"--config\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-GpuTess\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54165,7 +55307,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54222,32 +55364,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54261,7 +55403,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ReleaseAndAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ReleaseAndAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--releaseAndAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ReleaseAndAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ReleaseAndAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ReleaseAndAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--releaseAndAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ReleaseAndAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54269,7 +55411,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54326,32 +55468,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54365,7 +55507,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54373,7 +55515,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54430,22 +55572,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/procdump_win",
@@ -54455,12 +55597,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54474,7 +55616,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan_ProcDump\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan_ProcDump\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan_ProcDump\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54482,7 +55624,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54539,32 +55681,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54578,7 +55720,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54586,7 +55728,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54643,32 +55785,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54682,7 +55824,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54690,7 +55832,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54747,32 +55889,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54786,7 +55928,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"glbetex\\\",\\\"glbert\\\",\\\"narrow-glf16\\\",\\\"glreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"BonusConfigs\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"glbetex\\\",\\\"glbert\\\",\\\"narrow-glf16\\\",\\\"glreducedshaders\\\",\\\"glr8\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-BonusConfigs\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54794,7 +55936,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54851,32 +55993,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54890,7 +56032,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ReleaseAndAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--releaseAndAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"ReleaseAndAbandonGpuContext\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\",\\\"--releaseAndAbandonGpuContext\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ReleaseAndAbandonGpuContext\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"false\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -54898,7 +56040,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -54955,32 +56097,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -54994,7 +56136,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55002,7 +56144,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -55059,22 +56201,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/procdump_win",
@@ -55084,12 +56226,12 @@
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55103,7 +56245,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan_ProcDump\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan_ProcDump\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan_ProcDump\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55111,7 +56253,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -55168,32 +56310,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55272,32 +56414,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55311,7 +56453,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55376,32 +56518,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55415,7 +56557,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55480,32 +56622,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55519,7 +56661,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55584,32 +56726,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55623,7 +56765,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"~^ProcessorOptimizationValidationTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris6100\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC5i7RYH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"ProcessorCloneTest\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"~^ProcessorOptimizationValidationTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55688,32 +56830,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55792,32 +56934,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -55831,7 +56973,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -55896,32 +57038,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56000,32 +57142,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56104,32 +57246,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56143,7 +57285,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris540\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC6i5SYK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -56208,32 +57350,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56312,32 +57454,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56416,32 +57558,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56520,32 +57662,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56559,7 +57701,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -56624,32 +57766,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56728,32 +57870,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56832,32 +57974,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56936,32 +58078,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -56975,7 +58117,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelIris655\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUC8i5BEK\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLSwitchDefaultOnly_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUC8i5BEK-GPU-IntelIris655-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57040,32 +58182,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57144,32 +58286,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57248,32 +58390,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57287,7 +58429,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57352,32 +58494,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57391,7 +58533,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57456,32 +58598,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57495,7 +58637,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57560,32 +58702,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57599,7 +58741,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"IntelHD4400\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"NUCD34010WYKH\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d9_es2\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorToMatrixCast_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLVectorScalarMath_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLReturnsValueOnEveryPathES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdy_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicDFdx_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLIntrinsicFwidth_GPU\\\",\\\"angle_d3d9_es2\\\",\\\"gm\\\",\\\"_\\\",\\\"lighting\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-NUCD34010WYKH-GPU-IntelHD4400-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57664,32 +58806,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57703,7 +58845,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57768,32 +58910,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57807,7 +58949,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57872,32 +59014,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -57911,7 +59053,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~FloatingPointTextureTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~FloatingPointTextureTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -57976,32 +59118,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58015,7 +59157,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -58080,32 +59222,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58119,7 +59261,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -58184,32 +59326,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58223,7 +59365,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~FloatingPointTextureTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX660\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleA\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~FloatingPointTextureTest$\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleA-GPU-GTX660-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -58288,32 +59430,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58392,32 +59534,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58496,32 +59638,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58600,32 +59742,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58704,32 +59846,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58808,32 +59950,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -58912,32 +60054,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59016,32 +60158,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59120,32 +60262,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59159,7 +60301,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59224,32 +60366,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59263,7 +60405,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59328,32 +60470,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59367,7 +60509,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59432,32 +60574,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59471,7 +60613,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59536,32 +60678,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59575,7 +60717,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"ANGLE\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"angle_d3d11_es2\\\",\\\"angle_gl_es2\\\",\\\"angle_d3d11_es3\\\",\\\"angle_d3d11_es2_msaa4\\\",\\\"angle_d3d11_es2_dmsaa\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_d3d11_es3_msaa4\\\",\\\"angle_d3d11_es3_dmsaa\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"angle_gl_es3\\\",\\\"angle_gl_es2_msaa4\\\",\\\"angle_gl_es2_dmsaa\\\",\\\"angle_gl_es3_msaa4\\\",\\\"angle_gl_es3_dmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--match\\\",\\\"~BlurMaskBiggerThanDest\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-ANGLE\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59640,32 +60782,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59679,7 +60821,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"GTX960\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"ShuttleC\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-Clang-ShuttleC-GPU-GTX960-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59744,32 +60886,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59783,7 +60925,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59791,7 +60933,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -59848,32 +60990,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59887,7 +61029,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Direct3D\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Direct3D\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"d3d\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Direct3D\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Direct3D\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Direct3D\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"d3d\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Direct3D\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59895,7 +61037,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -59952,32 +61094,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -59991,7 +61133,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -59999,7 +61141,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -60056,32 +61198,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60095,7 +61237,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gl\\\",\\\"gldft\\\",\\\"srgb-gl\\\",\\\"glmsaa4\\\",\\\"gldmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gl\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -60103,7 +61245,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -60160,32 +61302,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60199,7 +61341,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Direct3D\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Direct3D\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"d3d\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Direct3D\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Direct3D\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Direct3D\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"d3d\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES2_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixConstructorsES3_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Direct3D\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -60207,7 +61349,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -60264,32 +61406,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60303,7 +61445,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"x86_64\\\",\\\"compiler\\\",\\\"MSVC\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"QuadroP400\\\",\\\"extra_config\\\",\\\"Vulkan\\\",\\\"model\\\",\\\"Golo\\\",\\\"os\\\",\\\"Win10\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"vk\\\",\\\"vkmsaa4\\\",\\\"vkdmsaa\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"testimgari.jpg\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle8-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"rle4-height-negative.bmp\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Arrays_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Structs_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Types_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLRecursiveComparison_Vectors_GPU\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLCommaSideEffects\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"SkSLMatrixFoldingES2_GPU\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-Win10-MSVC-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -60311,7 +61453,7 @@
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "gpu:10de:1cb3-30.0.14.7168",
+        "gpu:10de:1cb3-30.0.15.1179",
         "os:Windows-10-19043",
         "pool:Skia"
       ],
@@ -60368,32 +61510,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60473,32 +61615,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60578,32 +61720,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60683,32 +61825,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60788,32 +61930,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60893,32 +62035,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -60998,32 +62140,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61103,32 +62245,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61208,32 +62350,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61313,32 +62455,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61418,32 +62560,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61523,32 +62665,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61627,32 +62769,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61731,32 +62873,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61835,32 +62977,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -61939,32 +63081,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62043,32 +63185,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62147,32 +63289,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62251,32 +63393,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62355,32 +63497,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62459,32 +63601,32 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/skimage",
           "path": "skimage",
-          "version": "version:46"
+          "version": "version:47"
         },
         {
           "name": "skia/bots/skp",
           "path": "skp",
-          "version": "version:352"
+          "version": "version:362"
         },
         {
           "name": "skia/bots/svg",
@@ -62568,22 +63710,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -62671,22 +63813,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -62774,22 +63916,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -62877,22 +64019,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -62953,7 +64095,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All": {
+    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -62980,26 +64122,26 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
           "version": "version:0"
         }
       ],
@@ -63009,7 +64151,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylargebitmap\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylarge_picture_image\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"ImageFilterBlurLargeImage_Gpu\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -63020,8 +64162,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
+        "device_type:iPhone9,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -63056,7 +64198,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal": {
+    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -63083,26 +64225,26 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
+          "name": "skia/bots/ios-dev-image-13.3",
+          "path": "ios-dev-image-13.3",
           "version": "version:0"
         }
       ],
@@ -63112,7 +64254,7 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylargebitmap\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylarge_picture_image\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"ImageFilterBlurLargeImage_Gpu\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~flight_animated_image\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
@@ -63123,214 +64265,8 @@
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
-          "version": "version:0"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylargebitmap\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylarge_picture_image\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"ImageFilterBlurLargeImage_Gpu\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
-      ],
-      "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 14400000000000,
-      "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "test",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-12.4",
-          "path": "ios-dev-image-12.4",
-          "version": "version:0"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGX6450\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone6\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylargebitmap\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"verylarge_picture_image\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"_\\\",\\\"tests\\\",\\\"_\\\",\\\"ImageFilterBlurLargeImage_Gpu\\\",\\\"_\\\",\\\"gm\\\",\\\"_\\\",\\\"wacky_yuv\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--match\\\",\\\"~flight_animated_image\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
-      ],
-      "dimensions": [
-        "device_type:iPhone7,2",
-        "os:iOS-12.4.5",
+        "device_type:iPhone9,1",
+        "os:iOS-13.3.1",
         "pool:Skia"
       ],
       "environment": {
@@ -63365,7 +64301,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All": {
+    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -63392,22 +64328,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63421,11 +64357,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -63468,7 +64404,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal": {
+    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -63495,22 +64431,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63524,11 +64460,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS_Metal",
+        "Build-Mac-Clang-arm64-Release-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -63571,7 +64507,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
+    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -63598,22 +64534,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63627,18 +64563,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Mac-Clang-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone9,1",
+        "device_type:iPhone10,1",
         "os:iOS-13.3.1",
         "pool:Skia"
       ],
@@ -63674,7 +64610,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal": {
+    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -63701,22 +64637,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63730,18 +64666,18 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"PowerVRGT7600\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone7\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"circular_arcs_hairline\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dashcircle\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"ovals\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"roundrects\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils_occl\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokerect\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokes3\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_nearest_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_linear_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"textblobmixedsizes_df\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim_repeat\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Chalkboard.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Ghostscript_Tiger.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_American_Samoa.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_Illinois.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"desk_motionmark_paths.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"rg1024_green_grapes.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"shapes-intro-02-f.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"tiger-8.svg\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Mac-Clang-arm64-Debug-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone9,1",
+        "device_type:iPhone10,1",
         "os:iOS-13.3.1",
         "pool:Skia"
       ],
@@ -63777,7 +64713,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All": {
+    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -63804,22 +64740,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63833,11 +64769,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS",
+        "Build-Mac-Clang-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -63880,7 +64816,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal": {
+    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -63907,22 +64843,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.3",
@@ -63936,11 +64872,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"circular_arcs_hairline\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dashcircle\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"ovals\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"roundrects\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils_occl\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokerect\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokes3\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_nearest_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_linear_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"textblobmixedsizes_df\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim_repeat\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Chalkboard.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Ghostscript_Tiger.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_American_Samoa.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_Illinois.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"desk_motionmark_paths.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"rg1024_green_grapes.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"shapes-intro-02-f.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"tiger-8.svg\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"circular_arcs_hairline\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dashcircle\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"ovals\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"roundrects\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils_occl\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokerect\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokes3\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_nearest_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_linear_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"textblobmixedsizes_df\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim_repeat\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Chalkboard.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Ghostscript_Tiger.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_American_Samoa.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_Illinois.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"desk_motionmark_paths.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"rg1024_green_grapes.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"shapes-intro-02-f.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"tiger-8.svg\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Debug-iOS_Metal",
+        "Build-Mac-Clang-arm64-Release-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -63983,7 +64919,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All": {
+    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All": {
       "caches": [
         {
           "name": "vpython",
@@ -64010,26 +64946,26 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
+          "name": "skia/bots/ios-dev-image-13.6",
+          "path": "ios-dev-image-13.6",
           "version": "version:0"
         }
       ],
@@ -64039,19 +64975,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS",
+        "Build-Mac-Xcode11.4.1-arm64-Debug-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone10,1",
-        "os:iOS-13.3.1",
+        "device_type:iPhone12,1",
+        "os:iOS-13.6",
         "pool:Skia"
       ],
       "environment": {
@@ -64086,7 +65022,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal": {
+    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -64113,26 +65049,26 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
-          "name": "skia/bots/ios-dev-image-13.3",
-          "path": "ios-dev-image-13.3",
+          "name": "skia/bots/ios-dev-image-13.6",
+          "path": "ios-dev-image-13.6",
           "version": "version:0"
         }
       ],
@@ -64142,19 +65078,19 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Clang\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA11\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone8\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtltestprecompile\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"atlastext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"circular_arcs_hairline\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dashcircle\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"dftext\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"fontmgr_bounds_1_-0.25\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_b\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_h_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"glyph_pos_n_f\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"persp_images\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"ovals\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"roundrects\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"shadow_utils_occl\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokedlines\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokerect\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"strokes3\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_nearest_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"texel_subset_linear_mipmap_linear_down\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"textblobmixedsizes_df\\\",\\\"mtltestprecompile\\\",\\\"gm\\\",\\\"_\\\",\\\"yuv420_odd_dim_repeat\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"A_large_blank_world_map_with_oceans_marked_in_blue.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Chalkboard.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Ghostscript_Tiger.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_American_Samoa.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"Seal_of_Illinois.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"desk_motionmark_paths.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"rg1024_green_grapes.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"shapes-intro-02-f.svg\\\",\\\"mtltestprecompile\\\",\\\"svg\\\",\\\"_\\\",\\\"tiger-8.svg\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Clang-iPhone8-GPU-AppleA11-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Clang-arm64-Release-iOS_Metal",
+        "Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
         "Housekeeper-PerCommit-IsolateSkImage"
       ],
       "dimensions": [
-        "device_type:iPhone10,1",
-        "os:iOS-13.3.1",
+        "device_type:iPhone12,1",
+        "os:iOS-13.6",
         "pool:Skia"
       ],
       "environment": {
@@ -64189,7 +65125,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All": {
+    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All": {
       "caches": [
         {
           "name": "vpython",
@@ -64216,22 +65152,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -64245,11 +65181,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Debug-iOS",
+        "Build-Mac-Xcode11.4.1-arm64-Release-iOS",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -64292,7 +65228,7 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal": {
+    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal": {
       "caches": [
         {
           "name": "vpython",
@@ -64319,22 +65255,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "skia/bots/ios-dev-image-13.6",
@@ -64348,11 +65284,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Debug\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Debug-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Debug-iOS_Metal",
+        "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal",
         "Housekeeper-PerCommit-BundleRecipes",
         "Housekeeper-PerCommit-IsolateSKP",
         "Housekeeper-PerCommit-IsolateSVG",
@@ -64395,22 +65331,22 @@
       ],
       "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All": {
+    "Upload-BuildStats-Debian10-EMCC-asmjs-Release-PathKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "run-recipe",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -64422,27 +65358,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.6",
-          "path": "ios-dev-image-13.6",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64450,20 +65381,19 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"gles\\\",\\\"glesdft\\\",\\\"srgb-gles\\\",\\\"glesmsaa4\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"srgb-gles\\\",\\\"image\\\",\\\"_\\\",\\\"_\\\",\\\"gles\\\",\\\"skp\\\",\\\"_\\\",\\\"_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "upload_buildstats_results",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-asmjs-Release-PathKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Release-iOS",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "BuildStats-Debian10-EMCC-asmjs-Release-PathKit",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_type:iPhone12,1",
-        "os:iOS-13.6",
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "environment": {
@@ -64486,34 +65416,30 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 3600000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 14400000000000,
+      "io_timeout_ns": 3600000000000,
       "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal": {
+    "Upload-BuildStats-Debian10-EMCC-wasm-Release-CanvasKit": {
       "caches": [
         {
           "name": "vpython",
           "path": "cache/vpython"
         }
       ],
-      "casSpec": "test",
+      "casSpec": "run-recipe",
       "cipd_packages": [
         {
-          "name": "infra/3pp/tools/cpython/linux-arm64",
+          "name": "infra/3pp/tools/cpython/linux-amd64",
           "path": "cipd_bin_packages/cpython",
           "version": "version:2@2.7.18.chromium.39"
         },
         {
-          "name": "infra/3pp/tools/cpython3/linux-arm64",
+          "name": "infra/3pp/tools/cpython3/linux-amd64",
           "path": "cipd_bin_packages/cpython3",
           "version": "version:2@3.8.10.chromium.19"
         },
@@ -64525,27 +65451,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "skia/bots/ios-dev-image-13.6",
-          "path": "ios-dev-image-13.6",
-          "version": "version:0"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64553,20 +65474,19 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "test",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\",\"dm_flags\":\"[\\\"dm\\\",\\\"--nameByHash\\\",\\\"--key\\\",\\\"arch\\\",\\\"arm64\\\",\\\"compiler\\\",\\\"Xcode11.4.1\\\",\\\"configuration\\\",\\\"Release\\\",\\\"cpu_or_gpu\\\",\\\"GPU\\\",\\\"cpu_or_gpu_value\\\",\\\"AppleA13\\\",\\\"extra_config\\\",\\\"Metal\\\",\\\"model\\\",\\\"iPhone11\\\",\\\"os\\\",\\\"iOS\\\",\\\"style\\\",\\\"default\\\",\\\"--randomProcessorTest\\\",\\\"--nocpu\\\",\\\"--config\\\",\\\"mtl\\\",\\\"mtlmsaa4\\\",\\\"mtlreducedshaders\\\",\\\"--src\\\",\\\"tests\\\",\\\"gm\\\",\\\"image\\\",\\\"colorImage\\\",\\\"svg\\\",\\\"--skip\\\",\\\"_\\\",\\\"svg\\\",\\\"_\\\",\\\"svgparse_\\\",\\\"_\\\",\\\"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\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"frame_larger_than_image.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc2.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc3.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc4.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc5.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc6.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc7.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc8.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc9.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc10.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc11.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc12.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc13.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc14.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.png\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"incInterlaced.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc1.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"inc0.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"butterfly.gif\\\",\\\"_\\\",\\\"image\\\",\\\"gen_platf\\\",\\\"error\\\",\\\"_\\\",\\\"test\\\",\\\"_\\\",\\\"GrStyledShape\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced1.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced2.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\"interlaced3.png\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".arw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".cr2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".dng\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".nrw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".orf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".raf\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".rw2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".pef\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".srw\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ARW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".CR2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".DNG\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".NRW\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".ORF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RAF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".RW2\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".PEF\\\",\\\"_\\\",\\\"image\\\",\\\"_\\\",\\\".SRW\\\",\\\"--nonativeFonts\\\",\\\"--verbose\\\"]\",\"dm_properties\":\"{\\\"buildbucket_build_id\\\":\\\"<(BUILDBUCKET_BUILD_ID)\\\",\\\"builder\\\":\\\"Test-iOS-Xcode11.4.1-iPhone11-GPU-AppleA13-arm64-Release-All-Metal\\\",\\\"gitHash\\\":\\\"<(REVISION)\\\",\\\"issue\\\":\\\"<(ISSUE)\\\",\\\"patch_storage\\\":\\\"<(PATCH_STORAGE)\\\",\\\"patchset\\\":\\\"<(PATCHSET)\\\",\\\"swarming_bot_id\\\":\\\"${SWARMING_BOT_ID}\\\",\\\"swarming_task_id\\\":\\\"${SWARMING_TASK_ID}\\\",\\\"task_id\\\":\\\"<(TASK_ID)\\\"}\",\"do_upload\":\"true\",\"gold_hashes_url\":\"https://gold.skia.org/json/v1/hashes\",\"gs_bucket\":\"skia-infra-gm\",\"images\":\"true\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"resources\":\"true\",\"revision\":\"<(REVISION)\",\"skps\":\"true\",\"svgs\":\"true\",\"swarm_out_dir\":\"test\",\"task_id\":\"<(TASK_ID)\"}",
+        "upload_buildstats_results",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "Build-Mac-Xcode11.4.1-arm64-Release-iOS_Metal",
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Housekeeper-PerCommit-IsolateSKP",
-        "Housekeeper-PerCommit-IsolateSVG",
-        "Housekeeper-PerCommit-IsolateSkImage"
+        "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit",
+        "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
-        "device_type:iPhone12,1",
-        "os:iOS-13.6",
+        "cpu:x86-64-Haswell_GCE",
+        "gpu:none",
+        "machine_type:n1-highmem-2",
+        "os:Debian-10.3",
         "pool:Skia"
       ],
       "environment": {
@@ -64589,19 +65509,15 @@
           "cache/vpython"
         ]
       },
-      "execution_timeout_ns": 14400000000000,
-      "expiration_ns": 72000000000000,
+      "execution_timeout_ns": 3600000000000,
       "extra_tags": {
         "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
       },
-      "io_timeout_ns": 14400000000000,
+      "io_timeout_ns": 3600000000000,
       "max_attempts": 2,
-      "outputs": [
-        "test"
-      ],
-      "service_account": "skia-external-gm-uploader@skia-swarming-bots.iam.gserviceaccount.com"
+      "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-BuildStats-Debian10-EMCC-asmjs-Release-PathKit": {
+    "Upload-BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU": {
       "caches": [
         {
           "name": "vpython",
@@ -64628,22 +65544,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64652,11 +65568,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_buildstats_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-asmjs-Release-PathKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "BuildStats-Debian10-EMCC-asmjs-Release-PathKit",
+        "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -64694,7 +65610,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-BuildStats-Debian10-EMCC-wasm-Release-CanvasKit": {
+    "Upload-BuildStats-Debian10-EMCC-wasm-Release-PathKit": {
       "caches": [
         {
           "name": "vpython",
@@ -64721,22 +65637,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64745,11 +65661,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_buildstats_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-PathKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit",
+        "BuildStats-Debian10-EMCC-wasm-Release-PathKit",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -64787,7 +65703,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU": {
+    "Upload-BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker": {
       "caches": [
         {
           "name": "vpython",
@@ -64814,22 +65730,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64838,11 +65754,11 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_buildstats_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "BuildStats-Debian10-EMCC-wasm-Release-CanvasKit_CPU",
+        "BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker",
         "Housekeeper-PerCommit-BundleRecipes"
       ],
       "dimensions": [
@@ -64880,7 +65796,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-BuildStats-Debian10-EMCC-wasm-Release-PathKit": {
+    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -64907,22 +65823,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -64930,13 +65846,13 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "upload_buildstats_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian10-EMCC-wasm-Release-PathKit\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "upload_nano_results",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "BuildStats-Debian10-EMCC-wasm-Release-PathKit",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -64973,7 +65889,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker": {
+    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing": {
       "caches": [
         {
           "name": "vpython",
@@ -65000,22 +65916,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65023,13 +65939,13 @@
         "-u",
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
-        "upload_buildstats_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "upload_nano_results",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
-        "BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker",
-        "Housekeeper-PerCommit-BundleRecipes"
+        "Housekeeper-PerCommit-BundleRecipes",
+        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65066,7 +65982,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -65093,22 +66009,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65117,12 +66033,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65159,7 +66075,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -65186,22 +66102,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65210,12 +66126,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65252,7 +66168,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -65279,22 +66195,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65303,12 +66219,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65345,7 +66261,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -65372,22 +66288,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65396,12 +66312,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65438,7 +66354,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -65465,22 +66381,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65489,12 +66405,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Mskp_Skpbench"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65531,7 +66447,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -65558,22 +66474,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65582,12 +66498,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Skpbench"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65624,7 +66540,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -65651,22 +66567,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65675,12 +66591,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65717,7 +66633,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench": {
+    "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -65744,22 +66660,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65768,12 +66684,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"
+        "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65810,7 +66726,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench": {
+    "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -65837,22 +66753,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65861,12 +66777,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_Skpbench"
+        "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65903,7 +66819,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -65930,22 +66846,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -65954,12 +66870,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android"
+        "Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -65996,7 +66912,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -66023,22 +66939,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66047,12 +66963,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66089,7 +67005,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -66116,22 +67032,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66140,12 +67056,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android"
+        "Perf-Android-Clang-JioNext-CPU-SnapdragonQM215-arm-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66182,7 +67098,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -66209,22 +67125,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66233,12 +67149,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-GalaxyS9-GPU-MaliG72-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66275,7 +67191,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android": {
+    "Upload-Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -66302,22 +67218,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66326,12 +67242,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-All-Android"
+        "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66368,7 +67284,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -66395,22 +67311,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66419,12 +67335,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android"
+        "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66461,7 +67377,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -66488,22 +67404,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66512,12 +67428,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-P30-GPU-MaliG76-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66554,7 +67470,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -66581,22 +67497,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66605,12 +67521,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Mskp_Skpbench"
+        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66647,7 +67563,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -66674,22 +67590,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66698,12 +67614,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Skpbench"
+        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66740,7 +67656,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -66767,22 +67683,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66791,12 +67707,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel2XL-GPU-Adreno530-arm64-Release-All-Android_Vulkan_Skpbench"
+        "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66833,7 +67749,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -66860,22 +67776,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66884,12 +67800,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -66926,7 +67842,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -66953,22 +67869,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -66977,12 +67893,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67019,7 +67935,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -67046,22 +67962,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67070,12 +67986,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67112,7 +68028,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -67139,22 +68055,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67163,12 +68079,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel3-GPU-Adreno630-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67205,7 +68121,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -67232,22 +68148,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67256,12 +68172,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67298,7 +68214,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs": {
       "caches": [
         {
           "name": "vpython",
@@ -67325,22 +68241,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67349,12 +68265,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67391,7 +68307,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs": {
+    "Upload-Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -67418,22 +68334,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67442,12 +68358,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4-CPU-Snapdragon855-arm64-Release-All-Android_Wuffs"
+        "Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67484,7 +68400,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -67511,22 +68427,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67535,12 +68451,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67577,7 +68493,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -67604,22 +68520,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67628,12 +68544,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4-GPU-Adreno640-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67670,7 +68586,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -67697,22 +68613,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67721,12 +68637,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67763,7 +68679,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -67790,22 +68706,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67814,12 +68730,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_AllPathsVolatile_Skpbench"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67856,7 +68772,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -67883,22 +68799,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -67907,12 +68823,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Skpbench"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -67949,7 +68865,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -67976,22 +68892,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68000,12 +68916,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -68042,7 +68958,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench": {
       "caches": [
         {
           "name": "vpython",
@@ -68069,22 +68985,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68093,12 +69009,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench"
+        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -68135,7 +69051,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench": {
+    "Upload-Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android": {
       "caches": [
         {
           "name": "vpython",
@@ -68162,22 +69078,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68186,12 +69102,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel4XL-GPU-Adreno640-arm64-Release-All-Android_Vulkan_Skpbench"
+        "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -68228,7 +69144,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android": {
+    "Upload-Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -68255,22 +69171,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68279,12 +69195,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android"
+        "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -68321,7 +69237,7 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan": {
+    "Upload-Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan": {
       "caches": [
         {
           "name": "vpython",
@@ -68348,22 +69264,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68372,12 +69288,12 @@
         "skia/infra/bots/run_recipe.py",
         "${ISOLATED_OUTDIR}",
         "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
+        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
         "skia"
       ],
       "dependencies": [
         "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-Android-Clang-Pixel5-GPU-Adreno620-arm64-Release-All-Android_Vulkan"
+        "Perf-Android-Clang-Pixel6-GPU-MaliG78-arm64-Release-All-Android_Vulkan"
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
@@ -68441,22 +69357,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68534,22 +69450,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68627,22 +69543,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68720,22 +69636,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68813,22 +69729,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68906,22 +69822,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -68999,22 +69915,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69092,22 +70008,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69185,22 +70101,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69278,22 +70194,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69371,22 +70287,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69464,22 +70380,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69557,22 +70473,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69650,22 +70566,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69743,22 +70659,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69836,22 +70752,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -69929,22 +70845,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70022,22 +70938,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70115,22 +71031,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70208,22 +71124,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70301,22 +71217,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70394,22 +71310,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70487,22 +71403,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70580,22 +71496,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70673,22 +71589,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70766,22 +71682,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70859,22 +71775,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -70952,22 +71868,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71045,22 +71961,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71138,22 +72054,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71231,22 +72147,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71324,22 +72240,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71417,22 +72333,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71510,22 +72426,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71603,22 +72519,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71696,22 +72612,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71789,22 +72705,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71882,22 +72798,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -71975,22 +72891,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72068,22 +72984,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72161,22 +73077,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72254,22 +73170,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72347,22 +73263,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72440,22 +73356,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72533,22 +73449,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72626,22 +73542,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72719,22 +73635,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72812,22 +73728,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72905,22 +73821,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -72998,22 +73914,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73091,22 +74007,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73184,22 +74100,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73277,22 +74193,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73370,22 +74286,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73463,22 +74379,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73556,22 +74472,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73649,22 +74565,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73742,22 +74658,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73835,22 +74751,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -73928,22 +74844,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74021,22 +74937,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74114,22 +75030,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74207,22 +75123,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74300,22 +75216,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74393,22 +75309,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74486,22 +75402,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74579,22 +75495,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74672,22 +75588,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74765,22 +75681,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74858,22 +75774,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -74951,22 +75867,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75044,22 +75960,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75137,22 +76053,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75230,22 +76146,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75323,22 +76239,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75416,22 +76332,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75509,22 +76425,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75602,22 +76518,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75695,22 +76611,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75788,22 +76704,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75881,22 +76797,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -75974,22 +76890,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76067,22 +76983,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76160,22 +77076,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76253,22 +77169,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76346,22 +77262,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76439,22 +77355,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76532,22 +77448,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76598,192 +77514,6 @@
       "max_attempts": 2,
       "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
     },
-    "Upload-Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "run-recipe",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-highmem-2",
-        "os:Debian-10.3",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 3600000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 3600000000000,
-      "max_attempts": 2,
-      "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
-    "Upload-Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal": {
-      "caches": [
-        {
-          "name": "vpython",
-          "path": "cache/vpython"
-        }
-      ],
-      "casSpec": "run-recipe",
-      "cipd_packages": [
-        {
-          "name": "infra/3pp/tools/cpython/linux-amd64",
-          "path": "cipd_bin_packages/cpython",
-          "version": "version:2@2.7.18.chromium.39"
-        },
-        {
-          "name": "infra/3pp/tools/cpython3/linux-amd64",
-          "path": "cipd_bin_packages/cpython3",
-          "version": "version:2@3.8.10.chromium.19"
-        },
-        {
-          "name": "infra/gsutil",
-          "path": "cipd_bin_packages",
-          "version": "version:4.46"
-        },
-        {
-          "name": "infra/tools/luci-auth/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/kitchen/${platform}",
-          "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython-native/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        },
-        {
-          "name": "infra/tools/luci/vpython/${platform}",
-          "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
-        }
-      ],
-      "command": [
-        "cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
-        "-u",
-        "skia/infra/bots/run_recipe.py",
-        "${ISOLATED_OUTDIR}",
-        "upload_nano_results",
-        "{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildbucket_build_id\":\"<(BUILDBUCKET_BUILD_ID)\",\"buildername\":\"Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal\",\"gs_bucket\":\"skia-perf\",\"patch_issue\":\"<(ISSUE_INT)\",\"patch_ref\":\"<(PATCH_REF)\",\"patch_repo\":\"<(PATCH_REPO)\",\"patch_set\":\"<(PATCHSET_INT)\",\"patch_storage\":\"<(PATCH_STORAGE)\",\"repository\":\"<(REPO)\",\"revision\":\"<(REVISION)\",\"swarm_out_dir\":\"output_ignored\",\"task_id\":\"<(TASK_ID)\"}",
-        "skia"
-      ],
-      "dependencies": [
-        "Housekeeper-PerCommit-BundleRecipes",
-        "Perf-iOS-Clang-iPhone6-GPU-PowerVRGX6450-arm64-Release-All-Metal"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "machine_type:n1-highmem-2",
-        "os:Debian-10.3",
-        "pool:Skia"
-      ],
-      "environment": {
-        "RECIPES_USE_PY3": "true",
-        "VPYTHON_LOG_TRACE": "1"
-      },
-      "env_prefixes": {
-        "PATH": [
-          "cipd_bin_packages/cpython",
-          "cipd_bin_packages/cpython/bin",
-          "cipd_bin_packages/cpython3",
-          "cipd_bin_packages/cpython3/bin",
-          "cipd_bin_packages",
-          "cipd_bin_packages/bin"
-        ],
-        "VPYTHON_DEFAULT_SPEC": [
-          "skia/.vpython"
-        ],
-        "VPYTHON_VIRTUALENV_ROOT": [
-          "cache/vpython"
-        ]
-      },
-      "execution_timeout_ns": 3600000000000,
-      "extra_tags": {
-        "log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
-      },
-      "io_timeout_ns": 3600000000000,
-      "max_attempts": 2,
-      "service_account": "skia-external-nano-uploader@skia-swarming-bots.iam.gserviceaccount.com"
-    },
     "Upload-Perf-iOS-Clang-iPhone7-GPU-PowerVRGT7600-arm64-Release-All": {
       "caches": [
         {
@@ -76811,22 +77541,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76904,22 +77634,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -76997,22 +77727,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77090,22 +77820,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77183,22 +77913,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77276,22 +78006,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77369,22 +78099,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77462,22 +78192,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77555,22 +78285,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77648,22 +78378,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77741,22 +78471,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77834,22 +78564,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -77927,22 +78657,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78020,22 +78750,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78113,22 +78843,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78206,22 +78936,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78299,22 +79029,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78392,22 +79122,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78485,22 +79215,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78578,22 +79308,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78671,22 +79401,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78764,22 +79494,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78857,22 +79587,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -78950,22 +79680,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79043,22 +79773,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79136,22 +79866,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79229,22 +79959,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79322,22 +80052,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79415,22 +80145,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79508,22 +80238,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79601,22 +80331,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79694,22 +80424,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79787,22 +80517,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79880,22 +80610,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -79973,22 +80703,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80066,22 +80796,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80159,22 +80889,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80252,22 +80982,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80345,22 +81075,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80438,22 +81168,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80531,22 +81261,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80624,22 +81354,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80717,22 +81447,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80810,22 +81540,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80903,22 +81633,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -80996,22 +81726,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81089,22 +81819,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81182,22 +81912,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81275,22 +82005,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81368,22 +82098,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81461,22 +82191,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81554,22 +82284,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81647,22 +82377,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81740,22 +82470,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81833,22 +82563,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -81926,22 +82656,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82019,22 +82749,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82112,22 +82842,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82205,22 +82935,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82298,22 +83028,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82391,22 +83121,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82484,22 +83214,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82577,22 +83307,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82670,22 +83400,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82763,22 +83493,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82856,22 +83586,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -82949,22 +83679,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83042,22 +83772,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83135,22 +83865,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83228,22 +83958,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83321,22 +84051,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83414,22 +84144,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83507,22 +84237,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83600,22 +84330,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83693,22 +84423,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83786,22 +84516,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83879,22 +84609,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -83972,22 +84702,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84065,22 +84795,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84158,22 +84888,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84251,22 +84981,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84344,22 +85074,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84437,22 +85167,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84530,22 +85260,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84623,22 +85353,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84716,22 +85446,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84809,22 +85539,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84902,22 +85632,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -84995,22 +85725,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85088,22 +85818,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85181,22 +85911,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85274,22 +86004,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85367,22 +86097,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85460,22 +86190,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85553,22 +86283,22 @@
         {
           "name": "infra/tools/luci-auth/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/kitchen/${platform}",
           "path": ".",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython-native/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         },
         {
           "name": "infra/tools/luci/vpython/${platform}",
           "path": "cipd_bin_packages",
-          "version": "git_revision:bad9cab78683fb56589867eaf035a048da903374"
+          "version": "git_revision:aa47e6be98046ddf930042773df0bd2b768e3d99"
         }
       ],
       "command": [
@@ -85644,8 +86374,7 @@
         "skia/.vpython",
         "skia/BUILD.gn",
         "skia/bench",
-        "skia/bin/fetch-clang-format",
-        "skia/bin/fetch-gn",
+        "skia/bin",
         "skia/build/fuchsia",
         "skia/build_overrides",
         "skia/buildtools",
@@ -85894,6 +86623,10 @@
     "BuildStats-Debian9-Clang-arm-Release-Flutter_Android_Docker": {
       "experimental": true
     },
+    "CodeSize-dm-Debian10-Clang-x86_64-Debug": {},
+    "CodeSize-dm-Debian10-Clang-x86_64-Release": {},
+    "CodeSize-fm-Debian10-Clang-x86_64-Debug": {},
+    "CodeSize-fm-Debian10-Clang-x86_64-Release": {},
     "Housekeeper-OnDemand-Presubmit": {},
     "Housekeeper-PerCommit-CheckGeneratedFiles": {
       "location_regexes": [
@@ -85903,7 +86636,6 @@
     },
     "Housekeeper-PerCommit-InfraTests_Linux": {},
     "Housekeeper-PerCommit-RunGnToBp": {},
-    "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-ASAN": {},
     "Test-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan": {},
     "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All": {},
     "Test-Debian10-Clang-GCE-CPU-AVX2-x86_64-Debug-All-BonusConfigs": {},
@@ -85921,7 +86653,6 @@
       ]
     },
     "Test-Mac10.15.1-Clang-MacBookAir7.2-GPU-IntelHD6000-x86_64-Debug-All-Metal": {},
-    "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-ASAN": {},
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan": {},
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-Vulkan": {},
     "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All": {},
diff --git a/third_party/skia/infra/canvaskit/docker/Makefile b/third_party/skia/infra/canvaskit/docker/Makefile
index d0840fcb0ff64..926746d55bfb6 100644
--- a/third_party/skia/infra/canvaskit/docker/Makefile
+++ b/third_party/skia/infra/canvaskit/docker/Makefile
@@ -1,4 +1,4 @@
-EMSDK_VERSION=2.0.20_v1
+EMSDK_VERSION=3.1.3_v1
 
 publish_canvaskit_emsdk:
 	docker build -t canvaskit-emsdk ./canvaskit-emsdk/
diff --git a/third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile b/third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile
index 93b80f246b82b..df73f1e393aad 100644
--- a/third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile
+++ b/third_party/skia/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile
@@ -1,7 +1,7 @@
 # A Docker image that augments the Emscripten SDK Docker image
-# with anything needed to build Canvaskit
+# with anything needed to build CanvasKit
 
-FROM gcr.io/skia-public/emsdk-base:2.0.20_v1
+FROM gcr.io/skia-public/emsdk-base:3.1.3_v1
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y \
   libfreetype6-dev
diff --git a/third_party/skia/infra/wasm-common/docker/Makefile b/third_party/skia/infra/wasm-common/docker/Makefile
index 0cd0be8c10f1d..8e01d5ae87fc9 100644
--- a/third_party/skia/infra/wasm-common/docker/Makefile
+++ b/third_party/skia/infra/wasm-common/docker/Makefile
@@ -1,4 +1,4 @@
-EMSDK_VERSION=2.0.20_v1
+EMSDK_VERSION=3.1.3_v1
 
 # Can check CHROME_VERSION with
 # docker run karma-chrome-tests /usr/bin/google-chrome-stable --version
diff --git a/third_party/skia/infra/wasm-common/docker/emsdk-base/Dockerfile b/third_party/skia/infra/wasm-common/docker/emsdk-base/Dockerfile
index 15e7b08e6c48a..3e15d1205693e 100644
--- a/third_party/skia/infra/wasm-common/docker/emsdk-base/Dockerfile
+++ b/third_party/skia/infra/wasm-common/docker/emsdk-base/Dockerfile
@@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.20
+FROM emscripten/emsdk:3.1.3
 
 RUN apt update && apt install -y python
 
diff --git a/third_party/skia/modules/androidkit/src/Image.cpp b/third_party/skia/modules/androidkit/src/Image.cpp
index de51daca65b59..9304ddc5afa93 100644
--- a/third_party/skia/modules/androidkit/src/Image.cpp
+++ b/third_party/skia/modules/androidkit/src/Image.cpp
@@ -8,6 +8,7 @@
 #include <jni.h>
 
 #include "include/core/SkImage.h"
+#include "include/core/SkM44.h"
 #include "include/core/SkTileMode.h"
 #include "modules/androidkit/src/Utils.h"
 
diff --git a/third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp b/third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
index 472d4e2e938a2..df86a983418d6 100644
--- a/third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
+++ b/third_party/skia/modules/androidkit/src/RuntimeShaderBuilder.cpp
@@ -56,7 +56,7 @@ static void ShaderBuilder_SetUniformMatrix(JNIEnv* env, jobject, jlong native_in
 
 static jlong ShaderBuilder_MakeShader(JNIEnv* env, jobject, jlong native_instance) {
     if (auto* builder = reinterpret_cast<SkRuntimeShaderBuilder*>(native_instance)) {
-        auto shader = builder->makeShader(nullptr, false);
+        auto shader = builder->makeShader();
         return reinterpret_cast<jlong>(shader.release());
     }
 
diff --git a/third_party/skia/modules/canvaskit/BUILD.bazel b/third_party/skia/modules/canvaskit/BUILD.bazel
index 04dcc68af8478..68b91babb0ffe 100644
--- a/third_party/skia/modules/canvaskit/BUILD.bazel
+++ b/third_party/skia/modules/canvaskit/BUILD.bazel
@@ -15,14 +15,14 @@ BASE_LINKOPTS = [
     "-sNODEJS_CATCH_EXIT=0",  # We don't have a 'main' so disable exit() catching
     "-sWASM",
     "-sMAX_WEBGL_VERSION=2",
+    "-sUSE_WEBGL2=1",
     "-sFORCE_FILESYSTEM=0",
+    "-sDYNAMIC_EXECUTION=0",
     "-sFILESYSTEM=0",
+    "-sEXPORTED_FUNCTIONS=['_malloc','_free']",
 ]
 
 RELEASE_OPTS = [
-    "--closure 1",  # Run the closure compiler
-    # pass the externs file in
-    "--closure-args=--externs=modules/canvaskit/externs.js",
     "-sASSERTIONS=0",  # Turn off assertions
     "-Oz",
 ]
@@ -31,12 +31,18 @@ DEBUG_OPTS = [
     "--closure 0",  # Do not use closure
     "-sASSERTIONS",  # Turn on assertions
     "-sGL_ASSERTIONS",
+    "-O0",
+    "-g3",
+    "--source-map-base=/build/",
 ]
 
 GM_OPTS = [
     "-sEXPORT_NAME=InitWasmGMTests",
     "--pre-js",
     "modules/canvaskit/gm.js",
+    "-sDEMANGLE_SUPPORT=1",
+    "--profiling-funcs",
+    "--profiling",
 ]
 
 filegroup(
@@ -47,24 +53,20 @@ filegroup(
 )
 
 cc_binary_with_flags(
-    name = "gm_bindings_with_flags",
+    name = "wasm_gm_tests.with_flags",
     testonly = True,
     srcs = [
         "gm_bindings.cpp",
         ":hdrs",
-        "//gm:gms",  # Required for the registry to work
+        "//gm:gm_list",
+        "//tests:test_list",
     ],
     additional_linker_inputs = ["gm.js"],
-    cc_binary_name = "gm_bindings",
     linkopts = select({
         "//bazel/common_config_settings:debug_build": BASE_LINKOPTS + GM_OPTS + DEBUG_OPTS,
         "//bazel/common_config_settings:release_build": BASE_LINKOPTS + GM_OPTS + RELEASE_OPTS,
         "//conditions:default": BASE_LINKOPTS + GM_OPTS + RELEASE_OPTS,
     }),
-    local_defines = [
-        "SK_GL",
-        "SK_USE_WEBGL",
-    ],
     set_flags = {
         "include_decoder": [
             "jpeg_decode_codec",
@@ -72,27 +74,39 @@ cc_binary_with_flags(
             "webp_decode_codec",
             "gif_decode_codec",
         ],
+        "include_encoder": [
+            "jpeg_encode_codec",
+            "png_encode_codec",
+            "webp_encode_codec",
+        ],
         "gpu_backend": [
             "gl_backend",
         ],
         "with_gl_standard": [
             "webgl_standard",
         ],
+        "is_skia_dev_build": [
+            "True",
+        ],
     },
     # This target won't build successfully on its own because of missing emscripten
     # headers etc. Therefore, we hide it from wildcards.
     tags = ["manual"],
     deps = [
-        "//:gms",
-        "//:hash_and_encode",
-        "//:tests",
+        "//:skia_core",
+        "//gm",
+        "//src/core:SkFontMgrPriv_hdr",
+        "//tests",
+        "//tools:hash_and_encode",
+        "//tools:resource_factory",
+        "//tools/fonts:test_font_manager",
     ],
 )
 
 wasm_cc_binary(
-    name = "gm_bindings_wasm",
+    name = "wasm_gm_tests",
     testonly = True,
-    cc_target = ":gm_bindings_with_flags",
+    cc_target = ":wasm_gm_tests.with_flags",
 )
 
 # See https://stackoverflow.com/a/57499321 for reference.
@@ -110,16 +124,35 @@ genrule(
     tools = ["//tools:embed_resources"],
 )
 
-CK_DEFINES = select({
-    ":enable_fonts_true": ["SK_INCLUDE_PARAGRAPH=1"],
-    ":enable_fonts_false": ["SK_NO_FONTS"],
+# Note: These are defines that only impact the _bindings.cpp files in this folder.
+# Any defines that need to effect the entire Skia build should go in //bazel/BUILD.bazel
+CK_DEFINES = [
+    "CK_INCLUDE_PATHOPS",
+] + select({
+    ":enable_fonts_true": ["CK_INCLUDE_PARAGRAPH"],
+    ":enable_fonts_false": ["CK_NO_FONTS"],
+}) + select({
+    ":enable_skp_serialization_true": ["CK_SERIALIZE_SKP=1"],
+    ":enable_skp_serialization_false": [],
+}) + select({
+    ":enable_runtime_effect_true": ["CK_INCLUDE_RUNTIME_EFFECT=1"],
+    ":enable_runtime_effect_false": [],
+}) + select({
+    ":enable_sksl_tracing_true": ["CK_INCLUDE_SKSL_TRACE=1"],
+    ":enable_sksl_tracing_false": [],
 })
 
+CK_RELEASE_OPTS = [
+    "--closure 1",  # Run the closure compiler
+    # pass the externs file in
+    "--closure-args=--externs=$(location externs.js)",
+]
+
 CK_OPTS = BASE_LINKOPTS + [
     "-sEXPORT_NAME=CanvasKitInit",
     "-sINITIAL_MEMORY=128MB",
     # The order of these --pre-js flags matters! The preamble is a partially open scope and the
-    # postamble closes it.
+    # postamble closes it. TODO(kjlubick) do we need to do it this way anymore?
     "--pre-js",
     "modules/canvaskit/preamble.js",
     "--pre-js",
@@ -131,7 +164,7 @@ CK_OPTS = BASE_LINKOPTS + [
     "--pre-js",
     "modules/canvaskit/interface.js",
     "--pre-js",
-    "modules/canvaskit/matrix.js",
+    "modules/canvaskit/pathops.js",
 ] + select({
     "//bazel/common_config_settings:gl_backend": [
         "--pre-js",
@@ -181,7 +214,38 @@ CK_OPTS = BASE_LINKOPTS + [
         "modules/canvaskit/htmlcanvas/postamble.js",
     ],
     ":enable_canvas_polyfill_false": [],
+}) + select({
+    ":enable_skottie_true": [
+        "--pre-js",
+        "modules/canvaskit/skottie.js",
+    ],
+    ":enable_skottie_false": [],
+}) + select({
+    ":enable_skp_serialization_true": [
+        "--pre-js",
+        "modules/canvaskit/skp.js",
+    ],
+    ":enable_skp_serialization_false": [],
+}) + select({
+    ":enable_particles_true": [
+        "--pre-js",
+        "modules/canvaskit/particles.js",
+    ],
+    ":enable_particles_false": [],
+}) + select({
+    ":enable_runtime_effect_true": [
+        "--pre-js",
+        "modules/canvaskit/rt_shader.js",
+    ],
+    ":enable_runtime_effect_false": [],
+}) + select({
+    ":include_matrix_js_true": [
+        "--pre-js",
+        "modules/canvaskit/matrix.js",
+    ],
+    ":include_matrix_js_false": [],
 }) + [
+    # This must come last
     "--pre-js",
     "modules/canvaskit/postamble.js",
 ] + select({
@@ -189,13 +253,14 @@ CK_OPTS = BASE_LINKOPTS + [
         "--pre-js",
         "modules/canvaskit/debug.js",
     ],
-    "//conditions:default": RELEASE_OPTS + [
+    "//conditions:default": RELEASE_OPTS + CK_RELEASE_OPTS + [
         "--pre-js",
         "modules/canvaskit/release.js",
     ],
 })
 
-# All JS files that could be included via --pre-js or --post-js
+# All JS files that could possibly be included via --pre-js or --post-js.
+# Whether they actually will be or not will be controlled above in the construction of CK_OPTS.
 JS_INTERFACE_FILES = [
     "color.js",
     "cpu.js",
@@ -243,18 +308,24 @@ CK_SRCS = [
         "paragraph_bindings_gen.cpp",
     ],
     ":enable_fonts_false": [],
+}) + select({
+    ":enable_skottie_true": ["skottie_bindings.cpp"],
+    ":enable_skottie_false": [],
+}) + select({
+    ":enable_particles_true": ["particles_bindings.cpp"],
+    ":enable_particles_false": [],
 })
 
 cc_binary_with_flags(
-    name = "canvaskit_with_flags",
+    name = "canvaskit.with_flags",
     srcs = CK_SRCS,
     additional_linker_inputs = JS_INTERFACE_FILES + ["externs.js"],
     # wasm_cc_binary makes the canvaskit.js/canvaskit.wasm based on the actual name
     # of the executable.
-    cc_binary_name = "canvaskit",
     linkopts = CK_OPTS,
     local_defines = CK_DEFINES,
     set_flags = {
+        "disable_tracing": ["True"],
         "include_decoder": [
             "jpeg_decode_codec",
             "png_decode_codec",
@@ -264,14 +335,12 @@ cc_binary_with_flags(
         "include_encoder": [
             "jpeg_encode_codec",
             "png_encode_codec",
+            "webp_encode_codec",
         ],
         # TODO(kjlubick) make this optional, depending on enable_fonts
         "fontmgr_factory": [
             "custom_embedded_fontmgr_factory",
         ],
-        "include_fontmgr": [
-            "custom_embedded_fontmgr",
-        ],
         "gpu_backend": [
             "gl_backend",
         ],
@@ -292,15 +361,28 @@ cc_binary_with_flags(
         "//:skia_core",
     ] + select({
         ":enable_fonts_true": [
-            "//modules/skparagraph:skparagraph",
+            "//modules/skparagraph",
         ],
         ":enable_fonts_false": [],
+    }) + select({
+        ":enable_skottie_true": [
+            "//modules/skottie",
+            "//modules/skottie:utils",
+        ],
+        ":enable_skottie_false": [],
+    }) + select({
+        ":enable_particles_true": [
+            "//modules/particles",
+        ],
+        ":enable_particles_false": [],
     }),
 )
 
 wasm_cc_binary(
     name = "canvaskit_wasm",
-    cc_target = ":canvaskit_with_flags",
+    # Whatever is before the dot will be the name of the output js and wasm, aka "the stem".
+    # https://github.com/emscripten-core/emsdk/blob/82ad00499a42abde16b363239d2bc83bf5d863ab/bazel/emscripten_toolchain/wasm_cc_binary.bzl#L91
+    cc_target = ":canvaskit.with_flags",
 )
 
 bool_flag(
@@ -317,3 +399,33 @@ bool_flag(
     default = True,
     flag_name = "include_embedded_font",
 )
+
+bool_flag(
+    default = True,
+    flag_name = "enable_skottie",
+)
+
+bool_flag(
+    default = True,
+    flag_name = "enable_skp_serialization",
+)
+
+bool_flag(
+    default = True,
+    flag_name = "enable_particles",
+)
+
+bool_flag(
+    default = True,
+    flag_name = "enable_runtime_effect",
+)
+
+bool_flag(
+    default = True,
+    flag_name = "enable_sksl_tracing",
+)
+
+bool_flag(
+    default = True,
+    flag_name = "include_matrix_js",
+)
diff --git a/third_party/skia/modules/canvaskit/BUILD.gn b/third_party/skia/modules/canvaskit/BUILD.gn
index bffa162f5cd3c..58d06d5a3feff 100644
--- a/third_party/skia/modules/canvaskit/BUILD.gn
+++ b/third_party/skia/modules/canvaskit/BUILD.gn
@@ -2,54 +2,357 @@
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
+import("//gn/skia.gni")
+import("//gn/toolchain/wasm.gni")
+import("canvaskit.gni")
 
-component("viewer_wasm") {
-  testonly = true
-  include_dirs = [ "../.." ]
-  sources = [
-    "../../modules/svg/src/SkSVGAttribute.cpp",
-    "../../modules/svg/src/SkSVGAttributeParser.cpp",
-    "../../modules/svg/src/SkSVGCircle.cpp",
-    "../../modules/svg/src/SkSVGClipPath.cpp",
-    "../../modules/svg/src/SkSVGContainer.cpp",
-    "../../modules/svg/src/SkSVGDOM.cpp",
-    "../../modules/svg/src/SkSVGEllipse.cpp",
-    "../../modules/svg/src/SkSVGFe.cpp",
-    "../../modules/svg/src/SkSVGFeColorMatrix.cpp",
-    "../../modules/svg/src/SkSVGFeComposite.cpp",
-    "../../modules/svg/src/SkSVGFeTurbulence.cpp",
-    "../../modules/svg/src/SkSVGFilter.cpp",
-    "../../modules/svg/src/SkSVGFilterContext.cpp",
-    "../../modules/svg/src/SkSVGGradient.cpp",
-    "../../modules/svg/src/SkSVGLine.cpp",
-    "../../modules/svg/src/SkSVGLinearGradient.cpp",
-    "../../modules/svg/src/SkSVGNode.cpp",
-    "../../modules/svg/src/SkSVGPath.cpp",
-    "../../modules/svg/src/SkSVGPattern.cpp",
-    "../../modules/svg/src/SkSVGPoly.cpp",
-    "../../modules/svg/src/SkSVGRadialGradient.cpp",
-    "../../modules/svg/src/SkSVGRect.cpp",
-    "../../modules/svg/src/SkSVGRenderContext.cpp",
-    "../../modules/svg/src/SkSVGSVG.cpp",
-    "../../modules/svg/src/SkSVGShape.cpp",
-    "../../modules/svg/src/SkSVGStop.cpp",
-    "../../modules/svg/src/SkSVGText.cpp",
-    "../../modules/svg/src/SkSVGTransformableNode.cpp",
-    "../../modules/svg/src/SkSVGUse.cpp",
-    "../../modules/svg/src/SkSVGValue.cpp",
-    "../../tools/viewer/SKPSlide.cpp",
-    "../../tools/viewer/SampleSlide.cpp",
-    "../../tools/viewer/SvgSlide.cpp",
+# These targets depend on components that are only declared if
+# `skia_enable_tools` is true.
+if (skia_enable_tools) {
+  component("viewer_wasm") {
+    testonly = true
+    include_dirs = [ "../.." ]
+    sources = [
+      "../../modules/svg/src/SkSVGAttribute.cpp",
+      "../../modules/svg/src/SkSVGAttributeParser.cpp",
+      "../../modules/svg/src/SkSVGCircle.cpp",
+      "../../modules/svg/src/SkSVGClipPath.cpp",
+      "../../modules/svg/src/SkSVGContainer.cpp",
+      "../../modules/svg/src/SkSVGDOM.cpp",
+      "../../modules/svg/src/SkSVGEllipse.cpp",
+      "../../modules/svg/src/SkSVGFe.cpp",
+      "../../modules/svg/src/SkSVGFeColorMatrix.cpp",
+      "../../modules/svg/src/SkSVGFeComposite.cpp",
+      "../../modules/svg/src/SkSVGFeTurbulence.cpp",
+      "../../modules/svg/src/SkSVGFilter.cpp",
+      "../../modules/svg/src/SkSVGFilterContext.cpp",
+      "../../modules/svg/src/SkSVGGradient.cpp",
+      "../../modules/svg/src/SkSVGLine.cpp",
+      "../../modules/svg/src/SkSVGLinearGradient.cpp",
+      "../../modules/svg/src/SkSVGNode.cpp",
+      "../../modules/svg/src/SkSVGPath.cpp",
+      "../../modules/svg/src/SkSVGPattern.cpp",
+      "../../modules/svg/src/SkSVGPoly.cpp",
+      "../../modules/svg/src/SkSVGRadialGradient.cpp",
+      "../../modules/svg/src/SkSVGRect.cpp",
+      "../../modules/svg/src/SkSVGRenderContext.cpp",
+      "../../modules/svg/src/SkSVGSVG.cpp",
+      "../../modules/svg/src/SkSVGShape.cpp",
+      "../../modules/svg/src/SkSVGStop.cpp",
+      "../../modules/svg/src/SkSVGText.cpp",
+      "../../modules/svg/src/SkSVGTransformableNode.cpp",
+      "../../modules/svg/src/SkSVGUse.cpp",
+      "../../modules/svg/src/SkSVGValue.cpp",
+      "../../tools/viewer/SKPSlide.cpp",
+      "../../tools/viewer/SampleSlide.cpp",
+      "../../tools/viewer/SvgSlide.cpp",
+    ]
+    deps = [ "../..:samples" ]
+  }
+
+  component("gm_wasm") {
+    testonly = true
+    include_dirs = [ "../.." ]
+    deps = [
+      "../..:hash_and_encode",
+      "../..:tool_utils",
+      "../../modules/svg:svg",
+    ]
+  }
+}
+
+action("create_notomono_cpp") {
+  script = "../../tools/embed_resources.py"
+
+  inputs = [ "fonts/NotoMono-Regular.ttf" ]
+
+  outputs =
+      [ "$root_out_dir/modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp" ]
+
+  args = [
+    "--name=SK_EMBEDDED_FONTS",
+    "--input",
+    rebase_path("fonts/NotoMono-Regular.ttf"),
+    "--output",
+    "modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp",
+    "--align=4",
   ]
-  deps = [ "../..:samples" ]
 }
 
-component("gm_wasm") {
-  testonly = true
-  include_dirs = [ "../.." ]
-  deps = [
-    "../..:hash_and_encode",
-    "../..:tool_utils",
-    "../../modules/svg:svg",
+skia_wasm_lib("canvaskit") {
+  deps = [ "../..:skia" ]
+  if (skia_canvaskit_enable_paragraph) {
+    deps += [ "../../modules/skparagraph:skparagraph" ]
+  }
+  if (skia_canvaskit_enable_skottie) {
+    deps += [
+      "../../modules/skottie:skottie",
+      "../../modules/sksg:sksg",
+    ]
+  }
+  if (skia_canvaskit_enable_particles) {
+    deps += [ "../../modules/particles:particles" ]
+  }
+  if (skia_canvaskit_enable_skottie || skia_canvaskit_enable_particles) {
+    deps += [ "../../modules/skresources:skresources" ]
+  }
+  if (skia_canvaskit_include_viewer) {
+    deps += [ ":viewer_wasm" ]
+  }
+  if (skia_canvaskit_enable_embedded_font) {
+    deps += [ ":create_notomono_cpp" ]
+  }
+
+  sources = [
+    "WasmCommon.h",
+    "canvaskit_bindings.cpp",
   ]
+  if (skia_canvaskit_enable_paragraph) {
+    sources += [
+      "paragraph_bindings.cpp",
+      "paragraph_bindings_gen.cpp",
+    ]
+  }
+  if (skia_canvaskit_enable_skottie) {
+    sources += [
+      "../../modules/skottie/utils/SkottieUtils.cpp",
+      "skottie_bindings.cpp",
+    ]
+  }
+  if (skia_canvaskit_enable_particles) {
+    sources += [ "particles_bindings.cpp" ]
+  }
+  if (skia_canvaskit_enable_skottie || skia_canvaskit_enable_particles) {
+    sources += [ "../../modules/skresources/src/SkResources.cpp" ]
+  }
+  if (skia_canvaskit_include_viewer) {
+    sources += [ "viewer_bindings.cpp" ]
+  }
+  if (skia_canvaskit_enable_embedded_font) {
+    sources += [
+      "$root_out_dir/modules/canvaskit/fonts/NotoMono-Regular.ttf.ninja.cpp",
+    ]
+  }
+
+  ldflags = []
+  if (is_debug) {
+    ldflags += [
+      "-O0",
+      "-sDEMANGLE_SUPPORT=1",
+      "-sASSERTIONS=1",
+      "-sGL_ASSERTIONS=1",
+      "-g3",
+      "--source-map-base",
+      "/node_modules/canvaskit/bin/",
+      "--pre-js",
+      rebase_path("debug.js"),
+    ]
+  } else {
+    externs_path = rebase_path("externs.js")
+    ldflags += [
+      "-Oz",
+      "--closure=1",
+      "--pre-js",
+      rebase_path("release.js"),
+      "--closure-args=--externs=$externs_path",
+    ]
+  }
+  if (skia_canvaskit_profile_build) {
+    ldflags += [
+      "--profiling-funcs",
+      "--closure=0",
+    ]
+  }
+  ldflags += [ "-fno-rtti" ]
+
+  if (skia_enable_gpu) {
+    ldflags += [
+      "-lGL",
+      "--pre-js",
+      rebase_path("cpu.js"),
+      "--pre-js",
+      rebase_path("gpu.js"),
+      "-sUSE_WEBGL2=1",
+      "-sMAX_WEBGL_VERSION=2",
+    ]
+  } else {
+    ldflags += [
+      "--pre-js",
+      rebase_path("cpu.js"),
+      "-sUSE_WEBGL2=0",
+    ]
+  }
+
+  ldflags += [
+    "-std=c++17",
+    "--bind",
+    "--no-entry",
+    "--pre-js",
+    rebase_path("preamble.js"),
+    "--pre-js",
+    rebase_path("color.js"),
+    "--pre-js",
+    rebase_path("memory.js"),
+    "--pre-js",
+    rebase_path("util.js"),
+    "--pre-js",
+    rebase_path("interface.js"),
+  ]
+
+  if (skia_canvaskit_enable_matrix_helper) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("matrix.js"),
+    ]
+  }
+
+  ldflags += [
+    "--pre-js",
+    rebase_path("paragraph.js"),
+  ]
+
+  if (skia_canvaskit_enable_skottie) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("skottie.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_particles) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("particles.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_pathops) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("pathops.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_font) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("font.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_skp_serialization) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("skp.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_rt_shader) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("rt_shader.js"),
+    ]
+  }
+
+  if (skia_canvaskit_enable_canvas_bindings) {
+    ldflags += [
+      "--pre-js",
+      rebase_path("htmlcanvas/preamble.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/util.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/color.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/font.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/canvas2dcontext.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/htmlcanvas.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/htmlimage.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/imagedata.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/lineargradient.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/path2d.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/pattern.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/radialgradient.js"),
+      "--pre-js",
+      rebase_path("htmlcanvas/postamble.js"),
+    ]
+  }
+
+  ldflags += [
+    "--pre-js",
+    rebase_path("postamble.js"),
+    "-sLLD_REPORT_UNDEFINED",
+    "-sALLOW_MEMORY_GROWTH",
+    "-sUSE_PTHREADS=0",
+    "-sDISABLE_EXCEPTION_CATCHING",
+    "-sNODEJS_CATCH_EXIT=0",
+    "-sDYNAMIC_EXECUTION=0",
+    "-sEXPORT_NAME=CanvasKitInit",
+    "-sEXPORTED_FUNCTIONS=[_malloc,_free]",
+    "-sFORCE_FILESYSTEM=0",
+    "-sFILESYSTEM=0",
+    "-sMODULARIZE",
+    "-sNO_EXIT_RUNTIME=1",
+    "-sINITIAL_MEMORY=128MB",
+    "-sWASM",
+    "-sSTRICT=1",
+  ]
+
+  defines = []
+  if (is_debug) {
+    defines += [ "SK_DEBUG" ]
+  } else {
+    defines += [ "SK_RELEASE" ]
+  }
+  if (!is_debug && !skia_canvaskit_force_tracing) {
+    defines += [ "SK_DISABLE_TRACING" ]
+  }
+  defines += [
+    "SK_DISABLE_AAA",
+    "SK_FORCE_8_BYTE_ALIGNMENT",
+    "EMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0",
+    "SK_HAS_ANDROID_CODEC",
+    "SK_SHAPER_HARFBUZZ_AVAILABLE",
+  ]
+  if (skia_canvaskit_enable_paragraph) {
+    defines += [ "CK_INCLUDE_PARAGRAPH" ]
+  }
+  if (skia_canvaskit_enable_skp_serialization) {
+    defines += [ "CK_SERIALIZE_SKP" ]
+  }
+  if (skia_enable_gpu) {
+    defines += [
+      "SK_SUPPORT_GPU=1",
+      "SK_GL",
+      "SK_DISABLE_LEGACY_SHADERCONTEXT",
+    ]
+  } else {
+    defines += [
+      "SK_SUPPORT_GPU=0",
+      "SK_ENABLE_SKSL",
+    ]
+  }
+
+  if (skia_canvaskit_enable_pathops) {
+    defines += [ "CK_INCLUDE_PATHOPS" ]
+  }
+  if (skia_canvaskit_enable_rt_shader) {
+    defines += [ "CK_INCLUDE_RUNTIME_EFFECT" ]
+  }
+  if (skia_canvaskit_enable_sksl_trace) {
+    defines += [ "CK_INCLUDE_SKSL_TRACE" ]
+  }
+  if (!skia_canvaskit_enable_alias_font) {
+    defines += [ "CANVASKIT_NO_ALIAS_FONT" ]
+  }
+
+  if (!skia_canvaskit_enable_font) {
+    defines += [ "CK_NO_FONTS" ]
+  }
 }
diff --git a/third_party/skia/modules/canvaskit/CHANGELOG.md b/third_party/skia/modules/canvaskit/CHANGELOG.md
index f7ffa6426a7dd..f088dd74b4cab 100644
--- a/third_party/skia/modules/canvaskit/CHANGELOG.md
+++ b/third_party/skia/modules/canvaskit/CHANGELOG.md
@@ -6,6 +6,49 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Breaking
+ - `SkRuntimeEffect.makeShader` and `SkRuntimeEffect.makeShaderWithChildren` no longer accept
+   an `isOpaque` parameter. These functions will now make a best effort to determine if your
+   shader always produces opaque output, and optimize accordingly. If you definitely want your
+   shader to produce opaque output, do so in the shader's SkSL code.
+
+### Added
+ - `SkPicture.makeShader`
+ - Skia now has a GN toolchain that is used to compile CanvasKit. Ideally, all settings should
+   be the same, but there may be some subtle differences in practice. This changes the setup
+   to build CanvasKit (users no longer need to download emsdk themselves).
+
+### Changed
+ - If an invalid matrix type is passed in (e.g. not an array, TypedArray, or DOMMatrix), CanvasKit
+   will throw instead of drawing incorrectly.
+
+## [0.33.0] - 2022-02-03
+
+### Added
+ - `Surface.updateTextureFromSource` prevents flickering on some platforms by re-using the texture
+   for a given `Image` instead of needing to always create a new one via
+   `Surface.makeImageFromTextureSource`. (skbug.com/12723)
+ - `ParagraphBuilder.reset` allows re-use of the underlying memory.
+ - `PathEffect.MakePath2D`, `PathEffect.MakePath1D` and `PathEffect.MakeLine2D`.
+
+### Changed
+ - Surface factories always produce a surface with an attached color space. Specifying `null` to
+   `CanvasKit.MakeWebGLCanvasSurface` or calling any factory that does not take a color space
+   will now create a surface with a color space of `CanvasKit.ColorSpace.SRGB`.
+ - We now build/ship with emscripten 3.1.3.
+ - Internal calls no longer use dynamic dispatch (skbug.com/12795).
+ - JPEG and WEBP encoding are turned on by default in full version (in /bin/full/).
+
+### Fixed
+ - Supplying textures via `Surface.makeImageFromTextureSource` should not cause issues with
+   Mipmaps or other places where Skia needs to create textures (skbug.com/12797)
+ - `CanvasKit.MakeRenderTarget` correctly takes 2 or 3 params, as per the documentation.
+ - `CanvasKit.MakeOnScreenGLSurface` and other gpu surface constructors correctly adjust the
+   underlying WebGL context, avoiding corruption and mismatched textures
+   (https://github.com/flutter/flutter/issues/95259).
+
+## [0.32.0] - 2021-12-15
+
 ### Breaking
  - `Canvas.drawVertices` and `Canvas.drawPatch` treat the default blend mode differently.
    See https://bugs.chromium.org/p/skia/issues/detail?id=12662.
@@ -16,6 +59,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    should use a real shaping library, like SkParagraph.
  - `AnimatedImage.currentFrameDuration` has been added, as well as some clarifying documentation.
 
+### Fixed
+ - Drawing images created from MakeLazyImageFromTextureSource should no longer cause a draw to only
+   partially show up on some frames <https://crbug.com/skia/12740>.
+
 ## [0.31.0] - 2021-11-16
 
 ### Added
diff --git a/third_party/skia/modules/canvaskit/Makefile b/third_party/skia/modules/canvaskit/Makefile
index d3d54f4753d72..a68d568e60bc2 100644
--- a/third_party/skia/modules/canvaskit/Makefile
+++ b/third_party/skia/modules/canvaskit/Makefile
@@ -71,7 +71,8 @@ npm:
 
 	# These features are turned off to keep code size smaller for the
 	# general use case.
-	./compile.sh release no_skottie no_particles no_rt_shader no_alias_font no_effects_deserialization
+	./compile.sh release no_skottie no_particles no_rt_shader no_sksl_trace no_alias_font \
+		no_effects_deserialization no_encode_jpeg no_encode_webp
 	cp ../../out/canvaskit_wasm/canvaskit.js       ./npm_build/bin
 	cp ../../out/canvaskit_wasm/canvaskit.wasm     ./npm_build/bin
 
@@ -93,9 +94,6 @@ gm_tests:
 	cp ../../out/wasm_gm_tests/wasm_gm_tests.wasm     ./out
 
 local-example:
-	rm -rf node_modules/canvaskit
-	mkdir -p node_modules
-	ln -s ../npm_build node_modules/canvaskit
 	echo "Go check out http://localhost:8000/npm_build/example.html"
 	python3 ../../tools/serve_wasm.py
 
@@ -129,19 +127,19 @@ bazel_gms_release:
 	# unit, by letting the cache be used (and not dropped from the sandbox), which gets expensive.
 	# Local testing showed using the local strategy sped up a clean build from 9.5 minutes
 	# to 1 minute. https://docs.bazel.build/versions/main/user-manual.html#strategy-options
-	bazelisk build :gm_bindings_wasm --compilation_mode opt --spawn_strategy=local
+	bazelisk build :wasm_gm_tests --compilation_mode opt --spawn_strategy=local
 	- rm -rf build/
 	mkdir build
-	cp ../../bazel-bin/modules/canvaskit/gm_bindings_wasm/gm_bindings.js build/gm_bindings.js
-	cp ../../bazel-bin/modules/canvaskit/gm_bindings_wasm/gm_bindings.wasm build/gm_bindings.wasm
+	cp ../../bazel-bin/modules/canvaskit/wasm_gm_tests/wasm_gm_tests.js build/wasm_gm_tests.js
+	cp ../../bazel-bin/modules/canvaskit/wasm_gm_tests/wasm_gm_tests.wasm build/wasm_gm_tests.wasm
 
 bazel_gms_debug:
 	# See above note about spawn_strategy
-	bazelisk build :gm_bindings_wasm --compilation_mode dbg --spawn_strategy=local
+	bazelisk build :wasm_gm_tests --compilation_mode dbg --spawn_strategy=local
 	- rm -rf build/
 	mkdir build
-	cp ../../bazel-bin/modules/canvaskit/gm_bindings_wasm/gm_bindings.js build/gm_bindings.js
-	cp ../../bazel-bin/modules/canvaskit/gm_bindings_wasm/gm_bindings.wasm build/gm_bindings.wasm
+	cp ../../bazel-bin/modules/canvaskit/wasm_gm_tests/wasm_gm_tests.js build/wasm_gm_tests.js
+	cp ../../bazel-bin/modules/canvaskit/wasm_gm_tests/wasm_gm_tests.wasm build/wasm_gm_tests.wasm
 
 bazel_canvaskit_debug:
 	# See above note about spawn_strategy
@@ -158,4 +156,4 @@ bazel_canvaskit_release:
 	mkdir build
 	cp ../../bazel-bin/modules/canvaskit/canvaskit_wasm/canvaskit.js build/canvaskit.js
 	cp ../../bazel-bin/modules/canvaskit/canvaskit_wasm/canvaskit.wasm build/canvaskit.wasm
-	ls -l build
\ No newline at end of file
+	ls -l build
diff --git a/third_party/skia/modules/canvaskit/README.md b/third_party/skia/modules/canvaskit/README.md
index 3d5495c1c7b24..127e84b3e55ac 100644
--- a/third_party/skia/modules/canvaskit/README.md
+++ b/third_party/skia/modules/canvaskit/README.md
@@ -4,25 +4,23 @@ Node v14 or later is required to run tests. We use npm (the Node Package Manager
 test dependencies. Recent installations of Node have npm as well.
 CanvasKit has no other external source dependencies.
 
-To compile CanvasKit, you will first need to [install `emscripten`][1].  This
-will set the environment `EMSDK` (among others) which is required for
-compilation. Which version should you use?  [`/infra/wasm-common/docker/emsdk-base/Dockerfile`][2]
-shows the version we build and test with. We try to use as recent a version of emscripten as
-is reasonable.
+## Compiling with GN
+To build with GN, you need to have followed the instructions to download Skia and its deps
+<https://skia.org/user/download>.
 
-[1]: https://emscripten.org/docs/getting_started/downloads.html
-[2]: https://github.com/google/skia/blob/main/infra/wasm-common/docker/emsdk-base/Dockerfile
+To compile CanvasKit, you will first need to [download and activate `emscripten`][1] using the
+script in `//bin/activate-emsdk` (or `//bin/git-sync-deps` which also calls activate-emsdk).
+This places the associated files in `//third_party/externals/emsdk` and the GN[2] build scripts
+will use those by default.
+The compile.sh script automates the default GN settings; users are free to set their own. If users
+want to use their own version of emscripten, they should set the `skia_emsdk_dir` argument
+(see `//skia/gn/toolchain/wasm.gni`). For other available arguments, see
+`//modules/canvaskit/BUILD.gn`.
 
-Be sure to both install **and** activate the correct version. For example:
-```
-    ./emsdk install 2.0.20
-    ./emsdk activate 2.0.20
-```
+[1]: https://emscripten.org/
+[2]: https://chromium.googlesource.com/chromium/src/tools/gn/+/48062805e19b4697c5fbd926dc649c78b6aaa138/README.md
 
-This document also assumes you have followed the instructions to download Skia and its deps
-<https://skia.org/user/download>.
-
-## MacOS specific notes
+### MacOS specific notes
 Make sure you have Python3 installed, otherwise the downloading emscripten toolchain
 can fail with errors about SSL certificates. <https://github.com/emscripten-core/emsdk/pull/273>
 
@@ -61,13 +59,13 @@ make debug
 make test-continuous
 ```
 
-This reads karma.conf.js, and opens a chrome browser and begins running all the test
+This reads karma.conf.js, and opens a Chrome browser and begins running all the test
 in `test/` it will detect changes to the tests in that directory and automatically
-run again, however it will automatically rebuild and reload canvaskit. Closing the
+run again, however it will automatically rebuild and reload CanvasKit. Closing the
 chrome window will just cause it to re-opened. Kill the karma process to stop continuous
 monitoring for changes.
 
-The tests are run with whichever build of canvaskit you last made. be sure to also
+The tests are run with whichever build of CanvasKit you last made. be sure to also
 test with `release`, `debug_cpu`, and `release_cpu`. testing with release builds will
 expose problems in closure compilation and usually forgotten externs.
 
@@ -80,7 +78,7 @@ the results will only be useful when testing a debug build. Open
 ## Measuring Performance
 
 We use puppeteer to run a Chrome browser to gather performance data in a consistent way.
-See //tools/perf-canvaskit-puppeteer for more.
+See `//tools/perf-canvaskit-puppeteer` for more.
 
 ## Adding tests
 
@@ -95,12 +93,12 @@ head.
 
 ## Testing from Gerrit
 
-When submitting a CL in gerrit, click "choose tryjobs" and type canvaskit to filter them.
+When submitting a CL in gerrit, click "choose tryjobs" and type CanvasKit to filter them.
 select all of them, which at the time of this writing is four jobs, for each combination
 of perf/test gpu/cpu.
 
-The performance results are reported to perf.skia.org
-gold results are reported to gold.skia.org
+The performance results are reported to [perf.skia.org] and correctness results are reported to
+[gold.skia.org].
 
 Coverage is not measured while running tests this way.
 
@@ -125,30 +123,17 @@ images used for building and testing.
 This presumes you have updated emscripten locally to a newer version of the
 sdk and verified/fixed any build issues that have arisen.
 
-  1. Edit `$SKIA_ROOT/infra/wasm-common/docker/emsdk-base/Dockerfile` to install
-     and activate the desired version of Emscripten.
-  2. Edit `$SKIA_ROOT/infra/wasm-common/docker/Makefile` to have `EMSDK_VERSION` be
-     set to that desired version. If there is a suffix that is not `_v1`, reset
-     it to be `_v1`. If testing the image later does not work and edits are made
-     to the emsdk-base Dockerfile to correct that, increment to `_v2`,`_v3`, etc
-     to force the bots to pick up the new image.
-  3. In `$SKIA_ROOT/infra/wasm-common/docker/`, run `make publish_emsdk_base`
-  4. Edit `$SKIA_ROOT/infra/canvaskit/docker/canvaskit-emsdk/Dockerfile` to be based
-     off the new version from step 2. CanvasKit has its own docker image because
-     it needs a few extra dependencies to build with font support.
-  5. Edit `$SKIA_ROOT/infra/canvaskit/docker/Makefile` to have the same version
-     from step 2. It's easiest to keep the `emsdk-base` and `canvaskit-emsdk` versions
-     be in lock-step.
-  6. In `$SKIA_ROOT/infra/canvaskit/docker/`, run `make publish_canvaskit_emsdk`.
-  7. In `$SKIA_ROOT/infra/bots/recipe_modules/build/`, update `canvaskit.py`
-     and `pathkit.py` to have `DOCKER_IMAGE` point to the desired tagged Docker
-     containers from steps 2 and 5 (which should be the same).
-  8. In `$SKIA_ROOT/infra/bots/task_drivers/compile_wasm_gm_tests.go`, update dockerImage
-     to refer to the desired Docker containers from steps 2 and 5.
-  9. In `$SKIA_ROOT/infra/bots/`, run `make train` to re-train the recipes.
-  10. Optional: Run something like `git grep 1\\.38\\.` in `$SKIA_ROOT` to see if
-     there are any other references that need updating.
-  11. Upload a CL with all the changes. Run all Test.+CanvasKit, Perf.+Puppeteer,
+  1. Edit `//bin/activate-emsdk` to install and activate the desired version of Emscripten.
+  2. Upload a CL with all the changes. Run all Test.+CanvasKit, Perf.+Puppeteer,
       Test.+PathKit, Perf.+PathKit jobs to make sure the new builds pass all
       tests and don't crash the perf harnesses.
-  12. Send out CL for review. Feel free to point the reviewer at these steps.
+  3. Send out CL for review. Feel free to point the reviewer at these steps.
+
+## Running Skia's GMs and Unit Tests against wasm+WebGL ##
+TODO(kjlubick)
+
+General Tips:
+ - Make use of the skip lists and start indexes in the run-wasm-gm-tests.html to focus in on
+   problematic tests.
+ - `Uncaught (in promise) RuntimeError: function signature mismatch` tends to mean null was
+   dereferenced somewhere. Add SkASSERT to verify.
\ No newline at end of file
diff --git a/third_party/skia/modules/canvaskit/canvaskit.gni b/third_party/skia/modules/canvaskit/canvaskit.gni
new file mode 100644
index 0000000000000..7b5a844421c20
--- /dev/null
+++ b/third_party/skia/modules/canvaskit/canvaskit.gni
@@ -0,0 +1,32 @@
+# Copyright 2022 Google LLC. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+declare_args() {
+  skia_canvaskit_enable_canvas_bindings = true
+  skia_canvaskit_enable_skottie = true
+  skia_canvaskit_enable_pathops = true
+  skia_canvaskit_enable_particles = true
+  skia_canvaskit_enable_rt_shader = true
+  skia_canvaskit_enable_sksl_trace = true
+  skia_canvaskit_enable_alias_font = true
+  skia_canvaskit_enable_skp_serialization = true
+  skia_canvaskit_enable_effects_deserialization = true
+  skia_canvaskit_enable_matrix_helper = true
+  skia_canvaskit_enable_font = true
+  skia_canvaskit_enable_embedded_font = true
+  skia_canvaskit_enable_paragraph = true
+  skia_canvaskit_include_viewer = false
+  skia_canvaskit_force_tracing = false
+  skia_canvaskit_profile_build = false
+}
+
+# Assert that skia_canvaskit_profile_build implies release mode.
+assert(
+    !skia_canvaskit_profile_build || !is_debug,
+    "If you set `skia_canvaskit_profile_build=true` you must set `is_debug=false`.")
+
+# Assert that skia_canvaskit_enable_embedded_font implies skia_canvaskit_enable_font.
+assert(
+    !skia_canvaskit_enable_embedded_font || skia_canvaskit_enable_font,
+    "If you set `skia_canvaskit_enable_embedded_font=true` you must set `skia_canvaskit_enable_font=true`.")
diff --git a/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp b/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
index 3a1b31fe74071..e0570f3afa51b 100644
--- a/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
+++ b/third_party/skia/modules/canvaskit/canvaskit_bindings.cpp
@@ -38,6 +38,8 @@
 #include "include/core/SkTypeface.h"
 #include "include/core/SkTypes.h"
 #include "include/core/SkVertices.h"
+#include "include/effects/Sk1DPathEffect.h"
+#include "include/effects/Sk2DPathEffect.h"
 #include "include/effects/SkCornerPathEffect.h"
 #include "include/effects/SkDashPathEffect.h"
 #include "include/effects/SkDiscretePathEffect.h"
@@ -71,21 +73,25 @@
 #include <webgl/webgl1.h>
 #endif
 
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
 #include "include/core/SkFont.h"
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkFontTypes.h"
-#ifdef SK_INCLUDE_PARAGRAPH
+#ifdef CK_INCLUDE_PARAGRAPH
 #include "modules/skparagraph/include/Paragraph.h"
-#endif // SK_INCLUDE_PARAGRAPH
-#endif // SK_NO_FONTS
+#endif // CK_INCLUDE_PARAGRAPH
+#endif // CK_NO_FONTS
 
-#ifdef SK_INCLUDE_PATHOPS
+#ifdef CK_INCLUDE_PATHOPS
 #include "include/pathops/SkPathOps.h"
 #endif
 
-#ifndef SK_NO_FONTS
+#if defined(CK_INCLUDE_RUNTIME_EFFECT) && defined(CK_INCLUDE_SKSL_TRACE)
+#include "include/sksl/SkSLDebugTrace.h"
+#endif
+
+#ifndef CK_NO_FONTS
 sk_sp<SkFontMgr> SkFontMgr_New_Custom_Data(sk_sp<SkData>* datas, int n);
 #endif
 
@@ -128,7 +134,8 @@ struct SimpleImageInfo {
 };
 
 SkImageInfo toSkImageInfo(const SimpleImageInfo& sii) {
-    return SkImageInfo::Make(sii.width, sii.height, sii.colorType, sii.alphaType, sii.colorSpace);
+    return SkImageInfo::Make(sii.width, sii.height, sii.colorType, sii.alphaType,
+                             sii.colorSpace ? sii.colorSpace : SkColorSpace::MakeSRGB());
 }
 
 #ifdef SK_GL
@@ -179,6 +186,10 @@ sk_sp<SkSurface> MakeOnScreenGLSurface(sk_sp<GrDirectContext> dContext, int widt
     GrGLint stencil;
     emscripten_glGetIntegerv(GL_STENCIL_BITS, &stencil);
 
+    if (!colorSpace) {
+        colorSpace = SkColorSpace::MakeSRGB();
+    }
+
     const auto colorSettings = ColorSettings(colorSpace);
     info.fFormat = colorSettings.pixFormat;
     GrBackendRenderTarget target(width, height, sampleCnt, stencil, info);
@@ -188,7 +199,8 @@ sk_sp<SkSurface> MakeOnScreenGLSurface(sk_sp<GrDirectContext> dContext, int widt
 }
 
 sk_sp<SkSurface> MakeRenderTarget(sk_sp<GrDirectContext> dContext, int width, int height) {
-    SkImageInfo info = SkImageInfo::MakeN32(width, height, SkAlphaType::kPremul_SkAlphaType);
+    SkImageInfo info = SkImageInfo::MakeN32(
+            width, height, SkAlphaType::kPremul_SkAlphaType, SkColorSpace::MakeSRGB());
 
     sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(dContext.get(),
                              SkBudgeted::kYes,
@@ -315,7 +327,7 @@ void ApplyTransform(SkPath& orig,
     orig.transform(m);
 }
 
-#ifdef SK_INCLUDE_PATHOPS
+#ifdef CK_INCLUDE_PATHOPS
 bool ApplySimplify(SkPath& path) {
     return Simplify(path, &path);
 }
@@ -614,7 +626,7 @@ void computeTonalColors(WASMPointerF32 cPtrAmbi, WASMPointerF32 cPtrSpot) {
     memcpy(spotFloats, spot4f.vec(), 4 * sizeof(SkScalar));
 }
 
-#ifdef SK_INCLUDE_RUNTIME_EFFECT
+#ifdef CK_INCLUDE_RUNTIME_EFFECT
 struct RuntimeEffectUniform {
     int columns;
     int rows;
@@ -681,7 +693,7 @@ namespace emscripten {
         void raw_destructor<SkVertices>(SkVertices* ptr) {
         }
 
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
         template<>
         void raw_destructor<SkTextBlob>(SkTextBlob* ptr) {
         }
@@ -747,12 +759,17 @@ class WebGLTextureImageGenerator : public SkImageGenerator {
         }
 
         GrGLTextureInfo glInfo;
+        // This callback is defined in gpu.js
         glInfo.fID     = fCallback.call<uint32_t>("makeTexture");
         // The format and target should match how we make the texture on the JS side
         // See the implementation of the makeTexture function.
         glInfo.fFormat = GR_GL_RGBA8;
         glInfo.fTarget = GR_GL_TEXTURE_2D;
 
+        // In order to bind the image source to the texture, makeTexture has changed which
+        // texture is "in focus" for the WebGL context.
+        GrAsDirectContext(ctx)->resetContext(kTextureBinding_GrGLBackendState);
+
         static constexpr auto kMipmapped = GrMipmapped::kNo;
         GrBackendTexture backendTexture(info.width(), info.height(), kMipmapped, glInfo);
 
@@ -776,7 +793,7 @@ class WebGLTextureImageGenerator : public SkImageGenerator {
             return {};
         }
         static constexpr auto kOrigin = kTopLeft_GrSurfaceOrigin;
-        GrSwizzle swizzle = ctx->priv().caps()->getReadSwizzle(format, colorType);
+        skgpu::Swizzle swizzle = ctx->priv().caps()->getReadSwizzle(format, colorType);
         return GrSurfaceProxyView(std::move(proxy), kOrigin, swizzle);
     }
 
@@ -850,7 +867,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
                               flags, outputBounds);
     }));
 
-#ifdef SK_SERIALIZE_SKP
+#ifdef CK_SERIALIZE_SKP
     function("_MakePicture", optional_override([](WASMPointerU8 dPtr,
                                                   size_t bytes)->sk_sp<SkPicture> {
         uint8_t* d = reinterpret_cast<uint8_t*>(dPtr);
@@ -1051,7 +1068,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
             self.drawOval(*oval, paint);
         }))
         .function("_drawPaint", &SkCanvas::drawPaint)
-#ifdef SK_INCLUDE_PARAGRAPH
+#ifdef CK_INCLUDE_PARAGRAPH
         .function("_drawParagraph", optional_override([](SkCanvas& self, skia::textlayout::Paragraph* p,
                                                         SkScalar x, SkScalar y) {
             p->paint(&self, x, y);
@@ -1107,7 +1124,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
                                       ptrToSkColor4f(spotColorPtr).toSkColor(),
                                       flags);
         }))
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
         .function("_drawSimpleText", optional_override([](SkCanvas& self, WASMPointerU8 sptr,
                                                           size_t len, SkScalar x, SkScalar y, const SkFont& font,
                                                           const SkPaint& paint) {
@@ -1217,7 +1234,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .function("isClosed", &SkContourMeasure::isClosed)
         .function("length", &SkContourMeasure::length);
 
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
     class_<SkFont>("Font")
         .constructor<>()
         .constructor<sk_sp<SkTypeface>>()
@@ -1331,11 +1348,11 @@ EMSCRIPTEN_BINDINGS(Skia) {
 
         return self.makeFromData(fontData);
     }), allow_raw_pointers());
-#endif // SK_NO_FONTS
+#endif // CK_NO_FONTS
 
     class_<SkImage>("Image")
         .smart_ptr<sk_sp<SkImage>>("sk_sp<Image>")
-#if SK_GL
+#ifdef SK_GL
         .class_function("_makeFromGenerator", &MakeImageFromGenerator)
 #endif
         // Note that this needs to be cleaned up with delete().
@@ -1492,12 +1509,27 @@ EMSCRIPTEN_BINDINGS(Skia) {
             const float* intervals = reinterpret_cast<const float*>(cptr);
             return SkDashPathEffect::Make(intervals, count, phase);
         }), allow_raw_pointers())
-        .class_function("MakeDiscrete", &SkDiscretePathEffect::Make);
+        .class_function("MakeDiscrete", &SkDiscretePathEffect::Make)
+        .class_function("_MakeLine2D", optional_override([](SkScalar width,
+                                                            WASMPointerF32 mPtr)->sk_sp<SkPathEffect> {
+            SkMatrix matrix;
+            const SkScalar* nineMatrixValues = reinterpret_cast<const SkScalar*>(mPtr);
+            matrix.set9(nineMatrixValues);
+            return SkLine2DPathEffect::Make(width, matrix);
+        }), allow_raw_pointers())
+        .class_function("MakePath1D", &SkPath1DPathEffect::Make)
+        .class_function("_MakePath2D", optional_override([](WASMPointerF32 mPtr,
+                                                          SkPath path)->sk_sp<SkPathEffect> {
+            SkMatrix matrix;
+            const SkScalar* nineMatrixValues = reinterpret_cast<const SkScalar*>(mPtr);
+            matrix.set9(nineMatrixValues);
+            return SkPath2DPathEffect::Make(matrix, path);
+        }), allow_raw_pointers());
 
     // TODO(kjlubick, reed) Make SkPath immutable and only creatable via a factory/builder.
     class_<SkPath>("Path")
         .constructor<>()
-#ifdef SK_INCLUDE_PATHOPS
+#ifdef CK_INCLUDE_PATHOPS
         .class_function("MakeFromOp", &MakePathFromOp)
 #endif
         .class_function("MakeFromSVGString", &MakePathFromSVGString)
@@ -1574,7 +1606,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .function("_trim", &ApplyTrim)
         .function("_stroke", &ApplyStroke)
 
-#ifdef SK_INCLUDE_PATHOPS
+#ifdef CK_INCLUDE_PATHOPS
         // PathOps
         .function("_simplify", &ApplySimplify)
         .function("_op", &ApplyPathOp)
@@ -1618,7 +1650,14 @@ EMSCRIPTEN_BINDINGS(Skia) {
 
     class_<SkPicture>("Picture")
         .smart_ptr<sk_sp<SkPicture>>("sk_sp<Picture>")
-#ifdef SK_SERIALIZE_SKP
+        .function("_makeShader",  optional_override([](SkPicture& self,
+                                 SkTileMode tmx, SkTileMode tmy, SkFilterMode mode,
+                                 WASMPointerF32 mPtr, WASMPointerF32 rPtr) -> sk_sp<SkShader> {
+            OptionalMatrix localMatrix(mPtr);
+            SkRect* tileRect = reinterpret_cast<SkRect*>(rPtr);
+            return self.makeShader(tmx, tmy, mode, &localMatrix, tileRect);
+        }), allow_raw_pointers())
+#ifdef CK_SERIALIZE_SKP
         // The serialized format of an SkPicture (informally called an "skp"), is not something
         // that clients should ever rely on.  The format may change at anytime and no promises
         // are made for backwards or forward compatibility.
@@ -1760,7 +1799,22 @@ EMSCRIPTEN_BINDINGS(Skia) {
             return nullptr;
         }), allow_raw_pointers());
 
-#ifdef SK_INCLUDE_RUNTIME_EFFECT
+#ifdef CK_INCLUDE_RUNTIME_EFFECT
+#ifdef CK_INCLUDE_SKSL_TRACE
+    class_<SkSL::DebugTrace>("DebugTrace")
+        .smart_ptr<sk_sp<SkSL::DebugTrace>>("sk_sp<DebugTrace>")
+        .function("writeTrace", optional_override([](SkSL::DebugTrace& self) -> std::string {
+            SkDynamicMemoryWStream wstream;
+            self.writeTrace(&wstream);
+            sk_sp<SkData> trace = wstream.detachAsData();
+            return std::string(reinterpret_cast<const char*>(trace->bytes()), trace->size());
+        }));
+
+    value_object<SkRuntimeEffect::TracedShader>("TracedShader")
+        .field("shader",     &SkRuntimeEffect::TracedShader::shader)
+        .field("debugTrace", &SkRuntimeEffect::TracedShader::debugTrace);
+#endif
+
     class_<SkRuntimeEffect>("RuntimeEffect")
         .smart_ptr<sk_sp<SkRuntimeEffect>>("sk_sp<RuntimeEffect>")
         .class_function("_Make", optional_override([](std::string sksl,
@@ -1774,17 +1828,30 @@ EMSCRIPTEN_BINDINGS(Skia) {
             }
             return effect;
         }))
-        .function("_makeShader", optional_override([](SkRuntimeEffect& self, WASMPointerF32 fPtr, size_t fLen, bool isOpaque,
+#ifdef CK_INCLUDE_SKSL_TRACE
+        .class_function("MakeTraced", optional_override([](
+                sk_sp<SkShader> shader,
+                int traceCoordX,
+                int traceCoordY) -> SkRuntimeEffect::TracedShader {
+            return SkRuntimeEffect::MakeTraced(shader, SkIPoint::Make(traceCoordX, traceCoordY));
+        }))
+#endif
+        .function("_makeShader", optional_override([](SkRuntimeEffect& self,
+                                                      WASMPointerF32 fPtr,
+                                                      size_t fLen,
                                                       WASMPointerF32 mPtr)->sk_sp<SkShader> {
             void* inputData = reinterpret_cast<void*>(fPtr);
             castUniforms(inputData, fLen, self);
             sk_sp<SkData> inputs = SkData::MakeFromMalloc(inputData, fLen);
 
             OptionalMatrix localMatrix(mPtr);
-            return self.makeShader(inputs, nullptr, 0, &localMatrix, isOpaque);
+            return self.makeShader(inputs, nullptr, 0, &localMatrix);
         }))
-        .function("_makeShaderWithChildren", optional_override([](SkRuntimeEffect& self, WASMPointerF32 fPtr, size_t fLen, bool isOpaque,
-                                                                  WASMPointerU32 cPtrs, size_t cLen,
+        .function("_makeShaderWithChildren", optional_override([](SkRuntimeEffect& self,
+                                                                  WASMPointerF32 fPtr,
+                                                                  size_t fLen,
+                                                                  WASMPointerU32 cPtrs,
+                                                                  size_t cLen,
                                                                   WASMPointerF32 mPtr)->sk_sp<SkShader> {
             void* inputData = reinterpret_cast<void*>(fPtr);
             castUniforms(inputData, fLen, self);
@@ -1798,7 +1865,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
                 children[i] = sk_ref_sp<SkShader>(childrenPtrs[i]);
             }
             OptionalMatrix localMatrix(mPtr);
-            auto s = self.makeShader(inputs, children, cLen, &localMatrix, isOpaque);
+            auto s = self.makeShader(inputs, children, cLen, &localMatrix);
             delete[] children;
             return s;
         }))
@@ -1884,6 +1951,9 @@ EMSCRIPTEN_BINDINGS(Skia) {
             auto backendRT = self.getBackendRenderTarget(SkSurface::kFlushRead_BackendHandleAccess);
             return (backendRT.isValid()) ? backendRT.sampleCnt() : 0;
         }))
+        .function("_resetContext",optional_override([](SkSurface& self)->void {
+            GrAsDirectContext(self.recordingContext())->resetContext(kTextureBinding_GrGLBackendState);
+        }))
 #else
         .function("reportBackendTypeIsGPU", optional_override([](SkSurface& self) -> bool {
             return false;
@@ -1891,7 +1961,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
 #endif
         .function("width", &SkSurface::width);
 
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
     class_<SkTextBlob>("TextBlob")
         .smart_ptr<sk_sp<SkTextBlob>>("sk_sp<TextBlob>")
         .class_function("_MakeFromRSXform", optional_override([](WASMPointerU8 sptr,
@@ -2055,7 +2125,12 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .value("Fill",            SkPaint::Style::kFill_Style)
         .value("Stroke",          SkPaint::Style::kStroke_Style);
 
-#ifdef SK_INCLUDE_PATHOPS
+    enum_<SkPath1DPathEffect::Style>("Path1DEffect")
+        .value("Translate", SkPath1DPathEffect::Style::kTranslate_Style)
+        .value("Rotate",    SkPath1DPathEffect::Style::kRotate_Style)
+        .value("Morph",     SkPath1DPathEffect::Style::kMorph_Style);
+
+#ifdef CK_INCLUDE_PATHOPS
     enum_<SkPathOp>("PathOp")
         .value("Difference",         SkPathOp::kDifference_SkPathOp)
         .value("Intersect",          SkPathOp::kIntersect_SkPathOp)
@@ -2079,7 +2154,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
         .value("Round", SkPaint::Join::kRound_Join)
         .value("Bevel", SkPaint::Join::kBevel_Join);
 
-#ifndef SK_NO_FONTS
+#ifndef CK_NO_FONTS
     enum_<SkFontHinting>("FontHinting")
         .value("None",   SkFontHinting::kNone)
         .value("Slight", SkFontHinting::kSlight)
@@ -2137,7 +2212,7 @@ EMSCRIPTEN_BINDINGS(Skia) {
     constant("ShadowGeometricOnly", (int)SkShadowFlags::kGeometricOnly_ShadowFlag);
     constant("ShadowDirectionalLight", (int)SkShadowFlags::kDirectionalLight_ShadowFlag);
 
-#ifdef SK_INCLUDE_PARAGRAPH
+#ifdef CK_INCLUDE_PARAGRAPH
     constant("_GlyphRunFlags_isWhiteSpace", (int)skia::textlayout::Paragraph::kWhiteSpace_VisitorFlag);
 #endif
 }
diff --git a/third_party/skia/modules/canvaskit/compile.sh b/third_party/skia/modules/canvaskit/compile.sh
index 7832bf07f5e47..c83bf7932aba2 100755
--- a/third_party/skia/modules/canvaskit/compile.sh
+++ b/third_party/skia/modules/canvaskit/compile.sh
@@ -6,200 +6,126 @@
 
 set -ex
 
-BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
-# This expects the environment variable EMSDK to be set
-if [[ ! -d $EMSDK ]]; then
-  cat >&2 << "EOF"
-Be sure to set the EMSDK environment variable to the location of Emscripten SDK:
-
-    https://emscripten.org/docs/getting_started/downloads.html
-EOF
-  exit 1
-fi
-
 # Navigate to SKIA_HOME from where this file is located.
+BASE_DIR=`cd $(dirname ${BASH_SOURCE[0]}) && pwd`
 pushd $BASE_DIR/../..
+./bin/fetch-gn
 
-source $EMSDK/emsdk_env.sh
-EMCC=`which emcc`
-EMCXX=`which em++`
-EMAR=`which emar`
-
-RELEASE_CONF="-Oz --closure 1 -DSK_RELEASE --pre-js $BASE_DIR/release.js"
-EXTRA_CFLAGS="\"-DSK_RELEASE\","
 IS_OFFICIAL_BUILD="true"
-
+IS_DEBUG="false"
+FORCE_TRACING="false"
+PROFILE_BUILD="false"
 # Tracing will be disabled in release/profiling unless this flag is seen. Tracing will
 # be on debug builds always.
 if [[ $@ != *force_tracing* ]] ; then
-  RELEASE_CONF+=" -DSK_DISABLE_TRACING"
-  EXTRA_CFLAGS+="\"-DSK_DISABLE_TRACING\","
+  FORCE_TRACING="true"
 fi
 
 if [[ $@ == *debug* ]]; then
   echo "Building a Debug build"
-  EXTRA_CFLAGS="\"-DSK_DEBUG\","
-  RELEASE_CONF="-O0 --js-opts 0 -s DEMANGLE_SUPPORT=1 -s ASSERTIONS=1 -s GL_ASSERTIONS=1 -g3 \
-                --source-map-base /node_modules/canvaskit/bin/ -DSK_DEBUG --pre-js $BASE_DIR/debug.js"
+  IS_DEBUG="true"
+  IS_OFFICIAL_BUILD="false"
   BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm_debug"}
 elif [[ $@ == *profiling* ]]; then
   echo "Building a build for profiling"
-  RELEASE_CONF+=" --profiling-funcs --closure 0"
+  PROFILE_BUILD="true"
   BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm_profile"}
-elif [[ $@ == *simd* ]]; then
-  echo "Building with SIMD operations"
-  BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm_experimental_simd"}
 else
   BUILD_DIR=${BUILD_DIR:="out/canvaskit_wasm"}
 fi
 
-if [[ $@ == *simd* ]]; then
-  RELEASE_CONF+=" -msimd128"
-  EXTRA_CFLAGS+="\"-msimd128\","
-fi
-
 mkdir -p $BUILD_DIR
 # sometimes the .a files keep old symbols around - cleaning them out makes sure
 # we get a fresh build.
 rm -f $BUILD_DIR/*.a
 
-GN_GPU="skia_enable_gpu=true skia_gl_standard = \"webgl\""
-GN_GPU_FLAGS="\"-DSK_DISABLE_LEGACY_SHADERCONTEXT\","
-WASM_GPU="-lGL -DSK_SUPPORT_GPU=1 -DSK_GL \
-          -DSK_DISABLE_LEGACY_SHADERCONTEXT --pre-js $BASE_DIR/cpu.js --pre-js $BASE_DIR/gpu.js\
-          -s USE_WEBGL2=1"
+ENABLE_GPU="true"
 if [[ $@ == *cpu* ]]; then
   echo "Using the CPU backend instead of the GPU backend"
-  GN_GPU="skia_enable_gpu=false"
-  GN_GPU_FLAGS=""
-  WASM_GPU="-DSK_SUPPORT_GPU=0 -DSK_ENABLE_SKSL --pre-js $BASE_DIR/cpu.js -s USE_WEBGL2=0"
+  ENABLE_GPU="false"
 fi
 
-SKP_JS="--pre-js $BASE_DIR/skp.js"
-GN_SKP_FLAGS=""
-WASM_SKP="-DSK_SERIALIZE_SKP"
+SERIALIZE_SKP="true"
 if [[ $@ == *no_skp_serialization* ]]; then
   # This saves about 20kb compressed.
-  SKP_JS=""
-  WASM_SKP=""
-  GN_SKP_FLAGS="\"-DSK_DISABLE_EFFECT_DESERIALIZATION\","
+  echo "disabling SKP serialization"
+  SERIALIZE_SKP="false"
 fi
+DESERIALIZE_EFFECTS="true"
 if [[ $@ == *no_effects_deserialization* ]]; then
   # This saves about 60kb compressed.
   echo "disabling effects deserialization"
-  GN_SKP_FLAGS="\"-DSK_DISABLE_EFFECT_DESERIALIZATION\","
+  DESERIALIZE_EFFECTS="false"
 fi
 
-SKOTTIE_JS="--pre-js $BASE_DIR/skottie.js"
-SKOTTIE_BINDINGS="$BASE_DIR/skottie_bindings.cpp"
-
-SKOTTIE_LIB="$BUILD_DIR/libskottie.a \
-             $BUILD_DIR/libsksg.a"
-
+ENABLE_SKOTTIE="true"
 if [[ $@ == *no_skottie* ]]; then
   echo "Omitting Skottie"
-  SKOTTIE_JS=""
-  SKOTTIE_LIB=""
-  SKOTTIE_BINDINGS=""
+  ENABLE_SKOTTIE="false"
 fi
 
-GN_VIEWER="skia_use_expat=false"
-VIEWER_BINDINGS=""
-VIEWER_LIB=""
-
+INCLUDE_VIEWER="false"
+USE_EXPAT="false"
 if [[ $@ == *viewer* ]]; then
   echo "Including viewer"
-  GN_VIEWER="skia_use_expat=true"
-  VIEWER_BINDINGS="$BASE_DIR/viewer_bindings.cpp"
-  VIEWER_LIB="$BUILD_DIR/libviewer_wasm.a"
+  INCLUDE_VIEWER="true"
+  USE_EXPAT="true"
   IS_OFFICIAL_BUILD="false"
 fi
 
-MANAGED_SKOTTIE_BINDINGS="\
-  -DSK_INCLUDE_MANAGED_SKOTTIE=1 \
-  modules/skottie/utils/SkottieUtils.cpp"
-if [[ $@ == *no_managed_skottie* || $@ == *no_skottie* ]]; then
-  echo "Omitting managed Skottie"
-  MANAGED_SKOTTIE_BINDINGS="-DSK_INCLUDE_MANAGED_SKOTTIE=0"
-fi
-
-PARTICLES_JS="--pre-js $BASE_DIR/particles.js"
-PARTICLES_BINDINGS="$BASE_DIR/particles_bindings.cpp"
-PARTICLES_LIB="$BUILD_DIR/libparticles.a"
-
+ENABLE_PARTICLES="true"
 if [[ $@ == *no_particles* ]]; then
   echo "Omitting Particles"
-  PARTICLES_JS=""
-  PARTICLES_BINDINGS=""
-  PARTICLES_LIB=""
-fi
-
-if [[ $@ != *no_particles* || $@ != *no_skottie* ]] ; then
-  PARTICLES_BINDINGS+=" modules/skresources/src/SkResources.cpp"
+  ENABLE_PARTICLES="false"
 fi
 
-WASM_PATHOPS="-DSK_INCLUDE_PATHOPS"
-PATHOPS_JS="--pre-js $BASE_DIR/pathops.js"
+ENABLE_PATHOPS="true"
 if [[ $@ == *no_pathops* ]] ; then
   # This saves about 2kb compressed.
-  WASM_PATHOPS=""
-  PATHOPS_JS=""
+  echo "Omitting PathOps"
+  ENABLE_PATHOPS="false"
 fi
 
-WASM_RT_SHADER="-DSK_INCLUDE_RUNTIME_EFFECT"
-RT_SHADER_JS="--pre-js $BASE_DIR/rt_shader.js"
+ENABLE_RT_SHADER="true"
 if [[ $@ == *no_rt_shader* ]] ; then
-  WASM_RT_SHADER=""
-  RT_SHADER_JS=""
+  echo "Omitting runtime shaders"
+  ENABLE_RT_SHADER="false"
+fi
+
+ENABLE_SKSL_TRACE="true"
+if [[ $@ == *no_sksl_trace* ]] ; then
+  echo "Omitting SkSl trace"
+  ENABLE_SKSL_TRACE="false"
 fi
 
-MATRIX_HELPER_JS="--pre-js $BASE_DIR/matrix.js"
+ENABLE_MATRIX="true"
 if [[ $@ == *no_matrix* ]]; then
   echo "Omitting matrix helper code"
-  MATRIX_HELPER_JS=""
+  ENABLE_MATRIX="false"
 fi
 
-HTML_CANVAS_API="--pre-js $BASE_DIR/htmlcanvas/preamble.js \
---pre-js $BASE_DIR/htmlcanvas/util.js \
---pre-js $BASE_DIR/htmlcanvas/color.js \
---pre-js $BASE_DIR/htmlcanvas/font.js \
---pre-js $BASE_DIR/htmlcanvas/canvas2dcontext.js \
---pre-js $BASE_DIR/htmlcanvas/htmlcanvas.js \
---pre-js $BASE_DIR/htmlcanvas/htmlimage.js \
---pre-js $BASE_DIR/htmlcanvas/imagedata.js \
---pre-js $BASE_DIR/htmlcanvas/lineargradient.js \
---pre-js $BASE_DIR/htmlcanvas/path2d.js \
---pre-js $BASE_DIR/htmlcanvas/pattern.js \
---pre-js $BASE_DIR/htmlcanvas/radialgradient.js \
---pre-js $BASE_DIR/htmlcanvas/postamble.js "
+ENABLE_CANVAS="true"
 if [[ $@ == *no_canvas* || $@ == *no_matrix* ]]; then
   # Note: HTML Canvas bindings depend on the matrix helpers.
   echo "Omitting bindings for HTML Canvas API"
-  HTML_CANVAS_API=""
+  ENABLE_CANVAS="false"
 fi
 
 GN_FONT="skia_enable_fontmgr_custom_directory=false "
 WOFF2_FONT="skia_use_freetype_woff2=true"
-FONT_CFLAGS=""
-BUILTIN_FONT=""
-FONT_JS="--pre-js $BASE_DIR/font.js"
+ENABLE_FONT="true"
+ENABLE_EMBEDDED_FONT="true"
 if [[ $@ == *no_font* ]]; then
   echo "Omitting the built-in font(s), font manager and all code dealing with fonts"
-  FONT_CFLAGS="-DSK_NO_FONTS"
-  WOFF2_FONT=""
-  FONT_JS=""
+  ENABLE_FONT="false"
+  ENABLE_EMBEDDED_FONT="false"
   GN_FONT+="skia_enable_fontmgr_custom_embedded=false skia_enable_fontmgr_custom_empty=false"
 elif [[ $@ == *no_embedded_font* ]]; then
   echo "Omitting the built-in font(s)"
+  ENABLE_EMBEDDED_FONT="false"
   GN_FONT+="skia_enable_fontmgr_custom_embedded=false skia_enable_fontmgr_custom_empty=true"
 else
   # Generate the font's binary file (which is covered by .gitignore)
-  python tools/embed_resources.py \
-      --name SK_EMBEDDED_FONTS \
-      --input $BASE_DIR/fonts/NotoMono-Regular.ttf \
-      --output $BASE_DIR/fonts/NotoMono-Regular.ttf.cpp \
-      --align 4
-  BUILTIN_FONT="$BASE_DIR/fonts/NotoMono-Regular.ttf.cpp"
   GN_FONT+="skia_enable_fontmgr_custom_embedded=true skia_enable_fontmgr_custom_empty=false"
 fi
 
@@ -207,32 +133,21 @@ if [[ $@ == *no_woff2* ]]; then
   WOFF2_FONT="skia_use_freetype_woff2=false"
 fi
 
+ENABLE_ALIAS_FONT="true"
 if [[ $@ == *no_alias_font* ]]; then
-EXTRA_CFLAGS+="\"-DCANVASKIT_NO_ALIAS_FONT\","
-FONT_CFLAGS+=" -DCANVASKIT_NO_ALIAS_FONT"
+  ENABLE_ALIAS_FONT="false"
 fi
 
 GN_SHAPER="skia_use_icu=true skia_use_system_icu=false skia_use_harfbuzz=true skia_use_system_harfbuzz=false"
-SHAPER_LIB="$BUILD_DIR/libskunicode.a \
-            $BUILD_DIR/libharfbuzz.a \
-            $BUILD_DIR/libicu.a"
 if [[ $@ == *primitive_shaper* ]] || [[ $@ == *no_font* ]]; then
   echo "Using the primitive shaper instead of the harfbuzz/icu one"
   GN_SHAPER="skia_use_icu=false skia_use_harfbuzz=false"
-  SHAPER_LIB=""
 fi
 
-PARAGRAPH_JS="--pre-js $BASE_DIR/paragraph.js"
-PARAGRAPH_LIB="$BUILD_DIR/libskparagraph.a"
-PARAGRAPH_BINDINGS="-DSK_INCLUDE_PARAGRAPH=1 \
-  $BASE_DIR/paragraph_bindings.cpp \
-  $BASE_DIR/paragraph_bindings_gen.cpp"
-
+ENABLE_PARAGRAPH="true"
 if [[ $@ == *no_paragraph* ]] || [[ $@ == *primitive_shaper* ]] || [[ $@ == *no_font* ]]; then
   echo "Omitting paragraph (must have fonts and non-primitive shaper)"
-  PARAGRAPH_JS=""
-  PARAGRAPH_LIB=""
-  PARAGRAPH_BINDINGS=""
+  ENABLE_PARAGRAPH="false"
 fi
 
 DO_DECODE="true"
@@ -249,14 +164,14 @@ else
     ENCODE_PNG="false"
   fi
 
-  ENCODE_JPEG="false"
-  if [[ $@ == *force_encode_jpeg* ]]; then
-    ENCODE_JPEG="true"
+  ENCODE_JPEG="true"
+  if [[ $@ == *no_encode_jpeg* ]]; then
+    ENCODE_JPEG="false"
   fi
 
-  ENCODE_WEBP="false"
-  if [[ $@ == *force_encode_webp* ]]; then
-    ENCODE_WEBP="true"
+  ENCODE_WEBP="true"
+  if [[ $@ == *no_encode_webp* ]]; then
+    ENCODE_WEBP="false"
   fi
 
 fi # no_codecs
@@ -271,23 +186,10 @@ fi
 # Re-enable error checking
 set -e
 
-./bin/fetch-gn
-
-echo "Compiling bitcode"
+echo "Compiling"
 
-# Inspired by https://github.com/Zubnix/skia-wasm-port/blob/master/build_bindings.sh
 ./bin/gn gen ${BUILD_DIR} \
-  --args="cc=\"${EMCC}\" \
-  cxx=\"${EMCXX}\" \
-  ar=\"${EMAR}\" \
-  extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\", \"-s\", \"MAIN_MODULE=1\",
-    \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",
-    \"-DSK_FORCE_8_BYTE_ALIGNMENT\",
-    ${GN_GPU_FLAGS}
-    ${GN_SKP_FLAGS}
-    ${EXTRA_CFLAGS}
-  ] \
-  is_debug=false \
+  --args="is_debug=${IS_DEBUG} \
   is_official_build=${IS_OFFICIAL_BUILD} \
   is_component_build=false \
   werror=true \
@@ -296,6 +198,7 @@ echo "Compiling bitcode"
   skia_use_angle=false \
   skia_use_dng_sdk=false \
   skia_use_webgl=true \
+  skia_use_expat=${USE_EXPAT} \
   skia_use_fontconfig=false \
   skia_use_freetype=true \
   skia_use_libheif=false \
@@ -315,97 +218,30 @@ echo "Compiling bitcode"
   skia_use_vulkan=false \
   skia_use_wuffs=true \
   skia_use_zlib=true \
+  skia_enable_gpu=${ENABLE_GPU} \
   \
   ${GN_SHAPER} \
-  ${GN_GPU} \
   ${GN_FONT} \
   ${WOFF2_FONT} \
-  ${GN_VIEWER} \
   \
   skia_enable_skshaper=true \
   skia_enable_skparagraph=true \
-  skia_enable_pdf=false"
-
-# Build all the libs we will need below
-parse_targets() {
-  for LIBPATH in $@; do
-    basename $LIBPATH
-  done
-}
-${NINJA} -C ${BUILD_DIR} libskia.a libskshaper.a \
-  $(parse_targets $SKOTTIE_LIB $VIEWER_LIB $PARTICLES_LIB $SHAPER_LIB $PARAGRAPH_LIB)
-
-export EMCC_CLOSURE_ARGS="--externs $BASE_DIR/externs.js "
-
-echo "Generating final wasm"
-
-# Disable '-s STRICT=1' outside of Linux until
-# https://github.com/emscripten-core/emscripten/issues/12118 is resovled.
-STRICTNESS="-s STRICT=1"
-if [[ `uname` != "Linux" ]]; then
-  echo "Disabling '-s STRICT=1'. See: https://github.com/emscripten-core/emscripten/issues/12118"
-  STRICTNESS=""
-fi
-
-# Emscripten prefers that the .a files go last in order, otherwise, it
-# may drop symbols that it incorrectly thinks aren't used. One day,
-# Emscripten will use LLD, which may relax this requirement.
-EMCC_DEBUG=1 ${EMCXX} \
-    $RELEASE_CONF \
-    -I. \
-    -Ithird_party/icu \
-    -Ithird_party/skcms \
-    -Ithird_party/externals/icu/source/common/ \
-    -DSK_DISABLE_AAA \
-    -DSK_FORCE_8_BYTE_ALIGNMENT \
-    -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
-    -fno-rtti \
-    $WASM_GPU \
-    $WASM_PATHOPS \
-    $WASM_RT_SHADER \
-    $WASM_SKP \
-    $FONT_CFLAGS \
-    -std=c++17 \
-    --bind \
-    --no-entry \
-    --pre-js $BASE_DIR/preamble.js \
-    --pre-js $BASE_DIR/color.js \
-    --pre-js $BASE_DIR/memory.js \
-    --pre-js $BASE_DIR/util.js \
-    --pre-js $BASE_DIR/interface.js \
-    $MATRIX_HELPER_JS \
-    $PARAGRAPH_JS \
-    $SKOTTIE_JS \
-    $PARTICLES_JS \
-    $PATHOPS_JS \
-    $FONT_JS \
-    $SKP_JS \
-    $RT_SHADER_JS \
-    $HTML_CANVAS_API \
-    --pre-js $BASE_DIR/postamble.js \
-    $BASE_DIR/canvaskit_bindings.cpp \
-    $PARTICLES_BINDINGS \
-    $SKOTTIE_BINDINGS \
-    $VIEWER_BINDINGS \
-    $MANAGED_SKOTTIE_BINDINGS \
-    $PARAGRAPH_BINDINGS \
-    $SKOTTIE_LIB \
-    $VIEWER_LIB \
-    $PARTICLES_LIB \
-    $PARAGRAPH_LIB \
-    $BUILD_DIR/libskshaper.a \
-    $SHAPER_LIB \
-    $BUILD_DIR/libskia.a \
-    $BUILTIN_FONT \
-    -s LLD_REPORT_UNDEFINED \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s EXPORT_NAME="CanvasKitInit" \
-    -s EXPORTED_FUNCTIONS=['_malloc','_free'] \
-    -s FORCE_FILESYSTEM=0 \
-    -s FILESYSTEM=0 \
-    -s MODULARIZE=1 \
-    -s NO_EXIT_RUNTIME=1 \
-    -s INITIAL_MEMORY=128MB \
-    -s WASM=1 \
-    $STRICTNESS \
-    -o $BUILD_DIR/canvaskit.js
+  skia_enable_pdf=false \
+  skia_canvaskit_force_tracing=${FORCE_TRACING} \
+  skia_canvaskit_profile_build=${PROFILE_BUILD} \
+  skia_canvaskit_enable_skp_serialization=${SERIALIZE_SKP} \
+  skia_canvaskit_enable_effects_deserialization=${DESERIALIZE_EFFECTS} \
+  skia_canvaskit_enable_skottie=${ENABLE_SKOTTIE} \
+  skia_canvaskit_include_viewer=${INCLUDE_VIEWER} \
+  skia_canvaskit_enable_particles=${ENABLE_PARTICLES} \
+  skia_canvaskit_enable_pathops=${ENABLE_PATHOPS} \
+  skia_canvaskit_enable_rt_shader=${ENABLE_RT_SHADER} \
+  skia_canvaskit_enable_sksl_trace=${ENABLE_SKSL_TRACE} \
+  skia_canvaskit_enable_matrix_helper=${ENABLE_MATRIX} \
+  skia_canvaskit_enable_canvas_bindings=${ENABLE_CANVAS} \
+  skia_canvaskit_enable_font=${ENABLE_FONT} \
+  skia_canvaskit_enable_embedded_font=${ENABLE_EMBEDDED_FONT} \
+  skia_canvaskit_enable_alias_font=${ENABLE_ALIAS_FONT} \
+  skia_canvaskit_enable_paragraph=${ENABLE_PARAGRAPH}"
+
+${NINJA} -C ${BUILD_DIR} canvaskit.js
diff --git a/third_party/skia/modules/canvaskit/compile_gm.sh b/third_party/skia/modules/canvaskit/compile_gm.sh
index 820152ac67a62..4a27fe398fe2a 100755
--- a/third_party/skia/modules/canvaskit/compile_gm.sh
+++ b/third_party/skia/modules/canvaskit/compile_gm.sh
@@ -21,15 +21,13 @@ fi
 pushd $BASE_DIR/../..
 
 source $EMSDK/emsdk_env.sh
-EMCC=`which emcc`
 EMCXX=`which em++`
-EMAR=`which emar`
 
 if [[ $@ == *debug* ]]; then
   echo "Building a Debug build"
   DEBUG=true
   EXTRA_CFLAGS="\"-DSK_DEBUG\", \"-DGR_TEST_UTILS\", "
-  RELEASE_CONF="-O1 --js-opts 0 -s DEMANGLE_SUPPORT=1 -frtti -s ASSERTIONS=1 -s GL_ASSERTIONS=1 -g \
+  RELEASE_CONF="-O1 --js-opts 0 -sDEMANGLE_SUPPORT=1 -frtti -sASSERTIONS=1 -sGL_ASSERTIONS=1 -g \
                 -DSK_DEBUG --pre-js $BASE_DIR/debug.js"
   BUILD_DIR=${BUILD_DIR:="out/wasm_gm_tests_debug"}
 else
@@ -52,7 +50,7 @@ GN_GPU="skia_enable_gpu=true skia_gl_standard = \"webgl\""
 GN_GPU_FLAGS="\"-DSK_DISABLE_LEGACY_SHADERCONTEXT\","
 WASM_GPU="-lGL -DSK_SUPPORT_GPU=1 -DSK_GL \
           -DSK_DISABLE_LEGACY_SHADERCONTEXT --pre-js $BASE_DIR/cpu.js --pre-js $BASE_DIR/gpu.js\
-          -s USE_WEBGL2=1"
+          -sUSE_WEBGL2=1"
 
 GM_LIB="$BUILD_DIR/libgm_wasm.a"
 
@@ -85,11 +83,9 @@ echo "Compiling bitcode"
 
 # Inspired by https://github.com/Zubnix/skia-wasm-port/blob/master/build_bindings.sh
 ./bin/gn gen ${BUILD_DIR} \
-  --args="cc=\"${EMCC}\" \
-  cxx=\"${EMCXX}\" \
-  ar=\"${EMAR}\" \
+  --args="skia_emsdk_dir=\"${EMSDK}\" \
   extra_cflags_cc=[\"-frtti\"] \
-  extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\", \"-s\", \"MAIN_MODULE=1\",
+  extra_cflags=[\"-sMAIN_MODULE=1\",
     \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",
     \"-DSK_FORCE_8_BYTE_ALIGNMENT\",
     ${GN_GPU_FLAGS}
@@ -161,14 +157,6 @@ SKIA_DEFINES="
 -DSK_UNICODE_AVAILABLE \
 -DSK_ENABLE_SVG"
 
-# Disable '-s STRICT=1' outside of Linux until
-# https://github.com/emscripten-core/emscripten/issues/12118 is resovled.
-STRICTNESS="-s STRICT=1"
-if [[ `uname` != "Linux" ]]; then
-  echo "Disabling '-s STRICT=1'. See: https://github.com/emscripten-core/emscripten/issues/12118"
-  STRICTNESS=""
-fi
-
 GMS_TO_BUILD="gm/*.cpp"
 TESTS_TO_BUILD="tests/*.cpp"
 
@@ -184,7 +172,6 @@ GLOBIGNORE="gm/cgms.cpp:"\
 "gm/compressed_textures.cpp:"\
 "gm/fiddle.cpp:"\
 "gm/particles.cpp:"\
-"gm/xform.cpp:"\
 "gm/video_decoder.cpp:"
 
 # These tests do not compile with the WASM code (require other deps).
@@ -234,15 +221,15 @@ EMCC_DEBUG=1 ${EMCXX} \
     $BUILD_DIR/libsvg.a \
     $BUILD_DIR/libskia.a \
     $BUILTIN_FONT \
-    -s LLD_REPORT_UNDEFINED \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s EXPORT_NAME="InitWasmGMTests" \
-    -s EXPORTED_FUNCTIONS=['_malloc','_free'] \
-    -s FORCE_FILESYSTEM=1 \
-    -s FILESYSTEM=1 \
-    -s MODULARIZE=1 \
-    -s NO_EXIT_RUNTIME=1 \
-    -s INITIAL_MEMORY=256MB \
-    -s WASM=1 \
-    $STRICTNESS \
+    -sLLD_REPORT_UNDEFINED \
+    -sALLOW_MEMORY_GROWTH=1 \
+    -sEXPORT_NAME="InitWasmGMTests" \
+    -sEXPORTED_FUNCTIONS=['_malloc','_free'] \
+    -sFORCE_FILESYSTEM=1 \
+    -sFILESYSTEM=1 \
+    -sMODULARIZE=1 \
+    -sNO_EXIT_RUNTIME=1 \
+    -sINITIAL_MEMORY=256MB \
+    -sWASM=1 \
+    -sSTRICT=1 \
     -o $BUILD_DIR/wasm_gm_tests.js
diff --git a/third_party/skia/modules/canvaskit/externs.js b/third_party/skia/modules/canvaskit/externs.js
index e23e1b1eb8c5a..dcb9efbde83e0 100644
--- a/third_party/skia/modules/canvaskit/externs.js
+++ b/third_party/skia/modules/canvaskit/externs.js
@@ -154,6 +154,7 @@ var CanvasKit = {
     addText: function() {},
     build: function() {},
     pop: function() {},
+    reset: function() {},
 
     prototype: {
       pushStyle: function() {},
@@ -501,9 +502,14 @@ var CanvasKit = {
     MakeCorner: function() {},
     MakeDash: function() {},
     MakeDiscrete: function() {},
+    MakePath1D: function() {},
+    MakeLine2D: function() {},
+    MakePath2D: function() {},
 
     // Private C++ API
     _MakeDash: function() {},
+    _MakeLine2D: function() {},
+    _MakePath2D: function() {},
   },
 
   ParticleEffect: {
@@ -627,6 +633,10 @@ var CanvasKit = {
 
   Picture: {
     serialize: function() {},
+    prototype: {
+      makeShader: function() {},
+    },
+    _makeShader: function() {},
   },
 
   PictureRecorder: {
@@ -674,6 +684,7 @@ var CanvasKit = {
       /** @return {CanvasKit.Image} */
       makeImageSnapshot: function() {},
       makeSurface: function() {},
+      updateTextureFromSource: function() {},
     },
 
     // private API
@@ -683,6 +694,7 @@ var CanvasKit = {
     _makeImageSnapshot: function() {},
     _makeSurface: function() {},
     _makeRasterDirect: function() {},
+    _resetContext: function() {},
     delete: function() {},
   },
 
diff --git a/third_party/skia/modules/canvaskit/gpu.js b/third_party/skia/modules/canvaskit/gpu.js
index cd11cdabdbd95..c50d9af130707 100644
--- a/third_party/skia/modules/canvaskit/gpu.js
+++ b/third_party/skia/modules/canvaskit/gpu.js
@@ -79,6 +79,9 @@
       }
 
       CanvasKit.MakeOnScreenGLSurface = function(grCtx, w, h, colorspace) {
+        if (!this.setCurrentContext(grCtx._context)) {
+          return null;
+        }
         var surface = this._MakeOnScreenGLSurface(grCtx, w, h, colorspace);
         if (!surface) {
           return null;
@@ -87,18 +90,24 @@
         return surface;
       }
 
-      CanvasKit.MakeRenderTarget = function(grCtx, w, h) {
-        var surface = this._MakeRenderTargetWH(grCtx, w, h);
-        if (!surface) {
+      CanvasKit.MakeRenderTarget = function() {
+        var grCtx = arguments[0];
+        if (!this.setCurrentContext(grCtx._context)) {
           return null;
         }
-        surface._context = grCtx._context;
-        return surface;
-      }
-
-      CanvasKit.MakeRenderTarget = function(grCtx, imageInfo) {
-        var surface = this._MakeRenderTargetII(grCtx, imageInfo);
-        if (!surface) {
+        var surface;
+        if (arguments.length === 3) {
+          surface = this._MakeRenderTargetWH(grCtx, arguments[1], arguments[2]);
+          if (!surface) {
+            return null;
+          }
+        } else if (arguments.length === 2) {
+          surface = this._MakeRenderTargetII(grCtx, arguments[1]);
+          if (!surface) {
+            return null;
+          }
+        } else {
+          Debug('Expected 2 or 3 params');
           return null;
         }
         surface._context = grCtx._context;
@@ -156,22 +165,22 @@
 
       function pushTexture(tex) {
         // GL is an emscripten object that holds onto WebGL state. One item in that state is
-        // an array of textures, of which the index is the handle/id.
-        var texHandle = GL.textures.length;
-        if (!texHandle) {
-          // If our texture handle is 0, Skia interprets that as an invalid texture id.
-          // As a special case, we push a null texture there so the first texture has id 1.
-          GL.textures.push(null);
-          texHandle = 1;
-        }
-        GL.textures.push(tex);
+        // an array of textures, of which the index is the handle/id. We must call getNewId so
+        // the GL's tracking of textures is up to date and we do not accidentally use the same
+        // texture in two different places if Skia creates a texture. (e.g. skbug.com/12797)
+        var texHandle = GL.getNewId(GL.textures);
+        GL.textures[texHandle] = tex;
         return texHandle
       }
 
       CanvasKit.Surface.prototype.makeImageFromTexture = function(tex, info) {
         CanvasKit.setCurrentContext(this._context);
         var texHandle = pushTexture(tex);
-        return this._makeImageFromTexture(this._context, texHandle, info);
+        var img = this._makeImageFromTexture(this._context, texHandle, info);
+        if (img) {
+          img._tex = texHandle;
+        }
+        return img;
       };
 
       // We try to find the natural media type (for <img> and <video>), display* for
@@ -215,6 +224,54 @@
         return this.makeImageFromTexture(newTex, info);
       };
 
+      CanvasKit.Surface.prototype.updateTextureFromSource = function(img, src) {
+        if (!img._tex) {
+          Debug('Image is not backed by a user-provided texture');
+          return;
+        }
+        CanvasKit.setCurrentContext(this._context);
+        var glCtx = GL.currentContext.GLctx;
+        // Copy the contents of src over the texture associated with this image.
+        var tex = GL.textures[img._tex];
+        glCtx.bindTexture(glCtx.TEXTURE_2D, tex);
+        if (GL.currentContext.version === 2) {
+          glCtx.texImage2D(glCtx.TEXTURE_2D, 0, glCtx.RGBA, getWidth(src), getHeight(src), 0, glCtx.RGBA, glCtx.UNSIGNED_BYTE, src);
+        } else {
+          glCtx.texImage2D(glCtx.TEXTURE_2D, 0, glCtx.RGBA, glCtx.RGBA, glCtx.UNSIGNED_BYTE, src);
+        }
+        glCtx.bindTexture(glCtx.TEXTURE_2D, null);
+        // Tell Skia we messed with the currently bound texture.
+        this._resetContext();
+        // Create a new texture entry and put null into the old slot. This keeps our texture alive,
+        // otherwise it will be deleted when we delete the old Image.
+        GL.textures[img._tex] = null;
+        img._tex = pushTexture(tex);
+        var ii = img.getImageInfo();
+        ii['colorSpace'] = img.getColorSpace();
+        // Skia may cache parts of the image, and some places assume images are immutable. In order
+        // to make things work, we create a new SkImage based on the same texture as the old image.
+        var newImg = this._makeImageFromTexture(this._context, img._tex, ii);
+        // To make things more ergonomic for the user, we change passed in img object to refer
+        // to the new image and clean up the old SkImage object. This has the effect of updating
+        // the Image (from the user's side of things), because they shouldn't be caring about what
+        // part of WASM memory we are pointing to.
+        // The $$ part is provided by emscripten's embind, so this could break if they change
+        // things on us.
+        // https://github.com/emscripten-core/emscripten/blob/a65d70c809f077542649c60097787e1c7460ced6/src/embind/embind.js
+        // They do not do anything special to keep closure from minifying things and neither do we.
+        var oldPtr = img.$$.ptr;
+        var oldSmartPtr = img.$$.smartPtr;
+        img.$$.ptr = newImg.$$.ptr;
+        img.$$.smartPtr = newImg.$$.smartPtr;
+        // We want to clean up the previous image, so we swap out the pointers and call delete on it
+        // which should have that effect.
+        newImg.$$.ptr = oldPtr;
+        newImg.$$.smartPtr = oldSmartPtr;
+        newImg.delete();
+        // Clean up the colorspace that we used.
+        ii['colorSpace'].delete();
+      }
+
       CanvasKit.MakeLazyImageFromTextureSource = function(src, info) {
         if (!info) {
           info = {
diff --git a/third_party/skia/modules/canvaskit/interface.js b/third_party/skia/modules/canvaskit/interface.js
index a29ad835ade8f..bfb6753e039cc 100644
--- a/third_party/skia/modules/canvaskit/interface.js
+++ b/third_party/skia/modules/canvaskit/interface.js
@@ -911,6 +911,12 @@ CanvasKit.onRuntimeInitialized = function() {
     return ta.slice(0, 2);
   };
 
+  CanvasKit.Picture.prototype.makeShader = function(tmx, tmy, mode, matr, rect) {
+    var mPtr = copy3x3MatrixToWasm(matr);
+    var rPtr = copyRectToWasm(rect);
+    return this._makeShader(tmx, tmy, mode, mPtr, rPtr);
+  };
+
   CanvasKit.PictureRecorder.prototype.beginRecording = function(bounds) {
     var bPtr = copyRectToWasm(bounds);
     return this._beginRecording(bPtr);
@@ -979,6 +985,16 @@ CanvasKit.onRuntimeInitialized = function() {
     return dpe;
   };
 
+  CanvasKit.PathEffect.MakeLine2D = function(width, matrix) {
+    var matrixPtr = copy3x3MatrixToWasm(matrix);
+    return CanvasKit.PathEffect._MakeLine2D(width, matrixPtr);
+  };
+
+  CanvasKit.PathEffect.MakePath2D = function(matrix, path) {
+    var matrixPtr = copy3x3MatrixToWasm(matrix);
+    return CanvasKit.PathEffect._MakePath2D(matrixPtr, path);
+  };
+
   CanvasKit.Shader.MakeColor = function(color4f, colorSpace) {
     colorSpace = colorSpace || null;
     var cPtr = copyColorToWasm(color4f);
@@ -1185,7 +1201,7 @@ CanvasKit.MakeImageFromCanvasImageSource = function(canvasImageSource) {
   memoizedCanvas2dElement.width = width;
   memoizedCanvas2dElement.height = height;
 
-  var ctx2d = memoizedCanvas2dElement.getContext('2d');
+  var ctx2d = memoizedCanvas2dElement.getContext('2d', {willReadFrequently: true});
   ctx2d.drawImage(canvasImageSource, 0, 0);
 
   var imageData = ctx2d.getImageData(0, 0, width, height);
diff --git a/third_party/skia/modules/canvaskit/memory.js b/third_party/skia/modules/canvaskit/memory.js
index 6b6ccc95122e4..fe900b5264fde 100644
--- a/third_party/skia/modules/canvaskit/memory.js
+++ b/third_party/skia/modules/canvaskit/memory.js
@@ -204,6 +204,7 @@ function copy3x3MatrixToWasm(matr) {
     return nullptr;
   }
 
+  var wasm3x3Matrix = _scratch3x3Matrix['toTypedArray']();
   if (matr.length) {
     if (matr.length === 6 || matr.length === 9) {
       // matr should be an array or typed array.
@@ -216,7 +217,6 @@ function copy3x3MatrixToWasm(matr) {
       return _scratch3x3MatrixPtr;
     } else if (matr.length === 16) {
       // Downsample the 4x4 matrix into a 3x3
-      var wasm3x3Matrix = _scratch3x3Matrix['toTypedArray']();
       wasm3x3Matrix[0] = matr[0];
       wasm3x3Matrix[1] = matr[1];
       wasm3x3Matrix[2] = matr[3];
@@ -231,20 +231,21 @@ function copy3x3MatrixToWasm(matr) {
       return _scratch3x3MatrixPtr;
     }
     throw 'invalid matrix size';
+  } else if (matr['m11'] === undefined) {
+    throw 'invalid matrix argument';
   }
-  var wasm3x3Matrix = _scratch3x3Matrix['toTypedArray']();
-  // Try as if it's a DOMMatrix. Reminder that DOMMatrix is column-major.
-  wasm3x3Matrix[0] = matr.m11;
-  wasm3x3Matrix[1] = matr.m21;
-  wasm3x3Matrix[2] = matr.m41;
-
-  wasm3x3Matrix[3] = matr.m12;
-  wasm3x3Matrix[4] = matr.m22;
-  wasm3x3Matrix[5] = matr.m42;
-
-  wasm3x3Matrix[6] = matr.m14;
-  wasm3x3Matrix[7] = matr.m24;
-  wasm3x3Matrix[8] = matr.m44;
+  // Reminder that DOMMatrix is column-major.
+  wasm3x3Matrix[0] = matr['m11'];
+  wasm3x3Matrix[1] = matr['m21'];
+  wasm3x3Matrix[2] = matr['m41'];
+
+  wasm3x3Matrix[3] = matr['m12'];
+  wasm3x3Matrix[4] = matr['m22'];
+  wasm3x3Matrix[5] = matr['m42'];
+
+  wasm3x3Matrix[6] = matr['m14'];
+  wasm3x3Matrix[7] = matr['m24'];
+  wasm3x3Matrix[8] = matr['m44'];
   return _scratch3x3MatrixPtr;
 }
 
@@ -297,27 +298,29 @@ function copy4x4MatrixToWasm(matr) {
       wasm4x4Matrix[15]=1;
     }
     return _scratch4x4MatrixPtr;
+  } else if (matr['m11'] === undefined) {
+    throw 'invalid matrix argument';
   }
-  // Try as if it's a DOMMatrix. Reminder that DOMMatrix is column-major.
-  wasm4x4Matrix[0] = matr.m11;
-  wasm4x4Matrix[1] = matr.m21;
-  wasm4x4Matrix[2] = matr.m31;
-  wasm4x4Matrix[3] = matr.m41;
-
-  wasm4x4Matrix[4] = matr.m12;
-  wasm4x4Matrix[5] = matr.m22;
-  wasm4x4Matrix[6] = matr.m32;
-  wasm4x4Matrix[7] = matr.m42;
-
-  wasm4x4Matrix[8] = matr.m13;
-  wasm4x4Matrix[9] = matr.m23;
-  wasm4x4Matrix[10] = matr.m33;
-  wasm4x4Matrix[11] = matr.m43;
-
-  wasm4x4Matrix[12] = matr.m14;
-  wasm4x4Matrix[13] = matr.m24;
-  wasm4x4Matrix[14] = matr.m34;
-  wasm4x4Matrix[15] = matr.m44;
+  // Reminder that DOMMatrix is column-major.
+  wasm4x4Matrix[0] = matr['m11'];
+  wasm4x4Matrix[1] = matr['m21'];
+  wasm4x4Matrix[2] = matr['m31'];
+  wasm4x4Matrix[3] = matr['m41'];
+
+  wasm4x4Matrix[4] = matr['m12'];
+  wasm4x4Matrix[5] = matr['m22'];
+  wasm4x4Matrix[6] = matr['m32'];
+  wasm4x4Matrix[7] = matr['m42'];
+
+  wasm4x4Matrix[8] = matr['m13'];
+  wasm4x4Matrix[9] = matr['m23'];
+  wasm4x4Matrix[10] = matr['m33'];
+  wasm4x4Matrix[11] = matr['m43'];
+
+  wasm4x4Matrix[12] = matr['m14'];
+  wasm4x4Matrix[13] = matr['m24'];
+  wasm4x4Matrix[14] = matr['m34'];
+  wasm4x4Matrix[15] = matr['m44'];
   return _scratch4x4MatrixPtr;
 }
 
diff --git a/third_party/skia/modules/canvaskit/npm_build/extra.html b/third_party/skia/modules/canvaskit/npm_build/extra.html
index bcbdc68d4c406..862ef0ab1e15f 100644
--- a/third_party/skia/modules/canvaskit/npm_build/extra.html
+++ b/third_party/skia/modules/canvaskit/npm_build/extra.html
@@ -401,7 +401,7 @@ <h2> Support for extended color spaces </h2>
       0.5,
       150, 150,
       0, 1, 0, 1,
-      1, 0, 0, 1], true);
+      1, 0, 0, 1]);
     const paint = new CanvasKit.Paint();
     paint.setShader(shader);
     canvas.drawRect(CanvasKit.LTRBRect(0, 0, 300, 300), paint);
@@ -489,7 +489,7 @@ <h2> Support for extended color spaces </h2>
       rad_scale,
       quadrantSize/2, quadrantSize/2,
       1, 1, 1, 1,
-      0, 0, 0, 1], true);
+      0, 0, 0, 1]);
 
       const blur = CanvasKit.ImageFilter.MakeBlur(0.1, 0.1, CanvasKit.TileMode.Clamp, null);
 
@@ -513,7 +513,7 @@ <h2> Support for extended color spaces </h2>
 
       const blendShader = thresholdEffect.makeShaderWithChildren(
         [0.5, 10],
-        true, [dogShader, mandrillShader, thresholdShader]);
+        [dogShader, mandrillShader, thresholdShader]);
       draw(0, 0, blendShader);
       draw(quadrantSize, 0, thresholdShader);
       draw(0, quadrantSize, dogShader);
diff --git a/third_party/skia/modules/canvaskit/npm_build/package-lock.json b/third_party/skia/modules/canvaskit/npm_build/package-lock.json
index 4380296bfb59c..7e76e7d2d9784 100644
--- a/third_party/skia/modules/canvaskit/npm_build/package-lock.json
+++ b/third_party/skia/modules/canvaskit/npm_build/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "canvaskit-wasm",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/third_party/skia/modules/canvaskit/npm_build/package.json b/third_party/skia/modules/canvaskit/npm_build/package.json
index 08e297f7660a7..24026001b484c 100644
--- a/third_party/skia/modules/canvaskit/npm_build/package.json
+++ b/third_party/skia/modules/canvaskit/npm_build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvaskit-wasm",
-  "version": "0.31.0",
+  "version": "0.33.0",
   "description": "A WASM version of Skia's Canvas API",
   "main": "bin/canvaskit.js",
   "homepage": "https://github.com/google/skia/tree/main/modules/canvaskit",
diff --git a/third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts b/third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
index 8120fcc473802..47eb2fc08902b 100644
--- a/third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
+++ b/third_party/skia/modules/canvaskit/npm_build/types/canvaskit-wasm-tests.ts
@@ -570,6 +570,7 @@ function paragraphBuilderTests(CK: CanvasKit, fontMgr?: FontMgr, paint?: Paint)
     builder2.pushPaintStyle(blueText, paint, paint);
     builder2.addPlaceholder();
     builder2.addPlaceholder(10, 20, CK.PlaceholderAlignment.Top, CK.TextBaseline.Ideographic, 3);
+    builder2.reset();
 }
 
 function particlesTests(CK: CanvasKit, canvas?: Canvas) {
@@ -594,11 +595,18 @@ function particlesTests(CK: CanvasKit, canvas?: Canvas) {
     });
 }
 
-function pathEffectTests(CK: CanvasKit) {
+function pathEffectTests(CK: CanvasKit, path?: Path) {
+    if (!path) {
+        return;
+    }
     const pe1 = CK.PathEffect.MakeCorner(2); // $ExpectType PathEffect | null
     const pe2 = CK.PathEffect.MakeDash([2, 4]); // $ExpectType PathEffect
     const pe3 = CK.PathEffect.MakeDash([2, 4, 6, 8], 10); // $ExpectType PathEffect
     const pe4 = CK.PathEffect.MakeDiscrete(10, 2, 0); // $ExpectType PathEffect
+    const pe5 = CK.PathEffect.MakePath1D(path, 3, 4, CK.Path1DEffect.Morph); // $ExpectType PathEffect | null
+    const matr = CK.Matrix.scaled(3, 2);
+    const pe6 = CK.PathEffect.MakePath2D(matr, path); // $ExpectType PathEffect | null
+    const pe7 = CK.PathEffect.MakeLine2D(3.2, matr); // $ExpectType PathEffect | null
 }
 
 function mallocTests(CK: CanvasKit) {
@@ -657,6 +665,11 @@ function pictureTests(CK: CanvasKit) {
     const pic = recorder.finishRecordingAsPicture(); // $ExpectType SkPicture
     const bytes = pic.serialize(); // $ExpectType Uint8Array | null
     const pic2 = CK.MakePicture(bytes!);
+    const shader1 = pic2!.makeShader(CK.TileMode.Clamp, CK.TileMode.Decal, CK.FilterMode.Nearest);
+    const shader2 = pic2!.makeShader(CK.TileMode.Clamp, CK.TileMode.Decal, CK.FilterMode.Nearest,
+        CK.Matrix.rotated(3));
+    const shader3 = pic2!.makeShader(CK.TileMode.Clamp, CK.TileMode.Decal, CK.FilterMode.Nearest,
+        CK.Matrix.skewed(2, 1), CK.LTRBRect(3, 4, 5, 6));
 }
 
 function rectangleTests(CK: CanvasKit) {
@@ -675,9 +688,9 @@ function runtimeEffectTests(CK: CanvasKit) {
     });
     const someMatr = CK.Matrix.translated(2, 60);
     const s1 = rt.makeShader([0, 1]); // $ExpectType Shader
-    const s2 = rt.makeShader([0, 1], true, someMatr); // $ExpectType Shader
-    const s3 = rt.makeShaderWithChildren([4, 5], true, [s1, s2]); // $ExpectType Shader
-    const s4 = rt.makeShaderWithChildren([4, 5], true, [s1, s2], someMatr); // $ExpectType Shader
+    const s2 = rt.makeShader([0, 1], someMatr); // $ExpectType Shader
+    const s3 = rt.makeShaderWithChildren([4, 5], [s1, s2]); // $ExpectType Shader
+    const s4 = rt.makeShaderWithChildren([4, 5], [s1, s2], someMatr); // $ExpectType Shader
     const a = rt.getUniform(1); // $ExpectType SkSLUniform
     const b = rt.getUniformCount(); // $ExpectType number
     const c = rt.getUniformFloatCount(); // $ExpectType number
@@ -895,6 +908,8 @@ function surfaceTests(CK: CanvasKit, gl?: WebGLRenderingContext) {
     };
     surfaceFour.requestAnimationFrame(drawFrame);
     surfaceFour.drawOnce(drawFrame);
+
+    surfaceFour.updateTextureFromSource(img5!, videoEle);
 }
 
 function textBlobTests(CK: CanvasKit, font?: Font, path?: Path) {
diff --git a/third_party/skia/modules/canvaskit/npm_build/types/index.d.ts b/third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
index 5dbedda97c487..3abbcc3fcaeed 100644
--- a/third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
+++ b/third_party/skia/modules/canvaskit/npm_build/types/index.d.ts
@@ -407,7 +407,7 @@ export interface CanvasKit {
     readonly PictureRecorder: DefaultConstructor<PictureRecorder>;
     readonly TextStyle: TextStyleConstructor;
 
-    // Factories, i.e. things made with CanvasKit.Foo.MakeTurboEncapsulator()
+    // Factories, i.e. things made with CanvasKit.Foo.MakeTurboEncabulator()
     readonly ParagraphBuilder: ParagraphBuilderFactory;
     readonly ColorFilter: ColorFilterFactory;
     readonly FontMgr: FontMgrFactory;
@@ -440,6 +440,7 @@ export interface CanvasKit {
     readonly ImageFormat: ImageFormatEnumValues;
     readonly MipmapMode: MipmapModeEnumValues;
     readonly PaintStyle: PaintStyleEnumValues;
+    readonly Path1DEffect: Path1DEffectStyleEnumValues;
     readonly PathOp: PathOpEnumValues;
     readonly PointMode: PointModeEnumValues;
     readonly ColorSpace: ColorSpaceEnumValues;
@@ -921,6 +922,12 @@ export interface ParagraphBuilder extends EmbindObject<ParagraphBuilder> {
      * @param bg
      */
     pushPaintStyle(textStyle: TextStyle, fg: Paint, bg: Paint): void;
+
+    /**
+     * Resets this builder to its initial state, discarding any text, styles, placeholders that have
+     * been added, but keeping the initial ParagraphStyle.
+     */
+    reset(): void;
 }
 
 export interface ParagraphStyle {
@@ -2499,6 +2506,22 @@ export type PathEffect = EmbindObject<PathEffect>;
  * call a bitmap). An SkPicture is a series of draw commands.
  */
 export interface SkPicture extends EmbindObject<SkPicture> {
+    /**
+     *  Returns a new shader that will draw with this picture.
+     *
+     *  @param tmx  The tiling mode to use when sampling in the x-direction.
+     *  @param tmy  The tiling mode to use when sampling in the y-direction.
+     *  @param mode How to filter the tiles
+     *  @param localMatrix Optional matrix used when sampling
+     *  @param tileRect The tile rectangle in picture coordinates: this represents the subset
+     *              (or superset) of the picture used when building a tile. It is not
+     *              affected by localMatrix and does not imply scaling (only translation
+     *              and cropping). If null, the tile rect is considered equal to the picture
+     *              bounds.
+     */
+    makeShader(tmx: TileMode, tmy: TileMode, mode: FilterMode,
+               localMatrix?: InputMatrix, tileRect?: InputRect): Shader;
+
     /**
      * Returns the serialized format of this SkPicture. The format may change at anytime and
      * no promises are made for backwards or forward compatibility.
@@ -2527,20 +2550,18 @@ export interface RuntimeEffect extends EmbindObject<RuntimeEffect> {
     /**
      * Returns a shader executed using the given uniform data.
      * @param uniforms
-     * @param isOpaque
      * @param localMatrix
      */
-    makeShader(uniforms: Float32Array | number[], isOpaque?: boolean,
+    makeShader(uniforms: Float32Array | number[],
                localMatrix?: InputMatrix): Shader;
 
     /**
      * Returns a shader executed using the given uniform data and the children as inputs.
      * @param uniforms
-     * @param isOpaque
      * @param children
      * @param localMatrix
      */
-    makeShaderWithChildren(uniforms: Float32Array | number[], isOpaque?: boolean,
+    makeShaderWithChildren(uniforms: Float32Array | number[],
                            children?: Shader[], localMatrix?: InputMatrix): Shader;
 
     /**
@@ -2674,6 +2695,19 @@ export interface Surface extends EmbindObject<Surface> {
      */
     sampleCnt(): number;
 
+    /**
+     * Updates the underlying GPU texture of the image to be the contents of the provided
+     * TextureSource. Has no effect on CPU backend or if img was not created with either
+     * makeImageFromTextureSource or makeImageFromTexture.
+     * If the provided TextureSource is of different dimensions than the Image, the contents
+     * will be deformed (e.g. squished). The ColorType, AlphaType, and ColorSpace of src should
+     * match the original settings used to create the Image or it may draw strange.
+     *
+     * @param img - A texture-backed Image.
+     * @param src - A valid texture source of any dimensions.
+     */
+    updateTextureFromSource(img: Image, src: TextureSource): void;
+
     /**
      * Returns the width of this surface in pixels.
      */
@@ -3327,11 +3361,50 @@ export interface PathEffectFactory {
      * @param seedAssist - modifies the randomness. See SkDiscretePathEffect.h for more.
      */
     MakeDiscrete(segLength: number, dev: number, seedAssist: number): PathEffect;
+
+    /**
+     * Returns a PathEffect that will fill the drawing path with a pattern made by applying
+     * the given matrix to a repeating set of infinitely long lines of the given width.
+     * For example, the scale of the provided matrix will determine how far apart the lines
+     * should be drawn its rotation affects the lines' orientation.
+     * @param width - must be >= 0
+     * @param matrix
+     */
+    MakeLine2D(width: number, matrix: InputMatrix): PathEffect | null;
+
+    /**
+     * Returns a PathEffect which implements dashing by replicating the specified path.
+     *   @param path The path to replicate (dash)
+     *   @param advance The space between instances of path
+     *   @param phase distance (mod advance) along path for its initial position
+     *   @param style how to transform path at each point (based on the current
+     *                position and tangent)
+     */
+    MakePath1D(path: Path, advance: number, phase: number, style: Path1DEffectStyle):
+        PathEffect | null;
+
+    /**
+     * Returns a PathEffect that will fill the drawing path with a pattern by repeating the
+     * given path according to the provided matrix. For example, the scale of the matrix
+     * determines how far apart the path instances should be drawn.
+     * @param matrix
+     * @param path
+     */
+    MakePath2D(matrix: InputMatrix, path: Path): PathEffect | null;
 }
 
 /**
  * See RuntimeEffect.h for more details.
  */
+export interface DebugTrace extends EmbindObject<DebugTrace> {
+    writeTrace(): string;
+}
+
+export interface TracedShader {
+    shader: Shader;
+    debugTrace: DebugTrace;
+}
+
 export interface RuntimeEffectFactory {
     /**
      * Compiles a RuntimeEffect from the given shader code.
@@ -3340,6 +3413,14 @@ export interface RuntimeEffectFactory {
      *                   be printed to console.log().
      */
     Make(sksl: string, callback?: (err: string) => void): RuntimeEffect | null;
+
+    /**
+     * Adds debug tracing to an existing RuntimeEffect.
+     * @param shader - An already-assembled shader, created with RuntimeEffect.makeShader.
+     * @param traceCoordX - the X coordinate of the device-space pixel to trace
+     * @param traceCoordY - the Y coordinate of the device-space pixel to trace
+     */
+    MakeTraced(shader: Shader, traceCoordX: number, traceCoordY: number): TracedShader;
 }
 
 /**
@@ -3800,6 +3881,7 @@ export type FontEdging = EmbindEnumEntity;
 export type FontHinting = EmbindEnumEntity;
 export type MipmapMode = EmbindEnumEntity;
 export type PaintStyle = EmbindEnumEntity;
+export type Path1DEffectStyle = EmbindEnumEntity;
 export type PathOp = EmbindEnumEntity;
 export type PointMode = EmbindEnumEntity;
 export type StrokeCap = EmbindEnumEntity;
@@ -3993,6 +4075,15 @@ export interface PaintStyleEnumValues extends EmbindEnum {
     Stroke: PaintStyle;
 }
 
+export interface Path1DEffectStyleEnumValues extends EmbindEnum {
+    // Translate the shape to each position
+    Translate: Path1DEffectStyle;
+    // Rotate the shape about its center
+    Rotate: Path1DEffectStyle;
+    // Transform each point and turn lines into curves
+    Morph: Path1DEffectStyle;
+}
+
 export interface PathOpEnumValues extends EmbindEnum {
     Difference: PathOp;
     Intersect: PathOp;
diff --git a/third_party/skia/modules/canvaskit/package-lock.json b/third_party/skia/modules/canvaskit/package-lock.json
index fa6ef25e3a3cf..6e6bcf8d6dc27 100644
--- a/third_party/skia/modules/canvaskit/package-lock.json
+++ b/third_party/skia/modules/canvaskit/package-lock.json
@@ -839,12 +839,23 @@
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
       "engines": {
         "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
     "node_modules/fs-extra": {
@@ -2740,9 +2751,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
     "fs-extra": {
diff --git a/third_party/skia/modules/canvaskit/paragraph_bindings.cpp b/third_party/skia/modules/canvaskit/paragraph_bindings.cpp
index 60812975747c6..2979bce414092 100644
--- a/third_party/skia/modules/canvaskit/paragraph_bindings.cpp
+++ b/third_party/skia/modules/canvaskit/paragraph_bindings.cpp
@@ -522,6 +522,7 @@ EMSCRIPTEN_BINDINGS(Paragraph) {
                       }))
             .function("build", &para::ParagraphBuilderImpl::Build, allow_raw_pointers())
             .function("pop", &para::ParagraphBuilderImpl::pop)
+            .function("reset", &para::ParagraphBuilderImpl::Reset, allow_raw_pointers())
             .function("_pushStyle", optional_override([](para::ParagraphBuilderImpl& self,
                                                          SimpleTextStyle textStyle) {
                           auto ts = toTextStyle(textStyle);
diff --git a/third_party/skia/modules/canvaskit/rt_shader.js b/third_party/skia/modules/canvaskit/rt_shader.js
index f67109103b5d1..19aa440312875 100644
--- a/third_party/skia/modules/canvaskit/rt_shader.js
+++ b/third_party/skia/modules/canvaskit/rt_shader.js
@@ -15,17 +15,17 @@ CanvasKit._extraInitializations.push(function() {
     return CanvasKit.RuntimeEffect._Make(sksl, callbackObj);
   };
 
-  CanvasKit.RuntimeEffect.prototype.makeShader = function(floats, isOpaque, localMatrix) {
+  CanvasKit.RuntimeEffect.prototype.makeShader = function(floats, localMatrix) {
     // We don't need to free these floats because they will become owned by the shader.
     var fptr = copy1dArray(floats, "HEAPF32");
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
     // Our array has 4 bytes per float, so be sure to account for that before
     // sending it over the wire.
-    return this._makeShader(fptr, floats.length * 4, !!isOpaque, localMatrixPtr);
+    return this._makeShader(fptr, floats.length * 4, localMatrixPtr);
   }
 
   // childrenWithShaders is an array of other shaders (e.g. Image.makeShader())
-  CanvasKit.RuntimeEffect.prototype.makeShaderWithChildren = function(floats, isOpaque, childrenShaders, localMatrix) {
+  CanvasKit.RuntimeEffect.prototype.makeShaderWithChildren = function(floats, childrenShaders, localMatrix) {
     // We don't need to free these floats because they will become owned by the shader.
     var fptr = copy1dArray(floats, "HEAPF32");
     var localMatrixPtr = copy3x3MatrixToWasm(localMatrix);
@@ -38,7 +38,7 @@ CanvasKit._extraInitializations.push(function() {
     var childrenPointers = copy1dArray(barePointers, "HEAPU32");
     // Our array has 4 bytes per float, so be sure to account for that before
     // sending it over the wire.
-    return this._makeShaderWithChildren(fptr, floats.length * 4, !!isOpaque, childrenPointers,
+    return this._makeShaderWithChildren(fptr, floats.length * 4, childrenPointers,
                                         barePointers.length, localMatrixPtr);
   }
 });
diff --git a/third_party/skia/modules/canvaskit/skottie_bindings.cpp b/third_party/skia/modules/canvaskit/skottie_bindings.cpp
index 1de0331efc344..b51f5eaa91d94 100644
--- a/third_party/skia/modules/canvaskit/skottie_bindings.cpp
+++ b/third_party/skia/modules/canvaskit/skottie_bindings.cpp
@@ -9,25 +9,20 @@
 #include "include/core/SkImage.h"
 #include "include/core/SkString.h"
 #include "include/core/SkTypes.h"
+#include "modules/canvaskit/WasmCommon.h"
 #include "modules/skottie/include/Skottie.h"
+#include "modules/skottie/include/SkottieProperty.h"
+#include "modules/skottie/utils/SkottieUtils.h"
+#include "modules/skresources/include/SkResources.h"
 #include "modules/sksg/include/SkSGInvalidationController.h"
 
 #include <string>
 #include <vector>
-
 #include <emscripten.h>
 #include <emscripten/bind.h>
-#include "modules/canvaskit/WasmCommon.h"
-
-#if SK_INCLUDE_MANAGED_SKOTTIE
-#include "modules/skottie/include/SkottieProperty.h"
-#include "modules/skottie/utils/SkottieUtils.h"
-#include "modules/skresources/include/SkResources.h"
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
 
 using namespace emscripten;
 
-#if SK_INCLUDE_MANAGED_SKOTTIE
 namespace {
 
 // WebTrack wraps a JS object that has a 'seek' method.
@@ -280,7 +275,6 @@ class ManagedAnimation final : public SkRefCnt {
 };
 
 } // anonymous ns
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
 
 EMSCRIPTEN_BINDINGS(Skottie) {
     // Animation things (may eventually go in own library)
@@ -313,7 +307,6 @@ EMSCRIPTEN_BINDINGS(Skottie) {
     }));
     constant("skottie", true);
 
-#if SK_INCLUDE_MANAGED_SKOTTIE
     class_<ManagedAnimation>("ManagedAnimation")
         .smart_ptr<sk_sp<ManagedAnimation>>("sk_sp<ManagedAnimation>")
         .function("version"   , &ManagedAnimation::version)
@@ -381,5 +374,4 @@ EMSCRIPTEN_BINDINGS(Skottie) {
                                       prop_prefix, std::move(logger));
     }));
     constant("managed_skottie", true);
-#endif // SK_INCLUDE_MANAGED_SKOTTIE
 }
diff --git a/third_party/skia/modules/canvaskit/tests/core.spec.js b/third_party/skia/modules/canvaskit/tests/core.spec.js
index babc6085512fb..9b95b75c3e3c6 100644
--- a/third_party/skia/modules/canvaskit/tests/core.spec.js
+++ b/third_party/skia/modules/canvaskit/tests/core.spec.js
@@ -16,8 +16,8 @@ describe('Core canvas behavior', () => {
 
     gm('picture_test', (canvas) => {
         const spr = new CanvasKit.PictureRecorder();
-        const rcanvas = spr.beginRecording(
-                        CanvasKit.LTRBRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT));
+        const bounds = CanvasKit.LTRBRect(0, 0, 400, 120);
+        const rcanvas = spr.beginRecording(bounds);
         const paint = new CanvasKit.Paint();
         paint.setStrokeWidth(2.0);
         paint.setAntiAlias(true);
@@ -33,10 +33,26 @@ describe('Core canvas behavior', () => {
         paint.delete();
 
         canvas.drawPicture(pic);
+        const paint2 = new CanvasKit.Paint();
+        paint2.setColor(CanvasKit.RED);
+        paint2.setStyle(CanvasKit.PaintStyle.Stroke);
+        canvas.drawRect(bounds, paint2);
 
         const bytes = pic.serialize();
         expect(bytes).toBeTruthy();
 
+
+        const matr = CanvasKit.Matrix.scaled(0.33, 0.33);
+        // Give a 5 pixel margin between the original content.
+        const tileRect = CanvasKit.LTRBRect(-5, -5, 405, 125);
+        const shader = pic.makeShader(CanvasKit.TileMode.Mirror, CanvasKit.TileMode.Mirror,
+        CanvasKit.FilterMode.Linear, matr, tileRect);
+        paint2.setStyle(CanvasKit.PaintStyle.Fill);
+        paint2.setShader(shader);
+        canvas.drawRect(CanvasKit.LTRBRect(0, 150, CANVAS_WIDTH, CANVAS_HEIGHT), paint2);
+
+        paint2.delete();
+        shader.delete();
         pic.delete();
     });
 
@@ -1083,6 +1099,33 @@ describe('Core canvas behavior', () => {
     });
 
     describe('ColorSpace Support', () => {
+        it('Creates an SRGB 8888 surface by default', () => {
+            const colorSpace = CanvasKit.ColorSpace.SRGB;
+            const surface = CanvasKit.MakeCanvasSurface('test');
+            expect(surface).toBeTruthy('Could not make surface');
+            let info = surface.imageInfo();
+            expect(info.alphaType).toEqual(CanvasKit.AlphaType.Unpremul);
+            expect(info.colorType).toEqual(CanvasKit.ColorType.RGBA_8888);
+            expect(CanvasKit.ColorSpace.Equals(info.colorSpace, colorSpace))
+                .toBeTruthy("Surface not created with correct color space.");
+
+            const mObj = CanvasKit.Malloc(Uint8Array, CANVAS_WIDTH * CANVAS_HEIGHT * 4);
+            mObj.toTypedArray()[0] = 127; // sentinel value. Should be overwritten by readPixels.
+            const canvas = surface.getCanvas();
+            canvas.clear(CanvasKit.TRANSPARENT);
+            const pixels = canvas.readPixels(0, 0, {
+                width: CANVAS_WIDTH,
+                height: CANVAS_HEIGHT,
+                colorType: CanvasKit.ColorType.RGBA_8888,
+                alphaType: CanvasKit.AlphaType.Unpremul,
+                colorSpace: colorSpace
+            }, mObj, 4 * CANVAS_WIDTH);
+            expect(pixels).toBeTruthy('Could not read pixels from surface');
+            expect(pixels[0] !== 127).toBeTruthy();
+            expect(pixels[0]).toEqual(mObj.toTypedArray()[0]);
+            CanvasKit.Free(mObj);
+            surface.delete();
+        });
         it('Can create an SRGB 8888 surface', () => {
             const colorSpace = CanvasKit.ColorSpace.SRGB;
             const surface = CanvasKit.MakeCanvasSurface('test', CanvasKit.ColorSpace.SRGB);
@@ -1239,6 +1282,21 @@ describe('Core canvas behavior', () => {
             paint.delete();
             path.delete();
         });
+
+        it('throws if an invalid matrix is passed in', () => {
+            let threw;
+            try {
+                CanvasKit.ImageFilter.MakeMatrixTransform(
+                  'invalid matrix value',
+                  { filter: CanvasKit.FilterMode.Linear },
+                  null
+                )
+                threw = false;
+            } catch (e) {
+                threw = true;
+            }
+            expect(threw).toBeTrue();
+        });
     }); // end describe('DOMMatrix support')
 
     it('can call subarray on a Malloced object', () => {
@@ -1363,6 +1421,10 @@ describe('Core canvas behavior', () => {
         // measure, we also wait for it to be decoded.
         return imageEle.decode().then(() => {
             const img = surface.makeImageFromTextureSource(imageEle);
+            // Make sure the texture is properly written to and Skia does not draw over it by
+            // by accident.
+            canvas.clear(CanvasKit.RED);
+            surface.updateTextureFromSource(img, imageEle);
             canvas.drawImage(img, 0, 0, null);
 
             const info = img.getImageInfo();
@@ -1423,4 +1485,121 @@ describe('Core canvas behavior', () => {
             img.delete();
         });
     });
+
+    it('encodes images in three different ways', () => {
+        // This creates and draws an Image that is 1 pixel wide, 4 pixels tall with
+        // the colors listed below.
+        const pixels = Uint8Array.from([
+            255,   0,   0, 255, // opaque red
+              0, 255,   0, 255, // opaque green
+              0,   0, 255, 255, // opaque blue
+            255,   0, 255, 100, // transparent purple
+        ]);
+        const img = CanvasKit.MakeImage({
+          'width': 1,
+          'height': 4,
+          'alphaType': CanvasKit.AlphaType.Unpremul,
+          'colorType': CanvasKit.ColorType.RGBA_8888,
+          'colorSpace': CanvasKit.ColorSpace.SRGB
+        }, pixels, 4);
+
+        let bytes = img.encodeToBytes(CanvasKit.ImageFormat.PNG, 100);
+        assertBytesDecodeToImage(bytes, 'png');
+        bytes = img.encodeToBytes(CanvasKit.ImageFormat.JPEG, 90);
+        assertBytesDecodeToImage(bytes, 'jpeg');
+        bytes = img.encodeToBytes(CanvasKit.ImageFormat.WEBP, 100);
+        assertBytesDecodeToImage(bytes, 'webp');
+
+        img.delete();
+    });
+
+    function assertBytesDecodeToImage(bytes, format) {
+        expect(bytes).toBeTruthy('null output for ' + format);
+        const img = CanvasKit.MakeImageFromEncoded(bytes);
+        expect(img).toBeTruthy('Could not decode result from '+ format);
+        img && img.delete();
+    }
+
+    it('can make a render target', () => {
+        if (!CanvasKit.gpu) {
+            return;
+        }
+        const canvas = document.getElementById('test');
+        const context = CanvasKit.GetWebGLContext(canvas);
+        const grContext = CanvasKit.MakeGrContext(context);
+        expect(grContext).toBeTruthy();
+        const target = CanvasKit.MakeRenderTarget(grContext, 100, 100);
+        expect(target).toBeTruthy();
+        target.delete();
+        grContext.delete();
+    });
+
+    gm('PathEffect_MakePath1D', (canvas) => {
+        // Based off //docs/examples/skpaint_path_1d_path_effect.cpp
+        canvas.clear(CanvasKit.WHITE);
+
+        const path = new CanvasKit.Path();
+        path.addOval(CanvasKit.XYWHRect(0, 0, 16, 6));
+
+        const paint = new CanvasKit.Paint();
+        const effect = CanvasKit.PathEffect.MakePath1D(
+           path, 32, 0, CanvasKit.Path1DEffect.Rotate,
+        );
+        paint.setColor(CanvasKit.Color(94, 53, 88, 1)); // deep purple
+        paint.setPathEffect(effect);
+        paint.setAntiAlias(true);
+        canvas.drawCircle(128, 128, 122, paint);
+
+        path.delete();
+        effect.delete();
+        paint.delete();
+    });
+
+    gm('PathEffect_MakePath2D', (canvas) => {
+        // Based off //docs/examples/skpaint_path_2d_path_effect.cpp
+        canvas.clear(CanvasKit.WHITE);
+
+        const path = new CanvasKit.Path();
+        path.moveTo(20, 30);
+        const points = [20, 20, 10, 30, 0, 30, 20, 10, 30, 10, 40, 0, 40, 10,
+                        50, 10, 40, 20, 40, 30, 20, 50, 20, 40, 30, 30, 20, 30];
+        for (let i = 0; i < points.length; i += 2) {
+            path.lineTo(points[i], points[i+1]);
+        }
+
+        const paint = new CanvasKit.Paint();
+        const effect = CanvasKit.PathEffect.MakePath2D(
+          CanvasKit.Matrix.scaled(40, 40), path
+        );
+        paint.setColor(CanvasKit.Color(53, 94, 59, 1)); // hunter green
+        paint.setPathEffect(effect);
+        paint.setAntiAlias(true);
+        canvas.drawRect(CanvasKit.LTRBRect(-20, -20, 300, 300), paint);
+
+        path.delete();
+        effect.delete();
+        paint.delete();
+    });
+
+    gm('PathEffect_MakeLine2D', (canvas) => {
+        // Based off //docs/examples/skpaint_line_2d_path_effect.cpp
+        canvas.clear(CanvasKit.WHITE);
+
+        const lattice = CanvasKit.Matrix.multiply(
+            CanvasKit.Matrix.scaled(8, 8),
+            CanvasKit.Matrix.rotated(Math.PI / 6),
+        );
+
+        const paint = new CanvasKit.Paint();
+        const effect = CanvasKit.PathEffect.MakeLine2D(
+          2, lattice,
+        );
+        paint.setColor(CanvasKit.Color(59, 53, 94, 1)); // dark blue
+        paint.setPathEffect(effect);
+        paint.setAntiAlias(true);
+        canvas.drawRect(CanvasKit.LTRBRect(20, 20, 300, 300), paint);
+
+        effect.delete();
+        paint.delete();
+    });
 });
diff --git a/third_party/skia/modules/canvaskit/tests/paragraph.spec.js b/third_party/skia/modules/canvaskit/tests/paragraph.spec.js
index daca43add798f..046845ef3268b 100644
--- a/third_party/skia/modules/canvaskit/tests/paragraph.spec.js
+++ b/third_party/skia/modules/canvaskit/tests/paragraph.spec.js
@@ -983,4 +983,50 @@ describe('Paragraph Behavior', function() {
         fontMgr.delete();
         builder.delete();
     });
+
+    gm('paragraph builder with reset', (canvas) => {
+        canvas.clear(CanvasKit.WHITE);
+        const fontMgr = CanvasKit.FontMgr.FromData(notoSerifFontBuffer, notoSerifBoldItalicFontBuffer);
+
+        const wrapTo = 250;
+
+        const paraStyle = new CanvasKit.ParagraphStyle({
+            textStyle: {
+                fontSize: 20,
+            },
+        });
+
+        const builder = CanvasKit.ParagraphBuilder.Make(paraStyle, fontMgr);
+        builder.addText('Default text\n');
+
+        const boldItalic = new CanvasKit.TextStyle({
+            fontStyle: {
+                weight: CanvasKit.FontWeight.Bold,
+                slant: CanvasKit.FontSlant.Italic,
+            }
+        });
+        builder.pushStyle(boldItalic);
+        builder.addText(`Bold, Italic\n`);
+        builder.pop();
+        const paragraph = builder.build();
+        paragraph.layout(wrapTo);
+
+        builder.reset();
+        builder.addText('This builder has been reused\n');
+
+        builder.pushStyle(boldItalic);
+        builder.addText(`2 Bold, Italic\n`);
+        builder.pop();
+        builder.addText(`2 back to normal`);
+        const paragraph2 = builder.build();
+        paragraph2.layout(wrapTo);
+
+        canvas.drawParagraph(paragraph, 10, 10);
+        canvas.drawParagraph(paragraph2, 10, 100);
+
+        paragraph.delete();
+        paragraph2.delete();
+        fontMgr.delete();
+        builder.delete();
+    });
 });
diff --git a/third_party/skia/modules/canvaskit/tests/rtshader.spec.js b/third_party/skia/modules/canvaskit/tests/rtshader.spec.js
index f54acf83172c6..4220ebea99402 100644
--- a/third_party/skia/modules/canvaskit/tests/rtshader.spec.js
+++ b/third_party/skia/modules/canvaskit/tests/rtshader.spec.js
@@ -14,8 +14,6 @@ describe('Runtime shader effects', () => {
         document.body.removeChild(container);
     });
 
-    // On the SW backend, atan is not supported - a shader is returned, but
-    // it will draw blank.
     const spiralSkSL = `
 uniform float rad_scale;
 uniform int2   in_center;
@@ -67,7 +65,6 @@ half4 main(float2 p) {
             CANVAS_WIDTH/2, CANVAS_HEIGHT/2,
             1, 0, 0, 1, // solid red
             0, 1, 0, 1], // solid green
-            true, /*=opaque*/
             localMatrix);
         paint.setShader(shader);
         canvas.drawRect(CanvasKit.LTRBRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT), paint);
@@ -96,6 +93,63 @@ half4 main(float2 p) {
         expect(error).toContain('error');
     });
 
+    it('can generate a debug trace', () => {
+        // We don't support debug tracing on GPU, so we always request a software canvas here.
+        const surface = CanvasKit.MakeSWCanvasSurface('test');
+        expect(surface).toBeTruthy('Could not make surface');
+        if (!surface) {
+            return;
+        }
+        const spiral = CanvasKit.RuntimeEffect.Make(spiralSkSL);
+        expect(spiral).toBeTruthy('could not compile program');
+
+        const canvas = surface.getCanvas();
+        const paint = new CanvasKit.Paint();
+        const shader = spiral.makeShader([
+            0.3,
+            CANVAS_WIDTH/2, CANVAS_HEIGHT/2,
+            1, 0, 0, 1,   // solid red
+            0, 1, 0, 1]); // solid green
+
+        const traced = CanvasKit.RuntimeEffect.MakeTraced(shader, CANVAS_WIDTH/2, CANVAS_HEIGHT/2);
+        paint.setShader(traced.shader);
+        canvas.drawRect(CanvasKit.LTRBRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT), paint);
+
+        const traceData = traced.debugTrace.writeTrace();
+        paint.delete();
+        shader.delete();
+        spiral.delete();
+        traced.shader.delete();
+        traced.debugTrace.delete();
+        surface.delete();
+
+        const parsedTrace = JSON.parse(traceData);
+        expect(parsedTrace).toBeTruthy('could not parse trace JSON');
+        expect(parsedTrace.functions).toBeTruthy('debug trace does not include function list');
+        expect(parsedTrace.slots).toBeTruthy('debug trace does not include slot list');
+        expect(parsedTrace.trace).toBeTruthy('debug trace does not include trace data');
+        expect(parsedTrace.nonsense).toBeFalsy('debug trace includes a nonsense key');
+        expect(parsedTrace.mystery).toBeFalsy('debug trace includes a mystery key');
+        expect(parsedTrace.source).toEqual([
+            "",
+            "uniform float rad_scale;",
+            "uniform int2   in_center;",
+            "uniform float4 in_colors0;",
+            "uniform float4 in_colors1;",
+            "",
+            "half4 main(float2 p) {",
+            "    float2 pp = p - float2(in_center);",
+            "    float radius = sqrt(dot(pp, pp));",
+            "    radius = sqrt(radius);",
+            "    float angle = atan(pp.y / pp.x);",
+            "    float t = (angle + 3.1415926/2) / (3.1415926);",
+            "    t += radius * rad_scale;",
+            "    t = fract(t);",
+            "    return half4(mix(in_colors0, in_colors1, t));",
+            "}"
+        ]);
+    });
+
     const loadBrick = fetch(
         '/assets/brickwork-texture.jpg')
         .then((response) => response.arrayBuffer());
@@ -143,21 +197,21 @@ half4 main(float2 xy) {
                     CanvasKit.TileMode.Decal, CanvasKit.TileMode.Decal,
                     1/3 /*B*/, 1/3 /*C*/,
                     CanvasKit.Matrix.scaled(CANVAS_WIDTH/brickImg.width(),
-                                              CANVAS_HEIGHT/brickImg.height()));
+                                            CANVAS_HEIGHT/brickImg.height()));
                 const mandrillShader = mandrillImg.makeShaderCubic(
                     CanvasKit.TileMode.Decal, CanvasKit.TileMode.Decal,
                     1/3 /*B*/, 1/3 /*C*/,
                     CanvasKit.Matrix.scaled(CANVAS_WIDTH/mandrillImg.width(),
-                                              CANVAS_HEIGHT/mandrillImg.height()));
+                                            CANVAS_HEIGHT/mandrillImg.height()));
                 const spiralShader = spiralEffect.makeShader([
                     0.8,
                     CANVAS_WIDTH/2, CANVAS_HEIGHT/2,
                     1, 1, 1, 1,
-                    0, 0, 0, 1], true);
+                    0, 0, 0, 1]);
 
                 const blendShader = thresholdEffect.makeShaderWithChildren(
                     [0.5, 5],
-                    true, [brickShader, mandrillShader, spiralShader], localMatrix);
+                    [brickShader, mandrillShader, spiralShader], localMatrix);
 
                 const surface = CanvasKit.MakeCanvasSurface('test');
                 expect(surface).toBeTruthy('Could not make surface');
diff --git a/third_party/skia/modules/canvaskit/wasm_tools/gms.html b/third_party/skia/modules/canvaskit/wasm_tools/gms.html
index e5ee00dfec7e6..3b92677cd1838 100644
--- a/third_party/skia/modules/canvaskit/wasm_tools/gms.html
+++ b/third_party/skia/modules/canvaskit/wasm_tools/gms.html
@@ -4,7 +4,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-<script type="text/javascript" src="/build/gm_bindings.js"></script>
+<script type="text/javascript" src="/build/wasm_gm_tests.js"></script>
 
 <p id="log"></p>
 <!-- Makes png visible to user -->
@@ -35,5 +35,7 @@
     const bmp = await createImageBitmap(b);
     const canvasCtx = document.getElementById("png_canvas").getContext("2d");
     canvasCtx.drawImage(bmp, 0, 0);
+
+    GM.ListTests();
   }
 </script>
\ No newline at end of file
diff --git a/third_party/skia/modules/particles/BUILD.bazel b/third_party/skia/modules/particles/BUILD.bazel
new file mode 100644
index 0000000000000..b577f764403d1
--- /dev/null
+++ b/third_party/skia/modules/particles/BUILD.bazel
@@ -0,0 +1,12 @@
+cc_library(
+    name = "particles",
+    hdrs = ["//modules/particles/include:hdrs"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/particles/src:SkParticleBinding_src",
+        "//modules/particles/src:SkParticleDrawable_src",
+        "//modules/particles/src:SkParticleEffect_src",
+        "//modules/particles/src:SkReflected_src",
+        "//modules/skresources",
+    ],
+)
diff --git a/third_party/skia/modules/particles/include/BUILD.bazel b/third_party/skia/modules/particles/include/BUILD.bazel
new file mode 100644
index 0000000000000..728530d2b4a6c
--- /dev/null
+++ b/third_party/skia/modules/particles/include/BUILD.bazel
@@ -0,0 +1,78 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+filegroup(
+    name = "hdrs",
+    srcs = [
+        "SkParticleBinding.h",
+        "SkParticleData.h",
+        "SkParticleDrawable.h",
+        "SkParticleEffect.h",
+        "SkParticleSerialization.h",
+        "SkReflected.h",
+    ],
+    visibility = ["//modules/particles:__pkg__"],
+)
+
+generated_cc_atom(
+    name = "SkParticleBinding_hdr",
+    hdrs = ["SkParticleBinding.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkReflected_hdr",
+        "//include/core:SkString_hdr",
+        "//src/sksl/ir:SkSLExternalFunction_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkParticleData_hdr",
+    hdrs = ["SkParticleData.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/private:SkTemplates_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkParticleDrawable_hdr",
+    hdrs = ["SkParticleDrawable.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkReflected_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkParticleEffect_hdr",
+    hdrs = ["SkParticleEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkParticleData_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkParticleSerialization_hdr",
+    hdrs = ["SkParticleSerialization.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkReflected_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+        "//src/utils:SkJSONWriter_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkReflected_hdr",
+    hdrs = ["SkReflected.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/particles/src/BUILD.bazel b/third_party/skia/modules/particles/src/BUILD.bazel
new file mode 100644
index 0000000000000..9ec194a3f25a6
--- /dev/null
+++ b/third_party/skia/modules/particles/src/BUILD.bazel
@@ -0,0 +1,71 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SkParticleBinding_src",
+    srcs = ["SkParticleBinding.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkContourMeasure_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//modules/particles/include:SkParticleBinding_hdr",
+        "//modules/particles/include:SkReflected_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/core:SkVM_hdr",
+        "//src/shaders:SkShaderBase_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkParticleDrawable_src",
+    srcs = ["SkParticleDrawable.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRSXform_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/particles/include:SkParticleData_hdr",
+        "//modules/particles/include:SkParticleDrawable_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkParticleEffect_src",
+    srcs = ["SkParticleEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPaint_hdr",
+        "//include/private:SkOnce_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/particles/include:SkParticleBinding_hdr",
+        "//modules/particles/include:SkParticleDrawable_hdr",
+        "//modules/particles/include:SkParticleEffect_hdr",
+        "//modules/particles/include:SkReflected_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+        "//src/core:SkPaintPriv_hdr",
+        "//src/core:SkVM_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLUtil_hdr",
+        "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkReflected_src",
+    srcs = ["SkReflected.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/particles/include:SkReflected_hdr"],
+)
diff --git a/third_party/skia/modules/particles/src/SkParticleBinding.cpp b/third_party/skia/modules/particles/src/SkParticleBinding.cpp
index d53ed6a3f689b..09b9a63ed2666 100644
--- a/third_party/skia/modules/particles/src/SkParticleBinding.cpp
+++ b/third_party/skia/modules/particles/src/SkParticleBinding.cpp
@@ -225,8 +225,10 @@ class SkImageBinding : public SkParticleBinding {
     }
 
     void prepare(const skresources::ResourceProvider* resourceProvider) override {
+        SkASSERT(resourceProvider);
         if (auto asset = resourceProvider->loadImageAsset(fImagePath.c_str(), fImageName.c_str(),
                                                           nullptr)) {
+            SkASSERT(asset);
             if (auto image = asset->getFrame(0)) {
                 SkMatrix normalize = SkMatrix::Scale(1.0f / image->width(), 1.0f / image->height());
                 fShader = image->makeShader(SkSamplingOptions(SkFilterMode::kLinear), &normalize);
diff --git a/third_party/skia/modules/particles/src/SkParticleEffect.cpp b/third_party/skia/modules/particles/src/SkParticleEffect.cpp
index 41a3bf919a9e6..5b9b4c728a7e3 100644
--- a/third_party/skia/modules/particles/src/SkParticleEffect.cpp
+++ b/third_party/skia/modules/particles/src/SkParticleEffect.cpp
@@ -137,7 +137,7 @@ void SkParticleEffectParams::prepare(const skresources::ResourceProvider* resour
         fDrawable->prepare(resourceProvider);
     }
 
-    auto buildProgram = [this](const SkSL::String& code) -> std::unique_ptr<SkParticleProgram> {
+    auto buildProgram = [this](const std::string& code) -> std::unique_ptr<SkParticleProgram> {
         std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Standalone();
         SkSL::Compiler compiler(caps.get());
 
@@ -146,7 +146,7 @@ void SkParticleEffectParams::prepare(const skresources::ResourceProvider* resour
         // and after it's populated, the values never need to be touched again.
         // The second uniform arg is for things declared as 'uniform' in the SkSL (including the
         // built-in declarations of 'dt' and 'effect').
-        skvm::Uniforms efUniforms(skvm::UPtr{0}, 0);
+        skvm::Uniforms efUniforms(skvm::UPtr{{0}}, 0);
         auto alloc = std::make_unique<SkArenaAlloc>(0);
 
         std::vector<std::unique_ptr<SkSL::ExternalFunction>> externalFns;
@@ -208,7 +208,7 @@ void SkParticleEffectParams::prepare(const skresources::ResourceProvider* resour
                                                    std::move(uniformInfo));
     };
 
-    SkSL::String particleCode(kCommonHeader);
+    std::string particleCode(kCommonHeader);
     particleCode.append(fCode.c_str());
 
     if (auto prog = buildProgram(particleCode)) {
diff --git a/third_party/skia/modules/pathkit/.gitignore b/third_party/skia/modules/pathkit/.gitignore
index 6e849a1c1f888..b64a59f91accb 100644
--- a/third_party/skia/modules/pathkit/.gitignore
+++ b/third_party/skia/modules/pathkit/.gitignore
@@ -1,3 +1,8 @@
 **/bin
 node_modules/
-package-lock.json
\ No newline at end of file
+build/
+package-lock.json
+# We copy the CHANGELOG into the bundle shipped to CanvasKit, but we do not
+# want to check that in.
+npm-asmjs/CHANGELOG.md
+npm-wasm/CHANGELOG.md
\ No newline at end of file
diff --git a/third_party/skia/modules/pathkit/CHANGELOG.md b/third_party/skia/modules/pathkit/CHANGELOG.md
index ce93034276d25..5d7192e4f4e53 100644
--- a/third_party/skia/modules/pathkit/CHANGELOG.md
+++ b/third_party/skia/modules/pathkit/CHANGELOG.md
@@ -6,8 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] 2022-02-03
+
 ### Changed
- - Now compile with emsdk 2.0.20
+ - Now compile with emsdk 3.1.3
+ - Internal calls no longer use dynamic dispatch (skbug.com/12795)
+ - WASM Memory can grow beyond initial 32MB
+ - The debug and test builds of PathKit are no longer published to NPM.
 
 ## [0.7.0] 2019-07-20
 
diff --git a/third_party/skia/modules/pathkit/Makefile b/third_party/skia/modules/pathkit/Makefile
index 5260093b3fc35..83f5fcf0360c0 100644
--- a/third_party/skia/modules/pathkit/Makefile
+++ b/third_party/skia/modules/pathkit/Makefile
@@ -1,145 +1,47 @@
-build:
+debug:
+	./compile.sh debug
+	- rm -rf build/
+	mkdir  -p ./build/wasm ./build/asmjs
+	cp ../../out/pathkit/pathkit.js     ./build/wasm/pathkit.js
+	cp ../../out/pathkit/pathkit.wasm   ./build/wasm/pathkit.wasm
+
+	./compile.sh asm.js debug
+	cp ../../out/pathkit/pathkit.js     ./build/asmjs/pathkit.js
+
+release:
 	./compile.sh
+	- rm -rf build/
+	mkdir  -p ./build/wasm ./build/asmjs
+	cp ../../out/pathkit/pathkit.js     ./build/wasm/pathkit.js
+	cp ../../out/pathkit/pathkit.wasm   ./build/wasm/pathkit.wasm
 
-npm: npm-test npm-debug
-	mkdir -p ./npm-wasm/bin
-	mkdir -p ./npm-asmjs/bin
+	./compile.sh asm.js
+	cp ../../out/pathkit/pathkit.js     ./build/asmjs/pathkit.js
+	cp ../../out/pathkit/pathkit.js.mem ./build/asmjs/pathkit.js.mem
+
+npm:
+	rm -rf ./npm-wasm/bin ./npm-asmjs/bin
+	mkdir -p ./npm-wasm/bin ./npm-asmjs/bin
 	./compile.sh
 	cp ../../out/pathkit/pathkit.js   ./npm-wasm/bin
 	cp ../../out/pathkit/pathkit.wasm ./npm-wasm/bin
 	./compile.sh asm.js
 	cp ../../out/pathkit/pathkit.js     ./npm-asmjs/bin/pathkit.js
 	cp ../../out/pathkit/pathkit.js.mem ./npm-asmjs/bin/pathkit.js.mem
-
-publish:
-	cd npm-wasm; npm publish
-	cd npm-asmjs; npm publish
-
-update-major:
-	cd npm-wasm; npm version major
-	cd ../npm-asmjs; npm version major
-	echo "Don't forget to publish."
-
-update-minor:
-	cd npm-wasm; npm version minor
-	cd npm-asmjs; npm version minor
-	echo "Don't forget to publish."
-
-update-patch:
-	cd npm-wasm; npm version patch
-	cd npm-asmjs; npm version patch
-	echo "Don't forget to publish."
-
-# Build the library and run the tests. If developing locally, test-continuous is better
-# suited for that, although if you make changes to the C++/WASM code, you will need
-# to manually call make npm-test to re-build.
-test: npm-test
-	npm install
-	npx karma start ./karma.conf.js --single-run
-	ASM_JS=1 npx karma start ./karma.conf.js --single-run
+	cp CHANGELOG.md ./npm-wasm
+	cp CHANGELOG.md ./npm-asmjs
 
 test-continuous:
-	echo "Assuming npm install has been run by user"
-	echo "Also assuming make npm-test has also been run by a user (if needed)"
+	echo "Assuming npm ci has been run by user"
+	echo "Also assuming make debug or make release has also been run by a user (if needed)"
 	npx karma start ./karma.conf.js --no-single-run --watch-poll
 
 test-continuous-asmjs:
-	echo "Assuming npm install has been run by user"
-	echo "Also assuming make npm-test has also been run by a user (if needed)"
+	echo "Assuming npm ci has been run by user"
+	echo "Also assuming make debug or make release has also been run by a user (if needed)"
 	ASM_JS=1 npx karma start ./karma.conf.js --no-single-run --watch-poll
 
-# Build the library and run the tests using the docker image.  If developing locally,
-# test-docker-continuous is better, although if you make changes to the C++/WASM code,
-# you will need to manually call make npm-test to re-build.
-test-docker:
-	mkdir -p ./npm-wasm/bin/test
-	mkdir -p ./npm-asmjs/bin/test
-	mkdir -p $$SKIA_ROOT/out/dockerbuild
-
-	docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \
-gcr.io/skia-public/emsdk-base:prod /SRC/infra/pathkit/build_pathkit.sh
-	cp ../../out/dockerbuild/pathkit.js   ./npm-wasm/bin/test/pathkit.js
-	cp ../../out/dockerbuild/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm
-
-	docker run --rm -v $$SKIA_ROOT:/SRC -v $$SKIA_ROOT/out/dockerbuild:/OUT \
-gcr.io/skia-public/emsdk-base:prod /SRC/infra/pathkit/build_pathkit.sh asm.js
-	cp ../../out/dockerbuild/pathkit.js     ./npm-asmjs/bin/test/pathkit.js
-	cp ../../out/dockerbuild/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem
-
-	docker run --shm-size=2gb -v $$SKIA_ROOT:/SRC gcr.io/skia-public/karma-chrome-tests:72.0.3626.121_v1 \
-karma start /SRC/modules/pathkit/karma.conf.js --single-run
-	docker run --shm-size=2gb -v $$SKIA_ROOT:/SRC -e ASM_JS=1 gcr.io/skia-public/karma-chrome-tests:72.0.3626.121_v1 \
-karma start /SRC/modules/pathkit/karma.conf.js --single-run
-
-test-docker-continuous:
-	echo "Assuming make npm-test has also been run by a user (if needed)"
-	docker run --shm-size=2gb -v $$SKIA_ROOT:/SRC gcr.io/skia-public/karma-chrome-tests:72.0.3626.121_v1 \
-karma start /SRC/modules/pathkit/karma.conf.js --no-single-run
-
-test-docker-continuous-asmjs:
-	echo "Assuming make npm-test has also been run by a user (if needed)"
-	docker run --shm-size=2gb -v $$SKIA_ROOT:/SRC -e ASM_JS=1 gcr.io/skia-public/karma-chrome-tests:72.0.3626.121_v1 \
-karma start /SRC/modules/pathkit/karma.conf.js --no-single-run
-
-npm-test:
-	# This compile time is typically faster than release and good for use with
-	# local-example-test
-	mkdir -p ./npm-wasm/bin/test
-	mkdir -p ./npm-asmjs/bin/test
-	./compile.sh test
-	cp ../../out/pathkit/pathkit.js   ./npm-wasm/bin/test/pathkit.js
-	cp ../../out/pathkit/pathkit.wasm ./npm-wasm/bin/test/pathkit.wasm
-	./compile.sh asm.js test
-	cp ../../out/pathkit/pathkit.js     ./npm-asmjs/bin/test/pathkit.js
-	cp ../../out/pathkit/pathkit.js.mem ./npm-asmjs/bin/test/pathkit.js.mem
-
-npm-debug:
-	# This compile time is typically faster than release and good for use with
-	# local-example-test
-	mkdir -p ./npm-wasm/bin/debug
-	mkdir -p ./npm-asmjs/bin/debug
-	./compile.sh debug
-	cp ../../out/pathkit/pathkit.js     ./npm-wasm/bin/debug/pathkit.js
-	cp ../../out/pathkit/pathkit.wasm   ./npm-wasm/bin/debug/pathkit.wasm
-
-	./compile.sh asm.js debug
-	cp ../../out/pathkit/pathkit.js     ./npm-asmjs/bin/debug/pathkit.js
-
-
-example:
-	npm install pathkit-asmjs pathkit-wasm
-	echo "Go check out localhost:8000/npm-wasm/example.html"
-	python3 ../../tools/serve_wasm.py
-
 local-example:
-	rm -rf node_modules/pathkit-wasm
-	rm -rf node_modules/pathkit-asmjs
-	mkdir -p node_modules
-	ln -s -T ../npm-wasm  node_modules/pathkit-wasm
-	ln -s -T ../npm-asmjs node_modules/pathkit-asmjs
 	echo "Go check out http://localhost:8000/npm-wasm/example.html"
 	echo "or http://localhost:8000/npm-asmjs/example.html"
 	python3 ../../tools/serve_wasm.py
-
-local-example-test:
-	rm -rf node_modules/pathkit-wasm
-	rm -rf node_modules/pathkit-asmjs
-	mkdir -p node_modules/pathkit-wasm
-	mkdir -p node_modules/pathkit-asmjs
-	ln -s -T ../../npm-wasm/bin/test node_modules/pathkit-wasm/bin
-	ln -s -T ../../npm-asmjs/bin/test node_modules/pathkit-asmjs/bin
-	echo "Go check out localhost:8000/npm-wasm/example.html"
-	echo "or http://localhost:8000/npm-asmjs/example.html"
-	python3 ../../tools/serve_wasm.py
-
-local-example-debug:
-	rm -rf node_modules/pathkit-wasm
-	rm -rf node_modules/pathkit-asmjs
-	mkdir -p node_modules/pathkit-wasm
-	mkdir -p node_modules/pathkit-asmjs
-	ln -s -T ../../npm-wasm/bin/debug node_modules/pathkit-wasm/bin
-	ln -s -T ../../npm-asmjs/bin/debug node_modules/pathkit-asmjs/bin
-	echo "Go check out localhost:8000/npm-wasm/example.html"
-	echo "or http://localhost:8000/npm-asmjs/example.html"
-	python3 ../../tools/serve_wasm.py
-
diff --git a/third_party/skia/modules/pathkit/README.md b/third_party/skia/modules/pathkit/README.md
index e3316bfa7df3b..ab963eb518a8f 100644
--- a/third_party/skia/modules/pathkit/README.md
+++ b/third_party/skia/modules/pathkit/README.md
@@ -14,17 +14,14 @@ Set the EMSDK environment variable to the directory you installed it to.
 Run `./compile.sh` to compile a production, WASM build to `$SKIA_HOME/out/pathkit`.
 Add "--help" for more options.
 
-
 Deploying to npm
 ----------------
 
-    # Build all 3 versions (release, test, debug) for both asmjs and WASM
+    # Build the release version for both asmjs and WASM
     # These binaries will be placed in the proper places of npm-*/bin
-    # This takes 5-10 minutes.
     make npm
 
-    # Update the package.json files of both npm-asmjs and npm-wasm
-    make update-patch  # or update-minor or update-major
-
-    # Publish both repos
-    make publish
+    # In each npm- subdirectory, run:
+    npm version minor (or patch or major)
+    npm login --registry https://wombat-dressing-room.appspot.com
+    npm publish
diff --git a/third_party/skia/modules/pathkit/compile.sh b/third_party/skia/modules/pathkit/compile.sh
index d45496669f90b..8b29199197135 100755
--- a/third_party/skia/modules/pathkit/compile.sh
+++ b/third_party/skia/modules/pathkit/compile.sh
@@ -49,7 +49,7 @@ fi
 # Use -O0 for larger builds (but generally quicker)
 # Use -Oz for (much slower, but smaller/faster) production builds
 export EMCC_CLOSURE_ARGS="--externs $BASE_DIR/externs.js "
-RELEASE_CONF="-Oz --closure 1 -s EVAL_CTORS=1 -DSK_RELEASE"
+RELEASE_CONF="-Oz --closure 1 -DSK_RELEASE"
 # It is very important for the -DSK_RELEASE/-DSK_DEBUG to match on the libskia.a, otherwise
 # things like SKDEBUGCODE are sometimes compiled in and sometimes not, which can cause headaches
 # like sizeof() mismatching between .cpp files and .h files.
@@ -60,21 +60,19 @@ if [[ $@ == *test* ]]; then
 elif [[ $@ == *debug* ]]; then
   echo "Building a Debug build"
   EXTRA_CFLAGS="\"-DSK_DEBUG\""
-  RELEASE_CONF="-O0 --js-opts 0 -s SAFE_HEAP=1 -s ASSERTIONS=1 -g3 -DPATHKIT_TESTING -DSK_DEBUG"
+  RELEASE_CONF="-O0 --js-opts 0 -sSAFE_HEAP=1 -sASSERTIONS=1 -g3 -DPATHKIT_TESTING -DSK_DEBUG"
 fi
 
-WASM_CONF="-s WASM=1"
+WASM_CONF="-sWASM=1"
 if [[ $@ == *asm.js* ]]; then
   echo "Building with asm.js instead of WASM"
-  WASM_CONF="-s WASM=0 -s ALLOW_MEMORY_GROWTH=1"
+  WASM_CONF="-sWASM=0 -sALLOW_MEMORY_GROWTH=1"
 fi
 
 OUTPUT="-o $BUILD_DIR/pathkit.js"
 
 source $EMSDK/emsdk_env.sh
-EMCC=`which emcc`
 EMCXX=`which em++`
-EMAR=`which emar`
 
 # Turn off exiting while we check for ninja (which may not be on PATH)
 set +e
@@ -90,11 +88,9 @@ echo "Compiling bitcode"
 
 ./bin/fetch-gn
 ./bin/gn gen ${BUILD_DIR} \
-  --args="cc=\"${EMCC}\" \
-  cxx=\"${EMCXX}\" \
-  ar=\"${EMAR}\" \
-  extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\",
-    \"-s\", \"MAIN_MODULE=1\",
+  --args="skia_emsdk_dir=\"${EMSDK}\" \
+  extra_cflags=[
+    \"-sMAIN_MODULE=1\",
     ${EXTRA_CFLAGS}
   ] \
   is_debug=false \
@@ -115,12 +111,15 @@ ${EMCXX} $RELEASE_CONF -std=c++17 \
 --pre-js $BASE_DIR/chaining.js \
 -fno-rtti -fno-exceptions -DEMSCRIPTEN_HAS_UNBOUND_TYPE_NAMES=0 \
 $WASM_CONF \
--s ERROR_ON_UNDEFINED_SYMBOLS=1 \
--s EXPORT_NAME="PathKitInit" \
--s MODULARIZE=1 \
--s NO_EXIT_RUNTIME=1 \
--s NO_FILESYSTEM=1 \
--s STRICT=1 \
+-sERROR_ON_UNDEFINED_SYMBOLS=1 \
+-sEXPORT_NAME="PathKitInit" \
+-sMODULARIZE=1 \
+-sNO_EXIT_RUNTIME=1 \
+-sNO_FILESYSTEM=1 \
+-sDYNAMIC_EXECUTION=0 \
+-sINITIAL_MEMORY=32MB \
+-sALLOW_MEMORY_GROWTH=1 \
+-sSTRICT=1 \
 $OUTPUT \
 $BASE_DIR/pathkit_wasm_bindings.cpp \
 ${BUILD_DIR}/libpathkit.a
diff --git a/third_party/skia/modules/pathkit/karma.conf.js b/third_party/skia/modules/pathkit/karma.conf.js
index 04ef0231b77c0..0d84576bfb71c 100644
--- a/third_party/skia/modules/pathkit/karma.conf.js
+++ b/third_party/skia/modules/pathkit/karma.conf.js
@@ -10,16 +10,16 @@ module.exports = function(config) {
 
     // list of files / patterns to load in the browser
     files: [
-      { pattern: 'npm-wasm/bin/test/pathkit.wasm', included:false, served:true},
+      { pattern: 'build/wasm/pathkit.wasm', included:false, served:true},
       { pattern: 'tests/*.json', included:false, served:true},
       'tests/testReporter.js',
-      'npm-wasm/bin/test/pathkit.js',
+      'build/wasm/pathkit.js',
       'tests/pathkitinit.js',
       'tests/*.spec.js'
     ],
 
     proxies: {
-      '/pathkit/': '/base/npm-wasm/bin/test/'
+      '/pathkit/': '/base/build/wasm/'
     },
 
     // test results reporter to use
@@ -79,16 +79,16 @@ module.exports = function(config) {
   if (process.env.ASM_JS) {
     console.log('asm.js is under test');
     cfg.files = [
-      { pattern: 'npm-asmjs/bin/test/pathkit.js.mem', included:false, served:true},
+      { pattern: 'build/asmjs/pathkit.js.mem', included:false, served:true},
       { pattern: 'tests/*.json', included:false, served:true},
       'tests/testReporter.js',
-      'npm-asmjs/bin/test/pathkit.js',
+      'build/asmjs/pathkit.js',
       'tests/pathkitinit.js',
       'tests/*.spec.js'
     ];
 
     cfg.proxies = {
-      '/pathkit/': '/base/npm-asmjs/bin/test/'
+      '/pathkit/': '/base/build/asmjs/'
     };
   } else {
     console.log('wasm is under test');
diff --git a/third_party/skia/modules/pathkit/npm-asmjs/example.html b/third_party/skia/modules/pathkit/npm-asmjs/example.html
index c50c453e1afc1..e018621e8cd05 100644
--- a/third_party/skia/modules/pathkit/npm-asmjs/example.html
+++ b/third_party/skia/modules/pathkit/npm-asmjs/example.html
@@ -47,12 +47,12 @@ <h2> Supports fill-rules of nonzero and evenodd </h2>
 <h2> Solves Cubics for Y given X </h2>
 <canvas class=big id=cubics></canvas>
 
-<script type="text/javascript" src="/node_modules/pathkit-asmjs/bin/pathkit.js"></script>
+<script type="text/javascript" src="/build/asmjs/pathkit.js"></script>
 
 <script type="text/javascript" charset="utf-8">
 
   PathKitInit({
-    locateFile: (file) => '/node_modules/pathkit-asmjs/bin/'+file,
+    locateFile: (file) => '/build/asmjs/'+file,
   }).then((PathKit) => {
     window.PathKit = PathKit;
     OutputsExample(PathKit);
diff --git a/third_party/skia/modules/pathkit/npm-asmjs/package.json b/third_party/skia/modules/pathkit/npm-asmjs/package.json
index fcd4a7bc3b428..fed44c3abc608 100644
--- a/third_party/skia/modules/pathkit/npm-asmjs/package.json
+++ b/third_party/skia/modules/pathkit/npm-asmjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pathkit-asmjs",
-  "version": "0.7.0",
+  "version": "1.0.0",
   "description": "A asm.js version of Skia's PathOps toolkit",
   "main": "bin/pathkit.js",
   "homepage": "https://github.com/google/skia/tree/main/modules/pathkit",
@@ -9,7 +9,7 @@
   },
   "permsRepo": "skia-dev/.github",
   "publishConfig": {
-    "registry":"https://wombat-dressing-room.appspot.com"
+    "registry": "https://wombat-dressing-room.appspot.com"
   },
   "license": "BSD-3-Clause"
 }
diff --git a/third_party/skia/modules/pathkit/npm-wasm/example.html b/third_party/skia/modules/pathkit/npm-wasm/example.html
index 488f6ecbed875..6ba64c149f3cb 100644
--- a/third_party/skia/modules/pathkit/npm-wasm/example.html
+++ b/third_party/skia/modules/pathkit/npm-wasm/example.html
@@ -47,12 +47,12 @@ <h2> Supports fill-rules of nonzero and evenodd </h2>
 <h2> Solves Cubics for Y given X </h2>
 <canvas class=big id=cubics></canvas>
 
-<script type="text/javascript" src="/node_modules/pathkit-wasm/bin/pathkit.js"></script>
+<script type="text/javascript" src="/build/wasm/pathkit.js"></script>
 
 <script type="text/javascript" charset="utf-8">
 
   PathKitInit({
-    locateFile: (file) => '/node_modules/pathkit-wasm/bin/'+file,
+    locateFile: (file) => '/build/wasm/'+file,
   }).then((PathKit) => {
     window.PathKit = PathKit;
     OutputsExample(PathKit);
diff --git a/third_party/skia/modules/pathkit/npm-wasm/package.json b/third_party/skia/modules/pathkit/npm-wasm/package.json
index d37354d8b8811..73ba3a7d07d5a 100644
--- a/third_party/skia/modules/pathkit/npm-wasm/package.json
+++ b/third_party/skia/modules/pathkit/npm-wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pathkit-wasm",
-  "version": "0.7.0",
+  "version": "1.0.0",
   "description": "A WASM version of Skia's PathOps toolkit",
   "main": "bin/pathkit.js",
   "homepage": "https://github.com/google/skia/tree/main/modules/pathkit",
@@ -9,7 +9,7 @@
   },
   "permsRepo": "skia-dev/.github",
   "publishConfig": {
-    "registry":"https://wombat-dressing-room.appspot.com"
+    "registry": "https://wombat-dressing-room.appspot.com"
   },
   "license": "BSD-3-Clause"
 }
diff --git a/third_party/skia/modules/pathkit/package-lock.json b/third_party/skia/modules/pathkit/package-lock.json
index 8994c95f43e71..9890b4dcfab01 100644
--- a/third_party/skia/modules/pathkit/package-lock.json
+++ b/third_party/skia/modules/pathkit/package-lock.json
@@ -274,26 +274,50 @@
       "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
       "dev": true
     },
+    "@socket.io/base64-arraybuffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz",
+      "integrity": "sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==",
+      "dev": true
+    },
+    "@types/component-emitter": {
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz",
+      "integrity": "sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==",
+      "dev": true
+    },
+    "@types/cookie": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
+      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
+      "dev": true
+    },
+    "@types/cors": {
+      "version": "2.8.12",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
+      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==",
+      "dev": true
+    },
+    "@types/node": {
+      "version": "17.0.17",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.17.tgz",
+      "integrity": "sha512-e8PUNQy1HgJGV3iU/Bp2+D/DXh3PYeyli8LgIwsQcs1Ar1LoaWHSIT6Rw+H2rNJmiq6SNWiDytfx8+gYj7wDHw==",
+      "dev": true
+    },
     "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       }
     },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
-    },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true
     },
     "ansi-styles": {
@@ -306,88 +330,49 @@
       }
     },
     "anymatch": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "arraybuffer.slice": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "base64-arraybuffer": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz",
-      "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=",
-      "dev": true
-    },
     "base64id": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
       "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
       "dev": true
     },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "dev": true,
-      "requires": {
-        "callsite": "1.0.0"
-      }
-    },
     "binary-extensions": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-      "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-      "dev": true
-    },
-    "blob": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
     "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz",
+      "integrity": "sha512-8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
+        "bytes": "3.1.1",
         "content-type": "~1.0.4",
         "debug": "2.6.9",
         "depd": "~1.1.2",
-        "http-errors": "1.7.2",
+        "http-errors": "1.8.1",
         "iconv-lite": "0.4.24",
         "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
+        "qs": "6.9.6",
+        "raw-body": "2.4.2",
+        "type-is": "~1.6.18"
       }
     },
     "brace-expansion": {
@@ -410,21 +395,9 @@
       }
     },
     "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true
-    },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz",
+      "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==",
       "dev": true
     },
     "chalk": {
@@ -465,30 +438,30 @@
       }
     },
     "chokidar": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz",
-      "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.1.2",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
       }
     },
     "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "wrap-ansi": "^7.0.0"
       }
     },
     "color-convert": {
@@ -512,22 +485,10 @@
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true
     },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-      "dev": true
-    },
     "component-emitter": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-      "dev": true
-    },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
     "concat-map": {
@@ -564,11 +525,21 @@
       }
     },
     "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz",
+      "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==",
       "dev": true
     },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "dev": true,
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
     "custom-event": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
@@ -576,9 +547,9 @@
       "dev": true
     },
     "date-format": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-3.0.0.tgz",
-      "integrity": "sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-4.0.3.tgz",
+      "integrity": "sha512-7P3FyqDcfeznLZp2b+OMitV9Sz2lUnsT87WaTat9nVwqsBkTzPG3lPLNwW3en6F4pHUiWzr6vb8CLhjdK9bcxQ==",
       "dev": true
     },
     "debug": {
@@ -590,12 +561,6 @@
         "ms": "2.0.0"
       }
     },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
     "depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -639,104 +604,47 @@
       "dev": true
     },
     "engine.io": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.2.tgz",
-      "integrity": "sha512-b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==",
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz",
+      "integrity": "sha512-v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==",
       "dev": true,
       "requires": {
+        "@types/cookie": "^0.4.1",
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
-        "cookie": "0.3.1",
-        "debug": "~4.1.0",
-        "engine.io-parser": "~2.2.0",
-        "ws": "^7.1.2"
+        "cookie": "~0.4.1",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.0.0",
+        "ws": "~8.2.3"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.4.tgz",
-      "integrity": "sha512-iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "~1.3.0",
-        "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.2.0",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parseqs": "0.0.6",
-        "parseuri": "0.0.6",
-        "ws": "~6.1.0",
-        "xmlhttprequest-ssl": "~1.5.4",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-          "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "parseqs": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.6.tgz",
-          "integrity": "sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==",
-          "dev": true
-        },
-        "parseuri": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.6.tgz",
-          "integrity": "sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
-        },
-        "ws": {
-          "version": "6.1.4",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-          "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "~1.0.0"
-          }
         }
       }
     },
     "engine.io-parser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.1.tgz",
-      "integrity": "sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz",
+      "integrity": "sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==",
       "dev": true,
       "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
-        "base64-arraybuffer": "0.1.4",
-        "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
+        "@socket.io/base64-arraybuffer": "~1.0.2"
       }
     },
     "ent": {
@@ -745,6 +653,12 @@
       "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
       "dev": true
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -793,37 +707,27 @@
         "unpipe": "~1.0.0"
       }
     },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
     "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz",
+      "integrity": "sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==",
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
-      "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
     "fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
+      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       }
     },
     "fs.realpath": {
@@ -833,9 +737,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true
     },
@@ -852,9 +756,9 @@
       "dev": true
     },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
       "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
@@ -866,9 +770,9 @@
       }
     },
     "glob-parent": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
@@ -881,24 +785,9 @@
       "dev": true
     },
     "graceful-fs": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
-      "dev": true
-    },
-    "has-binary2": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-      "dev": true,
-      "requires": {
-        "isarray": "2.0.1"
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "version": "4.2.9",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
+      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
       "dev": true
     },
     "has-flag": {
@@ -914,16 +803,16 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz",
+      "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==",
       "dev": true,
       "requires": {
         "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
         "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
+        "toidentifier": "1.0.1"
       }
     },
     "http-proxy": {
@@ -946,12 +835,6 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -963,9 +846,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
     "is-binary-path": {
@@ -996,9 +879,9 @@
       "dev": true
     },
     "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
@@ -1010,16 +893,10 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
-    "isarray": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-      "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-      "dev": true
-    },
     "isbinaryfile": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.6.tgz",
-      "integrity": "sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz",
+      "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==",
       "dev": true
     },
     "isexe": {
@@ -1140,43 +1017,52 @@
       }
     },
     "jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.6"
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
       }
     },
     "karma": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-5.2.3.tgz",
-      "integrity": "sha512-tHdyFADhVVPBorIKCX8A37iLHxc6RBRphkSoQ+MLKdAtFn1k97tD8WUGi1KlEtDZKL3hui0qhsY9HXUfSNDYPQ==",
+      "version": "6.3.14",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-6.3.14.tgz",
+      "integrity": "sha512-SDFoU5F4LdosEiUVWUDRPCV/C1zQRNtIakx7rWkigf7R4sxGADlSEeOma4S1f/js7YAzvqLW92ByoiQptg+8oQ==",
       "dev": true,
       "requires": {
         "body-parser": "^1.19.0",
         "braces": "^3.0.2",
-        "chokidar": "^3.4.2",
-        "colors": "^1.4.0",
+        "chokidar": "^3.5.1",
+        "colors": "1.4.0",
         "connect": "^3.7.0",
         "di": "^0.0.1",
         "dom-serialize": "^2.2.1",
-        "glob": "^7.1.6",
-        "graceful-fs": "^4.2.4",
+        "glob": "^7.1.7",
+        "graceful-fs": "^4.2.6",
         "http-proxy": "^1.18.1",
-        "isbinaryfile": "^4.0.6",
-        "lodash": "^4.17.19",
-        "log4js": "^6.2.1",
-        "mime": "^2.4.5",
+        "isbinaryfile": "^4.0.8",
+        "lodash": "^4.17.21",
+        "log4js": "^6.4.1",
+        "mime": "^2.5.2",
         "minimatch": "^3.0.4",
         "qjobs": "^1.2.0",
         "range-parser": "^1.2.1",
         "rimraf": "^3.0.2",
-        "socket.io": "^2.3.0",
+        "socket.io": "^4.2.0",
         "source-map": "^0.6.1",
-        "tmp": "0.2.1",
-        "ua-parser-js": "0.7.22",
-        "yargs": "^15.3.1"
+        "tmp": "^0.2.1",
+        "ua-parser-js": "^0.7.30",
+        "yargs": "^16.1.1"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.21",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+          "dev": true
+        }
       }
     },
     "karma-chrome-launcher": {
@@ -1211,15 +1097,6 @@
         "jasmine-core": "^3.6.0"
       }
     },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
     "lodash": {
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
@@ -1227,22 +1104,22 @@
       "dev": true
     },
     "log4js": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.3.0.tgz",
-      "integrity": "sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.4.1.tgz",
+      "integrity": "sha512-iUiYnXqAmNKiIZ1XSAitQ4TmNs8CdZYTAWINARF3LjnsLN8tY5m0vRwd6uuWj/yNY0YHxeZodnbmxKFUOM2rMg==",
       "dev": true,
       "requires": {
-        "date-format": "^3.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.1",
-        "rfdc": "^1.1.4",
-        "streamroller": "^2.2.4"
+        "date-format": "^4.0.3",
+        "debug": "^4.3.3",
+        "flatted": "^3.2.4",
+        "rfdc": "^1.3.0",
+        "streamroller": "^3.0.2"
       },
       "dependencies": {
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -1272,24 +1149,24 @@
       "dev": true
     },
     "mime": {
-      "version": "2.4.6",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-      "integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
       "dev": true
     },
     "mime-db": {
-      "version": "1.44.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
+      "version": "1.51.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
+      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.27",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "version": "2.1.34",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
+      "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
       "dev": true,
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.51.0"
       }
     },
     "minimatch": {
@@ -1314,9 +1191,9 @@
       "dev": true
     },
     "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
     "normalize-path": {
@@ -1325,10 +1202,10 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
       "dev": true
     },
     "on-finished": {
@@ -1349,60 +1226,12 @@
         "wrappy": "1"
       }
     },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
     "parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1410,9 +1239,9 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
     "qjobs": {
@@ -1422,9 +1251,9 @@
       "dev": true
     },
     "qs": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-      "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+      "version": "6.9.6",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz",
+      "integrity": "sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ==",
       "dev": true
     },
     "range-parser": {
@@ -1434,21 +1263,21 @@
       "dev": true
     },
     "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz",
+      "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==",
       "dev": true,
       "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
+        "bytes": "3.1.1",
+        "http-errors": "1.8.1",
         "iconv-lite": "0.4.24",
         "unpipe": "1.0.0"
       }
     },
     "readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
@@ -1460,12 +1289,6 @@
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
       "dev": true
     },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
     "requirejs": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz",
@@ -1479,9 +1302,9 @@
       "dev": true
     },
     "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
       "dev": true
     },
     "rimraf": {
@@ -1511,158 +1334,73 @@
       "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
       "dev": true
     },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
     "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "socket.io": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz",
-      "integrity": "sha512-2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz",
+      "integrity": "sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==",
       "dev": true,
       "requires": {
-        "debug": "~4.1.0",
-        "engine.io": "~3.4.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
-        "socket.io-client": "2.3.0",
-        "socket.io-parser": "~3.4.0"
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "debug": "~4.3.2",
+        "engine.io": "~6.1.0",
+        "socket.io-adapter": "~2.3.3",
+        "socket.io-parser": "~4.0.4"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
     },
     "socket.io-adapter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz",
-      "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz",
+      "integrity": "sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==",
       "dev": true
     },
-    "socket.io-client": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz",
-      "integrity": "sha512-cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA==",
-      "dev": true,
-      "requires": {
-        "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "~4.1.0",
-        "engine.io-client": "~3.4.0",
-        "has-binary2": "~1.0.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "~3.3.0",
-        "to-array": "0.1.4"
-      },
-      "dependencies": {
-        "base64-arraybuffer": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-          "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-          "dev": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-          "dev": true
-        },
-        "socket.io-parser": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.1.tgz",
-          "integrity": "sha512-1QLvVAe8dTz+mKmZ07Swxt+LAo4Y1ff50rlyoEx00TQmDFVQYPfcqGvIDJLGaBdhdNCecXtyKpD+EgKGcmmbuQ==",
-          "dev": true,
-          "requires": {
-            "component-emitter": "~1.3.0",
-            "debug": "~3.1.0",
-            "isarray": "2.0.1"
-          },
-          "dependencies": {
-            "component-emitter": {
-              "version": "1.3.0",
-              "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-              "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-              "dev": true
-            },
-            "debug": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-              "dev": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "ms": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-              "dev": true
-            }
-          }
-        }
-      }
-    },
     "socket.io-parser": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz",
-      "integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz",
+      "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==",
       "dev": true,
       "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "~4.1.0",
-        "isarray": "2.0.1"
+        "@types/component-emitter": "^1.2.10",
+        "component-emitter": "~1.3.0",
+        "debug": "~4.3.1"
       },
       "dependencies": {
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
         },
         "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         }
       }
@@ -1680,26 +1418,20 @@
       "dev": true
     },
     "streamroller": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz",
-      "integrity": "sha512-OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.0.2.tgz",
+      "integrity": "sha512-ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA==",
       "dev": true,
       "requires": {
-        "date-format": "^2.1.0",
+        "date-format": "^4.0.3",
         "debug": "^4.1.1",
-        "fs-extra": "^8.1.0"
+        "fs-extra": "^10.0.0"
       },
       "dependencies": {
-        "date-format": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-          "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
-          "dev": true
-        },
         "debug": {
-          "version": "4.3.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-          "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "dev": true,
           "requires": {
             "ms": "2.1.2"
@@ -1714,23 +1446,23 @@
       }
     },
     "string-width": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-      "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.0"
+        "strip-ansi": "^6.0.1"
       }
     },
     "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
       "requires": {
-        "ansi-regex": "^5.0.0"
+        "ansi-regex": "^5.0.1"
       }
     },
     "supports-color": {
@@ -1751,12 +1483,6 @@
         "rimraf": "^3.0.0"
       }
     },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -1773,9 +1499,9 @@
       }
     },
     "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "type-is": {
@@ -1789,15 +1515,15 @@
       }
     },
     "ua-parser-js": {
-      "version": "0.7.22",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
-      "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==",
+      "version": "0.7.31",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz",
+      "integrity": "sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==",
       "dev": true
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
     "unpipe": {
@@ -1812,6 +1538,12 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
       "dev": true
     },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+      "dev": true
+    },
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
@@ -1827,16 +1559,10 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
     "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
@@ -1851,56 +1577,36 @@
       "dev": true
     },
     "ws": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.1.tgz",
-      "integrity": "sha512-pTsP8UAfhy3sk1lSk/O/s4tjD0CRwvMnzvwr4OKGX7ZvqZtUyx4KIJB5JWbkykPoc55tixMGgTNoh3k4FkNGFQ==",
-      "dev": true
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "version": "8.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz",
+      "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==",
       "dev": true
     },
     "y18n": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-      "integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true
     },
     "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
       "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
         "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
       }
     },
     "yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    },
-    "yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
     }
   }
diff --git a/third_party/skia/modules/pathkit/package.json b/third_party/skia/modules/pathkit/package.json
index ea255840cfed3..1b9d6bea51f65 100644
--- a/third_party/skia/modules/pathkit/package.json
+++ b/third_party/skia/modules/pathkit/package.json
@@ -8,7 +8,7 @@
   "devDependencies": {
     "is-docker": "~1.1.0",
     "jasmine-core": "~3.6.0",
-    "karma": "~5.2.3",
+    "karma": "~6.3.14",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "~2.0.3",
     "karma-jasmine": "~4.0.1",
diff --git a/third_party/skia/modules/skottie/BUILD.bazel b/third_party/skia/modules/skottie/BUILD.bazel
new file mode 100644
index 0000000000000..4f8734d1b80ed
--- /dev/null
+++ b/third_party/skia/modules/skottie/BUILD.bazel
@@ -0,0 +1,91 @@
+cc_library(
+    name = "skottie",
+    hdrs = ["//modules/skottie/include:hdrs"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/src:Camera_src",
+        "//modules/skottie/src:Composition_src",
+        "//modules/skottie/src:Layer_src",
+        "//modules/skottie/src:Path_src",
+        "//modules/skottie/src:SkottieJson_src",
+        "//modules/skottie/src:SkottieProperty_src",
+        "//modules/skottie/src:Skottie_src",
+        "//modules/skottie/src:Transform_src",
+        "//modules/skottie/src/animator:Animator_src",
+        "//modules/skottie/src/animator:KeyframeAnimator_src",
+        "//modules/skottie/src/animator:ScalarKeyframeAnimator_src",
+        "//modules/skottie/src/animator:ShapeKeyframeAnimator_src",
+        "//modules/skottie/src/animator:TextKeyframeAnimator_src",
+        "//modules/skottie/src/animator:Vec2KeyframeAnimator_src",
+        "//modules/skottie/src/animator:VectorKeyframeAnimator_src",
+        "//modules/skottie/src/effects:BlackAndWhiteEffect_src",
+        "//modules/skottie/src/effects:BrightnessContrastEffect_src",
+        "//modules/skottie/src/effects:BuldgeEffect_src",
+        "//modules/skottie/src/effects:CCTonerEffect_src",
+        "//modules/skottie/src/effects:CornerPinEffect_src",
+        "//modules/skottie/src/effects:DirectionalBlur_src",
+        "//modules/skottie/src/effects:DisplacementMapEffect_src",
+        "//modules/skottie/src/effects:DropShadowEffect_src",
+        "//modules/skottie/src/effects:Effects_src",
+        "//modules/skottie/src/effects:FillEffect_src",
+        "//modules/skottie/src/effects:FractalNoiseEffect_src",
+        "//modules/skottie/src/effects:GaussianBlurEffect_src",
+        "//modules/skottie/src/effects:GlowStyles_src",
+        "//modules/skottie/src/effects:GradientEffect_src",
+        "//modules/skottie/src/effects:HueSaturationEffect_src",
+        "//modules/skottie/src/effects:InvertEffect_src",
+        "//modules/skottie/src/effects:LevelsEffect_src",
+        "//modules/skottie/src/effects:LinearWipeEffect_src",
+        "//modules/skottie/src/effects:MotionBlurEffect_src",
+        "//modules/skottie/src/effects:MotionTileEffect_src",
+        "//modules/skottie/src/effects:RadialWipeEffect_src",
+        "//modules/skottie/src/effects:ShadowStyles_src",
+        "//modules/skottie/src/effects:SharpenEffect_src",
+        "//modules/skottie/src/effects:ShiftChannelsEffect_src",
+        "//modules/skottie/src/effects:SkSLEffect_src",
+        "//modules/skottie/src/effects:SphereEffect_src",
+        "//modules/skottie/src/effects:ThresholdEffect_src",
+        "//modules/skottie/src/effects:TintEffect_src",
+        "//modules/skottie/src/effects:TransformEffect_src",
+        "//modules/skottie/src/effects:TritoneEffect_src",
+        "//modules/skottie/src/effects:VenetianBlindsEffect_src",
+        "//modules/skottie/src/layers:AudioLayer_src",
+        "//modules/skottie/src/layers:FootageLayer_src",
+        "//modules/skottie/src/layers:NullLayer_src",
+        "//modules/skottie/src/layers:PrecompLayer_src",
+        "//modules/skottie/src/layers:SolidLayer_src",
+        "//modules/skottie/src/layers:TextLayer_src",
+        "//modules/skottie/src/layers/shapelayer:Ellipse_src",
+        "//modules/skottie/src/layers/shapelayer:FillStroke_src",
+        "//modules/skottie/src/layers/shapelayer:Gradient_src",
+        "//modules/skottie/src/layers/shapelayer:MergePaths_src",
+        "//modules/skottie/src/layers/shapelayer:OffsetPaths_src",
+        "//modules/skottie/src/layers/shapelayer:Polystar_src",
+        "//modules/skottie/src/layers/shapelayer:PuckerBloat_src",
+        "//modules/skottie/src/layers/shapelayer:Rectangle_src",
+        "//modules/skottie/src/layers/shapelayer:Repeater_src",
+        "//modules/skottie/src/layers/shapelayer:RoundCorners_src",
+        "//modules/skottie/src/layers/shapelayer:ShapeLayer_src",
+        "//modules/skottie/src/layers/shapelayer:TrimPaths_src",
+        "//modules/skottie/src/text:RangeSelector_src",
+        "//modules/skottie/src/text:SkottieShaper_src",
+        "//modules/skottie/src/text:TextAdapter_src",
+        "//modules/skottie/src/text:TextAnimator_src",
+        "//modules/skottie/src/text:TextValue_src",
+        "//modules/skresources",
+        "//modules/sksg",
+        "//modules/skshaper",
+        "//modules/skunicode",
+        "//src/utils:json_srcs",
+    ],
+)
+
+cc_library(
+    name = "utils",
+    hdrs = ["//modules/skottie/utils:hdrs"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":skottie",
+        "//modules/skottie/utils:SkottieUtils_src",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/fuzz/BUILD.bazel b/third_party/skia/modules/skottie/fuzz/BUILD.bazel
new file mode 100644
index 0000000000000..6982b725029a0
--- /dev/null
+++ b/third_party/skia/modules/skottie/fuzz/BUILD.bazel
@@ -0,0 +1,14 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "FuzzSkottieJSON_src",
+    srcs = ["FuzzSkottieJSON.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//src/core:SkFontMgrPriv_hdr",
+        "//tools/fonts:TestFontMgr_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/gm/BUILD.bazel b/third_party/skia/modules/skottie/gm/BUILD.bazel
new file mode 100644
index 0000000000000..522c47707cba6
--- /dev/null
+++ b/third_party/skia/modules/skottie/gm/BUILD.bazel
@@ -0,0 +1,33 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "ExternalProperties_src",
+    srcs = ["ExternalProperties.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//gm:gm_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/utils:SkAnimCodecPlayer_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/utils:SkottieUtils_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieGM_src",
+    srcs = ["SkottieGM.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//gm:gm_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/utils:SkAnimCodecPlayer_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/utils:SkottieUtils_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/include/BUILD.bazel b/third_party/skia/modules/skottie/include/BUILD.bazel
new file mode 100644
index 0000000000000..e31061df3ec90
--- /dev/null
+++ b/third_party/skia/modules/skottie/include/BUILD.bazel
@@ -0,0 +1,48 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+filegroup(
+    name = "hdrs",
+    srcs = [
+        "ExternalLayer.h",
+        "Skottie.h",
+        "SkottieProperty.h",
+    ],
+    visibility = ["//modules/skottie:__pkg__"],
+)
+
+generated_cc_atom(
+    name = "ExternalLayer_hdr",
+    hdrs = ["ExternalLayer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkottieProperty_hdr",
+    hdrs = ["SkottieProperty.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/utils:SkTextUtils_hdr",
+        "//modules/skottie/src/text:SkottieShaper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skottie_hdr",
+    hdrs = ["Skottie.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ExternalLayer_hdr",
+        ":SkottieProperty_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/skottie.gni b/third_party/skia/modules/skottie/skottie.gni
index 037d6d21681bb..87242f8d78a1c 100644
--- a/third_party/skia/modules/skottie/skottie.gni
+++ b/third_party/skia/modules/skottie/skottie.gni
@@ -64,6 +64,7 @@ skia_skottie_sources = [
   "$_src/effects/MotionTileEffect.cpp",
   "$_src/effects/RadialWipeEffect.cpp",
   "$_src/effects/ShadowStyles.cpp",
+  "$_src/effects/SharpenEffect.cpp",
   "$_src/effects/ShiftChannelsEffect.cpp",
   "$_src/effects/SkSLEffect.cpp",
   "$_src/effects/SphereEffect.cpp",
diff --git a/third_party/skia/modules/skottie/src/BUILD.bazel b/third_party/skia/modules/skottie/src/BUILD.bazel
new file mode 100644
index 0000000000000..1be2828376ad6
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/BUILD.bazel
@@ -0,0 +1,270 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "Adapter_hdr",
+    hdrs = ["Adapter.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/skottie/src/animator:Animator_hdr"],
+)
+
+generated_cc_atom(
+    name = "Camera_hdr",
+    hdrs = ["Camera.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Transform_hdr"],
+)
+
+generated_cc_atom(
+    name = "Camera_src",
+    srcs = ["Camera.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Camera_hdr",
+        ":SkottieJson_hdr",
+        ":SkottiePriv_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Composition_hdr",
+    hdrs = ["Composition.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Layer_hdr",
+        ":SkottiePriv_hdr",
+        "//include/private:SkTHash_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Composition_src",
+    srcs = ["Composition.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Camera_hdr",
+        ":Composition_hdr",
+        ":SkottieJson_hdr",
+        ":SkottiePriv_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Layer_hdr",
+    hdrs = ["Layer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkottiePriv_hdr"],
+)
+
+generated_cc_atom(
+    name = "Layer_src",
+    srcs = ["Layer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Camera_hdr",
+        ":Composition_hdr",
+        ":Layer_hdr",
+        ":SkottieJson_hdr",
+        "//modules/skottie/src/effects:Effects_hdr",
+        "//modules/skottie/src/effects:MotionBlurEffect_hdr",
+        "//modules/sksg/include:SkSGClipEffect_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGMaskEffect_hdr",
+        "//modules/sksg/include:SkSGMerge_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Path_src",
+    srcs = ["Path.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Adapter_hdr",
+        ":SkottieJson_hdr",
+        ":SkottiePriv_hdr",
+        ":SkottieValue_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieJson_hdr",
+    hdrs = ["SkottieJson.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRefCnt_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieJson_src",
+    srcs = ["SkottieJson.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkottieJson_hdr",
+        ":SkottieValue_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottiePriv_hdr",
+    hdrs = ["SkottiePriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/private:SkTHash_hdr",
+        "//include/utils:SkCustomTypeface_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieProperty_src",
+    srcs = ["SkottieProperty.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Transform_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/src/text:TextAdapter_hdr",
+        "//modules/sksg/include:SkSGOpacityEffect_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieTest_src",
+    srcs = ["SkottieTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/src/text:SkottieShaper_hdr",
+        "//src/core:SkFontDescriptor_hdr",
+        "//src/core:SkTextBlobPriv_hdr",
+        "//tests:Test_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieTool_src",
+    srcs = ["SkottieTool.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/ffmpeg:SkVideoEncoder_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/utils:SkottieUtils_hdr",
+        "//modules/skresources/include:SkResources_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkTaskGroup_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieValue_hdr",
+    hdrs = ["SkottieValue.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColor_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skottie_src",
+    srcs = ["Skottie.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Composition_hdr",
+        ":SkottieJson_hdr",
+        ":SkottiePriv_hdr",
+        ":SkottieValue_hdr",
+        ":Transform_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/private:SkTo_hdr",
+        "//modules/skottie/include:ExternalLayer_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//modules/skottie/src/text:TextAdapter_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGOpacityEffect_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+        "//src/core:SkTraceEvent_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Transform_hdr",
+    hdrs = ["Transform.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Adapter_hdr",
+        ":SkottieValue_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPoint_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Transform_src",
+    srcs = ["Transform.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkottieJson_hdr",
+        ":SkottiePriv_hdr",
+        ":Transform_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/Layer.cpp b/third_party/skia/modules/skottie/src/Layer.cpp
index 7ecf5a84ba3c4..1057a6fe70d9f 100644
--- a/third_party/skia/modules/skottie/src/Layer.cpp
+++ b/third_party/skia/modules/skottie/src/Layer.cpp
@@ -450,12 +450,11 @@ sk_sp<sksg::RenderNode> LayerBuilder::buildRenderTree(const AnimationBuilder& ab
         { nullptr                              ,                 0 },  // 'ty': 14 -> light
     };
 
-    const auto type = SkToSizeT(fType);
-    if (type >= SK_ARRAY_COUNT(gLayerBuildInfo)) {
+    if (fType < 0 || static_cast<size_t>(fType) >= SK_ARRAY_COUNT(gLayerBuildInfo)) {
         return nullptr;
     }
 
-    const auto& build_info = gLayerBuildInfo[type];
+    const auto& build_info = gLayerBuildInfo[fType];
 
     // Switch to the layer animator scope (which at this point holds transform-only animators).
     AnimationBuilder::AutoScope ascope(&abuilder, std::move(fLayerScope));
diff --git a/third_party/skia/modules/skottie/src/Skottie.cpp b/third_party/skia/modules/skottie/src/Skottie.cpp
index f1e62dd311c17..8c96b52a7984e 100644
--- a/third_party/skia/modules/skottie/src/Skottie.cpp
+++ b/third_party/skia/modules/skottie/src/Skottie.cpp
@@ -38,7 +38,7 @@
 #include <cmath>
 #include <memory>
 
-#include "stdlib.h"
+#include <stdlib.h>
 
 namespace skottie {
 
@@ -114,11 +114,10 @@ static SkBlendMode GetBlendMode(const skjson::ObjectValue& jobject,
         SkBlendMode::kPlus,       // 16:'add'
     };
 
-    const auto bm_index = ParseDefault<size_t>(jobject["bm"], 0);
+    const size_t bm_index = ParseDefault<size_t>(jobject["bm"], 0);
     if (bm_index >= SK_ARRAY_COUNT(kBlendModeMap)) {
-            abuilder->log(Logger::Level::kWarning, &jobject,
-                          "Unsupported blend mode %lu\n", bm_index);
-            return SkBlendMode::kSrcOver;
+        abuilder->log(Logger::Level::kWarning, &jobject, "Unsupported blend mode %zu\n", bm_index);
+        return SkBlendMode::kSrcOver;
     }
 
     return kBlendModeMap[bm_index];
diff --git a/third_party/skia/modules/skottie/src/SkottieJson.cpp b/third_party/skia/modules/skottie/src/SkottieJson.cpp
index 3c569666a5129..e5ab8cf12ddf7 100644
--- a/third_party/skia/modules/skottie/src/SkottieJson.cpp
+++ b/third_party/skia/modules/skottie/src/SkottieJson.cpp
@@ -14,6 +14,7 @@
 #include "include/core/SkStream.h"
 #include "include/core/SkString.h"
 #include "modules/skottie/src/SkottieValue.h"
+#include <limits>
 #include <vector>
 
 namespace skottie {
@@ -57,8 +58,13 @@ template <typename T>
 bool ParseIntegral(const Value& v, T* result) {
     if (const skjson::NumberValue* num = v) {
         const auto dbl = **num;
+        if (dbl > static_cast<double>(std::numeric_limits<T>::max()) ||
+            dbl < static_cast<double>(std::numeric_limits<T>::min())) {
+            return false;
+        }
+
         *result = static_cast<T>(dbl);
-        return static_cast<double>(*result) == dbl;
+        return true;
     }
 
     return false;
diff --git a/third_party/skia/modules/skottie/src/SkottiePriv.h b/third_party/skia/modules/skottie/src/SkottiePriv.h
index 4e94383731c84..5e1307d4af94e 100644
--- a/third_party/skia/modules/skottie/src/SkottiePriv.h
+++ b/third_party/skia/modules/skottie/src/SkottiePriv.h
@@ -76,7 +76,7 @@ class AnimationBuilder final : public SkNoncopyable {
     };
     const FontInfo* findFont(const SkString& name) const;
 
-    void log(Logger::Level, const skjson::Value*, const char fmt[], ...) const;
+    void log(Logger::Level, const skjson::Value*, const char fmt[], ...) const SK_PRINTF_LIKE(4, 5);
 
     sk_sp<sksg::Transform> attachMatrix2D(const skjson::ObjectValue&, sk_sp<sksg::Transform>,
                                           bool auto_orient = false) const;
@@ -276,7 +276,7 @@ class AnimationBuilder final : public SkNoncopyable {
             }
         }
 
-        operator bool() const { return !!fInfo; }
+        explicit operator bool() const { return !!fInfo; }
 
         const skjson::ObjectValue& operator*() const { return *fInfo->fAsset; }
 
diff --git a/third_party/skia/modules/skottie/src/SkottieTest.cpp b/third_party/skia/modules/skottie/src/SkottieTest.cpp
index cbc79021ebf72..d7a322a10fd8d 100644
--- a/third_party/skia/modules/skottie/src/SkottieTest.cpp
+++ b/third_party/skia/modules/skottie/src/SkottieTest.cpp
@@ -861,3 +861,29 @@ DEF_TEST(Skottie_Image_Loading, reporter) {
         REPORTER_ASSERT(reporter, SkScalarNearlyEqual(multi_asset->requestedFrames()[1], 2));
     }
 }
+
+DEF_TEST(Skottie_Layer_NoType, r) {
+    static constexpr char json[] =
+        R"({
+             "v": "5.2.1",
+             "w": 100,
+             "h": 100,
+             "fr": 10,
+             "ip": 0,
+             "op": 100,
+             "layers": [
+               {
+                 "ind": 0,
+                 "ip": 0,
+                 "op": 100,
+                 "ks": {}
+               }
+             ]
+           })";
+
+    SkMemoryStream stream(json, strlen(json));
+    auto anim = Animation::Make(&stream);
+
+    // passes if we don't crash
+    REPORTER_ASSERT(r, anim);
+}
diff --git a/third_party/skia/modules/skottie/src/animator/BUILD.bazel b/third_party/skia/modules/skottie/src/animator/BUILD.bazel
new file mode 100644
index 0000000000000..1c2a8131645cf
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/animator/BUILD.bazel
@@ -0,0 +1,117 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "Animator_hdr",
+    hdrs = ["Animator.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkRefCnt_hdr"],
+)
+
+generated_cc_atom(
+    name = "Animator_src",
+    srcs = ["Animator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        ":KeyframeAnimator_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "KeyframeAnimator_hdr",
+    hdrs = ["KeyframeAnimator.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        "//include/core:SkCubicMap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/private:SkNoncopyable_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "KeyframeAnimator_src",
+    srcs = ["KeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":KeyframeAnimator_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ScalarKeyframeAnimator_src",
+    srcs = ["ScalarKeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        ":KeyframeAnimator_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShapeKeyframeAnimator_src",
+    srcs = ["ShapeKeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        ":VectorKeyframeAnimator_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextKeyframeAnimator_src",
+    srcs = ["TextKeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":KeyframeAnimator_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/text:TextValue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Vec2KeyframeAnimator_src",
+    srcs = ["Vec2KeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        ":KeyframeAnimator_hdr",
+        "//include/core:SkContourMeasure_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VectorKeyframeAnimator_hdr",
+    hdrs = ["VectorKeyframeAnimator.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":KeyframeAnimator_hdr"],
+)
+
+generated_cc_atom(
+    name = "VectorKeyframeAnimator_src",
+    srcs = ["VectorKeyframeAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Animator_hdr",
+        ":VectorKeyframeAnimator_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkNx_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//src/core:SkSafeMath_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/effects/BUILD.bazel b/third_party/skia/modules/skottie/src/effects/BUILD.bazel
new file mode 100644
index 0000000000000..25f2990ae956f
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/effects/BUILD.bazel
@@ -0,0 +1,480 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "BlackAndWhiteEffect_src",
+    srcs = ["BlackAndWhiteEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BrightnessContrastEffect_src",
+    srcs = ["BrightnessContrastEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BuldgeEffect_src",
+    srcs = ["BuldgeEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkNx_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CCTonerEffect_src",
+    srcs = ["CCTonerEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/private:SkNx_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CornerPinEffect_src",
+    srcs = ["CornerPinEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DirectionalBlur_src",
+    srcs = ["DirectionalBlur.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DisplacementMapEffect_src",
+    srcs = ["DisplacementMapEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkColorData_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DropShadowEffect_src",
+    srcs = ["DropShadowEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Effects_hdr",
+    hdrs = ["Effects.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/src:Composition_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Effects_src",
+    srcs = ["Effects.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:Composition_hdr",
+        "//modules/skottie/src:Layer_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FillEffect_src",
+    srcs = ["FillEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FractalNoiseEffect_src",
+    srcs = ["FractalNoiseEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GaussianBlurEffect_src",
+    srcs = ["GaussianBlurEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GlowStyles_src",
+    srcs = ["GlowStyles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GradientEffect_src",
+    srcs = ["GradientEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGradient_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "HueSaturationEffect_src",
+    srcs = ["HueSaturationEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "InvertEffect_src",
+    srcs = ["InvertEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LevelsEffect_src",
+    srcs = ["LevelsEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LinearWipeEffect_src",
+    srcs = ["LinearWipeEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MotionBlurEffect_hdr",
+    hdrs = ["MotionBlurEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MotionBlurEffect_src",
+    srcs = ["MotionBlurEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":MotionBlurEffect_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMath_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/private:SkVx_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//src/core:SkMathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MotionTileEffect_src",
+    srcs = ["MotionTileEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RadialWipeEffect_src",
+    srcs = ["RadialWipeEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShadowStyles_src",
+    srcs = ["ShadowStyles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SharpenEffect_src",
+    srcs = ["SharpenEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShiftChannelsEffect_src",
+    srcs = ["ShiftChannelsEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLEffect_src",
+    srcs = ["SkSLEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SphereEffect_src",
+    srcs = ["SphereEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ThresholdEffect_src",
+    srcs = ["ThresholdEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TintEffect_src",
+    srcs = ["TintEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TransformEffect_src",
+    srcs = ["TransformEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:Transform_hdr",
+        "//modules/sksg/include:SkSGOpacityEffect_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TritoneEffect_src",
+    srcs = ["TritoneEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VenetianBlindsEffect_src",
+    srcs = ["VenetianBlindsEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Effects_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkShaderMaskFilter_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/effects/BuldgeEffect.cpp b/third_party/skia/modules/skottie/src/effects/BuldgeEffect.cpp
index 99821ee2ef610..6e6dbc1895231 100644
--- a/third_party/skia/modules/skottie/src/effects/BuldgeEffect.cpp
+++ b/third_party/skia/modules/skottie/src/effects/BuldgeEffect.cpp
@@ -119,7 +119,7 @@ class BulgeNode final : public sksg::CustomRenderNode {
 
         const auto lm = SkMatrix::Translate(fCenter.x(), fCenter.y())
                       * SkMatrix::Scale(fRadius.x(), fRadius.y());
-        return builder.makeShader(&lm, false);
+        return builder.makeShader(&lm);
     }
 
     SkRect onRevalidate(sksg::InvalidationController* ic, const SkMatrix& ctm) override {
diff --git a/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp b/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp
index 198a715ec552d..b20f94d82a3d6 100644
--- a/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp
+++ b/third_party/skia/modules/skottie/src/effects/DisplacementMapEffect.cpp
@@ -237,7 +237,7 @@ class DisplacementNode final : public sksg::CustomRenderNode {
         builder.uniform("selector_offset") = selector_o;
 
         // TODO: RGB->HSL stage
-        return builder.makeShader(nullptr, false);
+        return builder.makeShader();
     }
 
     SkRect onRevalidate(sksg::InvalidationController* ic, const SkMatrix& ctm) override {
diff --git a/third_party/skia/modules/skottie/src/effects/Effects.cpp b/third_party/skia/modules/skottie/src/effects/Effects.cpp
index 42e3745a23dc9..1072b1e3f176b 100644
--- a/third_party/skia/modules/skottie/src/effects/Effects.cpp
+++ b/third_party/skia/modules/skottie/src/effects/Effects.cpp
@@ -50,6 +50,7 @@ EffectBuilder::EffectBuilderT EffectBuilder::findBuilder(const skjson::ObjectVal
         { "ADBE Pro Levels2"            , &EffectBuilder::attachProLevelsEffect          },
         { "ADBE Radial Wipe"            , &EffectBuilder::attachRadialWipeEffect         },
         { "ADBE Ramp"                   , &EffectBuilder::attachGradientEffect           },
+        { "ADBE Sharpen"                , &EffectBuilder::attachSharpenEffect            },
         { "ADBE Shift Channels"         , &EffectBuilder::attachShiftChannelsEffect      },
         { "ADBE Threshold2"             , &EffectBuilder::attachThresholdEffect          },
         { "ADBE Tile"                   , &EffectBuilder::attachMotionTileEffect         },
diff --git a/third_party/skia/modules/skottie/src/effects/Effects.h b/third_party/skia/modules/skottie/src/effects/Effects.h
index 1fb4689f0271a..39ed57e0565ac 100644
--- a/third_party/skia/modules/skottie/src/effects/Effects.h
+++ b/third_party/skia/modules/skottie/src/effects/Effects.h
@@ -79,6 +79,8 @@ class EffectBuilder final : public SkNoncopyable {
                                                            sk_sp<sksg::RenderNode>) const;
     sk_sp<sksg::RenderNode> attachRadialWipeEffect        (const skjson::ArrayValue&,
                                                            sk_sp<sksg::RenderNode>) const;
+    sk_sp<sksg::RenderNode> attachSharpenEffect            (const skjson::ArrayValue&,
+                                                           sk_sp<sksg::RenderNode>) const;
     sk_sp<sksg::RenderNode> attachShiftChannelsEffect     (const skjson::ArrayValue&,
                                                            sk_sp<sksg::RenderNode>) const;
     sk_sp<sksg::RenderNode> attachSkSLColorFilter         (const skjson::ArrayValue&,
diff --git a/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp b/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
index e64d5c00bf6d6..18c87fdbdb923 100644
--- a/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
+++ b/third_party/skia/modules/skottie/src/effects/FractalNoiseEffect.cpp
@@ -197,10 +197,6 @@ sk_sp<SkRuntimeEffect> make_noise_effect(unsigned loops, const char* filter, con
     auto result = SkRuntimeEffect::MakeForShader(
             SkStringPrintf(gNoiseEffectSkSL, filter, fractal, loops), {});
 
-    if (0 && !result.effect) {
-        printf("!!! %s\n", result.errorText.c_str());
-    }
-
     return std::move(result.effect);
 }
 
@@ -297,7 +293,7 @@ class FractalNoiseNode final : public sksg::CustomRenderNode {
             fSubMatrix.rc(0,2), fSubMatrix.rc(1,2), fSubMatrix.rc(2,2),
         };
 
-        return builder.makeShader(&fMatrix, false);
+        return builder.makeShader(&fMatrix);
     }
 
     SkRect onRevalidate(sksg::InvalidationController* ic, const SkMatrix& ctm) override {
diff --git a/third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp b/third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp
new file mode 100644
index 0000000000000..00cc120ed31a8
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/effects/SharpenEffect.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2021 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "modules/skottie/src/effects/Effects.h"
+
+#include "modules/skottie/src/Adapter.h"
+#include "modules/skottie/src/SkottieValue.h"
+#include "modules/sksg/include/SkSGPaint.h"
+#include "modules/sksg/include/SkSGRenderEffect.h"
+#include "src/utils/SkJSON.h"
+
+namespace skottie::internal {
+
+namespace {
+
+class SharpenAdapter final : public DiscardableAdapterBase<SharpenAdapter,
+                                                           sksg::ExternalImageFilter> {
+    public:
+        SharpenAdapter(const skjson::ArrayValue& jprops,
+                       const AnimationBuilder& abuilder)
+            : INHERITED(sksg::ExternalImageFilter::Make())
+        {
+            enum : size_t {
+                kSharpenAmount_Index  = 0,
+            };
+
+            EffectBinder(jprops, abuilder, this).bind(kSharpenAmount_Index, fAmount);
+        }
+    private:
+        void onSync() override {
+            SkScalar intensity = 1 + (fAmount * 0.01);
+            SkScalar discount = (1 - intensity) / 8.0;
+            SkScalar kernel[9] = {
+                discount, discount, discount,
+                discount, intensity, discount,
+                discount, discount, discount,
+            };
+            auto filter = SkImageFilters::MatrixConvolution(SkISize::Make(3,3), kernel, 1, 0,
+                                                            SkIPoint::Make(1,1), SkTileMode::kRepeat,
+                                                            true, nullptr);
+            this->node()->setImageFilter(std::move(filter));
+        }
+
+        ScalarValue fAmount = 0;
+
+        using INHERITED = DiscardableAdapterBase<SharpenAdapter, sksg::ExternalImageFilter>;
+};
+
+} // namespace
+
+sk_sp<sksg::RenderNode> EffectBuilder::attachSharpenEffect(const skjson::ArrayValue& jprops,
+                                                             sk_sp<sksg::RenderNode> layer) const {
+    auto imageFilterNode = fBuilder->attachDiscardableAdapter<SharpenAdapter>(jprops,
+                                                                              *fBuilder);
+    return sksg::ImageFilterEffect::Make(std::move(layer), std::move(imageFilterNode));
+}
+
+} // namespace skottie::internal
diff --git a/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp b/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
index 43ac5f2b6066a..00e139d91cd91 100644
--- a/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
+++ b/third_party/skia/modules/skottie/src/effects/SkSLEffect.cpp
@@ -139,7 +139,8 @@ class SkSLShaderAdapter final : public DiscardableAdapterBase<SkSLShaderAdapter,
         if (!fEffect) {
             return;
         }
-        sk_sp<SkShader> shader = fEffect->makeShader(buildUniformData(), {/* TODO: child support */}, &SkMatrix::I(), false);
+        sk_sp<SkShader> shader =
+                fEffect->makeShader(buildUniformData(), {/* TODO: child support */});
         this->node()->setShader(std::move(shader));
     }
 };
diff --git a/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp b/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
index 2490b040ef01b..a1a2117e5e847 100644
--- a/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
+++ b/third_party/skia/modules/skottie/src/effects/SphereEffect.cpp
@@ -220,7 +220,7 @@ class SphereNode final : public sksg::CustomRenderNode {
         const auto lm = SkMatrix::Translate(fCenter.fX, fCenter.fY) *
                         SkMatrix::Scale(fRadius, fRadius);
 
-        return builder.makeShader(&lm, false);
+        return builder.makeShader(&lm);
     }
 
     SkRect onRevalidate(sksg::InvalidationController* ic, const SkMatrix& ctm) override {
diff --git a/third_party/skia/modules/skottie/src/layers/BUILD.bazel b/third_party/skia/modules/skottie/src/layers/BUILD.bazel
new file mode 100644
index 0000000000000..a105299d47c98
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/layers/BUILD.bazel
@@ -0,0 +1,92 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "AudioLayer_src",
+    srcs = ["AudioLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FootageLayer_src",
+    srcs = ["FootageLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkImage_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/sksg/include:SkSGImage_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "NullLayer_src",
+    srcs = ["NullLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PrecompLayer_src",
+    srcs = ["PrecompLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/include:ExternalLayer_hdr",
+        "//modules/skottie/src:Composition_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SolidLayer_src",
+    srcs = ["SolidLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/utils:SkParse_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextLayer_src",
+    srcs = ["TextLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkData_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkTypes_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src/text:TextAdapter_hdr",
+        "//modules/skottie/src/text:TextAnimator_hdr",
+        "//modules/skottie/src/text:TextValue_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGText_hdr",
+        "//src/core:SkTSearch_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/layers/TextLayer.cpp b/third_party/skia/modules/skottie/src/layers/TextLayer.cpp
index ef458edb48124..ebdc0e828fc2c 100644
--- a/third_party/skia/modules/skottie/src/layers/TextLayer.cpp
+++ b/third_party/skia/modules/skottie/src/layers/TextLayer.cpp
@@ -170,15 +170,6 @@ bool AnimationBuilder::FontInfo::matches(const char family[], const char style[]
         && 0 == strcmp(fStyle.c_str(), style);
 }
 
-#ifdef SK_NO_FONTS
-void AnimationBuilder::parseFonts(const skjson::ObjectValue* jfonts,
-                                  const skjson::ArrayValue* jchars) {}
-
-sk_sp<sksg::RenderNode> AnimationBuilder::attachTextLayer(const skjson::ObjectValue& jlayer,
-                                                          LayerInfo*) const {
-    return nullptr;
-}
-#else
 void AnimationBuilder::parseFonts(const skjson::ObjectValue* jfonts,
                                   const skjson::ArrayValue* jchars) {
     // Optional array of font entries, referenced (by name) from text layer document nodes. E.g.
@@ -404,7 +395,6 @@ sk_sp<sksg::RenderNode> AnimationBuilder::attachTextLayer(const skjson::ObjectVa
                                                        fLazyFontMgr.getMaybeNull(),
                                                        fLogger);
 }
-#endif
 
 const AnimationBuilder::FontInfo* AnimationBuilder::findFont(const SkString& font_name) const {
     return fFonts.find(font_name);
diff --git a/third_party/skia/modules/skottie/src/layers/shapelayer/BUILD.bazel b/third_party/skia/modules/skottie/src/layers/shapelayer/BUILD.bazel
new file mode 100644
index 0000000000000..13f76de9b7522
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/layers/shapelayer/BUILD.bazel
@@ -0,0 +1,200 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "Ellipse_src",
+    srcs = ["Ellipse.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/core:SkRRect_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FillStroke_src",
+    srcs = ["FillStroke.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Gradient_src",
+    srcs = ["Gradient.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGradient_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MergePaths_src",
+    srcs = ["MergePaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OffsetPaths_src",
+    srcs = ["OffsetPaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Polystar_src",
+    srcs = ["Polystar.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PuckerBloat_src",
+    srcs = ["PuckerBloat.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/core:SkM44_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+        "//src/core:SkGeometry_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Rectangle_src",
+    srcs = ["Rectangle.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/core:SkRRect_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Repeater_src",
+    srcs = ["Repeater.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RoundCorners_src",
+    srcs = ["RoundCorners.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShapeLayer_hdr",
+    hdrs = ["ShapeLayer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/private:SkNoncopyable_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//modules/sksg/include:SkSGMerge_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShapeLayer_src",
+    srcs = ["ShapeLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//include/core:SkPath_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGMerge_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TrimPaths_src",
+    srcs = ["TrimPaths.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ShapeLayer_hdr",
+        "//modules/skottie/src:Adapter_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+        "//modules/sksg/include:SkSGMerge_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/text/BUILD.bazel b/third_party/skia/modules/skottie/src/text/BUILD.bazel
new file mode 100644
index 0000000000000..1b51f02bce337
--- /dev/null
+++ b/third_party/skia/modules/skottie/src/text/BUILD.bazel
@@ -0,0 +1,139 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "RangeSelector_hdr",
+    hdrs = ["RangeSelector.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TextAnimator_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RangeSelector_src",
+    srcs = ["RangeSelector.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RangeSelector_hdr",
+        "//include/core:SkCubicMap_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieShaper_hdr",
+    hdrs = ["SkottieShaper.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPoint_hdr",
+        "//include/utils:SkTextUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieShaper_src",
+    srcs = ["SkottieShaper.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkottieShaper_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//modules/skshaper/include:SkShaper_hdr",
+        "//modules/skunicode/include:SkUnicode_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/core:SkTextBlobPriv_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextAdapter_hdr",
+    hdrs = ["TextAdapter.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkottieShaper_hdr",
+        ":TextAnimator_hdr",
+        ":TextValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextAdapter_src",
+    srcs = ["TextAdapter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RangeSelector_hdr",
+        ":TextAdapter_hdr",
+        ":TextAnimator_hdr",
+        "//include/core:SkContourMeasure_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGText_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextAnimator_hdr",
+    hdrs = ["TextAnimator.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkM44_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextAnimator_src",
+    srcs = ["TextAnimator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RangeSelector_hdr",
+        ":TextAnimator_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/private:SkNx_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextValue_hdr",
+    hdrs = ["TextValue.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/skottie/include:SkottieProperty_hdr"],
+)
+
+generated_cc_atom(
+    name = "TextValue_src",
+    srcs = ["TextValue.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TextValue_hdr",
+        "//modules/skottie/src:SkottieJson_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/src/text/TextAdapter.cpp b/third_party/skia/modules/skottie/src/text/TextAdapter.cpp
index d63418a467b6d..f8dd41997dee1 100644
--- a/third_party/skia/modules/skottie/src/text/TextAdapter.cpp
+++ b/third_party/skia/modules/skottie/src/text/TextAdapter.cpp
@@ -472,6 +472,10 @@ void TextAdapter::reshape() {
             const auto msg = SkStringPrintf("Text layout failed for '%s'.",
                                             fText->fText.c_str());
             fLogger->log(Logger::Level::kError, msg.c_str());
+
+            // These may trigger repeatedly when the text is animating.
+            // To avoid spamming, only log once.
+            fLogger = nullptr;
         }
 
         if (shape_result.fMissingGlyphCount > 0) {
@@ -479,11 +483,8 @@ void TextAdapter::reshape() {
                                             shape_result.fMissingGlyphCount,
                                             fText->fText.c_str());
             fLogger->log(Logger::Level::kWarning, msg.c_str());
+            fLogger = nullptr;
         }
-
-        // These may trigger repeatedly when the text is animating.
-        // To avoid spamming, only log once.
-        fLogger = nullptr;
     }
 
     // Rebuild all fragments.
diff --git a/third_party/skia/modules/skottie/src/text/TextAnimator.cpp b/third_party/skia/modules/skottie/src/text/TextAnimator.cpp
index 8b88859729848..06c8216fb8564 100644
--- a/third_party/skia/modules/skottie/src/text/TextAnimator.cpp
+++ b/third_party/skia/modules/skottie/src/text/TextAnimator.cpp
@@ -15,6 +15,8 @@
 #include "modules/skottie/src/text/RangeSelector.h"
 #include "src/utils/SkJSON.h"
 
+#include <cmath>
+
 namespace skottie {
 namespace internal {
 
@@ -127,6 +129,9 @@ TextAnimator::ResolvedProps TextAnimator::modulateProps(const ResolvedProps& pro
     modulated_props.blur         += fTextProps.blur         * amount;
     modulated_props.line_spacing += fTextProps.line_spacing * amount;
 
+    const auto lerp = [](float v0, float v1, float t) {
+        return v0 + (v1 - v0)*t;
+    };
     const auto lerp_color = [](SkColor c0, SkColor c1, float t) {
         const auto c0_4f = SkNx_cast<float>(Sk4b::Load(&c0)),
                    c1_4f = SkNx_cast<float>(Sk4b::Load(&c1)),
@@ -137,37 +142,37 @@ TextAnimator::ResolvedProps TextAnimator::modulateProps(const ResolvedProps& pro
         return c;
     };
 
-    // Colors and opacity are overridden, and use a clamped amount value.
+    // Colors and opacity are interpolated, and use a clamped amount value.
     const auto clamped_amount = std::max(amount, 0.0f);
     if (fHasFillColor) {
-        const auto fc = static_cast<SkColor>(fTextProps.fill_color);
-        modulated_props.fill_color = lerp_color(props.fill_color, fc, clamped_amount);
+        modulated_props.fill_color = lerp_color(props.fill_color,
+                                                fTextProps.fill_color,
+                                                clamped_amount);
     }
     if (fHasStrokeColor) {
-        const auto sc = static_cast<SkColor>(fTextProps.stroke_color);
-        modulated_props.stroke_color = lerp_color(props.stroke_color, sc, clamped_amount);
+        modulated_props.stroke_color = lerp_color(props.stroke_color,
+                                                  fTextProps.stroke_color,
+                                                  clamped_amount);
     }
-
-    const auto modulate_opacity = [](float o0, float o1, float t) {
-        return o0 + o0*(o1 - 1)*t;
-    };
-
-    const auto adjust_opacity = [&](SkColor c, float o, float t) {
+    if (fHasFillOpacity) {
         // 255-based
-        const auto alpha = modulate_opacity(SkColorGetA(c), o, t);
-
-        return SkColorSetA(c, SkScalarRoundToInt(alpha));
-    };
-
-    modulated_props.fill_color = adjust_opacity(modulated_props.fill_color,
-                                                fTextProps.fill_opacity * 0.01f,
-                                                clamped_amount);
-    modulated_props.stroke_color = adjust_opacity(modulated_props.stroke_color,
-                                                  fTextProps.stroke_opacity * 0.01f,
-                                                  clamped_amount);
-    modulated_props.opacity = modulate_opacity(modulated_props.opacity,
-                                               fTextProps.opacity * 0.01f,
-                                               clamped_amount);
+        const auto alpha = lerp(SkColorGetA(props.fill_color),
+                                fTextProps.fill_opacity*2.55f,
+                                clamped_amount);
+        modulated_props.fill_color = SkColorSetA(modulated_props.fill_color,
+                                                 static_cast<U8CPU>(std::round(alpha)));
+    }
+    if (fHasStrokeOpacity) {
+        // 255-based
+        const auto alpha = lerp(SkColorGetA(props.stroke_color),
+                                fTextProps.stroke_opacity*2.55f,
+                                clamped_amount);
+        modulated_props.stroke_color = SkColorSetA(modulated_props.stroke_color,
+                                                   static_cast<U8CPU>(std::round(alpha)));
+    }
+    if (fHasOpacity) {
+        modulated_props.opacity = lerp(props.opacity, fTextProps.opacity*0.01f, clamped_amount);
+    }
 
     return modulated_props;
 }
@@ -180,9 +185,6 @@ TextAnimator::TextAnimator(std::vector<sk_sp<RangeSelector>>&& selectors,
     , fRequiresAnchorPoint(false) {
 
     acontainer->bind(*abuilder, jprops["p" ], fTextProps.position);
-    acontainer->bind(*abuilder, jprops["o" ], fTextProps.opacity);
-    acontainer->bind(*abuilder, jprops["fo"], fTextProps.fill_opacity);
-    acontainer->bind(*abuilder, jprops["so"], fTextProps.stroke_opacity);
     acontainer->bind(*abuilder, jprops["t" ], fTextProps.tracking);
     acontainer->bind(*abuilder, jprops["ls"], fTextProps.line_spacing);
 
@@ -195,9 +197,12 @@ TextAnimator::TextAnimator(std::vector<sk_sp<RangeSelector>>&& selectors,
     fRequiresAnchorPoint |= acontainer->bind(*abuilder, jprops["ry"], fTextProps.rotation.y);
     fRequiresAnchorPoint |= acontainer->bind(*abuilder, jprops["r" ], fTextProps.rotation.z);
 
-    fHasFillColor   = acontainer->bind(*abuilder, jprops["fc"], fTextProps.fill_color  );
-    fHasStrokeColor = acontainer->bind(*abuilder, jprops["sc"], fTextProps.stroke_color);
-    fHasBlur        = acontainer->bind(*abuilder, jprops["bl"], fTextProps.blur        );
+    fHasFillColor     = acontainer->bind(*abuilder, jprops["fc"], fTextProps.fill_color    );
+    fHasStrokeColor   = acontainer->bind(*abuilder, jprops["sc"], fTextProps.stroke_color  );
+    fHasFillOpacity   = acontainer->bind(*abuilder, jprops["fo"], fTextProps.fill_opacity  );
+    fHasStrokeOpacity = acontainer->bind(*abuilder, jprops["so"], fTextProps.stroke_opacity);
+    fHasOpacity       = acontainer->bind(*abuilder, jprops["o" ], fTextProps.opacity       );
+    fHasBlur          = acontainer->bind(*abuilder, jprops["bl"], fTextProps.blur          );
 }
 
 } // namespace internal
diff --git a/third_party/skia/modules/skottie/src/text/TextAnimator.h b/third_party/skia/modules/skottie/src/text/TextAnimator.h
index 467a7a637c5c6..5180a34570573 100644
--- a/third_party/skia/modules/skottie/src/text/TextAnimator.h
+++ b/third_party/skia/modules/skottie/src/text/TextAnimator.h
@@ -102,6 +102,9 @@ class TextAnimator final : public SkNVRefCnt<TextAnimator> {
     AnimatedProps fTextProps;
     bool          fHasFillColor        : 1,
                   fHasStrokeColor      : 1,
+                  fHasFillOpacity      : 1,
+                  fHasStrokeOpacity    : 1,
+                  fHasOpacity          : 1,
                   fHasBlur             : 1,
                   fRequiresAnchorPoint : 1; // animator sensitive to transform origin?
 };
diff --git a/third_party/skia/modules/skottie/tests/BUILD.bazel b/third_party/skia/modules/skottie/tests/BUILD.bazel
new file mode 100644
index 0000000000000..7b252a0b76bb3
--- /dev/null
+++ b/third_party/skia/modules/skottie/tests/BUILD.bazel
@@ -0,0 +1,61 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "AudioLayer_src",
+    srcs = ["AudioLayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/include:Skottie_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Expression_src",
+    srcs = ["Expression.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Image_src",
+    srcs = ["Image.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkSurface_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Keyframe_src",
+    srcs = ["Keyframe.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/include:ExternalLayer_hdr",
+        "//modules/skottie/src:SkottiePriv_hdr",
+        "//modules/skottie/src:SkottieValue_hdr",
+        "//modules/skottie/src/animator:Animator_hdr",
+        "//src/utils:SkJSON_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Text_src",
+    srcs = ["Text.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+        "//tests:Test_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/skottie/tests/Keyframe.cpp b/third_party/skia/modules/skottie/tests/Keyframe.cpp
index 130e71eb57372..10efa23adb9af 100644
--- a/third_party/skia/modules/skottie/tests/Keyframe.cpp
+++ b/third_party/skia/modules/skottie/tests/Keyframe.cpp
@@ -30,7 +30,7 @@ class MockProperty final : public AnimatablePropertyContainer {
         fDidBind = this->bind(abuilder, json_dom.root(), &fValue);
     }
 
-    operator bool() const { return fDidBind; }
+    explicit operator bool() const { return fDidBind; }
 
     const T& operator()(float t) { this->seek(t); return fValue; }
 
diff --git a/third_party/skia/modules/skottie/utils/BUILD.bazel b/third_party/skia/modules/skottie/utils/BUILD.bazel
new file mode 100644
index 0000000000000..c26dda8fa5520
--- /dev/null
+++ b/third_party/skia/modules/skottie/utils/BUILD.bazel
@@ -0,0 +1,27 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+filegroup(
+    name = "hdrs",
+    srcs = [
+        "SkottieUtils.h",
+    ],
+    visibility = ["//modules/skottie:__pkg__"],
+)
+
+generated_cc_atom(
+    name = "SkottieUtils_hdr",
+    hdrs = ["SkottieUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skottie/include:ExternalLayer_hdr",
+        "//modules/skottie/include:SkottieProperty_hdr",
+        "//modules/skottie/include:Skottie_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkottieUtils_src",
+    srcs = ["SkottieUtils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkottieUtils_hdr"],
+)
diff --git a/third_party/skia/modules/skparagraph/gm/simple_gm.cpp b/third_party/skia/modules/skparagraph/gm/simple_gm.cpp
index 8f950bd17bfdb..ad843ef4da98b 100644
--- a/third_party/skia/modules/skparagraph/gm/simple_gm.cpp
+++ b/third_party/skia/modules/skparagraph/gm/simple_gm.cpp
@@ -138,19 +138,20 @@ class ParagraphGM : public skiagm::GM {
                 canvas->drawLine(x0, Y+2, X1, Y+2, underp);
             }
 
-            if (info->utf8Starts && false) {
-                SkString str;
-                for (int i = 0; i < info->count; ++i) {
-                    str.appendUnichar(gSpeach[info->utf8Starts[i]]);
+            if ((false)) {
+                if (info->utf8Starts) {
+                    SkString str;
+                    for (int i = 0; i < info->count; ++i) {
+                        str.appendUnichar(gSpeach[info->utf8Starts[i]]);
+                    }
+                    SkDebugf("'%s'\n", str.c_str());
                 }
-                SkDebugf("'%s'\n", str.c_str());
-            }
 
-            if (false) {    // show position points
-            for (int i = 0; i < info->count; ++i) {
-                auto pos = info->positions[i];
-                canvas->drawPoint(pos.fX + info->origin.fX, pos.fY + info->origin.fY, p2);
-            }
+                // show position points
+                for (int i = 0; i < info->count; ++i) {
+                    auto pos = info->positions[i];
+                    canvas->drawPoint(pos.fX + info->origin.fX, pos.fY + info->origin.fY, p2);
+                }
             }
         });
     }
diff --git a/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h b/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
index 816691bda4bf7..95b758622d857 100644
--- a/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
+++ b/third_party/skia/modules/skparagraph/include/ParagraphBuilder.h
@@ -39,12 +39,12 @@ class ParagraphBuilder {
 
     virtual TextStyle peekStyle() = 0;
 
-    // Adds text to the builder. Forms the proper runs to use the upper-most style
-    // on the style_stack
+    // Adds UTF16-encoded text to the builder. Forms the proper runs to use the upper-most style
+    // on the style_stack.
     virtual void addText(const std::u16string& text) = 0;
 
-    // Adds text to the builder, using the top-most style on on the style_stack.
-    virtual void addText(const char* text) = 0; // Don't use this one - going away soon
+    // Adds UTF8-encoded text to the builder, using the top-most style on the style_stack.
+    virtual void addText(const char* text) = 0;
     virtual void addText(const char* text, size_t len) = 0;
 
     // Pushes the information required to leave an open space, where Flutter may
@@ -57,6 +57,9 @@ class ParagraphBuilder {
     // Constructs a SkParagraph object that can be used to layout and paint the text to a SkCanvas.
     virtual std::unique_ptr<Paragraph> Build() = 0;
 
+    // Resets this builder to its initial state, discarding any text, styles, placeholders that have
+    // been added, but keeping the initial ParagraphStyle.
+    virtual void Reset() = 0;
 
     // Just until we fix all the google3 code
     static std::unique_ptr<ParagraphBuilder> make(const ParagraphStyle& style,
diff --git a/third_party/skia/modules/skparagraph/samples/SampleParagraph.cpp b/third_party/skia/modules/skparagraph/samples/SampleParagraph.cpp
index 0f0994f7d64de..73d90d954fdf9 100644
--- a/third_party/skia/modules/skparagraph/samples/SampleParagraph.cpp
+++ b/third_party/skia/modules/skparagraph/samples/SampleParagraph.cpp
@@ -3620,34 +3620,37 @@ class ParagraphView63 : public ParagraphView_Base {
     void onDrawContent(SkCanvas* canvas) override {
 
         canvas->drawColor(SK_ColorWHITE);
-        /*
-        auto fontCollection = getFontCollection();
-        fontCollection->setDefaultFontManager(SkFontMgr::RefDefault());
-        fontCollection->enableFontFallback();
-        */
         auto fontCollection = sk_make_sp<TestFontCollection>(GetResourcePath("fonts").c_str(), true, true);
         TextStyle text_style;
         text_style.setFontFamilies({SkString("Ahem")});
         text_style.setFontSize(10);
+        SkPaint black; black.setColor(SK_ColorBLACK);
+        text_style.setForegroundColor(black);
 
         ParagraphStyle paragraph_style;
         paragraph_style.setTextStyle(text_style);
         paragraph_style.setTextDirection(TextDirection::kLtr);
+        StrutStyle strut_style;
+        strut_style.setStrutEnabled(true);
+        strut_style.setFontFamilies({SkString("Ahem")});
+        strut_style.setFontSize(16);
+        strut_style.setHeight(4.0f);
+        strut_style.setHeightOverride(true);
+        strut_style.setLeading(-1.0f);
+        strut_style.setForceStrutHeight(true);
+        paragraph_style.setStrutStyle(strut_style);
         ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+
         builder.pushStyle(text_style);
-        builder.addText(u"\u05D0\u05D0\u05D0ABC");
+        builder.addText(u"Atwater Peel Sherbrooke Bonaventure\nhi\nwasssup!");
         auto paragraph = builder.Build();
-        paragraph->layout(100);
+        paragraph->layout(797);
         paragraph->paint(canvas, 0, 0);
-        auto boxes = paragraph->getRectsForRange(0, paragraph->getMaxWidth(), RectHeightStyle::kTight, RectWidthStyle::kTight);
+        auto boxes = paragraph->getRectsForRange(0, 60,
+                                                 RectHeightStyle::kIncludeLineSpacingTop, RectWidthStyle::kMax);
         for (auto& box : boxes) {
             SkDebugf("[%f, %f, %f, %f]: %s\n", box.rect.left(), box.rect.top(), box.rect.right(), box.rect.bottom(), box.direction == TextDirection::kLtr ? "left" : "right");
         }
-        std::vector<SkScalar> widths = { -10, 0, 10, 20, 30, 40, 50, 60 };
-        for (auto w : widths) {
-            auto pos = paragraph->getGlyphPositionAtCoordinate(w, 0);
-            SkDebugf("%f: %d, %s\n", w, pos.position, pos.affinity == Affinity::kDownstream ? "down" : "up");
-        }
     }
 
 private:
diff --git a/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp b/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
index 84c1e0ead9ddf..7647097ab890e 100644
--- a/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
+++ b/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.cpp
@@ -158,7 +158,17 @@ std::unique_ptr<Paragraph> ParagraphBuilderImpl::Build() {
     // Add one fake placeholder with the rest of the text
     addPlaceholder(PlaceholderStyle(), true);
     return std::make_unique<ParagraphImpl>(
-            fUtf8, fParagraphStyle, fStyledBlocks, fPlaceholders, fFontCollection, std::move(fUnicode));
+            fUtf8, fParagraphStyle, fStyledBlocks, fPlaceholders, fFontCollection, fUnicode);
+}
+
+void ParagraphBuilderImpl::Reset() {
+    std::stack<TextStyle> text_styles;
+    fTextStyles.swap(text_styles);
+    fUtf8.reset();
+    fStyledBlocks.reset();
+    fPlaceholders.reset();
+
+    this->setParagraphStyle(fParagraphStyle);
 }
 
 }  // namespace textlayout
diff --git a/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h b/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
index 8c1b6c3cc3ee2..d540da403db5f 100644
--- a/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
+++ b/third_party/skia/modules/skparagraph/src/ParagraphBuilderImpl.h
@@ -61,6 +61,8 @@ class ParagraphBuilderImpl : public ParagraphBuilder {
     // Constructs a SkParagraph object that can be used to layout and paint the text to a SkCanvas.
     std::unique_ptr<Paragraph> Build() override;
 
+    void Reset() override;
+
     static std::unique_ptr<ParagraphBuilder> make(const ParagraphStyle& style,
                                                   sk_sp<FontCollection> fontCollection,
                                                   std::unique_ptr<SkUnicode> unicode);
@@ -79,7 +81,7 @@ class ParagraphBuilderImpl : public ParagraphBuilder {
     sk_sp<FontCollection> fFontCollection;
     ParagraphStyle fParagraphStyle;
 
-    std::unique_ptr<SkUnicode> fUnicode;
+    std::shared_ptr<SkUnicode> fUnicode;
 };
 }  // namespace textlayout
 }  // namespace skia
diff --git a/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp b/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
index 8873bc40dba0a..c4fd2d9234247 100644
--- a/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
+++ b/third_party/skia/modules/skparagraph/src/ParagraphImpl.cpp
@@ -66,7 +66,7 @@ ParagraphImpl::ParagraphImpl(const SkString& text,
                              SkTArray<Block, true> blocks,
                              SkTArray<Placeholder, true> placeholders,
                              sk_sp<FontCollection> fonts,
-                             std::unique_ptr<SkUnicode> unicode)
+                             std::shared_ptr<SkUnicode> unicode)
         : Paragraph(std::move(style), std::move(fonts))
         , fTextStyles(std::move(blocks))
         , fPlaceholders(std::move(placeholders))
@@ -87,7 +87,7 @@ ParagraphImpl::ParagraphImpl(const std::u16string& utf16text,
                              SkTArray<Block, true> blocks,
                              SkTArray<Placeholder, true> placeholders,
                              sk_sp<FontCollection> fonts,
-                             std::unique_ptr<SkUnicode> unicode)
+                             std::shared_ptr<SkUnicode> unicode)
         : ParagraphImpl(SkString(),
                         std::move(style),
                         std::move(blocks),
@@ -601,13 +601,13 @@ void ParagraphImpl::resolveStrut() {
         fStrutMetrics = InternalLineMetrics(
             (metrics.fAscent / strutHeight) * strutMultiplier,
             (metrics.fDescent / strutHeight) * strutMultiplier,
-                strutStyle.getLeading() < 0 ? 0 : strutStyle.getLeading() * strutStyle.getFontSize());
+                strutStyle.getLeading() < 0 ? 0 : strutStyle.getLeading() * strutStyle.getFontSize(),
+            metrics.fAscent, metrics.fDescent, metrics.fLeading);
     } else {
         fStrutMetrics = InternalLineMetrics(
                 metrics.fAscent,
                 metrics.fDescent,
-                strutStyle.getLeading() < 0 ? 0
-                                            : strutStyle.getLeading() * strutStyle.getFontSize());
+                strutStyle.getLeading() < 0 ? 0 : strutStyle.getLeading() * strutStyle.getFontSize());
     }
     fStrutMetrics.setForceStrut(this->paragraphStyle().getStrutStyle().getForceStrutHeight());
 }
diff --git a/third_party/skia/modules/skparagraph/src/ParagraphImpl.h b/third_party/skia/modules/skparagraph/src/ParagraphImpl.h
index d0cbf25bfbd6c..111cf46649db3 100644
--- a/third_party/skia/modules/skparagraph/src/ParagraphImpl.h
+++ b/third_party/skia/modules/skparagraph/src/ParagraphImpl.h
@@ -102,14 +102,14 @@ class ParagraphImpl final : public Paragraph {
                   SkTArray<Block, true> blocks,
                   SkTArray<Placeholder, true> placeholders,
                   sk_sp<FontCollection> fonts,
-                  std::unique_ptr<SkUnicode> unicode);
+                  std::shared_ptr<SkUnicode> unicode);
 
     ParagraphImpl(const std::u16string& utf16text,
                   ParagraphStyle style,
                   SkTArray<Block, true> blocks,
                   SkTArray<Placeholder, true> placeholders,
                   sk_sp<FontCollection> fonts,
-                  std::unique_ptr<SkUnicode> unicode);
+                  std::shared_ptr<SkUnicode> unicode);
     ~ParagraphImpl() override;
 
     void layout(SkScalar width) override;
@@ -273,7 +273,7 @@ class ParagraphImpl final : public Paragraph {
     SkScalar fOldHeight;
     SkScalar fMaxWidthWithTrailingSpaces;
 
-    std::unique_ptr<SkUnicode> fUnicode;
+    std::shared_ptr<SkUnicode> fUnicode;
 };
 }  // namespace textlayout
 }  // namespace skia
diff --git a/third_party/skia/modules/skparagraph/src/Run.cpp b/third_party/skia/modules/skparagraph/src/Run.cpp
index e50f41254119f..74fe3c5b49684 100644
--- a/third_party/skia/modules/skparagraph/src/Run.cpp
+++ b/third_party/skia/modules/skparagraph/src/Run.cpp
@@ -27,6 +27,11 @@ Run::Run(ParagraphImpl* owner,
     , fClusterRange(EMPTY_CLUSTERS)
     , fFont(info.fFont)
     , fClusterStart(firstChar)
+    , fGlyphData(std::make_shared<GlyphData>())
+    , fGlyphs(fGlyphData->glyphs)
+    , fPositions(fGlyphData->positions)
+    , fClusterIndexes(fGlyphData->clusterIndexes)
+    , fBounds(fGlyphData->bounds)
     , fHeightMultiplier(heightMultiplier)
     , fUseHalfLeading(useHalfLeading)
     , fBaselineShift(baselineShift)
@@ -36,6 +41,7 @@ Run::Run(ParagraphImpl* owner,
     fIndex = index;
     fUtf8Range = info.utf8Range;
     fOffset = SkVector::Make(offsetX, 0);
+
     fGlyphs.push_back_n(info.glyphCount);
     fBounds.push_back_n(info.glyphCount);
     fPositions.push_back_n(info.glyphCount + 1);
diff --git a/third_party/skia/modules/skparagraph/src/Run.h b/third_party/skia/modules/skparagraph/src/Run.h
index 517ced8a5bc78..a182e112892ed 100644
--- a/third_party/skia/modules/skparagraph/src/Run.h
+++ b/third_party/skia/modules/skparagraph/src/Run.h
@@ -184,13 +184,23 @@ class Run {
     SkVector fOffset;
     TextIndex fClusterStart;
     SkShaper::RunHandler::Range fUtf8Range;
-    SkSTArray<128, SkGlyphID, true> fGlyphs;
-    SkSTArray<128, SkPoint, true> fPositions;
-    SkSTArray<128, SkPoint, true> fJustificationShifts; // For justification (current and prev shifts)
-    SkSTArray<128, uint32_t, true> fClusterIndexes;
-    SkSTArray<128, SkRect, true> fBounds;
+
+    // These fields are not modified after shaping completes and can safely be
+    // shared among copies of the run that are held by different paragraphs.
+    struct GlyphData {
+        SkSTArray<128, SkGlyphID, true> glyphs;
+        SkSTArray<128, SkPoint, true> positions;
+        SkSTArray<128, uint32_t, true> clusterIndexes;
+        SkSTArray<128, SkRect, true> bounds;
+    };
+    std::shared_ptr<GlyphData> fGlyphData;
+    SkSTArray<128, SkGlyphID, true>& fGlyphs;
+    SkSTArray<128, SkPoint, true>& fPositions;
+    SkSTArray<128, uint32_t, true>& fClusterIndexes;
+    SkSTArray<128, SkRect, true>& fBounds;
 
     SkSTArray<128, SkScalar, true> fShifts;  // For formatting (letter/word spacing)
+    SkSTArray<128, SkPoint, true> fJustificationShifts; // For justification (current and prev shifts)
 
     SkFontMetrics fFontMetrics;
     const SkScalar fHeightMultiplier;
@@ -376,6 +386,16 @@ class InternalLineMetrics {
         fForceStrut = false;
     }
 
+    InternalLineMetrics(SkScalar a, SkScalar d, SkScalar l, SkScalar ra, SkScalar rd, SkScalar rl) {
+        fAscent = a;
+        fDescent = d;
+        fLeading = l;
+        fRawAscent = ra;
+        fRawDescent = rd;
+        fRawLeading = rl;
+        fForceStrut = false;
+    }
+
     InternalLineMetrics(const SkFont& font, bool forceStrut) {
         SkFontMetrics metrics;
         font.getMetrics(&metrics);
diff --git a/third_party/skia/modules/skparagraph/src/TextLine.cpp b/third_party/skia/modules/skparagraph/src/TextLine.cpp
index 41dca7eeb1c10..41410c54ce949 100644
--- a/third_party/skia/modules/skparagraph/src/TextLine.cpp
+++ b/third_party/skia/modules/skparagraph/src/TextLine.cpp
@@ -997,20 +997,31 @@ void TextLine::getRectsForRange(TextRange textRange0,
                     clip.fTop = this->sizes().delta();
                     break;
                 case RectHeightStyle::kIncludeLineSpacingTop: {
+                    clip.fBottom = this->height();
+                    clip.fTop = this->sizes().delta();
+                    auto verticalShift = this->sizes().rawAscent() - this->sizes().ascent();
                     if (isFirstLine()) {
-                        auto verticalShift =  this->sizes().runTop(context.run, LineMetricStyle::Typographic);
                         clip.fTop += verticalShift;
                     }
                     break;
                 }
                 case RectHeightStyle::kIncludeLineSpacingMiddle: {
-                    auto verticalShift =  this->sizes().runTop(context.run, LineMetricStyle::Typographic);
-                    clip.fTop += isFirstLine() ? verticalShift : verticalShift / 2;
-                    clip.fBottom += isLastLine() ? 0 : verticalShift / 2;
+                    clip.fBottom = this->height();
+                    clip.fTop = this->sizes().delta();
+                    auto verticalShift = this->sizes().rawAscent() - this->sizes().ascent();
+                    clip.offset(0, verticalShift / 2.0);
+                    if (isFirstLine()) {
+                        clip.fTop += verticalShift / 2.0;
+                    }
+                    if (isLastLine()) {
+                        clip.fBottom -= verticalShift / 2.0;
+                    }
                     break;
                  }
                 case RectHeightStyle::kIncludeLineSpacingBottom: {
-                    auto verticalShift =  this->sizes().runTop(context.run, LineMetricStyle::Typographic);
+                    clip.fBottom = this->height();
+                    clip.fTop = this->sizes().delta();
+                    auto verticalShift = this->sizes().rawAscent() - this->sizes().ascent();
                     clip.offset(0, verticalShift);
                     if (isLastLine()) {
                         clip.fBottom -= verticalShift;
diff --git a/third_party/skia/modules/skparagraph/tests/SkParagraphTest.cpp b/third_party/skia/modules/skparagraph/tests/SkParagraphTest.cpp
index ecbe4f91b96a8..6e2d643a0f300 100644
--- a/third_party/skia/modules/skparagraph/tests/SkParagraphTest.cpp
+++ b/third_party/skia/modules/skparagraph/tests/SkParagraphTest.cpp
@@ -2041,13 +2041,13 @@ UNIX_ONLY_TEST(SkParagraph_JustifyRTLNewLine, reporter) {
     // All lines should be justified to the width of the paragraph
     // except for #0 (new line) and #5 (the last one)
     for (auto& line : impl->lines()) {
-        auto num = &line - impl->lines().data();
+        ptrdiff_t num = &line - impl->lines().data();
         if (num == 0 || num == 5) {
             REPORTER_ASSERT(reporter, line.width() < TestCanvasWidth - 100);
         } else {
             REPORTER_ASSERT(reporter,
                             SkScalarNearlyEqual(line.width(), TestCanvasWidth - 100, EPSILON100),
-                            "#%d: %f <= %f\n", num, line.width(), TestCanvasWidth - 100);
+                            "#%zd: %f <= %d\n", num, line.width(), TestCanvasWidth - 100);
         }
     }
 }
@@ -6585,23 +6585,164 @@ UNIX_ONLY_TEST(SkParagraph_RTLFollowedByLTR, reporter) {
     paragraph->layout(100);
     paragraph->paint(canvas.get(), 0, 0);
 
-    auto boxes = paragraph->getRectsForRange(0, paragraph->getMaxWidth(), RectHeightStyle::kTight, RectWidthStyle::kTight);
+    auto boxes = paragraph->getRectsForRange(
+            0, paragraph->getMaxWidth(), RectHeightStyle::kTight, RectWidthStyle::kTight);
     REPORTER_ASSERT(reporter, boxes.size() == 2);
-    REPORTER_ASSERT(reporter, boxes[0].direction == TextDirection::kRtl &&
-                              boxes[1].direction == TextDirection::kLtr);
+    REPORTER_ASSERT(
+            reporter,
+            boxes[0].direction == TextDirection::kRtl && boxes[1].direction == TextDirection::kLtr);
     REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fLeft, 0.0f));
     REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fRight, boxes[1].rect.fLeft));
-    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[1].rect.fRight, paragraph->getMaxIntrinsicWidth()));
+    REPORTER_ASSERT(reporter,
+                    SkScalarNearlyEqual(boxes[1].rect.fRight, paragraph->getMaxIntrinsicWidth()));
 
-    std::vector<SkScalar> widths = { -10, 0, 10, 20, 30, 40, 50, 60 };
-    std::vector<int> positions = { -2, -2, 2, 1, -3, -4, -5, 6 };
+    std::vector<SkScalar> widths = {-10, 0, 10, 20, 30, 40, 50, 60};
+    std::vector<int> positions = {-2, -2, 2, 1, -3, -4, -5, 6};
 
     size_t index = 0;
     for (auto w : widths) {
         auto pos = paragraph->getGlyphPositionAtCoordinate(w, 0);
         auto res = positions[index];
-        REPORTER_ASSERT(reporter, pos.affinity == (res < 0 ? Affinity::kDownstream : Affinity::kUpstream));
+        REPORTER_ASSERT(reporter,
+                        pos.affinity == (res < 0 ? Affinity::kDownstream : Affinity::kUpstream));
         REPORTER_ASSERT(reporter, pos.position == std::abs(res));
         ++index;
     }
 }
+
+UNIX_ONLY_TEST(SkParagraph_StrutTopLine, reporter) {
+    sk_sp<ResourceFontCollection> fontCollection = sk_make_sp<ResourceFontCollection>();
+    if (!fontCollection->fontsFound()) return;
+
+    TestCanvas canvas("SkParagraph_StrutTopLine.png");
+
+    TextStyle text_style;
+    text_style.setFontFamilies({SkString("Ahem")});
+    text_style.setFontSize(10);
+    SkPaint black;
+    black.setColor(SK_ColorBLACK);
+    text_style.setForegroundColor(black);
+
+    ParagraphStyle paragraph_style;
+    paragraph_style.setTextStyle(text_style);
+    paragraph_style.setTextDirection(TextDirection::kLtr);
+    StrutStyle strut_style;
+    strut_style.setStrutEnabled(true);
+    strut_style.setFontFamilies({SkString("Ahem")});
+    strut_style.setFontSize(16);
+    strut_style.setHeight(4.0f);
+    strut_style.setHeightOverride(true);
+    strut_style.setLeading(-1.0f);
+    strut_style.setForceStrutHeight(true);
+    paragraph_style.setStrutStyle(strut_style);
+    ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+
+    builder.pushStyle(text_style);
+    builder.addText(u"Atwater Peel Sherbrooke Bonaventure\nhi\nwasssup!");
+
+    auto paragraph = builder.Build();
+    paragraph->layout(797);
+    paragraph->paint(canvas.get(), 0, 0);
+    auto boxes = paragraph->getRectsForRange(0, 60, RectHeightStyle::kIncludeLineSpacingTop, RectWidthStyle::kMax);
+    REPORTER_ASSERT(reporter, boxes.size() == 4);
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fTop, 38.4f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fBottom, 64.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[1].rect.fTop, 64.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[1].rect.fBottom, 128.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[2].rect.fTop, 64.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[2].rect.fBottom, 128.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[3].rect.fTop, 128.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[3].rect.fBottom, 192.0f));
+}
+
+UNIX_ONLY_TEST(SkParagraph_DifferentFontsTopLine, reporter) {
+    sk_sp<ResourceFontCollection> fontCollection = sk_make_sp<ResourceFontCollection>();
+    if (!fontCollection->fontsFound()) return;
+
+    TestCanvas canvas("SkParagraph_DifferentFontsTopLine.png");
+
+    TextStyle text_style;
+    text_style.setFontFamilies({SkString("Ahem")});
+    text_style.setFontSize(10);
+    SkPaint black;
+    black.setColor(SK_ColorBLACK);
+    text_style.setForegroundColor(black);
+
+    ParagraphStyle paragraph_style;
+    paragraph_style.setTextStyle(text_style);
+    paragraph_style.setTextDirection(TextDirection::kLtr);
+    ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+
+    text_style.setFontSize(30.0);
+    builder.pushStyle(text_style);
+    builder.addText(u"Atwater Peel ");
+    text_style.setFontSize(15.0);
+    builder.pushStyle(text_style);
+    builder.addText(u"Sherbrooke Bonaventure ");
+    text_style.setFontSize(10.0);
+    builder.pushStyle(text_style);
+    builder.addText(u"hi wassup!");
+
+    auto paragraph = builder.Build();
+    paragraph->layout(797);
+    paragraph->paint(canvas.get(), 0, 0);
+    auto boxes = paragraph->getRectsForRange(0, 60, RectHeightStyle::kIncludeLineSpacingTop, RectWidthStyle::kMax);
+    REPORTER_ASSERT(reporter, boxes.size() == 4);
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fTop, 00.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[0].rect.fBottom, 30.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[1].rect.fTop, 00.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[1].rect.fBottom, 30.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[2].rect.fTop, 00.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[2].rect.fBottom, 30.0f));
+
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[3].rect.fTop, 30.0f));
+    REPORTER_ASSERT(reporter, SkScalarNearlyEqual(boxes[3].rect.fBottom, 40.0f));
+}
+
+UNIX_ONLY_TEST(SkParagraph_SimpleParagraphReset, reporter) {
+    sk_sp<ResourceFontCollection> fontCollection = sk_make_sp<ResourceFontCollection>();
+    if (!fontCollection->fontsFound()) return;
+    const char* text = "Hello World Text Dialog";
+    const size_t len = strlen(text);
+
+    ParagraphStyle paragraph_style;
+    paragraph_style.turnHintingOff();
+    ParagraphBuilderImpl builder(paragraph_style, fontCollection);
+
+    for (int iteration = 0; iteration < 2; iteration += 1) {
+        builder.Reset();
+        REPORTER_ASSERT(reporter, builder.peekStyle().equals(paragraph_style.getTextStyle()));
+
+        TextStyle text_style;
+        text_style.setFontFamilies({SkString("Roboto")});
+        text_style.setColor(SK_ColorBLACK);
+        builder.pushStyle(text_style);
+        builder.addText(text, len);
+        builder.pop();
+
+        auto paragraph = builder.Build();
+        paragraph->layout(TestCanvasWidth);
+        REPORTER_ASSERT(reporter, paragraph->unresolvedGlyphs() == 0);
+
+        auto impl = static_cast<ParagraphImpl*>(paragraph.get());
+        REPORTER_ASSERT(reporter, impl->runs().size() == 1);
+        REPORTER_ASSERT(reporter, impl->styles().size() == 1);  // paragraph style does not count
+        REPORTER_ASSERT(reporter, impl->styles()[0].fStyle.equals(text_style));
+
+        size_t index = 0;
+        for (auto& line : impl->lines()) {
+            line.scanStyles(StyleType::kDecorations,
+                            [&index, reporter]
+                            (TextRange textRange, const TextStyle& style, const TextLine::ClipContext& context) {
+                                REPORTER_ASSERT(reporter, index == 0);
+                                REPORTER_ASSERT(reporter, style.getColor() == SK_ColorBLACK);
+                                ++index;
+                            });
+        }
+    }
+}
diff --git a/third_party/skia/modules/skresources/BUILD.bazel b/third_party/skia/modules/skresources/BUILD.bazel
new file mode 100644
index 0000000000000..156af07f75343
--- /dev/null
+++ b/third_party/skia/modules/skresources/BUILD.bazel
@@ -0,0 +1,8 @@
+cc_library(
+    name = "skresources",
+    hdrs = ["//modules/skresources/include:hdrs"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/skresources/src:SkResources_src",
+    ],
+)
diff --git a/third_party/skia/modules/skresources/include/BUILD.bazel b/third_party/skia/modules/skresources/include/BUILD.bazel
index 4d86f397a5ee2..8963fdb436e81 100644
--- a/third_party/skia/modules/skresources/include/BUILD.bazel
+++ b/third_party/skia/modules/skresources/include/BUILD.bazel
@@ -1,5 +1,11 @@
 load("//bazel:macros.bzl", "generated_cc_atom")
 
+filegroup(
+    name = "hdrs",
+    srcs = ["SkResources.h"],
+    visibility = ["//modules/skresources:__pkg__"],
+)
+
 generated_cc_atom(
     name = "SkResources_hdr",
     hdrs = ["SkResources.h"],
diff --git a/third_party/skia/modules/sksg/BUILD.bazel b/third_party/skia/modules/sksg/BUILD.bazel
new file mode 100644
index 0000000000000..36b252846651f
--- /dev/null
+++ b/third_party/skia/modules/sksg/BUILD.bazel
@@ -0,0 +1,30 @@
+cc_library(
+    name = "sksg",
+    hdrs = ["//modules/sksg/include:hdrs"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/sksg/src:SkSGClipEffect_src",
+        "//modules/sksg/src:SkSGColorFilter_src",
+        "//modules/sksg/src:SkSGDraw_src",
+        "//modules/sksg/src:SkSGEffectNode_src",
+        "//modules/sksg/src:SkSGGeometryEffect_src",
+        "//modules/sksg/src:SkSGGeometryNode_src",
+        "//modules/sksg/src:SkSGGradient_src",
+        "//modules/sksg/src:SkSGGroup_src",
+        "//modules/sksg/src:SkSGImage_src",
+        "//modules/sksg/src:SkSGInvalidationController_src",
+        "//modules/sksg/src:SkSGMaskEffect_src",
+        "//modules/sksg/src:SkSGMerge_src",
+        "//modules/sksg/src:SkSGNode_src",
+        "//modules/sksg/src:SkSGOpacityEffect_src",
+        "//modules/sksg/src:SkSGPaint_src",
+        "//modules/sksg/src:SkSGPath_src",
+        "//modules/sksg/src:SkSGPlane_src",
+        "//modules/sksg/src:SkSGRect_src",
+        "//modules/sksg/src:SkSGRenderEffect_src",
+        "//modules/sksg/src:SkSGRenderNode_src",
+        "//modules/sksg/src:SkSGScene_src",
+        "//modules/sksg/src:SkSGText_src",
+        "//modules/sksg/src:SkSGTransform_src",
+    ],
+)
diff --git a/third_party/skia/modules/sksg/include/BUILD.bazel b/third_party/skia/modules/sksg/include/BUILD.bazel
new file mode 100644
index 0000000000000..9af7e81b07531
--- /dev/null
+++ b/third_party/skia/modules/sksg/include/BUILD.bazel
@@ -0,0 +1,255 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+filegroup(
+    name = "hdrs",
+    srcs = [
+        "SkSGClipEffect.h",
+        "SkSGColorFilter.h",
+        "SkSGDraw.h",
+        "SkSGEffectNode.h",
+        "SkSGGeometryEffect.h",
+        "SkSGGeometryNode.h",
+        "SkSGGradient.h",
+        "SkSGGroup.h",
+        "SkSGImage.h",
+        "SkSGInvalidationController.h",
+        "SkSGMaskEffect.h",
+        "SkSGMerge.h",
+        "SkSGNode.h",
+        "SkSGOpacityEffect.h",
+        "SkSGPaint.h",
+        "SkSGPath.h",
+        "SkSGPlane.h",
+        "SkSGRect.h",
+        "SkSGRenderEffect.h",
+        "SkSGRenderNode.h",
+        "SkSGScene.h",
+        "SkSGText.h",
+        "SkSGTransform.h",
+    ],
+    visibility = ["//modules/sksg:__pkg__"],
+)
+
+generated_cc_atom(
+    name = "SkSGClipEffect_hdr",
+    hdrs = ["SkSGClipEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGEffectNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGColorFilter_hdr",
+    hdrs = ["SkSGColorFilter.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGEffectNode_hdr",
+        "//include/core:SkBlendMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGDraw_hdr",
+    hdrs = ["SkSGDraw.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        ":SkSGPaint_hdr",
+        ":SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGEffectNode_hdr",
+    hdrs = ["SkSGEffectNode.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGRenderNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGGeometryEffect_hdr",
+    hdrs = ["SkSGGeometryEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        ":SkSGTransform_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/effects:SkTrimPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGGeometryNode_hdr",
+    hdrs = ["SkSGGeometryNode.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGGradient_hdr",
+    hdrs = ["SkSGGradient.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGRenderEffect_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGGroup_hdr",
+    hdrs = ["SkSGGroup.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGRenderNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGImage_hdr",
+    hdrs = ["SkSGImage.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGRenderNode_hdr",
+        "//include/core:SkSamplingOptions_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGInvalidationController_hdr",
+    hdrs = ["SkSGInvalidationController.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGMaskEffect_hdr",
+    hdrs = ["SkSGMaskEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGEffectNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGMerge_hdr",
+    hdrs = ["SkSGMerge.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGNode_hdr",
+    hdrs = ["SkSGNode.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGOpacityEffect_hdr",
+    hdrs = ["SkSGOpacityEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGEffectNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGPaint_hdr",
+    hdrs = ["SkSGPaint.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGNode_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGPath_hdr",
+    hdrs = ["SkSGPath.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGPlane_hdr",
+    hdrs = ["SkSGPlane.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGGeometryNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGRect_hdr",
+    hdrs = ["SkSGRect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGRenderEffect_hdr",
+    hdrs = ["SkSGRenderEffect.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGEffectNode_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGRenderNode_hdr",
+    hdrs = ["SkSGRenderNode.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGNode_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGScene_hdr",
+    hdrs = ["SkSGScene.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGText_hdr",
+    hdrs = ["SkSGText.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGGeometryNode_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/utils:SkTextUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGTransform_hdr",
+    hdrs = ["SkSGTransform.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSGEffectNode_hdr"],
+)
diff --git a/third_party/skia/modules/sksg/samples/BUILD.bazel b/third_party/skia/modules/sksg/samples/BUILD.bazel
new file mode 100644
index 0000000000000..a96eec08d4d25
--- /dev/null
+++ b/third_party/skia/modules/sksg/samples/BUILD.bazel
@@ -0,0 +1,24 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SampleSVGPong_src",
+    srcs = ["SampleSVGPong.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+        "//samplecode:Sample_hdr",
+        "//tools/timer:TimeUtils_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/sksg/src/BUILD.bazel b/third_party/skia/modules/sksg/src/BUILD.bazel
new file mode 100644
index 0000000000000..6f6f52b643cfc
--- /dev/null
+++ b/third_party/skia/modules/sksg/src/BUILD.bazel
@@ -0,0 +1,287 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SkSGClipEffect_src",
+    srcs = ["SkSGClipEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//modules/sksg/include:SkSGClipEffect_hdr",
+        "//modules/sksg/include:SkSGGeometryNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGColorFilter_src",
+    srcs = ["SkSGColorFilter.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkColorFilter_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/private:SkColorData_hdr",
+        "//modules/sksg/include:SkSGColorFilter_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGDraw_src",
+    srcs = ["SkSGDraw.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGeometryNode_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//src/core:SkTLazy_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGEffectNode_src",
+    srcs = ["SkSGEffectNode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/sksg/include:SkSGEffectNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGGeometryEffect_src",
+    srcs = ["SkSGGeometryEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGTransformPriv_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/effects:SkCornerPathEffect_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkTrimPathEffect_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//modules/sksg/include:SkSGGeometryEffect_hdr",
+        "//src/core:SkPathEffectBase_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGGeometryNode_src",
+    srcs = ["SkSGGeometryNode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPath_hdr",
+        "//modules/sksg/include:SkSGGeometryNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGGradient_src",
+    srcs = ["SkSGGradient.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPaint_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTPin_hdr",
+        "//modules/sksg/include:SkSGGradient_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGGroup_src",
+    srcs = ["SkSGGroup.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGImage_src",
+    srcs = ["SkSGImage.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//modules/sksg/include:SkSGImage_hdr",
+        "//src/core:SkPaintPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGInvalidationController_src",
+    srcs = ["SkSGInvalidationController.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRect_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//src/core:SkTLazy_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGMaskEffect_src",
+    srcs = ["SkSGMaskEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/effects:SkLumaColorFilter_hdr",
+        "//modules/sksg/include:SkSGMaskEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGMerge_src",
+    srcs = ["SkSGMerge.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//modules/sksg/include:SkSGMerge_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGNodePriv_hdr",
+    hdrs = ["SkSGNodePriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/sksg/include:SkSGNode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGNode_src",
+    srcs = ["SkSGNode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGNode_hdr",
+        "//src/core:SkRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGOpacityEffect_src",
+    srcs = ["SkSGOpacityEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/sksg/include:SkSGOpacityEffect_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGPaint_src",
+    srcs = ["SkSGPaint.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/private:SkTPin_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGPath_src",
+    srcs = ["SkSGPath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//modules/sksg/include:SkSGPath_hdr",
+        "//src/core:SkRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGPlane_src",
+    srcs = ["SkSGPlane.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//modules/sksg/include:SkSGPlane_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGRect_src",
+    srcs = ["SkSGRect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGRenderEffect_src",
+    srcs = ["SkSGRenderEffect.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkShader_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//src/core:SkMaskFilterBase_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGRenderNode_src",
+    srcs = ["SkSGRenderNode.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGNodePriv_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGScene_src",
+    srcs = ["SkSGScene.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGRenderNode_hdr",
+        "//modules/sksg/include:SkSGScene_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGText_src",
+    srcs = ["SkSGText.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/private:SkTArray_hdr",
+        "//modules/sksg/include:SkSGText_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSGTransformPriv_hdr",
+    hdrs = ["SkSGTransformPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//modules/sksg/include:SkSGTransform_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSGTransform_src",
+    srcs = ["SkSGTransform.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSGTransformPriv_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/sksg/tests/BUILD.bazel b/third_party/skia/modules/sksg/tests/BUILD.bazel
new file mode 100644
index 0000000000000..b8b958489b1df
--- /dev/null
+++ b/third_party/skia/modules/sksg/tests/BUILD.bazel
@@ -0,0 +1,21 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SGTest_src",
+    srcs = ["SGTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTo_hdr",
+        "//modules/sksg/include:SkSGDraw_hdr",
+        "//modules/sksg/include:SkSGGroup_hdr",
+        "//modules/sksg/include:SkSGInvalidationController_hdr",
+        "//modules/sksg/include:SkSGPaint_hdr",
+        "//modules/sksg/include:SkSGRect_hdr",
+        "//modules/sksg/include:SkSGRenderEffect_hdr",
+        "//modules/sksg/include:SkSGTransform_hdr",
+        "//src/core:SkRectPriv_hdr",
+        "//tests:Test_hdr",
+    ],
+)
diff --git a/third_party/skia/modules/sksg/tests/SGTest.cpp b/third_party/skia/modules/sksg/tests/SGTest.cpp
index dbfedc58ded63..ea3f62efafc5f 100644
--- a/third_party/skia/modules/sksg/tests/SGTest.cpp
+++ b/third_party/skia/modules/sksg/tests/SGTest.cpp
@@ -31,7 +31,7 @@ static void check_inval(skiatest::Reporter* reporter, const sk_sp<sksg::Node>& r
     sksg::InvalidationController ic;
     const auto bbox = root->revalidate(&ic, SkMatrix::I());
 
-    if (0) {
+    if ((false)) {
         SkDebugf("** bbox: [%f %f %f %f], ibbox: [%f %f %f %f]\n",
                  bbox.fLeft, bbox.fTop, bbox.fRight, bbox.fBottom,
                  ic.bounds().left(), ic.bounds().top(), ic.bounds().right(), ic.bounds().bottom());
@@ -46,7 +46,7 @@ static void check_inval(skiatest::Reporter* reporter, const sk_sp<sksg::Node>& r
         for (size_t i = 0; i < std::min(expected_damage->size(), damage_count); ++i) {
             const auto r1 = (*expected_damage)[i],
                        r2 = ic.begin()[i];
-            if (0) {
+            if ((false)) {
                 SkDebugf("*** expected inval: [%f %f %f %f], actual: [%f %f %f %f]\n",
                          r1.left(), r1.top(), r1.right(), r1.bottom(),
                          r2.left(), r2.top(), r2.right(), r2.bottom());
diff --git a/third_party/skia/modules/skshaper/include/SkShaper.h b/third_party/skia/modules/skshaper/include/SkShaper.h
index dd4bd7445094b..2b6d5870473f8 100644
--- a/third_party/skia/modules/skshaper/include/SkShaper.h
+++ b/third_party/skia/modules/skshaper/include/SkShaper.h
@@ -62,10 +62,6 @@ class SKSHAPER_API SkShaper {
 
     class RunIterator {
     public:
-        // Required until C++17 copy elision
-        RunIterator(const RunIterator&) = default;
-        // Required because above is required
-        RunIterator() = default;
         virtual ~RunIterator() = default;
         /** Set state to that of current run and move iterator to end of that run. */
         virtual void consume() = 0;
diff --git a/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp b/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
index 01d509f1975b9..dbc9d187ad0af 100644
--- a/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
+++ b/third_party/skia/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -264,8 +264,8 @@ HBBlob stream_to_blob(std::unique_ptr<SkStreamAsset> asset) {
 SkDEBUGCODE(static hb_user_data_key_t gDataIdKey;)
 
 HBFace create_hb_face(const SkTypeface& typeface) {
-    int index;
-    std::unique_ptr<SkStreamAsset> typefaceAsset = typeface.openStream(&index);
+    int index = 0;
+    std::unique_ptr<SkStreamAsset> typefaceAsset = typeface.openExistingStream(&index);
     HBFace face;
     if (typefaceAsset && typefaceAsset->getMemoryBase()) {
         HBBlob blob(stream_to_blob(std::move(typefaceAsset)));
@@ -286,12 +286,12 @@ HBFace create_hb_face(const SkTypeface& typeface) {
             skhb_get_table,
             const_cast<SkTypeface*>(SkRef(&typeface)),
             [](void* user_data){ SkSafeUnref(reinterpret_cast<SkTypeface*>(user_data)); }));
+        hb_face_set_index(face.get(), (unsigned)index);
     }
     SkASSERT(face);
     if (!face) {
         return nullptr;
     }
-    hb_face_set_index(face.get(), (unsigned)index);
     hb_face_set_upem(face.get(), typeface.getUnitsPerEm());
 
     SkDEBUGCODE(
@@ -1261,37 +1261,35 @@ void ShapeDontWrapOrReorder::wrap(char const * const utf8, size_t utf8Bytes,
 
 class HBLockedFaceCache {
 public:
-    HBLockedFaceCache(SkLRUCache<SkFontID, HBFace>& lruCache, SkMutex& mutex)
+    HBLockedFaceCache(SkLRUCache<SkTypefaceID, HBFace>& lruCache, SkMutex& mutex)
         : fLRUCache(lruCache), fMutex(mutex)
     {
         fMutex.acquire();
     }
     HBLockedFaceCache(const HBLockedFaceCache&) = delete;
     HBLockedFaceCache& operator=(const HBLockedFaceCache&) = delete;
-    // Required until C++17 copy elision
-    HBLockedFaceCache(HBLockedFaceCache&&) = default;
     HBLockedFaceCache& operator=(HBLockedFaceCache&&) = delete;
 
     ~HBLockedFaceCache() {
         fMutex.release();
     }
 
-    HBFace* find(SkFontID fontId) {
+    HBFace* find(SkTypefaceID fontId) {
         return fLRUCache.find(fontId);
     }
-    HBFace* insert(SkFontID fontId, HBFace hbFace) {
+    HBFace* insert(SkTypefaceID fontId, HBFace hbFace) {
         return fLRUCache.insert(fontId, std::move(hbFace));
     }
     void reset() {
         fLRUCache.reset();
     }
 private:
-    SkLRUCache<SkFontID, HBFace>& fLRUCache;
+    SkLRUCache<SkTypefaceID, HBFace>& fLRUCache;
     SkMutex& fMutex;
 };
 static HBLockedFaceCache get_hbFace_cache() {
     static SkMutex gHBFaceCacheMutex;
-    static SkLRUCache<SkFontID, HBFace> gHBFaceCache(100);
+    static SkLRUCache<SkTypefaceID, HBFace> gHBFaceCache(100);
     return HBLockedFaceCache(gHBFaceCache, gHBFaceCacheMutex);
 }
 
@@ -1354,7 +1352,7 @@ ShapedRun ShaperHarfBuzz::shape(char const * const utf8,
     HBFont hbFont;
     {
         HBLockedFaceCache cache = get_hbFace_cache();
-        SkFontID dataId = font.currentFont().getTypeface()->uniqueID();
+        SkTypefaceID dataId = font.currentFont().getTypeface()->uniqueID();
         HBFace* hbFaceCached = cache.find(dataId);
         if (!hbFaceCached) {
             HBFace hbFace(create_hb_face(*font.currentFont().getTypeface()));
diff --git a/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp b/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp
index ee196f2113e4a..fb91800978341 100644
--- a/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp
+++ b/third_party/skia/modules/skunicode/src/SkUnicode_icu.cpp
@@ -123,39 +123,6 @@ class SkBidiIterator_icu : public SkBidiIterator {
 
         return makeBidiIterator(utf16.get(), utf16Units, dir);
     }
-
-    // This method returns the final results only: a list of bidi regions
-    // (this is all SkParagraph really needs; SkShaper however uses the iterator itself)
-    static std::vector<Region> getBidiRegions(const char utf8[], int utf8Units, Direction dir) {
-
-        auto bidiIterator = makeBidiIterator(utf8, utf8Units, dir);
-        std::vector<Region> bidiRegions;
-        const char* start8 = utf8;
-        const char* end8 = utf8 + utf8Units;
-        SkBidiIterator::Level currentLevel = 0;
-
-        Position pos8 = 0;
-        Position pos16 = 0;
-        Position end16 = bidiIterator->getLength();
-        while (pos16 < end16) {
-            auto level = bidiIterator->getLevelAt(pos16);
-            if (pos16 == 0) {
-                currentLevel = level;
-            } else if (level != currentLevel) {
-                auto end = SkTo<Position>(start8 - utf8);
-                bidiRegions.emplace_back(pos8, end, currentLevel);
-                currentLevel = level;
-                pos8 = end;
-            }
-            SkUnichar u = utf8_next(&start8, end8);
-            pos16 += SkUTF::ToUTF16(u);
-        }
-        auto end = start8 - utf8;
-        if (end != pos8) {
-            bidiRegions.emplace_back(pos8, end, currentLevel);
-        }
-        return bidiRegions;
-    }
 };
 
 void SkBidiIterator::ReorderVisual(const Level runLevels[], int levelsCount,
@@ -310,6 +277,16 @@ class SkUnicode_icu : public SkUnicode {
         Position pos8 = 0;
         Position pos16 = 0;
         Position end16 = sk_ubidi_getLength(bidi.get());
+
+        if (end16 == 0) {
+            return true;
+        }
+        if (sk_ubidi_getDirection(bidi.get()) != UBIDI_MIXED) {
+            // The entire paragraph is unidirectional.
+            bidiRegions->emplace_back(0, utf8Units, sk_ubidi_getLevelAt(bidi.get(), 0));
+            return true;
+        }
+
         while (pos16 < end16) {
             auto level = sk_ubidi_getLevelAt(bidi.get(), pos16);
             if (pos16 == 0) {
diff --git a/third_party/skia/modules/skunicode/src/SkUnicode_icu.h b/third_party/skia/modules/skunicode/src/SkUnicode_icu.h
index 6eb58c30756f5..63615a1cc450c 100644
--- a/third_party/skia/modules/skunicode/src/SkUnicode_icu.h
+++ b/third_party/skia/modules/skunicode/src/SkUnicode_icu.h
@@ -24,6 +24,7 @@
     SKICU_FUNC(u_isWhitespace)        \
     SKICU_FUNC(u_strToUpper)          \
     SKICU_FUNC(ubidi_close)           \
+    SKICU_FUNC(ubidi_getDirection)    \
     SKICU_FUNC(ubidi_getLength)       \
     SKICU_FUNC(ubidi_getLevelAt)      \
     SKICU_FUNC(ubidi_openSized)       \
diff --git a/third_party/skia/modules/svg/include/SkSVGRenderContext.h b/third_party/skia/modules/svg/include/SkSVGRenderContext.h
index 4529d41ffea07..dc0192e484a93 100644
--- a/third_party/skia/modules/svg/include/SkSVGRenderContext.h
+++ b/third_party/skia/modules/svg/include/SkSVGRenderContext.h
@@ -97,9 +97,6 @@ class SkSVGRenderContext {
             }
         }
 
-        // Required until C++17 copy elision
-        BorrowedNode(BorrowedNode&&) = default;
-
         ~BorrowedNode() {
             if (fOwner) {
                 *fOwner = std::move(fBorrowed);
@@ -110,7 +107,7 @@ class SkSVGRenderContext {
         const SkSVGNode* operator->() const { return fBorrowed.get(); }
         const SkSVGNode& operator*() const { return *fBorrowed; }
 
-        operator bool() const { return !!fBorrowed; }
+        explicit operator bool() const { return !!fBorrowed; }
 
     private:
         // noncopyable
diff --git a/third_party/skia/modules/svg/include/SkSVGTypes.h b/third_party/skia/modules/svg/include/SkSVGTypes.h
index 7e0393a95c101..6423586c785b9 100644
--- a/third_party/skia/modules/svg/include/SkSVGTypes.h
+++ b/third_party/skia/modules/svg/include/SkSVGTypes.h
@@ -81,13 +81,25 @@ template <typename T, bool kInheritable> class SkSVGProperty {
         fValue.set(std::move(value));
     }
 
-    T* operator->() const {
+    T* operator->() {
         SkASSERT(fState == SkSVGPropertyState::kValue);
         SkASSERT(fValue.isValid());
         return fValue.get();
     }
 
-    T& operator*() const {
+    const T* operator->() const {
+        SkASSERT(fState == SkSVGPropertyState::kValue);
+        SkASSERT(fValue.isValid());
+        return fValue.get();
+    }
+
+    T& operator*() {
+        SkASSERT(fState == SkSVGPropertyState::kValue);
+        SkASSERT(fValue.isValid());
+        return *fValue;
+    }
+
+    const T& operator*() const {
         SkASSERT(fState == SkSVGPropertyState::kValue);
         SkASSERT(fValue.isValid());
         return *fValue;
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/AndroidTest.xml b/third_party/skia/platform_tools/android/apps/skqp/src/main/AndroidTest.xml
new file mode 100644
index 0000000000000..670015b5bf633
--- /dev/null
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/AndroidTest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2019 Google LLC.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
+-->
+<configuration description="Config for CTS SkQP test cases">
+<option name="test-suite-tag" value="cts" />
+<option name="not-shardable" value="true" />
+<option name="config-descriptor:metadata" key="component" value="uitoolkit" />
+<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+<option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+<option name="cleanup-apks" value="true" />
+<option name="test-file-name" value="CtsSkQPTestCases.apk" />
+</target_preparer>
+<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+<option name="package" value="org.skia.skqp" />
+<option name="runtime-hint" value="7m" />
+</test>
+</configuration>
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/.gitignore b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/.gitignore
index bd378b7f98a9a..e47e1b33a748b 100644
--- a/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/.gitignore
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/.gitignore
@@ -1,2 +1 @@
-/gmkb
 /resources
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
new file mode 100644
index 0000000000000..169f974defa42
--- /dev/null
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
@@ -0,0 +1 @@
+foo,-1
\ No newline at end of file
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
new file mode 100644
index 0000000000000..0fd9954c2acec
--- /dev/null
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
@@ -0,0 +1,7 @@
+# Exclude all unit tests that end with the ES3 suffix because Android does not
+# require ES3 support.
+.+ES3
+# These tests fail or crash on a Pixel 6 Pro
+SkRemoteGlyphCache_.+
+ApplyGamma
+ResourceAllocatorTest
\ No newline at end of file
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java b/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
index 127b6083901a0..f2252302105ff 100644
--- a/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQP.java
@@ -28,7 +28,7 @@ public class SkQP {
     protected static final String LOG_PREFIX = "org.skia.skqp";
 
     static {
-      System.loadLibrary("skqp_app");
+      System.loadLibrary("skqp_jni");
     }
 }
 
diff --git a/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPActivity.java b/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPActivity.java
index cc085ac228daf..89b8dfef0cd3a 100644
--- a/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPActivity.java
+++ b/third_party/skia/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPActivity.java
@@ -44,7 +44,6 @@ public void run() {
         impl.nInit(assetManager, outputDirPath);
 
         for (int backend = 0; backend < impl.mBackends.length; backend++) {
-          String classname = SkQP.kSkiaGM + impl.mBackends[backend];
           for (int gm = 0; gm < impl.mGMs.length; gm++) {
               String testName = SkQP.kSkiaGM + impl.mBackends[backend] + "_" + impl.mGMs[gm];
               long value = java.lang.Long.MAX_VALUE;
@@ -58,7 +57,7 @@ public void run() {
               if (error != null) {
                   Log.w(SkQP.LOG_PREFIX, "Error: " + testName + " " + error);
               } else if (value != 0) {
-                  Log.w(SkQP.LOG_PREFIX, String.format("Fail: %s %f", testName, value));
+                  Log.w(SkQP.LOG_PREFIX, String.format("Fail: %s %d", testName, value));
               } else {
                   Log.i(SkQP.LOG_PREFIX, "Pass: " + testName);
               }
diff --git a/third_party/skia/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java b/third_party/skia/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
index 7d11ff08f8696..ea610397b99ec 100644
--- a/third_party/skia/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
+++ b/third_party/skia/platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerActivity.java
@@ -10,6 +10,7 @@
 import android.app.Activity;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -21,7 +22,6 @@
 import android.view.SurfaceView;
 import android.view.View;
 import android.widget.ListView;
-import androidx.core.widget.DrawerLayout;
 
 public class ViewerActivity
         extends Activity implements SurfaceHolder.Callback, View.OnTouchListener {
diff --git a/third_party/skia/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml b/third_party/skia/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml
index e816965c0d869..bfb91dff57217 100644
--- a/third_party/skia/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml
+++ b/third_party/skia/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<androidx.core.widget.DrawerLayout
+<android.support.v4.widget.DrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
@@ -34,5 +34,5 @@
         android:divider="@android:color/transparent"
         android:dividerHeight="0dp"
         android:background="@android:color/background_light"/>
-</androidx.core.widget.DrawerLayout>
+</android.support.v4.widget.DrawerLayout>
 
diff --git a/third_party/skia/public.bzl b/third_party/skia/public.bzl
index f4c5b635b8d2d..4751621658780 100644
--- a/third_party/skia/public.bzl
+++ b/third_party/skia/public.bzl
@@ -338,6 +338,31 @@ PORTS_SRCS_ANDROID = struct(
     ],
 )
 
+PORTS_SRCS_ANDROID_NO_FONT = struct(
+    include = [
+        "src/ports/**/*.cpp",
+        "src/ports/**/*.h",
+    ],
+    exclude = [
+        "src/ports/*CG*",
+        "src/ports/*FontConfig*",
+        "src/ports/*WIC*",
+        "src/ports/*chromium*",
+        "src/ports/*fontconfig*",
+        "src/ports/*mac*",
+        "src/ports/*mozalloc*",
+        "src/ports/*nacl*",
+        "src/ports/*win*",
+        "src/ports/*NDK*",
+        "src/ports/SkDebug_stdio.cpp",
+        "src/ports/SkFontMgr_a*",
+        "src/ports/SkFontHost_Free*",
+        "src/ports/SkFontMgr_custom*",
+        "src/ports/SkFontMgr_fuchsia.cpp",
+        "src/ports/SkImageGenerator_none.cpp",
+    ],
+)
+
 GL_SRCS_IOS = struct(
     include = [
         "src/gpu/gl/*.cpp",
@@ -495,6 +520,7 @@ def ports_srcs(os_conditions):
             skia_glob(PORTS_SRCS_WASM),
             skia_glob(PORTS_SRCS_FUCHSIA),
             skia_glob(PORTS_SRCS_MACOS),
+            skia_glob(PORTS_SRCS_ANDROID_NO_FONT),
         ],
     )
 
@@ -508,6 +534,7 @@ def gl_srcs(os_conditions):
             skia_glob(GL_SRCS_WASM),
             skia_glob(GL_SRCS_FUCHSIA),
             skia_glob(GL_SRCS_MACOS),
+            skia_glob(GL_SRCS_ANDROID),
         ],
     )
 
@@ -646,7 +673,6 @@ DM_SRCS_ALL = struct(
         "tests/FontMgrFontConfigTest.cpp",  # FontConfig-only.
         "tests/TypefaceMacTest.cpp",  # CoreText-only.
         "tests/SkParagraphTest.cpp",  # Skipping tests for now.
-        "tests/skia_test.cpp",  # Old main.
         "tools/gpu/d3d/*",
         "tools/gpu/dawn/*",
         "tools/gpu/gl/angle/*",
@@ -737,10 +763,8 @@ def base_defines(os_conditions):
         "SK_WEBP_ENCODER_USE_DEFAULT_METHOD",
         # Experiment to diagnose image diffs in Google3
         "SK_DISABLE_LOWP_RASTER_PIPELINE",
-        # JPEG is in codec_limited
-        "SK_CODEC_DECODES_JPEG",
-        "SK_ENCODE_JPEG",
-        "SK_HAS_ANDROID_CODEC",
+        # JPEG is in codec_limited and is included in all
+        # builds except the no_codec android build
     ] + skia_select(
         os_conditions,
         [
@@ -754,6 +778,9 @@ def base_defines(os_conditions):
                 "SK_ENCODE_WEBP",
                 "SK_R32_SHIFT=16",
                 "SK_GL",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
             ],
             # ANDROID
             [
@@ -763,13 +790,18 @@ def base_defines(os_conditions):
                 "SK_ENCODE_PNG",
                 "SK_ENCODE_WEBP",
                 "SK_GL",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
             ],
             # IOS
             [
                 "SK_BUILD_FOR_IOS",
-                "SKNX_NO_SIMD",
                 "SK_NO_COMMAND_BUFFER",  # Test tools that use thread_local.
                 "SK_GL",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
             ],
             # WASM
             [
@@ -781,6 +813,9 @@ def base_defines(os_conditions):
                 "SK_DISABLE_EFFECT_DESERIALIZATION",
                 "SK_FORCE_8_BYTE_ALIGNMENT",
                 "SKNX_NO_SIMD",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
             ],
             # FUCHSIA
             [
@@ -791,11 +826,22 @@ def base_defines(os_conditions):
                 "SK_ENCODE_WEBP",
                 "SK_R32_SHIFT=16",
                 "SK_VULKAN",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
             ],
             # MACOS
             [
                 "SK_BUILD_FOR_MAC",
                 "SK_GL",
+                "SK_CODEC_DECODES_JPEG",
+                "SK_ENCODE_JPEG",
+                "SK_HAS_ANDROID_CODEC",
+            ],
+            # ANDROID W/ NO CODECS
+            [
+                "SK_BUILD_FOR_ANDROID",
+                "SK_GL",
             ],
         ],
     )
@@ -860,16 +906,6 @@ def skparagraph_lib_hdrs():
 def skparagraph_lib_srcs():
     return native.glob(["modules/skparagraph/src/*.cpp"])
 
-################################################################################
-## experimental xform
-################################################################################
-
-def exp_xform_lib_hdrs():
-    return native.glob(["experimental/xform/*.h"])
-
-def exp_xform_lib_srcs():
-    return native.glob(["experimental/xform/*.cpp"])
-
 ################################################################################
 ## skresources_lib
 ################################################################################
diff --git a/third_party/skia/resources/fonts/NotoSansCJK-VF-subset.otf.ttc b/third_party/skia/resources/fonts/NotoSansCJK-VF-subset.otf.ttc
new file mode 100644
index 0000000000000..24b85d389c962
Binary files /dev/null and b/third_party/skia/resources/fonts/NotoSansCJK-VF-subset.otf.ttc differ
diff --git a/third_party/skia/resources/fonts/more_samples-glyf_colr_1.ttf b/third_party/skia/resources/fonts/more_samples-glyf_colr_1.ttf
index 8f9ffde67b1c0..850343c6881da 100644
Binary files a/third_party/skia/resources/fonts/more_samples-glyf_colr_1.ttf and b/third_party/skia/resources/fonts/more_samples-glyf_colr_1.ttf differ
diff --git a/third_party/skia/resources/skottie/skottie-sharpen.json b/third_party/skia/resources/skottie/skottie-sharpen.json
new file mode 100644
index 0000000000000..4347adc00b2f8
--- /dev/null
+++ b/third_party/skia/resources/skottie/skottie-sharpen.json
@@ -0,0 +1 @@
+{"v":"5.8.0","fr":29.9700012207031,"ip":0,"op":140.000005702317,"w":100,"h":100,"nm":"sharpen","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[46.75,49,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":29,"nm":"Gaussian Blur","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"Blurriness","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":5.4,"ix":1}},{"ty":7,"nm":"Blur Dimensions","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Repeat Edge Pixels","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":0,"ix":3}}]},{"ty":5,"nm":"Sharpen","np":3,"mn":"ADBE Sharpen","ix":2,"en":1,"ef":[{"ty":0,"nm":"Sharpen Amount","mn":"ADBE Sharpen-0001","ix":1,"v":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":71,"s":[200]},{"t":115.000004684046,"s":[0]}],"ix":1}}]}],"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[48.38,45.845],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.233335487515,0.233335487515,0.233335487515,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[3.19,0.922],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":900.000036657751,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":1,"nm":"White Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2,"l":2},"a":{"a":0,"k":[50,50,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"sw":100,"sh":100,"sc":"#ffffff","ip":0,"op":900.000036657751,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/third_party/skia/resources/skottie/skottie-text-animator-opacity.json b/third_party/skia/resources/skottie/skottie-text-animator-opacity.json
new file mode 100644
index 0000000000000..711dbd6d99189
--- /dev/null
+++ b/third_party/skia/resources/skottie/skottie-text-animator-opacity.json
@@ -0,0 +1 @@
+{"v":"5.8.1","fr":60,"ip":0,"op":300,"w":500,"h":500,"nm":"opacity semantics","ddd":0,"assets":[],"fonts":{"list":[{"origin":0,"fPath":"","fClass":"","fFamily":"Arial","fWeight":"","fStyle":"Regular","fName":"ArialMT","ascent":75.6476929411292}]},"layers":[{"ddd":0,"ind":1,"ty":5,"nm":"1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[120,160,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[246,132],"ps":[-118,-111],"s":28,"f":"ArialMT","t":"The  quick  brown  fox  jumps  over  the  lazy  dog.","ca":0,"j":2,"tr":-100,"lh":33.6000022888184,"ls":0,"fc":[0,0.971,0.039]},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"zero","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"r":1},"a":{"o":{"a":0,"k":0,"ix":9}}},{"nm":"full","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"o":{"a":0,"k":100,"ix":9}}}]},"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":5,"nm":"2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[120,400,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[246,132],"ps":[-118,-111],"s":28,"f":"ArialMT","t":"The  quick  brown  fox  jumps  over  the  lazy  dog.","ca":0,"j":2,"tr":-100,"lh":33.6000022888184,"ls":0,"fc":[0,0.971,0.039]},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"full","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"r":1},"a":{"o":{"a":0,"k":100,"ix":9}}},{"nm":"zero","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"o":{"a":0,"k":0,"ix":9}}}]},"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":5,"nm":"3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[370,160,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[246,132],"ps":[-118,-111],"s":28,"f":"ArialMT","t":"The  quick  brown  fox  jumps  over  the  lazy  dog.","ca":0,"j":2,"tr":-100,"lh":33.6000022888184,"ls":0,"fc":[0,0.971,0.039]},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"zero","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"r":1},"a":{"o":{"a":0,"k":0,"ix":9}}},{"nm":"full","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"o":{"a":0,"k":100,"ix":9}}},{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"p":{"a":0,"k":[0,-20,0],"ix":2}}}]},"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":5,"nm":"4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[370,400,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"t":{"d":{"k":[{"s":{"sz":[246,132],"ps":[-118,-111],"s":28,"f":"ArialMT","t":"The  quick  brown  fox  jumps  over  the  lazy  dog.","ca":0,"j":2,"tr":-100,"lh":33.6000022888184,"ls":0,"fc":[0,0.971,0.039]},"t":0}]},"p":{},"m":{"g":1,"a":{"a":0,"k":[0,0],"ix":2}},"a":[{"nm":"full","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":1,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"r":1},"a":{"o":{"a":0,"k":100,"ix":9}}},{"nm":"zero","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"o":{"a":0,"k":0,"ix":9}}},{"nm":"Animator 1","s":{"t":0,"xe":{"a":0,"k":0,"ix":7},"ne":{"a":0,"k":0,"ix":8},"a":{"a":0,"k":100,"ix":4},"b":3,"rn":0,"sh":1,"sm":{"a":0,"k":100,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[-100]},{"t":299,"s":[100]}],"ix":3},"r":1},"a":{"p":{"a":0,"k":[0,-20,0],"ix":2}}}]},"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":1,"nm":"Black Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"sw":500,"sh":500,"sc":"#000000","ip":0,"op":300,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/third_party/skia/resources/sksl/errors/ArgumentCountMismatch.sksl b/third_party/skia/resources/sksl/errors/ArgumentCountMismatch.sksl
index 4c93e5037ea07..9034e975f0d19 100644
--- a/third_party/skia/resources/sksl/errors/ArgumentCountMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/ArgumentCountMismatch.sksl
@@ -5,3 +5,7 @@ float foo(float x) {
 void main() {
     float x = foo(1, 2);
 }
+
+/*%%*
+call to 'foo' expected 1 argument, but found 2
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArgumentMismatch.sksl b/third_party/skia/resources/sksl/errors/ArgumentMismatch.sksl
index 1ff662b3dfd99..6a000ccaace30 100644
--- a/third_party/skia/resources/sksl/errors/ArgumentMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/ArgumentMismatch.sksl
@@ -5,3 +5,7 @@ float foo(float x) {
 void main() {
     float x = foo(true);
 }
+
+/*%%*
+expected 'float', but found 'bool'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArgumentModifiers.sksl b/third_party/skia/resources/sksl/errors/ArgumentModifiers.sksl
index 2c2aeaf4ff4bc..2ae3c416fefc5 100644
--- a/third_party/skia/resources/sksl/errors/ArgumentModifiers.sksl
+++ b/third_party/skia/resources/sksl/errors/ArgumentModifiers.sksl
@@ -1,2 +1,6 @@
 void test(int x);
 void test(out int x) {}
+
+/*%%*
+modifiers on parameter 1 differ between declaration and definition
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayConstructorElementCount.sksl b/third_party/skia/resources/sksl/errors/ArrayConstructorElementCount.sksl
index 21c703d059eb7..4ce4f3936184b 100644
--- a/third_party/skia/resources/sksl/errors/ArrayConstructorElementCount.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayConstructorElementCount.sksl
@@ -1,6 +1,10 @@
-// Expect 3 errors
-
 float noElements[2]            = float[2]();
 float notEnoughElements[2]     = float[2](1);
 float rightNumberOfElements[2] = float[2](1, 2);
 float tooManyElements[2]       = float[2](1, 2, 3);
+
+/*%%*
+invalid arguments to 'float[2]' constructor (expected 2 elements, but found 0)
+invalid arguments to 'float[2]' constructor (expected 2 elements, but found 1)
+invalid arguments to 'float[2]' constructor (expected 2 elements, but found 3)
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/ArrayIndexOutOfRange.sksl
index 72eb99ddda7f2..610e6e6a88b74 100644
--- a/third_party/skia/resources/sksl/errors/ArrayIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayIndexOutOfRange.sksl
@@ -5,3 +5,11 @@ void array_123              () { half4x4 a[123]; half4x4 v = a[123]; }
 void array_huge             () { int4    a[123]; int4    v = a[1000000000]; }
 void array_overflow         () { half3   a[123]; half3   v = a[3000000000]; }
 void array_no_index         () { int     a[123]; int     v = a[]; }
+
+/*%%*
+index -1 out of range for 'int[123]'
+index 123 out of range for 'half4x4[123]'
+index 1000000000 out of range for 'int4[123]'
+index 3000000000 out of range for 'half3[123]'
+missing index in '[]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayInlinedIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/ArrayInlinedIndexOutOfRange.sksl
index 3f7eedd0b33d5..b0600b21a4f8d 100644
--- a/third_party/skia/resources/sksl/errors/ArrayInlinedIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayInlinedIndexOutOfRange.sksl
@@ -11,3 +11,8 @@ half4 main(float2 coords) {
     int undefined = indexArray(-1) + indexArray(3);
     return colorGreen;
 }
+
+/*%%*
+index -1 out of range for 'int[3]'
+index 3 out of range for 'int[3]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayNegation.sksl b/third_party/skia/resources/sksl/errors/ArrayNegation.sksl
index 46d5e1e1862f9..179023d686f61 100644
--- a/third_party/skia/resources/sksl/errors/ArrayNegation.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayNegation.sksl
@@ -4,3 +4,12 @@ void array_negate_float  () { float   a[123]; -a; }
 void array_negate_half3  () { half3   a[123]; -a; }
 void array_negate_bool2  () { bool2   a[123]; -a; }
 void array_negate_half4x4() { half4x4 a[123]; -a; }
+
+/*%%*
+'-' cannot operate on 'int[123]'
+'-' cannot operate on 'int4[123]'
+'-' cannot operate on 'float[123]'
+'-' cannot operate on 'half3[123]'
+'-' cannot operate on 'bool2[123]'
+'-' cannot operate on 'half4x4[123]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayOfInvalidSize.sksl b/third_party/skia/resources/sksl/errors/ArrayOfInvalidSize.sksl
index cbb8f121a5f24..a67f47af28a32 100644
--- a/third_party/skia/resources/sksl/errors/ArrayOfInvalidSize.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayOfInvalidSize.sksl
@@ -8,6 +8,7 @@ void g1() { float[false]; }
 void h1() { float[int2(2, 2)]; }
 void i1() { float[]; }
 void j1() { float[int3(4000000000)]; }
+void k1() { float[int(1e20)]; }
 
 void a2() { float x[-2]; }
 void b2() { float x[-1]; }
@@ -19,3 +20,30 @@ void g2() { float x[false]; }
 void h2() { float x[int2(2, 2)]; }
 void i2() { float x[]; }
 void j2() { float x[int3(4000000000)]; }
+void k2() { float x[int(1e20)]; }
+
+/*%%*
+array size must be positive
+array size must be positive
+array size must be positive
+expected 'int', but found 'float'
+integer is out of range for type 'int': 4000000000
+array size must be positive
+expected 'int', but found 'bool'
+expected 'int', but found 'bool'
+expected 'int', but found 'int2'
+missing index in '[]'
+integer is out of range for type 'int': 4000000000
+integer is out of range for type 'int': 100000002004087734272
+array size must be positive
+array size must be positive
+array size must be positive
+array size must be an integer
+array size out of bounds
+array size must be an integer
+array size must be an integer
+array size must be an integer
+expected array dimension
+integer is out of range for type 'int': 4000000000
+integer is out of range for type 'int': 100000002004087734272
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayOfVoid.sksl b/third_party/skia/resources/sksl/errors/ArrayOfVoid.sksl
index 5e2d339a8816b..f7b3e2aa3c437 100644
--- a/third_party/skia/resources/sksl/errors/ArrayOfVoid.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayOfVoid.sksl
@@ -1,5 +1,3 @@
-// Expect 6 errors
-
 void a[2];
 void[2] b;
 
@@ -7,3 +5,13 @@ void[2] funcF() {}
 void funcG() { void g[2]; }
 void funcH() { void[2] h; }
 void funcI() { void[2]; }
+
+/*%%*
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+function 'funcF' can exit without returning a value
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayPlus.sksl b/third_party/skia/resources/sksl/errors/ArrayPlus.sksl
index b1c954277d1e9..4e3a67f353209 100644
--- a/third_party/skia/resources/sksl/errors/ArrayPlus.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayPlus.sksl
@@ -4,3 +4,12 @@ void array_plus_float  () { float   a[123]; +a; }
 void array_plus_half3  () { half3   a[123]; +a; }
 void array_plus_bool2  () { bool2   a[123]; +a; }
 void array_plus_half4x4() { half4x4 a[123]; +a; }
+
+/*%%*
+'+' cannot operate on 'int[123]'
+'+' cannot operate on 'int4[123]'
+'+' cannot operate on 'float[123]'
+'+' cannot operate on 'half3[123]'
+'+' cannot operate on 'bool2[123]'
+'+' cannot operate on 'half4x4[123]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayReturnTypes.sksl b/third_party/skia/resources/sksl/errors/ArrayReturnTypes.sksl
index 200f8b33a7b48..e85836412fd37 100644
--- a/third_party/skia/resources/sksl/errors/ArrayReturnTypes.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayReturnTypes.sksl
@@ -1,2 +1,7 @@
 float4x4[2] return_float4x4_2() {}
 int[1]      return_int_1()      {}
+
+/*%%*
+functions may not return type 'float4x4[2]'
+functions may not return type 'int[1]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArraySplitDimensions.sksl b/third_party/skia/resources/sksl/errors/ArraySplitDimensions.sksl
index b98afc23b58d8..b138427f2d48a 100644
--- a/third_party/skia/resources/sksl/errors/ArraySplitDimensions.sksl
+++ b/third_party/skia/resources/sksl/errors/ArraySplitDimensions.sksl
@@ -1 +1,5 @@
 float[2] x[2];
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncBody.sksl b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncBody.sksl
index 76c4f085aa42d..ebe124e2f0a98 100644
--- a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncBody.sksl
+++ b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncBody.sksl
@@ -1 +1,5 @@
 void func() { float[2] x[2]; }
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncDecl.sksl b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncDecl.sksl
index f1a0dfee288f8..659c9cf3b65fc 100644
--- a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncDecl.sksl
+++ b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInFuncDecl.sksl
@@ -1 +1,5 @@
 void func(float[2] x[2]) {}
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInStruct.sksl b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInStruct.sksl
index 351f1c78ed3c0..bbec234f77ce4 100644
--- a/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/ArraySplitDimensionsInStruct.sksl
@@ -1 +1,5 @@
 struct S { float[2] x[2]; };
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensions.sksl b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensions.sksl
index aca74909dfaf9..6036a389a341f 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensions.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensions.sksl
@@ -1 +1,5 @@
 float x[2][2];
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncBody.sksl b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncBody.sksl
index c067db2ed1512..8cd0683200c40 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncBody.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncBody.sksl
@@ -1 +1,5 @@
 void main() { float x[2][2]; }
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncDecl.sksl b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncDecl.sksl
index bd1bf03de08bf..c5233be9bf0d2 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncDecl.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInFuncDecl.sksl
@@ -1 +1,5 @@
 void func(float x[2][2]) {}
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInStruct.sksl b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInStruct.sksl
index 4c15ed84e1532..af88fe1e02259 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTooManyDimensionsInStruct.sksl
@@ -1 +1,5 @@
 struct S { float x[2][2]; };
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensions.sksl b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensions.sksl
index 980710646d1d4..362280146ce89 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensions.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensions.sksl
@@ -1 +1,5 @@
 float[2][2] x;
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.sksl b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.sksl
index 099f5c9c66fe8..a609cefebd819 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncBody.sksl
@@ -1 +1,5 @@
 void main() { float[2][2] x; }
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.sksl b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.sksl
index 2cf1ba8d86a40..ba73f3f318aab 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInFuncDecl.sksl
@@ -1 +1,5 @@
 void func(float[2][2] x) {}
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInStruct.sksl b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInStruct.sksl
index 054dca06cb5b3..5e0e58a898d93 100644
--- a/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayTypeTooManyDimensionsInStruct.sksl
@@ -1 +1,5 @@
 struct S { float[2][2] x; };
+
+/*%%*
+multi-dimensional arrays are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ArrayUnspecifiedDimensions.sksl b/third_party/skia/resources/sksl/errors/ArrayUnspecifiedDimensions.sksl
index 854c224aa93c7..16b84d144259d 100644
--- a/third_party/skia/resources/sksl/errors/ArrayUnspecifiedDimensions.sksl
+++ b/third_party/skia/resources/sksl/errors/ArrayUnspecifiedDimensions.sksl
@@ -3,3 +3,10 @@ in int arrFloat[1.];
 in int arrBool[true];
 
 int unsized_in_expression() { return int[](0)[0]; }
+
+/*%%*
+expected array dimension
+array size must be an integer
+array size must be an integer
+missing index in '[]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/AssignmentTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/AssignmentTypeMismatch.sksl
index bb8e3c9253b87..26e5e8a33a899 100644
--- a/third_party/skia/resources/sksl/errors/AssignmentTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/AssignmentTypeMismatch.sksl
@@ -6,3 +6,13 @@ void type_ref_in_comma_expr()        { int x = (bool4, 1); }
 int function_ref_in_global_variable = mix;
 float3x3 type_ref_in_global_variable = float3x3;
 
+
+/*%%*
+expected 'int', but found 'float'
+type mismatch: '=' cannot operate on 'int', 'float'
+type mismatch: '*=' cannot operate on 'int3', 'float'
+expected '(' to begin function call
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+expected '(' to begin constructor invocation
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadCaps.sksl b/third_party/skia/resources/sksl/errors/BadCaps.sksl
index 91c6ff2695a49..fc87522f05306 100644
--- a/third_party/skia/resources/sksl/errors/BadCaps.sksl
+++ b/third_party/skia/resources/sksl/errors/BadCaps.sksl
@@ -1 +1,5 @@
 bool b = sk_Caps.bugFreeDriver;
+
+/*%%*
+unknown capability flag 'bugFreeDriver'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadConstInitializers.sksl b/third_party/skia/resources/sksl/errors/BadConstInitializers.sksl
index 5c45f7679553f..73aa9a9a6945f 100644
--- a/third_party/skia/resources/sksl/errors/BadConstInitializers.sksl
+++ b/third_party/skia/resources/sksl/errors/BadConstInitializers.sksl
@@ -20,3 +20,13 @@ void from_non_const_local()              { float x = u; const float y = x; }
 void from_non_const_expression()         { const float x = u + u; }
 void from_mixed_expression()             { const float x = c + u; }
 void from_non_const_struct_field()       { const float x = s.f; }
+
+/*%%*
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+'const' variable initializer must be a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadFieldAccess.sksl b/third_party/skia/resources/sksl/errors/BadFieldAccess.sksl
index a4010e806bda5..bbf5ee5e34459 100644
--- a/third_party/skia/resources/sksl/errors/BadFieldAccess.sksl
+++ b/third_party/skia/resources/sksl/errors/BadFieldAccess.sksl
@@ -5,3 +5,11 @@ void not_a_function() { S s; s.f(); }
 void not_a_bvec()     { S s; s.f = bool3(true); }
 void not_a_struct()   { S s; s.f.missing; }
 void not_an_array()   { S s; s.f[0]; }
+
+/*%%*
+type 'S' does not have a field named 'missing'
+not a function
+type mismatch: '=' cannot operate on 'float', 'bool3'
+invalid swizzle component 'm'
+expected array, but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadIndex.sksl b/third_party/skia/resources/sksl/errors/BadIndex.sksl
index cbc5f131369a9..d68b32ec16bda 100644
--- a/third_party/skia/resources/sksl/errors/BadIndex.sksl
+++ b/third_party/skia/resources/sksl/errors/BadIndex.sksl
@@ -1,2 +1,7 @@
 void int_not_array()      { int x = 2[0]; }
 void index_float2_twice() { float2 x = float2(0); int y = x[0][0]; }
+
+/*%%*
+expected array, but found 'int'
+expected array, but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadModifiers.sksl b/third_party/skia/resources/sksl/errors/BadModifiers.sksl
index 17065e21c2e4a..7884a4b27fa7c 100644
--- a/third_party/skia/resources/sksl/errors/BadModifiers.sksl
+++ b/third_party/skia/resources/sksl/errors/BadModifiers.sksl
@@ -4,3 +4,24 @@ void func2(const in out uniform flat noperspective sk_has_side_effects
            inline noinline float test) {}
 
 const in out uniform flat noperspective sk_has_side_effects inline noinline float var;
+
+/*%%*
+'const' is not permitted here
+'in' is not permitted here
+'out' is not permitted here
+'uniform' is not permitted here
+'flat' is not permitted here
+'noperspective' is not permitted here
+functions cannot be both 'inline' and 'noinline'
+'uniform' is not permitted here
+'flat' is not permitted here
+'noperspective' is not permitted here
+'sk_has_side_effects' is not permitted here
+'inline' is not permitted here
+'noinline' is not permitted here
+'in uniform' variables not permitted
+'sk_has_side_effects' is not permitted here
+'inline' is not permitted here
+'noinline' is not permitted here
+'const' variables must be initialized
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BadOctal.sksl b/third_party/skia/resources/sksl/errors/BadOctal.sksl
index 4bf6c1c0a9767..a7fe38bc98eb1 100644
--- a/third_party/skia/resources/sksl/errors/BadOctal.sksl
+++ b/third_party/skia/resources/sksl/errors/BadOctal.sksl
@@ -1,2 +1,7 @@
 int i1 = 08;
 int i2 = 012349;
+
+/*%%*
+'08' is not a valid octal number
+expected expression, but found '08'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BinaryInvalidType.sksl b/third_party/skia/resources/sksl/errors/BinaryInvalidType.sksl
index 7f72417e0db47..86b4a48a2d40d 100644
--- a/third_party/skia/resources/sksl/errors/BinaryInvalidType.sksl
+++ b/third_party/skia/resources/sksl/errors/BinaryInvalidType.sksl
@@ -53,3 +53,18 @@ void arrayRight() {
 void arrayBoth() {
     float x = array * array;
 }
+
+/*%%*
+type mismatch: '*' cannot operate on '<INVALID>', 'int'
+type mismatch: '*' cannot operate on 'int', '<INVALID>'
+type mismatch: '*' cannot operate on '<INVALID>', '<INVALID>'
+type mismatch: '*' cannot operate on 'S', 'int'
+type mismatch: '*' cannot operate on 'int', 'S'
+type mismatch: '*' cannot operate on 'S', 'S'
+type mismatch: '*' cannot operate on 'sampler2D', 'int'
+type mismatch: '*' cannot operate on 'int', 'sampler2D'
+type mismatch: '*' cannot operate on 'sampler2D', 'sampler2D'
+type mismatch: '*' cannot operate on 'int[1]', 'int'
+type mismatch: '*' cannot operate on 'int', 'int[1]'
+type mismatch: '*' cannot operate on 'int[1]', 'int[1]'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BinaryTypeCoercion.sksl b/third_party/skia/resources/sksl/errors/BinaryTypeCoercion.sksl
index 6cc03950f432e..7cfa99ee6d616 100644
--- a/third_party/skia/resources/sksl/errors/BinaryTypeCoercion.sksl
+++ b/third_party/skia/resources/sksl/errors/BinaryTypeCoercion.sksl
@@ -53,3 +53,26 @@ void matrix_times_matrix_disallowed_3() { H4x4 *= F4x4;       }
 void dimensions_ok_1()                  { F4x4 *= F4x4; }
 void dimensions_ok_2()                  { F4   *= F4x4; }
 void dimensions_disallowed_1()          { F4x4 *= F4;   }
+
+/*%%*
+type mismatch: '=' cannot operate on 'half', 'float'
+type mismatch: '=' cannot operate on 'half', 'float'
+type mismatch: '*=' cannot operate on 'half', 'float'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '*=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '*=' cannot operate on 'half4', 'float'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '=' cannot operate on 'half4', 'float4'
+type mismatch: '*=' cannot operate on 'half4', 'float4x4'
+type mismatch: '=' cannot operate on 'half4x4', 'float4x4'
+type mismatch: '=' cannot operate on 'half4x4', 'float4x4'
+type mismatch: '*=' cannot operate on 'half4x4', 'float4x4'
+type mismatch: '*=' cannot operate on 'float4x4', 'float4'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BinaryTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/BinaryTypeMismatch.sksl
index c4cd45abc4290..4a3eb55253661 100644
--- a/third_party/skia/resources/sksl/errors/BinaryTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/BinaryTypeMismatch.sksl
@@ -6,3 +6,13 @@ void float2_neq_int()   { bool x = float2(0) != 0; }
 void float2_lt_float2() { bool x = float2(0) < float2(1); }
 void float2_lt_float()  { bool x = float2(0) < 0.0; }
 void float_lt_float2()  { bool x = 0.0 < float2(0); }
+
+/*%%*
+type mismatch: '*' cannot operate on 'int', 'bool'
+type mismatch: '||' cannot operate on 'int', 'float'
+type mismatch: '==' cannot operate on 'float2', 'int'
+type mismatch: '!=' cannot operate on 'float2', 'int'
+type mismatch: '<' cannot operate on 'float2', 'float2'
+type mismatch: '<' cannot operate on 'float2', 'float'
+type mismatch: '<' cannot operate on 'float', 'float2'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BitShiftFloat.sksl b/third_party/skia/resources/sksl/errors/BitShiftFloat.sksl
index 990242f1c2d33..58a82a7dc9cd3 100644
--- a/third_party/skia/resources/sksl/errors/BitShiftFloat.sksl
+++ b/third_party/skia/resources/sksl/errors/BitShiftFloat.sksl
@@ -13,3 +13,16 @@ void shl() { x = x << 1; }
 void and() { x = x & 1; }
 void or()  { x = x | 1; }
 void xor() { x = x ^ 1; }
+
+/*%%*
+type mismatch: '>>=' cannot operate on 'float', 'int'
+type mismatch: '<<=' cannot operate on 'float', 'int'
+type mismatch: '&=' cannot operate on 'float', 'int'
+type mismatch: '|=' cannot operate on 'float', 'int'
+type mismatch: '^=' cannot operate on 'float', 'int'
+type mismatch: '>>' cannot operate on 'float', 'int'
+type mismatch: '<<' cannot operate on 'float', 'int'
+type mismatch: '&' cannot operate on 'float', 'int'
+type mismatch: '|' cannot operate on 'float', 'int'
+type mismatch: '^' cannot operate on 'float', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BitShiftFloatMatrix.sksl b/third_party/skia/resources/sksl/errors/BitShiftFloatMatrix.sksl
index 8d070b2c29adf..0b9374b332b5f 100644
--- a/third_party/skia/resources/sksl/errors/BitShiftFloatMatrix.sksl
+++ b/third_party/skia/resources/sksl/errors/BitShiftFloatMatrix.sksl
@@ -13,3 +13,16 @@ void shl() { x = x << 1; }
 void and() { x = x & 1; }
 void or()  { x = x | 1; }
 void xor() { x = x ^ 1; }
+
+/*%%*
+type mismatch: '>>=' cannot operate on 'float2x2', 'int'
+type mismatch: '<<=' cannot operate on 'float2x2', 'int'
+type mismatch: '&=' cannot operate on 'float2x2', 'int'
+type mismatch: '|=' cannot operate on 'float2x2', 'int'
+type mismatch: '^=' cannot operate on 'float2x2', 'int'
+type mismatch: '>>' cannot operate on 'float2x2', 'int'
+type mismatch: '<<' cannot operate on 'float2x2', 'int'
+type mismatch: '&' cannot operate on 'float2x2', 'int'
+type mismatch: '|' cannot operate on 'float2x2', 'int'
+type mismatch: '^' cannot operate on 'float2x2', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BitShiftFloatVector.sksl b/third_party/skia/resources/sksl/errors/BitShiftFloatVector.sksl
index 8186b0b620a96..bac8a76168f7f 100644
--- a/third_party/skia/resources/sksl/errors/BitShiftFloatVector.sksl
+++ b/third_party/skia/resources/sksl/errors/BitShiftFloatVector.sksl
@@ -13,3 +13,16 @@ void shl() { x = x << 1; }
 void and() { x = x & 1; }
 void or()  { x = x | 1; }
 void xor() { x = x ^ 1; }
+
+/*%%*
+type mismatch: '>>=' cannot operate on 'float2', 'int'
+type mismatch: '<<=' cannot operate on 'float2', 'int'
+type mismatch: '&=' cannot operate on 'float2', 'int'
+type mismatch: '|=' cannot operate on 'float2', 'int'
+type mismatch: '^=' cannot operate on 'float2', 'int'
+type mismatch: '>>' cannot operate on 'float2', 'int'
+type mismatch: '<<' cannot operate on 'float2', 'int'
+type mismatch: '&' cannot operate on 'float2', 'int'
+type mismatch: '|' cannot operate on 'float2', 'int'
+type mismatch: '^' cannot operate on 'float2', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BooleanArithmetic.sksl b/third_party/skia/resources/sksl/errors/BooleanArithmetic.sksl
index f85819a801e17..ed5f052e7fed5 100644
--- a/third_party/skia/resources/sksl/errors/BooleanArithmetic.sksl
+++ b/third_party/skia/resources/sksl/errors/BooleanArithmetic.sksl
@@ -24,3 +24,31 @@ bool2 bitnot_boolean_vec() { return ~bool2(false, false); }
 bool2 bitand_boolean_vec() { return bool2(false, false) & bool2(true, true); }
 bool2 bitor_boolean_vec()  { return bool2(false, false) | bool2(true, true); }
 bool2 bitxor_boolean_vec() { return bool2(false, false) ^ bool2(true, true); }
+
+/*%%*
+type mismatch: '+' cannot operate on 'bool', 'bool'
+type mismatch: '-' cannot operate on 'bool', 'bool'
+type mismatch: '*' cannot operate on 'bool', 'bool'
+type mismatch: '/' cannot operate on 'bool', 'bool'
+type mismatch: '%' cannot operate on 'bool', 'bool'
+type mismatch: '<<' cannot operate on 'bool', 'bool'
+type mismatch: '>>' cannot operate on 'bool', 'bool'
+'-' cannot operate on 'bool'
+'~' cannot operate on 'bool'
+type mismatch: '&' cannot operate on 'bool', 'bool'
+type mismatch: '|' cannot operate on 'bool', 'bool'
+type mismatch: '^' cannot operate on 'bool', 'bool'
+type mismatch: '+' cannot operate on 'bool2', 'bool2'
+type mismatch: '-' cannot operate on 'bool2', 'bool2'
+type mismatch: '*' cannot operate on 'bool2', 'bool2'
+type mismatch: '/' cannot operate on 'bool2', 'bool2'
+type mismatch: '%' cannot operate on 'bool2', 'bool2'
+type mismatch: '<<' cannot operate on 'bool2', 'bool2'
+type mismatch: '>>' cannot operate on 'bool2', 'bool2'
+'!' cannot operate on 'bool2'
+'-' cannot operate on 'bool2'
+'~' cannot operate on 'bool2'
+type mismatch: '&' cannot operate on 'bool2', 'bool2'
+type mismatch: '|' cannot operate on 'bool2', 'bool2'
+type mismatch: '^' cannot operate on 'bool2', 'bool2'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/BreakOutsideLoop.sksl b/third_party/skia/resources/sksl/errors/BreakOutsideLoop.sksl
index aee3f488c7d05..4da67ccc88649 100644
--- a/third_party/skia/resources/sksl/errors/BreakOutsideLoop.sksl
+++ b/third_party/skia/resources/sksl/errors/BreakOutsideLoop.sksl
@@ -1 +1,5 @@
 void outside_while()   { while(true) {} if (true) break; }
+
+/*%%*
+break statement must be inside a loop or switch
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/CallNonFunction.sksl b/third_party/skia/resources/sksl/errors/CallNonFunction.sksl
index 9709277a65cd0..0ce09c60222e9 100644
--- a/third_party/skia/resources/sksl/errors/CallNonFunction.sksl
+++ b/third_party/skia/resources/sksl/errors/CallNonFunction.sksl
@@ -2,3 +2,7 @@ void main() {
     float x = 3;
     x();
 }
+
+/*%%*
+not a function
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/CanExitWithoutReturningValue.sksl b/third_party/skia/resources/sksl/errors/CanExitWithoutReturningValue.sksl
index c565d4a255fe7..84825629af969 100644
--- a/third_party/skia/resources/sksl/errors/CanExitWithoutReturningValue.sksl
+++ b/third_party/skia/resources/sksl/errors/CanExitWithoutReturningValue.sksl
@@ -93,3 +93,27 @@ int switch_with_conditional_break_then_fallthrough() {
         default: return 2;
     }
 }
+
+/*%%*
+function 'if_only' can exit without returning a value
+function 'return_on_if_but_not_else' can exit without returning a value
+function 'return_on_else_but_not_if' can exit without returning a value
+function 'for_with_conditional_return' can exit without returning a value
+function 'for_with_conditional_break' can exit without returning a value
+function 'for_with_conditional_continue' can exit without returning a value
+function 'do_with_conditional_return' can exit without returning a value
+function 'do_with_conditional_break' can exit without returning a value
+function 'do_with_conditional_continue' can exit without returning a value
+function 'bad_if_else_chain' can exit without returning a value
+function 'switch_empty' can exit without returning a value
+function 'switch_with_no_default' can exit without returning a value
+function 'switch_with_break' can exit without returning a value
+continue statement cannot be used in a switch
+function 'switch_with_continue' can exit without returning a value
+function 'switch_with_fallthrough_off_bottom' can exit without returning a value
+function 'switch_with_conditional_break' can exit without returning a value
+continue statement cannot be used in a switch
+function 'switch_with_conditional_continue' can exit without returning a value
+function 'switch_with_conditional_if_then_return' can exit without returning a value
+function 'switch_with_conditional_break_then_fallthrough' can exit without returning a value
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ComparisonDimensional.sksl b/third_party/skia/resources/sksl/errors/ComparisonDimensional.sksl
new file mode 100644
index 0000000000000..933fa4e87992c
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/ComparisonDimensional.sksl
@@ -0,0 +1,39 @@
+bool different_types() {
+    float2x2 m;
+    float2 v;
+    float f;
+    return v == f || v == m || m == f ||
+           f == v || m == v || f == m ||
+           v != f || v != m || m != f ||
+           f != v || m != v || f != m ;
+}
+
+bool different_matrices() {
+    float2x2 m2;
+    float3x3 m3;
+    return m2 == m3 || m2 != m3;
+}
+
+bool different_vectors() {
+    float2 v2;
+    float3 v3;
+    return v2 == v3 || v2 != v3;
+}
+/*%%*
+type mismatch: '==' cannot operate on 'float2', 'float'
+type mismatch: '==' cannot operate on 'float2', 'float2x2'
+type mismatch: '==' cannot operate on 'float2x2', 'float'
+type mismatch: '==' cannot operate on 'float', 'float2'
+type mismatch: '==' cannot operate on 'float2x2', 'float2'
+type mismatch: '==' cannot operate on 'float', 'float2x2'
+type mismatch: '!=' cannot operate on 'float2', 'float'
+type mismatch: '!=' cannot operate on 'float2', 'float2x2'
+type mismatch: '!=' cannot operate on 'float2x2', 'float'
+type mismatch: '!=' cannot operate on 'float', 'float2'
+type mismatch: '!=' cannot operate on 'float2x2', 'float2'
+type mismatch: '!=' cannot operate on 'float', 'float2x2'
+type mismatch: '==' cannot operate on 'float2x2', 'float3x3'
+type mismatch: '!=' cannot operate on 'float2x2', 'float3x3'
+type mismatch: '==' cannot operate on 'float2', 'float3'
+type mismatch: '!=' cannot operate on 'float2', 'float3'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ConstructorArgumentCount.sksl b/third_party/skia/resources/sksl/errors/ConstructorArgumentCount.sksl
index 6aece5058b2ba..6977bdf3ba0e8 100644
--- a/third_party/skia/resources/sksl/errors/ConstructorArgumentCount.sksl
+++ b/third_party/skia/resources/sksl/errors/ConstructorArgumentCount.sksl
@@ -1,3 +1,9 @@
 void construct_float3_from_float_float()             { float3 x = float3(1.0, 2.0); }
 void construct_float3_from_float_float_float_float() { float3 x = float3(1.0, 2.0, 3.0, 4.0); }
 void construct_bool_from_int3()                      { bool   x = bool(int3(77)); }
+
+/*%%*
+invalid arguments to 'float3' constructor (expected 3 scalars, but found 2)
+invalid arguments to 'float3' constructor (expected 3 scalars, but found 4)
+'int3' is not a valid parameter to 'bool' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ConstructorTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/ConstructorTypeMismatch.sksl
index 2677a0aecf5b4..4a54bbf8765d0 100644
--- a/third_party/skia/resources/sksl/errors/ConstructorTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/ConstructorTypeMismatch.sksl
@@ -8,3 +8,12 @@ void construct_float2_from_struct()     { float2 x = float2(foo); }
 void construct_float2x2_from_struct()   { float2x2 x = float2x2(foo); }
 void construct_float2x2_from_type()     { float2x2 x = float2x2(int); }
 void construct_float2x2_from_function() { float2x2 x = float2x2(sqrt); }
+
+/*%%*
+expected 'int', but found 'float2x2'
+'Foo' is not a valid parameter to 'float' constructor
+'Foo' is not a valid parameter to 'float2' constructor
+'Foo' is not a valid parameter to 'float2x2' constructor
+'<INVALID>' is not a valid parameter to 'float2x2' constructor
+'<INVALID>' is not a valid parameter to 'float2x2' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ContinueOutsideLoop.sksl b/third_party/skia/resources/sksl/errors/ContinueOutsideLoop.sksl
index 0664576900bdc..e4b98f2a7c4c4 100644
--- a/third_party/skia/resources/sksl/errors/ContinueOutsideLoop.sksl
+++ b/third_party/skia/resources/sksl/errors/ContinueOutsideLoop.sksl
@@ -1,2 +1,7 @@
 void outside_for()   { for (;;) {} continue; }
 void inside_switch() { switch (1) { default: continue; } }
+
+/*%%*
+continue statement must be inside a loop
+continue statement must be inside a loop
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/DivideByZero.sksl b/third_party/skia/resources/sksl/errors/DivideByZero.sksl
index 597765d2d084c..7f72eccbfc61b 100644
--- a/third_party/skia/resources/sksl/errors/DivideByZero.sksl
+++ b/third_party/skia/resources/sksl/errors/DivideByZero.sksl
@@ -2,3 +2,10 @@ int a = 1 / 0;
 float b = 1 / 0;
 float c = 1.0 / 0.0;
 float d = -67.0 / (3.0 - 3);
+
+/*%%*
+division by zero
+division by zero
+division by zero
+division by zero
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/DoTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/DoTypeMismatch.sksl
index 40dc166029196..ae27a62ccf923 100644
--- a/third_party/skia/resources/sksl/errors/DoTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/DoTypeMismatch.sksl
@@ -1,3 +1,7 @@
 void main() {
     do {} while (float2(1));
 }
+
+/*%%*
+expected 'bool', but found 'float2'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/DuplicateFunction.sksl b/third_party/skia/resources/sksl/errors/DuplicateFunction.sksl
index adf45e7231749..4125e2cad100d 100644
--- a/third_party/skia/resources/sksl/errors/DuplicateFunction.sksl
+++ b/third_party/skia/resources/sksl/errors/DuplicateFunction.sksl
@@ -1,2 +1,6 @@
 void main() {}
 void main() {}
+
+/*%%*
+duplicate definition of void main()
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/DuplicateOutput.sksl b/third_party/skia/resources/sksl/errors/DuplicateOutput.sksl
index 67a083bfadd97..6a4873837ee02 100644
--- a/third_party/skia/resources/sksl/errors/DuplicateOutput.sksl
+++ b/third_party/skia/resources/sksl/errors/DuplicateOutput.sksl
@@ -1 +1,5 @@
 layout (location=0, index=0) out half4 duplicateOutput;
+
+/*%%*
+out location=0, index=0 is reserved for sk_FragColor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/DuplicateSymbol.sksl b/third_party/skia/resources/sksl/errors/DuplicateSymbol.sksl
index fa73e8e68cad6..8785fcc646e76 100644
--- a/third_party/skia/resources/sksl/errors/DuplicateSymbol.sksl
+++ b/third_party/skia/resources/sksl/errors/DuplicateSymbol.sksl
@@ -5,3 +5,9 @@ int main;
 void main() {
     int y,y;
 }
+
+/*%%*
+symbol 'x' was already defined
+symbol 'main' was already defined
+symbol 'y' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/EmptyArray.sksl b/third_party/skia/resources/sksl/errors/EmptyArray.sksl
index d19fe4a474807..08502e18b5043 100644
--- a/third_party/skia/resources/sksl/errors/EmptyArray.sksl
+++ b/third_party/skia/resources/sksl/errors/EmptyArray.sksl
@@ -1,2 +1,7 @@
 int disallowed_zero[0];
 int disallowed_negative[-1];
+
+/*%%*
+array size must be positive
+array size must be positive
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/EmptyStruct.sksl b/third_party/skia/resources/sksl/errors/EmptyStruct.sksl
index f14106cdf9ec9..d0245e89d860c 100644
--- a/third_party/skia/resources/sksl/errors/EmptyStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/EmptyStruct.sksl
@@ -1 +1,5 @@
 struct S { };
+
+/*%%*
+struct 'S' must contain at least one field
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ErrorsInDeadCode.sksl b/third_party/skia/resources/sksl/errors/ErrorsInDeadCode.sksl
index ed7e732e28303..2f297d24f32ae 100644
--- a/third_party/skia/resources/sksl/errors/ErrorsInDeadCode.sksl
+++ b/third_party/skia/resources/sksl/errors/ErrorsInDeadCode.sksl
@@ -4,3 +4,10 @@ void error_in_dead_else_body()          { if (true) {} else x = 5; }
 void error_in_dead_if_body()            { if (false) x = 5; }
 void error_in_dead_ternary_true_expr()  { true ? 5 : x; }
 void error_in_dead_ternary_false_expr() { false ? x : 5; }
+
+/*%%*
+unknown identifier 'x'
+unknown identifier 'x'
+unknown identifier 'x'
+unknown identifier 'x'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/FloatRemainder.sksl b/third_party/skia/resources/sksl/errors/FloatRemainder.sksl
index fa77d2b664f9f..fd6f360b52512 100644
--- a/third_party/skia/resources/sksl/errors/FloatRemainder.sksl
+++ b/third_party/skia/resources/sksl/errors/FloatRemainder.sksl
@@ -5,3 +5,8 @@ float y;
 
 void rem()    { x = x % y; }
 void rem_eq() { x %= y; }
+
+/*%%*
+type mismatch: '%' cannot operate on 'float', 'float'
+type mismatch: '%=' cannot operate on 'float', 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ForInitStmt.sksl b/third_party/skia/resources/sksl/errors/ForInitStmt.sksl
index 92fdaa9aea144..f1933b8db334c 100644
--- a/third_party/skia/resources/sksl/errors/ForInitStmt.sksl
+++ b/third_party/skia/resources/sksl/errors/ForInitStmt.sksl
@@ -8,3 +8,7 @@ void test_init_stmt_continue()  { for (continue;; )             {} }
 void test_init_stmt_discard()   { for (discard;; )              {} }
 void test_init_stmt_type()      { for (void;; )                 {} }
 void test_init_stmt_deep()      { for (for(for(for(;;);;);;);;) {} }
+
+/*%%*
+expected expression, but found 'for'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ForTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/ForTypeMismatch.sksl
index 26bb7c427c241..590027e57ff04 100644
--- a/third_party/skia/resources/sksl/errors/ForTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/ForTypeMismatch.sksl
@@ -1,3 +1,7 @@
 void main() {
     for (int x = 0; x; x++) {}
 }
+
+/*%%*
+expected 'bool', but found 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/FunctionParameterOfVoid.sksl b/third_party/skia/resources/sksl/errors/FunctionParameterOfVoid.sksl
index fcae990f3d589..e5804dafd44a5 100644
--- a/third_party/skia/resources/sksl/errors/FunctionParameterOfVoid.sksl
+++ b/third_party/skia/resources/sksl/errors/FunctionParameterOfVoid.sksl
@@ -1 +1,5 @@
 void func(void x) {}
+
+/*%%*
+expected ')', but found 'x'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/GenericArgumentMismatch.sksl b/third_party/skia/resources/sksl/errors/GenericArgumentMismatch.sksl
index fd0ebdbfeef68..0dc3470afbaa7 100644
--- a/third_party/skia/resources/sksl/errors/GenericArgumentMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/GenericArgumentMismatch.sksl
@@ -1,3 +1,8 @@
 void sin_int_int() { float x = sin(1, 2); }
 void sin_bool()    { float x = sin(true); }
 
+
+/*%%*
+no match for sin(int, int)
+no match for sin(bool)
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/IfTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/IfTypeMismatch.sksl
index 74e23b2e96927..b612fa99baf8e 100644
--- a/third_party/skia/resources/sksl/errors/IfTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/IfTypeMismatch.sksl
@@ -1,3 +1,7 @@
 void main() {
     if (3) {}
 }
+
+/*%%*
+expected 'bool', but found 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InVarWithInitializerExpression.sksl b/third_party/skia/resources/sksl/errors/InVarWithInitializerExpression.sksl
index 419b9fc0f617f..4556329fa6ca9 100644
--- a/third_party/skia/resources/sksl/errors/InVarWithInitializerExpression.sksl
+++ b/third_party/skia/resources/sksl/errors/InVarWithInitializerExpression.sksl
@@ -1 +1,5 @@
 in float x = 1;
+
+/*%%*
+'in' variables cannot use initializer expressions
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/IncompleteExpression.sksl b/third_party/skia/resources/sksl/errors/IncompleteExpression.sksl
index d8f361ff7917e..b0a6910d49dff 100644
--- a/third_party/skia/resources/sksl/errors/IncompleteExpression.sksl
+++ b/third_party/skia/resources/sksl/errors/IncompleteExpression.sksl
@@ -2,3 +2,7 @@ half4 main(float2 xy) {
     int;
     return half4(0);
 }
+
+/*%%*
+expected '(' to begin constructor invocation
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/IncompleteFunctionCall.sksl b/third_party/skia/resources/sksl/errors/IncompleteFunctionCall.sksl
index 45a27637d2781..f63ab9bc53b52 100644
--- a/third_party/skia/resources/sksl/errors/IncompleteFunctionCall.sksl
+++ b/third_party/skia/resources/sksl/errors/IncompleteFunctionCall.sksl
@@ -2,3 +2,7 @@ half4 main(float2 xy) {
     mix;
     return half4(0);
 }
+
+/*%%*
+expected '(' to begin function call
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InterfaceBlockMemberReservedName.sksl b/third_party/skia/resources/sksl/errors/InterfaceBlockMemberReservedName.sksl
new file mode 100644
index 0000000000000..ffaafcd2b7732
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/InterfaceBlockMemberReservedName.sksl
@@ -0,0 +1,11 @@
+IB {
+    float float;
+} ib;
+
+float4 main() {
+    return ib.float.xxxx;
+}
+
+/*%%*
+expected an identifier, but found type 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InterfaceBlockReservedName.sksl b/third_party/skia/resources/sksl/errors/InterfaceBlockReservedName.sksl
new file mode 100644
index 0000000000000..7aba2bfed6a40
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/InterfaceBlockReservedName.sksl
@@ -0,0 +1,11 @@
+IB {
+    float f;
+} float;
+
+float4 main() {
+    return float.f.xxxx;
+}
+
+/*%%*
+expected ';', but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InterfaceBlockScope.sksl b/third_party/skia/resources/sksl/errors/InterfaceBlockScope.sksl
index cd913e0bc66b7..55aebadccbb82 100644
--- a/third_party/skia/resources/sksl/errors/InterfaceBlockScope.sksl
+++ b/third_party/skia/resources/sksl/errors/InterfaceBlockScope.sksl
@@ -1,3 +1,7 @@
 uniform testBlock {
     float x;
 } test[x];
+
+/*%%*
+unknown identifier 'x'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InterfaceBlockStorageModifiers.sksl b/third_party/skia/resources/sksl/errors/InterfaceBlockStorageModifiers.sksl
index 13073e7931661..1535c08591ea7 100644
--- a/third_party/skia/resources/sksl/errors/InterfaceBlockStorageModifiers.sksl
+++ b/third_party/skia/resources/sksl/errors/InterfaceBlockStorageModifiers.sksl
@@ -1 +1,5 @@
 uniform foo { out int x; };
+
+/*%%*
+'out' is not permitted here
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InterfaceBlockWithNoMembers.sksl b/third_party/skia/resources/sksl/errors/InterfaceBlockWithNoMembers.sksl
index 148f69a90c95b..2f32f29cd5297 100644
--- a/third_party/skia/resources/sksl/errors/InterfaceBlockWithNoMembers.sksl
+++ b/third_party/skia/resources/sksl/errors/InterfaceBlockWithNoMembers.sksl
@@ -1,2 +1,7 @@
 const S {};
 testBlock {} x[2];
+
+/*%%*
+interface block 'S' must contain at least one member
+interface block 'testBlock' must contain at least one member
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/IntrinsicInGlobalVariable.sksl b/third_party/skia/resources/sksl/errors/IntrinsicInGlobalVariable.sksl
index f24d23a2457e1..80062864c3f18 100644
--- a/third_party/skia/resources/sksl/errors/IntrinsicInGlobalVariable.sksl
+++ b/third_party/skia/resources/sksl/errors/IntrinsicInGlobalVariable.sksl
@@ -1,2 +1,6 @@
 half4 c = blend_src_over(half4(1), half4(0));
 void f() {}
+
+/*%%*
+global variable initializer must be a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InvalidAssignment.sksl b/third_party/skia/resources/sksl/errors/InvalidAssignment.sksl
index d838ef3c5a3c2..58a6a206ebe91 100644
--- a/third_party/skia/resources/sksl/errors/InvalidAssignment.sksl
+++ b/third_party/skia/resources/sksl/errors/InvalidAssignment.sksl
@@ -21,3 +21,19 @@ void assign_to_unary_plus()                   { float x; +x = 0; }  // TODO(skbu
 void assign_to_const_param(const int x)          { x = 0; }
 void assign_to_const_array_param(const int x[1]) { x[0] = 0; }
 void assign_to_const_struct_param(const S s)     { s.f = 0; }
+
+/*%%*
+cannot assign to this expression
+cannot modify immutable variable 'u'
+cannot modify immutable variable 'x'
+cannot assign to this expression
+cannot write to the same swizzle field more than once
+cannot modify immutable variable 'l'
+cannot modify immutable variable 'r'
+cannot modify immutable variable 'l'
+cannot assign to this expression
+cannot assign to this expression
+cannot modify immutable variable 'x'
+cannot modify immutable variable 'x'
+cannot modify immutable variable 's'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InvalidOutParams.sksl b/third_party/skia/resources/sksl/errors/InvalidOutParams.sksl
index 6194db826b77b..9df805e20e9b1 100644
--- a/third_party/skia/resources/sksl/errors/InvalidOutParams.sksl
+++ b/third_party/skia/resources/sksl/errors/InvalidOutParams.sksl
@@ -4,3 +4,9 @@ void inc4(out float4 x) { x += half4(1); }
 void test_a() { inc1(0); }
 void test_b() { inc4(float4(0)); }
 void test_c() { inc1(sqrt(1)); }
+
+/*%%*
+cannot assign to this expression
+cannot assign to this expression
+cannot assign to this expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InvalidToken.sksl b/third_party/skia/resources/sksl/errors/InvalidToken.sksl
index ec523f8d6bc02..5ec472d9d9723 100644
--- a/third_party/skia/resources/sksl/errors/InvalidToken.sksl
+++ b/third_party/skia/resources/sksl/errors/InvalidToken.sksl
@@ -1,2 +1,6 @@
 💩
 void main() {}
+
+/*%%*
+invalid token
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/InvalidUnary.sksl b/third_party/skia/resources/sksl/errors/InvalidUnary.sksl
index 186e1248ae81b..19ba562bb78f8 100644
--- a/third_party/skia/resources/sksl/errors/InvalidUnary.sksl
+++ b/third_party/skia/resources/sksl/errors/InvalidUnary.sksl
@@ -7,3 +7,13 @@ void postdecrement_vector() { float3 x = float3(1); x--; }
 void not_integer()          { int x = !12; }
 void positive_struct()      { Foo x = +bar; }
 void negative_struct()      { Foo x = -bar; }
+
+/*%%*
+'++' cannot operate on 'float4x4'
+'--' cannot operate on 'float3'
+'++' cannot operate on 'float4x4'
+'--' cannot operate on 'float3'
+'!' cannot operate on 'int'
+'+' cannot operate on 'Foo'
+'-' cannot operate on 'Foo'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/LayoutInFunctions.sksl b/third_party/skia/resources/sksl/errors/LayoutInFunctions.sksl
index d3b3ba1820e6e..b2d30fb6dc513 100644
--- a/third_party/skia/resources/sksl/errors/LayoutInFunctions.sksl
+++ b/third_party/skia/resources/sksl/errors/LayoutInFunctions.sksl
@@ -25,3 +25,28 @@ layout (
     set = 1,
     builtin = 1,
     input_attachment_index = 1) float x) {}
+
+/*%%*
+layout qualifier 'origin_upper_left' is not permitted here
+layout qualifier 'push_constant' is not permitted here
+layout qualifier 'blend_support_all_equations' is not permitted here
+layout qualifier 'color' is not permitted here
+layout qualifier 'location' is not permitted here
+layout qualifier 'offset' is not permitted here
+layout qualifier 'binding' is not permitted here
+layout qualifier 'index' is not permitted here
+layout qualifier 'set' is not permitted here
+layout qualifier 'builtin' is not permitted here
+layout qualifier 'input_attachment_index' is not permitted here
+layout qualifier 'origin_upper_left' is not permitted here
+layout qualifier 'push_constant' is not permitted here
+layout qualifier 'blend_support_all_equations' is not permitted here
+layout qualifier 'color' is not permitted here
+layout qualifier 'location' is not permitted here
+layout qualifier 'offset' is not permitted here
+layout qualifier 'binding' is not permitted here
+layout qualifier 'index' is not permitted here
+layout qualifier 'set' is not permitted here
+layout qualifier 'builtin' is not permitted here
+layout qualifier 'input_attachment_index' is not permitted here
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/LayoutInInterfaceBlock.sksl b/third_party/skia/resources/sksl/errors/LayoutInInterfaceBlock.sksl
index 5aad89ae67156..0f4787fd953c5 100644
--- a/third_party/skia/resources/sksl/errors/LayoutInInterfaceBlock.sksl
+++ b/third_party/skia/resources/sksl/errors/LayoutInInterfaceBlock.sksl
@@ -4,3 +4,8 @@ t {
     layout(binding=1) A y;  // Not allowed
     layout(set=0) A z;      // Not allowed
 };
+
+/*%%*
+layout qualifier 'binding' is not permitted here
+layout qualifier 'set' is not permitted here
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/LayoutInStruct.sksl b/third_party/skia/resources/sksl/errors/LayoutInStruct.sksl
index e9e124a11903f..ab695c89735b5 100644
--- a/third_party/skia/resources/sksl/errors/LayoutInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/LayoutInStruct.sksl
@@ -7,4 +7,8 @@ A a;
 
 void main(){
     a.x++;
-}
\ No newline at end of file
+}
+/*%%*
+layout qualifier 'binding' is not permitted on a struct field
+layout qualifier 'set' is not permitted on a struct field
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/LayoutRepeatedQualifiers.sksl b/third_party/skia/resources/sksl/errors/LayoutRepeatedQualifiers.sksl
index 7638796165e8e..abb80056db7b6 100644
--- a/third_party/skia/resources/sksl/errors/LayoutRepeatedQualifiers.sksl
+++ b/third_party/skia/resources/sksl/errors/LayoutRepeatedQualifiers.sksl
@@ -23,3 +23,20 @@ layout (
     builtin = 2,
     input_attachment_index = 2
 ) float x;
+
+/*%%*
+layout qualifier 'origin_upper_left' appears more than once
+layout qualifier 'push_constant' appears more than once
+layout qualifier 'blend_support_all_equations' appears more than once
+layout qualifier 'color' appears more than once
+layout qualifier 'location' appears more than once
+layout qualifier 'offset' appears more than once
+layout qualifier 'binding' appears more than once
+layout qualifier 'index' appears more than once
+layout qualifier 'set' appears more than once
+layout qualifier 'builtin' appears more than once
+layout qualifier 'input_attachment_index' appears more than once
+'layout(color)' is only permitted in runtime effects
+'layout(color)' is only permitted on 'uniform' variables
+'layout(color)' is not permitted on variables of type 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/MatrixIndexOutOfRange.sksl
index e57ac224d9ffa..ecdfc6e934be6 100644
--- a/third_party/skia/resources/sksl/errors/MatrixIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixIndexOutOfRange.sksl
@@ -29,3 +29,22 @@ void half4_2_constidx()        { half3x3 m;      const int INDEX = 2;          h
 void half4_3_constidx()        { half3x3 m;      const int INDEX = 3;          half3 v = m[INDEX]; }
 void half4_4_constidx()        { half3x3 m;      const int INDEX = 4;          half3 v = m[INDEX]; }
 void half4_huge_constidx()     { half3x3 m;      const int INDEX = 1000000000; half3 v = m[INDEX]; }
+
+/*%%*
+index -1 out of range for 'half2x4'
+index 2 out of range for 'half2x4'
+index 3 out of range for 'half2x4'
+index 4 out of range for 'half2x4'
+index 1000000000 out of range for 'half2x4'
+index -1 out of range for 'half3x3'
+index 3 out of range for 'half3x3'
+index 4 out of range for 'half3x3'
+index 1000000000 out of range for 'half3x3'
+index -1 out of range for 'half4x2'
+index 4 out of range for 'half4x2'
+index 1000000000 out of range for 'half4x2'
+index -1 out of range for 'half3x3'
+index 3 out of range for 'half3x3'
+index 4 out of range for 'half3x3'
+index 1000000000 out of range for 'half3x3'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixInlinedIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/MatrixInlinedIndexOutOfRange.sksl
index f9a8722baffcf..489bc6ec3d668 100644
--- a/third_party/skia/resources/sksl/errors/MatrixInlinedIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixInlinedIndexOutOfRange.sksl
@@ -11,3 +11,8 @@ half4 main(float2 coords) {
     float3 undefined = indexMatrix(-1) + indexMatrix(3);
     return colorGreen;
 }
+
+/*%%*
+index -1 out of range for 'float3x3'
+index 3 out of range for 'float3x3'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixToVectorCast3x3.sksl b/third_party/skia/resources/sksl/errors/MatrixToVectorCast3x3.sksl
index 6767a3283ae17..d94e744857b03 100644
--- a/third_party/skia/resources/sksl/errors/MatrixToVectorCast3x3.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixToVectorCast3x3.sksl
@@ -5,3 +5,10 @@ half    testScalar    = half (testMatrix3x3);
 half2   testVec2      = half2(testMatrix3x3);
 half3   testVec3      = half3(testMatrix3x3);
 half4   testVec4      = half4(testMatrix3x3);
+
+/*%%*
+'half3x3' is not a valid parameter to 'half' constructor; use '[0][0]' instead
+'half3x3' is not a valid parameter to 'half2' constructor
+'half3x3' is not a valid parameter to 'half3' constructor
+'half3x3' is not a valid parameter to 'half4' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixToVectorCastBoolean.sksl b/third_party/skia/resources/sksl/errors/MatrixToVectorCastBoolean.sksl
index cacfc1adbbd65..ef25f2198356d 100644
--- a/third_party/skia/resources/sksl/errors/MatrixToVectorCastBoolean.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixToVectorCastBoolean.sksl
@@ -5,3 +5,9 @@ bool    testScalar    = bool (testMatrix2x2);
 bool2   testVec2      = bool2(testMatrix2x2);
 bool3   testVec3      = bool3(testMatrix2x2);
 bool4   testVec4      = bool4(testMatrix2x2);  // not an error
+
+/*%%*
+'half2x2' is not a valid parameter to 'bool' constructor
+'half2x2' is not a valid parameter to 'bool2' constructor
+'half2x2' is not a valid parameter to 'bool3' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixToVectorCastInteger.sksl b/third_party/skia/resources/sksl/errors/MatrixToVectorCastInteger.sksl
index 9a9966f184923..b574457eaf26b 100644
--- a/third_party/skia/resources/sksl/errors/MatrixToVectorCastInteger.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixToVectorCastInteger.sksl
@@ -5,3 +5,9 @@ int    testScalar    = int (testMatrix2x2);
 int2   testVec2      = int2(testMatrix2x2);
 int3   testVec3      = int3(testMatrix2x2);
 int4   testVec4      = int4(testMatrix2x2);  // not an error
+
+/*%%*
+'half2x2' is not a valid parameter to 'int' constructor
+'half2x2' is not a valid parameter to 'int2' constructor
+'half2x2' is not a valid parameter to 'int3' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MatrixToVectorCastTooSmall.sksl b/third_party/skia/resources/sksl/errors/MatrixToVectorCastTooSmall.sksl
index 328789ee20565..fe7c891d912b6 100644
--- a/third_party/skia/resources/sksl/errors/MatrixToVectorCastTooSmall.sksl
+++ b/third_party/skia/resources/sksl/errors/MatrixToVectorCastTooSmall.sksl
@@ -5,3 +5,9 @@ half    testScalar    = half (testMatrix2x2);
 half2   testVec2      = half2(testMatrix2x2);
 half3   testVec3      = half3(testMatrix2x2);
 half4   testVec4      = half4(testMatrix2x2);  // not an error
+
+/*%%*
+'half2x2' is not a valid parameter to 'half' constructor; use '[0][0]' instead
+'half2x2' is not a valid parameter to 'half2' constructor
+'half2x2' is not a valid parameter to 'half3' constructor
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MismatchedNumbers.sksl b/third_party/skia/resources/sksl/errors/MismatchedNumbers.sksl
index 9d2e42476daf9..ea3615f9db65f 100644
--- a/third_party/skia/resources/sksl/errors/MismatchedNumbers.sksl
+++ b/third_party/skia/resources/sksl/errors/MismatchedNumbers.sksl
@@ -73,3 +73,56 @@ void   u_plus_i_disallowed()               { u + i; }
 void   u_minus_i_disallowed()              { u - i; }
 void   u_mul_i_disallowed()                { u * i; }
 void   u_div_i_disallowed()                { u / i; }
+
+/*%%*
+type mismatch: '=' cannot operate on 'int', 'float'
+type mismatch: '=' cannot operate on 'uint', 'float'
+type mismatch: '=' cannot operate on 'int', 'uint'
+type mismatch: '=' cannot operate on 'int', 'float'
+type mismatch: '=' cannot operate on 'float', 'int'
+function 'f_eq_i_disallowed' can exit without returning a value
+type mismatch: '=' cannot operate on 'float', 'uint'
+function 'f_eq_u_disallowed' can exit without returning a value
+type mismatch: '=' cannot operate on 'uint', 'int'
+type mismatch: '=' cannot operate on 'uint', 'float'
+type mismatch: '+' cannot operate on 'int', 'float'
+type mismatch: '-' cannot operate on 'int', 'float'
+type mismatch: '*' cannot operate on 'int', 'float'
+type mismatch: '/' cannot operate on 'int', 'float'
+type mismatch: '+' cannot operate on 'float', 'int'
+type mismatch: '-' cannot operate on 'float', 'int'
+type mismatch: '*' cannot operate on 'float', 'int'
+type mismatch: '/' cannot operate on 'float', 'int'
+type mismatch: '+' cannot operate on 'uint', 'float'
+type mismatch: '-' cannot operate on 'uint', 'float'
+type mismatch: '*' cannot operate on 'uint', 'float'
+type mismatch: '/' cannot operate on 'uint', 'float'
+type mismatch: '+' cannot operate on 'float', 'uint'
+type mismatch: '-' cannot operate on 'float', 'uint'
+type mismatch: '*' cannot operate on 'float', 'uint'
+type mismatch: '/' cannot operate on 'float', 'uint'
+type mismatch: '+' cannot operate on 'int', 'float'
+type mismatch: '-' cannot operate on 'int', 'float'
+type mismatch: '*' cannot operate on 'int', 'float'
+type mismatch: '/' cannot operate on 'int', 'float'
+type mismatch: '+' cannot operate on 'float', 'int'
+type mismatch: '-' cannot operate on 'float', 'int'
+type mismatch: '*' cannot operate on 'float', 'int'
+type mismatch: '/' cannot operate on 'float', 'int'
+type mismatch: '+' cannot operate on 'uint', 'float'
+type mismatch: '-' cannot operate on 'uint', 'float'
+type mismatch: '*' cannot operate on 'uint', 'float'
+type mismatch: '/' cannot operate on 'uint', 'float'
+type mismatch: '+' cannot operate on 'float', 'uint'
+type mismatch: '-' cannot operate on 'float', 'uint'
+type mismatch: '*' cannot operate on 'float', 'uint'
+type mismatch: '/' cannot operate on 'float', 'uint'
+type mismatch: '+' cannot operate on 'int', 'uint'
+type mismatch: '-' cannot operate on 'int', 'uint'
+type mismatch: '*' cannot operate on 'int', 'uint'
+type mismatch: '/' cannot operate on 'int', 'uint'
+type mismatch: '+' cannot operate on 'uint', 'int'
+type mismatch: '-' cannot operate on 'uint', 'int'
+type mismatch: '*' cannot operate on 'uint', 'int'
+type mismatch: '/' cannot operate on 'uint', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ModifiersInStruct.sksl b/third_party/skia/resources/sksl/errors/ModifiersInStruct.sksl
index ba68d1505117f..c5bafc5b5c34d 100644
--- a/third_party/skia/resources/sksl/errors/ModifiersInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/ModifiersInStruct.sksl
@@ -5,3 +5,11 @@ struct S {
     noperspective float4 d;
     inout bool e;
 };
+
+/*%%*
+modifier 'const' is not permitted on a struct field
+modifier 'uniform' is not permitted on a struct field
+modifier 'flat' is not permitted on a struct field
+modifier 'noperspective' is not permitted on a struct field
+modifier 'inout' is not permitted on a struct field
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MultipleFields.sksl b/third_party/skia/resources/sksl/errors/MultipleFields.sksl
new file mode 100644
index 0000000000000..77cdf1ae99fed
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/MultipleFields.sksl
@@ -0,0 +1,9 @@
+struct Varyings {
+  float var;
+  float var;
+};
+
+
+/*%%*
+field 'var' was already defined in the same struct ('Varyings')
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl b/third_party/skia/resources/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl
new file mode 100644
index 0000000000000..fa25f310048ca
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/MultipleFieldsInInterfaceBlocks.sksl
@@ -0,0 +1,12 @@
+IB {
+    float f;
+    float f;
+} ib;
+
+IB1 { float f; };
+IB2 { float f; };
+
+/*%%*
+field 'f' was already defined in the same interface block ('IB')
+symbol 'f' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/NoES3ModifierInUserCode.sksl b/third_party/skia/resources/sksl/errors/NoES3ModifierInUserCode.sksl
index f9ce51b5fc129..b47605e6866fb 100644
--- a/third_party/skia/resources/sksl/errors/NoES3ModifierInUserCode.sksl
+++ b/third_party/skia/resources/sksl/errors/NoES3ModifierInUserCode.sksl
@@ -1,2 +1,6 @@
 $es3 void fn() {}
 
+
+/*%%*
+'$es3' is not permitted here
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpaqueTypeAssignment.sksl b/third_party/skia/resources/sksl/errors/OpaqueTypeAssignment.sksl
index 99058aeac8881..e62900a40bb61 100644
--- a/third_party/skia/resources/sksl/errors/OpaqueTypeAssignment.sksl
+++ b/third_party/skia/resources/sksl/errors/OpaqueTypeAssignment.sksl
@@ -4,3 +4,11 @@ sampler c = a;
 void declare() { sampler d; }
 void initialize() { sampler e = a; }
 void assign() { a = b; }
+
+/*%%*
+opaque type 'sampler' cannot use initializer expressions
+variables of type 'sampler' must be global
+variables of type 'sampler' must be global
+opaque type 'sampler' cannot use initializer expressions
+assignments to opaque type 'sampler' are not permitted
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpaqueTypeConstruction.sksl b/third_party/skia/resources/sksl/errors/OpaqueTypeConstruction.sksl
index 742192765a53e..55abf0b94cae2 100644
--- a/third_party/skia/resources/sksl/errors/OpaqueTypeConstruction.sksl
+++ b/third_party/skia/resources/sksl/errors/OpaqueTypeConstruction.sksl
@@ -3,3 +3,7 @@ void func(sampler s) {}
 void main() {
     func(sampler(a));
 }
+
+/*%%*
+cannot construct 'sampler'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpaqueTypeInArray.sksl b/third_party/skia/resources/sksl/errors/OpaqueTypeInArray.sksl
index 81074cd58975c..d5eb56d4fefcb 100644
--- a/third_party/skia/resources/sksl/errors/OpaqueTypeInArray.sksl
+++ b/third_party/skia/resources/sksl/errors/OpaqueTypeInArray.sksl
@@ -2,3 +2,10 @@ in sampler a[1];
 in sampler[1] b;
 void fnC() { sampler c[1]; }
 void fnD() { sampler[1] d; }
+
+/*%%*
+opaque type 'sampler' may not be used in an array
+opaque type 'sampler' may not be used in an array
+opaque type 'sampler' may not be used in an array
+opaque type 'sampler' may not be used in an array
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpaqueTypeInInterfaceBlock.sksl b/third_party/skia/resources/sksl/errors/OpaqueTypeInInterfaceBlock.sksl
index 0c5e5033671fc..519d1ddf39d73 100644
--- a/third_party/skia/resources/sksl/errors/OpaqueTypeInInterfaceBlock.sksl
+++ b/third_party/skia/resources/sksl/errors/OpaqueTypeInInterfaceBlock.sksl
@@ -1 +1,5 @@
 Bad { sampler x; };
+
+/*%%*
+variables of type 'sampler' must be global
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpaqueTypeInStruct.sksl b/third_party/skia/resources/sksl/errors/OpaqueTypeInStruct.sksl
index cd18704fc0ce1..a21b99667af6a 100644
--- a/third_party/skia/resources/sksl/errors/OpaqueTypeInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/OpaqueTypeInStruct.sksl
@@ -1,3 +1,7 @@
 struct Bad { sampler x; };
 uniform Bad b;
 void main() {}
+
+/*%%*
+opaque type 'sampler' is not permitted in a struct
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OpenArray.sksl b/third_party/skia/resources/sksl/errors/OpenArray.sksl
index 918a0ba79f842..63de3bb43daec 100644
--- a/third_party/skia/resources/sksl/errors/OpenArray.sksl
+++ b/third_party/skia/resources/sksl/errors/OpenArray.sksl
@@ -1,3 +1,9 @@
 void main(inout float4 color) {
     color.r[ = ( color.g );
 }
+
+/*%%*
+shader 'main' must be main() or main(float2)
+unknown identifier 'color'
+expected expression, but found '='
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz26700.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz26700.sksl
index 6a4e5057fdea5..f6d993821c1df 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz26700.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz26700.sksl
@@ -1,2 +1,6 @@
 q { int y; };
 G { int q=_; };
+
+/*%%*
+expected ';', but found '='
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz27614.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz27614.sksl
index bb9b8e20e95e6..87ceaca67e7b1 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz27614.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz27614.sksl
@@ -1 +1,5 @@
 void main() { 0.5 - 0 * ~0 - half2(0) + 1; }
+
+/*%%*
+type mismatch: '-' cannot operate on 'float', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz27650.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz27650.sksl
index 9dec2c7636808..b715bbfdd57f7 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz27650.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz27650.sksl
@@ -1 +1,6 @@
 void main() { int i=9E7; 2+int4(i); }
+
+/*%%*
+expected 'int', but found 'float'
+unknown identifier 'i'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz27663.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz27663.sksl
index 432f8639b4de3..b07dc875f915d 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz27663.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz27663.sksl
@@ -1 +1,6 @@
 void main() { sk_FragColor = float4(1) / - -half4(0); }
+
+/*%%*
+division by zero
+type mismatch: '=' cannot operate on 'half4', 'float4'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz28050.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz28050.sksl
index 21d86a7a7c58f..854b583068b2e 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz28050.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz28050.sksl
@@ -2,3 +2,7 @@ float an()  { return 2; }
 void wna()  { an(), float[1](); }
 void na()   { wna(); }
 void main() { na(), na(); }
+
+/*%%*
+invalid arguments to 'float[1]' constructor (expected 1 elements, but found 0)
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz29444.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz29444.sksl
index dc07ec10b0b18..551334e7f3b49 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz29444.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz29444.sksl
@@ -2,3 +2,8 @@ float an()   { return 2; }
 void  wna()  { an(), float[1](), float[1](); }
 void  na()   { wna(); }
 void  main() { na(), na(); }
+
+/*%%*
+invalid arguments to 'float[1]' constructor (expected 1 elements, but found 0)
+invalid arguments to 'float[1]' constructor (expected 1 elements, but found 0)
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz29845.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz29845.sksl
index 3b5b0048874dc..9576bf9221555 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz29845.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz29845.sksl
@@ -1,3 +1,8 @@
 struct Test {
     l();
     void m();
+
+/*%%*
+no type named 'l'
+expected a type, but found '('
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz29849.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz29849.sksl
index 9e00e9582e16a..d3039f664a106 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz29849.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz29849.sksl
@@ -2,3 +2,7 @@ void main() {
     if (2 < 2) int a;
     a;
 }
+
+/*%%*
+variable 'a' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz31410.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz31410.sksl
index 40c7b9b74e976..fa36f7dfe3999 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz31410.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz31410.sksl
@@ -1,3 +1,7 @@
 void main() {
     sk_FragColor+=(0), 1.*~2;
 }
+
+/*%%*
+type mismatch: '*' cannot operate on 'float', 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz31469.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz31469.sksl
index bd23a0c4ef753..6f024d5eff23c 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz31469.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz31469.sksl
@@ -1,3 +1,7 @@
 half n() {}
 void S() { -n(); }
 void l() { S(); }
+
+/*%%*
+function 'n' can exit without returning a value
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz32156.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz32156.sksl
index b894a2430c021..8387c53060d10 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz32156.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz32156.sksl
@@ -1 +1,5 @@
 int s[3456*3456*928*48*8*4*544*8*8*544*8*48*8*4*544*184-51488*48*544*5888*48*8*54*544*54*544*5888*48*8*54*544*54];
+
+/*%%*
+array size must be an integer
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz32587.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz32587.sksl
index b113c9d6044ed..632951b4574d5 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz32587.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz32587.sksl
@@ -1,2 +1,7 @@
 const float x=1, _=x1;
 half x=x*8;
+
+/*%%*
+unknown identifier 'x1'
+expected 'half', but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz32851.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz32851.sksl
index 3b0c8bb36704c..d91fb3155c778 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz32851.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz32851.sksl
@@ -1 +1,6 @@
 int v=6/int2(bool2(0));
+
+/*%%*
+division by zero
+expected 'int', but found 'int2'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz36850.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz36850.sksl
index 87b1ce7831127..57a04fa8715ca 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz36850.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz36850.sksl
@@ -1,2 +1,5 @@
 T { int x; } f[];
 void main() { sk_FragCoord; }
+
+/*%%*
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz37457.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz37457.sksl
index 0cdfdaffaf1c5..eefdfd8483f21 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz37457.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz37457.sksl
@@ -1 +1,5 @@
 float a[b];
+
+/*%%*
+unknown identifier 'b'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz37465.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz37465.sksl
index c16257a05d890..58cd97240a8f3 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz37465.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz37465.sksl
@@ -1 +1,5 @@
 float f(const float x) { 5+x; }
+
+/*%%*
+function 'f' can exit without returning a value
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz37469.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz37469.sksl
index 3c22758c77b90..419b3e93c84e9 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz37469.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz37469.sksl
@@ -1 +1,3 @@
-k{int z;}m[];void main(){}
\ No newline at end of file
+k{int z;}m[];void main(){}
+/*%%*
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz37620.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz37620.sksl
index bfbc55b704598..af9debd87ac91 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz37620.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz37620.sksl
@@ -1 +1,5 @@
 void n() { for(;;exp); }
+
+/*%%*
+expected '(' to begin function call
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38106.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38106.sksl
index 79dbe5cee8f15..3f2d5b7291c25 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38106.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38106.sksl
@@ -1 +1,7 @@
 half R = 0 .;
+
+/*%%*
+expected identifier, but found ';'
+expected field name or swizzle mask after '.'
+expected ';', but found ''
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38107.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38107.sksl
index f76dd238ade08..22bfaf778551f 100644
Binary files a/third_party/skia/resources/sksl/errors/Ossfuzz38107.sksl and b/third_party/skia/resources/sksl/errors/Ossfuzz38107.sksl differ
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38108.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38108.sksl
index de4bf01ec8331..9f8be49b9a6cb 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38108.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38108.sksl
@@ -1 +1,4 @@
-int a,a;
\ No newline at end of file
+int a,a;
+/*%%*
+symbol 'a' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38140.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38140.sksl
index 2515b81d5e584..61d2782debb1a 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38140.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38140.sksl
@@ -5,3 +5,10 @@ half4 blend_src_over(half4 src, half4 dst) {
 half4 main(half4 src, half4 dst) {
     return blend_src_over(src, half4(1) - dst);
 }
+
+/*%%*
+function 'half4 blend_src_over(half4 src, half4 dst)' was already defined
+shader 'main' must be main() or main(float2)
+unknown identifier 'src'
+unknown identifier 'dst'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38560.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38560.sksl
index 1b2eab7217145..225aa334ce35f 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38560.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38560.sksl
@@ -1 +1,6 @@
 void n() { for(int r,r;;) int s; }
+
+/*%%*
+symbol 'r' was already defined
+variable 's' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38865.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38865.sksl
index 1ea5b80d0d5cb..62f22543032ef 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38865.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38865.sksl
@@ -1 +1,4 @@
-void c=+
\ No newline at end of file
+void c=+
+/*%%*
+expected expression, but found ''
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz38944.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz38944.sksl
index b6b5aa5e698d7..e61c834ea9086 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz38944.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz38944.sksl
@@ -1 +1,4 @@
-int a = log(    
\ No newline at end of file
+int a = log(    
+/*%%*
+expected expression, but found ''
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz39000.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz39000.sksl
index 6a4e5057fdea5..f6d993821c1df 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz39000.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz39000.sksl
@@ -1,2 +1,6 @@
 q { int y; };
 G { int q=_; };
+
+/*%%*
+expected ';', but found '='
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz40427.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz40427.sksl
index 39350e6cd4263..5a8c3c472a5f0 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz40427.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz40427.sksl
@@ -1 +1,6 @@
 uint s, z = s.0s.0s - 1;
+
+/*%%*
+integer is out of range for type 'uint': -1
+expected 'uint', but found 'uint2'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz40428.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz40428.sksl
index 78dc543155228..65d41043b01ca 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz40428.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz40428.sksl
@@ -1 +1,6 @@
 int x[~2147483649];
+
+/*%%*
+integer is out of range for type 'int': 2147483649
+array size must be an integer
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz40479.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz40479.sksl
index 8ab7eb8efef3c..ad7ccb33400ad 100644
--- a/third_party/skia/resources/sksl/errors/Ossfuzz40479.sksl
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz40479.sksl
@@ -1 +1,9 @@
 void[4016112253 .r1r
+
+/*%%*
+integer is out of range for type 'int': 4016112253
+array size must be an integer
+type 'void' may not be used in an array
+expected ']', but found ''
+expected an identifier, but found ''
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44045.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44045.sksl
new file mode 100644
index 0000000000000..44ad4aaa88e83
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz44045.sksl
@@ -0,0 +1,6 @@
+int[int3(half3(int3(half3(662666666.*6))))[1]] x;
+
+/*%%*
+integer is out of range for type 'int': 3976000000
+array size must be positive
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44551.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44551.sksl
new file mode 100644
index 0000000000000..b6c8017544201
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz44551.sksl
@@ -0,0 +1,11 @@
+void m( ){;
+int x;x+x-x+x+x+++x-+x+x+
+ x+
+ x+
+x+x+x+x;x* x+7+x+x+x+++x-+x+x+x+x;x+x-x+x* x+8+x+
+x+x+x+x+x-+x+x+x+-x+x+++x-+ x+7+x +x-+x+x+x+++x-+x-+x+x* x+7;x+
+x+x+x+x+x+++x-+x+x+
+ void o(){{{{{{{{{{{{{{{{{{{{{{{{{ 3x+
+ x+
+ x+3+x+x+x+++x-+x+
+x+x+x+x+x+++x&+-+x,~0/1;}void n() {;;m()7.<<void o);;9;;}void l(){n();;;0;;;({}[ colod({h
\ No newline at end of file
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44555.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44555.sksl
new file mode 100644
index 0000000000000..47025a73f7583
Binary files /dev/null and b/third_party/skia/resources/sksl/errors/Ossfuzz44555.sksl differ
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44557.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44557.sksl
new file mode 100644
index 0000000000000..adc466117a83a
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz44557.sksl
@@ -0,0 +1,17 @@
+uniform half4 colorGreen, cohorRed;
+
+struct S {
+    int x, y;
+};
+
+half4 main(float2 coords) {
+    float f1[4] = float[4](1, 2, 3, 4);
+    float f2[4] = float[4](1, 2, 3, 4);
+    float[4] f6 = float[4](1, 2, 3, -4);
+
+    int3 v1[2] = int3[2](int3(1, 2, 3), int3(4, 5, 6));
+    int3[2]?v2 = int3[2](int3(1, 2, 3), int3(4, 5, int s,r,b,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,z,r,b,r,r,r,r,r,r,b,r,r,r,r,r,r,rr,r,r,r,r,r,r,r,r,r,r,r,b,r,r,r, s,r,b,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,r,b,r,r,r,r,r,r,r,z,r,b,r,r,r,r,r,r,b,r,r,r,r,r,r,rr,r,r,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,b,r,r{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{,b,r,r4);
+    float[4] f6 = float[4](1, 2, 3, -4);
+
+    int3 v1[2] = int3[2](int3(1, 2, 3), int3(4, 5, 6));
+    int3[2]?v2 = int3[2](int3(1, 2, 3), int3(4, 5, int s,r,b,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,z,r,b,r,r,r,r,r,r,b,r,r,r,r,r,r,rr,r,r,r,r,r,r,r,r,r,r,r,b,r,r,r, s,r,b,r,r,r,b,r,r,r,r,r,b,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,r,b,r,r,r,r,r,r,r,z,r,b,r,r,r,r,r,r,b,r,r,r,r,r,r,rr,r,r,r,r,r,r,r,r,r,r,r,b,r,r,r,r,r,r,b,r,r{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{,r,r,r,r,rsssssssssssssssss3(
\ No newline at end of file
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44559.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44559.sksl
new file mode 100644
index 0000000000000..531ba7646de71
Binary files /dev/null and b/third_party/skia/resources/sksl/errors/Ossfuzz44559.sksl differ
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44561.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44561.sksl
new file mode 100644
index 0000000000000..817e82f409a63
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz44561.sksl
@@ -0,0 +1,21 @@
+void m(){ix;void[(0).r1(((5).ss0s.ss0s.sss0.ss0s+(5).ss0s.sss.00ss.ss0s.ss .ss0.ss00.ss0s+(5).ss0s.ss0.s0s.ss00.sssch (int) {case 0:{{{{{{{{{{{{{{{{{{{{{{{{e;void n(){;; int 
m;;half x;
+x*x++.ss1.ss;0;
+
+;5;
+
+switch (int) {case 0:{{{{{{{{{{{{{{{{{{{{{{{{e;void n(){;; int 
m;;half x;
+x*x++.ss1.ss;0;
+
+;
+x*x++.ss5.ss0, x;
+;6;
+
+;
+x*x++.ss11;;;;;0;;}void l(){3	;n();;switch (int) {case 0:{{{{{{{{{{{{{{{{{{{{{{{{e;void n(){;; int 
m;; ;
+//-, x;
+;6;
+
+;
+x*x++.ss11;;;;;0;;}void l(){3	;n();;switch (int) {case 0:{{{{{{{{{{{{{{{{{{{{{{{{e;void n(){;; int 
m;; ;
+
+;5;0.ss0s.ss .ss0s.ss00.ss0s+(5).ss0s.ss0.ss0(){int[{}
\ No newline at end of file
diff --git a/third_party/skia/resources/sksl/errors/Ossfuzz44565.sksl b/third_party/skia/resources/sksl/errors/Ossfuzz44565.sksl
new file mode 100644
index 0000000000000..403cb2616acae
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/Ossfuzz44565.sksl
@@ -0,0 +1,3 @@
+void mainain() {
+in blend_hard_light(nt  blend_dst(s=d&6o&&0-4=t[e(p¸¸<=t[t[e(p = all(not(bool3(1 ru¸¸¸ha{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{ld(-1=t[evoid mainain() {
+int[d((p = ala7=t[t(bold(ol3¸-4=¸ti
\ No newline at end of file
diff --git a/third_party/skia/resources/sksl/errors/OverflowFloatLiteral.sksl b/third_party/skia/resources/sksl/errors/OverflowFloatLiteral.sksl
index ed0cfb176c243..3015135ffa428 100644
--- a/third_party/skia/resources/sksl/errors/OverflowFloatLiteral.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowFloatLiteral.sksl
@@ -1,3 +1,7 @@
 void main() {
-    sk_FragColor.x = half4(3.41e+38);
+    sk_FragColor = half4(3.41e+38);
 }
+
+/*%%*
+floating-point value is too large:
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OverflowInlinedLiteral.sksl b/third_party/skia/resources/sksl/errors/OverflowInlinedLiteral.sksl
index f89d677e14aa0..3d3057583300d 100644
--- a/third_party/skia/resources/sksl/errors/OverflowInlinedLiteral.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowInlinedLiteral.sksl
@@ -25,3 +25,12 @@ void main() {
     negate_int4(int4(-2147483648));
 }
 
+
+/*%%*
+integer is out of range for type 'short': 99999
+integer is out of range for type 'short': 67890
+integer is out of range for type 'int': 5000000000
+integer is out of range for type 'int': 3000000000
+integer is out of range for type 'short': 32768
+integer is out of range for type 'int': 2147483648
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OverflowInt64Literal.sksl b/third_party/skia/resources/sksl/errors/OverflowInt64Literal.sksl
index a651ea83d4d64..d6a695b176e3e 100644
--- a/third_party/skia/resources/sksl/errors/OverflowInt64Literal.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowInt64Literal.sksl
@@ -1 +1,5 @@
 const int not_five = 18446744073709551621; // actually 0x10000000000000005
+
+/*%%*
+integer is too large: 18446744073709551621
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OverflowIntLiteral.sksl b/third_party/skia/resources/sksl/errors/OverflowIntLiteral.sksl
index 5b529f36e7a5b..ba27e6056b672 100644
--- a/third_party/skia/resources/sksl/errors/OverflowIntLiteral.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowIntLiteral.sksl
@@ -10,3 +10,12 @@ short4 s4_pos = short4(32765, 32768, 32766, 32767);     // error 32768
 
 int   cast_int   = int(2147483648.);                    // error
 short cast_short = short(32768.);                       // error
+
+/*%%*
+integer is out of range for type 'int': -2147483649
+integer is out of range for type 'int': 2147483648
+integer is out of range for type 'short': -32769
+integer is out of range for type 'short': 32768
+integer is out of range for type 'int': 2147483648
+integer is out of range for type 'short': 32768
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OverflowParamArraySize.sksl b/third_party/skia/resources/sksl/errors/OverflowParamArraySize.sksl
index 74b4fa732cf86..4927cedcaf653 100644
--- a/third_party/skia/resources/sksl/errors/OverflowParamArraySize.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowParamArraySize.sksl
@@ -1 +1,6 @@
 void fn(int arr[4294967296]);
+
+/*%%*
+integer is too large: 4294967296
+array size must be positive
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/OverflowUintLiteral.sksl b/third_party/skia/resources/sksl/errors/OverflowUintLiteral.sksl
index 6e017c2ada6be..4e6913f4a4bde 100644
--- a/third_party/skia/resources/sksl/errors/OverflowUintLiteral.sksl
+++ b/third_party/skia/resources/sksl/errors/OverflowUintLiteral.sksl
@@ -10,3 +10,12 @@ ushort4 us4_pos = ushort4(65536, 65535, 65534, 65533); // error 65536
 
 uint   cast_int   = uint(4294967296.);                 // error
 ushort cast_short = ushort(65536.);                    // error
+
+/*%%*
+integer is out of range for type 'uint': -1
+integer is too large: 4294967296
+integer is out of range for type 'ushort': -1
+integer is out of range for type 'ushort': 65536
+integer is out of range for type 'uint': 4294967296
+integer is out of range for type 'ushort': 65536
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/PrecisionQualifiersDisallowed.sksl b/third_party/skia/resources/sksl/errors/PrecisionQualifiersDisallowed.sksl
index ee1f7ed15c958..ac46e81dae6e1 100644
--- a/third_party/skia/resources/sksl/errors/PrecisionQualifiersDisallowed.sksl
+++ b/third_party/skia/resources/sksl/errors/PrecisionQualifiersDisallowed.sksl
@@ -2,3 +2,9 @@
 void h() { highp int x; }
 void m() { mediump int x; }
 void l() { lowp int x; }
+
+/*%%*
+precision qualifiers are not allowed
+precision qualifiers are not allowed
+precision qualifiers are not allowed
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/PrivateTypes.sksl b/third_party/skia/resources/sksl/errors/PrivateTypes.sksl
index a1b9845c99490..93a35d7e1363d 100644
--- a/third_party/skia/resources/sksl/errors/PrivateTypes.sksl
+++ b/third_party/skia/resources/sksl/errors/PrivateTypes.sksl
@@ -10,3 +10,12 @@ void param_private($ivec iv) {}
 void vardecl_private()       { $genType g; }
 void ctor_mat_private()      { $mat(0); }
 void ctor_literal_private()  { $floatLiteral(0); }
+
+/*%%*
+type '$mat' is private
+type '$bvec' is private
+type '$ivec' is private
+type '$genType' is private
+type '$mat' is private
+type '$floatLiteral' is private
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/PrivateVariables.sksl b/third_party/skia/resources/sksl/errors/PrivateVariables.sksl
new file mode 100644
index 0000000000000..00bd28b875cbf
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/PrivateVariables.sksl
@@ -0,0 +1,12 @@
+int $a;
+void main(float2 $b) {
+    float $c[2];
+    bool4 $d;
+}
+
+/*%%*
+name '$a' is reserved
+name '$b' is reserved
+name '$c' is reserved
+name '$d' is reserved
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ProgramTooLarge_Globals.sksl b/third_party/skia/resources/sksl/errors/ProgramTooLarge_Globals.sksl
index bd3fa0f3a6b48..af0ad17ce7a59 100644
--- a/third_party/skia/resources/sksl/errors/ProgramTooLarge_Globals.sksl
+++ b/third_party/skia/resources/sksl/errors/ProgramTooLarge_Globals.sksl
@@ -11,3 +11,7 @@ S large[10];
 S extra_large[100];
 S xxl[50000];
 
+
+/*%%*
+global variable 'extra_large' exceeds the size limit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ProgramTooLarge_Stack.sksl b/third_party/skia/resources/sksl/errors/ProgramTooLarge_Stack.sksl
index b01e670e63e11..127f0564e07c5 100644
--- a/third_party/skia/resources/sksl/errors/ProgramTooLarge_Stack.sksl
+++ b/third_party/skia/resources/sksl/errors/ProgramTooLarge_Stack.sksl
@@ -10,3 +10,7 @@ void main() {
     S big_chungus;
     S no_report; // we don't need to report overflows past the first
 }
+
+/*%%*
+variable 'big_chungus' exceeds the stack size limit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/PrototypeInFuncBody.sksl b/third_party/skia/resources/sksl/errors/PrototypeInFuncBody.sksl
index a9e88cc4fa309..b440ad2a2aee6 100644
--- a/third_party/skia/resources/sksl/errors/PrototypeInFuncBody.sksl
+++ b/third_party/skia/resources/sksl/errors/PrototypeInFuncBody.sksl
@@ -1,3 +1,7 @@
 void main() {
     float x();
 }
+
+/*%%*
+expected ';', but found '('
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareBasicType.sksl b/third_party/skia/resources/sksl/errors/RedeclareBasicType.sksl
index 4079d8c9e8faa..a0945520fd775 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareBasicType.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareBasicType.sksl
@@ -1 +1,5 @@
 float int;
+
+/*%%*
+expected an identifier, but found type 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareSamplerType.sksl b/third_party/skia/resources/sksl/errors/RedeclareSamplerType.sksl
index 6c3a2042c5b02..6f065e9df35f3 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareSamplerType.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareSamplerType.sksl
@@ -1 +1,5 @@
 sampler sampler;
+
+/*%%*
+expected an identifier, but found type 'sampler'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareStruct.sksl b/third_party/skia/resources/sksl/errors/RedeclareStruct.sksl
index de433a537b7aa..f4704e91e691c 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareStruct.sksl
@@ -1,3 +1,7 @@
 struct void {
     int x;
 };
+
+/*%%*
+expected an identifier, but found type 'void'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareStructTypeWithName.sksl b/third_party/skia/resources/sksl/errors/RedeclareStructTypeWithName.sksl
index a19e8682dd9d2..ef911dd4da6f8 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareStructTypeWithName.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareStructTypeWithName.sksl
@@ -1,3 +1,7 @@
 struct foo {
     int x;
 } foo;
+
+/*%%*
+symbol 'foo' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareUserType.sksl b/third_party/skia/resources/sksl/errors/RedeclareUserType.sksl
index 4db23d1f72871..d131fb4efcfb6 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareUserType.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareUserType.sksl
@@ -1,2 +1,6 @@
 struct S { int x; };
 float S;
+
+/*%%*
+symbol 'S' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/RedeclareVariable.sksl b/third_party/skia/resources/sksl/errors/RedeclareVariable.sksl
index 67ba3a82daa4d..e5ef434b55623 100644
--- a/third_party/skia/resources/sksl/errors/RedeclareVariable.sksl
+++ b/third_party/skia/resources/sksl/errors/RedeclareVariable.sksl
@@ -13,3 +13,14 @@ void main() {
     float y[4];
     S y;
 }
+
+/*%%*
+symbol 'x' was already defined
+symbol 'x' was already defined
+symbol 'x' was already defined
+symbol 'x' was already defined
+symbol 'y' was already defined
+symbol 'y' was already defined
+symbol 'y' was already defined
+symbol 'y' was already defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameAsm.sksl b/third_party/skia/resources/sksl/errors/ReservedNameAsm.sksl
index a1f9976a2e9f1..fe198942e7c49 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameAsm.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameAsm.sksl
@@ -1 +1,5 @@
 int asm;
+
+/*%%*
+'asm' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameAttribute.sksl b/third_party/skia/resources/sksl/errors/ReservedNameAttribute.sksl
index 53eda96051a18..6e5dadda645c6 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameAttribute.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameAttribute.sksl
@@ -1 +1,5 @@
 int attribute;
+
+/*%%*
+'attribute' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameCast.sksl b/third_party/skia/resources/sksl/errors/ReservedNameCast.sksl
index 33774ffbde3dd..de6663344d1a0 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameCast.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameCast.sksl
@@ -1 +1,5 @@
 int cast;
+
+/*%%*
+'cast' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameDouble.sksl b/third_party/skia/resources/sksl/errors/ReservedNameDouble.sksl
index 278ca4bb9dfe2..1d65060c30712 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameDouble.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameDouble.sksl
@@ -1 +1,5 @@
 int double;
+
+/*%%*
+'double' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameDvec2.sksl b/third_party/skia/resources/sksl/errors/ReservedNameDvec2.sksl
index 29d2e44662def..3ba0c4fbe16a4 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameDvec2.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameDvec2.sksl
@@ -1 +1,5 @@
 int dvec2;
+
+/*%%*
+'dvec2' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameDvec3.sksl b/third_party/skia/resources/sksl/errors/ReservedNameDvec3.sksl
index 1a250036c5cdc..0e2e3ffa8373d 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameDvec3.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameDvec3.sksl
@@ -1 +1,5 @@
 int dvec3;
+
+/*%%*
+'dvec3' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameDvec4.sksl b/third_party/skia/resources/sksl/errors/ReservedNameDvec4.sksl
index 1292810ea2b4a..2090c5648fa2f 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameDvec4.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameDvec4.sksl
@@ -1 +1,5 @@
 int dvec4;
+
+/*%%*
+'dvec4' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameEnum.sksl b/third_party/skia/resources/sksl/errors/ReservedNameEnum.sksl
index 817c703177ea7..98cca13d6027e 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameEnum.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameEnum.sksl
@@ -1 +1,5 @@
 int enum;
+
+/*%%*
+'enum' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameExtern.sksl b/third_party/skia/resources/sksl/errors/ReservedNameExtern.sksl
index ae2f3fab99ed4..c06581c7bdd36 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameExtern.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameExtern.sksl
@@ -1 +1,5 @@
 int extern;
+
+/*%%*
+'extern' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameExternal.sksl b/third_party/skia/resources/sksl/errors/ReservedNameExternal.sksl
index eabb1e740732e..d18c27ea34f33 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameExternal.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameExternal.sksl
@@ -1 +1,5 @@
 int external;
+
+/*%%*
+'external' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameFixed.sksl b/third_party/skia/resources/sksl/errors/ReservedNameFixed.sksl
index 17f45229e046c..693bbe0278038 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameFixed.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameFixed.sksl
@@ -1 +1,5 @@
 int fixed;
+
+/*%%*
+'fixed' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameFvec2.sksl b/third_party/skia/resources/sksl/errors/ReservedNameFvec2.sksl
index 31a9412cac95b..a1c7a5e0990c2 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameFvec2.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameFvec2.sksl
@@ -1 +1,5 @@
 int fvec2;
+
+/*%%*
+'fvec2' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameFvec3.sksl b/third_party/skia/resources/sksl/errors/ReservedNameFvec3.sksl
index 4d9bdffe333f0..c220eba9b2b30 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameFvec3.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameFvec3.sksl
@@ -1 +1,5 @@
 int fvec3;
+
+/*%%*
+'fvec3' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameFvec4.sksl b/third_party/skia/resources/sksl/errors/ReservedNameFvec4.sksl
index 89adeabcda475..2fe2c47fcfd87 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameFvec4.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameFvec4.sksl
@@ -1 +1,5 @@
 int fvec4;
+
+/*%%*
+'fvec4' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameGoto.sksl b/third_party/skia/resources/sksl/errors/ReservedNameGoto.sksl
index 5c9366d13c4fc..a14eac4beded2 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameGoto.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameGoto.sksl
@@ -1 +1,5 @@
 int goto;
+
+/*%%*
+'goto' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameHvec2.sksl b/third_party/skia/resources/sksl/errors/ReservedNameHvec2.sksl
index 673d44b14c7a5..bb8ba502e3291 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameHvec2.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameHvec2.sksl
@@ -1 +1,5 @@
 int hvec2;
+
+/*%%*
+'hvec2' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameHvec3.sksl b/third_party/skia/resources/sksl/errors/ReservedNameHvec3.sksl
index 0c960886651d0..cd0d12eca36e3 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameHvec3.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameHvec3.sksl
@@ -1 +1,5 @@
 int hvec3;
+
+/*%%*
+'hvec3' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameHvec4.sksl b/third_party/skia/resources/sksl/errors/ReservedNameHvec4.sksl
index 57b5589534296..cb130111a0bd4 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameHvec4.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameHvec4.sksl
@@ -1 +1,5 @@
 int hvec4;
+
+/*%%*
+'hvec4' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameInput.sksl b/third_party/skia/resources/sksl/errors/ReservedNameInput.sksl
index 9b75377dea0b5..e2423081e31bd 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameInput.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameInput.sksl
@@ -1 +1,5 @@
 int input;
+
+/*%%*
+'input' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameInterface.sksl b/third_party/skia/resources/sksl/errors/ReservedNameInterface.sksl
index e3c734fa62d77..3daf3ec8ac230 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameInterface.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameInterface.sksl
@@ -1 +1,5 @@
 int interface;
+
+/*%%*
+'interface' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameInvariant.sksl b/third_party/skia/resources/sksl/errors/ReservedNameInvariant.sksl
index 61a60d3df1be6..6eb9edf771f9c 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameInvariant.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameInvariant.sksl
@@ -1 +1,5 @@
 int invariant;
+
+/*%%*
+'invariant' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameLong.sksl b/third_party/skia/resources/sksl/errors/ReservedNameLong.sksl
index a1dc6aca68639..cea68b3329507 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameLong.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameLong.sksl
@@ -1 +1,5 @@
 int long;
+
+/*%%*
+'long' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameNamespace.sksl b/third_party/skia/resources/sksl/errors/ReservedNameNamespace.sksl
index 7d1b138f1b169..14e5dbbfa880f 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameNamespace.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameNamespace.sksl
@@ -1 +1,5 @@
 int namespace;
+
+/*%%*
+'namespace' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameOutput.sksl b/third_party/skia/resources/sksl/errors/ReservedNameOutput.sksl
index 803832208d927..069d54361c996 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameOutput.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameOutput.sksl
@@ -1 +1,5 @@
 int output;
+
+/*%%*
+'output' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNamePacked.sksl b/third_party/skia/resources/sksl/errors/ReservedNamePacked.sksl
index 1d12190446b8f..f1435753cb53d 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNamePacked.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNamePacked.sksl
@@ -1 +1,5 @@
 int packed;
+
+/*%%*
+'packed' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNamePrecision.sksl b/third_party/skia/resources/sksl/errors/ReservedNamePrecision.sksl
index 567eb1f695c70..2fe4c28f56f94 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNamePrecision.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNamePrecision.sksl
@@ -1 +1,5 @@
 int precision;
+
+/*%%*
+'precision' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNamePublic.sksl b/third_party/skia/resources/sksl/errors/ReservedNamePublic.sksl
index e8c2ea7c4c598..fefe192c75e85 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNamePublic.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNamePublic.sksl
@@ -1 +1,5 @@
 int public;
+
+/*%%*
+'public' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSampler1DShadow.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSampler1DShadow.sksl
index adcbafe75f06f..7f48177d65ae6 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSampler1DShadow.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSampler1DShadow.sksl
@@ -1 +1,5 @@
 int sampler1DShadow;
+
+/*%%*
+'sampler1DShadow' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl
index 9c1c9e269d9ee..f579442ef0170 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl
@@ -1 +1,5 @@
 int sampler2DRectShadow;
+
+/*%%*
+'sampler2DRectShadow' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSampler2DShadow.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSampler2DShadow.sksl
index 6342c24572013..1984327df452a 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSampler2DShadow.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSampler2DShadow.sksl
@@ -1 +1,5 @@
 int sampler2DShadow;
+
+/*%%*
+'sampler2DShadow' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSampler3DRect.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSampler3DRect.sksl
index d8862f69b32d9..20eb001bbdb45 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSampler3DRect.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSampler3DRect.sksl
@@ -1 +1,5 @@
 int sampler3DRect;
+
+/*%%*
+'sampler3DRect' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSamplerCube.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSamplerCube.sksl
index 9695e191ff998..607a9f9d64dda 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSamplerCube.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSamplerCube.sksl
@@ -1 +1,5 @@
 int samplerCube;
+
+/*%%*
+'samplerCube' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSizeof.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSizeof.sksl
index 777754b483bb0..9157a959d2091 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSizeof.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSizeof.sksl
@@ -1 +1,5 @@
 int sizeof;
+
+/*%%*
+'sizeof' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameStatic.sksl b/third_party/skia/resources/sksl/errors/ReservedNameStatic.sksl
index 6187f82487db9..96688516970d5 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameStatic.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameStatic.sksl
@@ -1 +1,5 @@
 int static;
+
+/*%%*
+'static' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameSuperp.sksl b/third_party/skia/resources/sksl/errors/ReservedNameSuperp.sksl
index 0cd067418720f..9f85eea103c01 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameSuperp.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameSuperp.sksl
@@ -1 +1,5 @@
 int superp;
+
+/*%%*
+'superp' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameTemplate.sksl b/third_party/skia/resources/sksl/errors/ReservedNameTemplate.sksl
index 7b4e44ba00952..0e3a863d560d1 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameTemplate.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameTemplate.sksl
@@ -1 +1,5 @@
 int template;
+
+/*%%*
+'template' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameThis.sksl b/third_party/skia/resources/sksl/errors/ReservedNameThis.sksl
index d0a833db009ac..4961a7261d8a8 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameThis.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameThis.sksl
@@ -1 +1,5 @@
 int this;
+
+/*%%*
+'this' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameTypedef.sksl b/third_party/skia/resources/sksl/errors/ReservedNameTypedef.sksl
index 7ed7e00358204..f373c9de38cb2 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameTypedef.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameTypedef.sksl
@@ -1 +1,5 @@
 int typedef;
+
+/*%%*
+'typedef' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameUnion.sksl b/third_party/skia/resources/sksl/errors/ReservedNameUnion.sksl
index e54b122b1b983..9e4c176c38cdc 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameUnion.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameUnion.sksl
@@ -1 +1,5 @@
 int union;
+
+/*%%*
+'union' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameUnsigned.sksl b/third_party/skia/resources/sksl/errors/ReservedNameUnsigned.sksl
index 8e0663c75e314..f0f92719478b4 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameUnsigned.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameUnsigned.sksl
@@ -1 +1,5 @@
 int unsigned;
+
+/*%%*
+'unsigned' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameUsing.sksl b/third_party/skia/resources/sksl/errors/ReservedNameUsing.sksl
index 91bf9c435253e..bc24629298d96 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameUsing.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameUsing.sksl
@@ -1 +1,5 @@
 int using;
+
+/*%%*
+'using' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameVarying.sksl b/third_party/skia/resources/sksl/errors/ReservedNameVarying.sksl
index 00c5b45b04d3f..32856f7bdd6ad 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameVarying.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameVarying.sksl
@@ -1 +1,5 @@
 int varying;
+
+/*%%*
+'varying' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReservedNameVolatile.sksl b/third_party/skia/resources/sksl/errors/ReservedNameVolatile.sksl
index fa9e67a4b7497..d49e9d199876a 100644
--- a/third_party/skia/resources/sksl/errors/ReservedNameVolatile.sksl
+++ b/third_party/skia/resources/sksl/errors/ReservedNameVolatile.sksl
@@ -1 +1,5 @@
 int volatile;
+
+/*%%*
+'volatile' is a reserved word
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReturnDifferentType.sksl b/third_party/skia/resources/sksl/errors/ReturnDifferentType.sksl
index 5d258e42d89c6..ffd0ed9b136e8 100644
--- a/third_party/skia/resources/sksl/errors/ReturnDifferentType.sksl
+++ b/third_party/skia/resources/sksl/errors/ReturnDifferentType.sksl
@@ -1,2 +1,6 @@
 int main() { return 1; }
 void main() {}
+
+/*%%*
+functions 'void main()' and 'int main()' differ only in return type
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReturnFromVoid.sksl b/third_party/skia/resources/sksl/errors/ReturnFromVoid.sksl
index 35d09c87211b5..6ba4a3dd2ba6d 100644
--- a/third_party/skia/resources/sksl/errors/ReturnFromVoid.sksl
+++ b/third_party/skia/resources/sksl/errors/ReturnFromVoid.sksl
@@ -1,3 +1,9 @@
 void a() { return true; }
 void b() { return b; }
 void c() { return int; }
+
+/*%%*
+may not return a value from a void function
+may not return a value from a void function
+may not return a value from a void function
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReturnMissingValue.sksl b/third_party/skia/resources/sksl/errors/ReturnMissingValue.sksl
index fe3fae507ab1b..42b03f8375acb 100644
--- a/third_party/skia/resources/sksl/errors/ReturnMissingValue.sksl
+++ b/third_party/skia/resources/sksl/errors/ReturnMissingValue.sksl
@@ -1 +1,5 @@
 int foo() { return; }
+
+/*%%*
+expected function to return 'int'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/ReturnTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/ReturnTypeMismatch.sksl
index ee50b6e0e4599..b81f85c06b976 100644
--- a/third_party/skia/resources/sksl/errors/ReturnTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/ReturnTypeMismatch.sksl
@@ -1 +1,5 @@
 int foo() { return 1.0; }
+
+/*%%*
+expected 'int', but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SelfReferentialInitializerExpression.sksl b/third_party/skia/resources/sksl/errors/SelfReferentialInitializerExpression.sksl
index 3d06758f3ae3f..0fec0a009adb3 100644
--- a/third_party/skia/resources/sksl/errors/SelfReferentialInitializerExpression.sksl
+++ b/third_party/skia/resources/sksl/errors/SelfReferentialInitializerExpression.sksl
@@ -1,2 +1,6 @@
 float foo(float v) { return v; }
 void main() { float x = foo(x); }
+
+/*%%*
+unknown identifier 'x'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SpuriousFloat.sksl b/third_party/skia/resources/sksl/errors/SpuriousFloat.sksl
index 560161295c16d..488ec76b37208 100644
--- a/third_party/skia/resources/sksl/errors/SpuriousFloat.sksl
+++ b/third_party/skia/resources/sksl/errors/SpuriousFloat.sksl
@@ -2,3 +2,7 @@ void main() {
     float x;
     x = 1.5 2.5;
 }
+
+/*%%*
+expected ';', but found '2.5'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticIfTest.sksl b/third_party/skia/resources/sksl/errors/StaticIfTest.sksl
index b9a7667d0a2b0..ad01e37648316 100644
--- a/third_party/skia/resources/sksl/errors/StaticIfTest.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticIfTest.sksl
@@ -5,3 +5,7 @@ void main() {
         sk_FragColor = half4(1);
     }
 }
+
+/*%%*
+static if has non-static test
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticSwitchConditionalBreak.sksl b/third_party/skia/resources/sksl/errors/StaticSwitchConditionalBreak.sksl
index 146d9d1b6af04..6df6e63a41c9f 100644
--- a/third_party/skia/resources/sksl/errors/StaticSwitchConditionalBreak.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticSwitchConditionalBreak.sksl
@@ -10,3 +10,7 @@ void main() {
             sk_FragColor = half4(0);
     }
 }
+
+/*%%*
+static switch contains non-static conditional exit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticSwitchTest.sksl b/third_party/skia/resources/sksl/errors/StaticSwitchTest.sksl
index 5c66d85734038..9ce1506271f1a 100644
--- a/third_party/skia/resources/sksl/errors/StaticSwitchTest.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticSwitchTest.sksl
@@ -8,3 +8,7 @@ half4 main() {
             return half4(0);
     }
 }
+
+/*%%*
+static switch has non-static test
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalBreak.sksl b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalBreak.sksl
index b3e121353e1c6..b1acceb285c1b 100644
--- a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalBreak.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalBreak.sksl
@@ -1,3 +1,7 @@
 uniform half4 testInputs;
 
 void test_break()    { @switch (1) { case 1: if (testInputs.x > 2) break; } }
+
+/*%%*
+static switch contains non-static conditional exit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalContinue.sksl b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalContinue.sksl
index aabefa2e4009a..dcdf411fcc65d 100644
--- a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalContinue.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalContinue.sksl
@@ -1,3 +1,7 @@
 uniform half4 testInputs;
 
 void test_continue() { for (;;) { @switch (1) { case 1: if (testInputs.x > 3) continue; } } }
+
+/*%%*
+static switch contains non-static conditional exit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalReturn.sksl b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalReturn.sksl
index 77c1d078364d6..4c44d73672d86 100644
--- a/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalReturn.sksl
+++ b/third_party/skia/resources/sksl/errors/StaticSwitchWithConditionalReturn.sksl
@@ -1,3 +1,7 @@
 uniform half4 testInputs;
 
 void test_return()   { @switch (1) { case 1: if (testInputs.x > 1) return; } }
+
+/*%%*
+static switch contains non-static conditional exit
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StructMemberReservedName.sksl b/third_party/skia/resources/sksl/errors/StructMemberReservedName.sksl
new file mode 100644
index 0000000000000..030d05f80d428
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/StructMemberReservedName.sksl
@@ -0,0 +1,11 @@
+struct S {
+    float float;
+} s;
+
+float4 main() {
+    return s.float.xxxx;
+}
+
+/*%%*
+expected an identifier, but found type 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StructNameWithoutIdentifier.sksl b/third_party/skia/resources/sksl/errors/StructNameWithoutIdentifier.sksl
index 987d9e067447b..f0c94f27629a8 100644
--- a/third_party/skia/resources/sksl/errors/StructNameWithoutIdentifier.sksl
+++ b/third_party/skia/resources/sksl/errors/StructNameWithoutIdentifier.sksl
@@ -1,2 +1,6 @@
 struct S { float x; };
 S;
+
+/*%%*
+expected an identifier, but found ';'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StructTooDeeplyNested.sksl b/third_party/skia/resources/sksl/errors/StructTooDeeplyNested.sksl
index 65e1369216c5c..72221b202e616 100644
--- a/third_party/skia/resources/sksl/errors/StructTooDeeplyNested.sksl
+++ b/third_party/skia/resources/sksl/errors/StructTooDeeplyNested.sksl
@@ -7,3 +7,7 @@ struct S6 { S5 x; };
 struct S7 { S6 x; };
 struct S8 { S7 x; };
 struct too_deep { S8 x; };
+
+/*%%*
+struct 'too_deep' is too deeply nested
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/StructVariableReservedName.sksl b/third_party/skia/resources/sksl/errors/StructVariableReservedName.sksl
new file mode 100644
index 0000000000000..2dd206e691ad8
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/StructVariableReservedName.sksl
@@ -0,0 +1,11 @@
+struct S {
+    float f;
+} float;
+
+float4 main() {
+    return float.f.xxxx;
+}
+
+/*%%*
+expected ';', but found 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwitchDuplicateCase.sksl b/third_party/skia/resources/sksl/errors/SwitchDuplicateCase.sksl
index c817049ffb88e..30be7cd063e70 100644
--- a/third_party/skia/resources/sksl/errors/SwitchDuplicateCase.sksl
+++ b/third_party/skia/resources/sksl/errors/SwitchDuplicateCase.sksl
@@ -6,3 +6,7 @@ void main() {
             break;
     }
 }
+
+/*%%*
+duplicate case value '0'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwitchDuplicateDefault.sksl b/third_party/skia/resources/sksl/errors/SwitchDuplicateDefault.sksl
index 4bdb94a603c38..c18a033c2f61a 100644
--- a/third_party/skia/resources/sksl/errors/SwitchDuplicateDefault.sksl
+++ b/third_party/skia/resources/sksl/errors/SwitchDuplicateDefault.sksl
@@ -5,3 +5,7 @@ void main() {
             break;
     }
 }
+
+/*%%*
+expected expression, but found 'default'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwitchTypes.sksl b/third_party/skia/resources/sksl/errors/SwitchTypes.sksl
index 911f8dbe184cb..d0f182b76c2c9 100644
--- a/third_party/skia/resources/sksl/errors/SwitchTypes.sksl
+++ b/third_party/skia/resources/sksl/errors/SwitchTypes.sksl
@@ -19,3 +19,15 @@ void switch_case_uniform_float()   { switch (1) { case uf: break; } }
 void switch_case_uniform_int()     { switch (1) { case ui: break; } }
 void switch_case_const_float_var() { switch (1) { case cf: break; } }
 void switch_case_int_var()         { switch (1) { case i: break; } }
+
+/*%%*
+expected 'int', but found 'float2'
+expected 'int', but found 'float2'
+expected 'int', but found 'float'
+expected 'int', but found 'float'
+expected 'int', but found 'float'
+expected 'int', but found 'float'
+case value must be a constant integer
+expected 'int', but found 'float'
+case value must be a constant integer
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwitchWithContinueInside.sksl b/third_party/skia/resources/sksl/errors/SwitchWithContinueInside.sksl
index 8015e20c2b140..786a6e6f12a2f 100644
--- a/third_party/skia/resources/sksl/errors/SwitchWithContinueInside.sksl
+++ b/third_party/skia/resources/sksl/errors/SwitchWithContinueInside.sksl
@@ -8,3 +8,8 @@ void main() {
     while (true) @switch (0) { default: continue; }
     for (;;) @switch (5) { case 5: continue; }
 }
+
+/*%%*
+continue statement cannot be used in a switch
+continue statement cannot be used in a switch
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleConstantOutput.sksl b/third_party/skia/resources/sksl/errors/SwizzleConstantOutput.sksl
index 9bbd9e4748b51..d9d31fffcb502 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleConstantOutput.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleConstantOutput.sksl
@@ -2,3 +2,7 @@ void main() {
     float4 test = float4(1);
     test.xyz0 = float4(1);
 }
+
+/*%%*
+cannot assign to this expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleDomain.sksl b/third_party/skia/resources/sksl/errors/SwizzleDomain.sksl
index 6b0fb6065824a..7ce8ec26c979b 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleDomain.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleDomain.sksl
@@ -23,3 +23,22 @@ float4 ygtT() { return v.ygtT; }
 float4 zbpR() { return v.zbpR; }
 float4 waqB() { return v.waqB; }
 
+
+/*%%*
+invalid swizzle mask 'xyra'
+invalid swizzle mask 'zxtq'
+invalid swizzle mask 'wwRB'
+invalid swizzle mask 'rgxy'
+invalid swizzle mask 'bast'
+invalid swizzle mask 'gbLT'
+invalid swizzle mask 'sxyz'
+invalid swizzle mask 'tpbb'
+invalid swizzle mask 'qsTR'
+invalid swizzle mask 'LTxy'
+invalid swizzle mask 'TRba'
+invalid swizzle mask 'RBst'
+invalid swizzle mask 'xrsL'
+invalid swizzle mask 'ygtT'
+invalid swizzle mask 'zbpR'
+invalid swizzle mask 'waqB'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleMatrix.sksl b/third_party/skia/resources/sksl/errors/SwizzleMatrix.sksl
index 52587f76e843e..efd90f1f0d6fd 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleMatrix.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleMatrix.sksl
@@ -2,3 +2,7 @@ void main() {
     float2x2 x = float2x2(1);
     float y = x.y;
 }
+
+/*%%*
+type 'float2x2' does not have a field named 'y'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleOnlyLiterals.sksl b/third_party/skia/resources/sksl/errors/SwizzleOnlyLiterals.sksl
index 0450e2f8c57c3..3f82bed5e02d0 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleOnlyLiterals.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleOnlyLiterals.sksl
@@ -1 +1,5 @@
 void main() { float x = 1.0; x = x.0; }
+
+/*%%*
+swizzle must refer to base expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleOutOfBounds.sksl b/third_party/skia/resources/sksl/errors/SwizzleOutOfBounds.sksl
index 2763adf721098..c21e992191691 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleOutOfBounds.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleOutOfBounds.sksl
@@ -1 +1,5 @@
 void main() { float3 test = float2(1).xyz; }
+
+/*%%*
+invalid swizzle component 'z'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/SwizzleTooManyComponents.sksl b/third_party/skia/resources/sksl/errors/SwizzleTooManyComponents.sksl
index f91935de0cfc7..f5f1cad3f0189 100644
--- a/third_party/skia/resources/sksl/errors/SwizzleTooManyComponents.sksl
+++ b/third_party/skia/resources/sksl/errors/SwizzleTooManyComponents.sksl
@@ -1 +1,5 @@
 void main() { float4 test = float2(1).xxxxx; }
+
+/*%%*
+too many components in swizzle mask
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/TernaryMismatch.sksl b/third_party/skia/resources/sksl/errors/TernaryMismatch.sksl
index 32625dbdb1c31..ccc5a38deed93 100644
--- a/third_party/skia/resources/sksl/errors/TernaryMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/TernaryMismatch.sksl
@@ -1,2 +1,7 @@
 void bool_or_float()   { float x = 5 > 2 ? true : 1.0; }
 void float3_or_float() { float x = 5 > 2 ? float3(1) : 1.0; }
+
+/*%%*
+ternary operator result mismatch: 'bool', 'float'
+ternary operator result mismatch: 'float3', 'float'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnassignedOutParameter.sksl b/third_party/skia/resources/sksl/errors/UnassignedOutParameter.sksl
new file mode 100644
index 0000000000000..55e548117d3d2
--- /dev/null
+++ b/third_party/skia/resources/sksl/errors/UnassignedOutParameter.sksl
@@ -0,0 +1,16 @@
+// Expect 2 errors in "testOut"
+
+void testIn(in float2 a, in float2 b, in float2 c)             { a = float2(1); }
+void testOut(out float2 a, out float2 b, out float2 c)         { a = float2(1); }
+void testInout(inout float2 a, inout float2 b, inout float2 c) { a = float2(1); }
+
+void main(float2 p) {
+    testIn(p, p, p);
+    testOut(p, p, p);
+    testInout(p, p, p);
+}
+
+/*%%*
+function 'testOut' never assigns a value to out parameter 'b'
+function 'testOut' never assigns a value to out parameter 'c'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UndeclaredFunction.sksl b/third_party/skia/resources/sksl/errors/UndeclaredFunction.sksl
index a30eac1ba3afd..4ee08a19c3559 100644
--- a/third_party/skia/resources/sksl/errors/UndeclaredFunction.sksl
+++ b/third_party/skia/resources/sksl/errors/UndeclaredFunction.sksl
@@ -1 +1,5 @@
 void main() { int x = foo(1); }
+
+/*%%*
+unknown identifier 'foo'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UndefinedFunction.sksl b/third_party/skia/resources/sksl/errors/UndefinedFunction.sksl
index dc1062db42614..d41d8861bdb88 100644
--- a/third_party/skia/resources/sksl/errors/UndefinedFunction.sksl
+++ b/third_party/skia/resources/sksl/errors/UndefinedFunction.sksl
@@ -1,3 +1,7 @@
 int foo(int x);
 
 void main() { int x = foo(1); }
+
+/*%%*
+function 'int foo(int x)' is not defined
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UndefinedSymbol.sksl b/third_party/skia/resources/sksl/errors/UndefinedSymbol.sksl
index 54f86c26e1bcb..2629e5c115034 100644
--- a/third_party/skia/resources/sksl/errors/UndefinedSymbol.sksl
+++ b/third_party/skia/resources/sksl/errors/UndefinedSymbol.sksl
@@ -5,3 +5,14 @@ void d() { float w = x, y = z; }
 
 float e = f, g = h;
 float i = j, k;
+
+/*%%*
+unknown identifier 'x'
+unknown identifier 'x'
+unknown identifier 'x'
+unknown identifier 'x'
+unknown identifier 'z'
+unknown identifier 'f'
+unknown identifier 'h'
+unknown identifier 'j'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UniformVarWithInitializerExpression.sksl b/third_party/skia/resources/sksl/errors/UniformVarWithInitializerExpression.sksl
index 79d41945ab0ba..17a2a05031f9d 100644
--- a/third_party/skia/resources/sksl/errors/UniformVarWithInitializerExpression.sksl
+++ b/third_party/skia/resources/sksl/errors/UniformVarWithInitializerExpression.sksl
@@ -1 +1,5 @@
 uniform float x = 1;
+
+/*%%*
+'uniform' variables cannot use initializer expressions
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnknownDivideByZero.sksl b/third_party/skia/resources/sksl/errors/UnknownDivideByZero.sksl
index 607cd9ed4ee05..ed12c8286c9de 100644
--- a/third_party/skia/resources/sksl/errors/UnknownDivideByZero.sksl
+++ b/third_party/skia/resources/sksl/errors/UnknownDivideByZero.sksl
@@ -19,4 +19,22 @@ void main() {
     y = (int4(unknownInput) % int4(int2(unknownInput, int(zero)), 1, 1)).x;
     y /= 0;
     y %= 0;
-}
\ No newline at end of file
+}
+/*%%*
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+division by zero
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnscopedVariableInDoWhile.sksl b/third_party/skia/resources/sksl/errors/UnscopedVariableInDoWhile.sksl
index 39dada807a616..fa169e7c78fd3 100644
--- a/third_party/skia/resources/sksl/errors/UnscopedVariableInDoWhile.sksl
+++ b/third_party/skia/resources/sksl/errors/UnscopedVariableInDoWhile.sksl
@@ -1,3 +1,7 @@
 void main() {
     do int foo = 1, bar = foo; while (false);
 }
+
+/*%%*
+variable 'foo' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnscopedVariableInElse.sksl b/third_party/skia/resources/sksl/errors/UnscopedVariableInElse.sksl
index 5f1a42af838be..877bc6cb12da9 100644
--- a/third_party/skia/resources/sksl/errors/UnscopedVariableInElse.sksl
+++ b/third_party/skia/resources/sksl/errors/UnscopedVariableInElse.sksl
@@ -1,3 +1,7 @@
 void main() {
     if (true) ; else half4 color = sk_FragColor;
 }
+
+/*%%*
+variable 'color' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnscopedVariableInFor.sksl b/third_party/skia/resources/sksl/errors/UnscopedVariableInFor.sksl
index 9d62be78ebef6..88be1c10a3444 100644
--- a/third_party/skia/resources/sksl/errors/UnscopedVariableInFor.sksl
+++ b/third_party/skia/resources/sksl/errors/UnscopedVariableInFor.sksl
@@ -1,3 +1,7 @@
 void main() {
     for (int x=0; x<10; ++x) float s = sqrt(4);
 }
+
+/*%%*
+variable 's' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnscopedVariableInIf.sksl b/third_party/skia/resources/sksl/errors/UnscopedVariableInIf.sksl
index 912b58b5e8114..89cef37eead78 100644
--- a/third_party/skia/resources/sksl/errors/UnscopedVariableInIf.sksl
+++ b/third_party/skia/resources/sksl/errors/UnscopedVariableInIf.sksl
@@ -1,3 +1,7 @@
 void main() {
     if (true) half4 x;
 }
+
+/*%%*
+variable 'x' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnscopedVariableInWhile.sksl b/third_party/skia/resources/sksl/errors/UnscopedVariableInWhile.sksl
index 07da96781abc1..919bb36a24978 100644
--- a/third_party/skia/resources/sksl/errors/UnscopedVariableInWhile.sksl
+++ b/third_party/skia/resources/sksl/errors/UnscopedVariableInWhile.sksl
@@ -1,3 +1,7 @@
 void main() {
     while (false) bool b;
 }
+
+/*%%*
+variable 'b' must be created in a scope
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UnsupportedGLSLIdentifiers.sksl b/third_party/skia/resources/sksl/errors/UnsupportedGLSLIdentifiers.sksl
index 8c44b5ee95bd5..570249cfec7d1 100644
--- a/third_party/skia/resources/sksl/errors/UnsupportedGLSLIdentifiers.sksl
+++ b/third_party/skia/resources/sksl/errors/UnsupportedGLSLIdentifiers.sksl
@@ -1,2 +1,9 @@
 void fragcoord() { float x = gl_FragCoord.x; }
 void fragcolor() { float r = gl_FragColor.r; }
+
+/*%%*
+'gl_FragCoord' is a reserved word
+unknown identifier 'gl_FragCoord'
+'gl_FragColor' is a reserved word
+unknown identifier 'gl_FragColor'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/UsingInvalidValue.sksl b/third_party/skia/resources/sksl/errors/UsingInvalidValue.sksl
index 705b1cd437fcc..158aafcb154e9 100644
--- a/third_party/skia/resources/sksl/errors/UsingInvalidValue.sksl
+++ b/third_party/skia/resources/sksl/errors/UsingInvalidValue.sksl
@@ -9,3 +9,14 @@ int  g_expect_constructor_invocation                       = int;
 int  g_expect_constructor_invocation_extra_initializer, ix = int;
 int  g_expect_function_call                                = func;
 int  g_expect_function_call_extra_initializer,          iy = func;
+
+/*%%*
+expected '(' to begin constructor invocation
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin constructor invocation
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+expected '(' to begin function call
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VectorIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/VectorIndexOutOfRange.sksl
index 92baa63791ad7..fed5e35bc3e3e 100644
--- a/third_party/skia/resources/sksl/errors/VectorIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/VectorIndexOutOfRange.sksl
@@ -42,3 +42,27 @@ void half4_2_constidx()        { half4 h;        const int INDEX = 2;          h
 void half4_3_constidx()        { half4 h;        const int INDEX = 3;          half v = h[INDEX]; }
 void half4_4_constidx()        { half4 h;        const int INDEX = 4;          half v = h[INDEX]; }
 void half4_huge_constidx()     { half4 h;        const int INDEX = 1000000000; half v = h[INDEX]; }
+
+/*%%*
+index -1 out of range for 'half4'
+index 4 out of range for 'half4'
+index 1000000000 out of range for 'half4'
+index -1 out of range for 'half3'
+index 3 out of range for 'half3'
+index 4 out of range for 'half3'
+index 1000000000 out of range for 'half3'
+index -1 out of range for 'half2'
+index 2 out of range for 'half2'
+index 3 out of range for 'half2'
+index 4 out of range for 'half2'
+index 1000000000 out of range for 'half2'
+index -1 out of range for 'half2'
+index 2 out of range for 'half2'
+index 1000000000 out of range for 'half2'
+index -1 out of range for 'half3'
+index 3 out of range for 'half3'
+index 1000000000 out of range for 'half3'
+index -1 out of range for 'half4'
+index 4 out of range for 'half4'
+index 1000000000 out of range for 'half4'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VectorInlinedIndexOutOfRange.sksl b/third_party/skia/resources/sksl/errors/VectorInlinedIndexOutOfRange.sksl
index 00ab55747b37f..84426937a1679 100644
--- a/third_party/skia/resources/sksl/errors/VectorInlinedIndexOutOfRange.sksl
+++ b/third_party/skia/resources/sksl/errors/VectorInlinedIndexOutOfRange.sksl
@@ -11,3 +11,8 @@ half4 main(float2 coords) {
     int undefined = indexVector(-1) + indexVector(3);
     return colorGreen;
 }
+
+/*%%*
+index -1 out of range for 'int3'
+index 3 out of range for 'int3'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VectorSlice.sksl b/third_party/skia/resources/sksl/errors/VectorSlice.sksl
index da930fc3a8bd9..37bba65c82a01 100644
--- a/third_party/skia/resources/sksl/errors/VectorSlice.sksl
+++ b/third_party/skia/resources/sksl/errors/VectorSlice.sksl
@@ -17,3 +17,15 @@ const bool4 b4 = bool4(false);
 const bool3 b3 = bool3(b4);
 const bool2 b2 = bool2(b4);
 const bool  b  = bool (b4);
+
+/*%%*
+'half4' is not a valid parameter to 'half3' constructor; use '.xyz' instead
+'half4' is not a valid parameter to 'half2' constructor; use '.xy' instead
+'half4' is not a valid parameter to 'half' constructor; use '.x' instead
+'int4' is not a valid parameter to 'int3' constructor; use '.xyz' instead
+'int4' is not a valid parameter to 'int2' constructor; use '.xy' instead
+'int4' is not a valid parameter to 'int' constructor; use '.x' instead
+'bool4' is not a valid parameter to 'bool3' constructor; use '.xyz' instead
+'bool4' is not a valid parameter to 'bool2' constructor; use '.xy' instead
+'bool4' is not a valid parameter to 'bool' constructor; use '.x' instead
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VoidConstructor.sksl b/third_party/skia/resources/sksl/errors/VoidConstructor.sksl
index a2a2d1bceae4c..94df380cf0016 100644
--- a/third_party/skia/resources/sksl/errors/VoidConstructor.sksl
+++ b/third_party/skia/resources/sksl/errors/VoidConstructor.sksl
@@ -1,3 +1,7 @@
 void main() {
     void();
 }
+
+/*%%*
+cannot construct 'void'
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VoidInStruct.sksl b/third_party/skia/resources/sksl/errors/VoidInStruct.sksl
index b6ee475fb48dd..114d98e1dbae5 100644
--- a/third_party/skia/resources/sksl/errors/VoidInStruct.sksl
+++ b/third_party/skia/resources/sksl/errors/VoidInStruct.sksl
@@ -6,3 +6,10 @@ struct S {
     void[2] c;
     void[2] d[2];
 };
+
+/*%%*
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+type 'void' may not be used in an array
+type 'void' is not permitted in a struct
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/VoidVariable.sksl b/third_party/skia/resources/sksl/errors/VoidVariable.sksl
index fc8ef43244b54..a48b15e2d2e55 100644
--- a/third_party/skia/resources/sksl/errors/VoidVariable.sksl
+++ b/third_party/skia/resources/sksl/errors/VoidVariable.sksl
@@ -3,3 +3,9 @@ void func();
 
 void a;
 void b = func();
+
+/*%%*
+variables of type 'void' are not allowed
+variables of type 'void' are not allowed
+global variable initializer must be a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/errors/WhileTypeMismatch.sksl b/third_party/skia/resources/sksl/errors/WhileTypeMismatch.sksl
index 6fc7664b02bee..85b4bb16c03d7 100644
--- a/third_party/skia/resources/sksl/errors/WhileTypeMismatch.sksl
+++ b/third_party/skia/resources/sksl/errors/WhileTypeMismatch.sksl
@@ -1,3 +1,7 @@
 void main() {
     while (float3(1)) {}
 }
+
+/*%%*
+expected 'bool', but found 'float3'
+*%%*/
diff --git a/third_party/skia/resources/sksl/folding/ArraySizeFolding.sksl b/third_party/skia/resources/sksl/folding/ArraySizeFolding.sksl
index 29c2b99a39dc7..87115eb3bfabb 100644
--- a/third_party/skia/resources/sksl/folding/ArraySizeFolding.sksl
+++ b/third_party/skia/resources/sksl/folding/ArraySizeFolding.sksl
@@ -6,14 +6,19 @@ bool check_array_is_int_2(int[2] x) {
 
 bool test() {
     const int two = 2;
+    const int4 vecTwo = int4(2);
     int a[int4(1, 2, 3, 4).y];
     int b[int(max(-5.5, 2.0))];
     int c[two];
-    int d[int2(float2x2(1, 2, 3, 4)[0]).y];
+    int d[vecTwo.yz01.x];
+    int e[two * vecTwo.x101.w];
+    int f[int2(float2x2(1, 2, 3, 4)[0]).y];
     return check_array_is_int_2(a) &&
            check_array_is_int_2(b) &&
            check_array_is_int_2(c) &&
-           check_array_is_int_2(d);
+           check_array_is_int_2(d) &&
+           check_array_is_int_2(e) &&
+           check_array_is_int_2(f);
 }
 
 bool check_array_is_float_3(float[3] x) {
diff --git a/third_party/skia/resources/sksl/folding/MatrixFoldingES2.sksl b/third_party/skia/resources/sksl/folding/MatrixFoldingES2.sksl
index a935bc340f08a..ae1f1ed397c21 100644
--- a/third_party/skia/resources/sksl/folding/MatrixFoldingES2.sksl
+++ b/third_party/skia/resources/sksl/folding/MatrixFoldingES2.sksl
@@ -2,7 +2,7 @@ uniform float2x2 testMatrix2x2;
 uniform half4 colorRed, colorGreen;
 uniform half unknownInput;
 
-bool test() {
+bool test_eq() {
     bool ok = true;
     ok = ok &&  (float2x2(float2(1.0, 0.0), float2(0.0, 1.0)) ==
                  float2x2(float2(1.0, 0.0), float2(0.0, 1.0)));
@@ -101,6 +101,104 @@ bool test() {
     return ok;
 }
 
+bool test_matrix_op_scalar_float() {
+    bool ok = true;
+
+    ok = ok && ((float3x3(2) + 4) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && ((float3x3(2) - 4) == float3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
+    ok = ok && ((float3x3(2) * 4) == float3x3(8));
+    ok = ok && ((float3x3(2) / 4) == float3x3(0.5));
+
+    ok = ok && (4 + (float3x3(2)) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && (4 - (float3x3(2)) == float3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
+    ok = ok && (4 * (float3x3(2)) == float3x3(8));
+    ok = ok && (4 / (float2x2(2, 2, 2, 2)) == float2x2(2, 2, 2, 2));
+
+    return ok;
+}
+
+bool test_matrix_op_scalar_half() {
+    bool ok = true;
+
+    ok = ok && ((half3x3(2) + 4) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && ((half3x3(2) - 4) == half3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
+    ok = ok && ((half3x3(2) * 4) == half3x3(8));
+    ok = ok && ((half3x3(2) / 4) == half3x3(0.5));
+
+    ok = ok && (4 + (half3x3(2)) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && (4 - (half3x3(2)) == half3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
+    ok = ok && (4 * (half3x3(2)) == half3x3(8));
+    ok = ok && (4 / (half2x2(2, 2, 2, 2)) == half2x2(2, 2, 2, 2));
+
+    return ok;
+}
+
+bool test_matrix_op_matrix_float() {
+    bool ok = true;
+
+    // Addition, subtraction and division operate componentwise.
+    const float3x3 splat_4 = float3x3(4, 4, 4, 4, 4, 4, 4, 4, 4);
+
+    ok = ok && ((float3x3(2) + splat_4) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && ((float3x3(2) - splat_4) == float3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
+    ok = ok && ((float3x3(2) / splat_4) == float3x3(0.5));
+
+    ok = ok && (splat_4 + (float3x3(2)) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && (splat_4 - (float3x3(2)) == float3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
+    ok = ok && (float2x2(4, 4, 4, 4) / (float2x2(2, 2, 2, 2)) == float2x2(2, 2, 2, 2));
+
+    ok = ok && (float4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16) +
+                float4x4(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) ==
+                float4x4(17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17));
+
+    ok = ok && (float2x2(10, 20, 30, 40) - float2x2(1, 2, 3, 4) == float2x2(9, 18, 27, 36));
+
+    ok = ok && (float2x2(10, 20, 30, 40) / float2x2(5, 4, 30, 1) == float2x2(2, 5, 1, 40));
+
+    // Multiplication performs a proper matrix multiply.
+    ok = ok && (float2x2(1, 2, 7, 4) * float2x2(3, 5, 3, 2) == float2x2(38, 26, 17, 14));
+    ok = ok && (float3x3(10, 4, 2, 20, 5, 3, 10, 6, 5) *
+                float3x3(3, 3, 4, 2, 3, 4, 4, 9, 2) ==
+                float3x3(130, 51, 35, 120, 47, 33, 240, 73, 45));
+
+    return ok;
+}
+
+bool test_matrix_op_matrix_half() {
+    bool ok = true;
+
+    // Addition, subtraction and division operate componentwise.
+    const half3x3 splat_4 = half3x3(4, 4, 4, 4, 4, 4, 4, 4, 4);
+
+    ok = ok && ((half3x3(2) + splat_4) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && ((half3x3(2) - splat_4) == half3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
+    ok = ok && ((half3x3(2) / splat_4) == half3x3(0.5));
+
+    ok = ok && (splat_4 + (half3x3(2)) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
+    ok = ok && (splat_4 - (half3x3(2)) == half3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
+    ok = ok && (half2x2(4, 4, 4, 4) / (half2x2(2, 2, 2, 2)) == half2x2(2, 2, 2, 2));
+
+    ok = ok && (half4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16) +
+                half4x4(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) ==
+                half4x4(17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17));
+
+    ok = ok && (half2x2(10, 20, 30, 40) - half2x2(1, 2, 3, 4) == half2x2(9, 18, 27, 36));
+
+    ok = ok && (half2x2(10, 20, 30, 40) / half2x2(5, 4, 30, 1) == half2x2(2, 5, 1, 40));
+
+    // Multiplication performs a proper matrix multiply.
+    ok = ok && (half2x2(1, 2, 7, 4) * half2x2(3, 5, 3, 2) == half2x2(38, 26, 17, 14));
+    ok = ok && (half3x3(10, 4, 2, 20, 5, 3, 10, 6, 5) *
+                half3x3(3, 3, 4, 2, 3, 4, 4, 9, 2) ==
+                half3x3(130, 51, 35, 120, 47, 33, 240, 73, 45));
+
+    return ok;
+}
+
 half4 main(float2 coords) {
-    return test() ? colorGreen : colorRed;
+    return (test_eq() &&
+            test_matrix_op_scalar_float() &&
+            test_matrix_op_scalar_half() &&
+            test_matrix_op_matrix_float() &&
+            test_matrix_op_matrix_half()) ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/resources/sksl/folding/MatrixFoldingES3.sksl b/third_party/skia/resources/sksl/folding/MatrixFoldingES3.sksl
index 67fc81d084565..ef83bf45867d4 100644
--- a/third_party/skia/resources/sksl/folding/MatrixFoldingES3.sksl
+++ b/third_party/skia/resources/sksl/folding/MatrixFoldingES3.sksl
@@ -1,11 +1,96 @@
 uniform half4 colorRed, colorGreen;
 
-bool test() {
+bool test_eq_float() {
     bool ok = true;
-    ok = ok &&  (float3x2(2) == float3x2(float2(2.0, 0.0), float2(0.0, 2.0), float2(0.0)));
+    ok = ok && (float3x2(2) == float3x2(float2(2.0, 0.0), float2(0.0, 2.0), float2(0.0)));
+    ok = ok && (float3x2(1, 2, 3, 4, 5, 6) == float3x2(float4x2(1, 2, 3, 4, 5, 6, 7, 8)));
+    return ok;
+}
+
+bool test_eq_half() {
+    bool ok = true;
+    ok = ok && (half3x2(2) == half3x2(half2(2.0, 0.0), half2(0.0, 2.0), half2(0.0)));
+    ok = ok && (half3x2(1, 2, 3, 4, 5, 6) == half3x2(half4x2(1, 2, 3, 4, 5, 6, 7, 8)));
+    return ok;
+}
+
+bool test_matrix_op_matrix_float() {
+    bool ok = true;
+
+    // Addition, subtraction and division operate componentwise.
+    {
+        const float3x2 splat_4 = float3x2(4, 4, 4, 4, 4, 4);
+
+        ok = ok && ((float3x2(2) + splat_4) == float3x2(6, 4, 4, 6, 4, 4));
+        ok = ok && ((float3x2(2) - splat_4) == float3x2(-2, -4, -4, -2, -4, -4));
+        ok = ok && ((float3x2(2) / splat_4) == float3x2(0.5));
+    }
+    {
+        const float2x3 splat_4 = float2x3(4, 4, 4, 4, 4, 4);
+
+        ok = ok && (splat_4 + (float2x3(2)) == float2x3(6, 4, 4, 4, 6, 4));
+        ok = ok && (splat_4 - (float2x3(2)) == float2x3(2, 4, 4, 4, 2, 4));
+        ok = ok && (splat_4 / (float2x3(2, 2, 2, 2, 2, 2)) == float2x3(2, 2, 2, 2, 2, 2));
+    }
+    ok = ok && (float4x3(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) +
+                float4x3(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5) ==
+                float4x3(17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17));
+
+    ok = ok && (float4x2(10, 20, 30, 40, 50, 60, 70, 80) -
+                float4x2(1, 2, 3, 4, 5, 6, 7, 8) ==
+                float4x2(9, 18, 27, 36, 45, 54, 63, 72));
+
+    ok = ok && (float2x4(10, 20, 30, 40, 10, 20, 30, 40) /
+                float2x4(10, 10, 10, 10, 5, 5, 5, 5) ==
+                float2x4(1, 2, 3, 4, 2, 4, 6, 8));
+
+    // Multiplication performs a proper matrix multiply.
+    ok = ok && (float3x2(1, 4, 2, 5, 3, 6) *
+                float2x3(7, 9, 11, 8, 10, 12) ==
+                float2x2(58, 139, 64, 154));
+    return ok;
+}
+
+bool test_matrix_op_matrix_half() {
+    bool ok = true;
+
+    // Addition, subtraction and division operate componentwise.
+    {
+        const half3x2 splat_4 = half3x2(4, 4, 4, 4, 4, 4);
+
+        ok = ok && ((half3x2(2) + splat_4) == half3x2(6, 4, 4, 6, 4, 4));
+        ok = ok && ((half3x2(2) - splat_4) == half3x2(-2, -4, -4, -2, -4, -4));
+        ok = ok && ((half3x2(2) / splat_4) == half3x2(0.5));
+    }
+    {
+        const half2x3 splat_4 = half2x3(4, 4, 4, 4, 4, 4);
+
+        ok = ok && (splat_4 + (half2x3(2)) == half2x3(6, 4, 4, 4, 6, 4));
+        ok = ok && (splat_4 - (half2x3(2)) == half2x3(2, 4, 4, 4, 2, 4));
+        ok = ok && (splat_4 / (half2x3(2, 2, 2, 2, 2, 2)) == half2x3(2, 2, 2, 2, 2, 2));
+    }
+    ok = ok && (half4x3(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12) +
+                half4x3(16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5) ==
+                half4x3(17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17));
+
+    ok = ok && (half4x2(10, 20, 30, 40, 50, 60, 70, 80) -
+                half4x2(1, 2, 3, 4, 5, 6, 7, 8) ==
+                half4x2(9, 18, 27, 36, 45, 54, 63, 72));
+
+    ok = ok && (half2x4(10, 20, 30, 40, 10, 20, 30, 40) /
+                half2x4(10, 10, 10, 10, 5, 5, 5, 5) ==
+                half2x4(1, 2, 3, 4, 2, 4, 6, 8));
+
+    // Multiplication performs a proper matrix multiply.
+    ok = ok && (half3x2(1, 4, 2, 5, 3, 6) *
+                half2x3(7, 9, 11, 8, 10, 12) ==
+                half2x2(58, 139, 64, 154));
     return ok;
 }
 
 half4 main(float2 coords) {
-    return test() ? colorGreen : colorRed;
+    return (test_eq_float() &&
+            test_eq_half() &&
+            test_matrix_op_matrix_float() &&
+            test_matrix_op_matrix_half()) ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/resources/sksl/folding/SwitchCaseFolding.sksl b/third_party/skia/resources/sksl/folding/SwitchCaseFolding.sksl
new file mode 100644
index 0000000000000..7a936110c2e69
--- /dev/null
+++ b/third_party/skia/resources/sksl/folding/SwitchCaseFolding.sksl
@@ -0,0 +1,20 @@
+uniform half4 colorRed, colorGreen;
+
+half4 main(float2 coords) {
+    half4 color = colorRed;
+
+    const int three = 3;
+    const int3 vecFour = int3(4);
+    switch (int(colorGreen.g)) {
+        case vecFour.000x.y:      break;                     // case 0
+        case int4(1, 2, 3, 4).x:  color = colorGreen; break; // case 1
+        case int(max(-5.5, 2.0)): break;                     // case 2
+        case three:               break;                     // case 3
+        case vecFour.yz01.x:      break;                     // case 4
+        case 2 * 3 - 1:           break;                     // case 5
+        default:                  break;
+    }
+
+    return color;
+}
+
diff --git a/third_party/skia/resources/sksl/errors/LastFragColorWithoutCaps.sksl b/third_party/skia/resources/sksl/glsl/LastFragColorWithoutCaps.sksl
similarity index 100%
rename from third_party/skia/resources/sksl/errors/LastFragColorWithoutCaps.sksl
rename to third_party/skia/resources/sksl/glsl/LastFragColorWithoutCaps.sksl
diff --git a/third_party/skia/resources/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl b/third_party/skia/resources/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl
index 976fcd4ab9772..c707f5514cd92 100644
--- a/third_party/skia/resources/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl
+++ b/third_party/skia/resources/sksl/inliner/ForWithoutReturnInsideCanBeInlined.sksl
@@ -1,9 +1,9 @@
 uniform half4 colorGreen;
 
 inline half4 loopy() {
-    half4 result;
+    half4 result = colorGreen;
     for (int x=0; x<4; ++x) {
-        result[x] = colorGreen[x];
+        result *= colorGreen;
     }
     return result;
 }
diff --git a/third_party/skia/resources/sksl/intrinsics/ClampFloat.sksl b/third_party/skia/resources/sksl/intrinsics/ClampFloat.sksl
index b1673d00f0aa4..f1180ec5a5087 100644
--- a/third_party/skia/resources/sksl/intrinsics/ClampFloat.sksl
+++ b/third_party/skia/resources/sksl/intrinsics/ClampFloat.sksl
@@ -13,14 +13,14 @@ half4 main(float2 coords) {
             clamp(testInputs.xy,   -1, 1)                         == expectedA.xy    &&
             clamp(testInputs.xyz,  -1, 1)                         == expectedA.xyz   &&
             clamp(testInputs.xyzw, -1, 1)                         == expectedA.xyzw  &&
-            clamp(constVal.x,      -1, 1)                         == expectedA.x     &&
-            clamp(constVal.xy,     -1, 1)                         == expectedA.xy    &&
-            clamp(constVal.xyz,    -1, 1)                         == expectedA.xyz   &&
-            clamp(constVal.xyzw,   -1, 1)                         == expectedA.xyzw  &&
             clamp(testInputs.x,    clampLow.x,    clampHigh.x   ) == expectedB.x     &&
             clamp(testInputs.xy,   clampLow.xy,   clampHigh.xy  ) == expectedB.xy    &&
             clamp(testInputs.xyz,  clampLow.xyz,  clampHigh.xyz ) == expectedB.xyz   &&
             clamp(testInputs.xyzw, clampLow.xyzw, clampHigh.xyzw) == expectedB.xyzw  &&
+            clamp(constVal.x,      -1, 1)                         == expectedA.x     &&
+            clamp(constVal.xy,     -1, 1)                         == expectedA.xy    &&
+            clamp(constVal.xyz,    -1, 1)                         == expectedA.xyz   &&
+            clamp(constVal.xyzw,   -1, 1)                         == expectedA.xyzw  &&
             clamp(constVal.x,      clampLow.x,    clampHigh.x   ) == expectedB.x     &&
             clamp(constVal.xy,     clampLow.xy,   clampHigh.xy  ) == expectedB.xy    &&
             clamp(constVal.xyz,    clampLow.xyz,  clampHigh.xyz ) == expectedB.xyz   &&
diff --git a/third_party/skia/resources/sksl/intrinsics/Cross.sksl b/third_party/skia/resources/sksl/intrinsics/Cross.sksl
index 6592756dd7434..ba9c6b95e9fc8 100644
--- a/third_party/skia/resources/sksl/intrinsics/Cross.sksl
+++ b/third_party/skia/resources/sksl/intrinsics/Cross.sksl
@@ -1,9 +1,9 @@
 uniform half2  ah, bh;
 uniform float2 af, bf;
 void main() {
-    sk_FragColor.x = cross(ah, bh);
-    sk_FragColor.y = half(cross(af, bf));
-    sk_FragColor.z = cross(half2(3, 0), half2(-1, 4));
+    sk_FragColor.x = cross_length_2d(ah, bh);
+    sk_FragColor.y = half(cross_length_2d(af, bf));
+    sk_FragColor.z = cross_length_2d(half2(3, 0), half2(-1, 4));
     sk_FragColor.xyz = cross(half3(3, 0, 2), half3(-1, 4, 2));
     sk_FragColor.yzw = cross(half3(1, 4, -7), half3(2, -1, 4));
 }
diff --git a/third_party/skia/resources/sksl/intrinsics/CrossNoInline.sksl b/third_party/skia/resources/sksl/intrinsics/CrossNoInline.sksl
index 69f4e4e557649..6b1469b9107e8 100644
--- a/third_party/skia/resources/sksl/intrinsics/CrossNoInline.sksl
+++ b/third_party/skia/resources/sksl/intrinsics/CrossNoInline.sksl
@@ -3,6 +3,6 @@
 uniform half2  ah, bh;
 uniform float2 af, bf;
 void main() {
-    sk_FragColor.x = cross(ah, bh);
-    sk_FragColor.y = half(cross(af, bf));
+    sk_FragColor.x = cross_length_2d(ah, bh);
+    sk_FragColor.y = half(cross_length_2d(af, bf));
 }
diff --git a/third_party/skia/resources/sksl/runtime/ChildEffects.rts b/third_party/skia/resources/sksl/runtime/ChildEffects.rts
new file mode 100644
index 0000000000000..a9bae1172755f
--- /dev/null
+++ b/third_party/skia/resources/sksl/runtime/ChildEffects.rts
@@ -0,0 +1,7 @@
+uniform shader s1, s2;
+uniform colorFilter c1, c2;
+uniform blender b;
+
+half4 main(float2 xy) {
+    return b.eval(c1.eval(s1.eval(xy)), c2.eval(s2.eval(xy)));
+}
diff --git a/third_party/skia/resources/sksl/runtime/GlobalVariables.rts b/third_party/skia/resources/sksl/runtime/GlobalVariables.rts
index d1e88725179f7..4f0e016e4c4fe 100644
--- a/third_party/skia/resources/sksl/runtime/GlobalVariables.rts
+++ b/third_party/skia/resources/sksl/runtime/GlobalVariables.rts
@@ -1,4 +1,4 @@
-/*#pragma settings NoInline*/
+/*#pragma settings NoInline SkVMDebugTrace*/
 
 const float gInitialized = -1.0;
 float gInitializedFromOther = -gInitialized;
diff --git a/third_party/skia/resources/sksl/runtime/QualifierOrder.rts b/third_party/skia/resources/sksl/runtime/QualifierOrder.rts
index 6d1ad4b179e33..b08b28223014f 100644
--- a/third_party/skia/resources/sksl/runtime/QualifierOrder.rts
+++ b/third_party/skia/resources/sksl/runtime/QualifierOrder.rts
@@ -7,7 +7,7 @@ uniform half4 colorGreen;
 // These qualifiers are reversed from the expected order, but SkSL should compile and run anyway.
 noinline void const_after_in(in const vec2 x) {}
 noinline void inout_after_high_precision(highp inout vec2 x) {}
-noinline void out_after_high_precision(highp out vec2 x) {}
+noinline void out_after_high_precision(highp out vec2 x) { x = vec2(0); }
 
 vec4 main(vec2 coords) {
     const_after_in(coords);
diff --git a/third_party/skia/resources/sksl/runtime_errors/DerivativesES2.rts b/third_party/skia/resources/sksl/runtime_errors/DerivativesES2.rts
index 1aaca2f8506ba..4150d2a2688b7 100644
--- a/third_party/skia/resources/sksl/runtime_errors/DerivativesES2.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/DerivativesES2.rts
@@ -1,2 +1,7 @@
 float2 dx(float2 coords) { return dFdx(coords); }
 float2 dy(float2 coords) { return dFdy(coords); }
+
+/*%%*
+no match for dFdx(float2)
+no match for dFdy(float2)
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ES3Types.rts b/third_party/skia/resources/sksl/runtime_errors/ES3Types.rts
index 1acf2b621f746..2448442b422ea 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ES3Types.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ES3Types.rts
@@ -41,3 +41,42 @@ void access_h42() { half4x2 var; var[0][0]; }
 void access_u()   { uint var; var.x; }
 void access_us4() { ushort4 var; var.x; }
 void access_aus() { ushort var[2]; var[0].x; }
+
+/*%%*
+type 'float2x3' is not supported
+type 'float2x4' is not supported
+type 'float3x2' is not supported
+type 'float3x4' is not supported
+type 'float4x2' is not supported
+type 'float4x3' is not supported
+type 'half2x3' is not supported
+type 'half2x4' is not supported
+type 'half3x2' is not supported
+type 'half3x4' is not supported
+type 'half4x2' is not supported
+type 'half4x3' is not supported
+type 'uint' is not supported
+type 'uint2' is not supported
+type 'uint3' is not supported
+type 'uint4' is not supported
+type 'ushort' is not supported
+type 'ushort2' is not supported
+type 'ushort3' is not supported
+type 'ushort4' is not supported
+type 'uint4' is not supported
+type 'ushort' is not supported
+type 'float2x3' is not supported
+type 'half4x2' is not supported
+type 'ushort' is not supported
+type 'uint' is not supported
+type 'float2x3' is not supported
+type 'half4x2' is not supported
+type 'uint' is not supported
+type 'ushort4' is not supported
+type 'ushort' is not supported
+type 'float2x3' is not supported
+type 'half4x2' is not supported
+type 'uint' is not supported
+type 'ushort4' is not supported
+type 'ushort' is not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/FirstClassArrays.rts b/third_party/skia/resources/sksl/runtime_errors/FirstClassArrays.rts
index 8723512b6b2ae..97a129df615fc 100644
--- a/third_party/skia/resources/sksl/runtime_errors/FirstClassArrays.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/FirstClassArrays.rts
@@ -1,6 +1,12 @@
-// Expect 2 errors
+// Expect 1 error
 
-void array_decl() { float[123] x; }
+// OK: SkSL allows ES3-style array declaration syntax. (This wouldn't work in native GLSL ES2.)
+float[123] global_var;
+void fn() { float[123] local_var; }
 
+// ERROR: SkSL (like GLSL ES2) does not allow array constructors in strict-ES2 mode.
 void array_ctor() { float[3](1, 2, 3); }
 
+/*%%*
+construction of array type 'float[3]' is not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalArrayOps.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalArrayOps.rts
index 0990d81ff5c51..e70048aa5b127 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalArrayOps.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalArrayOps.rts
@@ -36,3 +36,23 @@ void sequence_T() { t1, t2; }
 int ternary_A(bool b) { return (b ? a1 : a2)    [0]; }
 int ternary_S(bool b) { return (b ? s1 : s2)  .x[0]; }
 int ternary_T(bool b) { return (b ? t1 : t2).s.x[0]; }
+
+/*%%*
+operator '=' can not operate on arrays (or structs containing arrays)
+operator '=' can not operate on arrays (or structs containing arrays)
+operator '=' can not operate on arrays (or structs containing arrays)
+functions may not return structs containing arrays
+functions may not return structs containing arrays
+operator '==' can not operate on arrays (or structs containing arrays)
+operator '==' can not operate on arrays (or structs containing arrays)
+operator '==' can not operate on arrays (or structs containing arrays)
+operator '!=' can not operate on arrays (or structs containing arrays)
+operator '!=' can not operate on arrays (or structs containing arrays)
+operator '!=' can not operate on arrays (or structs containing arrays)
+operator ',' can not operate on arrays (or structs containing arrays)
+operator ',' can not operate on arrays (or structs containing arrays)
+operator ',' can not operate on arrays (or structs containing arrays)
+ternary operator result may not be an array (or struct containing an array)
+ternary operator result may not be an array (or struct containing an array)
+ternary operator result may not be an array (or struct containing an array)
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalIndexing.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalIndexing.rts
index 3c24417646404..9633092c623ca 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalIndexing.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalIndexing.rts
@@ -1,5 +1,3 @@
-// Expect 3 errors
-
 // Legal cases that should not produce errors:
 void literal_index()    { int a[2]; a[0] = 0; a[1] = a[0]; }
 void const_var_index()  { int a[2]; const int b = 0; a[b] = 0; }
@@ -27,3 +25,8 @@ void param_index(int p) { int a[2]; a[p] = 0; }
 
 // Legal in SkSL when optimization is enabled:
 void func_index()      { int a[2]; a[int(abs(-1))] = 0; }
+
+/*%%*
+error: 23: index expression must be constant
+error: 24: index expression must be constant
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalOperators.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalOperators.rts
index 08b25169c72d4..076ef9c8c569f 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalOperators.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalOperators.rts
@@ -14,3 +14,19 @@ int bit_or    (int x) { return x |  1; }
 int bit_or_eq (int x) { return x |= 1; }
 int bit_xor   (int x) { return x ^  1; }
 int bit_xor_eq(int x) { return x ^= 1; }
+
+/*%%*
+operator '~' is not allowed
+operator '%' is not allowed
+operator '%=' is not allowed
+operator '<<' is not allowed
+operator '<<=' is not allowed
+operator '>>' is not allowed
+operator '>>=' is not allowed
+operator '&' is not allowed
+operator '&=' is not allowed
+operator '|' is not allowed
+operator '|=' is not allowed
+operator '^' is not allowed
+operator '^=' is not allowed
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalPrecisionQualifiers.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalPrecisionQualifiers.rts
index ad51cc72f1bd5..aed4df9af6d1e 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalPrecisionQualifiers.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalPrecisionQualifiers.rts
@@ -12,3 +12,16 @@ uniform lowp colorFilter no_opaque;
 uniform highp half no_half_highp;
 uniform mediump half no_half_mediump;
 uniform lowp half no_lowp_mediump;
+
+/*%%*
+only one precision qualifier can be used
+only one precision qualifier can be used
+only one precision qualifier can be used
+only one precision qualifier can be used
+type 'S' does not support precision qualifiers
+type 'bool' does not support precision qualifiers
+type 'colorFilter' does not support precision qualifiers
+type 'half' does not support precision qualifiers
+type 'half' does not support precision qualifiers
+type 'half' does not support precision qualifiers
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionComplex.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionComplex.rts
index f98a6d637a443..ae358b23053d9 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionComplex.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionComplex.rts
@@ -32,3 +32,11 @@ void f_three(int n) {
 }
 
 void f_four(int n) {}
+
+/*%%*
+potential recursion (function call cycle) not allowed:
+	void f_one(int n)
+	void f_two(int n)
+	void f_three(int n)
+	void f_one(int n)
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionMutual.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionMutual.rts
index de43582de1c99..8981d9e25cc1d 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionMutual.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionMutual.rts
@@ -4,3 +4,10 @@
 bool is_even(int n);
 bool is_odd (int n) { return n == 0 ? false : is_even(n - 1); }
 bool is_even(int n) { return n == 0 ? true  : is_odd (n - 1); }
+
+/*%%*
+potential recursion (function call cycle) not allowed:
+	bool is_odd(int n)
+	bool is_even(int n)
+	bool is_odd(int n)
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionSimple.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionSimple.rts
index cdffbc376e96c..d58f2d846d006 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionSimple.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalRecursionSimple.rts
@@ -2,3 +2,9 @@
 
 // Simple recursion is not allowed, even with branching:
 int fibonacci(int n) { return n <= 1 ? n : fibonacci(n - 1) + fibonacci(n - 2); }
+
+/*%%*
+potential recursion (function call cycle) not allowed:
+	int fibonacci(int n)
+	int fibonacci(int n)
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalShaderSampling.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalShaderSampling.rts
index 4083ba58fc873..73d8c3f08ff06 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalShaderSampling.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalShaderSampling.rts
@@ -31,3 +31,21 @@ half4 eval_blender_comma_expr() { return (b, b).eval(color, color); }
 half4 eval_blender() { return b.eval(color, color); }
 half4 eval_colorFilter() { return f.eval(color); }
 half4 eval_shader() { return s.eval(xy); }
+
+/*%%*
+no match for shader::eval(float2, half4)
+no match for shader::eval(half4)
+no match for shader::eval(half4, float2)
+no match for shader::eval()
+no match for shader::eval(float3x3)
+type mismatch: ',' cannot operate on 'int', 'shader'
+no match for colorFilter::eval()
+no match for colorFilter::eval(float2)
+no match for colorFilter::eval(float2, half4)
+type mismatch: ',' cannot operate on 'shader', 'colorFilter'
+no match for blender::eval()
+no match for blender::eval(half4)
+no match for blender::eval(float2)
+no match for blender::eval(float2, half4)
+type mismatch: ',' cannot operate on 'blender', 'blender'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalShaderUse.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalShaderUse.rts
index b38ecb878cc99..58e85e503a688 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalShaderUse.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalShaderUse.rts
@@ -17,3 +17,18 @@ shader returned()          { return s1; }
 half4  constructed()       { return shader(s1).eval(xy); }
 half4  expression(bool b)  { return (b ? s1 : s2).eval(xy); }
 half4  dangling_eval()     { s1.eval; }
+
+/*%%*
+variables of type 'shader' must be uniform
+'in' variables not permitted in runtime effects
+variables of type 'shader' must be uniform
+variables of type 'shader' must be global
+variables of type 'shader' must be uniform
+parameters of type 'shader' not allowed
+unknown identifier 's'
+functions may not return opaque type 'shader'
+cannot construct 'shader'
+ternary expression of opaque type 'shader' not allowed
+expected '(' to begin method call
+function 'dangling_eval' can exit without returning a value
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/IllegalStatements.rts b/third_party/skia/resources/sksl/runtime_errors/IllegalStatements.rts
index dbd18088f2740..747ae1a72801f 100644
--- a/third_party/skia/resources/sksl/runtime_errors/IllegalStatements.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/IllegalStatements.rts
@@ -5,3 +5,9 @@ void discard_stmt() { discard; }
 int do_loop(int x) { do { x++; } while(x < 1); return x; }
 
 int while_loop(int x) { while (x < 1) { x++; } return x; }
+
+/*%%*
+discard statement is only permitted in fragment shaders
+do-while loops are not supported
+while loops are not supported
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/InvalidBlendMain.rtb b/third_party/skia/resources/sksl/runtime_errors/InvalidBlendMain.rtb
index 98159488f7b86..735d67aa13f8c 100644
--- a/third_party/skia/resources/sksl/runtime_errors/InvalidBlendMain.rtb
+++ b/third_party/skia/resources/sksl/runtime_errors/InvalidBlendMain.rtb
@@ -10,3 +10,17 @@ half4 main(half2 coords, half4 src, half4 dst) { return src * dst; }
 half4 main(half4 src, half4 dst, half4 bonusColor) { return src * dst; }
 
 half4 main(half4 src, half4 dst) { return src * dst; }  // the correct signature is allowed
+
+/*%%*
+'main' parameters must be (vec4|float4|half4, vec4|float4|half4)
+'main' parameters must be (vec4|float4|half4, vec4|float4|half4)
+unknown identifier 'src'
+'main' parameters must be (vec4|float4|half4, vec4|float4|half4)
+unknown identifier 'src'
+'main' parameters must be (vec4|float4|half4, vec4|float4|half4)
+unknown identifier 'src'
+unknown identifier 'dst'
+'main' parameters must be (vec4|float4|half4, vec4|float4|half4)
+unknown identifier 'src'
+unknown identifier 'dst'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf b/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf
index 98f0aa2f2de71..d8b475fecb5a8 100644
--- a/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf
+++ b/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterFeatures.rtcf
@@ -5,3 +5,7 @@
 half4 main(half4 color) {
     return sk_FragCoord.xy01;
 }
+
+/*%%*
+unknown identifier 'sk_FragCoord'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterMain.rtcf b/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterMain.rtcf
index e8071550a8875..9965c9ae29f9f 100644
--- a/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterMain.rtcf
+++ b/third_party/skia/resources/sksl/runtime_errors/InvalidColorFilterMain.rtcf
@@ -9,3 +9,12 @@ half4 main(float2 coord, half4 color) { return color; }
 half4 main(half4 color, half4 bonusColor) { return color; }
 
 half4 main(half4 color) { return color; }  // the correct signature is allowed
+
+/*%%*
+'main' parameter must be 'vec4', 'float4', or 'half4'
+'main' parameter must be 'vec4', 'float4', or 'half4'
+'main' parameter must be 'vec4', 'float4', or 'half4'
+unknown identifier 'color'
+'main' parameter must be 'vec4', 'float4', or 'half4'
+unknown identifier 'color'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/InvalidShaderMain.rts b/third_party/skia/resources/sksl/runtime_errors/InvalidShaderMain.rts
index db16d8cfc7059..080b1aa1ad524 100644
--- a/third_party/skia/resources/sksl/runtime_errors/InvalidShaderMain.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/InvalidShaderMain.rts
@@ -9,3 +9,13 @@ half4 main(float2 xy, half4 color, half4 bonusColor) { return color; }
 half4 main(half4 outOfOrderColor, float2 outOfOrderXy) { return color; }
 
 half4 main(float2 xy, half4 color) { return color; }  // the correct signature is allowed
+
+/*%%*
+'main' parameters must be (float2, (vec4|float4|half4)?)
+'main' parameters must be (float2, (vec4|float4|half4)?)
+unknown identifier 'color'
+'main' parameters must be (float2, (vec4|float4|half4)?)
+unknown identifier 'color'
+'main' parameters must be (float2, (vec4|float4|half4)?)
+unknown identifier 'color'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/LoopConditionErrors.rts b/third_party/skia/resources/sksl/runtime_errors/LoopConditionErrors.rts
index d9109ff238f72..9ffb7ac57d091 100644
--- a/third_party/skia/resources/sksl/runtime_errors/LoopConditionErrors.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/LoopConditionErrors.rts
@@ -14,3 +14,15 @@ uniform int u;
 
 void cond_uniform_val()    { for (int i = 0; i < u; ++i) {} }
 void cond_param_val(int p) { for (int i = 0; i < p; ++i) {} }
+
+/*%%*
+missing condition
+invalid condition
+invalid condition
+expected loop index on left hand side of condition
+expected loop index on left hand side of condition
+expected loop index on left hand side of condition
+expected loop index on left hand side of condition
+loop index must be compared with a constant expression
+loop index must be compared with a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/LoopExpressionErrors.rts b/third_party/skia/resources/sksl/runtime_errors/LoopExpressionErrors.rts
index a161a16f2c9cd..3d5fb5fa872d5 100644
--- a/third_party/skia/resources/sksl/runtime_errors/LoopExpressionErrors.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/LoopExpressionErrors.rts
@@ -11,3 +11,13 @@ uniform int u;
 
 void expression_uniform_val()    { for (int i = 0; i < 1; i += u) {} }
 void expression_param_val(int p) { for (int i = 0; i < 1; i += p) {} }
+
+/*%%*
+missing loop expression
+invalid operator in loop expression
+loop index must be modified by a constant expression
+invalid operator in loop expression
+invalid operator in loop expression
+loop index must be modified by a constant expression
+loop index must be modified by a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/LoopInitializerErrors.rts b/third_party/skia/resources/sksl/runtime_errors/LoopInitializerErrors.rts
index 974a48f247d1f..d18cd934a8728 100644
--- a/third_party/skia/resources/sksl/runtime_errors/LoopInitializerErrors.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/LoopInitializerErrors.rts
@@ -12,3 +12,16 @@ uniform int u;
 
 void uniform_init()    { for (int i = u; i < 1; ++i) {} }
 void param_init(int p) { for (int i = p; i < 1; ++i) {} }
+
+/*%%*
+missing init declaration
+invalid init declaration
+missing loop index initializer
+invalid type for loop index
+invalid type for loop index
+construction of array type 'int[2]' is not supported
+unknown identifier 'i'
+unknown identifier 'i'
+loop index initializer must be a constant expression
+loop index initializer must be a constant expression
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/LoopStructureErrors.rts b/third_party/skia/resources/sksl/runtime_errors/LoopStructureErrors.rts
index e71e4b6be4f6e..6ac20cab2e6db 100644
--- a/third_party/skia/resources/sksl/runtime_errors/LoopStructureErrors.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/LoopStructureErrors.rts
@@ -23,3 +23,21 @@ void infinite_loop_eq1()  { for (int i = 0; i == 0; i-=0) {} }
 void infinite_loop_eq2()  { for (int i = 1; i == 1; i+=0) {} }
 void infinite_loop_ne1()  { for (int i = 0; i != 4; i--)  {} }
 void infinite_loop_ne2()  { for (int i = 0; i != 4; i+=3) {} }
+
+/*%%*
+loop must guarantee termination in fewer iterations
+invalid loop expression
+invalid loop expression
+loop must guarantee termination in fewer iterations
+loop index must not be modified within body of the loop
+loop index must not be modified within body of the loop
+loop index must not be modified within body of the loop
+loop must guarantee termination in fewer iterations
+loop must guarantee termination in fewer iterations
+loop must guarantee termination in fewer iterations
+loop must guarantee termination in fewer iterations
+invalid loop expression
+invalid loop expression
+loop must guarantee termination in fewer iterations
+loop must guarantee termination in fewer iterations
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/Ossfuzz36655.rts b/third_party/skia/resources/sksl/runtime_errors/Ossfuzz36655.rts
index 0f1388cf1031d..d48e2a3575449 100644
--- a/third_party/skia/resources/sksl/runtime_errors/Ossfuzz36655.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/Ossfuzz36655.rts
@@ -47,3 +47,18 @@ void amsk_Rfloat2x1i() {
 	;
 	;
 }
+
+/*%%*
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin function call
+expected '(' to begin constructor invocation
+expected '(' to begin function call
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/Ossfuzz38131.rts b/third_party/skia/resources/sksl/runtime_errors/Ossfuzz38131.rts
index a3feb9f8b53e5..095e632b13a2f 100644
--- a/third_party/skia/resources/sksl/runtime_errors/Ossfuzz38131.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/Ossfuzz38131.rts
@@ -1 +1,5 @@
-s{int i;};
\ No newline at end of file
+s{int i;};
+
+/*%%*
+interface blocks are not allowed in this kind of program
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.rts
index 9304115fc3377..e5149efaa5d34 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_BlocklessLoops.rts
@@ -10,3 +10,7 @@ half4 main(float2 xy) {
 
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Extreme.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Extreme.rts
index 2f7534340e069..7492b05104d99 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Extreme.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Extreme.rts
@@ -13,3 +13,7 @@ half4 main(float2 xy) {
 
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_FlatLoop.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_FlatLoop.rts
index 66936e2cada86..41b7f9833a0a1 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_FlatLoop.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_FlatLoop.rts
@@ -115,3 +115,7 @@ half4 main(float2 xy) {
 
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Functions.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Functions.rts
index 4d20c4ee04b18..109cf6db7a940 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Functions.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_Functions.rts
@@ -9,3 +9,7 @@ half4 main(float2 xy) {
     a(i);
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_NestedLoops.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_NestedLoops.rts
index d39ed54700273..efa63a6f41699 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_NestedLoops.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_NestedLoops.rts
@@ -11,3 +11,7 @@ half4 main(float2 xy) {
 
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_SplitLoops.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_SplitLoops.rts
index 73dcf06ebac35..ce015e21452d4 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_SplitLoops.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_SplitLoops.rts
@@ -9,3 +9,7 @@ half4 main(float2 xy) {
     a(i);
     return half4(0);
 }
+
+/*%%*
+error: program is too large
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_StackDepth.rts b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_StackDepth.rts
index 776e6348042bd..23c24f0d1ddbb 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_StackDepth.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ProgramTooLarge_StackDepth.rts
@@ -58,3 +58,58 @@ void f4()  { f5(); }
 void f3()  { f4(); }
 void f2()  { f3(); }
 void f1()  { f2(); }
+
+/*%%*
+exceeded max function call depth:
+	half4 main(float2 xy)
+	void f1()
+	void f2()
+	void f3()
+	void f4()
+	void f5()
+	void f6()
+	void f7()
+	void f8()
+	void f9()
+	void f10()
+	void f11()
+	void f12()
+	void f13()
+	void f14()
+	void f15()
+	void f16()
+	void f17()
+	void f18()
+	void f19()
+	void f20()
+	void f21()
+	void f22()
+	void f23()
+	void f24()
+	void f25()
+	void f26()
+	void f27()
+	void f28()
+	void f29()
+	void f30()
+	void f31()
+	void f32()
+	void f33()
+	void f34()
+	void f35()
+	void f36()
+	void f37()
+	void f38()
+	void f39()
+	void f40()
+	void f41()
+	void f42()
+	void f43()
+	void f44()
+	void f45()
+	void f46()
+	void f47()
+	void f48()
+	void f49()
+	void f50()
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameISampler2D.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameISampler2D.rts
index 8e1c7a9958379..8948ec4cb4b3b 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameISampler2D.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameISampler2D.rts
@@ -1 +1,5 @@
 int isampler2D;
+
+/*%%*
+expected an identifier, but found type 'isampler2D'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler.rts
index 6e170578205e6..9740f835a3ef9 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler.rts
@@ -1 +1,5 @@
 int sampler;
+
+/*%%*
+expected an identifier, but found type 'sampler'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler1D.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler1D.rts
index c3406a2e9b726..7dc6cbbc0de5d 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler1D.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler1D.rts
@@ -1 +1,5 @@
 int sampler1D;
+
+/*%%*
+expected an identifier, but found type 'sampler1D'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2D.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2D.rts
index 1da7d63fa4d89..db35da4f13ba6 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2D.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2D.rts
@@ -1 +1,5 @@
 int sampler2D;
+
+/*%%*
+expected an identifier, but found type 'sampler2D'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2DRect.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2DRect.rts
index fce4ef2cf2251..973010b317089 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2DRect.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler2DRect.rts
@@ -1 +1,5 @@
 int sampler2DRect;
+
+/*%%*
+expected an identifier, but found type 'sampler2DRect'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler3D.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler3D.rts
index 67f35af459d48..3820dc10305e3 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler3D.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSampler3D.rts
@@ -1 +1,5 @@
 int sampler3D;
+
+/*%%*
+expected an identifier, but found type 'sampler3D'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSamplerExternalOES.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSamplerExternalOES.rts
index 7c25094081f6d..4331ddc7e2072 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSamplerExternalOES.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSamplerExternalOES.rts
@@ -1 +1,5 @@
 int samplerExternalOES;
+
+/*%%*
+expected an identifier, but found type 'samplerExternalOES'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInput.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInput.rts
index d72bf43172554..2499422623942 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInput.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInput.rts
@@ -1 +1,5 @@
 int subpassInput;
+
+/*%%*
+expected an identifier, but found type 'subpassInput'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInputMS.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInputMS.rts
index c13977721bc8c..2ff1f2a1afd71 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInputMS.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameSubpassInputMS.rts
@@ -1 +1,5 @@
 int subpassInputMS;
+
+/*%%*
+expected an identifier, but found type 'subpassInputMS'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/ReservedNameTexture2D.rts b/third_party/skia/resources/sksl/runtime_errors/ReservedNameTexture2D.rts
index a632412d02b9e..af2a543b33588 100644
--- a/third_party/skia/resources/sksl/runtime_errors/ReservedNameTexture2D.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/ReservedNameTexture2D.rts
@@ -1 +1,5 @@
 int texture2D;
+
+/*%%*
+expected an identifier, but found type 'texture2D'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/TypeAliases.rts b/third_party/skia/resources/sksl/runtime_errors/TypeAliases.rts
new file mode 100644
index 0000000000000..31b2d96c567fb
--- /dev/null
+++ b/third_party/skia/resources/sksl/runtime_errors/TypeAliases.rts
@@ -0,0 +1,24 @@
+vec4 main(vec2 coords) {
+    // it's ok to mix aliased with non-aliased types
+    bvec2 ok1 = bool2(true);
+    int3 ok2 = ivec3(1);
+    float2x2 ok3 = mat2(1);
+
+    // these all generate errors, and the error messages should refer to the type as written,
+    // preserving aliases
+    vec2 bad1 = 0;
+    int bad2 = mat2(0);
+    bvec2 bad3 = vec2(0);
+    float2 bad4 = vec3(0);
+    mat4 bad5 = float3x3(0);
+    return ivec4(1);
+}
+
+/*%%*
+expected 'vec2', but found 'int'
+expected 'int', but found 'mat2'
+expected 'bvec2', but found 'vec2'
+expected 'float2', but found 'vec3'
+expected 'mat4', but found 'float3x3'
+expected 'vec4', but found 'ivec4'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/UnsupportedExtension.rts b/third_party/skia/resources/sksl/runtime_errors/UnsupportedExtension.rts
new file mode 100644
index 0000000000000..0fe025a24734b
--- /dev/null
+++ b/third_party/skia/resources/sksl/runtime_errors/UnsupportedExtension.rts
@@ -0,0 +1,7 @@
+#extension i:enable
+
+/*%%*
+unsupported directive '#extension'
+no type named 'i'
+expected a type, but found ':'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts
index 5b2f52a6be4ab..04903ab98cd97 100644
--- a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeFragmentProcessor.rts
@@ -3,3 +3,9 @@ uniform fragmentProcessor s;
 half4 main(float2 xy) {
     return half4(0);
 }
+
+/*%%*
+no type named 'fragmentProcessor'
+no type named 's'
+expected a declaration, but found ';'
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeSampler.rts b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeSampler.rts
index 65937cf32347b..682432dc0d602 100644
--- a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeSampler.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeSampler.rts
@@ -3,3 +3,7 @@ uniform sampler2D s;
 half4 main(float2 xy) {
     return half4(0);
 }
+
+/*%%*
+invalid type
+*%%*/
diff --git a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeTexture.rts b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeTexture.rts
index 07a8b92776066..64b274726b166 100644
--- a/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeTexture.rts
+++ b/third_party/skia/resources/sksl/runtime_errors/UnsupportedTypeTexture.rts
@@ -3,3 +3,7 @@ uniform texture2D s;
 half4 main(float2 xy) {
     return half4(0);
 }
+
+/*%%*
+invalid type
+*%%*/
diff --git a/third_party/skia/resources/sksl/shared/ArrayComparison.sksl b/third_party/skia/resources/sksl/shared/ArrayComparison.sksl
index b0112df113852..23b2a1bd083cd 100644
--- a/third_party/skia/resources/sksl/shared/ArrayComparison.sksl
+++ b/third_party/skia/resources/sksl/shared/ArrayComparison.sksl
@@ -7,18 +7,18 @@ struct S {
 half4 main(float2 coords) {
     float f1[4] = float[4](1, 2, 3, 4);
     float f2[4] = float[4](1, 2, 3, 4);
-    float f3[4] = float[4](1, 2, 3, -4);
+    float[4] f3 = float[4](1, 2, 3, -4);
 
     int3 v1[2] = int3[2](int3(1, 2, 3), int3(4, 5, 6));
-    int3 v2[2] = int3[2](int3(1, 2, 3), int3(4, 5, 6));
+    int3[2] v2 = int3[2](int3(1, 2, 3), int3(4, 5, 6));
     int3 v3[2] = int3[2](int3(1, 2, 3), int3(4, 5, -6));
 
-    half2x2 m1[3] = half2x2[3](half2x2(1), half2x2(2), half2x2(3, 4, 5, 6));
+    half2x2[3] m1 = half2x2[3](half2x2(1), half2x2(2), half2x2(3, 4, 5, 6));
     half2x2 m2[3] = half2x2[3](half2x2(1), half2x2(2), half2x2(3, 4, 5, 6));
     half2x2 m3[3] = half2x2[3](half2x2(1), half2x2(2, 3, 4, 5), half2x2(6));
 
     S s1[3] = S[3](S(1, 2), S(3, 4), S(5, 6));
-    S s2[3] = S[3](S(1, 2), S(0, 0), S(5, 6));
+    S[3] s2 = S[3](S(1, 2), S(0, 0), S(5, 6));
     S s3[3] = S[3](S(1, 2), S(3, 4), S(5, 6));
 
     return (f1 == f2) && (f1 != f3) &&
diff --git a/third_party/skia/resources/sksl/shared/FunctionAnonymousParameters.sksl b/third_party/skia/resources/sksl/shared/FunctionAnonymousParameters.sksl
new file mode 100644
index 0000000000000..1d3d17e576d35
--- /dev/null
+++ b/third_party/skia/resources/sksl/shared/FunctionAnonymousParameters.sksl
@@ -0,0 +1,15 @@
+uniform half4 colorGreen, colorRed;
+
+struct S { int i; };
+
+half4 fnGreen(bool b, float2) {
+    return colorGreen;
+}
+
+half4 fnRed(int, float f, S) {
+    return colorRed;
+}
+
+half4 main(float2 coords) {
+    return bool(colorGreen.g) ? fnGreen(true, coords) : fnRed(123, 3.14, S(0));
+}
diff --git a/third_party/skia/resources/sksl/inliner/InlineWithInoutArgument.sksl b/third_party/skia/resources/sksl/shared/InoutParameters.sksl
similarity index 66%
rename from third_party/skia/resources/sksl/inliner/InlineWithInoutArgument.sksl
rename to third_party/skia/resources/sksl/shared/InoutParameters.sksl
index 524ec937fca04..9900524ae3219 100644
--- a/third_party/skia/resources/sksl/inliner/InlineWithInoutArgument.sksl
+++ b/third_party/skia/resources/sksl/shared/InoutParameters.sksl
@@ -24,24 +24,18 @@ inline void inoutParameterIgnore(inout half4 x) {
     half4 scratch = colorGreen * colorGreen;
 }
 
-inline void outParameterIgnore(out half4 x) {
-    half4 scratch = colorGreen * colorGreen;
-}
-
-// We don't inline functions that write to out parameters. (skia:11326)
 half4 main(float2 coords) {
     half4 c;
 
-    // These calls are ineligible for inlining, because they write to their `out` param.
+    // These functions write to their `out` param.
     outParameterWrite(c);
     outParameterWriteIndirect(c);
     inoutParameterWrite(c);
     inoutParameterWriteIndirect(c);
 
-    // These calls are eligible for inlining, because they don't write to their `out` param.
+    // These functions don't write to their `out` param.
     inoutParameterRead(c);
     inoutParameterIgnore(c);
-    outParameterIgnore(c);
 
     return c;
 }
diff --git a/third_party/skia/resources/sksl/shared/MatrixScalarMath.sksl b/third_party/skia/resources/sksl/shared/MatrixScalarMath.sksl
new file mode 100644
index 0000000000000..08f52ee7f8637
--- /dev/null
+++ b/third_party/skia/resources/sksl/shared/MatrixScalarMath.sksl
@@ -0,0 +1,38 @@
+uniform half4 colorGreen, colorRed;
+
+const int plus = 1;
+const int minus = 2;
+const int star = 3;
+const int slash = 4;
+
+bool test(int op, float m11, float m12, float m21, float m22, float2x2 expected) {
+
+    float one = colorRed.r;
+
+    float2x2 m2 = float2x2(m11 * one, m12 * one, m21 * one, m22 * one);
+    switch (op) {
+        case plus: m2 += 1; break;
+        case minus: m2 -= 1; break;
+        case star: m2 *= 2; break;
+        case slash: m2 /= 2; break;
+    }
+
+    return m2[0][0] == expected[0][0] &&
+           m2[0][1] == expected[0][1] &&
+           m2[1][0] == expected[1][0] &&
+           m2[1][1] == expected[1][1];
+}
+
+half4 main(float2 coords) {
+    float f1 = 1 * colorGreen.g;
+    float f2 = 2 * colorGreen.g;
+    float f3 = 3 * colorGreen.g;
+    float f4 = 4 * colorGreen.g;
+
+    return true
+           && test(plus, f1, f2, f3, f4, float2x2(f1+1, f2+1, f3+1, f4+1))
+           && test(minus, f1, f2, f3, f4, float2x2(f1-1, f2-1, f3-1, f4-1))
+           && test(star, f1, f2, f3, f4, float2x2(f1*2, f2*2, f3*2, f4*2))
+           && test(slash, f1, f2, f3, f4, float2x2(f1/2, f2/2, f3/2, f4/2))
+           ? colorGreen : colorRed;
+}
diff --git a/third_party/skia/resources/sksl/shared/MatrixScalarSplat.sksl b/third_party/skia/resources/sksl/shared/MatrixScalarSplat.sksl
deleted file mode 100644
index 75de16a3c66d4..0000000000000
--- a/third_party/skia/resources/sksl/shared/MatrixScalarSplat.sksl
+++ /dev/null
@@ -1,37 +0,0 @@
-uniform half4 colorGreen, colorRed;
-
-bool test_float() {
-    bool ok = true;
-
-    ok = ok && ((float3x3(2) + 4) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
-    ok = ok && ((float3x3(2) - 4) == float3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
-    ok = ok && ((float3x3(2) * 4) == float3x3(8));
-    ok = ok && ((float3x3(2) / 4) == float3x3(0.5));
-
-    ok = ok && (4 + (float3x3(2)) == float3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
-    ok = ok && (4 - (float3x3(2)) == float3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
-    ok = ok && (4 * (float3x3(2)) == float3x3(8));
-    ok = ok && (4 / (float2x2(2, 2, 2, 2)) == float2x2(2, 2, 2, 2));
-
-    return ok;
-}
-
-bool test_half() {
-    bool ok = true;
-
-    ok = ok && ((half3x3(2) + 4) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
-    ok = ok && ((half3x3(2) - 4) == half3x3(-2, -4, -4, -4, -2, -4, -4, -4, -2));
-    ok = ok && ((half3x3(2) * 4) == half3x3(8));
-    ok = ok && ((half3x3(2) / 4) == half3x3(0.5));
-
-    ok = ok && (4 + (half3x3(2)) == half3x3(6, 4, 4, 4, 6, 4, 4, 4, 6));
-    ok = ok && (4 - (half3x3(2)) == half3x3(2, 4, 4, 4, 2, 4, 4, 4, 2));
-    ok = ok && (4 * (half3x3(2)) == half3x3(8));
-    ok = ok && (4 / (half2x2(2, 2, 2, 2)) == half2x2(2, 2, 2, 2));
-
-    return ok;
-}
-
-half4 main(float2 coords) {
-    return test_float() && test_half() ? colorGreen : colorRed;
-}
diff --git a/third_party/skia/resources/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.sksl b/third_party/skia/resources/sksl/shared/OutParamsAreDistinct.sksl
similarity index 100%
rename from third_party/skia/resources/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.sksl
rename to third_party/skia/resources/sksl/shared/OutParamsAreDistinct.sksl
diff --git a/third_party/skia/resources/sksl/shared/OutParamsNoInline.sksl b/third_party/skia/resources/sksl/shared/OutParamsNoInline.sksl
deleted file mode 100644
index b94667dcce27e..0000000000000
--- a/third_party/skia/resources/sksl/shared/OutParamsNoInline.sksl
+++ /dev/null
@@ -1,84 +0,0 @@
-/*#pragma settings NoInline*/
-
-uniform half4 colorGreen, colorRed, colorWhite;
-
-void out_half (out half  v) { v = colorWhite.r; }
-void out_half2(out half2 v) { v = half2(colorWhite.g); }
-void out_half3(out half3 v) { v = half3(colorWhite.b); }
-void out_half4(out half4 v) { v = half4(colorWhite.a); }
-
-void out_half2x2(out half2x2 v) { v = half2x2(colorWhite.r); }
-void out_half3x3(out half3x3 v) { v = half3x3(colorWhite.g); }
-void out_half4x4(out half4x4 v) { v = half4x4(colorWhite.b); }
-
-void out_int (out int  v) { v = int(colorWhite.r); }
-void out_int2(out int2 v) { v = int2(colorWhite.g); }
-void out_int3(out int3 v) { v = int3(colorWhite.b); }
-void out_int4(out int4 v) { v = int4(colorWhite.a); }
-
-void out_float (out float  v) { v = float(colorWhite.r); }
-void out_float2(out float2 v) { v = float2(colorWhite.g); }
-void out_float3(out float3 v) { v = float3(colorWhite.b); }
-void out_float4(out float4 v) { v = float4(colorWhite.a); }
-
-void out_float2x2(out float2x2 v) { v = float2x2(colorWhite.r); }
-void out_float3x3(out float3x3 v) { v = float3x3(colorWhite.g); }
-void out_float4x4(out float4x4 v) { v = float4x4(colorWhite.b); }
-
-void out_bool (out bool  v) { v = bool(colorWhite.r); }
-void out_bool2(out bool2 v) { v = bool2(colorWhite.g); }
-void out_bool3(out bool3 v) { v = bool3(colorWhite.b); }
-void out_bool4(out bool4 v) { v = bool4(colorWhite.a); }
-
-half4 main(float2 coords) {
-    half4 result;
-
-    half     h;    out_half (h);
-    half2    h2;   out_half2(h2);
-    half3    h3;   out_half3(h3);
-    half4    h4;   out_half4(h4);
-                   out_half(h3[1]);
-                   out_half2(h3.xz);
-                   out_half4(h4.zwxy);
-
-    half2x2  h2x2; out_half2x2(h2x2);
-    half3x3  h3x3; out_half3x3(h3x3);
-    half4x4  h4x4; out_half4x4(h4x4);
-                   out_half3(h3x3[1]);
-                   out_half(h4x4[3].w);
-                   out_half(h2x2[0][0]);
-
-    int      i;    out_int (i);
-    int2     i2;   out_int2(i2);
-    int3     i3;   out_int3(i3);
-    int4     i4;   out_int4(i4);
-                   out_int3(i4.xyz);
-                   out_int(i2[1]);
-
-    float    f;    out_float (f);
-    float2   f2;   out_float2(f2);
-    float3   f3;   out_float3(f3);
-    float4   f4;   out_float4(f4);
-                   out_float2(f3.xy);
-                   out_float(f2[0]);
-
-    float2x2 f2x2; out_float2x2(f2x2);
-    float3x3 f3x3; out_float3x3(f3x3);
-    float4x4 f4x4; out_float4x4(f4x4);
-                   out_float(f2x2[0][0]);
-
-    bool     b;    out_bool (b);
-    bool2    b2;   out_bool2(b2);
-    bool3    b3;   out_bool3(b3);
-    bool4    b4;   out_bool4(b4);
-                   out_bool2(b4.xw);
-                   out_bool(b3[2]);
-
-    bool ok = true;
-    ok = ok && 1 == (h * h2.x * h3.x * h4.x * h2x2[0][0] * h3x3[0][0] * h4x4[0][0]);
-    ok = ok && 1 == (f * f2.x * f3.x * f4.x * f2x2[0][0] * f3x3[0][0] * f4x4[0][0]);
-    ok = ok && 1 == (i * i2.x * i3.x * i4.x);
-    ok = ok &&      (b && b2.x && b3.x && b4.x);
-
-    return ok ? colorGreen : colorRed;
-}
diff --git a/third_party/skia/resources/sksl/spirv/Ossfuzz44096.sksl b/third_party/skia/resources/sksl/spirv/Ossfuzz44096.sksl
new file mode 100644
index 0000000000000..a7757d5f2e604
--- /dev/null
+++ b/third_party/skia/resources/sksl/spirv/Ossfuzz44096.sksl
@@ -0,0 +1 @@
+void main() { half x; ++x * sk_SecondaryFragColor; }
diff --git a/third_party/skia/resources/sksl/errors/UnusedInterfaceBlock.sksl b/third_party/skia/resources/sksl/spirv/UnusedInterfaceBlock.sksl
similarity index 100%
rename from third_party/skia/resources/sksl/errors/UnusedInterfaceBlock.sksl
rename to third_party/skia/resources/sksl/spirv/UnusedInterfaceBlock.sksl
diff --git a/third_party/skia/resources/sksl/update_fuzzer.py b/third_party/skia/resources/sksl/update_fuzzer.py
index 62c022ef98188..5b641468b9cb9 100755
--- a/third_party/skia/resources/sksl/update_fuzzer.py
+++ b/third_party/skia/resources/sksl/update_fuzzer.py
@@ -23,53 +23,38 @@
 fileNum = 1
 
 # Prepare two scratch zip files, one for the input data as-is and another with 256-byte padding.
-with tempfile.NamedTemporaryFile(suffix='primary.zip', delete=False, mode='w') as pathToPrimaryZip:
-    with tempfile.NamedTemporaryFile(suffix='pad.zip', delete=False, mode='w') as pathToPaddedZip:
-        with zipfile.ZipFile(pathToPrimaryZip.name, 'w', zipfile.ZIP_DEFLATED) as primaryArchive:
-            with zipfile.ZipFile(pathToPaddedZip.name, 'w', zipfile.ZIP_DEFLATED) as paddedArchive:
-                # Iterate over every file in this directory and use it to assemble our corpus.
-                for root, dirs, files in os.walk(startDir):
-                    for file in files:
-                        # Exclude files that won't be useful fuzzer inputs.
-                        if (not file.startswith('.')        # Hidden
-                            and not file.endswith('.py')    # Python
-                            and not file.endswith('.test')  # ES2 conformance script
-                            and not file.endswith('.txt')): # Text
-                            # Prepend a number to each output filename to guarantee uniqueness.
-                            pathInZip = '%d_%s' % (fileNum, file)
-                            fileNum += 1
-                            with open('%s/%s' % (root, file), 'r') as skslFile:
-                                # Read the SkSL text as input.
-                                inputSkSL = skslFile.read()
-                                # In the primary archive, write the input SkSL as-is.
-                                primaryArchive.writestr(pathInZip, inputSkSL)
-                                # In the padded archive, write the input SkSL with 256 bonus bytes.
-                                paddedSkSL = inputSkSL + ("/" * 256)
-                                paddedArchive.writestr(pathInZip, paddedSkSL)
+with tempfile.NamedTemporaryFile(suffix='primary.zip', delete=False, mode='w') as pathToZip:
+    with zipfile.ZipFile(pathToZip.name, 'w', zipfile.ZIP_DEFLATED) as archive:
+        # Iterate over every file in this directory and use it to assemble our corpus.
+        for root, dirs, files in os.walk(startDir):
+            for file in files:
+                # Exclude files that won't be useful fuzzer inputs.
+                if (not file.startswith('.')        # Hidden
+                    and not file.endswith('.py')    # Python
+                    and not file.endswith('.test')  # ES2 conformance script
+                    and not file.endswith('.txt')): # Text
+                    # Prepend a number to each output filename to guarantee uniqueness.
+                    pathInZip = '%d_%s' % (fileNum, file)
+                    fileNum += 1
+                    with open('%s/%s' % (root, file), 'r') as skslFile:
+                        # Read the SkSL text as input.
+                        inputSkSL = skslFile.read()
+                        # Copy the SkSL into our zip archive.
+                        archive.writestr(pathInZip, inputSkSL)
 
     try:
-        # Upload both zip files to cloud storage.
+        # Upload our zip file to cloud storage.
         output = subprocess.check_output(
-                ['gsutil', 'cp', pathToPrimaryZip.name,
+                ['gsutil', 'cp', pathToZip.name,
                  'gs://skia-fuzzer/oss-fuzz/sksl_seed_corpus.zip'],
                  stderr=subprocess.STDOUT)
 
-        output = subprocess.check_output(
-                ['gsutil', 'cp', pathToPaddedZip.name,
-                 'gs://skia-fuzzer/oss-fuzz/sksl_with_256_padding_seed_corpus.zip'],
-                stderr=subprocess.STDOUT)
-
-        # Make the uploaded files world-readable.
+        # Make the uploaded file world-readable.
         output = subprocess.check_output(
                 ['gsutil', 'acl', 'ch', '-u', 'AllUsers:R',
                  'gs://skia-fuzzer/oss-fuzz/sksl_seed_corpus.zip'],
                 stderr=subprocess.STDOUT)
 
-        output = subprocess.check_output(
-                ['gsutil', 'acl', 'ch', '-u', 'AllUsers:R',
-                 'gs://skia-fuzzer/oss-fuzz/sksl_with_256_padding_seed_corpus.zip'],
-                stderr=subprocess.STDOUT)
-
     except subprocess.CalledProcessError as err:
         # Report the error.
         print("### Unable to upload fuzzer corpus to Google Cloud:")
diff --git a/third_party/skia/samplecode/Sample3D.cpp b/third_party/skia/samplecode/Sample3D.cpp
index d5c6bcf3c007b..7e958bc1b7c1c 100644
--- a/third_party/skia/samplecode/Sample3D.cpp
+++ b/third_party/skia/samplecode/Sample3D.cpp
@@ -428,7 +428,7 @@ class SampleBump3D : public SampleCubeBase {
 
         SkPaint paint;
         paint.setColor(color);
-        paint.setShader(builder.makeShader(nullptr, true));
+        paint.setShader(builder.makeShader());
 
         canvas->drawRRect(fRR, paint);
     }
diff --git a/third_party/skia/samplecode/SampleCircle.cpp b/third_party/skia/samplecode/SampleCircle.cpp
index c4126f9a03c68..3cd7c0b53b6d1 100644
--- a/third_party/skia/samplecode/SampleCircle.cpp
+++ b/third_party/skia/samplecode/SampleCircle.cpp
@@ -35,7 +35,7 @@ class CircleView : public Sample {
             paint.setStrokeWidth(SkIntToScalar(width));
         }
         canvas->drawCircle(0, 0, 9.0f, paint);
-        if (false) { // avoid bit rot, suppress warning
+        if ((false)) { // avoid bit rot, suppress warning
             test_circlebounds(canvas);
         }
     }
diff --git a/third_party/skia/samplecode/SampleCusp.cpp b/third_party/skia/samplecode/SampleCusp.cpp
index 9fb5a75cf5c14..543a3a3f234e9 100644
--- a/third_party/skia/samplecode/SampleCusp.cpp
+++ b/third_party/skia/samplecode/SampleCusp.cpp
@@ -144,12 +144,14 @@ class CuspView : public Sample {
         bool split;
         path = cusp(pts, pp, split, 8000, .125);
         auto debugOutCubic = [](const SkPoint* pts) {
-            return false; // comment out to capture stream of cusp'd cubics in stdout
-            SkDebugf("{{");
-            for (int i = 0; i < 4; ++i) {
-                SkDebugf("{0x%08x,0x%08x},", SkFloat2Bits(pts[i].fX), SkFloat2Bits(pts[i].fY));
+            if ((false)) { // enable to capture stream of cusp'd cubics in stdout
+                SkDebugf("{{");
+                for (int i = 0; i < 4; ++i) {
+                    SkDebugf("{0x%08x,0x%08x},", SkFloat2Bits(pts[i].fX), SkFloat2Bits(pts[i].fY));
+                }
+                SkDebugf("}},\n");
             }
-            SkDebugf("}},\n");
+            return false;
         };
         if (split) {
             debugOutCubic(&pp[0]);
diff --git a/third_party/skia/samplecode/SampleFilterBounds.cpp b/third_party/skia/samplecode/SampleFilterBounds.cpp
index c06dd8cf952cf..682891cddb9d2 100644
--- a/third_party/skia/samplecode/SampleFilterBounds.cpp
+++ b/third_party/skia/samplecode/SampleFilterBounds.cpp
@@ -232,7 +232,7 @@ class FilterBoundsSample : public Sample {
 
         // For visualization purposes, we want to show the layer-space output, this is what we get
         // when contentBounds is provided as a hint in local/parameter space.
-        skif::Mapping layerOnly(SkMatrix::I(), mapping.layerMatrix());
+        skif::Mapping layerOnly{mapping.layerMatrix()};
         skif::DeviceSpace<SkIRect> hintedOutputBounds = as_IFB(fBlur)->getOutputBounds(
                 layerOnly, contentBounds);
         canvas->drawRect(SkRect::Make(SkIRect(hintedOutputBounds)), line_paint(SK_ColorBLUE));
diff --git a/third_party/skia/samplecode/SampleGradients.cpp b/third_party/skia/samplecode/SampleGradients.cpp
index e3ade38670beb..a101ec35275ee 100644
--- a/third_party/skia/samplecode/SampleGradients.cpp
+++ b/third_party/skia/samplecode/SampleGradients.cpp
@@ -149,7 +149,7 @@ class GradientsView : public Sample {
         canvas->restore();
 
         canvas->translate(0, SkIntToScalar(370));
-        if (false) { // avoid bit rot, suppress warning
+        if ((false)) { // avoid bit rot, suppress warning
             test_alphagradients(canvas);
         }
     }
diff --git a/third_party/skia/samplecode/SampleImageFilterDAG.cpp b/third_party/skia/samplecode/SampleImageFilterDAG.cpp
index 4893c29d9b8a8..3c925d1f93d81 100644
--- a/third_party/skia/samplecode/SampleImageFilterDAG.cpp
+++ b/third_party/skia/samplecode/SampleImageFilterDAG.cpp
@@ -83,7 +83,7 @@ struct FilterNode {
             // For visualization purposes, we want the output bounds in layer space, before it's
             // been transformed to device space. To achieve that, we mock a new mapping with the
             // identity matrix transform.
-            skif::Mapping layerOnly = skif::Mapping(SkMatrix::I(), fMapping.layerMatrix());
+            skif::Mapping layerOnly{fMapping.layerMatrix()};
             skif::DeviceSpace<SkIRect> pseudoDeviceBounds =
                     as_IFB(fFilter)->getOutputBounds(layerOnly, fContent);
             // Since layerOnly's device matrix is I, this is effectively a cast to layer space
diff --git a/third_party/skia/samplecode/SampleLayers.cpp b/third_party/skia/samplecode/SampleLayers.cpp
index f7aa5e71c4b4d..c22857817c218 100644
--- a/third_party/skia/samplecode/SampleLayers.cpp
+++ b/third_party/skia/samplecode/SampleLayers.cpp
@@ -50,7 +50,7 @@ static void test_fade(SkCanvas* canvas) {
 
     // now draw the "content"
 
-    if (true) {
+    if ((true)) {
         r.setWH(100, 100);
 
         canvas->saveLayerAlpha(&r, 0x80);
@@ -103,7 +103,7 @@ class LayersView : public Sample {
     void onDrawContent(SkCanvas* canvas) override {
         this->drawBG(canvas);
 
-        if (true) {
+        if ((true)) {
             SkRect r;
             r.setWH(220, 120);
             SkPaint p;
@@ -116,7 +116,7 @@ class LayersView : public Sample {
             return;
         }
 
-        if (false) {
+        if ((false)) {
             SkRect r;
             r.setWH(220, 120);
             SkPaint p;
@@ -135,7 +135,7 @@ class LayersView : public Sample {
             canvas->drawOval(r, p);
         }
 
-        if (false) {
+        if ((false)) {
             SkPaint p;
             p.setAlpha(0x88);
             p.setAntiAlias(true);
diff --git a/third_party/skia/samplecode/SampleManyRects.cpp b/third_party/skia/samplecode/SampleManyRects.cpp
index 7278eed68c0ee..ba3bdb16f3e81 100644
--- a/third_party/skia/samplecode/SampleManyRects.cpp
+++ b/third_party/skia/samplecode/SampleManyRects.cpp
@@ -38,7 +38,7 @@ class ManyRectsView : public Sample {
 
             canvas->translate(SkIntToScalar(x), SkIntToScalar(y));
             // Uncomment to test rotated rect draw combining.
-            if (false) {
+            if ((false)) {
                 SkMatrix rotate;
                 rotate.setRotate(fRandom.nextUScalar1() * 360,
                                  SkIntToScalar(x) + SkScalarHalf(rect.fRight),
diff --git a/third_party/skia/samplecode/SamplePath.cpp b/third_party/skia/samplecode/SamplePath.cpp
index b717f62754531..ac725d91b2fcf 100644
--- a/third_party/skia/samplecode/SamplePath.cpp
+++ b/third_party/skia/samplecode/SamplePath.cpp
@@ -731,7 +731,7 @@ class CubicCurve2 : public Sample {
             Dot(canvas, p, 7, SK_ColorBLACK);
         }
 
-        if (false) {
+        if ((false)) {
             SkScalar ts[2];
             int n = SkFindCubicInflections(fPts, ts);
             for (int i = 0; i < n; ++i) {
diff --git a/third_party/skia/samplecode/SamplePathTessellators.cpp b/third_party/skia/samplecode/SamplePathTessellators.cpp
index 8ec922c9f0c72..30f43833a2303 100644
--- a/third_party/skia/samplecode/SamplePathTessellators.cpp
+++ b/third_party/skia/samplecode/SamplePathTessellators.cpp
@@ -18,6 +18,7 @@
 #include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
 #include "src/gpu/ops/TessellationPathRenderer.h"
 #include "src/gpu/tessellate/AffineMatrix.h"
+#include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h"
 #include "src/gpu/tessellate/PathCurveTessellator.h"
 #include "src/gpu/tessellate/PathWedgeTessellator.h"
 #include "src/gpu/tessellate/shaders/GrPathTessellationShader.h"
@@ -25,8 +26,6 @@
 
 namespace skgpu {
 
-using TrianglePatch = PatchWriter::TrianglePatch;
-
 namespace {
 
 enum class Mode {
@@ -135,23 +134,25 @@ class SamplePathTessellatorOp : public GrDrawOp {
         if (needsInnerFan) {
             patchPreallocCount += fPath.countVerbs() - 1;
         }
-        PatchWriter patchWriter(flushState, fTessellator, patchPreallocCount);
+        PatchWriter patchWriter(flushState,
+                                fTessellator,
+                                tessShader->maxTessellationSegments(*caps.shaderCaps()),
+                                patchPreallocCount);
 
         if (needsInnerFan) {
             // Write out inner fan triangles.
             AffineMatrix m(pathMatrix);
             for (PathMiddleOutFanIter it(fPath); !it.done();) {
                 for (auto [p0, p1, p2] : it.nextStack()) {
-                    TrianglePatch(patchWriter) << m.map2Points(p0, p1) << m.mapPoint(p2);
+                    auto [mp0, mp1] = m.map2Points(p0, p1);
+                    auto mp2 = m.map1Point(&p2);
+                    patchWriter.writeTriangle(mp0, mp1, mp2);
                 }
             }
         }
 
         // Write out the curves.
-        fTessellator->writePatches(patchWriter,
-                                   tessShader->maxTessellationSegments(*caps.shaderCaps()),
-                                   shaderMatrix,
-                                   {pathMatrix, fPath, kCyan});
+        fTessellator->writePatches(patchWriter, shaderMatrix, {pathMatrix, fPath, kCyan});
 
         if (!tessShader->willUseTessellationShaders()) {
             fTessellator->prepareFixedCountBuffers(flushState);
diff --git a/third_party/skia/samplecode/SampleStrokePath.cpp b/third_party/skia/samplecode/SampleStrokePath.cpp
index a77a9155e51db..5feb87cb5a4a0 100644
--- a/third_party/skia/samplecode/SampleStrokePath.cpp
+++ b/third_party/skia/samplecode/SampleStrokePath.cpp
@@ -138,7 +138,8 @@ class StrokePathView : public Sample {
     }
 
     void onDrawContent(SkCanvas* canvas) override {
-        test_huge_stroke(canvas); return;
+        test_huge_stroke(canvas);
+#if 0
         canvas->translate(SkIntToScalar(10), SkIntToScalar(10));
 
         SkPaint paint;
@@ -196,6 +197,7 @@ class StrokePathView : public Sample {
         canvas->translate(0, fPath.getBounds().height() * 5 / 4);
         fPath.setFillType(SkPathFillType::kEvenOdd);
         drawSet(canvas, &paint);
+#endif
     }
 
 private:
diff --git a/third_party/skia/site/_index.html b/third_party/skia/site/_index.html
index ed532b8aeb371..b154b658a46c3 100644
--- a/third_party/skia/site/_index.html
+++ b/third_party/skia/site/_index.html
@@ -9,7 +9,9 @@
 	<a class="btn btn-lg btn-primary mr-3 mb-4" href="{{< relref "/docs" >}}">
 		Learn More <i class="fas fa-arrow-alt-circle-right ml-2"></i>
 	</a>
-	<p class="h3 mt-5">Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms. It serves as the graphics engine for Google Chrome and Chrome OS, Android, Flutter, Mozilla Firefox and Firefox OS, and many other products.
+	<p class="h3 mt-5">Skia is an open source 2D graphics library which provides common APIs that
+		work across a variety of hardware and software platforms. It serves as the graphics engine
+		for Google Chrome and Chrome OS, Android, Flutter, and many other products.
 	</p>
 </div>
 {{< /blocks/cover >}}
diff --git a/third_party/skia/site/about/_index.html b/third_party/skia/site/about/_index.html
index f5b1ab18d6c85..69b50b233be1b 100644
--- a/third_party/skia/site/about/_index.html
+++ b/third_party/skia/site/about/_index.html
@@ -11,23 +11,16 @@
   <p class="h3 mt-5">
     Skia is an open source 2D graphics library which provides common APIs that
     work across a variety of hardware and software platforms. It serves as the
-    graphics engine for Google Chrome and Chrome OS, Android, Flutter, Mozilla
-    Firefox and Firefox OS, and many other products. Skia is sponsored and managed
-    by Google, but is available for use by anyone under the BSD Free Software
-    License. While engineering of the core components is done by the Skia
-    development team, we consider contributions from any source.
+    graphics engine for Google Chrome and Chrome OS, Android, Flutter, and many
+    other products. Skia is sponsored and managed by Google, but is available
+    for use by anyone under the BSD Free Software License. While engineering of
+    the core components is done by the Skia development team, we consider
+    contributions from any source.
   </p>
 {{< /blocks/cover>}}
 
 {{< blocks/section color="primary">}}
 
-  {{< blocks/feature icon="fa-lightbulb" title="Roadmap" url="https://docs.google.com/document/d/1LSdO3I-IdZVZCtEnW9pu3k_32gfPIcB_YeSn-OJBGZI/edit?usp=sharing" >}}
-     <p class=h4>
-      Check out the high level themes we have on tap the next 6-12 months. Note it is a living
-      document that changes based on the requirements of our users.
-    </p>
-  {{< /blocks/feature >}}
-
   {{< blocks/feature icon="fa-lightbulb" title="Supported Platforms" >}}
   <p class=h4>
     Windows 7, 8, 8.1, 10<br>
@@ -41,7 +34,7 @@
 
 
   {{< blocks/feature icon="fas fa-envelope-square" title="Subscribe"
-      url="https://twitter.com/docsydocs" >}}
+      url="https://groups.google.com/forum/#!forum/skia-discuss" >}}
    <p class=h4>
       Join the mailing list to keep up to date.
    </p>
diff --git a/third_party/skia/site/docs/_index.md b/third_party/skia/site/docs/_index.md
index cdbda33330638..d898fc80779ee 100644
--- a/third_party/skia/site/docs/_index.md
+++ b/third_party/skia/site/docs/_index.md
@@ -68,14 +68,6 @@ Click on any image below to see the source code that generated the image.
   </tr>
 </table>
 
-## Roadmap
-
-For a look at high level themes we have on tap the next 6-12 months, view our
-roadmap
-[here](https://docs.google.com/document/d/1LSdO3I-IdZVZCtEnW9pu3k_32gfPIcB_YeSn-OJBGZI/edit?usp=sharing).
-Note it is a living document that changes based on the requirements of our
-users.
-
 ## Platforms
 
 - Windows 7, 8, 8.1, 10
diff --git a/third_party/skia/site/docs/dev/contrib/directory.md b/third_party/skia/site/docs/dev/contrib/directory.md
index 418a20093c4b0..fe7d1c749b56d 100644
--- a/third_party/skia/site/docs/dev/contrib/directory.md
+++ b/third_party/skia/site/docs/dev/contrib/directory.md
@@ -35,7 +35,7 @@ linkTitle: "The Skia Directory"
     -   [Perf](https://perf.skia.org/) Performance testing.
     -   [Mon](https://mon.skia.org/) Grafana dashboard (requires login).
     -   [Alerts](https://alerts.skia.org/) Monitor testing and bot status.
-    -   [BugChomper] (https://bugchomper.skia.org/) Prioritize bugs quickly.
+    -   [BugChomper](https://bugchomper.skia.org/) Prioritize bugs quickly.
     -   [Code Review](https://skia-review.googlesource.com/)
 
 *   Mailing Lists
diff --git a/third_party/skia/site/docs/dev/contrib/patch.md b/third_party/skia/site/docs/dev/contrib/patch.md
deleted file mode 100644
index 1205e66e6f467..0000000000000
--- a/third_party/skia/site/docs/dev/contrib/patch.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: 'Applying patches'
-linkTitle: 'Applying patches'
----
-
-If you are a Skia committer and have been asked to commit an
-externally-submitted patch, this is how to do it. (This technique is useful in
-other situations too, like if you just want to try out somebody else's patch
-locally.)
-
-Notes:
-
-- For the examples below, we will assume that this is the change you want to
-  patch into your local checkout: https://codereview.appspot.com/6201055/
-- These instructions should work on Mac or Linux; Windows is trickier, because
-  there is no standard Windows "patch" tool.
-
-See also [Contributing Code for The Chromium Projects]
-(http://dev.chromium.org/developers/contributing-code#TOC-Instructions-for-Reviewer:-Checking-in-the-patch-for-a-non-committer).
-
-If you use `git cl`, then you should be able to use the shortcut:
-
-```
-git cl patch 6201055
-```
-
-If you use `gcl`, or the above doesn't work, the following should always work.
-
-1. Prepare your local workspace to accept the patch.
-
-   - cd into the root directory (usually `trunk/`) of the workspace where you
-     want to apply the patch.
-   - Make sure that the workspace is up-to-date and clean (or "updated and clean
-     enough" for your purposes). If the codereview patch was against an old
-     revision of the repo, you may need to sync your local workspace to that
-     same revision.
-
-2. Download the raw patch set.
-
-   - Open the codereview web page and look for the "Download raw patch set" link
-     near the upper right-hand corner. Right-click on that link and copy it to
-     the clipboard. (In my case, the link is
-     https://codereview.appspot.com/download/issue6201055_1.diff )
-   - If you are on Linux or Mac and have "curl" or "wget" installed, you can
-     download the patch from the command line:
-
-   ```
-   curl https://codereview.appspot.com/download/issue6201055_1.diff
-   --output patch.txt
-   # or...
-   wget https://codereview.appspot.com/download/issue6201055_1.diff
-   --output-document=patch.txt
-   ```
-
-   - Otherwise, figure out some other way to download this file and save it as
-     `patch.txt`
-
-3. Apply this patch to your local checkout.
-
-   - You should still be in the root directory of the workspace where you want
-     to apply the patch.
-
-   ```
-   patch -p1 <patch.txt
-   ```
-
-   - Then you can run `diff` and visually check the local changes.
-
-4. Complications: If the patch fails to apply, the following may be happening:
-
-   - Wrong revision. Maybe your local workspace is not up to date? Or maybe the
-     patch was made against an old revision of the repository, and cannot be
-     applied to the latest revision? (In that case, revert any changes and sync
-     your workspace to an older revision, then re-apply the patch.)
diff --git a/third_party/skia/site/docs/dev/design/text_c2d.md b/third_party/skia/site/docs/dev/design/text_c2d.md
index 04bb112b93cb6..7dea95433383a 100644
--- a/third_party/skia/site/docs/dev/design/text_c2d.md
+++ b/third_party/skia/site/docs/dev/design/text_c2d.md
@@ -1,6 +1,9 @@
-Canvas2D extensions for Shaped Text
-=============
-[Shaped Text](text_shaper.md) is a proposal for exposing the Browser's text shaping engine. It takes in
+---
+title: 'Canvas2D Shaped Text Extensions'
+linkTitle: 'Canvas2D Text Extensions'
+---
+
+[Shaped Text](/docs/dev/design/text_shaper) is a proposal for exposing the Browser's text shaping engine. It takes in
 a block of (annoated) text, and returns the low-level information needed to correctly measure, hit-test,
 and draw the text as positioned glyphs. This processing step is needed whenever text is measured or
 drawn in the browser, and this processing can be complex and time consuming. The output of this processing
@@ -33,9 +36,9 @@ with the exception of the actual text attributes:
 - direction
 
 These are ignored, because they have already been 'computed' by the Shape Text processing, and their
-results are represented in the glyphs, positions, and [Font](text_shaper.md) parameters.
+results are represented in the glyphs, positions, and [Font](/docs/dev/design/text_shaper) parameters.
 
-[Font](text_shaper.md) is far more specific in this extension that the existing context.font attribute. In
+[Font](/docs/dev/design/text_shaper) is far more specific in this extension that the existing context.font attribute. In
 today's canvas2d, "font" holds a high-level description of the typeface(s): It is a string with the
 font's name, which has to be resolved to find the actual (set of) resources. For Shaped Text, this
 resolution has already occured. The glyph IDs are specific to exactly 1 resource (i.e. file/blob) and
@@ -46,21 +49,19 @@ occured, the draw calls can execute faster.
 
 ## Font utilities
 
-[Shaped Text](text_shaper.md) introduced the Font interface, but for shaping, it only needed to specify
+[Shaped Text](/docs/dev/design/text_shaper) introduced the Font interface, but for shaping, it only needed to specify
 the resource (Typeface object) sizing information, and (on input) optional font-features. After shaping,
 clients may want to query information about specific glyphs within that Font. Those extended methods are
 presented here.
 
 ```WebIDL
 interface Font {
-    ...     // see [Shaped Text](text_shaper.md) for descriptive attributes
-
     // return array of advance widths for the specified glyphs.
     //
     sequence<float> getGlyphAdvances(sequene<unsigned short> glyphs);
 
     // return array of [left, top, right, bottom] coordinates for the specified glyphs,
-    // 
+    //
     // If positions are provided, then the rectangles are relative to each glyph's postion.
     // If no positions are provided, then the rectangles are all relateive to (0,0).
     // Note: positions are stored as (x,y) pairs
@@ -68,7 +69,7 @@ interface Font {
     sequence<float> getGlyphBounds(sequene<unsigned short> glyphs, sequence<float> positions?);
 
     // return array of Path2D objects for the specified glyphs,
-    // 
+    //
     // If positions are provided, then the paths are relative to each glyph's postion.
     // If no positions are provided, then the paths are all relateive to (0,0).
     // Note: positions are stored as (x,y) pairs
@@ -90,7 +91,7 @@ interface GlyphImage {
 };
 ```
 
-[Overview document](text_overview.md)
+[Overview document](/docs/dev/design/text_overview)
 
 ## Contributors:
  [mikerreed](https://github.com/mikerreed),
diff --git a/third_party/skia/site/docs/dev/design/text_overview.md b/third_party/skia/site/docs/dev/design/text_overview.md
index 5339c99614be2..b9bdca2cbc52b 100644
--- a/third_party/skia/site/docs/dev/design/text_overview.md
+++ b/third_party/skia/site/docs/dev/design/text_overview.md
@@ -1,5 +1,8 @@
-Text API Overview
-=============
+---
+title: 'Text API Overview'
+linkTitle: 'Text API Overview'
+---
+
 *2D Graphics* is a broad area. It consists of a host of related, but different ideas and primitives
 - rectangles, lines, paths
 - images (often scaled, transformed, filtered)
@@ -58,16 +61,16 @@ Determining what glyphs, in what order and positions, are needed to represent a
 
 We posit that drawing *internationally correct* Text is critical to most Web Apps, and that it is both complex to get correct, and can be computationally expensive. We propose exposing this processing to apps, providing them with results that can be efficiently drawn / animated.
 
-The core [Shaping APIs](text_shaper.md) are detailed here.
+The core [Shaping APIs](/docs/dev/design/text_shaper) are detailed here.
 
-Assocated [Canvas2D extensions](text_c2d.md) are detailed here.
+Associated [Canvas2D extensions](/docs/dev/design/text_c2d) are detailed here.
 
 Note: it is an explicit goal to **not** tie Shaping or its results to Canvas2D. We envision multiple scenarios where a framework or app will want to shape text, but not need a Canvas2D context .
 - drawn using WebGL or WebGPU
 - drawn using DOM (but utilizing line-breaking and metrics results)
 - drawn using a bespoke (i.e. wasm) renderer
 
-We are also proposing a lower level interface, one that just addresses exposing [unicode properties](uni_characterize.md).
+We are also proposing a lower level interface, one that just addresses exposing [unicode properties](/docs/dev/design/uni_characterize).
 
 
 ## Contributors:
diff --git a/third_party/skia/site/docs/dev/design/text_shaper.md b/third_party/skia/site/docs/dev/design/text_shaper.md
index 295775301b06b..9b8b5616d54c4 100644
--- a/third_party/skia/site/docs/dev/design/text_shaper.md
+++ b/third_party/skia/site/docs/dev/design/text_shaper.md
@@ -1,10 +1,13 @@
-Shaped Text
-=============
+---
+title: 'Shaped Text'
+linkTitle: 'Shaped Text'
+---
+
 A series of object models for describing a low-level builder for multi-line formatted text, and the resulting objects that expose the results of shaping that text. These are done outside of DOM Text nodes, and outside of any particular rendering model (e.g. canvas2d or webgl).
 
-A related explainer focuses on suggested [extensions to canvas2d](text_c2d.md) to allow it to efficiently render the shaped results, and to offer helper objects for inspecting useful properties from a typeface.
+A related explainer focuses on suggested [extensions to canvas2d](/docs/dev/design/text_c2d) to allow it to efficiently render the shaped results, and to offer helper objects for inspecting useful properties from a typeface.
 
-[Overview document](text_overview.md)
+[Overview document](/docs/dev/design/text_overview)
 
 ## Target audience
 
@@ -235,7 +238,7 @@ two proposals, allowing high-level clients to utilize their data model, but stil
 to access our lower level accessors (as they wish).
 
 ## Rendering in Canvas2D
-The [next explainer](text_c2d.md) describes how to take these results and render them
+The [next explainer](/docs/dev/design/text_c2d) describes how to take these results and render them
 into an (extended) Canvas context.
 
 ## Contributors:
diff --git a/third_party/skia/site/docs/dev/design/uni_characterize.md b/third_party/skia/site/docs/dev/design/uni_characterize.md
index add2808cf5fec..417a41e5a1091 100644
--- a/third_party/skia/site/docs/dev/design/uni_characterize.md
+++ b/third_party/skia/site/docs/dev/design/uni_characterize.md
@@ -1,5 +1,8 @@
-Text Properties API
-=============
+---
+title: 'Text Properties API'
+linkTitle: 'Text Properties API'
+---
+
 A variety of (internationally correct) text processing requires know the *properties* of unicode characters.
 For example, where in a string are the word boundaries (needed for line-breaking), which need to be ordered
 right-to-left or left-to-right?
@@ -90,14 +93,14 @@ results[34] --> HardLineBreak
 
 Some facilities for characterizing Unicode already exist, either as part of EcmaScript or the Web api. See [intl segmenter](https://github.com/tc39/proposal-intl-segmenter). This
 proposal acknowledges these, but suggests that any potential overlap in functionality is OK,
-given the design constraint spelled out in the [Ergonomics](#Ergonomics) section.
+given the design constraint spelled out in the [Ergonomics](#ergonomics) section.
 
 Similar to the contrast between canvas2d and webgl, this proposal seeks to provide very efficient,
 lower level access to unicode propoerties, specifically for sophisticated (possibly native ported to wasm)
 frameworks and apps. It is not intended to replace existing facilities (i.e. Segmenter), but rather
 to offer an alternative interface more suited to high-performance clients.
 
-We also propose a higher level interface specfically aimed at [Text Shaping](text_overview.md).
+We also propose a higher level interface specfically aimed at [Text Shaping](/docs/dev/design/text_overview).
 
 ## Contributors:
  [mikerreed](https://github.com/mikerreed),
diff --git a/third_party/skia/site/docs/dev/flutter/_index.md b/third_party/skia/site/docs/dev/flutter/_index.md
deleted file mode 100644
index 85d60cde4e5cc..0000000000000
--- a/third_party/skia/site/docs/dev/flutter/_index.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-title: 'Skia in Flutter & Fuchsia'
-linkTitle: 'Skia in Flutter & Fuchsia'
----
-
-Skia is used by both [Flutter](https://flutter.io/) and
-[Fuchsia](https://fuchsia.googlesource.com/docs/+/main/README.md).
-
-Fuchsia has a [roller](https://autoroll.skia.org/) that will continuously roll
-latest Skia into that project. Fuchsia uses an XML
-[manifest](https://fuchsia.googlesource.com/manifest/+/refs/heads/main) to
-specify the Skia revision (as well as other third party libraries).
-
-Flutter does not (yet) have a roller, so developers must manually perform rolls.
-Flutter uses [DEPS](https://github.com/flutter/engine/blob/master/DEPS) to
-specify third party dependencies.
-
-Although each project is (almost always) building at a different revision of
-Skia, Fuchsia itself always builds the latest revision of Flutter as one of its
-components. Thus, the versions of Skia being used by Flutter and Fuchsia must be
-"source compatible" -- Flutter must be capable of compiling against either
-revision without any change to Flutter itself.
-
-## Making API Changes
-
-If you need to make a breaking API change, the basic approach is:
-
-- Add new code to Skia, leaving the old code in place.
-- Deprecate the old code path so that it must be enabled with a flag such as
-  'SK_SUPPORT_LEGACY_XXX'.
-- Add that same flag to
-  [flutter_defines.gni](https://skia.googlesource.com/skia/+/main/gn/flutter_defines.gni)
-  in Skia.
-  - Both Flutter and Fuchsia build Skia with a GN argument that enables all the
-    defines listed in that file.
-- Land the Skia change, and test the new API in both Flutter and Fuchsia.
-- Remove the flag and code when the legacy code path is no longer in use.
diff --git a/third_party/skia/site/docs/dev/gardening/_index.md b/third_party/skia/site/docs/dev/gardening/_index.md
index 5c575d12357fe..f6f5716dedade 100644
--- a/third_party/skia/site/docs/dev/gardening/_index.md
+++ b/third_party/skia/site/docs/dev/gardening/_index.md
@@ -69,7 +69,8 @@ Below is a brief summary of what the gardener does for each task:
 
 You should triage Chromium and Skia bugs that show up under "Untriaged Bugs" on
 the [status page](https://status.skia.org). The Android Gardener will triage the
-untriaged Android Bugs. For a more detailed view of bugs see
+untriaged Android Bugs. The GPU Gardener will triage the untriaged OSS-Fuzz
+Bugs. For a more detailed view of bugs see
 [Skia Bugs Central](https://bugs-central.skia.org/).
 
 <a name="blamer"></a>
diff --git a/third_party/skia/site/docs/dev/gardening/gpu.md b/third_party/skia/site/docs/dev/gardening/gpu.md
index d858653f2a67c..fc918499daee7 100644
--- a/third_party/skia/site/docs/dev/gardening/gpu.md
+++ b/third_party/skia/site/docs/dev/gardening/gpu.md
@@ -21,7 +21,7 @@ What does a GPU Gardener do?
 
 The GPU Gardener has three main jobs:
 
-1) Stay on top of incoming GPU-related bugs from clients in various bug trackers. This means triaging and assigning bugs that have a clear owner and investigating and possibly fixing bugs that don't.
+1) Stay on top of incoming GPU-related bugs from clients in various bug trackers. This means triaging and assigning bugs that have a clear owner and investigating and possibly fixing bugs that don't. Also triage the "OSS-Fuzz" untriaged bugs that are displayed on Skia's [status page](https://status.skia.org/). If required, ask for view access to the oss-fuzz bugs from the Skia members listed [here](https://github.com/google/oss-fuzz/blob/master/projects/skia/project.yaml).
 
 
 2) Improve the reliability of the GPU bots. This includes dealing with flaky images, crashing bots, etc. We have a never ending set of machine or driver specific issues to deal with. We often brush them under the rug so that we have time for the "real work." When you're gardener this is "real work."
diff --git a/third_party/skia/site/docs/dev/tools/android_gdb.md b/third_party/skia/site/docs/dev/tools/android_gdb.md
new file mode 100644
index 0000000000000..634e11c8c517d
--- /dev/null
+++ b/third_party/skia/site/docs/dev/tools/android_gdb.md
@@ -0,0 +1,62 @@
+
+---
+title: "Debugging DM on Android"
+linkTitle: "Debugging DM on Android"
+
+---
+
+By default, we don’t do Android builds with full symbols. Assuming you want more than callstacks,
+add the following to your GN args:
+
+~~~
+extra_cflags = [ "-g" ]
+~~~
+
+When you build, you need to have built the `gdbserver` target. Either build everything, or at least
+build both `dm` and `gdbserver`:
+
+<!--?prettify lang=sh?-->
+
+    ninja -C out/android dm gdbserver
+
+At this point, the Android gdb script should work. Try running:
+
+<!--?prettify lang=sh?-->
+
+    platform_tools/android/bin/android_gdb_native -C out/android dm -i /data/local/tmp/resources <args>
+
+You will end up in a command-line gdb session connected to dm on the device. You’re done, but you
+can do better. From here, I’m assuming that you use VS Code. I strongly suspect that this could be
+adapted to other IDEs' GDB integration.
+
+VS Code comes with lldb support, but this workflow needs a GDB extension. Search for 'Native Debug'
+in the extension browser and install it, the thing you want comes from
+https://github.com/WebFreak001/code-debug if you’re unsure.
+
+In your VS Code project’s `launch.json`, add an entry that looks like the following. You'll need to
+replace <NDK_BUNDLE> with the path to your NDK bundle (ie $ANDROID_NDK_ROOT):
+
+~~~
+{
+    "name": "Android GDB",
+    "type": "gdb",
+    "request": "attach",
+    "target": ":5039",
+    "remote": true,
+    "gdbpath": "<NDK bundle>/prebuilt/linux-x86_64/bin/gdb",
+    "executable": "out/android/android_gdb_tmp/dm",
+    "cwd": "${workspaceRoot}",
+    "autorun": [ "break main" ]
+}
+~~~
+
+Rather than running `android_gdb_native`, run `android_gdbserver` in the same directory (and with
+the same arguments). This will do all of the same deployment, and run `gdbserver` on the device,
+but won’t start command line gdb on your host.
+
+Now, just 'Start Debugging' in VS Code (with the new configuration selected, if you have more than
+one). The VSC hosted gdb will connect to gdbserver, and you’ll have a somewhat interactive debugger
+where you can set breakpoints in your source windows, have panes for watches, locals, and the call
+stack, etc. Enjoy:
+
+![VS Code Debugger Screenshot](../android_gdb.png)
diff --git a/third_party/skia/site/docs/dev/tools/android_gdb.png b/third_party/skia/site/docs/dev/tools/android_gdb.png
new file mode 100644
index 0000000000000..0f4b903678e78
Binary files /dev/null and b/third_party/skia/site/docs/dev/tools/android_gdb.png differ
diff --git a/third_party/skia/site/docs/user/api/SkPath_Overview.md b/third_party/skia/site/docs/user/api/SkPath_Overview.md
index 0e6c54702dbb5..72f086eea55d9 100644
--- a/third_party/skia/site/docs/user/api/SkPath_Overview.md
+++ b/third_party/skia/site/docs/user/api/SkPath_Overview.md
@@ -52,10 +52,10 @@ on.
 
 ### Example
 
-<div><fiddle-embed name="93887af0c1dac49521972698cf04069c"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> contains three <a href='#Contour'>Contours</a>: <a href='undocumented#Line'>Line</a>, <a href='undocumented#Circle'>Circle</a>, and <a href='https://api.skia.org/classSkPath.html#ad75d5a934476ac6543d6d7ddd8dbb90a'>Quad</a>. <a href='undocumented#Line'>Line</a> is stroked but
+<div><fiddle-embed-sk name="93887af0c1dac49521972698cf04069c"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> contains three <a href='#Contour'>Contours</a>: <a href='undocumented#Line'>Line</a>, <a href='undocumented#Circle'>Circle</a>, and <a href='https://api.skia.org/classSkPath.html#ad75d5a934476ac6543d6d7ddd8dbb90a'>Quad</a>. <a href='undocumented#Line'>Line</a> is stroked but
 not filled. <a href='undocumented#Circle'>Circle</a> is stroked and filled; <a href='undocumented#Circle'>Circle</a> stroke forms a loop. <a href='https://api.skia.org/classSkPath.html#ad75d5a934476ac6543d6d7ddd8dbb90a'>Quad</a>
 is stroked and filled, but since it is not closed, <a href='https://api.skia.org/classSkPath.html#ad75d5a934476ac6543d6d7ddd8dbb90a'>Quad</a> does not stroke a loop.
-</div></fiddle-embed></div>
+</div></fiddle-embed-sk></div>
 
 <a href='https://api.skia.org/classSkPath.html'>Path</a> contains a
 <a href='#Path_Fill_Type'>Path_Fill_Type</a> which determines whether
@@ -66,8 +66,8 @@ or outside <a href='undocumented#Line'>Lines</a> and
 
 ### Example
 
-<div><fiddle-embed name="36a995442c081ee779ecab2962d36e69"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> is drawn filled, then stroked, then stroked and filled.
-</div></fiddle-embed></div>
+<div><fiddle-embed-sk name="36a995442c081ee779ecab2962d36e69"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> is drawn filled, then stroked, then stroked and filled.
+</div></fiddle-embed-sk></div>
 
 <a href='https://api.skia.org/classSkPath.html'>Path</a> contents are never
 shared. Copying <a href='https://api.skia.org/classSkPath.html'>Path</a> by
@@ -93,11 +93,11 @@ that follows starts a new <a href='#Contour'>Contour</a>.
 
 ### Example
 
-<div><fiddle-embed name="0374f2dcd7effeb1dd435205a6c2de6f"><div>Each <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_moveTo'>moveTo</a> starts a new <a href='#Contour'>Contour</a>, and content after <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_close'>close()</a>
+<div><fiddle-embed-sk name="0374f2dcd7effeb1dd435205a6c2de6f"><div>Each <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_moveTo'>moveTo</a> starts a new <a href='#Contour'>Contour</a>, and content after <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_close'>close()</a>
 also starts a new <a href='#Contour'>Contour</a>. Since <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_conicTo'>conicTo</a> is not preceded by
 <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_moveTo'>moveTo</a>, the first <a href='https://api.skia.org/structSkPoint.html'>Point</a> of the third <a href='#Contour'>Contour</a> starts at the last <a href='https://api.skia.org/structSkPoint.html'>Point</a>
 of the second <a href='#Contour'>Contour</a>.
-</div></fiddle-embed></div>
+</div></fiddle-embed-sk></div>
 
 If final <a href='#Path_Verb'>Path_Verb</a> in <a href='#Contour'>Contour</a> is
 <a href='https://api.skia.org/classSkPath.html'>SkPath</a>::<a href='#SkPath_kClose_Verb'>kClose_Verb</a>,
@@ -119,8 +119,8 @@ as final Verb, <a href='#Path_Last_Point'>Path_Last_Point</a> and first
 
 ### Example
 
-<div><fiddle-embed name="7a1f39b12d2cd8b7f5b1190879259cb2"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> is drawn stroked, with an open <a href='#Contour'>Contour</a> and a closed <a href='#Contour'>Contour</a>.
-</div></fiddle-embed></div>
+<div><fiddle-embed-sk name="7a1f39b12d2cd8b7f5b1190879259cb2"><div><a href='https://api.skia.org/classSkPath.html'>Path</a> is drawn stroked, with an open <a href='#Contour'>Contour</a> and a closed <a href='#Contour'>Contour</a>.
+</div></fiddle-embed-sk></div>
 
 <a name='Contour_Zero_Length'></a>
 
@@ -138,4 +138,4 @@ as final Verb, <a href='#Path_Last_Point'>Path_Last_Point</a> and first
 
 ### Example
 
-<div><fiddle-embed name="62848df605af6258653d9e16b27d8f7f"></fiddle-embed></div>
+<div><fiddle-embed-sk name="62848df605af6258653d9e16b27d8f7f"></fiddle-embed-sk></div>
diff --git a/third_party/skia/site/docs/user/api/skcanvas_overview.md b/third_party/skia/site/docs/user/api/skcanvas_overview.md
index df6ed050abf24..f9ce07a4ce1d4 100644
--- a/third_party/skia/site/docs/user/api/skcanvas_overview.md
+++ b/third_party/skia/site/docs/user/api/skcanvas_overview.md
@@ -19,7 +19,7 @@ Here is an example of a set of drawing commands to draw a filled
 heptagram.  This function can be cut and pasted into
 [fiddle.skia.org](https://fiddle.skia.org/).
 
-<fiddle-embed name='@skcanvas_star'></fiddle-embed>
+<fiddle-embed-sk name='@skcanvas_star'></fiddle-embed-sk>
 
 Details
 -------
@@ -32,7 +32,7 @@ store any other drawing attributes in the context (e.g. color, pen
 size). Rather, these are specified explicitly in each draw call, via a
 SkPaint.
 
-<fiddle-embed name='@skcanvas_square'></fiddle-embed>
+<fiddle-embed-sk name='@skcanvas_square'></fiddle-embed-sk>
 
 The code above will draw a rectangle rotated by 45 degrees. Exactly
 what color and style the rect will be drawn in is described by the
@@ -68,7 +68,7 @@ drawColor(), and save yourself having to allocate a paint.
 All of the other draw APIs are similar, each one ending with a paint
 parameter.
 
-<fiddle-embed name='@skcanvas_paint'></fiddle-embed>
+<fiddle-embed-sk name='@skcanvas_paint'></fiddle-embed-sk>
 
 In some of the calls, we pass a pointer, rather than a reference, to
 the paint. In those instances, the paint parameter may be null. In all
diff --git a/third_party/skia/site/docs/user/api/skpaint_overview.md b/third_party/skia/site/docs/user/api/skpaint_overview.md
index ac4f906b8a926..1e6887c8c78c1 100644
--- a/third_party/skia/site/docs/user/api/skpaint_overview.md
+++ b/third_party/skia/site/docs/user/api/skpaint_overview.md
@@ -17,13 +17,13 @@ the canvas state, and into (multiple) paint objects, allows canvas' save/restore
 to be that much more efficient, as all they have to do is maintain the stack of
 matrix and clip settings.
 
-<fiddle-embed name='@skpaint_skia'></fiddle-embed>
+<fiddle-embed-sk name='@skpaint_skia'></fiddle-embed-sk>
 
 This shows three different paints, each set up to draw in a different style. Now
 the caller can intermix these paints freely, either using them as is, or
 modifying them as the drawing proceeds.
 
-<fiddle-embed name='@skpaint_mix'></fiddle-embed>
+<fiddle-embed-sk name='@skpaint_mix'></fiddle-embed-sk>
 
 Beyond simple attributes such as color, strokes, and text values, paints support
 effects. These are subclasses of different aspects of the drawing pipeline, that
@@ -33,7 +33,7 @@ override some part of the drawing pipeline.
 For example, to draw using a gradient instead of a single color, assign a
 SkShader to the paint.
 
-<fiddle-embed name='@skpaint_shader'></fiddle-embed>
+<fiddle-embed-sk name='@skpaint_shader'></fiddle-embed-sk>
 
 Now, anything drawn with that paint will be drawn with the gradient specified in
 the call to `MakeLinear()`. The shader object that is returned is
@@ -75,7 +75,7 @@ this example the source is a solid magenta color with a horizontal alpha
 gradient and the destination is a solid cyan color with a vertical alpha
 gradient.
 
-<fiddle-embed name='@skpaint_xfer'></fiddle-embed>
+<fiddle-embed-sk name='@skpaint_xfer'></fiddle-embed-sk>
 
 ## SkShader
 
@@ -83,85 +83,85 @@ Several shaders are defined (besides the linear gradient already mentioned):
 
 - Bitmap Shader
 
-  <fiddle-embed name='@skpaint_bitmap_shader'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_bitmap_shader'></fiddle-embed-sk>
 
 - Radial Gradient Shader
 
-  <fiddle-embed name='@skpaint_radial'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_radial'></fiddle-embed-sk>
 
 - Two-Point Conical Gradient Shader
 
-  <fiddle-embed name='@skpaint_2pt'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_2pt'></fiddle-embed-sk>
 
 - Sweep Gradient Shader
 
-  <fiddle-embed name='@skpaint_sweep'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_sweep'></fiddle-embed-sk>
 
 - Fractal Perlin Noise Shader
 
-  <fiddle-embed name='@skpaint_perlin'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_perlin'></fiddle-embed-sk>
 
 - Turbulence Perlin Noise Shader
 
-  <fiddle-embed name='@skpaint_turb'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_turb'></fiddle-embed-sk>
 
 - Compose Shader
 
-  <fiddle-embed name='@skpaint_compose_shader'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_compose_shader'></fiddle-embed-sk>
 
 ## SkMaskFilter
 
 - Blur Mask Filter
 
-  <fiddle-embed name='@skpaint_blur_mask_filter'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_blur_mask_filter'></fiddle-embed-sk>
 
 ## SkColorFilter
 
 - Color Matrix Color Filter
 
-  <fiddle-embed name='@skpaint_matrix_color_filter'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_matrix_color_filter'></fiddle-embed-sk>
 
 - Color Table Color Filter
 
-  <fiddle-embed name='@skpaint_color_table_filter'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_color_table_filter'></fiddle-embed-sk>
 
 ## SkPathEffect
 
 - SkPath2DPathEffect: Stamp the specified path to fill the shape, using the
   matrix to define the latice.
 
-  <fiddle-embed name='@skpaint_path_2d_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_path_2d_path_effect'></fiddle-embed-sk>
 
 - SkLine2DPathEffect: a special case of SkPath2DPathEffect where the path is a
   straight line to be stroked, not a path to be filled.
 
-  <fiddle-embed name='@skpaint_line_2d_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_line_2d_path_effect'></fiddle-embed-sk>
 
 - SkPath1DPathEffect: create dash-like effects by replicating the specified path
   along the drawn path.
 
-  <fiddle-embed name='@skpaint_path_1d_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_path_1d_path_effect'></fiddle-embed-sk>
 
 - SkCornerPathEffect: a path effect that can turn sharp corners into various
   treatments (e.g. rounded corners).
 
-  <fiddle-embed name='@skpaint_corner_path_effects'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_corner_path_effects'></fiddle-embed-sk>
 
 - SkDashPathEffect: a path effect that implements dashing.
 
-  <fiddle-embed name='@skpaint_dash_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_dash_path_effect'></fiddle-embed-sk>
 
 - SkDiscretePathEffect: This path effect chops a path into discrete segments,
   and randomly displaces them.
 
-  <fiddle-embed name='@skpaint_discrete_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_discrete_path_effect'></fiddle-embed-sk>
 
 - SkComposePathEffect: a pathEffect whose effect is to apply first the inner
   pathEffect and the the outer pathEffect (i.e. outer(inner(path))).
 
-  <fiddle-embed name='@skpaint_compose_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_compose_path_effect'></fiddle-embed-sk>
 
 - SkSumPathEffect: a pathEffect whose effect is to apply two effects, in
   sequence (i.e. first(path) + second(path)).
 
-  <fiddle-embed name='@skpaint_sum_path_effect'></fiddle-embed>
+  <fiddle-embed-sk name='@skpaint_sum_path_effect'></fiddle-embed-sk>
diff --git a/third_party/skia/site/docs/user/coordinates.md b/third_party/skia/site/docs/user/coordinates.md
index fb49017a47a81..f26fae238bf99 100644
--- a/third_party/skia/site/docs/user/coordinates.md
+++ b/third_party/skia/site/docs/user/coordinates.md
@@ -21,13 +21,13 @@ This means that geometry is typically specified in pixel units. Here, we
 position a rectangle at `(100, 50)`, and specify that it is `50` units wide and
 tall:
 
-<fiddle-embed name='96f782b723c5240aab440242f4c7cbfb'></fiddle-embed>
+<fiddle-embed-sk name='96f782b723c5240aab440242f4c7cbfb'></fiddle-embed-sk>
 
 Local coordinates are also used to define and evaluate any `SkShader` on the
 paint. Here, we define a linear gradient shader that goes from green (when
 `x == 0`) to blue (when `x == 50`):
 
-<fiddle-embed name='97cf81a465fdeff01d2298e07a0802a3'></fiddle-embed>
+<fiddle-embed-sk name='97cf81a465fdeff01d2298e07a0802a3'></fiddle-embed-sk>
 
 ---
 
@@ -35,7 +35,7 @@ paint. Here, we define a linear gradient shader that goes from green (when
 
 Now, let's try to draw the gradient-filled square at `(100, 50)`:
 
-<fiddle-embed name='3adc73d23d57084f954f52c6b14c8772'></fiddle-embed>
+<fiddle-embed-sk name='3adc73d23d57084f954f52c6b14c8772'></fiddle-embed-sk>
 
 What happened? Remember, the local coordinate space has not changed. The origin
 is still in the upper-left corner of the surface. We have specified that the
@@ -54,7 +54,7 @@ Instead, we can use methods on `SkCanvas` to **change the local coordinate
 space**. This causes all local coordinates (geometry and shaders) to be
 evaluated in the new space defined by the canvas' transformation matrix:
 
-<fiddle-embed name='ce89b326b2bbe41587eec738706bf155'></fiddle-embed>
+<fiddle-embed-sk name='ce89b326b2bbe41587eec738706bf155'></fiddle-embed-sk>
 
 ---
 
@@ -73,11 +73,11 @@ been translated `50` units over and down. Then, we apply a `45` degree rotation
 (pivoting on the center of the box) to the canvas. This rotates the geometry of
 the box, and the gradient inside it:
 
-<fiddle-embed name='d4b52d94342f1b55900d489c7ba8fd21'></fiddle-embed>
+<fiddle-embed-sk name='d4b52d94342f1b55900d489c7ba8fd21'></fiddle-embed-sk>
 
 Compare that to the second example. We still translate `50` units over and down.
 Here, though, we apply the `45` degree rotation _only to the shader_, by
 specifying it as a `localMatrix` to the `SkGradientShader::MakeLinear` function.
 Now, the box remains un-rotated, but the gradient rotates inside the box:
 
-<fiddle-embed name='886fa46943b67e0d6aa78486dcfbcc2c'></fiddle-embed>
+<fiddle-embed-sk name='886fa46943b67e0d6aa78486dcfbcc2c'></fiddle-embed-sk>
diff --git a/third_party/skia/site/docs/user/modules/canvaskit.md b/third_party/skia/site/docs/user/modules/canvaskit.md
index 79521e4f84ab5..205aa0025b402 100644
--- a/third_party/skia/site/docs/user/modules/canvaskit.md
+++ b/third_party/skia/site/docs/user/modules/canvaskit.md
@@ -71,7 +71,7 @@ Skia's [Lottie animation](https://skia.org/docs/user/modules/skottie) support.
   <figure>
     <canvas id=camera3d width=400 height=400></canvas>
     <figcaption>
-      <a href="https://jsfiddle.skia.org/canvaskit/b0b90e29f25f41af15249831d9a5cb5a3b8126ca2c2f0b9ad0e9193d1bcf95e9"
+      <a href="https://jsfiddle.skia.org/canvaskit/55e66e892a5ae98175cc0b086fbac2100a4642105bb76bd938ed75ccce5af432"
           target=_blank rel=noopener>
         3D Cube JSFiddle</a>
     </figcaption>
@@ -479,8 +479,7 @@ half4 main(float2 p) {
         Math.sin(Date.now() / 2000) / 5,
         256, 256,
         1, 0, 0, 1,
-        0, 1, 0, 1],
-        true/*=opaque*/);
+        0, 1, 0, 1]);
 
       paint.setShader(shader);
       canvas.drawRect(CanvasKit.LTRBRect(0, 0, 512, 512), paint);
@@ -660,7 +659,7 @@ half4 main(float2 p) {
       const uniforms = [...lightWorldPos, ...localToWorld, ...normalMatrix(localToWorld)];
       const paint = new CanvasKit.Paint();
       paint.setAntiAlias(true);
-      const shader = fact.makeShaderWithChildren(uniforms, true /*=opaque*/, children);
+      const shader = fact.makeShaderWithChildren(uniforms, children);
       paint.setShader(shader);
       canvas.drawRRect(rr, paint);
     }
diff --git a/third_party/skia/site/docs/user/modules/particles.md b/third_party/skia/site/docs/user/modules/particles.md
index 7f79716c28b21..5356cd5f7622b 100644
--- a/third_party/skia/site/docs/user/modules/particles.md
+++ b/third_party/skia/site/docs/user/modules/particles.md
@@ -56,7 +56,7 @@ custom language, SkSL.
   <figure>
     <canvas id=curves width=400 height=400></canvas>
     <figcaption>
-      <a href="https://particles.skia.org/?nameOrHash=@spiral"
+      <a href="https://particles.skia.org/?nameOrHash=@swirl"
          target=_blank rel=noopener>Curves</a>
     </figcaption>
   </figure>
diff --git a/third_party/skia/site/docs/user/modules/skottie.md b/third_party/skia/site/docs/user/modules/skottie.md
index 4ec1e5bd49b0d..9664e5cadabb7 100644
--- a/third_party/skia/site/docs/user/modules/skottie.md
+++ b/third_party/skia/site/docs/user/modules/skottie.md
@@ -20,6 +20,14 @@ contributing advancements back to Bodymovin/Lottie.
 
 Here are some test samples rendering with Skia's animation player:
 
+<script src="https://skottie.skia.org/static/canvaskit.js"></script>
+<script src="https://skottie.skia.org/static/inline-bundle.js"></script>
+<style>
+    skottie-inline-sk {
+        display: inline-block;
+    }
+</style>
+
 <a href="https://skottie.skia.org/e6741dda67629da1f80c254dad3df865">
   <skottie-inline-sk src="https://skottie.skia.org/_/j/e6741dda67629da1f80c254dad3df865" width=200 height=200></skottie-inline-sk>
 </a>
diff --git a/third_party/skia/site/docs/user/release/release_notes.md b/third_party/skia/site/docs/user/release/release_notes.md
index cb1181c678013..042426174afe0 100644
--- a/third_party/skia/site/docs/user/release/release_notes.md
+++ b/third_party/skia/site/docs/user/release/release_notes.md
@@ -10,6 +10,100 @@ This page includes a list of high level updates for each milestone release.
 
 * * *
 
+Milestone 98
+------------
+  * The following functions and methods are not defined in SkSurface when SK_SUPPORT_GPU is 0:
+    MakeFromBackendTexture, MakeFromBackendRenderTarget, MakeRenderTarget,
+    getBackendTexture, getBackendRenderTarget, replaceBackendTexture. flush() with parameters
+    was removed as well. These were all no-ops anyway when just the CPU backend was compiled in
+    (noting that flush() and flushAndSubmit() are still no-ops on the CPU backend).
+  * GrBackendSemaphore only includes methods that match the GPU backend that Skia was compiled for.
+    For example, initVulkan and vkSemaphore are not defined unless the Vulkan backend is compiled
+    into Skia.
+  * Surfaces and images are now limited to just under 2GB of total size. Previously, larger images
+    could be created, but the CPU backend would fail to index them correctly.
+  * SkCanvas::drawVertices and SkCanvas::drawPatch variants that did not take SkBlendMode are
+    removed.
+  * SkImageFilters::RuntimeShader is a new public API that enables adding RuntimeShaderEffects into
+    image filter graph.
+  * SkImage::makeRawShader is a new public API that creates "raw" image shaders. makeRawShader
+    functions like SkImage::makeShader, but for images that contain non-color data. This includes
+    images encoding things like normals, material properties (eg roughness), heightmaps, or any
+    other purely mathematical data that happens to be stored in an image. These types of images are
+    useful with some programmable shaders (ie SkRuntimeEffect).
+    Raw image shaders work like regular image shaders (including filtering and tiling), with a few
+    major differences:
+      - No color space transformation is ever applied (the color space of the image is ignored).
+      - Images with an alpha type of kUnpremul are not automatically premultiplied.
+      - Bicubic filtering is not supported. If SkSamplingOptions::useCubic is true, these factories
+        will return nullptr.
+  * Removed SkCanvas::markCTM and SkCanvas::findMarkedCTM. These were created to be used with other
+    features that have since been deleted, so they served no purpose.
+
+* * *
+
+Milestone 97
+------------
+  * Added basic support for vulkan DRM modifiers. All of these are treated as read only textures
+    internally (versus querying specific modifier support). Clients can either pass a flag to Vulkan
+    GrBackendFormat to say it uses modifiers or pass the VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT
+    to a GrBackendTexture via the GrVkImageInfo struct.
+  * The following functions and methods are not defined in SkImage when SK_SUPPORT_GPU is 0:
+    MakeTextureFromCompressed, MakeFromTexture, MakeFromCompressedTexture,
+    MakeCrossContextFromPixmap, MakeFromAdoptedTexture, MakeFromYUVATextures,
+    MakeFromYUVAPixmaps, MakePromiseTexture, MakePromiseYUVATexture, MakeBackendTextureFromSkImage,
+    flush, flushAndSubmit, getBackendTexture, makeTextureImage.
+    These were all no-ops anyway when just the CPU backend was compiled in.
+
+* * *
+
+Milestone 96
+------------
+  * SkRuntimeEffect no longer clamps the RGB values of an effect's output to the range 0..A.
+    This makes it easier to use a hierarchy of SkSL shaders where intermediate values do not
+    represent colors but are, for example, non-color inputs to a lighting model.
+    http://review.skia.org/452558
+
+* * *
+
+Milestone 95
+------------
+  * Minimum supported iOS raised from 8 to 11. Skia may build back to iOS 9 but versions older
+    than 11 are not tested. Community contributions to support versions 9 and 10 of iOS may be
+    considered, but they may not be complex as they cannot be tested.
+
+* * *
+
+Milestone 94
+------------
+  * Metal backend has been changed to track command buffer resources manually
+    rather than using retained resources.
+    https://review.skia.org/432878
+
+  * Added virtual onResetClip() to SkCanvas for Android Framework, to emulate the soon-to-be-removed
+    expanding clip ops guarded by SK_SUPPORT_DEPRECATED_CLIPOPS.
+    https://review.skia.org/430897
+
+  * Removed SK_SUPPORT_DEPRECATED_CLIPOPS build flag. Clips can only be intersect and difference.
+    https://review.skia.org/436565
+
+  * There is a new syntax for invoking (sampling) child effects in SkSL. Previously, children
+    (shaders, colorFilters, blenders) were invoked using different overloads of `sample`. That
+    syntax is deprecated (but still supported). Now, the child behaves like an object, with a method
+    name `eval`. The arguments to these `eval` methods are the same as the arguments in the old
+    `sample` intrinsics. For example:
+      // Old syntax:
+        sample(shader, xy)
+        sample(colorFilter, color)
+        sample(blender, srcColor, dstColor)
+      // New syntax:
+        shader.eval(xy)
+        colorFilter.eval(color)
+        blender.eval(srcColor, dstColor)
+    https://review.skia.org/444735
+
+* * *
+
 Milestone 93
 ------------
   * Removed SkPaint::getHash
diff --git a/third_party/skia/site/docs/user/sample/pdf.md b/third_party/skia/site/docs/user/sample/pdf.md
index 6b942e3a7eaa7..798d981fe630a 100644
--- a/third_party/skia/site/docs/user/sample/pdf.md
+++ b/third_party/skia/site/docs/user/sample/pdf.md
@@ -6,7 +6,7 @@ linkTitle: "Using Skia's PDF Backend"
 Here is an example of using Skia's PDF backend (SkPDF) via the SkDocument and
 SkCanvas APIs.
 
-<fiddle-embed name='@PDF'></fiddle-embed>
+<fiddle-embed-sk name='@PDF'></fiddle-embed-sk>
 
 <!-- https://fiddle.skia.org/c/@PDF docs/examples/PDF.cpp -->
 
diff --git a/third_party/skia/site/docs/user/sksl.md b/third_party/skia/site/docs/user/sksl.md
index 623b37db08d3e..ff5bd886612a8 100644
--- a/third_party/skia/site/docs/user/sksl.md
+++ b/third_party/skia/site/docs/user/sksl.md
@@ -41,6 +41,7 @@ example, it might include:
   below).
 - Blending code (for certain `SkBlendMode`s, or for custom blending specified
   with `SkPaint::setBlender`).
+- Color space conversion code, as part of Skia's [color management](/docs/user/color).
 
 Even if the `SkPaint` has a complex tree of objects in the `SkShader`,
 `SkColorFilter`, or `SkBlender` fields, there is still only a _single_ GPU
@@ -62,7 +63,7 @@ own shader code, you don't use `sample`. Instead, the `shader` object has a
 `.eval()` method. Regardless, Skia has simple methods for creating an `SkShader`
 from an `SkImage`, so it's easy to use images in your runtime effects:
 
-<fiddle-embed name='3654053c76b5c23f18eb9a1c82abbde4'></fiddle-embed>
+<fiddle-embed-sk name='a998917a6e0cdf5cb3a06fe9d9630af3'></fiddle-embed-sk>
 
 Because the object you bind and evaluate is an `SkShader`, you can directly use
 any Skia shader, without necessarily turning it into an image (texture) first.
@@ -71,12 +72,154 @@ texture created to hold the gradient. Skia generates a single fragment shader
 that computes the gradient color, samples from the image's texture, and then
 multiplies the two together:
 
-<fiddle-embed name='f282a4411782ed92057350e339586502'></fiddle-embed>
+<fiddle-embed-sk name='7085607d39028050efb91c0fe6131210'></fiddle-embed-sk>
 
 Of course, you can even invoke another runtime effect, allowing you to combine
 shader snippets dynamically:
 
-<fiddle-embed name='2151b061428f47844a2500b57c887ddf'></fiddle-embed>
+<fiddle-embed-sk name='d2648c424e41cdd700330b7196283766'></fiddle-embed-sk>
+
+---
+
+## Coordinate Spaces
+
+To understand how coordinates work in SkSL, you first need to understand
+[how they work in Skia](/docs/user/coordinates). If you're comfortable with
+Skia's coordinate spaces, then just remember that the coordinates supplied to
+your `main()` are **local** coordinates. They will be relative to the coordinate
+space of the `SkShader`. This will match the local space of the canvas and any
+`localMatrix` transformations. Additionally, if the shader is invoked by
+another, that parent shader may modify them arbitrarily.
+
+In addition, the `SkShader` produced from an `SkImage` does not use normalized
+coordinates (like a texture in GLSL). It uses `(0, 0)` in the upper-left corner,
+and `(w, h)` in the bottom-right corner. Normally, this is exactly what you
+want. If you're evaluating an `SkImageShader` with coordinates based on the ones
+passed to you, the scale is correct. However, if you want to adjust those
+coordinates (to do some kind of re-mapping of the image), remember that the
+coordinates are scaled up to the dimensions of the image:
+
+<fiddle-embed-sk name='30a9eb3750ceaa3b88342938ee353071'></fiddle-embed-sk>
+
+---
+
+## Color Spaces
+
+Applications using Skia are usually [color managed](/docs/user/color). The color
+space of a surface (destination) determines the working color space for a draw.
+Source content (like shaders, including `SkImageShader`) also have color spaces.
+By default, inputs to your SkSL shader will be transformed to the working color
+space. Some inputs require special care to get (or inhibit) this behavior, though.
+
+First, let's see Skia's color management in action. Here, we're drawing a portion
+of the mandrill image twice. The first time, we've drawn it normally, respecting
+the color space stored in the file (this happens to be the [sRGB](https://en.wikipedia.org/wiki/SRGB)
+color space. The second time, we've assigned the Rec. 2020 color space to the image.
+This simply tells Skia to treat the image as if the colors stored are actually in
+that color space. Skia then transforms those values from Rec. 2020 to the
+destination surface's color space (sRGB). As a result, all of the colors look more
+vivid. More importantly, if the image really *were* in some other color space, or
+if the destination surface were in some other color space, this automatic conversion
+is desirable, because it ensures content looks consistently correct on any user's
+screen.
+
+<fiddle-embed-sk name='555684b3908afcaaefd37d5f859ceb17'></fiddle-embed-sk>
+
+### Uniforms
+
+Skia and SkSL doesn't know if your `uniform` variables contain colors, so it won't
+automatically apply color conversion to them. In the below example, there are two
+uniforms declared: `color` and `not_a_color`. The SkSL simply fades in one of the
+two uniform "colors" horizontally, choosing a different uniform for the top and
+bottom half of the shader. The code passes the same values to both uniforms, four
+floating point values `{1,0,0,1}` that represent "red".
+
+To really see the effect of automatic uniform conversion, the fiddle draws to an
+offscreen surface in the [Rec. 2020](https://en.wikipedia.org/wiki/Rec._2020) color
+space. Rec. 2020 has a very _wide gamut_, which means that it can represent more
+vivid colors than the common default [sRGB](https://en.wikipedia.org/wiki/SRGB)
+color space. In particular, the purest red in sRGB is fairly dull compared to pure
+red in Rec. 2020.
+
+To understand what happens in this fiddle, we'll explain the steps for the two
+different cases. For the top half, we use `not_a_color`. Skia and SkSL don't know
+that you intend to use this as a color, so the raw floating point values you supply
+are fed directly to the SkSL shader. In other words - when the SkSL executes,
+`not_a_color` will contain `{1,0,0,1}`, regardless of the surface's color space.
+This produces the most vivid red possible in the destination's color space (which
+ends up looking like a very bright red in this case).
+
+For the bottom half, we have declared the uniform `color` with the special syntax
+`layout(color)`. That tells SkSL that this variable will be used as a color.
+`layout(color)` can only be used on uniform values that are `vec3` (i.e., RGB) or
+`vec4` (i.e., RGBA). In either case, the colors you supply when providing uniform data
+should be unpremultiplied sRGB colors. Those colors can include values outside of
+the range `[0,1]`, if you want to supply wide gamut colors. This is the same way
+that Skia accepts and stores colors on `SkPaint`. When the SkSL executes, Skia
+transforms the uniform value to the working color space. In this case, that means
+that `color` (which starts out as sRGB red) is turned into whatever values represent
+that same color in the Rec. 2020 color space.
+
+The overall effect here is to make the correctly labeled uniform much duller, but
+that is actually what you want when working with uniform colors. By labeling uniform
+colors this way, your source colors (that you place in uniforms) will represent the
+same, consistent color regardless of the color space of the destination surface.
+
+<fiddle-embed-sk name='4f9365db3b8a52f767c57484eb6cad29'></fiddle-embed-sk>
+
+### Raw Image Shaders
+
+Although most images contain colors that should be color managed, some images
+contain data that isn't actually colors. This includes images storing normals,
+material properties (e.g., roughness), heightmaps, or any other purely
+mathematical data that happens to be stored in an image. When using these kinds
+of images in SkSL, you probably want to use a *raw* image shader, created with
+`SkImage::makeRawShader`. These work like regular image shaders (including
+filtering and tiling), with a few major differences:
+  - No color space transformation is ever applied (the color space of the image
+    is ignored).
+  - Images with an alpha type of kUnpremul are **not** automatically premultiplied.
+  - Bicubic filtering is not supported. Requesting bicubic filtering when
+    calling `makeRawShader` will return `nullptr`.
+
+Here, we create an image holding a spherical normal map. Then we use that with
+a lighting shader to show what happens when rendering to a different color space.
+If we use a regular image shader, the normals will be treated as colors, and
+transformed to the working color space. This alters the normals, incorrectly.
+For the final draw, we use a raw image shader, which returns the original
+normals, ignoring the working color space.
+
+<fiddle-embed-sk name='d91814fd4dc87a46c0ab4a0587260718'></fiddle-embed-sk>
+
+### Working In a Known Color Space
+
+Within an SkSL shader, you don't know what the working color space is. For many
+effects, this is fine - evaluating image shaders, and doing simple color math
+is usually going to give reasonable results (particularly if you know that
+the working color space for an application is always sRGB, for example). For
+certain effects, though, it may be important to do some math in a fixed, known
+color space. The most common example is lighting -- to get physically accurate
+lighting, math should be done in a _linear_ color space. To help with this,
+SkSL provides two intrinsic functions:
+
+```
+vec3 toLinearSrgb(vec3 color);
+vec3 fromLinearSrgb(vec3 color);
+```
+
+These convert colors between the working color space and the linear sRGB color
+space. That space uses the sRGB color primaries (gamut), and a linear transfer
+function. It represents values outside of the sRGB gamut using extended range
+values (below 0.0 and above 1.0). This corresponds to Android's
+[LINEAR_EXTENDED_SRGB](https://developer.android.com/reference/android/graphics/ColorSpace.Named.html#LINEAR_EXTENDED_SRGB)
+or Apple's
+[extendedLinearSRGB](https://developer.apple.com/documentation/coregraphics/cgcolorspace/1690961-extendedlinearsrgb),
+for example.
+
+Here's an example showing a sphere, with lighting math being done in the default
+working space (sRGB), and again with the math done in a linear space:
+
+<fiddle-embed-sk name='9e52c269cf3d47e5957e74d21288dd59'></fiddle-embed-sk>
 
 ---
 
@@ -110,26 +253,4 @@ The image below demonstrates this: properly premultiplied colors produce a smoot
 gradient as alpha decreases. Unpremultipled colors cause the gradient to display
 incorrectly, becoming too bright and shifting hue as the alpha changes.
 
-<fiddle-embed name='4aa28e27a9682fec18d8c0ca265151ad'></fiddle-embed>
-
----
-
-## Coordinate Spaces
-
-To understand how coordinates work in SkSL, you first need to understand
-[how they work in Skia](/docs/user/coordinates). If you're comfortable with
-Skia's coordinate spaces, then just remember that the coordinates supplied to
-your `main()` are **local** coordinates. They will be relative to the coordinate
-space of the `SkShader`. This will match the local space of the canvas and any
-`localMatrix` transformations. Additionally, if the shader is invoked by
-another, that parent shader may modify them arbitrarily.
-
-In addition, the `SkShader` produced from an `SkImage` does not use normalized
-coordinates (like a texture in GLSL). It uses `(0, 0)` in the upper-left corner,
-and `(w, h)` in the bottom-right corner. Normally, this is exactly what you
-want. If you're evaluating an `SkImageShader` with coordinates based on the ones
-passed to you, the scale is correct. However, if you want to adjust those
-coordinates (to do some kind of re-mapping of the image), remember that the
-coordinates are scaled up to the dimensions of the image:
-
-<fiddle-embed name='ddbd4142c1c88232ae131d27266e72b3'></fiddle-embed>
+<fiddle-embed-sk name='91a25662aab86b212b946cb4df8b12ca'></fiddle-embed-sk>
diff --git a/third_party/skia/site/docs/user/tips.md b/third_party/skia/site/docs/user/tips.md
index 11faba9d62077..591428bd69092 100644
--- a/third_party/skia/site/docs/user/tips.md
+++ b/third_party/skia/site/docs/user/tips.md
@@ -97,29 +97,4 @@ to draw those glyphs.
 
 ## How do I add drop shadow on text?
 
-<!--?prettify lang=cc?-->
-
-    void draw(SkCanvas* canvas) {
-        const SkScalar sigma = 1.65f;
-        const SkScalar xDrop = 2.0f;
-        const SkScalar yDrop = 2.0f;
-        const SkScalar x = 8.0f;
-        const SkScalar y = 52.0f;
-        const SkScalar textSize = 48.0f;
-        const uint8_t blurAlpha = 127;
-        auto blob = SkTextBlob::MakeFromString("Skia", SkFont(nullptr, textSize));
-        SkPaint paint;
-        paint.setAntiAlias(true);
-        SkPaint blur(paint);
-        blur.setAlpha(blurAlpha);
-        blur.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, sigma, 0));
-        canvas->drawColor(SK_ColorWHITE);
-        canvas->drawTextBlob(blob.get(), x + xDrop, y + yDrop, blur);
-        canvas->drawTextBlob(blob.get(), x,         y,         paint);
-    }
-
-<a href='https://fiddle.skia.org/c/@text_shadow'><img src='https://fiddle.skia.org/i/@text_shadow_raster.png'></a>
-
----
-
-<div style="margin-bottom:99%"></div>
+<fiddle-embed-sk name='1ff4da09e515087f7011c7caec2e98ae'></fiddle-embed-sk>
diff --git a/third_party/skia/src/codec/BUILD.bazel b/third_party/skia/src/codec/BUILD.bazel
index 6a2d2e0f9f46a..a827417fcd02a 100644
--- a/third_party/skia/src/codec/BUILD.bazel
+++ b/third_party/skia/src/codec/BUILD.bazel
@@ -308,6 +308,7 @@ generated_cc_atom(
         ":SkHeifCodec_hdr",
         ":SkIcoCodec_hdr",
         ":SkJpegCodec_hdr",
+        ":SkJpegxlCodec_hdr",
         ":SkPngCodec_hdr",
         ":SkRawCodec_hdr",
         ":SkWbmpCodec_hdr",
@@ -847,7 +848,39 @@ generated_cc_atom(
         "//src/core:SkDraw_hdr",
         "//src/core:SkMatrixProvider_hdr",
         "//src/core:SkRasterClip_hdr",
+        "//src/core:SkStreamPriv_hdr",
         "//src/core:SkUtils_hdr",
         "//third_party:wuffs",
     ],
 )
+
+generated_cc_atom(
+    name = "SkJpegxlCodec_hdr",
+    hdrs = ["SkJpegxlCodec.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkScalingCodec_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkJpegxlCodec_src",
+    srcs = ["SkJpegxlCodec.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkFrameHolder_hdr",
+        ":SkJpegxlCodec_hdr",
+        ":SkSampler_hdr",
+        "//include/codec:SkEncodedOrigin_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkEncodedInfo_hdr",
+        "//include/private:SkTFitsIn_hdr",
+        "//include/private:SkTo_hdr",
+        "//jxl:decode_cxx_hdr",
+        "//jxl:decode_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/core:SkStreamPriv_hdr",
+    ],
+)
diff --git a/third_party/skia/src/codec/SkAndroidCodec.cpp b/third_party/skia/src/codec/SkAndroidCodec.cpp
index 0328a1f72bb26..17c4ff8350d8a 100644
--- a/third_party/skia/src/codec/SkAndroidCodec.cpp
+++ b/third_party/skia/src/codec/SkAndroidCodec.cpp
@@ -133,6 +133,8 @@ SkColorType SkAndroidCodec::computeOutputColorType(SkColorType requestedColorTyp
                 return kRGB_565_SkColorType;
             }
             break;
+        case kRGBA_1010102_SkColorType:
+            return kRGBA_1010102_SkColorType;
         case kRGBA_F16_SkColorType:
             return kRGBA_F16_SkColorType;
         default:
@@ -140,6 +142,9 @@ SkColorType SkAndroidCodec::computeOutputColorType(SkColorType requestedColorTyp
     }
 
     // F16 is the Android default for high precision images.
+    // TODO: b/217378990, b/217378477
+    // Check the bit-depth of the input source. For 10-bit color input sources, change
+    // default to kRGBA_1010102_SkColorType instead of kN32_SkColorType.
     return highPrecision ? kRGBA_F16_SkColorType : kN32_SkColorType;
 }
 
@@ -156,7 +161,8 @@ sk_sp<SkColorSpace> SkAndroidCodec::computeOutputColorSpace(SkColorType outputCo
         case kRGBA_F16_SkColorType:
         case kRGB_565_SkColorType:
         case kRGBA_8888_SkColorType:
-        case kBGRA_8888_SkColorType: {
+        case kBGRA_8888_SkColorType:
+        case kRGBA_1010102_SkColorType: {
             // If |prefColorSpace| is supplied, choose it.
             if (prefColorSpace) {
                 return prefColorSpace;
diff --git a/third_party/skia/src/codec/SkBmpRLECodec.cpp b/third_party/skia/src/codec/SkBmpRLECodec.cpp
index 2b40647e8ecd8..728a933707d6f 100644
--- a/third_party/skia/src/codec/SkBmpRLECodec.cpp
+++ b/third_party/skia/src/codec/SkBmpRLECodec.cpp
@@ -411,14 +411,11 @@ int SkBmpRLECodec::decodeRLE(const SkImageInfo& dstInfo, void* dst, size_t dstRo
                     uint8_t numPixels = task;
                     const size_t rowBytes = compute_row_bytes(numPixels,
                             this->bitsPerPixel());
-                    // Abort if setting numPixels moves us off the edge of the
-                    // image.
                     if (x + numPixels > width) {
                         SkCodecPrintf("Warning: invalid RLE input.\n");
-                        return y;
                     }
 
-                    // Also abort if there are not enough bytes
+                    // Abort if there are not enough bytes
                     // remaining in the stream to set numPixels.
 
                     // At most, alignedRowBytes can be 255 (max uint8_t) *
@@ -435,7 +432,7 @@ int SkBmpRLECodec::decodeRLE(const SkImageInfo& dstInfo, void* dst, size_t dstRo
                         }
                     }
                     // Set numPixels number of pixels
-                    while (numPixels > 0) {
+                    while ((numPixels > 0) && (x < width)) {
                         switch(this->bitsPerPixel()) {
                             case 4: {
                                 SkASSERT(fCurrRLEByte < fBytesBuffered);
diff --git a/third_party/skia/src/codec/SkCodec.cpp b/third_party/skia/src/codec/SkCodec.cpp
index cf1c5cd58fb81..f21b0dd69b178 100644
--- a/third_party/skia/src/codec/SkCodec.cpp
+++ b/third_party/skia/src/codec/SkCodec.cpp
@@ -31,6 +31,10 @@
 #include "src/codec/SkJpegCodec.h"
 #endif
 
+#ifdef SK_CODEC_DECODES_JPEGXL
+#include "src/codec/SkJpegxlCodec.h"
+#endif
+
 #ifdef SK_CODEC_DECODES_PNG
 #include "src/codec/SkIcoCodec.h"
 #include "src/codec/SkPngCodec.h"
@@ -73,6 +77,9 @@ static std::vector<DecoderProc>* decoders() {
     #endif
         { SkBmpCodec::IsBmp, SkBmpCodec::MakeFromStream },
         { SkWbmpCodec::IsWbmp, SkWbmpCodec::MakeFromStream },
+    #ifdef SK_CODEC_DECODES_JPEGXL
+        { SkJpegxlCodec::IsJpegxl, SkJpegxlCodec::MakeFromStream },
+    #endif
     };
     return decoders;
 }
@@ -135,29 +142,27 @@ std::unique_ptr<SkCodec> SkCodec::MakeFromStream(
 #ifdef SK_CODEC_DECODES_PNG
     if (SkPngCodec::IsPng(buffer, bytesRead)) {
         return SkPngCodec::MakeFromStream(std::move(stream), outResult, chunkReader);
-    } else
+    }
 #endif
-    {
-        for (DecoderProc proc : *decoders()) {
-            if (proc.IsFormat(buffer, bytesRead)) {
-                return proc.MakeFromStream(std::move(stream), outResult);
-            }
+
+    for (DecoderProc proc : *decoders()) {
+        if (proc.IsFormat(buffer, bytesRead)) {
+            return proc.MakeFromStream(std::move(stream), outResult);
         }
+    }
 
 #ifdef SK_HAS_HEIF_LIBRARY
-        SkEncodedImageFormat format;
-        if (SkHeifCodec::IsSupported(buffer, bytesRead, &format)) {
-            return SkHeifCodec::MakeFromStream(std::move(stream), selectionPolicy,
-                    format, outResult);
-        }
+    SkEncodedImageFormat format;
+    if (SkHeifCodec::IsSupported(buffer, bytesRead, &format)) {
+        return SkHeifCodec::MakeFromStream(std::move(stream), selectionPolicy,
+                format, outResult);
+    }
 #endif
 
 #ifdef SK_CODEC_DECODES_RAW
-        // Try to treat the input as RAW if all the other checks failed.
-        return SkRawCodec::MakeFromStream(std::move(stream), outResult);
-#endif
-    }
-
+    // Try to treat the input as RAW if all the other checks failed.
+    return SkRawCodec::MakeFromStream(std::move(stream), outResult);
+#else
     if (bytesRead < bytesToRead) {
         *outResult = kIncompleteInput;
     } else {
@@ -165,6 +170,7 @@ std::unique_ptr<SkCodec> SkCodec::MakeFromStream(
     }
 
     return nullptr;
+#endif
 }
 
 std::unique_ptr<SkCodec> SkCodec::MakeFromData(sk_sp<SkData> data, SkPngChunkReader* reader) {
@@ -190,6 +196,10 @@ SkCodec::SkCodec(SkEncodedInfo&& info, XformFormat srcFormat, std::unique_ptr<Sk
 
 SkCodec::~SkCodec() {}
 
+void SkCodec::setSrcXformFormat(XformFormat pixelFormat) {
+    fSrcXformFormat = pixelFormat;
+}
+
 bool SkCodec::queryYUVAInfo(const SkYUVAPixmapInfo::SupportedDataTypes& supportedDataTypes,
                             SkYUVAPixmapInfo* yuvaPixmapInfo) const {
     if (!yuvaPixmapInfo) {
diff --git a/third_party/skia/src/codec/SkCodecImageGenerator.cpp b/third_party/skia/src/codec/SkCodecImageGenerator.cpp
index 61fbd5d7ca9d1..33fd3fc8141eb 100644
--- a/third_party/skia/src/codec/SkCodecImageGenerator.cpp
+++ b/third_party/skia/src/codec/SkCodecImageGenerator.cpp
@@ -10,7 +10,7 @@
 #include "src/core/SkPixmapPriv.h"
 
 std::unique_ptr<SkImageGenerator> SkCodecImageGenerator::MakeFromEncodedCodec(
-        sk_sp<SkData> data, skstd::optional<SkAlphaType> at) {
+        sk_sp<SkData> data, std::optional<SkAlphaType> at) {
     auto codec = SkCodec::MakeFromData(data);
     if (nullptr == codec) {
         return nullptr;
@@ -22,11 +22,11 @@ std::unique_ptr<SkImageGenerator> SkCodecImageGenerator::MakeFromEncodedCodec(
 std::unique_ptr<SkImageGenerator> SkCodecImageGenerator::MakeFromCodec(
         std::unique_ptr<SkCodec> codec) {
     return codec ? std::unique_ptr<SkImageGenerator>(
-                           new SkCodecImageGenerator(std::move(codec), nullptr, skstd::nullopt))
+                           new SkCodecImageGenerator(std::move(codec), nullptr, std::nullopt))
                  : nullptr;
 }
 
-static SkImageInfo adjust_info(SkCodec* codec, skstd::optional<SkAlphaType> at) {
+static SkImageInfo adjust_info(SkCodec* codec, std::optional<SkAlphaType> at) {
     SkASSERT(at != kOpaque_SkAlphaType);
     SkImageInfo info = codec->getInfo();
     if (at.has_value()) {
@@ -44,7 +44,7 @@ static SkImageInfo adjust_info(SkCodec* codec, skstd::optional<SkAlphaType> at)
 
 SkCodecImageGenerator::SkCodecImageGenerator(std::unique_ptr<SkCodec> codec,
                                              sk_sp<SkData> data,
-                                             skstd::optional<SkAlphaType> at)
+                                             std::optional<SkAlphaType> at)
         : INHERITED(adjust_info(codec.get(), at))
         , fCodec(std::move(codec))
         , fData(std::move(data)) {}
diff --git a/third_party/skia/src/codec/SkCodecImageGenerator.h b/third_party/skia/src/codec/SkCodecImageGenerator.h
index 337d16cddc4d4..db08f3ec9c609 100644
--- a/third_party/skia/src/codec/SkCodecImageGenerator.h
+++ b/third_party/skia/src/codec/SkCodecImageGenerator.h
@@ -10,7 +10,8 @@
 #include "include/codec/SkCodec.h"
 #include "include/core/SkData.h"
 #include "include/core/SkImageGenerator.h"
-#include "include/private/SkTOptional.h"
+
+#include <optional>
 
 class SkCodecImageGenerator : public SkImageGenerator {
 public:
@@ -19,7 +20,7 @@ class SkCodecImageGenerator : public SkImageGenerator {
      * return an SkCodecImageGenerator.  Otherwise return nullptr.
      */
     static std::unique_ptr<SkImageGenerator> MakeFromEncodedCodec(
-            sk_sp<SkData>, skstd::optional<SkAlphaType> = skstd::nullopt);
+            sk_sp<SkData>, std::optional<SkAlphaType> = std::nullopt);
 
     static std::unique_ptr<SkImageGenerator> MakeFromCodec(std::unique_ptr<SkCodec>);
 
@@ -109,7 +110,7 @@ class SkCodecImageGenerator : public SkImageGenerator {
     /*
      * Takes ownership of codec
      */
-    SkCodecImageGenerator(std::unique_ptr<SkCodec>, sk_sp<SkData>, skstd::optional<SkAlphaType>);
+    SkCodecImageGenerator(std::unique_ptr<SkCodec>, sk_sp<SkData>, std::optional<SkAlphaType>);
 
     std::unique_ptr<SkCodec> fCodec;
     sk_sp<SkData> fData;
diff --git a/third_party/skia/src/codec/SkHeifCodec.cpp b/third_party/skia/src/codec/SkHeifCodec.cpp
index 2a162e8409d0e..78339d3a2b062 100644
--- a/third_party/skia/src/codec/SkHeifCodec.cpp
+++ b/third_party/skia/src/codec/SkHeifCodec.cpp
@@ -214,20 +214,28 @@ bool SkHeifCodec::conversionSupported(const SkImageInfo& dstInfo, bool srcIsOpaq
 
     switch (dstInfo.colorType()) {
         case kRGBA_8888_SkColorType:
+            this->setSrcXformFormat(skcms_PixelFormat_RGBA_8888);
             return fHeifDecoder->setOutputColor(kHeifColorFormat_RGBA_8888);
 
         case kBGRA_8888_SkColorType:
+            this->setSrcXformFormat(skcms_PixelFormat_RGBA_8888);
             return fHeifDecoder->setOutputColor(kHeifColorFormat_BGRA_8888);
 
         case kRGB_565_SkColorType:
+            this->setSrcXformFormat(skcms_PixelFormat_RGBA_8888);
             if (needsColorXform) {
                 return fHeifDecoder->setOutputColor(kHeifColorFormat_RGBA_8888);
             } else {
                 return fHeifDecoder->setOutputColor(kHeifColorFormat_RGB565);
             }
 
+        case kRGBA_1010102_SkColorType:
+            this->setSrcXformFormat(skcms_PixelFormat_RGBA_1010102);
+            return fHeifDecoder->setOutputColor(kHeifColorFormat_RGBA_1010102);
+
         case kRGBA_F16_SkColorType:
             SkASSERT(needsColorXform);
+            this->setSrcXformFormat(skcms_PixelFormat_RGBA_8888);
             return fHeifDecoder->setOutputColor(kHeifColorFormat_RGBA_8888);
 
         default:
@@ -426,8 +434,12 @@ void SkHeifCodec::initializeSwizzler(
         const SkImageInfo& dstInfo, const Options& options) {
     SkImageInfo swizzlerDstInfo = dstInfo;
     if (this->colorXform()) {
-        // The color xform will be expecting RGBA 8888 input.
-        swizzlerDstInfo = swizzlerDstInfo.makeColorType(kRGBA_8888_SkColorType);
+        // Aligned with conversionSupported()
+        if (dstInfo.colorType() == kRGBA_1010102_SkColorType) {
+            swizzlerDstInfo = swizzlerDstInfo.makeColorType(kRGBA_1010102_SkColorType);
+        } else {
+            swizzlerDstInfo = swizzlerDstInfo.makeColorType(kRGBA_8888_SkColorType);
+        }
     }
 
     int srcBPP = 4;
diff --git a/third_party/skia/src/codec/SkJpegCodec.cpp b/third_party/skia/src/codec/SkJpegCodec.cpp
index 04b78b4b6ea0f..54e39893d8d73 100644
--- a/third_party/skia/src/codec/SkJpegCodec.cpp
+++ b/third_party/skia/src/codec/SkJpegCodec.cpp
@@ -21,6 +21,8 @@
 #include <stdio.h>
 #include "src/codec/SkJpegUtility.h"
 
+#ifdef SK_CODEC_DECODES_JPEG
+
 // This warning triggers false postives way too often in here.
 #if defined(__GNUC__) && !defined(__clang__)
     #pragma GCC diagnostic ignored "-Wclobbered"
@@ -995,3 +997,5 @@ bool SkGetJpegInfo(const void* data, size_t len,
     }
     return true;
 }
+
+#endif // SK_CODEC_DECODES_JPEG
diff --git a/third_party/skia/src/codec/SkJpegxlCodec.cpp b/third_party/skia/src/codec/SkJpegxlCodec.cpp
new file mode 100644
index 0000000000000..d0dda17b2c696
--- /dev/null
+++ b/third_party/skia/src/codec/SkJpegxlCodec.cpp
@@ -0,0 +1,453 @@
+/*
+ * Copyright 2021 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/codec/SkJpegxlCodec.h"
+
+#include <limits>
+#include <vector>
+
+#include "include/codec/SkEncodedOrigin.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkEncodedInfo.h"
+#include "include/private/SkTFitsIn.h"
+#include "include/private/SkTo.h"
+#include "jxl/decode.h"
+#include "jxl/decode_cxx.h"
+#include "src/codec/SkFrameHolder.h"
+#include "src/codec/SkSampler.h"
+#include "src/core/SkOpts.h"
+#include "src/core/SkStreamPriv.h"
+
+namespace {
+
+class Frame : public SkFrame {
+public:
+    explicit Frame(int i, SkEncodedInfo::Alpha alpha) : INHERITED(i), fReportedAlpha(alpha) {}
+    SkEncodedInfo::Alpha onReportedAlpha() const override { return fReportedAlpha; }
+
+private:
+    const SkEncodedInfo::Alpha fReportedAlpha;
+
+    using INHERITED = SkFrame;
+};
+
+}  // namespace
+
+bool SkJpegxlCodec::IsJpegxl(const void* buffer, size_t bytesRead) {
+    JxlSignature result = JxlSignatureCheck(reinterpret_cast<const uint8_t*>(buffer), bytesRead);
+    return (result == JXL_SIG_CODESTREAM) || (result == JXL_SIG_CONTAINER);
+}
+
+class SkJpegxlCodecPriv : public SkFrameHolder {
+public:
+    SkJpegxlCodecPriv() : fDecoder(JxlDecoderMake(/* memory_manager= */ nullptr)) {}
+    JxlDecoderPtr fDecoder;  // unique_ptr with custom destructor
+    JxlBasicInfo fInfo;
+    bool fSeenAllFrames = false;
+    std::vector<Frame> fFrames;
+    int fLastProcessedFrame = SkCodec::kNoFrame;
+    void* fDst;
+    size_t fPixelShift;
+    size_t fRowBytes;
+    SkColorType fDstColorType;
+
+protected:
+    const SkFrame* onGetFrame(int i) const override {
+        SkASSERT(i >= 0 && static_cast<size_t>(i) < fFrames.size());
+        return static_cast<const SkFrame*>(&fFrames[i]);
+    }
+};
+
+SkJpegxlCodec::SkJpegxlCodec(std::unique_ptr<SkJpegxlCodecPriv> codec,
+                             SkEncodedInfo&& info,
+                             std::unique_ptr<SkStream> stream,
+                             sk_sp<SkData> data)
+        : INHERITED(std::move(info), skcms_PixelFormat_RGBA_16161616LE, std::move(stream))
+        , fCodec(std::move(codec))
+        , fData(std::move(data)) {}
+
+std::unique_ptr<SkCodec> SkJpegxlCodec::MakeFromStream(std::unique_ptr<SkStream> stream,
+                                                       Result* result) {
+    *result = kInternalError;
+    // Either wrap or copy stream data.
+    sk_sp<SkData> data = nullptr;
+    if (stream->getMemoryBase()) {
+        data = SkData::MakeWithoutCopy(stream->getMemoryBase(), stream->getLength());
+    } else {
+        data = SkCopyStreamToData(stream.get());
+        // Data is copied; stream can be released now.
+        stream.reset(nullptr);
+    }
+
+    auto priv = std::make_unique<SkJpegxlCodecPriv>();
+    JxlDecoder* dec = priv->fDecoder.get();
+
+    // Only query metadata this time.
+    auto status = JxlDecoderSubscribeEvents(dec, JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING);
+    if (status != JXL_DEC_SUCCESS) {
+        // Fresh instance must accept request for subscription.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return nullptr;
+    }
+
+    status = JxlDecoderSetInput(dec, data->bytes(), data->size());
+    if (status != JXL_DEC_SUCCESS) {
+        // Fresh instance must accept first chunk of input.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return nullptr;
+    }
+
+    status = JxlDecoderProcessInput(dec);
+    if (status == JXL_DEC_NEED_MORE_INPUT) {
+        *result = kIncompleteInput;
+        return nullptr;
+    }
+    if (status != JXL_DEC_BASIC_INFO) {
+        *result = kInvalidInput;
+        return nullptr;
+    }
+    JxlBasicInfo& info = priv->fInfo;
+    status = JxlDecoderGetBasicInfo(dec, &info);
+    if (status != JXL_DEC_SUCCESS) {
+        // Current event is "JXL_DEC_BASIC_INFO" -> can't fail.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return nullptr;
+    }
+
+    // Check that image dimensions are not too large.
+    if (!SkTFitsIn<int32_t>(info.xsize) || !SkTFitsIn<int32_t>(info.ysize)) {
+        *result = kInvalidInput;
+        return nullptr;
+    }
+    int32_t width = SkTo<int32_t>(info.xsize);
+    int32_t height = SkTo<int32_t>(info.ysize);
+
+    bool hasAlpha = (info.alpha_bits != 0);
+    bool isGray = (info.num_color_channels == 1);
+    SkEncodedInfo::Alpha alpha =
+            hasAlpha ? SkEncodedInfo::kUnpremul_Alpha : SkEncodedInfo::kOpaque_Alpha;
+    SkEncodedInfo::Color color;
+    if (hasAlpha) {
+        color = isGray ? SkEncodedInfo::kGrayAlpha_Color : SkEncodedInfo::kRGBA_Color;
+    } else {
+        color = isGray ? SkEncodedInfo::kGray_Color : SkEncodedInfo::kRGB_Color;
+    }
+
+    status = JxlDecoderProcessInput(dec);
+    if (status != JXL_DEC_COLOR_ENCODING) {
+        *result = kInvalidInput;
+        return nullptr;
+    }
+
+    size_t iccSize = 0;
+    // TODO(eustas): format field is currently ignored by decoder.
+    status = JxlDecoderGetICCProfileSize(
+        dec, /* format = */ nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize);
+    if (status != JXL_DEC_SUCCESS) {
+        // Likely incompatible colorspace.
+        iccSize = 0;
+    }
+    std::unique_ptr<SkEncodedInfo::ICCProfile> profile = nullptr;
+    if (iccSize) {
+        auto icc = SkData::MakeUninitialized(iccSize);
+        // TODO(eustas): format field is currently ignored by decoder.
+        status = JxlDecoderGetColorAsICCProfile(dec,
+                                                /* format = */ nullptr,
+                                                JXL_COLOR_PROFILE_TARGET_DATA,
+                                                reinterpret_cast<uint8_t*>(icc->writable_data()),
+                                                iccSize);
+        if (status != JXL_DEC_SUCCESS) {
+            // Current event is JXL_DEC_COLOR_ENCODING -> can't fail.
+            SkDEBUGFAIL("libjxl returned unexpected status");
+            return nullptr;
+        }
+        profile = SkEncodedInfo::ICCProfile::Make(std::move(icc));
+    }
+
+    int bitsPerChannel = 16;
+
+    *result = kSuccess;
+    SkEncodedInfo encodedInfo =
+            SkEncodedInfo::Make(width, height, color, alpha, bitsPerChannel, std::move(profile));
+
+    return std::unique_ptr<SkCodec>(new SkJpegxlCodec(
+            std::move(priv), std::move(encodedInfo), std::move(stream), std::move(data)));
+}
+
+SkCodec::Result SkJpegxlCodec::onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t rowBytes,
+                                           const Options& options, int* rowsDecodedPtr) {
+    // TODO(eustas): implement
+    if (options.fSubset) {
+        return kUnimplemented;
+    }
+    auto& codec = *fCodec.get();
+    const int index = options.fFrameIndex;
+    SkASSERT(0 == index || static_cast<size_t>(index) < codec.fFrames.size());
+    auto* dec = codec.fDecoder.get();
+    JxlDecoderStatus status;
+
+    if ((codec.fLastProcessedFrame >= index) || (codec.fLastProcessedFrame = SkCodec::kNoFrame)) {
+        codec.fLastProcessedFrame = SkCodec::kNoFrame;
+        JxlDecoderRewind(dec);
+        status = JxlDecoderSubscribeEvents(dec, JXL_DEC_FRAME | JXL_DEC_FULL_IMAGE);
+        if (status != JXL_DEC_SUCCESS) {
+            // Fresh decoder instance (after rewind) must accept subscription request.
+            SkDEBUGFAIL("libjxl returned unexpected status");
+            return kInternalError;
+        }
+        status = JxlDecoderSetInput(dec, fData->bytes(), fData->size());
+        if (status != JXL_DEC_SUCCESS) {
+            // Fresh decoder instance (after rewind) must accept first data chunk.
+            SkDEBUGFAIL("libjxl returned unexpected status");
+            return kInternalError;
+        }
+        SkASSERT(codec.fLastProcessedFrame + 1 == 0);
+    }
+
+    int nextFrame = codec.fLastProcessedFrame + 1;
+    if (nextFrame < index) {
+        JxlDecoderSkipFrames(dec, index - nextFrame);
+    }
+
+    // Decode till the frame start.
+    status = JxlDecoderProcessInput(dec);
+    // TODO(eustas): actually, frame is not completely processed; for streaming / partial decoding
+    //               we should also add a flag that "last processed frame" is still incomplete, and
+    //               flip that flag when frame decoding is over.
+    codec.fLastProcessedFrame = index;
+    if (status != JXL_DEC_FRAME) {
+        // TODO(eustas): check status: it might be either corrupted or incomplete input.
+        return kInternalError;
+    }
+
+    codec.fDst = dst;
+    codec.fRowBytes = rowBytes;
+
+    // TODO(eustas): consider grayscale.
+    uint32_t numColorChannels = 3;
+    // TODO(eustas): consider no-alpha.
+    uint32_t numAlphaChannels = 1;
+    // NB: SKIA works with little-endian F16s.
+    auto endianness = JXL_LITTLE_ENDIAN;
+
+    // Internally JXL does most processing in floats. By "default" we request
+    // output data type to be U8; it takes less memory, but results in some precision loss.
+    //  We request F16 in two cases:
+    //  - destination type is F16
+    //  - color transformation is required; in this case values are remapped,
+    //    and with 8-bit precision it is likely that visual artefact will appear
+    //    (like banding, etc.)
+    bool halfFloatOutput = false;
+    if (fCodec->fDstColorType == kRGBA_F16_SkColorType) halfFloatOutput = true;
+    if (colorXform()) halfFloatOutput = true;
+    auto dataType = halfFloatOutput ? JXL_TYPE_FLOAT16 : JXL_TYPE_UINT8;
+
+    JxlPixelFormat format =
+        {numColorChannels + numAlphaChannels, dataType, endianness, /* align = */ 0};
+    status = JxlDecoderSetImageOutCallback(dec, &format, SkJpegxlCodec::imageOutCallback, this);
+    if (status != JXL_DEC_SUCCESS) {
+        // Current event is JXL_DEC_FRAME -> decoder must accept callback.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return kInternalError;
+    }
+
+    // Decode till the frame start.
+    status = JxlDecoderProcessInput(dec);
+    if (status != JXL_DEC_FULL_IMAGE) {
+        // TODO(eustas): check status: it might be either corrupted or incomplete input.
+        return kInternalError;
+    }
+    // TODO(eustas): currently it is supposed that complete input is accessible;
+    //               when streaming support is added JXL_DEC_NEED_MORE_INPUT would also
+    //               become a legal outcome; amount of decoded scanlines should be calculated
+    //               based on callback invocations / render-pipeline API.
+    *rowsDecodedPtr = dstInfo.height();
+
+    return kSuccess;
+}
+
+bool SkJpegxlCodec::onRewind() {
+    JxlDecoderRewind(fCodec->fDecoder.get());
+    return true;
+}
+
+bool SkJpegxlCodec::conversionSupported(const SkImageInfo& dstInfo, bool srcIsOpaque,
+                                        bool needsColorXform) {
+    fCodec->fDstColorType = dstInfo.colorType();
+    switch (dstInfo.colorType()) {
+        case kRGBA_8888_SkColorType:
+            return true;  // memcpy
+        case kBGRA_8888_SkColorType:
+            return true;  // rgba->bgra
+
+        case kRGBA_F16_SkColorType:
+            SkASSERT(needsColorXform);  // TODO(eustas): not necessary for JXL.
+            return true;  // memcpy
+
+        // TODO(eustas): implement
+        case kRGB_565_SkColorType:
+            return false;
+        case kGray_8_SkColorType:
+            return false;
+        case kAlpha_8_SkColorType:
+            return false;
+
+        default:
+            return false;
+    }
+    return true;
+}
+
+void SkJpegxlCodec::imageOutCallback(void* opaque, size_t x, size_t y,
+                                     size_t num_pixels, const void* pixels) {
+    SkJpegxlCodec* instance = reinterpret_cast<SkJpegxlCodec*>(opaque);
+    auto& codec = *instance->fCodec.get();
+    size_t offset = y * codec.fRowBytes + (x << codec.fPixelShift);
+    void* dst = SkTAddOffset<void>(codec.fDst, offset);
+    if (instance->colorXform()) {
+        instance->applyColorXform(dst, pixels, num_pixels);
+        return;
+    }
+    switch (codec.fDstColorType) {
+        case kRGBA_8888_SkColorType:
+            memcpy(dst, pixels, 4 * num_pixels);
+            return;
+        case kBGRA_8888_SkColorType:
+            SkOpts::RGBA_to_bgrA((uint32_t*) dst, (const uint32_t*)(pixels), num_pixels);
+            return;
+        case kRGBA_F16_SkColorType:
+            memcpy(dst, pixels, 8 * num_pixels);
+            return;
+        default:
+            SK_ABORT("Selected output format is not supported yet");
+            return;
+    }
+}
+
+bool SkJpegxlCodec::scanFrames() {
+    auto decoder = JxlDecoderMake(/* memory_manager = */ nullptr);
+    JxlDecoder* dec = decoder.get();
+    auto* frameHolder = fCodec.get();
+    auto& frames = frameHolder->fFrames;
+    const auto& info = fCodec->fInfo;
+    frames.clear();
+
+    auto alpha = (info.alpha_bits != 0) ? SkEncodedInfo::Alpha::kUnpremul_Alpha
+                                        : SkEncodedInfo::Alpha::kOpaque_Alpha;
+
+    auto status = JxlDecoderSubscribeEvents(dec, JXL_DEC_FRAME);
+    if (status != JXL_DEC_SUCCESS) {
+        // Fresh instance must accept request for subscription.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return true;
+    }
+
+    status = JxlDecoderSetInput(dec, fData->bytes(), fData->size());
+    if (status != JXL_DEC_SUCCESS) {
+        // Fresh instance must accept first input chunk.
+        SkDEBUGFAIL("libjxl returned unexpected status");
+        return true;
+    }
+
+    while (true) {
+        status = JxlDecoderProcessInput(dec);
+        switch (status) {
+            case JXL_DEC_FRAME: {
+                size_t frameId = frames.size();
+                JxlFrameHeader frameHeader;
+                if (JxlDecoderGetFrameHeader(dec, &frameHeader) != JXL_DEC_SUCCESS) {
+                    return true;
+                }
+                frames.emplace_back(static_cast<int>(frameId), alpha);
+                auto& frame = frames.back();
+                // TODO(eustas): for better consistency we need to track total duration and report
+                //               frame duration as delta to previous frame.
+                int duration = (1000 * frameHeader.duration * info.animation.tps_denominator) /
+                               info.animation.tps_numerator;
+                frame.setDuration(duration);
+                frameHolder->setAlphaAndRequiredFrame(&frame);
+                break;
+            }
+            case JXL_DEC_SUCCESS: {
+                return true;
+            }
+            default: {
+                return false;
+            }
+        }
+    }
+}
+
+int SkJpegxlCodec::onGetFrameCount() {
+    if (!fCodec->fInfo.have_animation) {
+        return 1;
+    }
+
+    if (!fCodec->fSeenAllFrames) {
+        fCodec->fSeenAllFrames = scanFrames();
+    }
+
+    return fCodec->fFrames.size();
+}
+
+bool SkJpegxlCodec::onGetFrameInfo(int index, FrameInfo* frameInfo) const {
+    if (index < 0) {
+        return false;
+    }
+    if (static_cast<size_t>(index) >= fCodec->fFrames.size()) {
+        return false;
+    }
+    fCodec->fFrames[index].fillIn(frameInfo, true);
+    return true;
+}
+
+int SkJpegxlCodec::onGetRepetitionCount() {
+    JxlBasicInfo& info = fCodec->fInfo;
+    if (!info.have_animation) {
+        return 0;
+    }
+
+    if (info.animation.num_loops == 0) {
+        return kRepetitionCountInfinite;
+    }
+
+    if (SkTFitsIn<int>(info.animation.num_loops)) {
+        return info.animation.num_loops - 1;
+    }
+
+    // Largest "non-infinite" value.
+    return std::numeric_limits<int>::max();
+}
+
+const SkFrameHolder* SkJpegxlCodec::getFrameHolder() const {
+    return fCodec.get();
+}
+
+// TODO(eustas): implement
+// SkCodec::Result SkJpegxlCodec::onStartScanlineDecode(
+//     const SkImageInfo& /*dstInfo*/, const Options& /*options*/) { return kUnimplemented; }
+
+// TODO(eustas): implement
+// SkCodec::Result SkJpegxlCodec::onStartIncrementalDecode(
+//     const SkImageInfo& /*dstInfo*/, void*, size_t, const Options&) { return kUnimplemented; }
+
+// TODO(eustas): implement
+// SkCodec::Result SkJpegxlCodec::onIncrementalDecode(int*) { return kUnimplemented; }
+
+// TODO(eustas): implement
+// bool SkJpegxlCodec::onSkipScanlines(int /*countLines*/) { return false; }
+
+// TODO(eustas): implement
+// int SkJpegxlCodec::onGetScanlines(
+//     void* /*dst*/, int /*countLines*/, size_t /*rowBytes*/) { return 0; }
+
+// TODO(eustas): implement
+// SkSampler* SkJpegxlCodec::getSampler(bool /*createIfNecessary*/) { return nullptr; }
diff --git a/third_party/skia/src/codec/SkJpegxlCodec.h b/third_party/skia/src/codec/SkJpegxlCodec.h
new file mode 100644
index 0000000000000..11de17e53fb76
--- /dev/null
+++ b/third_party/skia/src/codec/SkJpegxlCodec.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2021 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkJpegxlCodec_DEFINED
+#define SkJpegxlCodec_DEFINED
+
+#include <memory>
+
+#include "src/codec/SkScalingCodec.h"
+
+enum class SkEncodedImageFormat;
+struct SkEncodedInfo;
+enum SkEncodedOrigin;
+class SkFrameHolder;
+struct SkImageInfo;
+class SkJpegxlCodecPriv;
+class SkSampler;
+class SkStream;
+
+/*
+ *
+ * This class implements the decoding for jpegxl images
+ *
+ */
+class SkJpegxlCodec : public SkScalingCodec {
+public:
+    static bool IsJpegxl(const void*, size_t);
+
+    /*
+     * Assumes IsJpegxl was called and returned true
+     * Takes ownership of the stream
+     */
+    static std::unique_ptr<SkCodec> MakeFromStream(std::unique_ptr<SkStream>, Result*);
+
+protected:
+    /* TODO(eustas): implement when downscaling is supported. */
+    /* SkISize onGetScaledDimensions(float desiredScale) const override; */
+
+    /* TODO(eustas): implement when up-/down-scaling is supported. */
+    /* bool onDimensionsSupported(const SkISize&) override; */
+
+    SkEncodedImageFormat onGetEncodedFormat() const override {
+        return SkEncodedImageFormat::kJPEGXL;
+    }
+
+    Result onGetPixels(const SkImageInfo& dstInfo, void* dst, size_t rowBytes,
+                       const Options& options, int* rowsDecodedPtr) override;
+
+    /* TODO(eustas): add support for transcoded JPEG images? */
+    /* bool onQueryYUVAInfo(const SkYUVAPixmapInfo::SupportedDataTypes&,
+                            SkYUVAPixmapInfo*) const override; */
+
+    /* TODO(eustas): add support for transcoded JPEG images? */
+    /* Result onGetYUVAPlanes(const SkYUVAPixmaps& yuvaPixmaps) override; */
+
+    /* TODO(eustas): implement when cropped output is supported. */
+    /* bool onGetValidSubset(SkIRect* desiredSubset) const override; */
+
+    bool onRewind() override;
+
+    /* TODO(eustas): top-down by default; do we need something else? */
+    /* SkScanlineOrder onGetScanlineOrder() const override; */
+    /* int onOutputScanline(int inputScanline) const override; */
+
+    bool conversionSupported(const SkImageInfo&, bool, bool) override;
+
+    int onGetFrameCount() override;
+
+    bool onGetFrameInfo(int, FrameInfo*) const override;
+
+    int onGetRepetitionCount() override;
+
+private:
+    const SkFrameHolder* getFrameHolder() const override;
+
+    // Result onStartScanlineDecode(
+    //    const SkImageInfo& /*dstInfo*/, const Options& /*options*/) override;
+    // Result onStartIncrementalDecode(
+    //     const SkImageInfo& /*dstInfo*/, void*, size_t, const Options&) override;
+    // Result onIncrementalDecode(int*) override;
+    // bool onSkipScanlines(int /*countLines*/) override;
+    // int onGetScanlines(void* /*dst*/, int /*countLines*/, size_t /*rowBytes*/) override;
+    // SkSampler* getSampler(bool /*createIfNecessary*/) override;
+
+    // Opaque codec implementation for lightweight header file.
+    std::unique_ptr<SkJpegxlCodecPriv> fCodec;
+    sk_sp<SkData> fData;
+
+    bool scanFrames();
+    static void imageOutCallback(
+        void* opaque, size_t x, size_t y, size_t num_pixels, const void* pixels);
+
+    SkJpegxlCodec(std::unique_ptr<SkJpegxlCodecPriv> codec,
+                  SkEncodedInfo&& info,
+                  std::unique_ptr<SkStream> stream,
+                  sk_sp<SkData> data);
+
+    using INHERITED = SkScalingCodec;
+};
+
+#endif
diff --git a/third_party/skia/src/codec/SkRawCodec.cpp b/third_party/skia/src/codec/SkRawCodec.cpp
index c1eb6ad2e2d33..c0893d5d84c4a 100644
--- a/third_party/skia/src/codec/SkRawCodec.cpp
+++ b/third_party/skia/src/codec/SkRawCodec.cpp
@@ -440,12 +440,13 @@ class SkDngImage {
         // We just pretend all streams are invalid. Our AFL-fuzzer
         // should still exercise this code; it's more resistant to OOM.
         return nullptr;
-#endif
+#else
         if (!dngImage->initFromPiex() && !dngImage->readDng()) {
             return nullptr;
         }
 
         return dngImage.release();
+#endif
     }
 
     /*
diff --git a/third_party/skia/src/codec/SkStubHeifDecoderAPI.h b/third_party/skia/src/codec/SkStubHeifDecoderAPI.h
index 413ec6280034a..bcacc3054f227 100644
--- a/third_party/skia/src/codec/SkStubHeifDecoderAPI.h
+++ b/third_party/skia/src/codec/SkStubHeifDecoderAPI.h
@@ -19,6 +19,7 @@ enum HeifColorFormat {
     kHeifColorFormat_RGB565,
     kHeifColorFormat_RGBA_8888,
     kHeifColorFormat_BGRA_8888,
+    kHeifColorFormat_RGBA_1010102,
 };
 
 struct HeifStream {
diff --git a/third_party/skia/src/codec/SkSwizzler.cpp b/third_party/skia/src/codec/SkSwizzler.cpp
index e29c41428bfd3..ac2bfc026e5bf 100644
--- a/third_party/skia/src/codec/SkSwizzler.cpp
+++ b/third_party/skia/src/codec/SkSwizzler.cpp
@@ -789,6 +789,7 @@ std::unique_ptr<SkSwizzler> SkSwizzler::MakeSimple(int srcBPP, const SkImageInfo
             break;
         case 4:     // kRGBA_8888_SkColorType
                     // kBGRA_8888_SkColorType
+                    // kRGBA_1010102_SkColorType
             proc = &sample4;
             break;
         case 6:     // 16 bit PNG no alpha
diff --git a/third_party/skia/src/codec/SkWuffsCodec.cpp b/third_party/skia/src/codec/SkWuffsCodec.cpp
index 5c28ed180dba2..1e1e139354275 100644
--- a/third_party/skia/src/codec/SkWuffsCodec.cpp
+++ b/third_party/skia/src/codec/SkWuffsCodec.cpp
@@ -17,6 +17,7 @@
 #include "src/core/SkDraw.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/core/SkRasterClip.h"
+#include "src/core/SkStreamPriv.h"
 #include "src/core/SkUtils.h"
 
 #include <limits.h>
@@ -204,13 +205,6 @@ class SkWuffsCodec final : public SkScalingCodec {
     const SkWuffsFrame* frame(int i) const;
 
 private:
-    // TODO: delete this enum and all of the "which" function arguments. The
-    // "array of 1 Foo" typed fields can also simplify to "Foo".
-    enum WhichDecoder {
-        kIncrDecode,
-        kNumDecoders,
-    };
-
     // SkCodec overrides.
     SkEncodedImageFormat onGetEncodedFormat() const override;
     Result onGetPixels(const SkImageInfo&, void*, size_t, const Options&, int*) override;
@@ -247,21 +241,21 @@ class SkWuffsCodec final : public SkScalingCodec {
     Result onIncrementalDecodeTwoPass();
 
     void        onGetFrameCountInternal();
-    Result      seekFrame(WhichDecoder which, int frameIndex);
-    Result      resetDecoder(WhichDecoder which);
-    const char* decodeFrameConfig(WhichDecoder which);
-    const char* decodeFrame(WhichDecoder which);
-    void        updateNumFullyReceivedFrames(WhichDecoder which);
+    Result      seekFrame(int frameIndex);
+    Result      resetDecoder();
+    const char* decodeFrameConfig();
+    const char* decodeFrame();
+    void        updateNumFullyReceivedFrames();
 
     SkWuffsFrameHolder                           fFrameHolder;
     std::unique_ptr<SkStream>                    fStream;
     std::unique_ptr<uint8_t, decltype(&sk_free)> fWorkbufPtr;
     size_t                                       fWorkbufLen;
 
-    std::unique_ptr<wuffs_gif__decoder, decltype(&sk_free)> fDecoders[WhichDecoder::kNumDecoders];
+    std::unique_ptr<wuffs_gif__decoder, decltype(&sk_free)> fDecoder;
 
     const uint64_t           fFirstFrameIOPosition;
-    wuffs_base__frame_config fFrameConfigs[WhichDecoder::kNumDecoders];
+    wuffs_base__frame_config fFrameConfig;
     wuffs_base__pixel_config fPixelConfig;
     wuffs_base__pixel_buffer fPixelBuffer;
     wuffs_base__io_buffer    fIOBuffer;
@@ -281,17 +275,17 @@ class SkWuffsCodec final : public SkScalingCodec {
     std::vector<SkWuffsFrame> fFrames;
     bool                      fFramesComplete;
 
-    // If calling an fDecoders[which] method returns an incomplete status, then
-    // fDecoders[which] is suspended in a coroutine (i.e. waiting on I/O or
-    // halted on a non-recoverable error). To keep its internal proof-of-safety
-    // invariants consistent, there's only two things you can safely do with a
-    // suspended Wuffs object: resume the coroutine, or reset all state (memset
-    // to zero and start again).
+    // If calling an fDecoder method returns an incomplete status, then
+    // fDecoder is suspended in a coroutine (i.e. waiting on I/O or halted on a
+    // non-recoverable error). To keep its internal proof-of-safety invariants
+    // consistent, there's only two things you can safely do with a suspended
+    // Wuffs object: resume the coroutine, or reset all state (memset to zero
+    // and start again).
     //
-    // If fDecoderIsSuspended[which], and we aren't sure that we're going to
-    // resume the coroutine, then we will need to call this->resetDecoder
-    // before calling other fDecoders[which] methods.
-    bool fDecoderIsSuspended[WhichDecoder::kNumDecoders];
+    // If fDecoderIsSuspended, and we aren't sure that we're going to resume
+    // the coroutine, then we will need to call this->resetDecoder before
+    // calling other fDecoder methods.
+    bool fDecoderIsSuspended;
 
     uint8_t fBuffer[SK_WUFFS_CODEC_BUFFER_SIZE];
 
@@ -353,13 +347,9 @@ SkWuffsCodec::SkWuffsCodec(SkEncodedInfo&&
       fStream(std::move(stream)),
       fWorkbufPtr(std::move(workbuf_ptr)),
       fWorkbufLen(workbuf_len),
-      fDecoders{
-          std::move(dec),
-      },
+      fDecoder(std::move(dec)),
       fFirstFrameIOPosition(imgcfg.first_frame_io_position()),
-      fFrameConfigs{
-          wuffs_base__null_frame_config(),
-      },
+      fFrameConfig(wuffs_base__null_frame_config()),
       fPixelConfig(imgcfg.pixcfg),
       fPixelBuffer(wuffs_base__null_pixel_buffer()),
       fIOBuffer(wuffs_base__empty_io_buffer()),
@@ -372,9 +362,7 @@ SkWuffsCodec::SkWuffsCodec(SkEncodedInfo&&
       fTwoPassPixbufLen(0),
       fNumFullyReceivedFrames(0),
       fFramesComplete(false),
-      fDecoderIsSuspended{
-          false,
-      } {
+      fDecoderIsSuspended(false) {
     fFrameHolder.init(this, imgcfg.pixcfg.width(), imgcfg.pixcfg.height());
 
     // Initialize fIOBuffer's fields, copying any outstanding data from iobuf to
@@ -423,12 +411,12 @@ SkCodec::Result SkWuffsCodec::onStartIncrementalDecode(const SkImageInfo&      d
     if (options.fSubset) {
         return SkCodec::kUnimplemented;
     }
-    SkCodec::Result result = this->seekFrame(WhichDecoder::kIncrDecode, options.fFrameIndex);
+    SkCodec::Result result = this->seekFrame(options.fFrameIndex);
     if (result != SkCodec::kSuccess) {
         return result;
     }
 
-    const char* status = this->decodeFrameConfig(WhichDecoder::kIncrDecode);
+    const char* status = this->decodeFrameConfig();
     if (status == wuffs_base__suspension__short_read) {
         return SkCodec::kIncompleteInput;
     } else if (status != nullptr) {
@@ -547,7 +535,7 @@ SkCodec::Result SkWuffsCodec::onStartIncrementalDecodeTwoPass() {
         }
         size_t src_bytes_per_pixel = src_bits_per_pixel / 8;
 
-        wuffs_base__rect_ie_u32 frame_rect = fFrameConfigs[WhichDecoder::kIncrDecode].bounds();
+        wuffs_base__rect_ie_u32 frame_rect = fFrameConfig.bounds();
         wuffs_base__table_u8    pixels = fPixelBuffer.plane(0);
 
         uint8_t* ptr = pixels.ptr + (frame_rect.min_incl_y * pixels.stride) +
@@ -591,7 +579,7 @@ SkCodec::Result SkWuffsCodec::onIncrementalDecode(int* rowsDecoded) {
 }
 
 SkCodec::Result SkWuffsCodec::onIncrementalDecodeOnePass() {
-    const char* status = this->decodeFrame(WhichDecoder::kIncrDecode);
+    const char* status = this->decodeFrame();
     if (status != nullptr) {
         if (status == wuffs_base__suspension__short_read) {
             return SkCodec::kIncompleteInput;
@@ -605,7 +593,7 @@ SkCodec::Result SkWuffsCodec::onIncrementalDecodeOnePass() {
 
 SkCodec::Result SkWuffsCodec::onIncrementalDecodeTwoPass() {
     SkCodec::Result result = SkCodec::kSuccess;
-    const char*     status = this->decodeFrame(WhichDecoder::kIncrDecode);
+    const char*     status = this->decodeFrame();
     bool            independent;
     SkAlphaType     alphaType;
     const int       index = options().fFrameIndex;
@@ -638,7 +626,7 @@ SkCodec::Result SkWuffsCodec::onIncrementalDecodeTwoPass() {
     }
     size_t src_bytes_per_pixel = src_bits_per_pixel / 8;
 
-    wuffs_base__rect_ie_u32 frame_rect = fFrameConfigs[WhichDecoder::kIncrDecode].bounds();
+    wuffs_base__rect_ie_u32 frame_rect = fFrameConfig.bounds();
     if (fFirstCallToIncrementalDecode) {
         if (frame_rect.width() > (SIZE_MAX / src_bytes_per_pixel)) {
             return SkCodec::kInternalError;
@@ -666,7 +654,7 @@ SkCodec::Result SkWuffsCodec::onIncrementalDecodeTwoPass() {
     }
 
     // If the frame's dirty rect is empty, no need to swizzle.
-    wuffs_base__rect_ie_u32 dirty_rect = fDecoders[WhichDecoder::kIncrDecode]->frame_dirty_rect();
+    wuffs_base__rect_ie_u32 dirty_rect = fDecoder->frame_dirty_rect();
     if (!dirty_rect.is_empty()) {
         wuffs_base__table_u8 pixels = fPixelBuffer.plane(0);
 
@@ -774,7 +762,7 @@ int SkWuffsCodec::onGetFrameCount() {
 
     if (!fFramesComplete && !incrementalDecodeIsInProgress) {
         this->onGetFrameCountInternal();
-        this->updateNumFullyReceivedFrames(WhichDecoder::kIncrDecode);
+        this->updateNumFullyReceivedFrames();
     }
     return fFrames.size();
 }
@@ -782,14 +770,14 @@ int SkWuffsCodec::onGetFrameCount() {
 void SkWuffsCodec::onGetFrameCountInternal() {
     size_t n = fFrames.size();
     int    i = n ? n - 1 : 0;
-    if (this->seekFrame(WhichDecoder::kIncrDecode, i) != SkCodec::kSuccess) {
+    if (this->seekFrame(i) != SkCodec::kSuccess) {
         return;
     }
 
     // Iterate through the frames, converting from Wuffs'
     // wuffs_base__frame_config type to Skia's SkWuffsFrame type.
     for (; i < INT_MAX; i++) {
-        const char* status = this->decodeFrameConfig(WhichDecoder::kIncrDecode);
+        const char* status = this->decodeFrameConfig();
         if (status == nullptr) {
             // No-op.
         } else if (status == wuffs_base__note__end_of_data) {
@@ -801,7 +789,7 @@ void SkWuffsCodec::onGetFrameCountInternal() {
         if (static_cast<size_t>(i) < fFrames.size()) {
             continue;
         }
-        fFrames.emplace_back(&fFrameConfigs[WhichDecoder::kIncrDecode]);
+        fFrames.emplace_back(&fFrameConfig);
         SkWuffsFrame* f = &fFrames[fFrames.size() - 1];
         fFrameHolder.setAlphaAndRequiredFrame(f);
     }
@@ -825,7 +813,7 @@ int SkWuffsCodec::onGetRepetitionCount() {
     // number is how many times to play the loop. Skia's int number is how many
     // times to play the loop *after the first play*. Wuffs and Skia use 0 and
     // kRepetitionCountInfinite respectively to mean loop forever.
-    uint32_t n = fDecoders[WhichDecoder::kIncrDecode]->num_animation_loops();
+    uint32_t n = fDecoder->num_animation_loops();
     if (n == 0) {
         return SkCodec::kRepetitionCountInfinite;
     }
@@ -833,9 +821,9 @@ int SkWuffsCodec::onGetRepetitionCount() {
     return n < INT_MAX ? n : INT_MAX;
 }
 
-SkCodec::Result SkWuffsCodec::seekFrame(WhichDecoder which, int frameIndex) {
-    if (fDecoderIsSuspended[which]) {
-        SkCodec::Result res = this->resetDecoder(which);
+SkCodec::Result SkWuffsCodec::seekFrame(int frameIndex) {
+    if (fDecoderIsSuspended) {
+        SkCodec::Result res = this->resetDecoder();
         if (res != SkCodec::kSuccess) {
             return res;
         }
@@ -856,65 +844,65 @@ SkCodec::Result SkWuffsCodec::seekFrame(WhichDecoder which, int frameIndex) {
         return SkCodec::kInternalError;
     }
     wuffs_base__status status =
-        fDecoders[which]->restart_frame(frameIndex, fIOBuffer.reader_io_position());
+        fDecoder->restart_frame(frameIndex, fIOBuffer.reader_io_position());
     if (status.repr != nullptr) {
         return SkCodec::kInternalError;
     }
     return SkCodec::kSuccess;
 }
 
-SkCodec::Result SkWuffsCodec::resetDecoder(WhichDecoder which) {
+SkCodec::Result SkWuffsCodec::resetDecoder() {
     if (!fStream->rewind()) {
         return SkCodec::kInternalError;
     }
     fIOBuffer.meta = wuffs_base__empty_io_buffer_meta();
 
     SkCodec::Result result =
-        reset_and_decode_image_config(fDecoders[which].get(), nullptr, &fIOBuffer, fStream.get());
+        reset_and_decode_image_config(fDecoder.get(), nullptr, &fIOBuffer, fStream.get());
     if (result == SkCodec::kIncompleteInput) {
         return SkCodec::kInternalError;
     } else if (result != SkCodec::kSuccess) {
         return result;
     }
 
-    fDecoderIsSuspended[which] = false;
+    fDecoderIsSuspended = false;
     return SkCodec::kSuccess;
 }
 
-const char* SkWuffsCodec::decodeFrameConfig(WhichDecoder which) {
+const char* SkWuffsCodec::decodeFrameConfig() {
     while (true) {
         wuffs_base__status status =
-            fDecoders[which]->decode_frame_config(&fFrameConfigs[which], &fIOBuffer);
+            fDecoder->decode_frame_config(&fFrameConfig, &fIOBuffer);
         if ((status.repr == wuffs_base__suspension__short_read) &&
             fill_buffer(&fIOBuffer, fStream.get())) {
             continue;
         }
-        fDecoderIsSuspended[which] = !status.is_complete();
-        this->updateNumFullyReceivedFrames(which);
+        fDecoderIsSuspended = !status.is_complete();
+        this->updateNumFullyReceivedFrames();
         return status.repr;
     }
 }
 
-const char* SkWuffsCodec::decodeFrame(WhichDecoder which) {
+const char* SkWuffsCodec::decodeFrame() {
     while (true) {
-        wuffs_base__status status = fDecoders[which]->decode_frame(
+        wuffs_base__status status = fDecoder->decode_frame(
             &fPixelBuffer, &fIOBuffer, fIncrDecPixelBlend,
             wuffs_base__make_slice_u8(fWorkbufPtr.get(), fWorkbufLen), nullptr);
         if ((status.repr == wuffs_base__suspension__short_read) &&
             fill_buffer(&fIOBuffer, fStream.get())) {
             continue;
         }
-        fDecoderIsSuspended[which] = !status.is_complete();
-        this->updateNumFullyReceivedFrames(which);
+        fDecoderIsSuspended = !status.is_complete();
+        this->updateNumFullyReceivedFrames();
         return status.repr;
     }
 }
 
-void SkWuffsCodec::updateNumFullyReceivedFrames(WhichDecoder which) {
+void SkWuffsCodec::updateNumFullyReceivedFrames() {
     // num_decoded_frames's return value, n, can change over time, both up and
     // down, as we seek back and forth in the underlying stream.
     // fNumFullyReceivedFrames is the highest n we've seen.
-    uint64_t n = fDecoders[which]->num_decoded_frames();
+    uint64_t n = fDecoder->num_decoded_frames();
     if (fNumFullyReceivedFrames < n) {
         fNumFullyReceivedFrames = n;
     }
@@ -930,6 +918,13 @@ bool SkWuffsCodec_IsFormat(const void* buf, size_t bytesRead) {
 
 std::unique_ptr<SkCodec> SkWuffsCodec_MakeFromStream(std::unique_ptr<SkStream> stream,
                                                      SkCodec::Result*          result) {
+    // Some clients (e.g. Android) need to be able to seek the stream, but may
+    // not provide a seekable stream. Copy the stream to one that can seek.
+    if (!stream->hasPosition() || !stream->hasLength()) {
+        auto data = SkCopyStreamToData(stream.get());
+        stream.reset(new SkMemoryStream(std::move(data)));
+    }
+
     uint8_t               buffer[SK_WUFFS_CODEC_BUFFER_SIZE];
     wuffs_base__io_buffer iobuf =
         wuffs_base__make_io_buffer(wuffs_base__make_slice_u8(buffer, SK_WUFFS_CODEC_BUFFER_SIZE),
diff --git a/third_party/skia/src/core/BUILD.bazel b/third_party/skia/src/core/BUILD.bazel
index e73686dd1fd0f..a9f343e5cc40f 100644
--- a/third_party/skia/src/core/BUILD.bazel
+++ b/third_party/skia/src/core/BUILD.bazel
@@ -34,6 +34,7 @@ cc_library(
         ":SkCachedData_src",
         ":SkCanvasPriv_src",
         ":SkCanvas_src",
+        ":SkChromeRemoteGlyphCache_src",
         ":SkClipStackDevice_src",
         ":SkClipStack_src",
         ":SkColorFilter_Matrix_src",
@@ -47,6 +48,8 @@ cc_library(
         ":SkCpu_src",
         ":SkCubicClipper_src",
         ":SkCubicMap_src",
+        ":SkCustomMeshPriv_src",
+        ":SkCustomMesh_src",
         ":SkDataTable_src",
         ":SkData_src",
         ":SkDebug_src",
@@ -91,6 +94,7 @@ cc_library(
         ":SkImageFilter_src",
         ":SkImageGenerator_src",
         ":SkImageInfo_src",
+        ":SkKeyHelpers_src",
         ":SkLatticeIter_src",
         ":SkLineClipper_src",
         ":SkLocalMatrixImageFilter_src",
@@ -98,7 +102,6 @@ cc_library(
         ":SkMD5_src",
         ":SkMallocPixelRef_src",
         ":SkMalloc_src",
-        ":SkMarkerStack_src",
         ":SkMaskBlurFilter_src",
         ":SkMaskCache_src",
         ":SkMaskFilter_src",
@@ -152,7 +155,6 @@ cc_library(
         ":SkRect_src",
         ":SkRegion_path_src",
         ":SkRegion_src",
-        ":SkRemoteGlyphCache_src",
         ":SkResourceCache_src",
         ":SkScalar_src",
         ":SkScalerCache_src",
@@ -175,7 +177,6 @@ cc_library(
         ":SkStrikeForGPU_src",
         ":SkStrikeSpec_src",
         ":SkStringUtils_src",
-        ":SkStringView_src",
         ":SkString_src",
         ":SkStrokeRec_src",
         ":SkStroke_src",
@@ -519,7 +520,6 @@ generated_cc_atom(
         "//include/core:SkRect_hdr",
         "//include/core:SkScalar_hdr",
         "//include/core:SkSize_hdr",
-        "//include/core:SkSurfaceProps_hdr",
     ],
 )
 
@@ -647,6 +647,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkBlendModeBlender_hdr",
+        ":SkKeyHelpers_hdr",
         ":SkReadBuffer_hdr",
         ":SkWriteBuffer_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
@@ -685,7 +686,6 @@ generated_cc_atom(
         ":SkVM_hdr",
         "//include/core:SkBlender_hdr",
         "//include/core:SkColorSpace_hdr",
-        "//include/private:SkTOptional_hdr",
     ],
 )
 
@@ -993,13 +993,13 @@ generated_cc_atom(
         ":SkCanvasPriv_hdr",
         ":SkClipStack_hdr",
         ":SkColorFilterBase_hdr",
+        ":SkCustomMeshPriv_hdr",
         ":SkDraw_hdr",
         ":SkGlyphRun_hdr",
         ":SkImageFilterCache_hdr",
         ":SkImageFilter_Base_hdr",
         ":SkLatticeIter_hdr",
         ":SkMSAN_hdr",
-        ":SkMarkerStack_hdr",
         ":SkMatrixPriv_hdr",
         ":SkMatrixUtils_hdr",
         ":SkPaintPriv_hdr",
@@ -1024,7 +1024,6 @@ generated_cc_atom(
         "//include/core:SkVertices_hdr",
         "//include/effects:SkRuntimeEffect_hdr",
         "//include/gpu:GrDirectContext_hdr",
-        "//include/private:SkTOptional_hdr",
         "//include/private:SkTo_hdr",
         "//include/private/chromium:GrSlug_hdr",
         "//include/utils:SkNoDrawCanvas_hdr",
@@ -1072,8 +1071,8 @@ generated_cc_atom(
         "//include/core:SkRect_hdr",
         "//include/core:SkRegion_hdr",
         "//include/core:SkShader_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//include/private:SkDeque_hdr",
+        "//src/gpu:ResourceKey_hdr",
     ],
 )
 
@@ -1465,6 +1464,8 @@ generated_cc_atom(
     hdrs = ["SkDescriptor.h"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":SkBuffer_hdr",
+        ":SkFontPriv_hdr",
         ":SkScalerContext_hdr",
         "//include/private:SkMacros_hdr",
         "//include/private:SkNoncopyable_hdr",
@@ -1478,8 +1479,12 @@ generated_cc_atom(
     deps = [
         ":SkDescriptor_hdr",
         ":SkOpts_hdr",
+        ":SkReadBuffer_hdr",
+        ":SkWriteBuffer_hdr",
         "//include/core:SkTypes_hdr",
         "//include/private:SkTo_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
     ],
 )
 
@@ -1494,6 +1499,7 @@ generated_cc_atom(
         "//include/core:SkBlender_hdr",
         "//include/core:SkCanvas_hdr",
         "//include/core:SkColor_hdr",
+        "//include/core:SkCustomMesh_hdr",
         "//include/core:SkRefCnt_hdr",
         "//include/core:SkRegion_hdr",
         "//include/core:SkShader_hdr",
@@ -1515,7 +1521,6 @@ generated_cc_atom(
         ":SkImageFilter_Base_hdr",
         ":SkImagePriv_hdr",
         ":SkLatticeIter_hdr",
-        ":SkMarkerStack_hdr",
         ":SkMatrixPriv_hdr",
         ":SkOpts_hdr",
         ":SkPathPriv_hdr",
@@ -1863,7 +1868,6 @@ generated_cc_atom(
     name = "SkEnumerate_hdr",
     hdrs = ["SkEnumerate.h"],
     visibility = ["//:__subpackages__"],
-    deps = ["//include/private:SkTLogic_hdr"],
 )
 
 generated_cc_atom(
@@ -1892,13 +1896,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkFixed15_hdr",
-    hdrs = ["SkFixed15.h"],
-    visibility = ["//:__subpackages__"],
-    deps = ["//include/core:SkTypes_hdr"],
-)
-
 generated_cc_atom(
     name = "SkFlattenable_src",
     srcs = ["SkFlattenable.cpp"],
@@ -2147,7 +2144,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/text:GrSDFTControl_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
         "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
     ],
 )
@@ -2196,6 +2193,7 @@ generated_cc_atom(
     deps = [
         ":SkMask_hdr",
         ":SkMathPriv_hdr",
+        ":SkStrikeForGPU_hdr",
         "//include/core:SkPath_hdr",
         "//include/core:SkTypes_hdr",
         "//include/private:SkChecksum_hdr",
@@ -2213,6 +2211,7 @@ generated_cc_atom(
         ":SkArenaAlloc_hdr",
         ":SkGlyph_hdr",
         ":SkScalerContext_hdr",
+        "//include/core:SkDrawable_hdr",
         "//src/pathops:SkPathOpsCubic_hdr",
         "//src/pathops:SkPathOpsQuad_hdr",
     ],
@@ -2606,23 +2605,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkMarkerStack_hdr",
-    hdrs = ["SkMarkerStack.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//include/core:SkM44_hdr",
-        "//include/core:SkRefCnt_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "SkMarkerStack_src",
-    srcs = ["SkMarkerStack.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [":SkMarkerStack_hdr"],
-)
-
 generated_cc_atom(
     name = "SkMaskBlurFilter_hdr",
     hdrs = ["SkMaskBlurFilter.h"],
@@ -3141,8 +3123,11 @@ generated_cc_atom(
     srcs = ["SkPaintPriv.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":SkBlenderBase_hdr",
         ":SkColorFilterBase_hdr",
         ":SkColorSpacePriv_hdr",
+        ":SkKeyHelpers_hdr",
+        ":SkPaintParamsKey_hdr",
         ":SkPaintPriv_hdr",
         ":SkXfermodePriv_hdr",
         "//include/core:SkPaint_hdr",
@@ -3639,10 +3624,7 @@ generated_cc_atom(
     name = "SkPromiseImageTexture_src",
     srcs = ["SkPromiseImageTexture.cpp"],
     visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkMessageBus_hdr",
-        "//include/core:SkPromiseImageTexture_hdr",
-    ],
+    deps = ["//include/core:SkPromiseImageTexture_hdr"],
 )
 
 generated_cc_atom(
@@ -4098,44 +4080,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkRemoteGlyphCache_hdr",
-    hdrs = ["SkRemoteGlyphCache.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//include/core:SkData_hdr",
-        "//include/core:SkRefCnt_hdr",
-        "//include/utils:SkNoDrawCanvas_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "SkRemoteGlyphCache_src",
-    srcs = ["SkRemoteGlyphCache.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkDevice_hdr",
-        ":SkDraw_hdr",
-        ":SkEnumerate_hdr",
-        ":SkGlyphRun_hdr",
-        ":SkRemoteGlyphCache_hdr",
-        ":SkScalerCache_hdr",
-        ":SkStrikeCache_hdr",
-        ":SkStrikeForGPU_hdr",
-        ":SkTLazy_hdr",
-        ":SkTraceEvent_hdr",
-        ":SkTypeface_remote_hdr",
-        "//include/core:SkSerialProcs_hdr",
-        "//include/core:SkSpan_hdr",
-        "//include/core:SkTypeface_hdr",
-        "//include/gpu:GrContextOptions_hdr",
-        "//include/private:SkChecksum_hdr",
-        "//include/private:SkTHash_hdr",
-        "//src/gpu:GrDrawOpAtlas_hdr",
-        "//src/gpu/text:GrSDFTControl_hdr",
-    ],
-)
-
 generated_cc_atom(
     name = "SkResourceCache_hdr",
     hdrs = ["SkResourceCache.h"],
@@ -4203,6 +4147,7 @@ generated_cc_atom(
         "//include/effects:SkRuntimeEffect_hdr",
         "//include/gpu:GrRecordingContext_hdr",
         "//include/private:SkMutex_hdr",
+        "//include/sksl:DSLCore_hdr",
         "//src/gpu:GrColorInfo_hdr",
         "//src/gpu:GrFPArgs_hdr",
         "//src/gpu:GrImageInfo_hdr",
@@ -4213,10 +4158,12 @@ generated_cc_atom(
         "//src/image:SkImage_Gpu_hdr",
         "//src/sksl:SkSLAnalysis_hdr",
         "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLSharedCompiler_hdr",
         "//src/sksl:SkSLUtil_hdr",
         "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
         "//src/sksl/ir:SkSLFunctionDefinition_hdr",
         "//src/sksl/ir:SkSLVarDeclarations_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
     ],
 )
 
@@ -4290,6 +4237,7 @@ generated_cc_atom(
         ":SkEnumerate_hdr",
         ":SkScalerCache_hdr",
         ":SkScalerContext_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkGraphics_hdr",
         "//include/core:SkPath_hdr",
         "//include/core:SkTypeface_hdr",
@@ -4340,6 +4288,7 @@ generated_cc_atom(
         ":SkSurfacePriv_hdr",
         ":SkTextFormatParams_hdr",
         ":SkWriteBuffer_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkFontMetrics_hdr",
         "//include/core:SkMaskFilter_hdr",
         "//include/core:SkPaint_hdr",
@@ -4552,6 +4501,8 @@ generated_cc_atom(
         "//include/core:SkBitmap_hdr",
         "//include/core:SkCanvas_hdr",
         "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkTileMode_hdr",
         "//include/gpu:GrDirectContext_hdr",
         "//include/gpu:GrRecordingContext_hdr",
         "//src/gpu:GrImageInfo_hdr",
@@ -4560,6 +4511,7 @@ generated_cc_atom(
         "//src/gpu:GrTextureProxy_hdr",
         "//src/image:SkImage_Base_hdr",
         "//src/image:SkImage_Gpu_hdr",
+        "//src/shaders:SkImageShader_hdr",
     ],
 )
 
@@ -4682,6 +4634,7 @@ generated_cc_atom(
         ":SkScalerCache_hdr",
         ":SkStrikeForGPU_hdr",
         ":SkStrikeSpec_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/private:SkSpinlock_hdr",
         "//include/private:SkTemplates_hdr",
     ],
@@ -4710,7 +4663,6 @@ generated_cc_atom(
     hdrs = ["SkStrikeForGPU.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":SkGlyph_hdr",
         "//include/core:SkPaint_hdr",
         "//include/core:SkPoint_hdr",
         "//include/core:SkSpan_hdr",
@@ -4776,13 +4728,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkStringView_src",
-    srcs = ["SkStringView.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = ["//include/core:SkStringView_hdr"],
-)
-
 generated_cc_atom(
     name = "SkString_src",
     srcs = ["SkString.cpp"],
@@ -4790,7 +4735,6 @@ generated_cc_atom(
     deps = [
         ":SkSafeMath_hdr",
         ":SkUtils_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/core:SkString_hdr",
         "//include/private:SkTPin_hdr",
         "//include/private:SkTo_hdr",
@@ -5043,7 +4987,7 @@ generated_cc_atom(
         "//include/core:SkRSXform_hdr",
         "//include/core:SkTextBlob_hdr",
         "//include/core:SkTypeface_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
     ],
 )
 
@@ -5129,11 +5073,11 @@ generated_cc_atom(
         ":SkAdvancedTypefaceMetrics_hdr",
         ":SkDescriptor_hdr",
         ":SkFontDescriptor_hdr",
-        ":SkRemoteGlyphCache_hdr",
         ":SkScalerContext_hdr",
         "//include/core:SkFontStyle_hdr",
         "//include/core:SkPaint_hdr",
         "//include/core:SkTypeface_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
     ],
 )
 
@@ -5142,12 +5086,12 @@ generated_cc_atom(
     srcs = ["SkTypeface_remote.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":SkRemoteGlyphCache_hdr",
         ":SkScalerCache_hdr",
         ":SkStrikeCache_hdr",
         ":SkTraceEvent_hdr",
         ":SkTypeface_remote_hdr",
         "//include/core:SkPaint_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
     ],
 )
 
@@ -5215,6 +5159,7 @@ generated_cc_atom(
         ":SkArenaAlloc_hdr",
         ":SkBlitter_hdr",
         ":SkLRUCache_hdr",
+        ":SkTLazy_hdr",
         ":SkVM_hdr",
     ],
 )
@@ -5282,6 +5227,7 @@ generated_cc_atom(
         "//include/private:SkHalf_hdr",
         "//include/private:SkTFitsIn_hdr",
         "//include/private:SkThreadID_hdr",
+        "//src/utils:SkVMVisualizer_hdr",
     ],
 )
 
@@ -5335,12 +5281,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkVptr_hdr",
-    hdrs = ["SkVptr.h"],
-    visibility = ["//:__subpackages__"],
-)
-
 generated_cc_atom(
     name = "SkWriteBuffer_hdr",
     hdrs = ["SkWriteBuffer.h"],
@@ -5547,3 +5487,189 @@ generated_cc_atom(
         "//include/private:SkTo_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkChromeRemoteGlyphCache_src",
+    srcs = ["SkChromeRemoteGlyphCache.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkDevice_hdr",
+        ":SkDraw_hdr",
+        ":SkEnumerate_hdr",
+        ":SkGlyphRun_hdr",
+        ":SkReadBuffer_hdr",
+        ":SkScalerCache_hdr",
+        ":SkStrikeCache_hdr",
+        ":SkStrikeForGPU_hdr",
+        ":SkTLazy_hdr",
+        ":SkTraceEvent_hdr",
+        ":SkTypeface_remote_hdr",
+        "//include/core:SkDrawable_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/private:SkChecksum_hdr",
+        "//include/private:SkTHash_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
+        "//src/gpu:GrDrawOpAtlas_hdr",
+        "//src/gpu/text:GrSDFTControl_hdr",
+        "//src/gpu/text:GrTextBlob_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkCustomMeshPriv_hdr",
+    hdrs = ["SkCustomMeshPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSLTypeShared_hdr",
+        "//include/core:SkCustomMesh_hdr",
+        "//include/private:GrTypesPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkCustomMeshPriv_src",
+    srcs = ["SkCustomMeshPriv.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkCustomMeshPriv_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkCustomMesh_src",
+    srcs = ["SkCustomMesh.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkCustomMeshPriv_hdr",
+        "//include/core:SkCustomMesh_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLSharedCompiler_hdr",
+        "//src/sksl/ir:SkSLFunctionDefinition_hdr",
+        "//src/sksl/ir:SkSLProgram_hdr",
+        "//src/sksl/ir:SkSLVarDeclarations_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkDebugUtils_hdr",
+    hdrs = ["SkDebugUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTileMode_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkKeyHelpers_hdr",
+    hdrs = ["SkKeyHelpers.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Context_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkTileMode_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkKeyHelpers_src",
+    srcs = ["SkKeyHelpers.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkDebugUtils_hdr",
+        ":SkKeyHelpers_hdr",
+        ":SkPaintParamsKey_hdr",
+        ":SkShaderCodeDictionary_hdr",
+        ":SkUniformData_hdr",
+        ":SkUniform_hdr",
+        "//experimental/graphite/src:UniformManager_hdr",
+        "//src/shaders:SkShaderBase_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkPaintParamsKey_src",
+    srcs = ["SkPaintParamsKey.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkKeyHelpers_hdr",
+        ":SkPaintParamsKey_hdr",
+        ":SkShaderCodeDictionary_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkShaderCodeDictionary_src",
+    srcs = ["SkShaderCodeDictionary.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkOpts_hdr",
+        ":SkShaderCodeDictionary_hdr",
+        "//include/private:SkSLString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLTypeShared_hdr",
+    hdrs = ["SkSLTypeShared.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkUniformData_hdr",
+    hdrs = ["SkUniformData.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkUniform_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSpan_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkUniformData_src",
+    srcs = ["SkUniformData.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkOpts_hdr",
+        ":SkUniformData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkUniform_hdr",
+    hdrs = ["SkUniform.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSLTypeShared_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkBuiltInCodeSnippetID_hdr",
+    hdrs = ["SkBuiltInCodeSnippetID.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkPaintParamsKey_hdr",
+    hdrs = ["SkPaintParamsKey.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkBuiltInCodeSnippetID_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkShaderCodeDictionary_hdr",
+    hdrs = ["SkShaderCodeDictionary.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkArenaAlloc_hdr",
+        ":SkPaintParamsKey_hdr",
+        ":SkUniform_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/private:SkSpinlock_hdr",
+        "//include/private:SkUniquePaintParamsID_hdr",
+    ],
+)
diff --git a/third_party/skia/src/core/Sk4px.h b/third_party/skia/src/core/Sk4px.h
index d375e8eeb1e6d..23e4ca377c3d0 100644
--- a/third_party/skia/src/core/Sk4px.h
+++ b/third_party/skia/src/core/Sk4px.h
@@ -106,7 +106,7 @@ class Sk4px : public Sk16b {
     // A generic driver that maps fn over a src array into a dst array.
     // fn should take an Sk4px (4 src pixels) and return an Sk4px (4 dst pixels).
     template <typename Fn>
-    static void MapSrc(int n, SkPMColor* dst, const SkPMColor* src, const Fn& fn) {
+    [[maybe_unused]] static void MapSrc(int n, SkPMColor* dst, const SkPMColor* src, const Fn& fn) {
         SkASSERT(dst);
         SkASSERT(src);
         // This looks a bit odd, but it helps loop-invariant hoisting across different calls to fn.
@@ -138,7 +138,8 @@ class Sk4px : public Sk16b {
 
     // As above, but with dst4' = fn(dst4, src4).
     template <typename Fn>
-    static void MapDstSrc(int n, SkPMColor* dst, const SkPMColor* src, const Fn& fn) {
+    [[maybe_unused]] static void MapDstSrc(int n, SkPMColor* dst, const SkPMColor* src,
+                                           const Fn& fn) {
         SkASSERT(dst);
         SkASSERT(src);
         while (n > 0) {
@@ -168,7 +169,8 @@ class Sk4px : public Sk16b {
 
     // As above, but with dst4' = fn(dst4, alpha4).
     template <typename Fn>
-    static void MapDstAlpha(int n, SkPMColor* dst, const SkAlpha* a, const Fn& fn) {
+    [[maybe_unused]] static void MapDstAlpha(int n, SkPMColor* dst, const SkAlpha* a,
+                                             const Fn& fn) {
         SkASSERT(dst);
         SkASSERT(a);
         while (n > 0) {
@@ -198,8 +200,8 @@ class Sk4px : public Sk16b {
 
     // As above, but with dst4' = fn(dst4, src4, alpha4).
     template <typename Fn>
-    static void MapDstSrcAlpha(int n, SkPMColor* dst, const SkPMColor* src, const SkAlpha* a,
-                               const Fn& fn) {
+    [[maybe_unused]] static void MapDstSrcAlpha(int n, SkPMColor* dst, const SkPMColor* src,
+                                                const SkAlpha* a, const Fn& fn) {
         SkASSERT(dst);
         SkASSERT(src);
         SkASSERT(a);
diff --git a/third_party/skia/src/core/SkBitmapDevice.cpp b/third_party/skia/src/core/SkBitmapDevice.cpp
index 745027de0687a..eecf9e097a108 100644
--- a/third_party/skia/src/core/SkBitmapDevice.cpp
+++ b/third_party/skia/src/core/SkBitmapDevice.cpp
@@ -521,9 +521,11 @@ void SkBitmapDevice::drawImageRect(const SkImage* image, const SkRect* src, cons
     this->drawRect(*dstPtr, paintWithShader);
 }
 
-void SkBitmapDevice::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
+void SkBitmapDevice::onDrawGlyphRunList(SkCanvas* canvas,
+                                        const SkGlyphRunList& glyphRunList,
+                                        const SkPaint& paint) {
     SkASSERT(!glyphRunList.hasRSXForm());
-    LOOP_TILER( drawGlyphRunList(glyphRunList, paint, &fGlyphPainter), nullptr )
+    LOOP_TILER( drawGlyphRunList(canvas, &fGlyphPainter, glyphRunList, paint), nullptr )
 }
 
 void SkBitmapDevice::drawVertices(const SkVertices* vertices,
@@ -537,6 +539,12 @@ void SkBitmapDevice::drawVertices(const SkVertices* vertices,
     BDDraw(this).drawVertices(vertices, std::move(blender), paint);
 }
 
+#ifdef SK_ENABLE_SKSL
+void SkBitmapDevice::drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) {
+    // TODO: Implement
+}
+#endif
+
 void SkBitmapDevice::drawAtlas(const SkRSXform xform[],
                                const SkRect tex[],
                                const SkColor colors[],
@@ -544,7 +552,7 @@ void SkBitmapDevice::drawAtlas(const SkRSXform xform[],
                                sk_sp<SkBlender> blender,
                                const SkPaint& paint) {
     // set this to true for performance comparisons with the old drawVertices way
-    if (false) {
+    if ((false)) {
         this->INHERITED::drawAtlas(xform, tex, colors, count, std::move(blender), paint);
         return;
     }
@@ -573,7 +581,9 @@ void SkBitmapDevice::drawSpecial(SkSpecialImage* src,
     if (src->getROPixels(&resultBM)) {
         SkDraw draw;
         SkMatrixProvider matrixProvider(localToDevice);
-        draw.fDst = fBitmap.pixmap();
+        if (!this->accessPixels(&draw.fDst)) {
+          return; // no pixels to draw to so skip it
+        }
         draw.fMatrixProvider = &matrixProvider;
         draw.fRC = &fRCStack.rc();
         draw.drawBitmap(resultBM, SkMatrix::I(), nullptr, sampling, paint);
diff --git a/third_party/skia/src/core/SkBitmapDevice.h b/third_party/skia/src/core/SkBitmapDevice.h
index 5380ca234f8de..14a89b3139c8c 100644
--- a/third_party/skia/src/core/SkBitmapDevice.h
+++ b/third_party/skia/src/core/SkBitmapDevice.h
@@ -15,7 +15,6 @@
 #include "include/core/SkRect.h"
 #include "include/core/SkScalar.h"
 #include "include/core/SkSize.h"
-#include "include/core/SkSurfaceProps.h"
 #include "src/core/SkDevice.h"
 #include "src/core/SkGlyphRunPainter.h"
 #include "src/core/SkRasterClip.h"
@@ -29,7 +28,9 @@ class SkPixmap;
 class SkRasterHandleAllocator;
 class SkRRect;
 class SkSurface;
+class SkSurfaceProps;
 struct SkPoint;
+struct SkCustomMesh;
 
 ///////////////////////////////////////////////////////////////////////////////
 class SkBitmapDevice : public SkBaseDevice {
@@ -86,6 +87,10 @@ class SkBitmapDevice : public SkBaseDevice {
                        SkCanvas::SrcRectConstraint) override;
 
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override;
+#ifdef SK_ENABLE_SKSL
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override;
+#endif
+
     void drawAtlas(const SkRSXform[], const SkRect[], const SkColor[], int count, sk_sp<SkBlender>,
                    const SkPaint&) override;
 
@@ -102,7 +107,7 @@ class SkBitmapDevice : public SkBaseDevice {
 
     ///////////////////////////////////////////////////////////////////////////
 
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override;
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override;
     bool onReadPixels(const SkPixmap&, int x, int y) override;
     bool onWritePixels(const SkPixmap&, int, int) override;
     bool onPeekPixels(SkPixmap*) override;
@@ -154,25 +159,4 @@ class SkBitmapDevice : public SkBaseDevice {
     using INHERITED = SkBaseDevice;
 };
 
-class SkBitmapDeviceFilteredSurfaceProps {
-public:
-    SkBitmapDeviceFilteredSurfaceProps(const SkBitmap& bitmap, const SkPaint& paint,
-                                       const SkSurfaceProps& surfaceProps)
-        : fSurfaceProps((kN32_SkColorType != bitmap.colorType() || !paint.isSrcOver())
-                        ? fLazy.init(surfaceProps.flags(), kUnknown_SkPixelGeometry)
-                        : &surfaceProps)
-    { }
-
-    SkBitmapDeviceFilteredSurfaceProps(const SkBitmapDeviceFilteredSurfaceProps&) = delete;
-    SkBitmapDeviceFilteredSurfaceProps& operator=(const SkBitmapDeviceFilteredSurfaceProps&) = delete;
-    SkBitmapDeviceFilteredSurfaceProps(SkBitmapDeviceFilteredSurfaceProps&&) = delete;
-    SkBitmapDeviceFilteredSurfaceProps& operator=(SkBitmapDeviceFilteredSurfaceProps&&) = delete;
-
-    const SkSurfaceProps& operator()() const { return *fSurfaceProps; }
-
-private:
-    SkTLazy<SkSurfaceProps> fLazy;
-    SkSurfaceProps const * const fSurfaceProps;
-};
-
 #endif // SkBitmapDevice_DEFINED
diff --git a/third_party/skia/src/core/SkBlendModeBlender.cpp b/third_party/skia/src/core/SkBlendModeBlender.cpp
index cddb05970bc05..ea95b908aaeab 100644
--- a/third_party/skia/src/core/SkBlendModeBlender.cpp
+++ b/third_party/skia/src/core/SkBlendModeBlender.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "src/core/SkBlendModeBlender.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
 
@@ -59,6 +60,18 @@ sk_sp<SkBlender> SkBlender::Mode(SkBlendMode mode) {
 #undef RETURN_SINGLETON_BLENDER
 }
 
+void SkBlenderBase::addToKey(SkShaderCodeDictionary* dict,
+                             SkBackend backend,
+                             SkPaintParamsKeyBuilder* builder,
+                             SkUniformBlock* uniformBlock) const {
+
+    if (std::optional<SkBlendMode> bm = as_BB(this)->asBlendMode(); bm.has_value()) {
+        BlendModeBlock::AddToKey(dict, backend, builder, uniformBlock, bm.value());
+    } else {
+        BlendModeBlock::AddToKey(dict, backend, builder, uniformBlock, SkBlendMode::kSrcOver);
+    }
+}
+
 sk_sp<SkFlattenable> SkBlendModeBlender::CreateProc(SkReadBuffer& buffer) {
     SkBlendMode mode = buffer.read32LE(SkBlendMode::kLastMode);
     return SkBlender::Mode(mode);
diff --git a/third_party/skia/src/core/SkBlendModeBlender.h b/third_party/skia/src/core/SkBlendModeBlender.h
index a518618453103..90345ea747dc7 100644
--- a/third_party/skia/src/core/SkBlendModeBlender.h
+++ b/third_party/skia/src/core/SkBlendModeBlender.h
@@ -14,7 +14,7 @@ class SkBlendModeBlender : public SkBlenderBase {
 public:
     SkBlendModeBlender(SkBlendMode mode) : fMode(mode) {}
 
-    skstd::optional<SkBlendMode> asBlendMode() const final { return fMode; }
+    std::optional<SkBlendMode> asBlendMode() const final { return fMode; }
 
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(
diff --git a/third_party/skia/src/core/SkBlenderBase.h b/third_party/skia/src/core/SkBlenderBase.h
index bc55139e29814..092ecc68aa25d 100644
--- a/third_party/skia/src/core/SkBlenderBase.h
+++ b/third_party/skia/src/core/SkBlenderBase.h
@@ -10,13 +10,18 @@
 
 #include "include/core/SkBlender.h"
 #include "include/core/SkColorSpace.h"
-#include "include/private/SkTOptional.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkVM.h"
 
+#include <optional>
+
+enum class SkBackend : uint8_t;
 struct GrFPArgs;
 class GrFragmentProcessor;
+class SkPaintParamsKeyBuilder;
 class SkRuntimeEffect;
+class SkShaderCodeDictionary;
+class SkUniformBlock;
 
 /**
  * Encapsulates a blend function, including non-public APIs.
@@ -29,7 +34,7 @@ class SkBlenderBase : public SkBlender {
      * Returns true if this SkBlender represents any SkBlendMode, and returns the blender's
      * SkBlendMode in `mode`. Returns false for other types of blends.
      */
-    virtual skstd::optional<SkBlendMode> asBlendMode() const { return {}; }
+    virtual std::optional<SkBlendMode> asBlendMode() const { return {}; }
 
     /** Creates the blend program in SkVM. */
     SK_WARN_UNUSED_RESULT
@@ -52,6 +57,12 @@ class SkBlenderBase : public SkBlender {
 
     virtual SkRuntimeEffect* asRuntimeEffect() const { return nullptr; }
 
+    // TODO: make pure virtual
+    virtual void addToKey(SkShaderCodeDictionary*,
+                          SkBackend,
+                          SkPaintParamsKeyBuilder*,
+                          SkUniformBlock*) const;
+
     static SkFlattenable::Type GetFlattenableType() { return kSkBlender_Type; }
     Type getFlattenableType() const override { return GetFlattenableType(); }
 
diff --git a/third_party/skia/src/core/SkBlitter.cpp b/third_party/skia/src/core/SkBlitter.cpp
index 6ca39d6513d3a..c44659a31f5be 100644
--- a/third_party/skia/src/core/SkBlitter.cpp
+++ b/third_party/skia/src/core/SkBlitter.cpp
@@ -632,7 +632,7 @@ SkBlitter* SkBlitterClipper::apply(SkBlitter* blitter, const SkRegion* clip,
 bool SkBlitter::UseLegacyBlitter(const SkPixmap& device,
                                  const SkPaint& paint,
                                  const SkMatrix& matrix) {
-    if (gSkForceRasterPipelineBlitter) {
+    if (gSkForceRasterPipelineBlitter || gUseSkVMBlitter) {
         return false;
     }
 #if defined(SK_FORCE_RASTER_PIPELINE_BLITTER)
@@ -734,19 +734,14 @@ SkBlitter* SkBlitter::Choose(const SkPixmap& device,
         paint.writable()->setDither(false);
     }
 
-    if (gUseSkVMBlitter) {
-        if (auto blitter = SkVMBlitter::Make(device, *paint, matrixProvider,
-                                             alloc, clipShader)) {
-            return blitter;
-        }
-    }
-
     // Same basic idea used a few times: try SkRP, then try SkVM, then give up with a null-blitter.
     // (Setting gUseSkVMBlitter is the only way we prefer SkVM over SkRP at the moment.)
     auto create_SkRP_or_SkVMBlitter = [&]() -> SkBlitter* {
-        if (auto blitter = SkCreateRasterPipelineBlitter(device, *paint, matrixProvider,
-                                                         alloc, clipShader)) {
-            return blitter;
+        if (!gUseSkVMBlitter) {
+            if (auto blitter = SkCreateRasterPipelineBlitter(
+                        device, *paint, matrixProvider, alloc, clipShader)) {
+                return blitter;
+            }
         }
         if (auto blitter = SkVMBlitter::Make(device, *paint, matrixProvider,
                                              alloc, clipShader)) {
diff --git a/third_party/skia/src/core/SkBlitter_Sprite.cpp b/third_party/skia/src/core/SkBlitter_Sprite.cpp
index ac58d45644ced..fdb12dd5786a8 100644
--- a/third_party/skia/src/core/SkBlitter_Sprite.cpp
+++ b/third_party/skia/src/core/SkBlitter_Sprite.cpp
@@ -17,6 +17,7 @@
 #include "src/core/SkVMBlitter.h"
 
 extern bool gUseSkVMBlitter;
+extern bool gSkForceRasterPipelineBlitter;
 
 SkSpriteBlitter::SkSpriteBlitter(const SkPixmap& source)
     : fSource(source) {}
@@ -199,7 +200,9 @@ SkBlitter* SkBlitter::ChooseSprite(const SkPixmap& dst, const SkPaint& paint,
 
     SkSpriteBlitter* blitter = nullptr;
 
-    if (0 == SkColorSpaceXformSteps(source,dst).flags.mask() && !clipShader) {
+    if (gSkForceRasterPipelineBlitter) {
+        // Do not use any of these optimized memory blitters
+    } else if (0 == SkColorSpaceXformSteps(source,dst).flags.mask() && !clipShader) {
         if (!blitter && SkSpriteBlitter_Memcpy::Supports(dst, source, paint)) {
             blitter = alloc->make<SkSpriteBlitter_Memcpy>(source);
         }
diff --git a/third_party/skia/src/core/SkBlurMF.cpp b/third_party/skia/src/core/SkBlurMF.cpp
index c2d4d87a5c92a..54216973bb90c 100644
--- a/third_party/skia/src/core/SkBlurMF.cpp
+++ b/third_party/skia/src/core/SkBlurMF.cpp
@@ -789,9 +789,9 @@ static std::unique_ptr<GrFragmentProcessor> create_profile_effect(GrRecordingCon
     // 1 / textureRadius. This is done to avoid overflow in length().
     SkMatrix texM = SkMatrix::Scale(kProfileTextureWidth, 1.f);
 
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey key;
-    GrUniqueKey::Builder builder(&key, kDomain, 1, "1-D Circular Blur");
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey key;
+    skgpu::UniqueKey::Builder builder(&key, kDomain, 1, "1-D Circular Blur");
     builder[0] = sigmaToCircleRRatioFixed;
     builder.finish();
 
@@ -872,9 +872,9 @@ static std::unique_ptr<GrFragmentProcessor> make_rect_integral_fp(GrRecordingCon
 
     int width = SkGpuBlurUtils::CreateIntegralTable(sixSigma, nullptr);
 
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey key;
-    GrUniqueKey::Builder builder(&key, kDomain, 1, "Rect Blur Mask");
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey key;
+    skgpu::UniqueKey::Builder builder(&key, kDomain, 1, "Rect Blur Mask");
     builder[0] = width;
     builder.finish();
 
@@ -1040,13 +1040,13 @@ static std::unique_ptr<GrFragmentProcessor> make_rect_blur(GrRecordingContext* c
 
 static constexpr auto kBlurredRRectMaskOrigin = kTopLeft_GrSurfaceOrigin;
 
-static void make_blurred_rrect_key(GrUniqueKey* key,
+static void make_blurred_rrect_key(skgpu::UniqueKey* key,
                                    const SkRRect& rrectToDraw,
                                    float xformedSigma) {
     SkASSERT(!SkGpuBlurUtils::IsEffectivelyZeroSigma(xformedSigma));
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
 
-    GrUniqueKey::Builder builder(key, kDomain, 9, "RoundRect Blur Mask");
+    skgpu::UniqueKey::Builder builder(key, kDomain, 9, "RoundRect Blur Mask");
     builder[0] = SkScalarCeilToInt(xformedSigma - 1 / 6.0f);
 
     int index = 1;
@@ -1262,7 +1262,7 @@ static std::unique_ptr<GrFragmentProcessor> find_or_create_rrect_blur_mask_fp(
         const SkISize& dimensions,
         float xformedSigma) {
     SkASSERT(!SkGpuBlurUtils::IsEffectivelyZeroSigma(xformedSigma));
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     make_blurred_rrect_key(&key, rrectToDraw, xformedSigma);
 
     auto threadSafeCache = rContext->priv().threadSafeCache();
diff --git a/third_party/skia/src/core/SkBuiltInCodeSnippetID.h b/third_party/skia/src/core/SkBuiltInCodeSnippetID.h
new file mode 100644
index 0000000000000..5de608fa502e4
--- /dev/null
+++ b/third_party/skia/src/core/SkBuiltInCodeSnippetID.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkBuiltInCodeSnippetID_DEFINED
+#define SkBuiltInCodeSnippetID_DEFINED
+
+#include "include/core/SkTypes.h"
+
+// TODO: this needs to be expanded into a more flexible dictionary (esp. for user-supplied SkSL)
+enum class SkBuiltInCodeSnippetID : uint8_t {
+    // TODO: It seems like this requires some refinement. Fundamentally this doesn't seem like a
+    // draw that originated from a PaintParams.
+    kDepthStencilOnlyDraw,
+
+    kError,
+
+    // SkShader code snippets
+    kSolidColorShader,
+    kLinearGradientShader,
+    kRadialGradientShader,
+    kSweepGradientShader,
+    kConicalGradientShader,
+
+    kImageShader,
+    kBlendShader,     // aka ComposeShader
+
+    // BlendMode code snippets
+    kSimpleBlendMode,
+
+    kLast = kSimpleBlendMode
+};
+static constexpr int kBuiltInCodeSnippetIDCount = static_cast<int>(SkBuiltInCodeSnippetID::kLast)+1;
+
+#endif // SkBuiltInCodeSnippetID_DEFINED
diff --git a/third_party/skia/src/core/SkCanvas.cpp b/third_party/skia/src/core/SkCanvas.cpp
index a44670c14fadd..95b9c6a9d8eaf 100644
--- a/third_party/skia/src/core/SkCanvas.cpp
+++ b/third_party/skia/src/core/SkCanvas.cpp
@@ -19,7 +19,6 @@
 #include "include/core/SkTextBlob.h"
 #include "include/core/SkVertices.h"
 #include "include/effects/SkRuntimeEffect.h"
-#include "include/private/SkTOptional.h"
 #include "include/private/SkTo.h"
 #include "include/utils/SkNoDrawCanvas.h"
 #include "src/core/SkArenaAlloc.h"
@@ -27,6 +26,7 @@
 #include "src/core/SkCanvasPriv.h"
 #include "src/core/SkClipStack.h"
 #include "src/core/SkColorFilterBase.h"
+#include "src/core/SkCustomMeshPriv.h"
 #include "src/core/SkDraw.h"
 #include "src/core/SkGlyphRun.h"
 #include "src/core/SkImageFilterCache.h"
@@ -49,6 +49,7 @@
 
 #include <memory>
 #include <new>
+#include <optional>
 
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrDirectContext.h"
@@ -327,6 +328,7 @@ class AutoLayerForImageFilter {
                 rawBounds = &fPaint.computeFastBounds(*rawBounds, &storage);
             }
 
+            canvas->fSaveCount += 1;
             (void)canvas->internalSaveLayer(SkCanvas::SaveLayerRec(rawBounds, &restorePaint),
                                             SkCanvas::kFullLayer_SaveLayerStrategy);
             fTempLayerForImageFilter = true;
@@ -340,6 +342,7 @@ class AutoLayerForImageFilter {
 
     ~AutoLayerForImageFilter() {
         if (fTempLayerForImageFilter) {
+            fCanvas->fSaveCount -= 1;
             fCanvas->internalRestore();
         }
         SkASSERT(fCanvas->getSaveCount() == fSaveCount);
@@ -355,7 +358,7 @@ class AutoLayerForImageFilter {
     SkDEBUGCODE(int fSaveCount;)
 };
 
-skstd::optional<AutoLayerForImageFilter> SkCanvas::aboutToDraw(
+std::optional<AutoLayerForImageFilter> SkCanvas::aboutToDraw(
     SkCanvas* canvas,
     const SkPaint& paint,
     const SkRect* rawBounds,
@@ -364,14 +367,14 @@ skstd::optional<AutoLayerForImageFilter> SkCanvas::aboutToDraw(
 {
     if (checkOverwrite == CheckForOverwrite::kYes) {
         if (!this->predrawNotify(rawBounds, &paint, overrideOpacity)) {
-            return skstd::nullopt;
+            return std::nullopt;
         }
     } else {
         if (!this->predrawNotify()) {
-            return skstd::nullopt;
+            return std::nullopt;
         }
     }
-    return skstd::optional<AutoLayerForImageFilter>(canvas, paint, rawBounds);
+    return std::optional<AutoLayerForImageFilter>(std::in_place, canvas, paint, rawBounds);
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -762,7 +765,7 @@ static std::pair<skif::Mapping, skif::LayerSpace<SkIRect>> get_layer_mapping_and
         // When a filter is involved, the layer size may be larger than the default maxLayerDim due
         // to required inputs for filters (e.g. a displacement map with a large radius).
         if (layerBounds.width() > maxLayerDim || layerBounds.height() > maxLayerDim) {
-            skif::Mapping idealMapping(SkMatrix::I(), mapping.layerMatrix());
+            skif::Mapping idealMapping{mapping.layerMatrix()};
             auto idealLayerBounds = as_IFB(filter)->getInputBounds(idealMapping, targetOutput,
                                                                    contentBounds);
             maxLayerDim = std::max(std::max(idealLayerBounds.width(), idealLayerBounds.height()),
@@ -844,9 +847,15 @@ void SkCanvas::internalDrawDeviceWithFilter(SkBaseDevice* src,
     skif::LayerSpace<SkIRect> requiredInput;
     if (compat == DeviceCompatibleWithFilter::kYes) {
         // Just use the relative transform from src to dst and the src's whole image, since
-        // internalSaveLayer should have already determined what was necessary.
+        // internalSaveLayer should have already determined what was necessary. We explicitly
+        // construct the inverse (dst->src) to avoid the case where src's and dst's coord transforms
+        // were individually invertible by SkM44::invert() but their product is considered not
+        // invertible by SkMatrix::invert(). When this happens the matrices are already poorly
+        // conditioned so getRelativeTransform() gives us something reasonable.
         SkASSERT(scaleFactor == 1.0f);
-        mapping = skif::Mapping(src->getRelativeTransform(*dst), localToSrc);
+        mapping = skif::Mapping(src->getRelativeTransform(*dst),
+                                dst->getRelativeTransform(*src),
+                                localToSrc);
         requiredInput = skif::LayerSpace<SkIRect>(SkIRect::MakeSize(srcDims));
         SkASSERT(!requiredInput.isEmpty());
     } else {
@@ -923,12 +932,15 @@ void SkCanvas::internalDrawDeviceWithFilter(SkBaseDevice* src,
             intermediateDevice->setOrigin(SkM44(srcToIntermediate),
                                           requiredInput.left(), requiredInput.top());
 
-            SkMatrix offsetLocalToDevice = intermediateDevice->localToDevice();
-            offsetLocalToDevice.preTranslate(srcSubset.left(), srcSubset.top());
-            // We draw with non-AA bilinear since we cover the destination but definitely don't have
-            // a pixel-aligned transform.
-            intermediateDevice->drawSpecial(srcImage.get(), offsetLocalToDevice,
-                                            SkSamplingOptions{SkFilterMode::kLinear}, {});
+            // We use drawPaint to fill the entire device with the src input + clamp tiling, which
+            // extends the backdrop's edge pixels to the parts of 'requiredInput' that map offscreen
+            // Without this, the intermediateDevice would contain transparent pixels that may then
+            // infect blurs and other filters with large kernels.
+            SkPaint imageFill;
+            imageFill.setShader(srcImage->asShader(SkTileMode::kClamp,
+                                                   SkSamplingOptions{SkFilterMode::kLinear},
+                                                   SkMatrix::Translate(srcSubset.topLeft())));
+            intermediateDevice->drawPaint(imageFill);
             filterInput = intermediateDevice->snapSpecial();
 
             // TODO: Like the non-intermediate case, we need to apply the image origin.
@@ -1810,6 +1822,17 @@ void SkCanvas::drawVertices(const SkVertices* vertices, SkBlendMode mode, const
     this->onDrawVerticesObject(vertices, mode, paint);
 }
 
+#ifdef SK_ENABLE_SKSL
+void SkCanvas::drawCustomMesh(SkCustomMesh cm, sk_sp<SkBlender> blender, const SkPaint& paint) {
+    TRACE_EVENT0("skia", TRACE_FUNC);
+    RETURN_ON_FALSE(SkValidateCustomMesh(cm));
+    if (!blender) {
+        blender = SkBlender::Mode(SkBlendMode::kModulate);
+    }
+    this->onDrawCustomMesh(std::move(cm), std::move(blender), paint);
+}
+#endif
+
 void SkCanvas::drawPath(const SkPath& path, const SkPaint& paint) {
     TRACE_EVENT0("skia", TRACE_FUNC);
     this->onDrawPath(path, paint);
@@ -1864,12 +1887,12 @@ void SkCanvas::drawImageLattice(const SkImage* image, const Lattice& lattice, co
         latticePlusBounds.fBounds = &bounds;
     }
 
+    SkPaint latticePaint = clean_paint_for_lattice(paint);
     if (SkLatticeIter::Valid(image->width(), image->height(), latticePlusBounds)) {
-        SkPaint latticePaint = clean_paint_for_lattice(paint);
         this->onDrawImageLattice2(image, latticePlusBounds, dst, filter, &latticePaint);
     } else {
         this->drawImageRect(image, SkRect::MakeIWH(image->width(), image->height()), dst,
-                            SkSamplingOptions(filter), paint, kStrict_SrcRectConstraint);
+                            SkSamplingOptions(filter), &latticePaint, kStrict_SrcRectConstraint);
     }
 }
 
@@ -2126,7 +2149,7 @@ void SkCanvas::onDrawPath(const SkPath& path, const SkPaint& paint) {
         return;
     }
 
-    auto layer = this->aboutToDraw(this, paint, &pathBounds);
+    auto layer = this->aboutToDraw(this, paint, path.isInverseFillType() ? nullptr : &pathBounds);
     if (layer) {
         this->topDevice()->drawPath(path, layer->paint());
     }
@@ -2210,7 +2233,13 @@ void SkCanvas::onDrawImage2(const SkImage* image, SkScalar x, SkScalar y,
             // pre-concat here.
             SkMatrix layerToDevice = device->localToDevice();
             layerToDevice.preTranslate(x, y);
-            skif::Mapping mapping(layerToDevice, SkMatrix::Translate(-x, -y));
+
+            SkMatrix deviceToLayer;
+            if (!layerToDevice.invert(&deviceToLayer)) {
+                return; // bad ctm, draw nothing
+            }
+
+            skif::Mapping mapping(layerToDevice, deviceToLayer, SkMatrix::Translate(-x, -y));
 
             if (this->predrawNotify()) {
                 device->drawFilteredImage(mapping, special.get(), filter.get(), sampling,realPaint);
@@ -2294,7 +2323,7 @@ void SkCanvas::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPa
     }
     auto layer = this->aboutToDraw(this, paint, &bounds);
     if (layer) {
-        this->topDevice()->drawGlyphRunList(glyphRunList, layer->paint());
+        this->topDevice()->drawGlyphRunList(this, glyphRunList, layer->paint());
     }
 }
 
@@ -2333,7 +2362,7 @@ void SkCanvas::doDrawSlug(GrSlug* slug) {
         return;
     }
 
-    this->topDevice()->drawSlug(slug);
+    this->topDevice()->drawSlug(this, slug);
 }
 #endif
 
@@ -2452,6 +2481,21 @@ void SkCanvas::onDrawVerticesObject(const SkVertices* vertices, SkBlendMode bmod
     }
 }
 
+#ifdef SK_ENABLE_SKSL
+void SkCanvas::onDrawCustomMesh(SkCustomMesh cm, sk_sp<SkBlender> blender, const SkPaint& paint) {
+    SkPaint simplePaint = clean_paint_for_drawVertices(paint);
+
+    if (this->internalQuickReject(cm.bounds, simplePaint)) {
+        return;
+    }
+
+    auto layer = this->aboutToDraw(this, simplePaint, nullptr);
+    if (layer) {
+        this->topDevice()->drawCustomMesh(std::move(cm), std::move(blender), paint);
+    }
+}
+#endif
+
 void SkCanvas::drawPatch(const SkPoint cubics[12], const SkColor colors[4],
                          const SkPoint texCoords[4], SkBlendMode bmode,
                          const SkPaint& paint) {
@@ -2512,7 +2556,7 @@ void SkCanvas::onDrawDrawable(SkDrawable* dr, const SkMatrix* matrix) {
     // drawable bounds are no longer reliable (e.g. android displaylist)
     // so don't use them for quick-reject
     if (this->predrawNotify()) {
-        this->topDevice()->drawDrawable(dr, matrix, this);
+        this->topDevice()->drawDrawable(this, dr, matrix);
     }
 }
 
diff --git a/third_party/skia/src/core/SkCanvasPriv.cpp b/third_party/skia/src/core/SkCanvasPriv.cpp
index 6c642638317f0..b11e9a392ae18 100644
--- a/third_party/skia/src/core/SkCanvasPriv.cpp
+++ b/third_party/skia/src/core/SkCanvasPriv.cpp
@@ -101,6 +101,15 @@ void SkCanvasPriv::GetDstClipAndMatrixCounts(const SkCanvas::ImageSetEntry set[]
     *totalMatrixCount = maxMatrixIndex + 1;
 }
 
+#ifdef SK_ENABLE_SKSL
+void SkCanvasPriv::DrawCustomMesh(SkCanvas* canvas,
+                                  SkCustomMesh cm,
+                                  sk_sp<SkBlender> blender,
+                                  const SkPaint& paint) {
+    canvas->drawCustomMesh(cm, std::move(blender), paint);
+}
+#endif
+
 #if GR_TEST_UTILS
 
 #if SK_SUPPORT_GPU
diff --git a/third_party/skia/src/core/SkCanvasPriv.h b/third_party/skia/src/core/SkCanvasPriv.h
index 5b7e0401b415b..6d4654accf78c 100644
--- a/third_party/skia/src/core/SkCanvasPriv.h
+++ b/third_party/skia/src/core/SkCanvasPriv.h
@@ -92,6 +92,11 @@ class SkCanvasPriv {
     static void SetBackdropScaleFactor(SkCanvas::SaveLayerRec* rec, SkScalar scale) {
         rec->fExperimentalBackdropScale = scale;
     }
+
+    static void DrawCustomMesh(SkCanvas*,
+                               SkCustomMesh cm,
+                               sk_sp<SkBlender> blender,
+                               const SkPaint& paint);
 };
 
 /**
diff --git a/third_party/skia/src/core/SkRemoteGlyphCache.cpp b/third_party/skia/src/core/SkChromeRemoteGlyphCache.cpp
similarity index 70%
rename from third_party/skia/src/core/SkRemoteGlyphCache.cpp
rename to third_party/skia/src/core/SkChromeRemoteGlyphCache.cpp
index a9295515ec1ef..f9f244f6f10e7 100644
--- a/third_party/skia/src/core/SkRemoteGlyphCache.cpp
+++ b/third_party/skia/src/core/SkChromeRemoteGlyphCache.cpp
@@ -5,7 +5,7 @@
  * found in the LICENSE file.
  */
 
-#include "src/core/SkRemoteGlyphCache.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 
 #include <bitset>
 #include <iterator>
@@ -14,7 +14,7 @@
 #include <string>
 #include <tuple>
 
-#include "include/core/SkSerialProcs.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypeface.h"
 #include "include/private/SkChecksum.h"
@@ -23,6 +23,7 @@
 #include "src/core/SkDraw.h"
 #include "src/core/SkEnumerate.h"
 #include "src/core/SkGlyphRun.h"
+#include "src/core/SkReadBuffer.h"
 #include "src/core/SkScalerCache.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkStrikeForGPU.h"
@@ -34,36 +35,10 @@
 #include "include/gpu/GrContextOptions.h"
 #include "src/gpu/GrDrawOpAtlas.h"
 #include "src/gpu/text/GrSDFTControl.h"
+#include "src/gpu/text/GrTextBlob.h"
 #endif
 
-// This essentially replaces the font_id used on the RendererSide with the font_id on the GPU side.
-static SkDescriptor* auto_descriptor_from_desc(const SkDescriptor* source_desc,
-                                               SkFontID font_id,
-                                               SkAutoDescriptor* ad) {
-    ad->reset(source_desc->getLength());
-    auto* desc = ad->getDesc();
-
-    // Rec.
-    {
-        uint32_t size;
-        auto ptr = source_desc->findEntry(kRec_SkDescriptorTag, &size);
-        SkScalerContextRec rec;
-        std::memcpy((void*)&rec, ptr, size);
-        rec.fFontID = font_id;
-        desc->addEntry(kRec_SkDescriptorTag, sizeof(rec), &rec);
-    }
-
-    // Effects.
-    {
-        uint32_t size;
-        auto ptr = source_desc->findEntry(kEffects_SkDescriptorTag, &size);
-        if (ptr) { desc->addEntry(kEffects_SkDescriptorTag, size, ptr); }
-    }
-
-    desc->computeChecksum();
-    return desc;
-}
-
+namespace {
 // -- Serializer -----------------------------------------------------------------------------------
 size_t pad(size_t size, size_t alignment) { return (size + (alignment - 1)) & ~(alignment - 1); }
 
@@ -81,25 +56,19 @@ class Serializer {
 
     template <typename T, typename... Args>
     T* emplace(Args&&... args) {
-        auto result = allocate(sizeof(T), serialization_alignment<T>());
+        auto result = this->allocate(sizeof(T), serialization_alignment<T>());
         return new (result) T{std::forward<Args>(args)...};
     }
 
     template <typename T>
     void write(const T& data) {
-        T* result = (T*)allocate(sizeof(T), serialization_alignment<T>());
+        T* result = (T*)this->allocate(sizeof(T), serialization_alignment<T>());
         memcpy(result, &data, sizeof(T));
     }
 
-    template <typename T>
-    T* allocate() {
-        T* result = (T*)allocate(sizeof(T), serialization_alignment<T>());
-        return result;
-    }
-
     void writeDescriptor(const SkDescriptor& desc) {
         write(desc.getLength());
-        auto result = allocate(desc.getLength(), alignof(SkDescriptor));
+        auto result = this->allocate(desc.getLength(), alignof(SkDescriptor));
         memcpy(result, &desc, desc.getLength());
     }
 
@@ -132,17 +101,15 @@ class Deserializer {
     bool readDescriptor(SkAutoDescriptor* ad) {
         uint32_t descLength = 0u;
         if (!read<uint32_t>(&descLength)) return false;
-        if (descLength < sizeof(SkDescriptor)) return false;
-        if (descLength != SkAlign4(descLength)) return false;
 
-        auto* result = this->ensureAtLeast(descLength, alignof(SkDescriptor));
-        if (!result) return false;
-
-        ad->reset(descLength);
-        memcpy(ad->getDesc(), const_cast<const char*>(result), descLength);
+        auto* underlyingBuffer = this->ensureAtLeast(descLength, alignof(SkDescriptor));
+        if (!underlyingBuffer) return false;
+        SkReadBuffer buffer((void*)underlyingBuffer, descLength);
+        auto autoDescriptor = SkAutoDescriptor::MakeFromBuffer(buffer);
+        if (!autoDescriptor.has_value()) { return false; }
 
-        if (ad->getDesc()->getLength() > descLength) return false;
-        return ad->getDesc()->isValid();
+        *ad = std::move(*autoDescriptor);
+        return true;
     }
 
     const volatile void* read(size_t size, size_t alignment) {
@@ -170,21 +137,17 @@ class Deserializer {
     size_t fBytesRead = 0u;
 };
 
-bool SkFuzzDeserializeSkDescriptor(sk_sp<SkData> bytes, SkAutoDescriptor* ad) {
-    auto d = Deserializer(reinterpret_cast<const volatile char*>(bytes->data()), bytes->size());
-    return d.readDescriptor(ad);
-}
-
 // Paths use a SkWriter32 which requires 4 byte alignment.
-static const size_t kPathAlignment  = 4u;
+static const size_t kPathAlignment = 4u;
+static const size_t kDrawableAlignment = 8u;
 
 // -- StrikeSpec -----------------------------------------------------------------------------------
 struct StrikeSpec {
     StrikeSpec() = default;
-    StrikeSpec(SkFontID typefaceID_, SkDiscardableHandleId discardableHandleId_)
-            : typefaceID{typefaceID_}, discardableHandleId(discardableHandleId_) {}
-    SkFontID typefaceID = 0u;
-    SkDiscardableHandleId discardableHandleId = 0u;
+    StrikeSpec(SkTypefaceID typefaceID, SkDiscardableHandleId discardableHandleId)
+            : fTypefaceID{typefaceID}, fDiscardableHandleId(discardableHandleId) {}
+    SkTypefaceID fTypefaceID = 0u;
+    SkDiscardableHandleId fDiscardableHandleId = 0u;
     /* desc */
     /* n X (glyphs ids) */
 };
@@ -219,19 +182,6 @@ class LowerRangeBitVector {
     std::bitset<kMaxIndex> fBits;
 };
 
-// -- MapOps ---------------------------------------------------------------------------------------
-struct MapOps {
-    size_t operator()(const SkDescriptor* key) const;
-    bool operator()(const SkDescriptor* lhs, const SkDescriptor* rhs) const;
-};
-size_t MapOps::operator()(const SkDescriptor* key) const {
-    return key->getChecksum();
-}
-
-bool MapOps::operator()(const SkDescriptor* lhs, const SkDescriptor* rhs) const {
-    return *lhs == *rhs;
-}
-
 // -- RemoteStrike ----------------------------------------------------------------------------
 class RemoteStrike final : public SkStrikeForGPU {
 public:
@@ -255,20 +205,23 @@ class RemoteStrike final : public SkStrikeForGPU {
     }
 
     void prepareForMaskDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) override;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override;
 
     void prepareForSDFTDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) override;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override;
 
     void prepareForPathDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) override;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override;
+
+    void prepareForDrawableDrawing(
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override;
 
     void onAboutToExitScope() override {}
 
     sk_sp<SkStrike> getUnderlyingStrike() const override { return nullptr; }
 
     bool hasPendingGlyphs() const {
-        return !fMasksToSend.empty() || !fPathsToSend.empty();
+        return !fMasksToSend.empty() || !fPathsToSend.empty() || !fDrawablesToSend.empty();
     }
 
     void resetScalerContext();
@@ -276,29 +229,7 @@ class RemoteStrike final : public SkStrikeForGPU {
 private:
     template <typename Rejector>
     void commonMaskLoop(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects, Rejector&& reject);
-
-    // Keep track of if the glyph draw has been totally satisfied. It could be that this
-    // strike can not draw the glyph, and it must be rejected to be handled by fallback.
-    // For example, if a glyph has canDrawAsMask sent, then that data is on the GPU, and this
-    // strike totally satisfies this result. If canDrawAsMask is false, then this glyph must be
-    // rejected, and handled by a later stage using a latter strike.
-    struct MaskSummary {
-        static_assert(SkPackedGlyphID::kMaskAll < (1u << 30), "SkPackedGlyphID is too big.");
-        uint32_t packedID:30;
-        uint32_t canDrawAsMask:1;
-        uint32_t canDrawAsSDFT:1;
-    };
-
-    struct MaskSummaryTraits {
-        static SkPackedGlyphID GetKey(MaskSummary summary) {
-            return SkPackedGlyphID{summary.packedID};
-        }
-
-        static uint32_t Hash(SkPackedGlyphID packedID) {
-            return packedID.hash();
-        }
-    };
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected, Rejector&& reject);
 
     // Same thing as MaskSummary, but for paths.
     struct PathSummary {
@@ -319,7 +250,27 @@ class RemoteStrike final : public SkStrikeForGPU {
         }
     };
 
+    // Same thing as MaskSummary, but for drawables.
+    struct DrawableSummary {
+        constexpr static uint16_t kIsDrawable = 0;
+        SkGlyphID glyphID;
+        // If drawing glyphID can be done with a drawable, this is 0, otherwise it is the max
+        // dimension of the glyph.
+        uint16_t maxDimensionOrDrawable;
+    };
+
+    struct DrawableSummaryTraits {
+        static SkGlyphID GetKey(DrawableSummary summary) {
+            return summary.glyphID;
+        }
+
+        static uint32_t Hash(SkGlyphID packedID) {
+            return SkChecksum::CheapMix(packedID);
+        }
+    };
+
     void writeGlyphPath(const SkGlyph& glyph, Serializer* serializer) const;
+    void writeGlyphDrawable(const SkGlyph& glyph, Serializer* serializer) const;
     void ensureScalerContext();
 
     const SkAutoDescriptor fDescriptor;
@@ -340,16 +291,18 @@ class RemoteStrike final : public SkStrikeForGPU {
     LowerRangeBitVector fSentLowGlyphIDs;
 
     // The masks and paths that currently reside in the GPU process.
-    SkTHashTable<MaskSummary, SkPackedGlyphID, MaskSummaryTraits> fSentGlyphs;
+    SkTHashTable<SkGlyphDigest, uint32_t, SkGlyphDigest> fSentGlyphs;
     SkTHashTable<PathSummary, SkPackedGlyphID, PathSummaryTraits> fSentPaths;
+    SkTHashTable<DrawableSummary, SkGlyphID, DrawableSummaryTraits> fSentDrawables;
 
     // The Masks, SDFT Mask, and Paths that need to be sent to the GPU task for the processed
     // TextBlobs. Cleared after diffs are serialized.
     std::vector<SkGlyph> fMasksToSend;
     std::vector<SkGlyph> fPathsToSend;
+    std::vector<SkGlyph> fDrawablesToSend;
 
-    // Alloc for storing bits and pieces of paths, Cleared after diffs are serialized.
-    SkArenaAllocWithReset fPathAlloc{256};
+    // Alloc for storing bits and pieces of paths and drawables, Cleared after diffs are serialized.
+    SkArenaAllocWithReset fAlloc{256};
 };
 
 RemoteStrike::RemoteStrike(
@@ -368,7 +321,7 @@ RemoteStrike::RemoteStrike(
 
 // No need to write fForceBW because it is a flag private to SkScalerContext_DW, which will never
 // be called on the GPU side.
-static void writeGlyph(const SkGlyph& glyph, Serializer* serializer) {
+void write_glyph(const SkGlyph& glyph, Serializer* serializer) {
     serializer->write<SkPackedGlyphID>(glyph.getPackedID());
     serializer->write<float>(glyph.advanceX());
     serializer->write<float>(glyph.advanceY());
@@ -398,12 +351,12 @@ void RemoteStrike::writePendingGlyphs(Serializer* serializer) {
     // Write mask glyphs
     serializer->emplace<uint64_t>(fMasksToSend.size());
     for (SkGlyph& glyph : fMasksToSend) {
-        SkASSERT(SkMask::IsValidFormat(glyph.fMaskFormat));
+        SkASSERT(SkMask::IsValidFormat(glyph.maskFormat()));
 
-        writeGlyph(glyph, serializer);
+        write_glyph(glyph, serializer);
         auto imageSize = glyph.imageSize();
         if (imageSize > 0 && FitsInAtlas(glyph)) {
-            glyph.fImage = serializer->allocate(imageSize, glyph.formatAlignment());
+            glyph.setImage(serializer->allocate(imageSize, glyph.formatAlignment()));
             fContext->getImage(glyph);
         }
     }
@@ -412,13 +365,23 @@ void RemoteStrike::writePendingGlyphs(Serializer* serializer) {
     // Write glyphs paths.
     serializer->emplace<uint64_t>(fPathsToSend.size());
     for (SkGlyph& glyph : fPathsToSend) {
-        SkASSERT(SkMask::IsValidFormat(glyph.fMaskFormat));
+        SkASSERT(SkMask::IsValidFormat(glyph.maskFormat()));
 
-        writeGlyph(glyph, serializer);
-        writeGlyphPath(glyph, serializer);
+        write_glyph(glyph, serializer);
+        this->writeGlyphPath(glyph, serializer);
     }
     fPathsToSend.clear();
-    fPathAlloc.reset();
+
+    // Write glyphs drawables.
+    serializer->emplace<uint64_t>(fDrawablesToSend.size());
+    for (SkGlyph& glyph : fDrawablesToSend) {
+        SkASSERT(SkMask::IsValidFormat(glyph.maskFormat()));
+
+        write_glyph(glyph, serializer);
+        writeGlyphDrawable(glyph, serializer);
+    }
+    fDrawablesToSend.clear();
+    fAlloc.reset();
 }
 
 void RemoteStrike::ensureScalerContext() {
@@ -436,13 +399,7 @@ void RemoteStrike::setStrikeSpec(const SkStrikeSpec& strikeSpec) {
     fStrikeSpec = &strikeSpec;
 }
 
-void RemoteStrike::writeGlyphPath(
-        const SkGlyph& glyph, Serializer* serializer) const {
-    if (glyph.isColor() || glyph.isEmpty()) {
-        serializer->write<uint64_t>(0u);
-        return;
-    }
-
+void RemoteStrike::writeGlyphPath(const SkGlyph& glyph, Serializer* serializer) const {
     const SkPath* path = glyph.path();
 
     if (path == nullptr) {
@@ -457,88 +414,106 @@ void RemoteStrike::writeGlyphPath(
     serializer->write<bool>(glyph.pathIsHairline());
 }
 
+void RemoteStrike::writeGlyphDrawable(const SkGlyph& glyph, Serializer* serializer) const {
+    if (glyph.isEmpty()) {
+        serializer->write<uint64_t>(0u);
+        return;
+    }
+
+    SkDrawable* drawable = glyph.drawable();
+
+    if (drawable == nullptr) {
+        serializer->write<uint64_t>(0u);
+        return;
+    }
+
+    sk_sp<SkPicture> picture(drawable->newPictureSnapshot());
+    sk_sp<SkData> data = picture->serialize();
+    serializer->write<uint64_t>(data->size());
+    memcpy(serializer->allocate(data->size(), kDrawableAlignment), data->data(), data->size());
+}
+
 template <typename Rejector>
 void RemoteStrike::commonMaskLoop(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects, Rejector&& reject) {
-    drawables->forEachGlyphID(
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected, Rejector&& reject) {
+    accepted->forEachInput(
             [&](size_t i, SkPackedGlyphID packedID, SkPoint position) {
-                MaskSummary* summary = fSentGlyphs.find(packedID);
-                if (summary == nullptr) {
+                SkGlyphDigest* digest = fSentGlyphs.find(packedID.value());
+                if (digest == nullptr) {
                     // Put the new SkGlyph in the glyphs to send.
                     this->ensureScalerContext();
-                    fMasksToSend.emplace_back(fContext->makeGlyph(packedID, &fPathAlloc));
+                    fMasksToSend.emplace_back(fContext->makeGlyph(packedID, &fAlloc));
                     SkGlyph* glyph = &fMasksToSend.back();
 
-                    MaskSummary newSummary =
-                            {packedID.value(), CanDrawAsMask(*glyph), CanDrawAsSDFT(*glyph)};
-                    summary = fSentGlyphs.set(newSummary);
+                    SkGlyphDigest newDigest{0, *glyph};
+                    digest = fSentGlyphs.set(newDigest);
                 }
 
                 // Reject things that are too big.
-                if (reject(*summary)) {
-                    rejects->reject(i);
+                if (reject(*digest)) {
+                    rejected->reject(i);
                 }
             });
 }
 
 void RemoteStrike::prepareForMaskDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
-    for (auto [i, variant, _] : SkMakeEnumerate(drawables->input())) {
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
+    for (auto [i, variant, _] : SkMakeEnumerate(accepted->input())) {
         SkPackedGlyphID packedID = variant.packedID();
         if (fSentLowGlyphIDs.test(packedID)) {
             #ifdef SK_DEBUG
-            MaskSummary* summary = fSentGlyphs.find(packedID);
-            SkASSERT(summary != nullptr);
-            SkASSERT(summary->canDrawAsMask && summary->canDrawAsSDFT);
+            SkGlyphDigest* digest = fSentGlyphs.find(packedID.value());
+            SkASSERT(digest != nullptr);
+            SkASSERT(digest->canDrawAsMask() && digest->canDrawAsSDFT());
             #endif
             continue;
         }
 
-        MaskSummary* summary = fSentGlyphs.find(packedID);
-        if (summary == nullptr) {
+        SkGlyphDigest* digest = fSentGlyphs.find(packedID.value());
+        if (digest == nullptr) {
 
             // Put the new SkGlyph in the glyphs to send.
             this->ensureScalerContext();
-            fMasksToSend.emplace_back(fContext->makeGlyph(packedID, &fPathAlloc));
+            fMasksToSend.emplace_back(fContext->makeGlyph(packedID, &fAlloc));
             SkGlyph* glyph = &fMasksToSend.back();
 
-            MaskSummary newSummary =
-                    {packedID.value(), CanDrawAsMask(*glyph), CanDrawAsSDFT(*glyph)};
+            SkGlyphDigest newDigest{0, *glyph};
 
-            summary = fSentGlyphs.set(newSummary);
+            digest = fSentGlyphs.set(newDigest);
 
-            if (summary->canDrawAsMask && summary->canDrawAsSDFT) {
+            if (digest->canDrawAsMask() && digest->canDrawAsSDFT()) {
                 fSentLowGlyphIDs.setIfLower(packedID);
             }
         }
 
         // Reject things that are too big.
-        if (!summary->canDrawAsMask) {
-            rejects->reject(i);
+        // N.B. this must have the same behavior as SkScalerCache::prepareForMaskDrawing.
+        if (!digest->canDrawAsMask()) {
+            rejected->reject(i, digest->maxDimension());
         }
     }
 }
 
 void RemoteStrike::prepareForSDFTDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
-    this->commonMaskLoop(drawables, rejects,
-                         [](MaskSummary summary){return !summary.canDrawAsSDFT;});
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
+    this->commonMaskLoop(accepted, rejected,
+                         [](SkGlyphDigest digest){return !digest.canDrawAsSDFT();});
 }
 
 void RemoteStrike::prepareForPathDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
-    drawables->forEachGlyphID(
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
+    accepted->forEachInput(
             [&](size_t i, SkPackedGlyphID packedID, SkPoint position) {
                 PathSummary* summary = fSentPaths.find(packedID);
                 if (summary == nullptr) {
 
                     // Put the new SkGlyph in the glyphs to send.
                     this->ensureScalerContext();
-                    fPathsToSend.emplace_back(fContext->makeGlyph(packedID, &fPathAlloc));
+                    fPathsToSend.emplace_back(fContext->makeGlyph(packedID, &fAlloc));
                     SkGlyph* glyph = &fPathsToSend.back();
 
                     uint16_t maxDimensionOrPath = glyph->maxDimension();
-                    glyph->setPath(&fPathAlloc, fContext.get());
+                    glyph->setPath(&fAlloc, fContext.get());
                     if (glyph->path() != nullptr) {
                         maxDimensionOrPath = PathSummary::kIsPath;
                     }
@@ -548,7 +523,36 @@ void RemoteStrike::prepareForPathDrawing(
                 }
 
                 if (summary->maxDimensionOrPath != PathSummary::kIsPath) {
-                    rejects->reject(i, (int)summary->maxDimensionOrPath);
+                    rejected->reject(i, (int)summary->maxDimensionOrPath);
+                }
+            });
+}
+
+void RemoteStrike::prepareForDrawableDrawing(
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
+    accepted->forEachInput(
+            [&](size_t i, SkPackedGlyphID packedID, SkPoint position) {
+                SkGlyphID glyphID = packedID.glyphID();
+                DrawableSummary* summary = fSentDrawables.find(glyphID);
+                if (summary == nullptr) {
+
+                    // Put the new SkGlyph in the glyphs to send.
+                    this->ensureScalerContext();
+                    fDrawablesToSend.emplace_back(fContext->makeGlyph(packedID, &fAlloc));
+                    SkGlyph* glyph = &fDrawablesToSend.back();
+
+                    uint16_t maxDimensionOrDrawable = glyph->maxDimension();
+                    glyph->setDrawable(&fAlloc, fContext.get());
+                    if (glyph->drawable() != nullptr) {
+                        maxDimensionOrDrawable = DrawableSummary::kIsDrawable;
+                    }
+
+                    DrawableSummary newSummary = {glyph->getGlyphID(), maxDimensionOrDrawable};
+                    summary = fSentDrawables.set(newSummary);
+                }
+
+                if (summary->maxDimensionOrDrawable != DrawableSummary::kIsDrawable) {
+                    rejected->reject(i, (int)summary->maxDimensionOrDrawable);
                 }
             });
 }
@@ -556,20 +560,21 @@ void RemoteStrike::prepareForPathDrawing(
 // -- WireTypeface ---------------------------------------------------------------------------------
 struct WireTypeface {
     WireTypeface() = default;
-    WireTypeface(SkFontID typeface_id, int glyph_count, SkFontStyle style,
-                 bool is_fixed, bool needsCurrentColor)
-      : typefaceID(typeface_id), glyphCount(glyph_count), style(style),
-        isFixed(is_fixed), glyphMaskNeedsCurrentColor(needsCurrentColor) {}
-
-    SkFontID        typefaceID{0};
-    int             glyphCount{0};
-    SkFontStyle     style;
-    bool            isFixed{false};
+    WireTypeface(SkTypefaceID typefaceId, int glyphCount, SkFontStyle style,
+                 bool isFixed, bool needsCurrentColor)
+      : fTypefaceID(typefaceId), fGlyphCount(glyphCount), fStyle(style),
+        fIsFixed(isFixed), fGlyphMaskNeedsCurrentColor(needsCurrentColor) {}
+
+    SkTypefaceID    fTypefaceID{0};
+    int             fGlyphCount{0};
+    SkFontStyle     fStyle;
+    bool            fIsFixed{false};
     // Used for COLRv0 or COLRv1 fonts that may need the 0xFFFF special palette
     // index to represent foreground color. This information needs to be on here
     // to determine how this typeface can be cached.
-    bool            glyphMaskNeedsCurrentColor{false};
+    bool            fGlyphMaskNeedsCurrentColor{false};
 };
+}  // namespace
 
 // -- SkStrikeServerImpl ---------------------------------------------------------------------------
 class SkStrikeServerImpl final : public SkStrikeForGPUCacheInterface {
@@ -594,17 +599,25 @@ class SkStrikeServerImpl final : public SkStrikeForGPUCacheInterface {
 
     RemoteStrike* getOrCreateCache(const SkStrikeSpec& strikeSpec);
 
+    struct MapOps {
+        size_t operator()(const SkDescriptor* key) const {
+            return key->getChecksum();
+        }
+        bool operator()(const SkDescriptor* lhs, const SkDescriptor* rhs) const {
+            return *lhs == *rhs;
+        }
+    };
 
     using DescToRemoteStrike =
     std::unordered_map<const SkDescriptor*, std::unique_ptr<RemoteStrike>, MapOps, MapOps>;
     DescToRemoteStrike fDescToRemoteStrike;
 
     SkStrikeServer::DiscardableHandleManager* const fDiscardableHandleManager;
-    SkTHashSet<SkFontID> fCachedTypefaces;
+    SkTHashSet<SkTypefaceID> fCachedTypefaces;
     size_t fMaxEntriesInDescriptorMap = kMaxEntriesInDescriptorMap;
 
     // Cached serialized typefaces.
-    SkTHashMap<SkFontID, sk_sp<SkData>> fSerializedTypefaces;
+    SkTHashMap<SkTypefaceID, sk_sp<SkData>> fSerializedTypefaces;
 
     // State cached until the next serialization.
     SkTHashSet<RemoteStrike*> fRemoteStrikesToSend;
@@ -754,7 +767,7 @@ RemoteStrike* SkStrikeServerImpl::getOrCreateCache(const SkStrikeSpec& strikeSpe
 
     const SkTypeface& typeface = strikeSpec.typeface();
     // Create a new RemoteStrike. Start by processing the typeface.
-    const SkFontID typefaceId = typeface.uniqueID();
+    const SkTypefaceID typefaceId = typeface.uniqueID();
     if (!fCachedTypefaces.contains(typefaceId)) {
         fCachedTypefaces.add(typefaceId);
         fTypefacesToSend.emplace_back(typefaceId, typeface.countGlyphs(),
@@ -786,7 +799,9 @@ class GlyphTrackingDevice final : public SkNoPixelsDevice {
             : SkNoPixelsDevice(SkIRect::MakeSize(dimensions), props, std::move(colorSpace))
             , fStrikeServerImpl(server)
             , fDFTSupport(DFTSupport)
-            , fPainter{props, kUnknown_SkColorType, imageInfo().colorSpace(), fStrikeServerImpl} {
+            , fPainter{props, kUnknown_SkColorType, imageInfo().colorSpace(), fStrikeServerImpl}
+            , fConvertPainter{props, kUnknown_SkColorType, imageInfo().colorSpace(),
+                              SkStrikeCache::GlobalStrikeCache()} {
         SkASSERT(fStrikeServerImpl != nullptr);
     }
 
@@ -797,8 +812,10 @@ class GlyphTrackingDevice final : public SkNoPixelsDevice {
     }
 
 protected:
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override {
-        #if SK_SUPPORT_GPU
+    #if SK_SUPPORT_GPU
+    void onDrawGlyphRunList(SkCanvas*,
+                            const SkGlyphRunList& glyphRunList,
+                            const SkPaint& paint) override {
         GrContextOptions ctxOptions;
         GrSDFTControl control =
                 GrSDFTControl{fDFTSupport,
@@ -810,21 +827,54 @@ class GlyphTrackingDevice final : public SkNoPixelsDevice {
         drawMatrix.preTranslate(glyphRunList.origin().x(), glyphRunList.origin().y());
         const uint64_t uniqueID = glyphRunList.uniqueID();
         for (auto& glyphRun : glyphRunList) {
-            fPainter.processGlyphRun(glyphRun,
+            fPainter.processGlyphRun(nullptr,
+                                     glyphRun,
                                      drawMatrix,
                                      paint,
                                      control,
-                                     nullptr,
                                      "Cache Diff",
                                      uniqueID);
         }
-        #endif  // SK_SUPPORT_GPU
     }
 
+    sk_sp<GrSlug> convertGlyphRunListToSlug(const SkGlyphRunList& glyphRunList,
+                                            const SkPaint& paint) override {
+        GrContextOptions ctxOptions;
+        GrSDFTControl control =
+                GrSDFTControl{fDFTSupport,
+                              this->surfaceProps().isUseDeviceIndependentFonts(),
+                              ctxOptions.fMinDistanceFieldFontSize,
+                              ctxOptions.fGlyphsAsPathsFontSize};
+
+        SkMatrix drawMatrix = this->localToDevice();
+
+        // Run to fill the cache with the right strike transfer information.
+        drawMatrix.preTranslate(glyphRunList.origin().x(), glyphRunList.origin().y());
+
+        // TODO these two passes can be converted into one when the SkRemoteGlyphCache's strike
+        //  cache is fortified with enough information for supporting slug creation.
+
+        // Use the lightweight strike cache provided by SkRemoteGlyphCache through fPainter to do
+        // the analysis.
+        for (auto& glyphRun : glyphRunList) {
+            fPainter.processGlyphRun(nullptr,
+                                     glyphRun,
+                                     drawMatrix,
+                                     paint,
+                                     control,
+                                     "Convert Slug Analysis");
+        }
+
+        // Use the glyph strike cache to get actual glyph information.
+        return skgpu::v1::MakeSlug(drawMatrix, glyphRunList, paint, control, &fConvertPainter);
+    }
+    #endif  // SK_SUPPORT_GPU
+
 private:
     SkStrikeServerImpl* const fStrikeServerImpl;
     const bool fDFTSupport{false};
     SkGlyphRunListPainter fPainter;
+    SkGlyphRunListPainter fConvertPainter;
 };
 
 // -- SkStrikeServer -------------------------------------------------------------------------------
@@ -886,12 +936,25 @@ class SkStrikeClientImpl {
     sk_sp<SkTypeface> deserializeTypeface(const void* data, size_t length);
 
     bool readStrikeData(const volatile void* memory, size_t memorySize);
+    bool translateTypefaceID(SkAutoDescriptor* descriptor) const;
 
 private:
+    class PictureBackedGlyphDrawable final : public SkDrawable {
+    public:
+        PictureBackedGlyphDrawable(sk_sp<SkPicture> self) : fSelf(std::move(self)) {}
+    private:
+        sk_sp<SkPicture> fSelf;
+        SkRect onGetBounds() override { return fSelf->cullRect();  }
+        size_t onApproximateBytesUsed() override {
+            return sizeof(PictureBackedGlyphDrawable) + fSelf->approximateBytesUsed();
+        }
+        void onDraw(SkCanvas* canvas) override { canvas->drawPicture(fSelf); }
+    };
+
     static bool ReadGlyph(SkTLazy<SkGlyph>& glyph, Deserializer* deserializer);
     sk_sp<SkTypeface> addTypeface(const WireTypeface& wire);
 
-    SkTHashMap<SkFontID, sk_sp<SkTypeface>> fRemoteFontIdToTypeface;
+    SkTHashMap<SkTypefaceID, sk_sp<SkTypeface>> fRemoteFontIdToTypeface;
     sk_sp<SkStrikeClient::DiscardableHandleManager> fDiscardableHandleManager;
     SkStrikeCache* const fStrikeCache;
     const bool fIsLogging;
@@ -945,6 +1008,7 @@ bool SkStrikeClientImpl::readStrikeData(const volatile void* memory, size_t memo
     uint64_t strikeCount = 0;
     uint64_t glyphImagesCount = 0;
     uint64_t glyphPathsCount = 0;
+    uint64_t glyphDrawablesCount = 0;
 
     if (!deserializer.read<uint64_t>(&typefaceSize)) READ_FAILURE
     for (size_t i = 0; i < typefaceSize; ++i) {
@@ -968,8 +1032,8 @@ bool SkStrikeClientImpl::readStrikeData(const volatile void* memory, size_t memo
         StrikeSpec spec;
         if (!deserializer.read<StrikeSpec>(&spec)) READ_FAILURE
 
-        SkAutoDescriptor sourceAd;
-        if (!deserializer.readDescriptor(&sourceAd)) READ_FAILURE
+        SkAutoDescriptor ad;
+        if (!deserializer.readDescriptor(&ad)) READ_FAILURE
         #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
             msg.appendf("  Received descriptor:\n%s", sourceAd.getDesc()->dumpRec().c_str());
         #endif
@@ -982,34 +1046,31 @@ bool SkStrikeClientImpl::readStrikeData(const volatile void* memory, size_t memo
             if (!deserializer.read<SkFontMetrics>(&fontMetrics)) READ_FAILURE
         }
 
-        // Get the local typeface from remote fontID.
-        auto* tfPtr = fRemoteFontIdToTypeface.find(spec.typefaceID);
-        // Received strikes for a typeface which doesn't exist.
-        if (!tfPtr) READ_FAILURE
-        auto* tf = tfPtr->get();
-
         // Replace the ContextRec in the desc from the server to create the client
         // side descriptor.
-        // TODO: Can we do this in-place and re-compute checksum? Instead of a complete copy.
-        SkAutoDescriptor ad;
-        auto* client_desc = auto_descriptor_from_desc(sourceAd.getDesc(), tf->uniqueID(), &ad);
+        if (!this->translateTypefaceID(&ad)) READ_FAILURE
+        SkDescriptor* clientDesc = ad.getDesc();
 
         #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-            msg.appendf("  Mapped descriptor:\n%s", client_desc->dumpRec().c_str());
+            msg.appendf("  Mapped descriptor:\n%s", clientDesc->dumpRec().c_str());
         #endif
-        auto strike = fStrikeCache->findStrike(*client_desc);
+        auto strike = fStrikeCache->findStrike(*clientDesc);
         // Metrics are only sent the first time. If the metrics are not initialized, there must
         // be an existing strike.
         if (fontMetricsInitialized && strike == nullptr) READ_FAILURE
         if (strike == nullptr) {
+            // Get the local typeface from remote fontID.
+            auto* tfPtr = fRemoteFontIdToTypeface.find(spec.fTypefaceID);
+            // Received strikes for a typeface which doesn't exist.
+            if (!tfPtr) READ_FAILURE
             // Note that we don't need to deserialize the effects since we won't be generating any
             // glyphs here anyway, and the desc is still correct since it includes the serialized
             // effects.
-            SkStrikeSpec strikeSpec{*client_desc, *tfPtr};
+            SkStrikeSpec strikeSpec{*clientDesc, *tfPtr};
             strike = fStrikeCache->createStrike(
                     strikeSpec, &fontMetrics,
                     std::make_unique<DiscardableStrikePinner>(
-                            spec.discardableHandleId, fDiscardableHandleManager));
+                            spec.fDiscardableHandleId, fDiscardableHandleManager));
         }
 
         if (!deserializer.read<uint64_t>(&glyphImagesCount)) READ_FAILURE
@@ -1050,6 +1111,30 @@ bool SkStrikeClientImpl::readStrikeData(const volatile void* memory, size_t memo
 
             strike->mergePath(allocatedGlyph, pathPtr, hairline);
         }
+
+        if (!deserializer.read<uint64_t>(&glyphDrawablesCount)) READ_FAILURE
+        for (size_t j = 0; j < glyphDrawablesCount; j++) {
+            SkTLazy<SkGlyph> glyph;
+            if (!ReadGlyph(glyph, &deserializer)) READ_FAILURE
+
+            SkGlyph* allocatedGlyph = strike->mergeGlyphAndImage(glyph->getPackedID(), *glyph);
+
+            sk_sp<SkDrawable> drawable;
+            uint64_t drawableSize = 0u;
+            if (!deserializer.read<uint64_t>(&drawableSize)) READ_FAILURE
+
+            if (drawableSize > 0) {
+                auto* drawableData = deserializer.read(drawableSize, kDrawableAlignment);
+                if (!drawableData) READ_FAILURE
+                sk_sp<SkPicture> picture(SkPicture::MakeFromData(
+                        const_cast<const void*>(drawableData), drawableSize));
+                if (!picture) READ_FAILURE
+
+                drawable = sk_make_sp<PictureBackedGlyphDrawable>(std::move(picture));
+            }
+
+            strike->mergeDrawable(allocatedGlyph, std::move(drawable));
+        }
     }
 
 #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
@@ -1060,6 +1145,30 @@ bool SkStrikeClientImpl::readStrikeData(const volatile void* memory, size_t memo
     return true;
 }
 
+bool SkStrikeClientImpl::translateTypefaceID(SkAutoDescriptor* toChange) const {
+    SkDescriptor& descriptor = *toChange->getDesc();
+
+    // Rewrite the typefaceID in the rec.
+    {
+        uint32_t size;
+        // findEntry returns a const void*, remove the const in order to update in place.
+        void* ptr = const_cast<void *>(descriptor.findEntry(kRec_SkDescriptorTag, &size));
+        SkScalerContextRec rec;
+        std::memcpy((void*)&rec, ptr, size);
+        // Get the local typeface from remote typefaceID.
+        auto* tfPtr = fRemoteFontIdToTypeface.find(rec.fTypefaceID);
+        // Received a strike for a typeface which doesn't exist.
+        if (!tfPtr) { return false; }
+        // Update the typeface id to work with the client side.
+        rec.fTypefaceID = tfPtr->get()->uniqueID();
+        std::memcpy(ptr, &rec, size);
+    }
+
+    descriptor.computeChecksum();
+
+    return true;
+}
+
 sk_sp<SkTypeface> SkStrikeClientImpl::deserializeTypeface(const void* buf, size_t len) {
     WireTypeface wire;
     if (len != sizeof(wire)) return nullptr;
@@ -1068,13 +1177,13 @@ sk_sp<SkTypeface> SkStrikeClientImpl::deserializeTypeface(const void* buf, size_
 }
 
 sk_sp<SkTypeface> SkStrikeClientImpl::addTypeface(const WireTypeface& wire) {
-    auto* typeface = fRemoteFontIdToTypeface.find(wire.typefaceID);
+    auto* typeface = fRemoteFontIdToTypeface.find(wire.fTypefaceID);
     if (typeface) return *typeface;
 
     auto newTypeface = sk_make_sp<SkTypefaceProxy>(
-            wire.typefaceID, wire.glyphCount, wire.style, wire.isFixed,
-            wire.glyphMaskNeedsCurrentColor, fDiscardableHandleManager, fIsLogging);
-    fRemoteFontIdToTypeface.set(wire.typefaceID, newTypeface);
+            wire.fTypefaceID, wire.fGlyphCount, wire.fStyle, wire.fIsFixed,
+            wire.fGlyphMaskNeedsCurrentColor, fDiscardableHandleManager, fIsLogging);
+    fRemoteFontIdToTypeface.set(wire.fTypefaceID, newTypeface);
     return std::move(newTypeface);
 }
 
@@ -1093,3 +1202,13 @@ bool SkStrikeClient::readStrikeData(const volatile void* memory, size_t memorySi
 sk_sp<SkTypeface> SkStrikeClient::deserializeTypeface(const void* buf, size_t len) {
     return fImpl->deserializeTypeface(buf, len);
 }
+
+bool SkStrikeClient::translateTypefaceID(SkAutoDescriptor* descriptor) const {
+    return fImpl->translateTypefaceID(descriptor);
+}
+
+#if SK_SUPPORT_GPU
+sk_sp<GrSlug> SkStrikeClient::makeSlugFromBuffer(SkReadBuffer& buffer) const {
+    return GrSlug::MakeFromBuffer(buffer, this);
+}
+#endif  // SK_SUPPORT_GPU
diff --git a/third_party/skia/src/core/SkClipStack.h b/third_party/skia/src/core/SkClipStack.h
index 090beb2ce6e46..c325d2c6192cf 100644
--- a/third_party/skia/src/core/SkClipStack.h
+++ b/third_party/skia/src/core/SkClipStack.h
@@ -21,7 +21,7 @@
 #if SK_SUPPORT_GPU
 class GrProxyProvider;
 
-#include "include/private/GrResourceKey.h"
+#include "src/gpu/ResourceKey.h"
 #endif
 
 // Because a single save/restore state can have multiple clips, this class
@@ -195,7 +195,7 @@ class SkClipStack {
          * the element is destroyed because their key is based on this element's gen ID.
          */
         void addResourceInvalidationMessage(GrProxyProvider* proxyProvider,
-                                            const GrUniqueKey& key) const {
+                                            const skgpu::UniqueKey& key) const {
             SkASSERT(proxyProvider);
 
             if (!fProxyProvider) {
@@ -238,8 +238,8 @@ class SkClipStack {
 
         uint32_t fGenID;
 #if SK_SUPPORT_GPU
-        mutable GrProxyProvider*      fProxyProvider = nullptr;
-        mutable SkTArray<GrUniqueKey> fKeysToInvalidate;
+        mutable GrProxyProvider*           fProxyProvider = nullptr;
+        mutable SkTArray<skgpu::UniqueKey> fKeysToInvalidate;
 #endif
         Element(int saveCount) {
             this->initCommon(saveCount, SkClipOp::kIntersect, false);
diff --git a/third_party/skia/src/core/SkConvertPixels.cpp b/third_party/skia/src/core/SkConvertPixels.cpp
index f00042b37199a..ef999d289ae4b 100644
--- a/third_party/skia/src/core/SkConvertPixels.cpp
+++ b/third_party/skia/src/core/SkConvertPixels.cpp
@@ -103,7 +103,8 @@ static bool convert_to_alpha8(const SkImageInfo& dstInfo,       void* vdst, size
         case kR16G16_float_SkColorType:
         case kRGB_888x_SkColorType:
         case kRGB_101010x_SkColorType:
-        case kBGR_101010x_SkColorType: {
+        case kBGR_101010x_SkColorType:
+        case kR8_unorm_SkColorType: {
             for (int y = 0; y < srcInfo.height(); ++y) {
                memset(dst, 0xFF, srcInfo.width());
                dst = SkTAddOffset<uint8_t>(dst, dstRB);
diff --git a/third_party/skia/src/core/SkCustomMesh.cpp b/third_party/skia/src/core/SkCustomMesh.cpp
new file mode 100644
index 0000000000000..3920ccd24e37d
--- /dev/null
+++ b/third_party/skia/src/core/SkCustomMesh.cpp
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/core/SkCustomMesh.h"
+
+#ifdef SK_ENABLE_SKSL
+
+#include "src/core/SkCustomMeshPriv.h"
+#include "src/gpu/GrShaderCaps.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLSharedCompiler.h"
+#include "src/sksl/ir/SkSLFunctionDefinition.h"
+#include "src/sksl/ir/SkSLProgram.h"
+#include "src/sksl/ir/SkSLVarDeclarations.h"
+
+#include <locale>
+
+using Attribute = SkCustomMeshSpecification::Attribute;
+using Varying   = SkCustomMeshSpecification::Varying;
+
+#define RETURN_FAILURE(...) return Result{nullptr, SkStringPrintf(__VA_ARGS__)}
+
+#define RETURN_ERROR(...) return std::make_tuple(false, SkStringPrintf(__VA_ARGS__))
+
+#define RETURN_SUCCESS return std::make_tuple(true, SkString{})
+
+static bool has_main(const SkSL::Program& p) {
+    for (const SkSL::ProgramElement* elem : p.elements()) {
+        if (elem->is<SkSL::FunctionDefinition>()) {
+            const SkSL::FunctionDefinition& defn = elem->as<SkSL::FunctionDefinition>();
+            const SkSL::FunctionDeclaration& decl = defn.declaration();
+            if (decl.isMain()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+using ColorType = SkCustomMeshSpecificationPriv::ColorType;
+
+static std::tuple<ColorType, bool>
+get_fs_color_type_and_local_coords(const SkSL::Program& fsProgram) {
+    for (const SkSL::ProgramElement* elem : fsProgram.elements()) {
+        if (elem->is<SkSL::FunctionDefinition>()) {
+            const SkSL::FunctionDefinition& defn = elem->as<SkSL::FunctionDefinition>();
+            const SkSL::FunctionDeclaration& decl = defn.declaration();
+            if (decl.isMain()) {
+
+                SkCustomMeshSpecificationPriv::ColorType ct;
+                SkASSERT(decl.parameters().size() == 1 || decl.parameters().size() == 2);
+                if (decl.parameters().size() == 1) {
+                    ct = ColorType::kNone;
+                } else {
+                    const SkSL::Type& paramType = decl.parameters()[1]->type();
+                    SkASSERT(paramType.matches(*fsProgram.fContext->fTypes.fHalf4) ||
+                             paramType.matches(*fsProgram.fContext->fTypes.fFloat4));
+                    ct = paramType.matches(*fsProgram.fContext->fTypes.fHalf4)
+                                 ? ColorType::kHalf4
+                                 : ColorType::kFloat4;
+                }
+
+                const SkSL::Type& returnType = decl.returnType();
+                SkASSERT(returnType.matches(*fsProgram.fContext->fTypes.fVoid) ||
+                         returnType.matches(*fsProgram.fContext->fTypes.fFloat2));
+                bool hasLocalCoords = returnType.matches(*fsProgram.fContext->fTypes.fFloat2);
+
+                return std::make_tuple(ct, hasLocalCoords);
+            }
+        }
+    }
+    SkUNREACHABLE;
+}
+
+// This is a non-exhaustive check for the validity of a variable name. The SkSL compiler will
+// actually process the name. We're just guarding against having multiple tokens embedded in the
+// name before we put it into a struct definition.
+static bool check_name(const SkString& name) {
+    if (name.isEmpty()) {
+        return false;
+    }
+    for (size_t i = 0; i < name.size(); ++i) {
+        if (name[i] != '_' && !std::isalnum(name[i], std::locale::classic())) {
+            return false;
+        }
+    }
+    return true;
+}
+
+static size_t attribute_type_size(Attribute::Type type) {
+    switch (type) {
+        case Attribute::Type::kFloat:         return 4;
+        case Attribute::Type::kFloat2:        return 2*4;
+        case Attribute::Type::kFloat3:        return 3*4;
+        case Attribute::Type::kFloat4:        return 4*4;
+        case Attribute::Type::kUByte4_unorm:  return 4;
+    }
+    SkUNREACHABLE;
+};
+
+static const char* attribute_type_string(Attribute::Type type) {
+    switch (type) {
+        case Attribute::Type::kFloat:         return "float";
+        case Attribute::Type::kFloat2:        return "float2";
+        case Attribute::Type::kFloat3:        return "float3";
+        case Attribute::Type::kFloat4:        return "float4";
+        case Attribute::Type::kUByte4_unorm:  return "half4";
+    }
+    SkUNREACHABLE;
+};
+
+static const char* varying_type_string(Varying::Type type) {
+    switch (type) {
+        case Varying::Type::kFloat:  return "float";
+        case Varying::Type::kFloat2: return "float2";
+        case Varying::Type::kFloat3: return "float3";
+        case Varying::Type::kFloat4: return "float4";
+        case Varying::Type::kHalf:   return "half";
+        case Varying::Type::kHalf2:  return "half2";
+        case Varying::Type::kHalf3:  return "half3";
+        case Varying::Type::kHalf4:  return "half4";
+    }
+    SkUNREACHABLE;
+};
+
+std::tuple<bool, SkString>
+check_vertex_offsets_and_stride(SkSpan<const Attribute> attributes,
+                                size_t                  stride) {
+    // Vulkan 1.0 has a minimum maximum attribute count of 2048.
+    static_assert(SkCustomMeshSpecification::kMaxStride       <= 2048);
+    // ES 2 has a max of 8.
+    static_assert(SkCustomMeshSpecification::kMaxAttributes   <= 8);
+    // Four bytes alignment is required by Metal.
+    static_assert(SkCustomMeshSpecification::kStrideAlignment >= 4);
+    static_assert(SkCustomMeshSpecification::kOffsetAlignment >= 4);
+    // ES2 has a minimum maximum of 8. We may need one for a broken gl_FragCoord workaround and
+    // one for local coords.
+    static_assert(SkCustomMeshSpecification::kMaxVaryings     <= 6);
+
+    if (attributes.empty()) {
+        RETURN_ERROR("At least 1 attribute is required.");
+    }
+    if (attributes.size() > SkCustomMeshSpecification::kMaxAttributes) {
+        RETURN_ERROR("A maximum of %zu attributes is allowed.",
+                     SkCustomMeshSpecification::kMaxAttributes);
+    }
+    static_assert(SkIsPow2(SkCustomMeshSpecification::kStrideAlignment));
+    if (stride == 0 || stride & (SkCustomMeshSpecification::kStrideAlignment - 1)) {
+        RETURN_ERROR("Vertex stride must be a non-zero multiple of %zu.",
+                     SkCustomMeshSpecification::kStrideAlignment);
+    }
+    if (stride > SkCustomMeshSpecification::kMaxStride) {
+        RETURN_ERROR("Stride cannot exceed %zu.", SkCustomMeshSpecification::kMaxStride);
+    }
+    for (const auto& a : attributes) {
+        if (a.offset & (SkCustomMeshSpecification::kOffsetAlignment - 1)) {
+            RETURN_ERROR("Attribute offset must be a multiple of %zu.",
+                         SkCustomMeshSpecification::kOffsetAlignment);
+        }
+        // This equivalent to vertexAttributeAccessBeyondStride==VK_FALSE in
+        // VK_KHR_portability_subset. First check is to avoid overflow in second check.
+        if (a.offset >= stride || a.offset + attribute_type_size(a.type) > stride) {
+            RETURN_ERROR("Attribute offset plus size cannot exceed stride.");
+        }
+    }
+    RETURN_SUCCESS;
+}
+
+SkCustomMeshSpecification::Result SkCustomMeshSpecification::Make(
+        SkSpan<const Attribute> attributes,
+        size_t                  vertexStride,
+        SkSpan<const Varying>   varyings,
+        const SkString&         vs,
+        const SkString&         fs,
+        sk_sp<SkColorSpace>     cs,
+        SkAlphaType             at) {
+    SkString attributesStruct("struct Attributes {\n");
+    for (const auto& a : attributes) {
+        attributesStruct.appendf("  %s %s;\n", attribute_type_string(a.type), a.name.c_str());
+    }
+    attributesStruct.append("};\n");
+
+    SkString varyingStruct("struct Varyings {\n");
+    for (const auto& v : varyings) {
+        varyingStruct.appendf("  %s %s;\n", varying_type_string(v.type), v.name.c_str());
+    }
+    // Throw in an unused variable to avoid an empty struct, which is illegal.
+    if (varyings.empty()) {
+        varyingStruct.append("  bool _empty_;\n");
+    }
+    varyingStruct.append("};\n");
+
+    SkString fullVS;
+    fullVS.append(varyingStruct.c_str());
+    fullVS.append(attributesStruct.c_str());
+    fullVS.append(vs.c_str());
+
+    SkString fullFS;
+    fullFS.append(varyingStruct.c_str());
+    fullFS.append(fs.c_str());
+
+    return MakeFromSourceWithStructs(attributes,
+                                     vertexStride,
+                                     varyings,
+                                     fullVS,
+                                     fullFS,
+                                     std::move(cs),
+                                     at);
+}
+
+SkCustomMeshSpecification::Result SkCustomMeshSpecification::MakeFromSourceWithStructs(
+        SkSpan<const Attribute> attributes,
+        size_t                  stride,
+        SkSpan<const Varying>   varyings,
+        const SkString&         vs,
+        const SkString&         fs,
+        sk_sp<SkColorSpace>     cs,
+        SkAlphaType             at) {
+    if (auto [ok, error] = check_vertex_offsets_and_stride(attributes, stride); !ok) {
+        return {nullptr, error};
+    }
+
+    for (const auto& a : attributes) {
+        if (!check_name(a.name)) {
+            RETURN_FAILURE("\"%s\" is not a valid attribute name.", a.name.c_str());
+        }
+    }
+
+    if (varyings.size() > kMaxVaryings) {
+        RETURN_FAILURE("A maximum of %zu varyings is allowed.", kMaxVaryings);
+    }
+
+    for (const auto& v : varyings) {
+        if (!check_name(v.name)) {
+            return {nullptr, SkStringPrintf("\"%s\" is not a valid varying name.", v.name.c_str())};
+        }
+    }
+
+    SkSL::SharedCompiler compiler;
+    SkSL::Program::Settings settings;
+    settings.fEnforceES2Restrictions = true;
+    std::unique_ptr<SkSL::Program> vsProgram = compiler->convertProgram(
+            SkSL::ProgramKind::kCustomMeshVertex,
+            std::string(vs.c_str()),
+            settings);
+    if (!vsProgram) {
+        RETURN_FAILURE("VS: %s", compiler->errorText().c_str());
+    }
+    if (!has_main(*vsProgram)) {
+        RETURN_FAILURE("Vertex shader must have main function.");
+    }
+    if (SkSL::Analysis::CallsColorTransformIntrinsics(*vsProgram)) {
+        RETURN_FAILURE("Color transform intrinsics are not permitted in custom mesh shaders");
+    }
+
+    std::unique_ptr<SkSL::Program> fsProgram = compiler->convertProgram(
+            SkSL::ProgramKind::kCustomMeshFragment,
+            std::string(fs.c_str()),
+            settings);
+
+    if (!fsProgram) {
+        RETURN_FAILURE("FS: %s", compiler->errorText().c_str());
+    }
+    if (!has_main(*fsProgram)) {
+        RETURN_FAILURE("Fragment shader must have main function.");
+    }
+    if (SkSL::Analysis::CallsColorTransformIntrinsics(*fsProgram)) {
+        RETURN_FAILURE("Color transform intrinsics are not permitted in custom mesh shaders");
+    }
+
+    auto [ct, hasLocalCoords] = get_fs_color_type_and_local_coords(*fsProgram);
+
+    if (ct == ColorType::kNone) {
+        cs = nullptr;
+        at = kPremul_SkAlphaType;
+    } else {
+        if (!cs) {
+            return {nullptr, SkString{"Must provide a color space if FS returns a color."}};
+        }
+        if (at == kUnknown_SkAlphaType) {
+            return {nullptr, SkString{"Must provide a valid alpha type if FS returns a color."}};
+        }
+    }
+
+    return {sk_sp<SkCustomMeshSpecification>(new SkCustomMeshSpecification(attributes,
+                                                                           stride,
+                                                                           varyings,
+                                                                           std::move(vsProgram),
+                                                                           std::move(fsProgram),
+                                                                           ct,
+                                                                           hasLocalCoords,
+                                                                           std::move(cs),
+                                                                           at)),
+            /*error=*/ {}};
+}
+
+SkCustomMeshSpecification::~SkCustomMeshSpecification() = default;
+
+SkCustomMeshSpecification::SkCustomMeshSpecification(SkSpan<const Attribute>        attributes,
+                                                     size_t                         stride,
+                                                     SkSpan<const Varying>          varyings,
+                                                     std::unique_ptr<SkSL::Program> vs,
+                                                     std::unique_ptr<SkSL::Program> fs,
+                                                     ColorType                      ct,
+                                                     bool                           hasLocalCoords,
+                                                     sk_sp<SkColorSpace>            cs,
+                                                     SkAlphaType                    at)
+        : fAttributes(attributes.begin(), attributes.end())
+        , fVaryings(varyings.begin(), varyings.end())
+        , fVS(std::move(vs))
+        , fFS(std::move(fs))
+        , fStride(stride)
+        , fColorType(ct)
+        , fHasLocalCoords(hasLocalCoords)
+        , fColorSpace(std::move(cs))
+        , fAlphaType(at) {
+    fHash = SkOpts::hash_fn(fVS->fSource->c_str(), fVS->fSource->size(), 0);
+    fHash = SkOpts::hash_fn(fFS->fSource->c_str(), fFS->fSource->size(), fHash);
+
+    // The attributes and varyings SkSL struct declarations are included in the program source.
+    // However, the attribute offsets and types need to be included, the latter because the SkSL
+    // struct definition has the GPU type but not the CPU data format.
+    for (const auto& a : fAttributes) {
+        fHash = SkOpts::hash_fn(&a.offset, sizeof(a.offset), fHash);
+        fHash = SkOpts::hash_fn(&a.type,   sizeof(a.type),   fHash);
+    }
+
+    fHash = SkOpts::hash_fn(&stride, sizeof(stride), fHash);
+
+    uint64_t csHash = fColorSpace ? fColorSpace->hash() : 0;
+    fHash = SkOpts::hash_fn(&csHash, sizeof(csHash), fHash);
+
+    auto atInt = static_cast<uint32_t>(fAlphaType);
+    fHash = SkOpts::hash_fn(&atInt, sizeof(atInt), fHash);
+}
+#endif //SK_ENABLE_SKSL
diff --git a/third_party/skia/src/core/SkCustomMeshPriv.cpp b/third_party/skia/src/core/SkCustomMeshPriv.cpp
new file mode 100644
index 0000000000000..3619d76d9ed0c
--- /dev/null
+++ b/third_party/skia/src/core/SkCustomMeshPriv.cpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkCustomMeshPriv.h"
+
+#ifdef SK_ENABLE_SKSL
+
+static int min_vcount_for_mode(SkCustomMesh::Mode mode) {
+    switch (mode) {
+        case SkCustomMesh::Mode::kTriangles:     return 3;
+        case SkCustomMesh::Mode::kTriangleStrip: return 3;
+    }
+    SkUNREACHABLE;
+}
+
+bool SkValidateCustomMesh(const SkCustomMesh& cm) {
+    if (!cm.spec) {
+        return false;
+    }
+
+    if (!cm.vb) {
+        return false;
+    }
+
+    if (cm.vcount <= 0) {
+        return false;
+    }
+
+    if (cm.indices) {
+        if (cm.icount < min_vcount_for_mode(cm.mode)) {
+            return false;
+        }
+    } else {
+        if (cm.icount > 0) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+std::unique_ptr<const char[]> SkCopyCustomMeshVB(const SkCustomMesh& cm) {
+    SkASSERT(cm.spec);
+    size_t size = cm.spec->stride()*cm.vcount;
+
+    auto vb = std::make_unique<char[]>(size);
+    std::memcpy(vb.get(), cm.vb, size);
+
+    return std::move(vb);
+}
+
+std::unique_ptr<const uint16_t[]> SkCopyCustomMeshIB(const SkCustomMesh& cm) {
+    SkASSERT(cm.spec);
+    SkASSERT(SkToBool(cm.indices) == SkToBool(cm.icount));
+    if (!cm.indices) {
+        return nullptr;
+    }
+    auto ib = std::make_unique<uint16_t[]>(cm.icount);
+    std::copy_n(cm.indices, cm.icount, ib.get());
+
+    return std::move(ib);
+}
+
+#endif
diff --git a/third_party/skia/src/core/SkCustomMeshPriv.h b/third_party/skia/src/core/SkCustomMeshPriv.h
new file mode 100644
index 0000000000000..2a8da99d35739
--- /dev/null
+++ b/third_party/skia/src/core/SkCustomMeshPriv.h
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkCustomMeshPriv_DEFINED
+#define SkCustomMeshPriv_DEFINED
+
+#include "include/core/SkCustomMesh.h"
+
+#ifdef SK_ENABLE_SKSL
+#include "include/private/GrTypesPriv.h"
+#include "src/core/SkSLTypeShared.h"
+
+struct SkCustomMeshSpecificationPriv {
+    using Varying   = SkCustomMeshSpecification::Varying;
+    using Attribute = SkCustomMeshSpecification::Attribute;
+    using ColorType = SkCustomMeshSpecification::ColorType;
+
+    static SkSpan<const Varying> Varyings(const SkCustomMeshSpecification& spec) {
+        return SkMakeSpan(spec.fVaryings);
+    }
+
+    static const SkSL::Program* VS(const SkCustomMeshSpecification& spec) { return spec.fVS.get(); }
+    static const SkSL::Program* FS(const SkCustomMeshSpecification& spec) { return spec.fFS.get(); }
+
+    static int Hash(const SkCustomMeshSpecification& spec) { return spec.fHash; }
+
+    static ColorType GetColorType(const SkCustomMeshSpecification& spec) { return spec.fColorType; }
+    static bool HasColors(const SkCustomMeshSpecification& spec) {
+        return GetColorType(spec) != ColorType::kNone;
+    }
+
+    static SkColorSpace* ColorSpace(const SkCustomMeshSpecification& spec) {
+        return spec.fColorSpace.get();
+    }
+
+    static SkAlphaType AlphaType(const SkCustomMeshSpecification& spec) { return spec.fAlphaType; }
+
+    static bool HasLocalCoords(const SkCustomMeshSpecification& spec) {
+        return spec.fHasLocalCoords;
+    }
+
+    static SkSLType VaryingTypeAsSLType(Varying::Type type) {
+        switch (type) {
+            case Varying::Type::kFloat:  return SkSLType::kFloat;
+            case Varying::Type::kFloat2: return SkSLType::kFloat2;
+            case Varying::Type::kFloat3: return SkSLType::kFloat3;
+            case Varying::Type::kFloat4: return SkSLType::kFloat4;
+            case Varying::Type::kHalf:   return SkSLType::kHalf;
+            case Varying::Type::kHalf2:  return SkSLType::kHalf2;
+            case Varying::Type::kHalf3:  return SkSLType::kHalf3;
+            case Varying::Type::kHalf4:  return SkSLType::kHalf4;
+        }
+        SkUNREACHABLE;
+    }
+
+    static GrVertexAttribType AttrTypeAsVertexAttribType(Attribute::Type type) {
+        switch (type) {
+            case Attribute::Type::kFloat:        return kFloat_GrVertexAttribType;
+            case Attribute::Type::kFloat2:       return kFloat2_GrVertexAttribType;
+            case Attribute::Type::kFloat3:       return kFloat3_GrVertexAttribType;
+            case Attribute::Type::kFloat4:       return kFloat4_GrVertexAttribType;
+            case Attribute::Type::kUByte4_unorm: return kUByte4_norm_GrVertexAttribType;
+        }
+        SkUNREACHABLE;
+    }
+
+    static SkSLType AttrTypeAsSLType(Attribute::Type type) {
+        switch (type) {
+            case Attribute::Type::kFloat:        return SkSLType::kFloat;
+            case Attribute::Type::kFloat2:       return SkSLType::kFloat2;
+            case Attribute::Type::kFloat3:       return SkSLType::kFloat3;
+            case Attribute::Type::kFloat4:       return SkSLType::kFloat4;
+            case Attribute::Type::kUByte4_unorm: return SkSLType::kHalf4;
+        }
+        SkUNREACHABLE;
+    }
+};
+
+bool SkValidateCustomMesh(const SkCustomMesh&);
+
+std::unique_ptr<const char[]> SkCopyCustomMeshVB(const SkCustomMesh& cm);
+
+std::unique_ptr<const uint16_t[]> SkCopyCustomMeshIB(const SkCustomMesh& cm);
+
+#endif  // SK_ENABLE_SKSL
+
+#endif
diff --git a/third_party/skia/src/core/SkData.cpp b/third_party/skia/src/core/SkData.cpp
index 3b857bdcfd843..0682ee061c6e9 100644
--- a/third_party/skia/src/core/SkData.cpp
+++ b/third_party/skia/src/core/SkData.cpp
@@ -57,7 +57,9 @@ size_t SkData::copyRange(size_t offset, size_t length, void* buffer) const {
     }
     SkASSERT(length > 0);
 
-    memcpy(buffer, this->bytes() + offset, length);
+    if (buffer) {
+        memcpy(buffer, this->bytes() + offset, length);
+    }
     return length;
 }
 
diff --git a/third_party/skia/src/core/SkDebugUtils.h b/third_party/skia/src/core/SkDebugUtils.h
new file mode 100644
index 0000000000000..9333e837d12d0
--- /dev/null
+++ b/third_party/skia/src/core/SkDebugUtils.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkDebugUtils_DEFINED
+#define SkDebugUtils_DEFINED
+
+#include "include/core/SkTileMode.h"
+
+static constexpr const char* SkTileModeToStr(SkTileMode tm) {
+    switch (tm) {
+        case SkTileMode::kClamp:  return "Clamp";
+        case SkTileMode::kRepeat: return "Repeat";
+        case SkTileMode::kMirror: return "Mirror";
+        case SkTileMode::kDecal:  return "Decal";
+    }
+    SkUNREACHABLE;
+}
+
+#endif // SkDebugUtils_DEFINED
diff --git a/third_party/skia/src/core/SkDeferredDisplayListPriv.h b/third_party/skia/src/core/SkDeferredDisplayListPriv.h
index 1067cb78cba5b..b77f11dec5434 100644
--- a/third_party/skia/src/core/SkDeferredDisplayListPriv.h
+++ b/third_party/skia/src/core/SkDeferredDisplayListPriv.h
@@ -41,8 +41,6 @@ class SkDeferredDisplayListPriv {
 
 private:
     explicit SkDeferredDisplayListPriv(SkDeferredDisplayList* ddl) : fDDL(ddl) {}
-    // Required until C++17 copy elision
-    SkDeferredDisplayListPriv(const SkDeferredDisplayListPriv&) = default;
     SkDeferredDisplayListPriv& operator=(const SkDeferredDisplayListPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/core/SkDescriptor.cpp b/third_party/skia/src/core/SkDescriptor.cpp
index 787fb2965584c..9ffce8999cc63 100644
--- a/third_party/skia/src/core/SkDescriptor.cpp
+++ b/third_party/skia/src/core/SkDescriptor.cpp
@@ -6,16 +6,21 @@
  */
 
 #include "src/core/SkDescriptor.h"
+#include <string.h>
 
 #include <new>
 
 #include "include/core/SkTypes.h"
 #include "include/private/SkTo.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkOpts.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/gpu/GrResourceProvider.h"
 
 std::unique_ptr<SkDescriptor> SkDescriptor::Alloc(size_t length) {
-    SkASSERT(SkAlign4(length) == length);
-    void* allocation = ::operator new (length);
+    SkASSERT(length >= sizeof(SkDescriptor) && SkAlign4(length) == length);
+    void* allocation = ::operator new(length);
     return std::unique_ptr<SkDescriptor>(new (allocation) SkDescriptor{});
 }
 
@@ -24,6 +29,10 @@ void* SkDescriptor::operator new(size_t) {
     SK_ABORT("Descriptors are created with placement new.");
 }
 
+void SkDescriptor::flatten(SkWriteBuffer& buffer) const {
+    buffer.writePad32(static_cast<const void*>(this), this->fLength);
+}
+
 void* SkDescriptor::addEntry(uint32_t tag, size_t length, const void* data) {
     SkASSERT(tag);
     SkASSERT(SkAlign4(length) == length);
@@ -38,7 +47,7 @@ void* SkDescriptor::addEntry(uint32_t tag, size_t length, const void* data) {
 
     fCount += 1;
     fLength = SkToU32(fLength + sizeof(Entry) + length);
-    return (entry + 1); // return its data
+    return (entry + 1);  // return its data
 }
 
 void SkDescriptor::computeChecksum() {
@@ -47,7 +56,7 @@ void SkDescriptor::computeChecksum() {
 
 const void* SkDescriptor::findEntry(uint32_t tag, uint32_t* length) const {
     const Entry* entry = (const Entry*)(this + 1);
-    int          count = fCount;
+    int count = fCount;
 
     while (--count >= 0) {
         if (entry->fTag == tag) {
@@ -68,7 +77,6 @@ std::unique_ptr<SkDescriptor> SkDescriptor::copy() const {
 }
 
 bool SkDescriptor::operator==(const SkDescriptor& other) const {
-
     // the first value we should look at is the checksum, so this loop
     // should terminate early if they descriptors are different.
     // NOTE: if we wrote a sentinel value at the end of each, we could
@@ -96,7 +104,7 @@ SkString SkDescriptor::dumpRec() const {
 }
 
 uint32_t SkDescriptor::ComputeChecksum(const SkDescriptor* desc) {
-    const uint32_t* ptr = (const uint32_t*)desc + 1; // skip the checksum field
+    const uint32_t* ptr = (const uint32_t*)desc + 1;  // skip the checksum field
     size_t len = desc->fLength - sizeof(uint32_t);
     return SkOpts::hash(ptr, len);
 }
@@ -165,6 +173,32 @@ SkAutoDescriptor& SkAutoDescriptor::operator=(SkAutoDescriptor&& that) {
 
 SkAutoDescriptor::~SkAutoDescriptor() { this->free(); }
 
+std::optional<SkAutoDescriptor> SkAutoDescriptor::MakeFromBuffer(SkReadBuffer& buffer) {
+    SkDescriptor descriptorHeader;
+    if (!buffer.readPad32(&descriptorHeader, sizeof(SkDescriptor))) { return {}; }
+
+    // Basic bounds check on header length to make sure that bodyLength calculation does not
+    // underflow.
+    if (descriptorHeader.getLength() < sizeof(SkDescriptor)) { return {}; }
+    uint32_t bodyLength = descriptorHeader.getLength() - sizeof(SkDescriptor);
+
+    // Make sure the fLength makes sense with respect to the incoming data.
+    if (bodyLength > buffer.available()) {
+        return {};
+    }
+
+    SkAutoDescriptor ad{descriptorHeader.getLength()};
+    memcpy(ad.fDesc, &descriptorHeader, sizeof(SkDescriptor));
+    if (!buffer.readPad32(SkTAddOffset<void>(ad.fDesc, sizeof(SkDescriptor)), bodyLength)) {
+        return {};
+    }
+
+    if (SkDescriptor::ComputeChecksum(ad.getDesc()) != ad.getDesc()->fChecksum) { return {}; }
+    if (!ad.getDesc()->isValid()) { return {}; }
+
+    return {ad};
+}
+
 void SkAutoDescriptor::reset(size_t size) {
     this->free();
     if (size <= sizeof(fStorage)) {
diff --git a/third_party/skia/src/core/SkDescriptor.h b/third_party/skia/src/core/SkDescriptor.h
index 314290879187d..9e535afdc267f 100644
--- a/third_party/skia/src/core/SkDescriptor.h
+++ b/third_party/skia/src/core/SkDescriptor.h
@@ -13,6 +13,8 @@
 
 #include "include/private/SkMacros.h"
 #include "include/private/SkNoncopyable.h"
+#include "src/core/SkBuffer.h"
+#include "src/core/SkFontPriv.h"
 #include "src/core/SkScalerContext.h"
 
 class SkDescriptor : SkNoncopyable {
@@ -30,6 +32,8 @@ class SkDescriptor : SkNoncopyable {
     void* operator new(size_t);
     void* operator new(size_t, void* p) { return p; }
 
+    void flatten(SkWriteBuffer& buffer) const;
+
     uint32_t getLength() const { return fLength; }
     void* addEntry(uint32_t tag, size_t length, const void* data = nullptr);
     void computeChecksum();
@@ -86,9 +90,11 @@ class SkAutoDescriptor {
     SkAutoDescriptor& operator=(const SkAutoDescriptor&);
     SkAutoDescriptor(SkAutoDescriptor&&);
     SkAutoDescriptor& operator=(SkAutoDescriptor&&);
-
     ~SkAutoDescriptor();
 
+    // Returns no value if there is an error.
+    static std::optional<SkAutoDescriptor> MakeFromBuffer(SkReadBuffer& buffer);
+
     void reset(size_t size);
     void reset(const SkDescriptor& desc);
     SkDescriptor* getDesc() const { SkASSERT(fDesc); return fDesc; }
diff --git a/third_party/skia/src/core/SkDevice.cpp b/third_party/skia/src/core/SkDevice.cpp
index 797f5622fc39b..5d4018bccf3c1 100644
--- a/third_party/skia/src/core/SkDevice.cpp
+++ b/third_party/skia/src/core/SkDevice.cpp
@@ -294,7 +294,7 @@ void SkBaseDevice::drawEdgeAAImageSet(const SkCanvas::ImageSetEntry images[], in
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SkBaseDevice::drawDrawable(SkDrawable* drawable, const SkMatrix* matrix, SkCanvas* canvas) {
+void SkBaseDevice::drawDrawable(SkCanvas* canvas, SkDrawable* drawable, const SkMatrix* matrix) {
     drawable->draw(canvas, matrix);
 }
 
@@ -423,23 +423,27 @@ static sk_sp<SkShader> make_post_inverse_lm(const SkShader* shader, const SkMatr
     return shader->makeWithLocalMatrix(lm_inv * inverse * lm * outer_lm);
 }
 
-void SkBaseDevice::drawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
+void SkBaseDevice::drawGlyphRunList(SkCanvas* canvas,
+                                    const SkGlyphRunList& glyphRunList,
+                                    const SkPaint& paint) {
     if (!this->localToDevice().isFinite()) {
         return;
     }
 
     if (!glyphRunList.hasRSXForm()) {
-        this->onDrawGlyphRunList(glyphRunList, paint);
+        this->onDrawGlyphRunList(canvas, glyphRunList, paint);
     } else {
-        this->simplifyGlyphRunRSXFormAndRedraw(glyphRunList, paint);
+        this->simplifyGlyphRunRSXFormAndRedraw(canvas, glyphRunList, paint);
     }
 }
 
-void SkBaseDevice::simplifyGlyphRunRSXFormAndRedraw(const SkGlyphRunList& glyphRunList,
+void SkBaseDevice::simplifyGlyphRunRSXFormAndRedraw(SkCanvas* canvas,
+                                                    const SkGlyphRunList& glyphRunList,
                                                     const SkPaint& paint) {
     for (const SkGlyphRun& run : glyphRunList) {
         if (run.scaledRotations().empty()) {
-            this->drawGlyphRunList(SkGlyphRunList{run, run.sourceBounds(paint), {0, 0}}, paint);
+            SkGlyphRunList subList{run, run.sourceBounds(paint), {0, 0}};
+            this->drawGlyphRunList(canvas, subList, paint);
         } else {
             SkPoint origin = glyphRunList.origin();
             SkPoint sharedPos{0, 0};    // we're at the origin
@@ -453,7 +457,6 @@ void SkBaseDevice::simplifyGlyphRunRSXFormAndRedraw(const SkGlyphRunList& glyphR
                     SkSpan<const SkVector>{}
             };
 
-            const SkM44 originalLocalToDevice = this->localToDevice44();
             for (auto [i, glyphID, pos] : SkMakeEnumerate(run.source())) {
                 sharedGlyphID = glyphID;
                 auto [scos, ssin] = run.scaledRotations()[i];
@@ -467,11 +470,11 @@ void SkBaseDevice::simplifyGlyphRunRSXFormAndRedraw(const SkGlyphRunList& glyphR
                 // change to the ctm.
                 SkPaint invertingPaint{paint};
                 invertingPaint.setShader(make_post_inverse_lm(paint.getShader(), glyphToLocal));
-                this->setLocalToDevice(originalLocalToDevice * SkM44(glyphToLocal));
-                this->drawGlyphRunList(
-                    SkGlyphRunList{glyphRun, glyphRun.sourceBounds(paint), {0, 0}}, invertingPaint);
+                SkAutoCanvasRestore acr(canvas, true);
+                canvas->concat(SkM44(glyphToLocal));
+                SkGlyphRunList subList{glyphRun, glyphRun.sourceBounds(paint), {0, 0}};
+                this->drawGlyphRunList(canvas, subList, invertingPaint);
             }
-            this->setLocalToDevice(originalLocalToDevice);
         }
     }
 }
@@ -479,11 +482,11 @@ void SkBaseDevice::simplifyGlyphRunRSXFormAndRedraw(const SkGlyphRunList& glyphR
 #if SK_SUPPORT_GPU
 sk_sp<GrSlug> SkBaseDevice::convertGlyphRunListToSlug(
         const SkGlyphRunList& glyphRunList,
-        const SkPaint& paint) const {
+        const SkPaint& paint) {
     return nullptr;
 }
 
-void SkBaseDevice::drawSlug(GrSlug* slug) {
+void SkBaseDevice::drawSlug(SkCanvas*, GrSlug*) {
     SK_ABORT("GrSlug drawing not supported.");
 }
 #endif
diff --git a/third_party/skia/src/core/SkDevice.h b/third_party/skia/src/core/SkDevice.h
index 2615bdfae6eef..2b2fac23814df 100644
--- a/third_party/skia/src/core/SkDevice.h
+++ b/third_party/skia/src/core/SkDevice.h
@@ -11,6 +11,7 @@
 #include "include/core/SkBlender.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
+#include "include/core/SkCustomMesh.h"
 #include "include/core/SkRefCnt.h"
 #include "include/core/SkRegion.h"
 #include "include/core/SkShader.h"
@@ -190,7 +191,7 @@ class SkBaseDevice : public SkRefCnt, public SkMatrixProvider {
     virtual skgpu::BaseDevice* asGpuDevice() { return nullptr; }
 
     // Ensure that non-RSXForm runs are passed to onDrawGlyphRunList.
-    void drawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint);
+    void drawGlyphRunList(SkCanvas*, const SkGlyphRunList& glyphRunList, const SkPaint& paint);
 
 protected:
     enum TileUsage {
@@ -264,6 +265,9 @@ class SkBaseDevice : public SkRefCnt, public SkMatrixProvider {
                                   const SkRect& dst, SkFilterMode, const SkPaint&);
 
     virtual void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) = 0;
+#ifdef SK_ENABLE_SKSL
+    virtual void drawCustomMesh(SkCustomMesh cm, sk_sp<SkBlender>, const SkPaint&) = 0;
+#endif
     virtual void drawShadow(const SkPath&, const SkDrawShadowRec&);
 
     // default implementation calls drawVertices
@@ -289,17 +293,17 @@ class SkBaseDevice : public SkRefCnt, public SkMatrixProvider {
                                     const SkSamplingOptions&, const SkPaint&,
                                     SkCanvas::SrcRectConstraint);
 
-    virtual void drawDrawable(SkDrawable*, const SkMatrix*, SkCanvas*);
+    virtual void drawDrawable(SkCanvas*, SkDrawable*, const SkMatrix*);
 
     // Only called with glyphRunLists that do not contain RSXForm.
-    virtual void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) = 0;
+    virtual void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) = 0;
 
     // GrSlug handling routines.
 #if SK_SUPPORT_GPU
     virtual sk_sp<GrSlug> convertGlyphRunListToSlug(
             const SkGlyphRunList& glyphRunList,
-            const SkPaint& paint) const;
-    virtual void drawSlug(GrSlug* slug);
+            const SkPaint& paint);
+    virtual void drawSlug(SkCanvas*, GrSlug* slug);
 #endif
 
     /**
@@ -410,7 +414,7 @@ class SkBaseDevice : public SkRefCnt, public SkMatrixProvider {
     friend class SkSurface_Raster;
     friend class DeviceTestingAccess;
 
-    void simplifyGlyphRunRSXFormAndRedraw(const SkGlyphRunList& glyphRunList, const SkPaint& paint);
+    void simplifyGlyphRunRSXFormAndRedraw(SkCanvas*, const SkGlyphRunList&, const SkPaint&);
 
     // used to change the backend's pixels (and possibly config/rowbytes)
     // but cannot change the width/height, so there should be no change to
@@ -516,11 +520,14 @@ class SkNoPixelsDevice : public SkBaseDevice {
     void drawPath(const SkPath&, const SkPaint&, bool) override {}
     void drawDevice(SkBaseDevice*, const SkSamplingOptions&, const SkPaint&) override {}
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override {}
+#ifdef SK_ENABLE_SKSL
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override {}
+#endif
 
     void drawFilteredImage(const skif::Mapping&, SkSpecialImage* src, const SkImageFilter*,
                            const SkSamplingOptions&, const SkPaint&) override {}
 
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override {}
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override {}
 
 
     bool isNoPixelsDevice() const override { return true; }
diff --git a/third_party/skia/src/core/SkDraw.cpp b/third_party/skia/src/core/SkDraw.cpp
index b1cfa3ebff261..60d18e92bb80e 100644
--- a/third_party/skia/src/core/SkDraw.cpp
+++ b/third_party/skia/src/core/SkDraw.cpp
@@ -359,6 +359,10 @@ void SkDraw::drawPoints(SkCanvas::PointMode mode, size_t count,
         return;
     }
 
+    if (!SkScalarsAreFinite(&pts[0].fX, count * 2)) {
+        return;
+    }
+
     SkMatrix ctm = fMatrixProvider->localToDevice();
     PtProcRec rec;
     if (!device && rec.init(mode, paint, &ctm, fRC)) {
@@ -816,9 +820,6 @@ void SkDraw::drawDevPath(const SkPath& devPath, const SkPaint& paint, bool drawC
                 case SkPaint::kRound_Cap:
                     proc = SkScan::AntiHairRoundPath;
                     break;
-                default:
-                    proc SK_INIT_TO_AVOID_WARNING;
-                    SkDEBUGFAIL("unknown paint cap type");
             }
         } else {
             switch (paint.getStrokeCap()) {
@@ -831,9 +832,6 @@ void SkDraw::drawDevPath(const SkPath& devPath, const SkPaint& paint, bool drawC
                 case SkPaint::kRound_Cap:
                     proc = SkScan::HairRoundPath;
                     break;
-                default:
-                    proc SK_INIT_TO_AVOID_WARNING;
-                    SkDEBUGFAIL("unknown paint cap type");
             }
         }
     }
@@ -1084,7 +1082,7 @@ void SkDraw::validate() const {
 #include "src/core/SkBlitter.h"
 #include "src/core/SkDraw.h"
 
-bool SkDraw::ComputeMaskBounds(const SkRect& devPathBounds, const SkIRect* clipBounds,
+bool SkDraw::ComputeMaskBounds(const SkRect& devPathBounds, const SkIRect& clipBounds,
                                const SkMaskFilter* filter, const SkMatrix* filterMatrix,
                                SkIRect* bounds) {
     //  init our bounds from the path
@@ -1103,20 +1101,17 @@ bool SkDraw::ComputeMaskBounds(const SkRect& devPathBounds, const SkIRect* clipB
         }
     }
 
-    // (possibly) trim the bounds to reflect the clip
-    // (plus whatever slop the filter needs)
-    if (clipBounds) {
-        // Ugh. Guard against gigantic margins from wacky filters. Without this
-        // check we can request arbitrary amounts of slop beyond our visible
-        // clip, and bring down the renderer (at least on finite RAM machines
-        // like handsets, etc.). Need to balance this invented value between
-        // quality of large filters like blurs, and the corresponding memory
-        // requests.
-        static const int MAX_MARGIN = 128;
-        if (!bounds->intersect(clipBounds->makeOutset(std::min(margin.fX, MAX_MARGIN),
-                                                      std::min(margin.fY, MAX_MARGIN)))) {
-            return false;
-        }
+    // trim the bounds to reflect the clip (plus whatever slop the filter needs)
+    // Ugh. Guard against gigantic margins from wacky filters. Without this
+    // check we can request arbitrary amounts of slop beyond our visible
+    // clip, and bring down the renderer (at least on finite RAM machines
+    // like handsets, etc.). Need to balance this invented value between
+    // quality of large filters like blurs, and the corresponding memory
+    // requests.
+    static constexpr int kMaxMargin = 128;
+    if (!bounds->intersect(clipBounds.makeOutset(std::min(margin.fX, kMaxMargin),
+                                                 std::min(margin.fY, kMaxMargin)))) {
+        return false;
     }
 
     return true;
@@ -1154,7 +1149,7 @@ static void draw_into_mask(const SkMask& mask, const SkPath& devPath,
     draw.drawPath(devPath, paint);
 }
 
-bool SkDraw::DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
+bool SkDraw::DrawToMask(const SkPath& devPath, const SkIRect& clipBounds,
                         const SkMaskFilter* filter, const SkMatrix* filterMatrix,
                         SkMask* mask, SkMask::CreateMode mode,
                         SkStrokeRec::InitStyle style) {
@@ -1163,7 +1158,13 @@ bool SkDraw::DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
     }
 
     if (SkMask::kJustRenderImage_CreateMode != mode) {
-        if (!ComputeMaskBounds(devPath.getBounds(), clipBounds, filter,
+        // By using infinite bounds for inverse fills, ComputeMaskBounds is able to clip it to
+        // 'clipBounds' outset by whatever extra margin the mask filter requires.
+        static const SkRect kInverseBounds = { SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+                                               SK_ScalarInfinity, SK_ScalarInfinity};
+        SkRect pathBounds = devPath.isInverseFillType() ? kInverseBounds
+                                                        : devPath.getBounds();
+        if (!ComputeMaskBounds(pathBounds, clipBounds, filter,
                                filterMatrix, &mask->fBounds))
             return false;
     }
diff --git a/third_party/skia/src/core/SkDraw.h b/third_party/skia/src/core/SkDraw.h
index 03c5631348ac9..dc5fe8ede985b 100644
--- a/third_party/skia/src/core/SkDraw.h
+++ b/third_party/skia/src/core/SkDraw.h
@@ -61,9 +61,10 @@ class SkDraw : public SkGlyphRunListPainter::BitmapDevicePainter {
     void    drawBitmap(const SkBitmap&, const SkMatrix&, const SkRect* dstOrNull,
                        const SkSamplingOptions&, const SkPaint&) const override;
     void    drawSprite(const SkBitmap&, int x, int y, const SkPaint&) const;
-    void    drawGlyphRunList(const SkGlyphRunList& glyphRunList,
-                             const SkPaint& paint,
-                             SkGlyphRunListPainter* glyphPainter) const;
+    void    drawGlyphRunList(SkCanvas* canvas,
+                             SkGlyphRunListPainter* glyphPainter,
+                             const SkGlyphRunList& glyphRunList,
+                             const SkPaint& paint) const;
     void    drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) const;
     void  drawAtlas(const SkRSXform[], const SkRect[], const SkColor[], int count,
                     sk_sp<SkBlender>, const SkPaint&);
@@ -81,14 +82,9 @@ class SkDraw : public SkGlyphRunListPainter::BitmapDevicePainter {
         this->drawPath(src, paint, nullptr, false, !isHairline, customBlitter);
     }
 
-    void paintPaths(SkDrawableGlyphBuffer* drawables,
-                    SkScalar scale,
-                    SkPoint origin,
-                    const SkPaint& paint) const override;
+    void paintMasks(SkDrawableGlyphBuffer* accepted, const SkPaint& paint) const override;
 
-    void paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint) const override;
-
-    static bool ComputeMaskBounds(const SkRect& devPathBounds, const SkIRect* clipBounds,
+    static bool ComputeMaskBounds(const SkRect& devPathBounds, const SkIRect& clipBounds,
                                   const SkMaskFilter* filter, const SkMatrix* filterMatrix,
                                   SkIRect* bounds);
 
@@ -97,7 +93,7 @@ class SkDraw : public SkGlyphRunListPainter::BitmapDevicePainter {
         that must be done afterwards (by calling filterMask). The maskfilter is provided
         solely to assist in computing the mask's bounds (if the mode requests that).
     */
-    static bool DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
+    static bool DrawToMask(const SkPath& devPath, const SkIRect& clipBounds,
                            const SkMaskFilter*, const SkMatrix* filterMatrix,
                            SkMask* mask, SkMask::CreateMode mode,
                            SkStrokeRec::InitStyle style);
diff --git a/third_party/skia/src/core/SkDraw_atlas.cpp b/third_party/skia/src/core/SkDraw_atlas.cpp
index b0e577e1d6a17..4368f66ed6f91 100644
--- a/third_party/skia/src/core/SkDraw_atlas.cpp
+++ b/third_party/skia/src/core/SkDraw_atlas.cpp
@@ -143,7 +143,7 @@ void SkDraw::drawAtlas(const SkRSXform xform[],
             // we will late-bind the values in ctx, once for each color in the loop
             uniformCtx = alloc.make<SkRasterPipeline_UniformColorCtx>();
             rec.fPipeline->append(SkRasterPipeline::uniform_color_dst, uniformCtx);
-            if (skstd::optional<SkBlendMode> bm = as_BB(blender)->asBlendMode(); bm.has_value()) {
+            if (std::optional<SkBlendMode> bm = as_BB(blender)->asBlendMode(); bm.has_value()) {
                 SkBlendMode_AppendStages(*bm, rec.fPipeline);
             } else {
                 return false;
diff --git a/third_party/skia/src/core/SkDraw_text.cpp b/third_party/skia/src/core/SkDraw_text.cpp
index 2c5bff0793ef1..e7dc520bab6f6 100644
--- a/third_party/skia/src/core/SkDraw_text.cpp
+++ b/third_party/skia/src/core/SkDraw_text.cpp
@@ -35,7 +35,7 @@ static bool check_glyph_position(SkPoint position) {
              lt(position.fY, INT_MIN - (INT16_MIN + 0 /*UINT16_MIN*/)));
 }
 
-void SkDraw::paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint) const {
+void SkDraw::paintMasks(SkDrawableGlyphBuffer* accepted, const SkPaint& paint) const {
 
     // The size used for a typical blitter.
     SkSTArenaAlloc<3308> alloc;
@@ -48,8 +48,8 @@ void SkDraw::paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint)
     bool useRegion = fRC->isBW() && !fRC->isRect();
 
     if (useRegion) {
-        for (auto [variant, pos] : drawables->drawable()) {
-            SkGlyph* glyph = variant.glyph();
+        for (auto [variant, pos] : accepted->accepted()) {
+            const SkGlyph* glyph = variant.glyph();
             if (check_glyph_position(pos)) {
                 SkMask mask = glyph->mask(pos);
 
@@ -75,8 +75,8 @@ void SkDraw::paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint)
     } else {
         SkIRect clipBounds = fRC->isBW() ? fRC->bwRgn().getBounds()
                                          : fRC->aaRgn().getBounds();
-        for (auto [variant, pos] : drawables->drawable()) {
-            SkGlyph* glyph = variant.glyph();
+        for (auto [variant, pos] : accepted->accepted()) {
+            const SkGlyph* glyph = variant.glyph();
             if (check_glyph_position(pos)) {
                 SkMask mask = glyph->mask(pos);
                 SkIRect storage;
@@ -105,22 +105,10 @@ void SkDraw::paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint)
     }
 }
 
-void SkDraw::paintPaths(SkDrawableGlyphBuffer* drawables,
-                        SkScalar scale,
-                        SkPoint origin,
-                        const SkPaint& paint) const {
-    for (auto [variant, pos] : drawables->drawable()) {
-        const SkPath* path = variant.path();
-        SkMatrix m;
-        SkPoint translate = origin + pos;
-        m.setScaleTranslate(scale, scale, translate.x(), translate.y());
-        this->drawPath(*path, paint, &m, false);
-    }
-}
-
-void SkDraw::drawGlyphRunList(const SkGlyphRunList& glyphRunList,
-                              const SkPaint& paint,
-                              SkGlyphRunListPainter* glyphPainter) const {
+void SkDraw::drawGlyphRunList(SkCanvas* canvas,
+                              SkGlyphRunListPainter* glyphPainter,
+                              const SkGlyphRunList& glyphRunList,
+                              const SkPaint& paint) const {
 
     SkDEBUGCODE(this->validate();)
 
@@ -128,7 +116,8 @@ void SkDraw::drawGlyphRunList(const SkGlyphRunList& glyphRunList,
         return;
     }
 
-    glyphPainter->drawForBitmapDevice(glyphRunList, paint, fMatrixProvider->localToDevice(), this);
+    glyphPainter->drawForBitmapDevice(canvas, this, glyphRunList, paint,
+                                      fMatrixProvider->localToDevice());
 }
 
 #if defined _WIN32
diff --git a/third_party/skia/src/core/SkDraw_vertices.cpp b/third_party/skia/src/core/SkDraw_vertices.cpp
index 4fac2a1996e67..36a8ea15a7511 100644
--- a/third_party/skia/src/core/SkDraw_vertices.cpp
+++ b/third_party/skia/src/core/SkDraw_vertices.cpp
@@ -335,7 +335,7 @@ void SkDraw::drawFixedVertices(const SkVertices* vertices,
     bool blenderIsDst = false;
     // We can simplify things for certain blend modes. This is for speed, and SkShader_Blend
     // itself insists we don't pass kSrc or kDst to it.
-    if (skstd::optional<SkBlendMode> bm = as_BB(blender)->asBlendMode(); bm.has_value() && colors) {
+    if (std::optional<SkBlendMode> bm = as_BB(blender)->asBlendMode(); bm.has_value() && colors) {
         switch (*bm) {
             case SkBlendMode::kSrc:
                 colors = nullptr;
diff --git a/third_party/skia/src/core/SkDrawable.cpp b/third_party/skia/src/core/SkDrawable.cpp
index f4d34cf3008f1..64daf6ac35ccd 100644
--- a/third_party/skia/src/core/SkDrawable.cpp
+++ b/third_party/skia/src/core/SkDrawable.cpp
@@ -37,7 +37,7 @@ void SkDrawable::draw(SkCanvas* canvas, const SkMatrix* matrix) {
     }
     this->onDraw(canvas);
 
-    if (false) {
+    if ((false)) {
         draw_bbox(canvas, this->getBounds());
     }
 }
@@ -62,6 +62,13 @@ SkRect SkDrawable::getBounds() {
     return this->onGetBounds();
 }
 
+size_t SkDrawable::approximateBytesUsed() {
+    return this->onApproximateBytesUsed();
+}
+size_t SkDrawable::onApproximateBytesUsed() {
+    return 0;
+}
+
 void SkDrawable::notifyDrawingChanged() {
     fGenerationID = 0;
 }
@@ -76,7 +83,7 @@ SkPicture* SkDrawable::onNewPictureSnapshot() {
     const SkRect bounds = this->getBounds();
     SkCanvas* canvas = recorder.beginRecording(bounds);
     this->draw(canvas);
-    if (false) {
+    if ((false)) {
         draw_bbox(canvas, bounds);
     }
     return recorder.finishRecordingAsPicture().release();
diff --git a/third_party/skia/src/core/SkEnumerate.h b/third_party/skia/src/core/SkEnumerate.h
index 6107328ad7309..ecc3bf390b8a9 100644
--- a/third_party/skia/src/core/SkEnumerate.h
+++ b/third_party/skia/src/core/SkEnumerate.h
@@ -11,10 +11,9 @@
 #include <cstddef>
 #include <iterator>
 #include <tuple>
+#include <variant>
 
-#include "include/private/SkTLogic.h"
-
-template <typename Iter, typename C = skstd::monostate>
+template <typename Iter, typename C = std::monostate>
 class SkEnumerate {
     using Captured = decltype(*std::declval<Iter>());
     template <typename> struct is_tuple : std::false_type {};
diff --git a/third_party/skia/src/core/SkFixed15.h b/third_party/skia/src/core/SkFixed15.h
deleted file mode 100644
index d50337f2434e0..0000000000000
--- a/third_party/skia/src/core/SkFixed15.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkFixed15_DEFINED
-#define SkFixed15_DEFINED
-
-#include "include/core/SkTypes.h"
-
-// SkFixed15 is a fixed point value that represents values in [0,1] as [0x0000, 0x8000].
-// This mapping allows us to implement most operations in tightly packed 16-bit SIMD,
-// most notably multiplying using Q15 multiplication instructions (and a little fixup).
-
-class SkFixed15 {
-public:
-    SkFixed15() = default;
-
-    SkFixed15(float val) : fVal(val * 32768) { SkASSERT(0.0f <= val && val <= 1.0f); }
-    explicit operator float() const { return fVal * (1/32768.0f); }
-
-    static SkFixed15 Load(uint16_t val) {
-        SkASSERT(val <= 32768);
-        return val;
-    }
-    uint16_t store() const { return fVal; }
-
-    static SkFixed15 FromU8(uint8_t val) {
-        return val*128 + (val>>1)  // 32768/255 == 128.50196..., which is very close to 128 + 0.5.
-             + ((val+1)>>8);       // All val but 255 are correct.  +1 if val == 255 to get 32768.
-    }
-
-    uint8_t to_u8() const {
-        // FromU8() and to_u8() roundtrip all bytes.
-        // There is still much room to tweak this towards the ideal, a rounding scale by 255/32768.
-        return (fVal - (fVal>>8))>>7;
-    }
-
-    SkFixed15 operator +(SkFixed15 o) const { return fVal + o.fVal; }
-    SkFixed15 operator -(SkFixed15 o) const { return fVal - o.fVal; }
-    SkFixed15 operator *(SkFixed15 o) const { return (fVal * o.fVal + (1<<14)) >> 15; }
-    SkFixed15 operator<<(int bits) const { return fVal << bits; }
-    SkFixed15 operator>>(int bits) const { return fVal >> bits; }
-
-    SkFixed15& operator +=(SkFixed15 o) { return (*this = *this + o); }
-    SkFixed15& operator -=(SkFixed15 o) { return (*this = *this - o); }
-    SkFixed15& operator *=(SkFixed15 o) { return (*this = *this * o); }
-    SkFixed15& operator<<=(int bits) { return (*this = *this << bits); }
-    SkFixed15& operator>>=(int bits) { return (*this = *this >> bits); }
-
-    bool operator==(SkFixed15 o) const { return fVal == o.fVal; }
-    bool operator!=(SkFixed15 o) const { return fVal != o.fVal; }
-    bool operator<=(SkFixed15 o) const { return fVal <= o.fVal; }
-    bool operator>=(SkFixed15 o) const { return fVal >= o.fVal; }
-    bool operator< (SkFixed15 o) const { return fVal <  o.fVal; }
-    bool operator> (SkFixed15 o) const { return fVal >  o.fVal; }
-
-private:
-    SkFixed15(int val) : fVal(val) {}
-
-    uint16_t fVal;
-};
-
-// Notes
-//  - SSSE3+ multiply is _mm_abs_epi16(_mm_mulhrs_epi16(x, y));
-//  - NEON multipy is vsraq_n_u16(vabsq_s16(vqrdmulhq_s16(x,y)),
-//                                vandq_s16(x,y), 15);
-//  - Conversion to and from float can be done manually with bit masks and float add/subtract,
-//    rather than the naive version here involving int<->float conversion and float multiply.
-//  - On x86, conversion to float is _mm_sub_ps(_mm_unpacklo_epi16(x, _mm_set1_epi16(0x4380)),
-//                                              _mm_set1_ps(256.0f)).  // 0x43800000
-//  - On ARM, we can use the vcvtq_n_f32_u32(vmovl_u16(x), 15) to convert to float,
-//    and vcvtq_n_u32_f32(..., 15) for the other way around.
-
-#endif//SkFixed15_DEFINED
diff --git a/third_party/skia/src/core/SkFont.cpp b/third_party/skia/src/core/SkFont.cpp
index f74d868ea99f0..53be4b646ae14 100644
--- a/third_party/skia/src/core/SkFont.cpp
+++ b/third_party/skia/src/core/SkFont.cpp
@@ -343,6 +343,10 @@ SkRect SkFontPriv::GetFontBounds(const SkFont& font) {
     return bounds;
 }
 
+SkScalar SkFontPriv::ApproximateTransformedTextSize(const SkFont& font, const SkMatrix& matrix) {
+    return font.getSize() * matrix.getMaxScale();
+}
+
 int SkFontPriv::CountTextElements(const void* text, size_t byteLength, SkTextEncoding encoding) {
     switch (encoding) {
         case SkTextEncoding::kUTF8:
diff --git a/third_party/skia/src/core/SkFontDescriptor.cpp b/third_party/skia/src/core/SkFontDescriptor.cpp
index c8e94c60ebe3c..5774c624805e0 100644
--- a/third_party/skia/src/core/SkFontDescriptor.cpp
+++ b/third_party/skia/src/core/SkFontDescriptor.cpp
@@ -22,6 +22,8 @@ enum {
     kItalic         = 0x13, // scalar (0 is Roman, 1 is fully Italic)
 
     // Related to font data. Can also be used with a requested font.
+    kPaletteIndex   = 0xF8, // int
+    kPaletteEntryOverrides = 0xF9, // int count, (int, u32)[count]
     kFontVariation  = 0xFA, // int count, (u32, scalar)[count]
 
     // Related to font data.
@@ -80,6 +82,15 @@ bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) {
     size_t index;
     using CollectionIndexType = decltype(result->fCollectionIndex);
 
+    size_t paletteIndex;
+    using PaletteIndexType = decltype(result->fPaletteIndex);
+
+    size_t paletteEntryOverrideCount;
+    using PaletteEntryOverrideCountType = decltype(result->fPaletteEntryOverrideCount);
+
+    size_t paletteEntryOverrideIndex;
+    using PaletteEntryOverrideIndexType = decltype(result->fPaletteEntryOverrides[0].index);
+
     SkScalar weight = SkFontStyle::kNormal_Weight;
     SkScalar width = SkFontStyle::kNormal_Width;
     SkScalar slant = 0;
@@ -131,6 +142,32 @@ bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) {
                 if (!SkTFitsIn<CollectionIndexType>(index)) { return false; }
                 result->fCollectionIndex = SkTo<CollectionIndexType>(index);
                 break;
+            case kPaletteIndex:
+                if (!stream->readPackedUInt(&paletteIndex)) { return false; }
+                if (!SkTFitsIn<PaletteIndexType>(paletteIndex)) { return false; }
+                result->fPaletteIndex = SkTo<PaletteIndexType>(paletteIndex);
+                break;
+            case kPaletteEntryOverrides:
+                if (!stream->readPackedUInt(&paletteEntryOverrideCount)) { return false; }
+                if (!SkTFitsIn<PaletteEntryOverrideCountType>(paletteEntryOverrideCount)) {
+                    return false;
+                }
+                result->fPaletteEntryOverrideCount =
+                        SkTo<PaletteEntryOverrideCountType>(paletteEntryOverrideCount);
+
+                result->fPaletteEntryOverrides.reset(paletteEntryOverrideCount);
+                for (size_t i = 0; i < paletteEntryOverrideCount; ++i) {
+                    if (!stream->readPackedUInt(&paletteEntryOverrideIndex)) { return false; }
+                    if (!SkTFitsIn<PaletteEntryOverrideIndexType>(paletteEntryOverrideIndex)) {
+                        return false;
+                    }
+                    result->fPaletteEntryOverrides[i].index =
+                            SkTo<PaletteEntryOverrideIndexType>(paletteEntryOverrideIndex);
+                    if (!stream->readU32(&result->fPaletteEntryOverrides[i].color)) {
+                        return false;
+                    }
+                }
+                break;
             default:
                 SkDEBUGFAIL("Unknown id used by a font descriptor");
                 return false;
@@ -140,8 +177,8 @@ bool SkFontDescriptor::Deserialize(SkStream* stream, SkFontDescriptor* result) {
     SkFontStyle::Slant slantEnum = SkFontStyle::kUpright_Slant;
     if (slant != 0) { slantEnum = SkFontStyle::kOblique_Slant; }
     if (0 < italic) { slantEnum = SkFontStyle::kItalic_Slant; }
-    int usWidth = SkScalarRoundToInt(SkScalarInterpFunc(width, &width_for_usWidth[1], usWidths, 9));
-    result->fStyle = SkFontStyle(SkScalarRoundToInt(weight), usWidth, slantEnum);
+    SkFontStyle::Width widthEnum = SkFontStyleWidthForWidthAxisValue(width);
+    result->fStyle = SkFontStyle(SkScalarRoundToInt(weight), widthEnum, slantEnum);
 
     size_t length;
     if (!stream->readPackedUInt(&length)) { return false; }
@@ -172,6 +209,9 @@ void SkFontDescriptor::serialize(SkWStream* stream) const {
     if (fCollectionIndex) {
         write_uint(stream, fCollectionIndex, kFontIndex);
     }
+    if (fPaletteIndex) {
+        write_uint(stream, fPaletteIndex, kPaletteIndex);
+    }
     if (fCoordinateCount) {
         write_uint(stream, fCoordinateCount, kFontVariation);
         for (int i = 0; i < fCoordinateCount; ++i) {
@@ -179,6 +219,13 @@ void SkFontDescriptor::serialize(SkWStream* stream) const {
             stream->writeScalar(fVariation[i].value);
         }
     }
+    if (fPaletteEntryOverrideCount) {
+        write_uint(stream, fPaletteEntryOverrideCount, kPaletteEntryOverrides);
+        for (int i = 0; i < fPaletteEntryOverrideCount; ++i) {
+            stream->writePackedUInt(fPaletteEntryOverrides[i].index);
+            stream->write32(fPaletteEntryOverrides[i].color);
+        }
+    }
 
     stream->writePackedUInt(kSentinel);
 
@@ -191,3 +238,8 @@ void SkFontDescriptor::serialize(SkWStream* stream) const {
         stream->writePackedUInt(0);
     }
 }
+
+SkFontStyle::Width SkFontDescriptor::SkFontStyleWidthForWidthAxisValue(SkScalar width) {
+    int usWidth = SkScalarRoundToInt(SkScalarInterpFunc(width, &width_for_usWidth[1], usWidths, 9));
+    return static_cast<SkFontStyle::Width>(usWidth);
+}
diff --git a/third_party/skia/src/core/SkFontDescriptor.h b/third_party/skia/src/core/SkFontDescriptor.h
index 4bc328a9a22da..f00560ef9e96d 100644
--- a/third_party/skia/src/core/SkFontDescriptor.h
+++ b/third_party/skia/src/core/SkFontDescriptor.h
@@ -18,31 +18,40 @@
 class SkFontData {
 public:
     /** Makes a copy of the data in 'axis'. */
-    SkFontData(std::unique_ptr<SkStreamAsset> stream, int index, const SkFixed* axis, int axisCount)
-        : fStream(std::move(stream)), fIndex(index), fAxisCount(axisCount), fAxis(axisCount)
+    SkFontData(std::unique_ptr<SkStreamAsset> stream, int index, int paletteIndex,
+               const SkFixed* axis, int axisCount,
+               const SkFontArguments::Palette::Override* paletteOverrides, int paletteOverrideCount)
+        : fStream(std::move(stream))
+        , fIndex(index)
+        , fPaletteIndex(paletteIndex)
+        , fAxisCount(axisCount)
+        , fPaletteOverrideCount(paletteOverrideCount)
+        , fAxis(fAxisCount)
+        , fPaletteOverrides(fPaletteOverrideCount)
     {
-        for (int i = 0; i < axisCount; ++i) {
+        for (int i = 0; i < fAxisCount; ++i) {
             fAxis[i] = axis[i];
         }
-    }
-    SkFontData(std::unique_ptr<SkStreamAsset> stream, SkFontArguments args)
-        : fStream(std::move(stream)), fIndex(args.getCollectionIndex())
-        , fAxisCount(args.getVariationDesignPosition().coordinateCount)
-        , fAxis(args.getVariationDesignPosition().coordinateCount)
-    {
-        for (int i = 0; i < fAxisCount; ++i) {
-            fAxis[i] = SkFloatToFixed(args.getVariationDesignPosition().coordinates[i].value);
+        for (int i = 0; i < fPaletteOverrideCount; ++i) {
+            fPaletteOverrides[i] = paletteOverrides[i];
         }
     }
+
     SkFontData(const SkFontData& that)
         : fStream(that.fStream->duplicate())
         , fIndex(that.fIndex)
+        , fPaletteIndex(that.fPaletteIndex)
         , fAxisCount(that.fAxisCount)
+        , fPaletteOverrideCount(that.fPaletteOverrideCount)
         , fAxis(fAxisCount)
+        , fPaletteOverrides(fPaletteOverrideCount)
     {
         for (int i = 0; i < fAxisCount; ++i) {
             fAxis[i] = that.fAxis[i];
         }
+        for (int i = 0; i < fPaletteOverrideCount; ++i) {
+            fPaletteOverrides[i] = that.fPaletteOverrides[i];
+        }
     }
     bool hasStream() const { return fStream != nullptr; }
     std::unique_ptr<SkStreamAsset> detachStream() { return std::move(fStream); }
@@ -51,12 +60,20 @@ class SkFontData {
     int getIndex() const { return fIndex; }
     int getAxisCount() const { return fAxisCount; }
     const SkFixed* getAxis() const { return fAxis.get(); }
+    int getPaletteIndex() const { return fPaletteIndex; }
+    int getPaletteOverrideCount() const { return fPaletteOverrideCount; }
+    const SkFontArguments::Palette::Override* getPaletteOverrides() const {
+        return fPaletteOverrides.get();
+    }
 
 private:
     std::unique_ptr<SkStreamAsset> fStream;
     int fIndex;
+    int fPaletteIndex;
     int fAxisCount;
+    int fPaletteOverrideCount;
     SkAutoSTMalloc<4, SkFixed> fAxis;
+    SkAutoSTMalloc<4, SkFontArguments::Palette::Override> fPaletteOverrides;
 };
 
 class SkFontDescriptor : SkNoncopyable {
@@ -81,18 +98,30 @@ class SkFontDescriptor : SkNoncopyable {
     bool hasStream() const { return bool(fStream); }
     std::unique_ptr<SkStreamAsset> dupStream() const { return fStream->duplicate(); }
     int getCollectionIndex() const { return fCollectionIndex; }
+    int getPaletteIndex() const { return fPaletteIndex; }
     int getVariationCoordinateCount() const { return fCoordinateCount; }
     const SkFontArguments::VariationPosition::Coordinate* getVariation() const {
         return fVariation.get();
     }
+    int getPaletteEntryOverrideCount() const { return fPaletteEntryOverrideCount; }
+    const SkFontArguments::Palette::Override* getPaletteEntryOverrides() {
+        return fPaletteEntryOverrides.get();
+    }
 
     std::unique_ptr<SkStreamAsset> detachStream() { return std::move(fStream); }
     void setStream(std::unique_ptr<SkStreamAsset> stream) { fStream = std::move(stream); }
     void setCollectionIndex(int collectionIndex) { fCollectionIndex = collectionIndex; }
+    void setPaleteIndex(int paletteIndex) { fPaletteIndex = paletteIndex; }
     SkFontArguments::VariationPosition::Coordinate* setVariationCoordinates(int coordinateCount) {
         fCoordinateCount = coordinateCount;
         return fVariation.reset(coordinateCount);
     }
+    SkFontArguments::Palette::Override* setPaletteEntryOverrides(int paletteEntryOverrideCount) {
+        fPaletteEntryOverrideCount = paletteEntryOverrideCount;
+        return fPaletteEntryOverrides.reset(paletteEntryOverrideCount);
+    }
+
+    static SkFontStyle::Width SkFontStyleWidthForWidthAxisValue(SkScalar width);
 
 private:
     SkString fFamilyName;
@@ -105,6 +134,9 @@ class SkFontDescriptor : SkNoncopyable {
     using Coordinates = SkAutoSTMalloc<4, SkFontArguments::VariationPosition::Coordinate>;
     int fCoordinateCount = 0;
     Coordinates fVariation;
+    int fPaletteIndex = 0;
+    int fPaletteEntryOverrideCount = 0;
+    SkAutoTMalloc<SkFontArguments::Palette::Override> fPaletteEntryOverrides;
 };
 
 #endif // SkFontDescriptor_DEFINED
diff --git a/third_party/skia/src/core/SkFontPriv.h b/third_party/skia/src/core/SkFontPriv.h
index 28ef4380074f4..2bfbf987c5503 100644
--- a/third_party/skia/src/core/SkFontPriv.h
+++ b/third_party/skia/src/core/SkFontPriv.h
@@ -64,6 +64,13 @@ class SkFontPriv {
      */
     static SkRect GetFontBounds(const SkFont&);
 
+    /** Return the approximate largest dimension of typical text when transformed by the matrix.
+     *
+     * @param matrix  used to transform size
+     * @return  typical largest dimension
+     */
+    static SkScalar ApproximateTransformedTextSize(const SkFont& font, const SkMatrix& matrix);
+
     static bool IsFinite(const SkFont& font) {
         return SkScalarIsFinite(font.getSize()) &&
                SkScalarIsFinite(font.getScaleX()) &&
diff --git a/third_party/skia/src/core/SkGeometry.cpp b/third_party/skia/src/core/SkGeometry.cpp
index b528a61c4578d..0a3a8cc13e903 100644
--- a/third_party/skia/src/core/SkGeometry.cpp
+++ b/third_party/skia/src/core/SkGeometry.cpp
@@ -1410,7 +1410,7 @@ int SkConic::computeQuadPOW2(SkScalar tol) const {
         error *= 0.25f;
     }
     // float version -- using ceil gives the same results as the above.
-    if (false) {
+    if ((false)) {
         SkScalar err = SkScalarSqrt(x * x + y * y);
         if (err <= tol) {
             return 0;
diff --git a/third_party/skia/src/core/SkGlyph.cpp b/third_party/skia/src/core/SkGlyph.cpp
index 1ba6626da904b..8eb0f5ed47f00 100644
--- a/third_party/skia/src/core/SkGlyph.cpp
+++ b/third_party/skia/src/core/SkGlyph.cpp
@@ -7,11 +7,18 @@
 
 #include "src/core/SkGlyph.h"
 
+#include "include/core/SkDrawable.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkScalerContext.h"
 #include "src/pathops/SkPathOpsCubic.h"
 #include "src/pathops/SkPathOpsQuad.h"
 
+SkGlyph::SkGlyph(const SkGlyph&) = default;
+SkGlyph& SkGlyph::operator=(const SkGlyph&) = default;
+SkGlyph::SkGlyph(SkGlyph&&) = default;
+SkGlyph& SkGlyph::operator=(SkGlyph&&) = default;
+SkGlyph::~SkGlyph() = default;
+
 SkMask SkGlyph::mask() const {
     SkMask mask;
     mask.fImage = (uint8_t*)fImage;
@@ -100,7 +107,7 @@ bool SkGlyph::setImage(SkArenaAlloc* alloc, const void* image) {
 size_t SkGlyph::setMetricsAndImage(SkArenaAlloc* alloc, const SkGlyph& from) {
     // Since the code no longer tries to find replacement glyphs, the image should always be
     // nullptr.
-    SkASSERT(fImage == nullptr);
+    SkASSERT(fImage == nullptr || from.fImage == nullptr);
 
     // TODO(herb): remove "if" when we are sure there are no colliding glyphs.
     if (fImage == nullptr) {
@@ -189,6 +196,43 @@ bool SkGlyph::pathIsHairline() const {
     return fPathData->fHairline;
 }
 
+void SkGlyph::installDrawable(SkArenaAlloc* alloc, sk_sp<SkDrawable> drawable) {
+    SkASSERT(fDrawableData == nullptr);
+    SkASSERT(!this->setDrawableHasBeenCalled());
+    fDrawableData = alloc->make<SkGlyph::DrawableData>();
+    if (drawable != nullptr) {
+        fDrawableData->fDrawable = std::move(drawable);
+        fDrawableData->fDrawable->getGenerationID();
+        fDrawableData->fHasDrawable = true;
+    }
+}
+
+bool SkGlyph::setDrawable(SkArenaAlloc* alloc, SkScalerContext* scalerContext) {
+    if (!this->setDrawableHasBeenCalled()) {
+        sk_sp<SkDrawable> drawable = scalerContext->getDrawable(*this);
+        this->installDrawable(alloc, std::move(drawable));
+        return this->drawable() != nullptr;
+    }
+    return false;
+}
+
+bool SkGlyph::setDrawable(SkArenaAlloc* alloc, sk_sp<SkDrawable> drawable) {
+    if (!this->setDrawableHasBeenCalled()) {
+        this->installDrawable(alloc, std::move(drawable));
+        return this->drawable() != nullptr;
+    }
+    return false;
+}
+
+SkDrawable* SkGlyph::drawable() const {
+    // setDrawable must have been called previously.
+    SkASSERT(this->setDrawableHasBeenCalled());
+    if (fDrawableData->fHasDrawable) {
+        return fDrawableData->fDrawable.get();
+    }
+    return nullptr;
+}
+
 static std::tuple<SkScalar, SkScalar> calculate_path_gap(
         SkScalar topOffset, SkScalar bottomOffset, const SkPath& path) {
 
@@ -349,3 +393,12 @@ void SkGlyph::ensureIntercepts(const SkScalar* bounds, SkScalar scale, SkScalar
     }
     offsetResults(intercept, array, count);
 }
+
+SkGlyphDigest::SkGlyphDigest(size_t index, const SkGlyph& glyph)
+        : fPackedGlyphID{glyph.getPackedID().value()}
+        , fIndex{SkTo<uint32_t>(index)}
+        , fIsEmpty(glyph.isEmpty())
+        , fIsColor(glyph.isColor())
+        , fCanDrawAsMask{SkStrikeForGPU::CanDrawAsMask(glyph)}
+        , fCanDrawAsSDFT{SkStrikeForGPU::CanDrawAsSDFT(glyph)}
+        , fMaxDimension{(uint16_t)glyph.maxDimension()} {}
diff --git a/third_party/skia/src/core/SkGlyph.h b/third_party/skia/src/core/SkGlyph.h
index 0a73fd12b4557..d725511756d1c 100644
--- a/third_party/skia/src/core/SkGlyph.h
+++ b/third_party/skia/src/core/SkGlyph.h
@@ -16,8 +16,10 @@
 #include "include/private/SkVx.h"
 #include "src/core/SkMask.h"
 #include "src/core/SkMathPriv.h"
+#include "src/core/SkStrikeForGPU.h"
 
 class SkArenaAlloc;
+class SkDrawable;
 class SkScalerContext;
 
 // A combination of SkGlyphID and sub-pixel position information.
@@ -194,6 +196,7 @@ SkGlyphRect rect_intersection(SkGlyphRect, SkGlyphRect);
 // rectangle union and intersection operations.
 class SkGlyphRect {
 public:
+    SkGlyphRect() = default;
     SkGlyphRect(int16_t left, int16_t top, int16_t right, int16_t bottom)
             : fRect{left, top, (int16_t)-right, (int16_t)-bottom} {
         SkDEBUGCODE(const int32_t min = std::numeric_limits<int16_t>::min());
@@ -238,12 +241,52 @@ inline SkGlyphRect rect_intersection(SkGlyphRect a, SkGlyphRect b) {
 }
 }  // namespace skglyph
 
-struct SkGlyphPrototype;
+class SkGlyph;
+
+// SkGlyphDigest contains a digest of information for making GPU drawing decisions. It can be
+// referenced instead of the glyph itself in many situations. In the remote glyphs cache the
+// SkGlyphDigest is the only information that needs to be stored in the cache.
+class SkGlyphDigest {
+public:
+    // Default ctor is only needed for the hash table.
+    SkGlyphDigest() = default;
+    SkGlyphDigest(size_t index, const SkGlyph& glyph);
+    int index()          const {return fIndex;        }
+    bool isEmpty()       const {return fIsEmpty;      }
+    bool isColor()       const {return fIsColor;      }
+    bool canDrawAsMask() const {return fCanDrawAsMask;}
+    bool canDrawAsSDFT() const {return fCanDrawAsSDFT;}
+    uint32_t packedGlyphID() const {return fPackedGlyphID;}
+    uint16_t maxDimension()  const {return fMaxDimension; }
+
+    // Support mapping from SkPackedGlyphID stored in the digest.
+    static uint32_t GetKey(SkGlyphDigest digest) {
+        return digest.packedGlyphID();
+    }
+    static uint32_t Hash(uint32_t packedGlyphID) {
+        return SkGoodHash()(packedGlyphID);
+    }
+
+private:
+    static_assert(SkPackedGlyphID::kEndData == 20);
+    uint64_t fPackedGlyphID : SkPackedGlyphID::kEndData;
+    uint64_t fIndex         : SkPackedGlyphID::kEndData;
+    uint64_t fIsEmpty       : 1;
+    uint64_t fIsColor       : 1;
+    uint64_t fCanDrawAsMask : 1;
+    uint64_t fCanDrawAsSDFT : 1;
+    uint64_t fMaxDimension  : 16;
+};
 
 class SkGlyph {
 public:
     // SkGlyph() is used for testing.
     constexpr SkGlyph() : SkGlyph{SkPackedGlyphID()} { }
+    SkGlyph(const SkGlyph&);
+    SkGlyph& operator=(const SkGlyph&);
+    SkGlyph(SkGlyph&&);
+    SkGlyph& operator=(SkGlyph&&);
+    ~SkGlyph();
     constexpr explicit SkGlyph(SkPackedGlyphID id) : fID{id} { }
 
     SkVector advanceVector() const { return SkVector{fAdvanceX, fAdvanceY}; }
@@ -313,6 +356,11 @@ class SkGlyph {
     const SkPath* path() const;
     bool pathIsHairline() const;
 
+    bool setDrawable(SkArenaAlloc* alloc, SkScalerContext* scalerContext);
+    bool setDrawable(SkArenaAlloc* alloc, sk_sp<SkDrawable> drawable);
+    bool setDrawableHasBeenCalled() const { return fDrawableData != nullptr; }
+    SkDrawable* drawable() const;
+
     // Format
     bool isColor() const { return fMaskFormat == SkMask::kARGB32_Format; }
     SkMask::Format maskFormat() const { return fMaskFormat; }
@@ -346,12 +394,13 @@ class SkGlyph {
     void ensureIntercepts(const SkScalar bounds[2], SkScalar scale, SkScalar xPos,
                           SkScalar* array, int* count, SkArenaAlloc* alloc);
 
+    void setImage(void* image) { fImage = image; }
+
 private:
     // There are two sides to an SkGlyph, the scaler side (things that create glyph data) have
     // access to all the fields. Scalers are assumed to maintain all the SkGlyph invariants. The
     // consumer side has a tighter interface.
     friend class RandomScalerContext;
-    friend class RemoteStrike;
     friend class SkScalerContext;
     friend class SkScalerContextProxy;
     friend class SkScalerContext_Empty;
@@ -372,7 +421,7 @@ class SkGlyph {
     // Support horizontal and vertical skipping strike-through / underlines.
     // The caller walks the linked list looking for a match. For a horizontal underline,
     // the fBounds contains the top and bottom of the underline. The fInterval pair contains the
-    // beginning and end of of the intersection of the bounds and the glyph's path.
+    // beginning and end of the intersection of the bounds and the glyph's path.
     // If interval[0] >= interval[1], no intersection was found.
     struct Intercept {
         Intercept* fNext;
@@ -391,11 +440,20 @@ class SkGlyph {
         bool       fHairline{false};
     };
 
+    struct DrawableData {
+        Intercept* fIntercept{nullptr};
+        sk_sp<SkDrawable> fDrawable;
+        bool fHasDrawable{false};
+    };
+
     size_t allocImage(SkArenaAlloc* alloc);
 
     // path == nullptr indicates that there is no path.
     void installPath(SkArenaAlloc* alloc, const SkPath* path, bool hairline);
 
+    // drawable == nullptr indicates that there is no path.
+    void installDrawable(SkArenaAlloc* alloc, sk_sp<SkDrawable> drawable);
+
     // The width and height of the glyph mask.
     uint16_t  fWidth  = 0,
               fHeight = 0;
@@ -411,6 +469,7 @@ class SkGlyph {
     // else if fPathData is not null, then a path has been requested. The fPath field of fPathData
     // may still be null after the request meaning that there is no path for this glyph.
     PathData* fPathData = nullptr;
+    DrawableData* fDrawableData = nullptr;
 
     // The advance for this glyph.
     float     fAdvanceX = 0,
diff --git a/third_party/skia/src/core/SkGlyphBuffer.cpp b/third_party/skia/src/core/SkGlyphBuffer.cpp
index b05d1e3901b75..0c3a0b807ca91 100644
--- a/third_party/skia/src/core/SkGlyphBuffer.cpp
+++ b/third_party/skia/src/core/SkGlyphBuffer.cpp
@@ -22,12 +22,12 @@ void SkDrawableGlyphBuffer::ensureSize(size_t size) {
     }
 
     fInputSize = 0;
-    fDrawableSize = 0;
+    fAcceptedSize = 0;
 }
 
 void SkDrawableGlyphBuffer::startSource(const SkZip<const SkGlyphID, const SkPoint>& source) {
     fInputSize = source.size();
-    fDrawableSize = 0;
+    fAcceptedSize = 0;
 
     auto positions = source.get<1>();
     memcpy(fPositions, positions.data(), positions.size() * sizeof(SkPoint));
@@ -45,7 +45,7 @@ void SkDrawableGlyphBuffer::startBitmapDevice(
         SkPoint origin, const SkMatrix& viewMatrix,
         const SkGlyphPositionRoundingSpec& roundingSpec) {
     fInputSize = source.size();
-    fDrawableSize = 0;
+    fAcceptedSize = 0;
 
     // Map the positions including subpixel position.
     auto positions = source.get<1>();
@@ -73,7 +73,7 @@ void SkDrawableGlyphBuffer::startGPUDevice(
         const SkMatrix& drawMatrix,
         const SkGlyphPositionRoundingSpec& roundingSpec) {
     fInputSize = source.size();
-    fDrawableSize = 0;
+    fAcceptedSize = 0;
 
     // Build up the mapping from source space to device space. Add the rounding constant
     // halfSampleFreq so we just need to floor to get the device result.
@@ -117,6 +117,6 @@ void SkDrawableGlyphBuffer::reset() {
         fMaxSize = 0;
     }
     fInputSize = 0;
-    fDrawableSize = 0;
+    fAcceptedSize = 0;
 }
 
diff --git a/third_party/skia/src/core/SkGlyphBuffer.h b/third_party/skia/src/core/SkGlyphBuffer.h
index f373679d39d1d..f660aa7320a62 100644
--- a/third_party/skia/src/core/SkGlyphBuffer.h
+++ b/third_party/skia/src/core/SkGlyphBuffer.h
@@ -12,10 +12,14 @@
 #include "src/core/SkGlyph.h"
 #include "src/core/SkZip.h"
 
+#include <climits>
+
 class SkStrikeForGPU;
 struct SkGlyphPositionRoundingSpec;
+class SkPath;
+class SkDrawable;
 
-// SkSourceGlyphBuffer is the source of glyphs between the different stages of character drawing.
+// SkSourceGlyphBuffer is the source of glyphs between the different stages of glyph drawing.
 // It starts with the glyphs and positions from the SkGlyphRun as the first source. When glyphs
 // are reject by a stage they become the source for the next stage.
 class SkSourceGlyphBuffer {
@@ -45,7 +49,10 @@ class SkSourceGlyphBuffer {
     }
 
     void reject(size_t index, int rejectedMaxDimension) {
-        fRejectedMaxDimension = std::max(fRejectedMaxDimension, rejectedMaxDimension);
+        auto [prevMin, prevMax] = fMaxDimensionHintForRejects;
+        fMaxDimensionHintForRejects =
+                {std::min(prevMin, rejectedMaxDimension),
+                 std::max(prevMax, rejectedMaxDimension)};
         this->reject(index);
     }
 
@@ -53,14 +60,14 @@ class SkSourceGlyphBuffer {
         fRejects = SkMakeZip(fRejectedGlyphIDs, fRejectedPositions).first(fRejectSize);
         fSource = fRejects;
         fRejectSize = 0;
-        fSourceMaxDimension = fRejectedMaxDimension;
-        fRejectedMaxDimension = 0;
+        fMaxDimensionHintForSource = fMaxDimensionHintForRejects;
+        fMaxDimensionHintForRejects = {INT_MAX, 0};
         return fSource;
     }
 
     SkZip<const SkGlyphID, const SkPoint> source() const { return fSource; }
 
-    int rejectedMaxDimension() const { return fSourceMaxDimension; }
+    std::tuple<int, int> maxDimensionHint() const {return fMaxDimensionHintForSource;}
 
 private:
     SkSourceGlyphBuffer(const SkZip<const SkGlyphID, const SkPoint>& source) {
@@ -72,8 +79,12 @@ class SkSourceGlyphBuffer {
 
     SkZip<const SkGlyphID, const SkPoint> fSource;
     size_t fRejectSize{0};
-    int fSourceMaxDimension{0};
-    int fRejectedMaxDimension{0};
+
+    // Calculate the smallest and largest max glyph dimension. fMaxDimensionHintForSource captures
+    // fMaxDimensionHintForRejects when flipping rejects to the source.
+    std::tuple<int, int> fMaxDimensionHintForSource{INT_MAX, 0};
+    std::tuple<int, int> fMaxDimensionHintForRejects{INT_MAX, 0};
+
     SkZip<SkGlyphID, SkPoint> fRejects;
     SkSTArray<4, SkGlyphID> fRejectedGlyphIDs;
     SkSTArray<4, SkPoint> fRejectedPositions;
@@ -90,7 +101,7 @@ class SkGlyphVariant {
         SkDEBUGCODE(fTag = kPackedID);
         return *this;
     }
-    SkGlyphVariant& operator= (SkGlyph* glyph) {
+    SkGlyphVariant& operator= (const SkGlyph* glyph) {
         fV.glyph = glyph;
         SkDEBUGCODE(fTag = kGlyph);
         return *this;
@@ -101,8 +112,13 @@ class SkGlyphVariant {
         SkDEBUGCODE(fTag = kPath);
         return *this;
     }
+    SkGlyphVariant& operator= (SkDrawable* drawable) {
+        fV.drawable = drawable;
+        SkDEBUGCODE(fTag = kDrawable);
+        return *this;
+    }
 
-    SkGlyph* glyph() const {
+    const SkGlyph* glyph() const {
         SkASSERT(fTag == kGlyph);
         return fV.glyph;
     }
@@ -110,19 +126,25 @@ class SkGlyphVariant {
         SkASSERT(fTag == kPath);
         return fV.path;
     }
+    SkDrawable* drawable() const {
+        SkASSERT(fTag == kDrawable);
+        return fV.drawable;
+    }
     SkPackedGlyphID packedID() const {
         SkASSERT(fTag == kPackedID);
         return fV.packedID;
     }
 
-    operator SkPackedGlyphID() const { return this->packedID(); }
-    operator SkGlyph*()        const { return this->glyph();    }
-    operator const SkPath*()   const { return this->path();     }
+    operator SkPackedGlyphID()  const { return this->packedID(); }
+    operator const SkGlyph*()   const { return this->glyph();    }
+    operator const SkPath*()    const { return this->path();     }
+    operator const SkDrawable*()const { return this->drawable(); }
 
 private:
     union {
-        SkGlyph* glyph;
+        const SkGlyph* glyph;
         const SkPath* path;
+        SkDrawable* drawable;
         SkPackedGlyphID packedID;
     } fV;
 
@@ -131,7 +153,8 @@ class SkGlyphVariant {
         kEmpty,
         kPackedID,
         kGlyph,
-        kPath
+        kPath,
+        kDrawable,
     } fTag{kEmpty};
 #endif
 };
@@ -181,42 +204,49 @@ class SkDrawableGlyphBuffer {
         return SkZip<SkGlyphVariant, SkPoint>{fInputSize, fMultiBuffer.get(), fPositions};
     }
 
-    // Store the glyph in the next drawable slot, using the position information located at index
-    // from.
-    void push_back(SkGlyph* glyph, size_t from) {
+    // Store the glyph in the next slot, using the position information located at index from.
+    void accept(SkGlyph* glyph, size_t from) {
+        SkASSERT(fPhase == kProcess);
+        SkASSERT(fAcceptedSize <= from);
+        fPositions[fAcceptedSize] = fPositions[from];
+        fMultiBuffer[fAcceptedSize] = glyph;
+        fAcceptedSize++;
+    }
+
+    // Store the path in the next slot, using the position information located at index from.
+    void accept(const SkPath* path, size_t from) {
         SkASSERT(fPhase == kProcess);
-        SkASSERT(fDrawableSize <= from);
-        fPositions[fDrawableSize] = fPositions[from];
-        fMultiBuffer[fDrawableSize] = glyph;
-        fDrawableSize++;
+        SkASSERT(fAcceptedSize <= from);
+        fPositions[fAcceptedSize] = fPositions[from];
+        fMultiBuffer[fAcceptedSize] = path;
+        fAcceptedSize++;
     }
 
-    // Store the path in the next drawable slot, using the position information located at index
-    // from.
-    void push_back(const SkPath* path, size_t from) {
+    // Store drawable in the next slot, using the position information located at index from.
+    void accept(SkDrawable* drawable, size_t from) {
         SkASSERT(fPhase == kProcess);
-        SkASSERT(fDrawableSize <= from);
-        fPositions[fDrawableSize] = fPositions[from];
-        fMultiBuffer[fDrawableSize] = path;
-        fDrawableSize++;
+        SkASSERT(fAcceptedSize <= from);
+        fPositions[fAcceptedSize] = fPositions[from];
+        fMultiBuffer[fAcceptedSize] = drawable;
+        fAcceptedSize++;
     }
 
-    // The result after a series of push_backs of drawable SkGlyph* or SkPath*.
-    SkZip<SkGlyphVariant, SkPoint> drawable() {
+    // The result after a series of `accept` of accepted SkGlyph* or SkPath*.
+    SkZip<SkGlyphVariant, SkPoint> accepted() {
         SkASSERT(fPhase == kProcess);
         SkDEBUGCODE(fPhase = kDraw);
-        return SkZip<SkGlyphVariant, SkPoint>{fDrawableSize, fMultiBuffer.get(), fPositions};
+        return SkZip<SkGlyphVariant, SkPoint>{fAcceptedSize, fMultiBuffer.get(), fPositions};
     }
 
-    bool drawableIsEmpty() const {
+    bool empty() const {
         SkASSERT(fPhase == kProcess || fPhase == kDraw);
-        return fDrawableSize == 0;
+        return fAcceptedSize == 0;
     }
 
     void reset();
 
     template <typename Fn>
-    void forEachGlyphID(Fn&& fn) {
+    void forEachInput(Fn&& fn) {
         for (auto [i, packedID, pos] : SkMakeEnumerate(this->input())) {
             fn(i, packedID.packedID(), pos);
         }
@@ -225,7 +255,7 @@ class SkDrawableGlyphBuffer {
 private:
     size_t fMaxSize{0};
     size_t fInputSize{0};
-    size_t fDrawableSize{0};
+    size_t fAcceptedSize{0};
     SkAutoTArray<SkGlyphVariant> fMultiBuffer;
     SkAutoTMalloc<SkPoint> fPositions;
 
diff --git a/third_party/skia/src/core/SkGlyphRun.h b/third_party/skia/src/core/SkGlyphRun.h
index b2e77f9a0f1bf..1df972c9efa3e 100644
--- a/third_party/skia/src/core/SkGlyphRun.h
+++ b/third_party/skia/src/core/SkGlyphRun.h
@@ -21,6 +21,7 @@
 #include "src/core/SkZip.h"
 
 class SkBaseDevice;
+class SkCanvas;
 class SkGlyph;
 class SkTextBlob;
 class SkTextBlobRunIterator;
diff --git a/third_party/skia/src/core/SkGlyphRunPainter.cpp b/third_party/skia/src/core/SkGlyphRunPainter.cpp
index c1225781848e2..437729d50e0f3 100644
--- a/third_party/skia/src/core/SkGlyphRunPainter.cpp
+++ b/third_party/skia/src/core/SkGlyphRunPainter.cpp
@@ -15,7 +15,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/text/GrSDFTControl.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 #endif // SK_SUPPORT_GPU
 
@@ -79,8 +79,8 @@ SkGlyphRunListPainter::SkGlyphRunListPainter(const skgpu::v1::SurfaceDrawContext
 #endif // SK_SUPPORT_GPU
 
 void SkGlyphRunListPainter::drawForBitmapDevice(
-        const SkGlyphRunList& glyphRunList, const SkPaint& paint, const SkMatrix& deviceMatrix,
-        const BitmapDevicePainter* bitmapDevice) {
+        SkCanvas* canvas, const BitmapDevicePainter* bitmapDevice,
+        const SkGlyphRunList& glyphRunList, const SkPaint& paint, const SkMatrix& deviceMatrix) {
     ScopedBuffers _ = this->ensureBuffers(glyphRunList);
 
     // TODO: fStrikeCache is only used for GPU, and some compilers complain about it during the no
@@ -97,7 +97,7 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
     for (auto& glyphRun : glyphRunList) {
         const SkFont& runFont = glyphRun.font();
 
-        fRejects.setSource(glyphRun.source());
+        fRejected.setSource(glyphRun.source());
 
         if (SkStrikeSpec::ShouldDrawAsPath(paint, runFont, deviceMatrix)) {
 
@@ -106,31 +106,79 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
 
             auto strike = strikeSpec.findOrCreateStrike();
 
-            fDrawable.startSource(fRejects.source());
-            strike->prepareForPathDrawing(&fDrawable, &fRejects);
-            fRejects.flipRejectsToSource();
+            fAccepted.startSource(fRejected.source());
+            strike->prepareForPathDrawing(&fAccepted, &fRejected);
+            fRejected.flipRejectsToSource();
 
             // The paint we draw paths with must have the same anti-aliasing state as the runFont
             // allowing the paths to have the same edging as the glyph masks.
             SkPaint pathPaint = paint;
             pathPaint.setAntiAlias(runFont.hasSomeAntiAliasing());
 
-            bitmapDevice->paintPaths(
-                    &fDrawable, strikeToSourceScale, drawOrigin, pathPaint);
+            const bool stroking = pathPaint.getStyle() != SkPaint::kFill_Style;
+            const bool hairline = pathPaint.getStrokeWidth() == 0;
+            const bool needsExactCTM = pathPaint.getShader()
+                                    || pathPaint.getPathEffect()
+                                    || pathPaint.getMaskFilter()
+                                    || (stroking && !hairline);
+            if (!needsExactCTM) {
+                for (auto [variant, pos] : fAccepted.accepted()) {
+                    const SkPath* path = variant.path();
+                    SkMatrix m;
+                    SkPoint translate = drawOrigin + pos;
+                    m.setScaleTranslate(strikeToSourceScale, strikeToSourceScale,
+                                        translate.x(), translate.y());
+                    SkAutoCanvasRestore acr(canvas, true);
+                    canvas->concat(m);
+                    canvas->drawPath(*path, pathPaint);
+                }
+            } else {
+               for (auto [variant, pos] : fAccepted.accepted()) {
+                    const SkPath* path = variant.path();
+                    SkMatrix m;
+                    SkPoint translate = drawOrigin + pos;
+                    m.setScaleTranslate(strikeToSourceScale, strikeToSourceScale,
+                                        translate.x(), translate.y());
+
+                    SkPath deviceOutline;
+                    path->transform(m, &deviceOutline);
+                    deviceOutline.setIsVolatile(true);
+                    canvas->drawPath(deviceOutline, pathPaint);
+                }
+            }
+
+            if (!fRejected.source().empty()) {
+                fAccepted.startSource(fRejected.source());
+                strike->prepareForDrawableDrawing(&fAccepted, &fRejected);
+                fRejected.flipRejectsToSource();
+
+                for (auto [variant, pos] : fAccepted.accepted()) {
+                    SkDrawable* drawable = variant.drawable();
+                    SkMatrix m;
+                    SkPoint translate = drawOrigin + pos;
+                    m.setScaleTranslate(strikeToSourceScale, strikeToSourceScale,
+                                        translate.x(), translate.y());
+                    SkAutoCanvasRestore acr(canvas, false);
+                    SkRect drawableBounds = drawable->getBounds();
+                    m.mapRect(&drawableBounds);
+                    canvas->saveLayer(&drawableBounds, &paint);
+                    drawable->draw(canvas, &m);
+                }
+            }
         }
-        if (!fRejects.source().empty() && !deviceMatrix.hasPerspective()) {
+        if (!fRejected.source().empty() && !deviceMatrix.hasPerspective()) {
             SkStrikeSpec strikeSpec = SkStrikeSpec::MakeMask(
                     runFont, paint, props, fScalerContextFlags, deviceMatrix);
 
             auto strike = strikeSpec.findOrCreateStrike();
 
-            fDrawable.startBitmapDevice(
-                    fRejects.source(), drawOrigin, deviceMatrix, strike->roundingSpec());
-            strike->prepareForDrawingMasksCPU(&fDrawable);
-            fRejects.flipRejectsToSource();
-            bitmapDevice->paintMasks(&fDrawable, paint);
+            fAccepted.startBitmapDevice(
+                    fRejected.source(), drawOrigin, deviceMatrix, strike->roundingSpec());
+            strike->prepareForDrawingMasksCPU(&fAccepted);
+            fRejected.flipRejectsToSource();
+            bitmapDevice->paintMasks(&fAccepted, paint);
         }
-        if (!fRejects.source().empty()) {
+        if (!fRejected.source().empty()) {
             SkMatrix runMatrix = deviceMatrix;
             runMatrix.preTranslate(drawOrigin.x(), drawOrigin.y());
             std::vector<SkPoint> sourcePositions;
@@ -140,8 +188,8 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
                     runFont, paint, props, fScalerContextFlags, SkMatrix::I());
             SkBulkGlyphMetrics metrics{scaleStrikeSpec};
 
-            auto glyphIDs = fRejects.source().get<0>();
-            auto positions = fRejects.source().get<1>();
+            auto glyphIDs = fRejected.source().get<0>();
+            auto positions = fRejected.source().get<1>();
             SkSpan<const SkGlyph*> glyphs = metrics.glyphs(glyphIDs);
             SkScalar maxScale = SK_ScalarMin;
 
@@ -179,13 +227,13 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
             auto strike = strikeSpec.findOrCreateStrike();
 
             // Figure out all the positions and packed glyphIDs based on the device matrix.
-            fDrawable.startBitmapDevice(
-                    fRejects.source(), drawOrigin, deviceMatrix, strike->roundingSpec());
+            fAccepted.startBitmapDevice(
+                    fRejected.source(), drawOrigin, deviceMatrix, strike->roundingSpec());
 
-            strike->prepareForDrawingMasksCPU(&fDrawable);
-            auto variants = fDrawable.drawable().get<0>();
+            strike->prepareForDrawingMasksCPU(&fAccepted);
+            auto variants = fAccepted.accepted().get<0>();
             for (auto [variant, srcPos] : SkMakeZip(variants, sourcePositions)) {
-                SkGlyph* glyph = variant.glyph();
+                const SkGlyph* glyph = variant.glyph();
                 SkMask mask = glyph->mask();
                 // TODO: is this needed will A8 and BW just work?
                 if (mask.fFormat != SkMask::kARGB32_Format) {
@@ -212,7 +260,7 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
                         bm, translate, nullptr, SkSamplingOptions{SkFilterMode::kLinear},
                         paint);
             }
-            fRejects.flipRejectsToSource();
+            fRejected.flipRejectsToSource();
         }
 
         // TODO: have the mask stage above reject the glyphs that are too big, and handle the
@@ -225,11 +273,11 @@ void SkGlyphRunListPainter::drawForBitmapDevice(
 // extra_cflags = ["-D", "SK_TRACE_GLYPH_RUN_PROCESS"]
 
 #if SK_SUPPORT_GPU
-void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun,
+void SkGlyphRunListPainter::processGlyphRun(SkGlyphRunPainterInterface* process,
+                                            const SkGlyphRun& glyphRun,
                                             const SkMatrix& drawMatrix,
                                             const SkPaint& runPaint,
                                             const GrSDFTControl& control,
-                                            SkGlyphRunPainterInterface* process,
                                             const char* tag,
                                             uint64_t uniqueID) {
     #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
@@ -247,65 +295,71 @@ void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun,
                     drawMatrix[3], drawMatrix[4], drawMatrix[5]);
     #endif
     ScopedBuffers _ = this->ensureBuffers(glyphRun);
-    fRejects.setSource(glyphRun.source());
+    fRejected.setSource(glyphRun.source());
     const SkFont& runFont = glyphRun.font();
 
-    GrSDFTControl::DrawingType drawingType = control.drawingType(runFont, runPaint, drawMatrix);
+    // Only consider using direct or SDFT drawing if not drawing hairlines and not perspective.
+    if ((runPaint.getStyle() != SkPaint::kStroke_Style || runPaint.getStrokeWidth() != 0)
+             && !drawMatrix.hasPerspective()) {
+        SkScalar approximateDeviceTextSize =
+                SkFontPriv::ApproximateTransformedTextSize(runFont, drawMatrix);
 
-    if (drawingType == GrSDFTControl::kSDFT) {
-        // Process SDFT - This should be the .009% case.
-        const auto& [strikeSpec, strikeToSourceScale, minScale, maxScale] =
-                SkStrikeSpec::MakeSDFT(runFont, runPaint, fDeviceProps, drawMatrix, control);
-
-        #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-            msg.appendf("  SDFT case:\n%s", strikeSpec.dump().c_str());
-        #endif
-
-        if (!SkScalarNearlyZero(strikeToSourceScale)) {
-            SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
+        if (control.isSDFT(approximateDeviceTextSize, runPaint)) {
+            // Process SDFT - This should be the .009% case.
+            const auto& [strikeSpec, strikeToSourceScale, matrixRange] =
+                    SkStrikeSpec::MakeSDFT(runFont, runPaint, fDeviceProps, drawMatrix, control);
 
-            fDrawable.startSource(fRejects.source());
             #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-                msg.appendf("    glyphs:(x,y):\n      %s\n", fDrawable.dumpInput().c_str());
+                msg.appendf("  SDFT case:\n%s", strikeSpec.dump().c_str());
             #endif
-            strike->prepareForSDFTDrawing(&fDrawable, &fRejects);
-            fRejects.flipRejectsToSource();
 
-            if (process && !fDrawable.drawableIsEmpty()) {
-                // processSourceSDFT must be called even if there are no glyphs to make sure
-                // runs are set correctly.
-                process->processSourceSDFT(fDrawable.drawable(),
-                                           strike->getUnderlyingStrike(),
-                                           strikeToSourceScale,
-                                           runFont,
-                                           minScale, maxScale);
+            if (!SkScalarNearlyZero(strikeToSourceScale)) {
+                SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
+
+                fAccepted.startSource(fRejected.source());
+                #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
+                    msg.appendf("    glyphs:(x,y):\n      %s\n", fAccepted.dumpInput().c_str());
+                #endif
+                strike->prepareForSDFTDrawing(&fAccepted, &fRejected);
+                fRejected.flipRejectsToSource();
+
+                if (process && !fAccepted.empty()) {
+                    // processSourceSDFT must be called even if there are no glyphs to make sure
+                    // runs are set correctly.
+                    process->processSourceSDFT(fAccepted.accepted(),
+                                               strike->getUnderlyingStrike(),
+                                               strikeToSourceScale,
+                                               runFont,
+                                               matrixRange);
+                }
             }
         }
-    }
-
-    if (drawingType != GrSDFTControl::kPath && !fRejects.source().empty()) {
-        // Process masks including ARGB - this should be the 99.99% case.
 
-        SkStrikeSpec strikeSpec = SkStrikeSpec::MakeMask(
-                runFont, runPaint, fDeviceProps, fScalerContextFlags, drawMatrix);
+        if (!fRejected.source().empty()) {
+            // Process masks including ARGB - this should be the 99.99% case.
+            // This will handle medium size emoji that are sharing the run with SDFT drawn text.
+            // If things are too big they will be passed along to the drawing of last resort below.
+            SkStrikeSpec strikeSpec = SkStrikeSpec::MakeMask(
+                    runFont, runPaint, fDeviceProps, fScalerContextFlags, drawMatrix);
 
-        #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-            msg.appendf("  Mask case:\n%s", strikeSpec.dump().c_str());
-        #endif
+            #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
+                msg.appendf("  Mask case:\n%s", strikeSpec.dump().c_str());
+            #endif
 
-        SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
+            SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
 
-        fDrawable.startGPUDevice(fRejects.source(), drawMatrix, strike->roundingSpec());
-        #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-            msg.appendf("    glyphs:(x,y):\n      %s\n", fDrawable.dumpInput().c_str());
-        #endif
-        strike->prepareForMaskDrawing(&fDrawable, &fRejects);
-        fRejects.flipRejectsToSource();
+            fAccepted.startGPUDevice(fRejected.source(), drawMatrix, strike->roundingSpec());
+            #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
+                msg.appendf("    glyphs:(x,y):\n      %s\n", fAccepted.dumpInput().c_str());
+            #endif
+            strike->prepareForMaskDrawing(&fAccepted, &fRejected);
+            fRejected.flipRejectsToSource();
 
-        if (process && !fDrawable.drawableIsEmpty()) {
-            // processDeviceMasks must be called even if there are no glyphs to make sure runs
-            // are set correctly.
-            process->processDeviceMasks(fDrawable.drawable(), strike->getUnderlyingStrike());
+            if (process && !fAccepted.empty()) {
+                // processDeviceMasks must be called even if there are no glyphs to make sure runs
+                // are set correctly.
+                process->processDeviceMasks(fAccepted.accepted(), strike->getUnderlyingStrike());
+            }
         }
     }
 
@@ -314,7 +368,35 @@ void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun,
     // maxDimensionInSourceSpace is used to calculate the factor from strike space to source
     // space.
     SkScalar maxDimensionInSourceSpace = 0.0;
-    if (!fRejects.source().empty()) {
+    if (!fRejected.source().empty()) {
+        // Drawable case - handle big things with that have a drawable.
+        auto [strikeSpec, strikeToSourceScale] =
+                SkStrikeSpec::MakePath(runFont, runPaint, fDeviceProps, fScalerContextFlags);
+
+        #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
+            msg.appendf("  Drawable case:\n%s", strikeSpec.dump().c_str());
+        #endif
+
+        if (!SkScalarNearlyZero(strikeToSourceScale)) {
+            SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
+
+            fAccepted.startSource(fRejected.source());
+            #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
+                msg.appendf("    glyphs:(x,y):\n      %s\n", fAccepted.dumpInput().c_str());
+            #endif
+            strike->prepareForDrawableDrawing(&fAccepted, &fRejected);
+            fRejected.flipRejectsToSource();
+            auto [minHint, maxHint] = fRejected.maxDimensionHint();
+            maxDimensionInSourceSpace = SkScalarCeilToScalar(maxHint * strikeToSourceScale);
+
+            if (process && !fAccepted.empty()) {
+                // processSourceDrawables must be called even if there are no glyphs to make sure
+                // runs are set correctly.
+                process->processSourceDrawables(fAccepted.accepted(), runFont, strikeToSourceScale);
+            }
+        }
+    }
+    if (!fRejected.source().empty()) {
         // Path case - handle big things without color and that have a path.
         auto [strikeSpec, strikeToSourceScale] =
                 SkStrikeSpec::MakePath(runFont, runPaint, fDeviceProps, fScalerContextFlags);
@@ -326,24 +408,24 @@ void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun,
         if (!SkScalarNearlyZero(strikeToSourceScale)) {
             SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
 
-            fDrawable.startSource(fRejects.source());
+            fAccepted.startSource(fRejected.source());
             #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-                msg.appendf("    glyphs:(x,y):\n      %s\n", fDrawable.dumpInput().c_str());
+                msg.appendf("    glyphs:(x,y):\n      %s\n", fAccepted.dumpInput().c_str());
             #endif
-            strike->prepareForPathDrawing(&fDrawable, &fRejects);
-            fRejects.flipRejectsToSource();
-            maxDimensionInSourceSpace = fRejects.rejectedMaxDimension() * strikeToSourceScale;
+            strike->prepareForPathDrawing(&fAccepted, &fRejected);
+            fRejected.flipRejectsToSource();
+            auto [minHint, maxHint] = fRejected.maxDimensionHint();
+            maxDimensionInSourceSpace = SkScalarCeilToScalar(maxHint * strikeToSourceScale);
 
-            if (process && !fDrawable.drawableIsEmpty()) {
+            if (process && !fAccepted.empty()) {
                 // processSourcePaths must be called even if there are no glyphs to make sure
                 // runs are set correctly.
-                process->processSourcePaths(
-                        fDrawable.drawable(), runFont, strikeToSourceScale);
+                process->processSourcePaths(fAccepted.accepted(), runFont, strikeToSourceScale);
             }
         }
     }
 
-    if (!fRejects.source().empty() && maxDimensionInSourceSpace != 0) {
+    if (!fRejected.source().empty() && maxDimensionInSourceSpace != 0) {
         // Draw of last resort. Scale the bitmap to the screen.
         auto [strikeSpec, strikeToSourceScale] = SkStrikeSpec::MakeSourceFallback(
                 runFont, runPaint, fDeviceProps,
@@ -356,17 +438,17 @@ void SkGlyphRunListPainter::processGlyphRun(const SkGlyphRun& glyphRun,
         if (!SkScalarNearlyZero(strikeToSourceScale)) {
             SkScopedStrikeForGPU strike = strikeSpec.findOrCreateScopedStrike(fStrikeCache);
 
-            fDrawable.startSource(fRejects.source());
+            fAccepted.startSource(fRejected.source());
             #if defined(SK_TRACE_GLYPH_RUN_PROCESS)
-                msg.appendf("glyphs:(x,y):\n      %s\n", fDrawable.dumpInput().c_str());
+                msg.appendf("glyphs:(x,y):\n      %s\n", fAccepted.dumpInput().c_str());
             #endif
-            strike->prepareForMaskDrawing(&fDrawable, &fRejects);
-            fRejects.flipRejectsToSource();
-            SkASSERT(fRejects.source().empty());
+            strike->prepareForMaskDrawing(&fAccepted, &fRejected);
+            fRejected.flipRejectsToSource();
+            SkASSERT(fRejected.source().empty());
 
-            if (process && !fDrawable.drawableIsEmpty()) {
+            if (process && !fAccepted.empty()) {
                 process->processSourceMasks(
-                        fDrawable.drawable(), strike->getUnderlyingStrike(), strikeToSourceScale);
+                        fAccepted.accepted(), strike->getUnderlyingStrike(), strikeToSourceScale);
             }
         }
     }
@@ -394,12 +476,12 @@ auto SkGlyphRunListPainter::ensureBuffers(const SkGlyphRun& glyphRun) -> ScopedB
 
 SkGlyphRunListPainter::ScopedBuffers::ScopedBuffers(SkGlyphRunListPainter* painter, size_t size)
         : fPainter{painter} {
-    fPainter->fDrawable.ensureSize(size);
+    fPainter->fAccepted.ensureSize(size);
 }
 
 SkGlyphRunListPainter::ScopedBuffers::~ScopedBuffers() {
-    fPainter->fDrawable.reset();
-    fPainter->fRejects.reset();
+    fPainter->fAccepted.reset();
+    fPainter->fRejected.reset();
 }
 
 SkVector SkGlyphPositionRoundingSpec::HalfAxisSampleFreq(
diff --git a/third_party/skia/src/core/SkGlyphRunPainter.h b/third_party/skia/src/core/SkGlyphRunPainter.h
index a65b0d7e29211..bbc6ae45458b3 100644
--- a/third_party/skia/src/core/SkGlyphRunPainter.h
+++ b/third_party/skia/src/core/SkGlyphRunPainter.h
@@ -23,6 +23,7 @@ namespace skgpu { namespace v1 { class SurfaceDrawContext; }}
 
 class SkGlyphRunPainterInterface;
 class SkStrikeSpec;
+class GrSDFTMatrixRange;
 
 // round and ignorePositionMask are used to calculate the subpixel position of a glyph.
 // The per component (x or y) calculation is:
@@ -71,27 +72,23 @@ class SkGlyphRunListPainter {
         BitmapDevicePainter(const BitmapDevicePainter&) = default;
         virtual ~BitmapDevicePainter() = default;
 
-        virtual void paintPaths(
-                SkDrawableGlyphBuffer* drawables, SkScalar scale, SkPoint origin,
-                const SkPaint& paint) const = 0;
-
-        virtual void paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint) const = 0;
+        virtual void paintMasks(SkDrawableGlyphBuffer* accepted, const SkPaint& paint) const = 0;
         virtual void drawBitmap(const SkBitmap&, const SkMatrix&, const SkRect* dstOrNull,
                                 const SkSamplingOptions&, const SkPaint&) const = 0;
     };
 
     void drawForBitmapDevice(
-            const SkGlyphRunList& glyphRunList, const SkPaint& paint, const SkMatrix& deviceMatrix,
-            const BitmapDevicePainter* bitmapDevice);
+            SkCanvas* canvas, const BitmapDevicePainter* bitmapDevice,
+            const SkGlyphRunList& glyphRunList, const SkPaint& paint, const SkMatrix& deviceMatrix);
 
 #if SK_SUPPORT_GPU
     // A nullptr for process means that the calls to the cache will be performed, but none of the
     // callbacks will be called.
-    void processGlyphRun(const SkGlyphRun& glyphRun,
+    void processGlyphRun(SkGlyphRunPainterInterface* process,
+                         const SkGlyphRun& glyphRun,
                          const SkMatrix& drawMatrix,
                          const SkPaint& drawPaint,
                          const GrSDFTControl& control,
-                         SkGlyphRunPainterInterface* process,
                          const char* tag = nullptr,
                          uint64_t blobID = SK_InvalidUniqueID);
 #endif  // SK_SUPPORT_GPU
@@ -102,8 +99,6 @@ class SkGlyphRunListPainter {
 
     struct ScopedBuffers {
         ScopedBuffers(SkGlyphRunListPainter* painter, size_t size);
-        // Required until C++17 copy elision
-        ScopedBuffers(const ScopedBuffers&) = default;
         ~ScopedBuffers();
         SkGlyphRunListPainter* fPainter;
     };
@@ -120,8 +115,8 @@ class SkGlyphRunListPainter {
 
     SkStrikeForGPUCacheInterface* const fStrikeCache;
 
-    SkDrawableGlyphBuffer fDrawable;
-    SkSourceGlyphBuffer fRejects;
+    SkDrawableGlyphBuffer fAccepted;
+    SkSourceGlyphBuffer fRejected;
 };
 
 // SkGlyphRunPainterInterface are all the ways that Ganesh generates glyphs. The first
@@ -140,23 +135,26 @@ class SkGlyphRunPainterInterface {
 public:
     virtual ~SkGlyphRunPainterInterface() = default;
 
-    virtual void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    virtual void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                     sk_sp<SkStrike>&& strike) = 0;
 
-    virtual void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    virtual void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                     sk_sp<SkStrike>&& strike,
                                     SkScalar strikeToSourceScale) = 0;
 
-    virtual void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    virtual void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                     const SkFont& runFont,
                                     SkScalar strikeToSourceScale) = 0;
 
-    virtual void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    virtual void processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        const SkFont& runFont,
+                                        SkScalar strikeToSourceScale) = 0;
+
+    virtual void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    sk_sp<SkStrike>&& strike,
                                    SkScalar strikeToSourceScale,
                                    const SkFont& runFont,
-                                   SkScalar minScale,
-                                   SkScalar maxScale) = 0;
+                                   const GrSDFTMatrixRange& matrixRange) = 0;
 };
 
 #endif  // SkGlyphRunPainter_DEFINED
diff --git a/third_party/skia/src/core/SkImageFilter.cpp b/third_party/skia/src/core/SkImageFilter.cpp
index 58b0e8ad7ce7d..b3214a98516df 100644
--- a/third_party/skia/src/core/SkImageFilter.cpp
+++ b/third_party/skia/src/core/SkImageFilter.cpp
@@ -60,7 +60,7 @@ SkIRect SkImageFilter::filterBounds(const SkIRect& src, const SkMatrix& ctm,
     // The old filterBounds() function uses SkIRects that are defined in layer space so, while
     // we still are supporting it, bypass SkIF_B's new public filter bounds functions and go right
     // to the internal layer-space calculations.
-    skif::Mapping mapping(SkMatrix::I(), ctm);
+    skif::Mapping mapping{ctm};
     if (kReverse_MapDirection == direction) {
         skif::LayerSpace<SkIRect> targetOutput(src);
         if (as_IFB(this)->cropRectIsSet()) {
@@ -589,6 +589,7 @@ sk_sp<SkSpecialImage> SkImageFilter_Base::DrawWithFP(GrRecordingContext* rContex
                                                      SkColorType colorType,
                                                      const SkColorSpace* colorSpace,
                                                      const SkSurfaceProps& surfaceProps,
+                                                     GrSurfaceOrigin surfaceOrigin,
                                                      GrProtected isProtected) {
     GrImageInfo info(SkColorTypeToGrColorType(colorType),
                      kPremul_SkAlphaType,
@@ -600,7 +601,7 @@ sk_sp<SkSpecialImage> SkImageFilter_Base::DrawWithFP(GrRecordingContext* rContex
                                         1,
                                         GrMipmapped::kNo,
                                         isProtected,
-                                        kBottomLeft_GrSurfaceOrigin);
+                                        surfaceOrigin);
     if (!sfc) {
         return nullptr;
     }
diff --git a/third_party/skia/src/core/SkImageFilterTypes.h b/third_party/skia/src/core/SkImageFilterTypes.h
index 9b5260a8a4154..bbfb80e653f5d 100644
--- a/third_party/skia/src/core/SkImageFilterTypes.h
+++ b/third_party/skia/src/core/SkImageFilterTypes.h
@@ -423,13 +423,18 @@ class Mapping {
 public:
     Mapping() = default;
 
-    // This constructor allows the decomposition to be explicitly provided, requires
-    // layerToDev to be invertible.
-    Mapping(const SkMatrix& layerToDev, const SkMatrix& paramToLayer)
+    // Helper constructor that equates device and layer space to the same coordinate space.
+    explicit Mapping(const SkMatrix& paramToLayer)
+            : fLayerToDevMatrix(SkMatrix::I())
+            , fParamToLayerMatrix(paramToLayer)
+            , fDevToLayerMatrix(SkMatrix::I()) {}
+
+    // This constructor allows the decomposition to be explicitly provided, assumes that
+    // 'layerToDev's inverse has already been calculated in 'devToLayer'
+    Mapping(const SkMatrix& layerToDev, const SkMatrix& devToLayer, const SkMatrix& paramToLayer)
             : fLayerToDevMatrix(layerToDev)
-            , fParamToLayerMatrix(paramToLayer) {
-        SkAssertResult(fLayerToDevMatrix.invert(&fDevToLayerMatrix));
-    }
+            , fParamToLayerMatrix(paramToLayer)
+            , fDevToLayerMatrix(devToLayer) {}
 
     // Sets this Mapping to the default decomposition of the canvas's total transform, given the
     // requirements of the 'filter'. Returns false if the decomposition failed or would produce an
@@ -578,7 +583,7 @@ class Context {
     // with an origin of (0,0).
     Context(const SkMatrix& layerMatrix, const SkIRect& clipBounds, SkImageFilterCache* cache,
             SkColorType colorType, SkColorSpace* colorSpace, const SkSpecialImage* source)
-        : fMapping(SkMatrix::I(), layerMatrix)
+        : fMapping(layerMatrix)
         , fDesiredOutput(clipBounds)
         , fCache(cache)
         , fColorType(colorType)
diff --git a/third_party/skia/src/core/SkImageFilter_Base.h b/third_party/skia/src/core/SkImageFilter_Base.h
index f10f72b4772e5..6e88863e816ee 100644
--- a/third_party/skia/src/core/SkImageFilter_Base.h
+++ b/third_party/skia/src/core/SkImageFilter_Base.h
@@ -310,6 +310,7 @@ class SkImageFilter_Base : public SkImageFilter {
                                             SkColorType colorType,
                                             const SkColorSpace* colorSpace,
                                             const SkSurfaceProps&,
+                                            GrSurfaceOrigin surfaceOrigin,
                                             GrProtected isProtected = GrProtected::kNo);
 
     /**
diff --git a/third_party/skia/src/core/SkImageGenerator.cpp b/third_party/skia/src/core/SkImageGenerator.cpp
index 97de4ff371725..f0f5c2323f830 100644
--- a/third_party/skia/src/core/SkImageGenerator.cpp
+++ b/third_party/skia/src/core/SkImageGenerator.cpp
@@ -84,7 +84,7 @@ SkGraphics::SetImageGeneratorFromEncodedDataFactory(ImageGeneratorFromEncodedDat
 }
 
 std::unique_ptr<SkImageGenerator> SkImageGenerator::MakeFromEncoded(
-        sk_sp<SkData> data, skstd::optional<SkAlphaType> at) {
+        sk_sp<SkData> data, std::optional<SkAlphaType> at) {
     if (!data || at == kOpaque_SkAlphaType) {
         return nullptr;
     }
diff --git a/third_party/skia/src/core/SkImageInfo.cpp b/third_party/skia/src/core/SkImageInfo.cpp
index 48ac09f0e96c3..d4bb8899595e9 100644
--- a/third_party/skia/src/core/SkImageInfo.cpp
+++ b/third_party/skia/src/core/SkImageInfo.cpp
@@ -34,6 +34,7 @@ int SkColorTypeBytesPerPixel(SkColorType ct) {
         case kR16G16_float_SkColorType:       return 4;
         case kR16G16B16A16_unorm_SkColorType: return 8;
         case kSRGBA_8888_SkColorType:         return 4;
+        case kR8_unorm_SkColorType:           return 1;
     }
     SkUNREACHABLE;
 }
@@ -119,6 +120,7 @@ bool SkColorTypeValidateAlphaType(SkColorType colorType, SkAlphaType alphaType,
         case kRGB_888x_SkColorType:
         case kRGB_101010x_SkColorType:
         case kBGR_101010x_SkColorType:
+        case kR8_unorm_SkColorType:
             alphaType = kOpaque_SkAlphaType;
             break;
     }
diff --git a/third_party/skia/src/core/SkKeyHelpers.cpp b/third_party/skia/src/core/SkKeyHelpers.cpp
new file mode 100644
index 0000000000000..b001eae461e56
--- /dev/null
+++ b/third_party/skia/src/core/SkKeyHelpers.cpp
@@ -0,0 +1,716 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkKeyHelpers.h"
+
+#include "src/core/SkDebugUtils.h"
+#include "src/core/SkPaintParamsKey.h"
+#include "src/core/SkShaderCodeDictionary.h"
+#include "src/core/SkUniform.h"
+#include "src/core/SkUniformData.h"
+#include "src/shaders/SkShaderBase.h"
+
+#ifdef SK_GRAPHITE_ENABLED
+#include "experimental/graphite/src/UniformManager.h"
+#endif
+
+namespace {
+
+#if defined(SK_DEBUG) && defined(SK_GRAPHITE_ENABLED)
+SkBuiltInCodeSnippetID read_code_snippet_id(const SkPaintParamsKey& key, int headerOffset) {
+    uint8_t byte = key.byte(headerOffset);
+
+    SkASSERT(byte <= static_cast<int>(SkBuiltInCodeSnippetID::kLast));
+
+    return static_cast<SkBuiltInCodeSnippetID>(byte);
+}
+
+void validate_block_header_key(const SkPaintParamsKey& key,
+                               int headerOffset,
+                               SkBuiltInCodeSnippetID codeSnippetID,
+                               int blockDataSize) {
+    SkASSERT(key.byte(headerOffset) == static_cast<int>(codeSnippetID));
+    SkASSERT(key.byte(headerOffset+SkPaintParamsKey::kBlockSizeOffsetInBytes) ==
+             SkPaintParamsKey::kBlockHeaderSizeInBytes + blockDataSize);
+}
+#endif
+
+// This can be used to catch errors in blocks that have a fixed, known block data size
+void validate_block_header(const SkPaintParamsKeyBuilder* builder,
+                           SkBuiltInCodeSnippetID codeSnippetID,
+                           int blockDataSize) {
+    SkDEBUGCODE(int fullBlockSize = SkPaintParamsKey::kBlockHeaderSizeInBytes + blockDataSize;)
+    SkDEBUGCODE(int headerOffset = builder->sizeInBytes() - fullBlockSize;)
+    SkASSERT(builder->byte(headerOffset) == static_cast<int>(codeSnippetID));
+    SkASSERT(builder->byte(headerOffset+SkPaintParamsKey::kBlockSizeOffsetInBytes) ==
+             fullBlockSize);
+}
+
+#ifdef SK_GRAPHITE_ENABLED
+void add_blendmode_to_key(SkPaintParamsKeyBuilder* builder, SkBlendMode bm) {
+    SkASSERT(static_cast<int>(bm) <= std::numeric_limits<uint8_t>::max());
+    builder->addByte(static_cast<uint8_t>(bm));
+}
+
+#ifdef SK_DEBUG
+SkBlendMode to_blendmode(uint8_t data) {
+    SkASSERT(data <= static_cast<int>(SkBlendMode::kLastMode));
+    return static_cast<SkBlendMode>(data);
+}
+
+SkTileMode to_tilemode(uint8_t data) {
+    SkASSERT(data <= static_cast<int>(SkTileMode::kLastTileMode));
+    return static_cast<SkTileMode>(data);
+}
+#endif // SK_DEBUG
+
+#endif // SK_GRAPHITE_ENABLED
+
+} // anonymous namespace
+
+//--------------------------------------------------------------------------------------------------
+namespace DepthStencilOnlyBlock {
+
+static const int kBlockDataSize = 0;
+
+void AddToKey(SkShaderCodeDictionary* /* dict */,
+              SkBackend /* backend */,
+              SkPaintParamsKeyBuilder* builder,
+              SkUniformBlock* /* uniformBlock */) {
+    builder->beginBlock(SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw);
+    builder->endBlock();
+
+    validate_block_header(builder,
+                          SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw,
+                          kBlockDataSize);
+}
+
+#ifdef SK_DEBUG
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+#ifdef SK_GRAPHITE_ENABLED
+    validate_block_header_key(key,
+                              headerOffset,
+                              SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw,
+                              kBlockDataSize);
+
+    SkDebugf("kDepthStencilOnlyDraw\n");
+#endif // SK_GRAPHITE_ENABLED
+}
+#endif // SK_DEBUG
+
+} // namespace DepthStencilOnlyBlock
+
+//--------------------------------------------------------------------------------------------------
+namespace SolidColorShaderBlock {
+
+namespace {
+
+#ifdef SK_GRAPHITE_ENABLED
+static const int kBlockDataSize = 0;
+
+sk_sp<SkUniformData> make_solid_uniform_data(SkShaderCodeDictionary* dict, SkColor4f color) {
+    static constexpr size_t kExpectedNumUniforms = 1;
+
+    SkSpan<const SkUniform> uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kSolidColorShader);
+    SkASSERT(uniforms.size() == kExpectedNumUniforms);
+
+    skgpu::UniformManager mgr(skgpu::Layout::kMetal);
+
+    size_t dataSize = mgr.writeUniforms(uniforms, nullptr, nullptr, nullptr);
+
+    sk_sp<SkUniformData> result = SkUniformData::Make(uniforms, dataSize);
+
+    const void* srcs[kExpectedNumUniforms] = { &color };
+
+    mgr.writeUniforms(result->uniforms(), srcs, result->offsets(), result->data());
+    return result;
+}
+#endif // SK_GRAPHITE_ENABLED
+
+} // anonymous namespace
+
+void AddToKey(SkShaderCodeDictionary* dict,
+              SkBackend backend,
+              SkPaintParamsKeyBuilder* builder,
+              SkUniformBlock* uniformBlock,
+              const SkColor4f& color) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    if (backend == SkBackend::kGraphite) {
+        builder->beginBlock(SkBuiltInCodeSnippetID::kSolidColorShader);
+        builder->endBlock();
+
+        validate_block_header(builder,
+                              SkBuiltInCodeSnippetID::kSolidColorShader,
+                              kBlockDataSize);
+
+        if (uniformBlock) {
+            uniformBlock->add(make_solid_uniform_data(dict, color));
+        }
+        return;
+    }
+#endif // SK_GRAPHITE_ENABLED
+
+    if (backend == SkBackend::kSkVM || backend == SkBackend::kGanesh) {
+        // TODO: add implementation of other backends
+    }
+
+}
+
+#ifdef SK_DEBUG
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    validate_block_header_key(key,
+                              headerOffset,
+                              SkBuiltInCodeSnippetID::kSolidColorShader,
+                              kBlockDataSize);
+
+    SkDebugf("kSolidColorShader\n");
+#endif
+
+}
+#endif
+
+} // namespace SolidColorShaderBlock
+
+//--------------------------------------------------------------------------------------------------
+namespace GradientShaderBlocks {
+
+namespace {
+
+#ifdef SK_GRAPHITE_ENABLED
+static const int kBlockDataSize = 1;
+static const int kExpectedNumGradientUniforms = 7;
+
+sk_sp<SkUniformData> make_gradient_uniform_data_common(
+        SkSpan<const SkUniform> uniforms,
+        const void* srcs[kExpectedNumGradientUniforms]) {
+    skgpu::UniformManager mgr(skgpu::Layout::kMetal);
+
+    // TODO: Given that, for the sprint, we always know the uniforms we could cache 'dataSize'
+    // for each layout and skip the first call.
+    size_t dataSize = mgr.writeUniforms(uniforms, nullptr, nullptr, nullptr);
+
+    sk_sp<SkUniformData> result = SkUniformData::Make(uniforms, dataSize);
+
+    mgr.writeUniforms(result->uniforms(), srcs, result->offsets(), result->data());
+    return result;
+}
+
+sk_sp<SkUniformData> make_linear_gradient_uniform_data(SkShaderCodeDictionary* dict,
+                                                       const GradientData& gradData) {
+
+    auto uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kLinearGradientShader);
+    SkASSERT(uniforms.size() == kExpectedNumGradientUniforms);
+
+    SkPoint padding{0, 0};
+    const void* srcs[kExpectedNumGradientUniforms] = {
+        gradData.fColor4fs,
+        gradData.fOffsets,
+        &gradData.fPoints[0],
+        &gradData.fPoints[1],
+        &gradData.fRadii[0], // unused
+        &gradData.fRadii[1], // unused
+        &padding
+    };
+
+    return make_gradient_uniform_data_common(uniforms, srcs);
+};
+
+sk_sp<SkUniformData> make_radial_gradient_uniform_data(SkShaderCodeDictionary* dict,
+                                                       const GradientData& gradData) {
+
+    auto uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kRadialGradientShader);
+    SkASSERT(uniforms.size() == kExpectedNumGradientUniforms);
+
+    SkPoint padding{0, 0};
+    const void* srcs[kExpectedNumGradientUniforms] = {
+        gradData.fColor4fs,
+        gradData.fOffsets,
+        &gradData.fPoints[0],
+        &gradData.fPoints[1], // unused
+        &gradData.fRadii[0],
+        &gradData.fRadii[1],  // unused
+        &padding
+    };
+
+    return make_gradient_uniform_data_common(uniforms, srcs);
+};
+
+sk_sp<SkUniformData> make_sweep_gradient_uniform_data(SkShaderCodeDictionary* dict,
+                                                      const GradientData& gradData) {
+
+    auto uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kSweepGradientShader);
+    SkASSERT(uniforms.size() == kExpectedNumGradientUniforms);
+
+    SkPoint padding{0, 0};
+    const void* srcs[kExpectedNumGradientUniforms] = {
+        gradData.fColor4fs,
+        gradData.fOffsets,
+        &gradData.fPoints[0],
+        &gradData.fPoints[1], // unused
+        &gradData.fRadii[0],  // unused
+        &gradData.fRadii[1],  // unused
+        &padding
+    };
+
+    return make_gradient_uniform_data_common(uniforms, srcs);
+};
+
+sk_sp<SkUniformData> make_conical_gradient_uniform_data(SkShaderCodeDictionary* dict,
+                                                        const GradientData& gradData) {
+
+    auto uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kConicalGradientShader);
+    SkASSERT(uniforms.size() == kExpectedNumGradientUniforms);
+
+    SkPoint padding{0, 0};
+    const void* srcs[kExpectedNumGradientUniforms] = {
+        gradData.fColor4fs,
+        gradData.fOffsets,
+        &gradData.fPoints[0],
+        &gradData.fPoints[1],
+        &gradData.fRadii[0],
+        &gradData.fRadii[1],
+        &padding,
+    };
+
+    return make_gradient_uniform_data_common(uniforms, srcs);
+};
+
+#endif // SK_GRAPHITE_ENABLED
+
+} // anonymous namespace
+
+GradientData::GradientData(SkShader::GradientType type,
+                           SkTileMode tm,
+                           int numStops)
+        : fType(type)
+        , fPoints{{0.0f, 0.0f}, {0.0f, 0.0f}}
+        , fRadii{0.0f, 0.0f}
+        , fTM(tm)
+        , fNumStops(numStops) {
+    sk_bzero(fColor4fs, sizeof(fColor4fs));
+    sk_bzero(fOffsets, sizeof(fOffsets));
+}
+
+GradientData::GradientData(SkShader::GradientType type,
+                           SkPoint point0, SkPoint point1,
+                           float radius0, float radius1,
+                           SkTileMode tm,
+                           int numStops,
+                           SkColor4f* color4fs,
+                           float* offsets)
+        : fType(type)
+        , fTM(tm)
+        , fNumStops(std::min(numStops, kMaxStops)) {
+    SkASSERT(fNumStops >= 1);
+
+    fPoints[0] = point0;
+    fPoints[1] = point1;
+    fRadii[0] = radius0;
+    fRadii[1] = radius1;
+    memcpy(fColor4fs, color4fs, fNumStops * sizeof(SkColor4f));
+    if (offsets) {
+        memcpy(fOffsets, offsets, fNumStops * sizeof(float));
+    } else {
+        for (int i = 0; i < fNumStops; ++i) {
+            fOffsets[i] = SkIntToFloat(i) / (fNumStops-1);
+        }
+    }
+
+    // Extend the colors and offset, if necessary, to fill out the arrays
+    // TODO: this should be done later when the actual code snippet has been selected!!
+    for (int i = fNumStops ; i < kMaxStops; ++i) {
+        fColor4fs[i] = fColor4fs[fNumStops-1];
+        fOffsets[i] = fOffsets[fNumStops-1];
+    }
+}
+
+void AddToKey(SkShaderCodeDictionary* dict,
+              SkBackend backend,
+              SkPaintParamsKeyBuilder *builder,
+              SkUniformBlock* uniformBlock,
+              const GradientData& gradData) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    if (backend == SkBackend::kGraphite) {
+        SkBuiltInCodeSnippetID codeSnippetID = SkBuiltInCodeSnippetID::kSolidColorShader;
+        switch (gradData.fType) {
+            case SkShader::kLinear_GradientType:
+                codeSnippetID = SkBuiltInCodeSnippetID::kLinearGradientShader;
+                if (uniformBlock) {
+                    uniformBlock->add(make_linear_gradient_uniform_data(dict, gradData));
+                }
+                break;
+            case SkShader::kRadial_GradientType:
+                codeSnippetID = SkBuiltInCodeSnippetID::kRadialGradientShader;
+                if (uniformBlock) {
+                    uniformBlock->add(make_radial_gradient_uniform_data(dict, gradData));
+                }
+                break;
+            case SkShader::kSweep_GradientType:
+                codeSnippetID = SkBuiltInCodeSnippetID::kSweepGradientShader;
+                if (uniformBlock) {
+                    uniformBlock->add(make_sweep_gradient_uniform_data(dict, gradData));
+                }
+                break;
+            case SkShader::GradientType::kConical_GradientType:
+                codeSnippetID = SkBuiltInCodeSnippetID::kConicalGradientShader;
+                if (uniformBlock) {
+                    uniformBlock->add(make_conical_gradient_uniform_data(dict, gradData));
+                }
+                break;
+            case SkShader::GradientType::kColor_GradientType:
+            case SkShader::GradientType::kNone_GradientType:
+            default:
+                SkASSERT(0);
+                break;
+        }
+
+        builder->beginBlock(codeSnippetID);
+
+        SkASSERT(static_cast<int>(gradData.fTM) <= std::numeric_limits<uint8_t>::max());
+        builder->addByte(static_cast<uint8_t>(gradData.fTM));
+
+        builder->endBlock();
+
+        validate_block_header(builder, codeSnippetID, kBlockDataSize);
+        return;
+    }
+#endif // SK_GRAPHITE_ENABLED
+
+    if (backend == SkBackend::kSkVM || backend == SkBackend::kGanesh) {
+        // TODO: add implementation of other backends
+        SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, SkColors::kRed);
+    }
+}
+
+#ifdef SK_DEBUG
+
+#ifdef SK_GRAPHITE_ENABLED
+
+std::pair<SkBuiltInCodeSnippetID, SkTileMode> ExtractFromKey(const SkPaintParamsKey& key,
+                                                             uint32_t headerOffset) {
+    SkBuiltInCodeSnippetID id = read_code_snippet_id(key, headerOffset);
+
+    SkASSERT(id == SkBuiltInCodeSnippetID::kLinearGradientShader ||
+             id == SkBuiltInCodeSnippetID::kRadialGradientShader ||
+             id == SkBuiltInCodeSnippetID::kSweepGradientShader ||
+             id == SkBuiltInCodeSnippetID::kConicalGradientShader);
+    SkASSERT(key.byte(headerOffset+SkPaintParamsKey::kBlockSizeOffsetInBytes) ==
+             SkPaintParamsKey::kBlockHeaderSizeInBytes+kBlockDataSize);
+
+    uint8_t data = key.byte(headerOffset + SkPaintParamsKey::kBlockHeaderSizeInBytes);
+    SkTileMode tm = to_tilemode(data);
+
+    return { id, tm };
+}
+
+#endif // SK_GRAPHITE_ENABLED
+
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    auto [id, tm] =  ExtractFromKey(key, headerOffset);
+
+    switch (id) {
+        case SkBuiltInCodeSnippetID::kLinearGradientShader:
+            SkDebugf("kLinearGradientShader: %s\n", SkTileModeToStr(tm));
+            break;
+        case SkBuiltInCodeSnippetID::kRadialGradientShader:
+            SkDebugf("kRadialGradientShader: %s\n", SkTileModeToStr(tm));
+            break;
+        case SkBuiltInCodeSnippetID::kSweepGradientShader:
+            SkDebugf("kSweepGradientShader: %s\n", SkTileModeToStr(tm));
+            break;
+        case SkBuiltInCodeSnippetID::kConicalGradientShader:
+            SkDebugf("kConicalGradientShader: %s\n", SkTileModeToStr(tm));
+            break;
+        default:
+            SkDebugf("Unknown!!\n");
+            break;
+    }
+#endif // SK_GRAPHITE_ENABLED
+
+}
+#endif
+
+} // namespace GradientShaderBlocks
+
+//--------------------------------------------------------------------------------------------------
+namespace ImageShaderBlock {
+
+namespace {
+
+#ifdef SK_GRAPHITE_ENABLED
+
+inline static constexpr int kTileModeBits = 2;
+
+static const int kXTileModeShift = 0;
+static const int kYTileModeShift = kTileModeBits;
+
+#ifdef SK_DEBUG
+static const int kBlockDataSize = 1;
+
+inline static constexpr int kTileModeMask = 0x3;
+
+ImageData ExtractFromKey(const SkPaintParamsKey& key, uint32_t headerOffset) {
+    validate_block_header_key(key,
+                              headerOffset,
+                              SkBuiltInCodeSnippetID::kImageShader,
+                              kBlockDataSize);
+
+    uint8_t data = key.byte(headerOffset+SkPaintParamsKey::kBlockHeaderSizeInBytes);
+
+    SkTileMode tmX = to_tilemode(((data) >> kXTileModeShift) & kTileModeMask);
+    SkTileMode tmY = to_tilemode(((data) >> kYTileModeShift) & kTileModeMask);
+
+    return { tmX, tmY };
+}
+#endif // SK_DEBUG
+
+sk_sp<SkUniformData> make_image_uniform_data(SkShaderCodeDictionary* dict,
+                                             const ImageData& imgData) {
+    SkDEBUGCODE(static constexpr size_t kExpectedNumUniforms = 0;)
+
+    SkSpan<const SkUniform> uniforms = dict->getUniforms(SkBuiltInCodeSnippetID::kImageShader);
+    SkASSERT(uniforms.size() == kExpectedNumUniforms);
+
+    skgpu::UniformManager mgr(skgpu::Layout::kMetal);
+
+    size_t dataSize = mgr.writeUniforms(uniforms, nullptr, nullptr, nullptr);
+
+    sk_sp<SkUniformData> result = SkUniformData::Make(uniforms, dataSize);
+
+    // TODO: add the required data to ImageData and assemble the uniforms here
+
+    mgr.writeUniforms(result->uniforms(), nullptr, result->offsets(), result->data());
+    return result;
+}
+
+#endif // SK_GRAPHITE_ENABLED
+
+} // anonymous namespace
+
+void AddToKey(SkShaderCodeDictionary* dict,
+              SkBackend backend,
+              SkPaintParamsKeyBuilder* builder,
+              SkUniformBlock* uniformBlock,
+              const ImageData& imgData) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    if (backend == SkBackend::kGraphite) {
+
+        uint8_t data = (static_cast<uint8_t>(imgData.fTileModes[0]) << kXTileModeShift) |
+                       (static_cast<uint8_t>(imgData.fTileModes[1]) << kYTileModeShift);
+
+        builder->beginBlock(SkBuiltInCodeSnippetID::kImageShader);
+
+        builder->addByte(data);
+
+        builder->endBlock();
+
+        if (uniformBlock) {
+            uniformBlock->add(make_image_uniform_data(dict, imgData));
+        }
+        return;
+    }
+#endif // SK_GRAPHITE_ENABLED
+
+    if (backend == SkBackend::kSkVM || backend == SkBackend::kGanesh) {
+        // TODO: add implementation for other backends
+        SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, SkColors::kRed);
+    }
+}
+
+#ifdef SK_DEBUG
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    ImageData imgData = ExtractFromKey(key, headerOffset);
+
+    SkDebugf("kImageShader: tileModes(%s, %s) ",
+             SkTileModeToStr(imgData.fTileModes[0]),
+             SkTileModeToStr(imgData.fTileModes[1]));
+#endif // SK_GRAPHITE_ENABLED
+
+}
+#endif // SK_DEBUG
+
+} // namespace ImageShaderBlock
+
+//--------------------------------------------------------------------------------------------------
+namespace BlendShaderBlock {
+
+void AddToKey(SkShaderCodeDictionary* dict,
+              SkBackend backend,
+              SkPaintParamsKeyBuilder *builder,
+              SkUniformBlock* uniformBlock,
+              const BlendData& blendData) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    if (backend == SkBackend::kGraphite) {
+        builder->beginBlock(SkBuiltInCodeSnippetID::kBlendShader);
+
+        // Child blocks always go right after the parent block's header
+        // TODO: add startChild/endChild entry points to SkPaintParamsKeyBuilder. They could be
+        // used to compute and store the number of children w/in a block's header.
+        int start = builder->sizeInBytes();
+        as_SB(blendData.fDst)->addToKey(dict, backend, builder, uniformBlock);
+        int firstShaderSize = builder->sizeInBytes() - start;
+
+        start = builder->sizeInBytes();
+        as_SB(blendData.fSrc)->addToKey(dict, backend, builder, uniformBlock);
+        int secondShaderSize = builder->sizeInBytes() - start;
+
+        add_blendmode_to_key(builder, blendData.fBM);
+
+        builder->endBlock();
+
+        int expectedBlockSize = 1 + firstShaderSize + secondShaderSize;
+        validate_block_header(builder,
+                              SkBuiltInCodeSnippetID::kBlendShader,
+                              expectedBlockSize);
+        return;
+    }
+#endif // SK_GRAPHITE_ENABLED
+
+    if (backend == SkBackend::kSkVM || backend == SkBackend::kGanesh) {
+        // TODO: add implementation for other backends
+        SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, SkColors::kRed);
+    }
+}
+
+#ifdef SK_DEBUG
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+#ifdef SK_GRAPHITE_ENABLED
+    auto [id, storedBlockSize] = key.readCodeSnippetID(headerOffset);
+    SkASSERT(id == SkBuiltInCodeSnippetID::kBlendShader);
+
+    int runningOffset = headerOffset + SkPaintParamsKey::kBlockHeaderSizeInBytes;
+
+    SkDebugf("\nDst:  ");
+    int firstBlockSize = SkPaintParamsKey::DumpBlock(key, runningOffset);
+    runningOffset += firstBlockSize;
+
+    SkDebugf("Src: ");
+    int secondBlockSize = SkPaintParamsKey::DumpBlock(key, runningOffset);
+    runningOffset += secondBlockSize;
+
+    uint8_t data = key.byte(runningOffset);
+    SkBlendMode bm = to_blendmode(data);
+
+    SkDebugf("BlendMode: %s\n", SkBlendMode_Name(bm));
+    runningOffset += 1; // 1 byte for blendmode
+
+    int calculatedBlockSize = SkPaintParamsKey::kBlockHeaderSizeInBytes +
+                              firstBlockSize + secondBlockSize + 1;
+    SkASSERT(calculatedBlockSize == storedBlockSize);
+#endif// SK_GRAPHITE_ENABLED
+}
+#endif
+
+} // namespace BlendShaderBlock
+
+//--------------------------------------------------------------------------------------------------
+namespace BlendModeBlock {
+
+#ifdef SK_GRAPHITE_ENABLED
+static const int kBlockDataSize = 1;
+#endif
+
+void AddToKey(SkShaderCodeDictionary* dict,
+              SkBackend backend,
+              SkPaintParamsKeyBuilder *builder,
+              SkUniformBlock* uniformBlock,
+              SkBlendMode bm) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    if (backend == SkBackend::kGraphite) {
+        builder->beginBlock(SkBuiltInCodeSnippetID::kSimpleBlendMode);
+        add_blendmode_to_key(builder, bm);
+        builder->endBlock();
+
+        validate_block_header(builder,
+                              SkBuiltInCodeSnippetID::kSimpleBlendMode,
+                              kBlockDataSize);
+        return;
+    }
+#endif// SK_GRAPHITE_ENABLED
+
+    if (backend == SkBackend::kSkVM || backend == SkBackend::kGanesh) {
+        // TODO: add implementation for other backends
+        SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, SkColors::kRed);
+    }
+}
+
+#ifdef SK_DEBUG
+
+#ifdef SK_GRAPHITE_ENABLED
+SkBlendMode ExtractFromKey(const SkPaintParamsKey& key, uint32_t headerOffset) {
+    validate_block_header_key(key,
+                              headerOffset,
+                              SkBuiltInCodeSnippetID::kSimpleBlendMode,
+                              kBlockDataSize);
+
+    uint8_t data = key.byte(headerOffset + SkPaintParamsKey::kBlockHeaderSizeInBytes);
+    return to_blendmode(data);
+}
+#endif // SK_GRAPHITE_ENABLED
+
+void Dump(const SkPaintParamsKey& key, int headerOffset) {
+
+#ifdef SK_GRAPHITE_ENABLED
+    SkBlendMode bm = ExtractFromKey(key, headerOffset);
+
+    SkDebugf("kSimpleBlendMode: %s\n", SkBlendMode_Name(bm));
+#endif
+
+}
+#endif
+
+} // namespace BlendModeBlock
+
+//--------------------------------------------------------------------------------------------------
+#ifdef SK_GRAPHITE_ENABLED
+std::unique_ptr<SkPaintParamsKey> CreateKey(SkShaderCodeDictionary* dict,
+                                            SkBackend backend,
+                                            skgpu::ShaderCombo::ShaderType s,
+                                            SkTileMode tm,
+                                            SkBlendMode bm) {
+    SkPaintParamsKeyBuilder builder(dict);
+
+    switch (s) {
+        case skgpu::ShaderCombo::ShaderType::kNone:
+            DepthStencilOnlyBlock::AddToKey(dict, backend, &builder, nullptr);
+            break;
+        case skgpu::ShaderCombo::ShaderType::kSolidColor:
+            SolidColorShaderBlock::AddToKey(dict, backend, &builder, nullptr, SkColors::kRed);
+            break;
+        case skgpu::ShaderCombo::ShaderType::kLinearGradient:
+            GradientShaderBlocks::AddToKey(dict, backend, &builder, nullptr,
+                                           { SkShader::kLinear_GradientType, tm, 0 });
+            break;
+        case skgpu::ShaderCombo::ShaderType::kRadialGradient:
+            GradientShaderBlocks::AddToKey(dict, backend, &builder, nullptr,
+                                           { SkShader::kRadial_GradientType, tm, 0 });
+            break;
+        case skgpu::ShaderCombo::ShaderType::kSweepGradient:
+            GradientShaderBlocks::AddToKey(dict, backend, &builder, nullptr,
+                                           { SkShader::kSweep_GradientType, tm, 0 });
+            break;
+        case skgpu::ShaderCombo::ShaderType::kConicalGradient:
+            GradientShaderBlocks::AddToKey(dict, backend, &builder, nullptr,
+                                           { SkShader::kConical_GradientType, tm, 0 });
+            break;
+    }
+
+    BlendModeBlock::AddToKey(dict, backend, &builder, nullptr, bm);
+    return builder.snap();
+}
+#endif
diff --git a/third_party/skia/src/core/SkKeyHelpers.h b/third_party/skia/src/core/SkKeyHelpers.h
new file mode 100644
index 0000000000000..da9dcac7f2b9f
--- /dev/null
+++ b/third_party/skia/src/core/SkKeyHelpers.h
@@ -0,0 +1,176 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkKeyHelpers_DEFINED
+#define SkKeyHelpers_DEFINED
+
+#ifdef SK_GRAPHITE_ENABLED
+#include "experimental/graphite/include/Context.h"
+#endif
+
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkTileMode.h"
+
+enum class SkBackend : uint8_t;
+class SkPaintParamsKey;
+class SkPaintParamsKeyBuilder;
+class SkShaderCodeDictionary;
+class SkUniformBlock;
+
+// The KeyHelpers can be used to manually construct an SkPaintParamsKey
+
+namespace DepthStencilOnlyBlock {
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace DepthStencilOnlyBlock
+
+namespace SolidColorShaderBlock {
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*,
+                  const SkColor4f&);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace SolidColorShaderBlock
+
+// TODO: move this functionality to the SkLinearGradient, SkRadialGradient, etc classes
+namespace GradientShaderBlocks {
+
+    struct GradientData {
+        // TODO: For the sprint we only support 4 stops in the gradients
+        static constexpr int kMaxStops = 4;
+
+        // This ctor is used during pre-compilation when we don't have enough information to
+        // extract uniform data. However, we must be able to provide enough data to make all the
+        // relevant decisions about which code snippets to use.
+        GradientData(SkShader::GradientType,
+                     SkTileMode,
+                     int numStops);
+
+        // This ctor is used when extracting information from PaintParams. It must provide
+        // enough data to generate the uniform data the selected code snippet will require.
+        GradientData(SkShader::GradientType,
+                     SkPoint point0, SkPoint point1,
+                     float radius0, float radius1,
+                     SkTileMode,
+                     int numStops,
+                     SkColor4f* colors,
+                     float* offsets);
+
+        bool operator==(const GradientData& rhs) const {
+            return fType == rhs.fType &&
+                   fPoints[0] == rhs.fPoints[0] &&
+                   fPoints[1] == rhs.fPoints[1] &&
+                   fRadii[0] == rhs.fRadii[0] &&
+                   fRadii[1] == rhs.fRadii[1] &&
+                   fTM == rhs.fTM &&
+                   fNumStops == rhs.fNumStops &&
+                   !memcmp(fColor4fs, rhs.fColor4fs, sizeof(fColor4fs)) &&
+                   !memcmp(fOffsets, rhs.fOffsets, sizeof(fOffsets));
+        }
+        bool operator!=(const GradientData& rhs) const { return !(*this == rhs); }
+
+        SkShader::GradientType fType;
+        SkPoint                fPoints[2];
+        float                  fRadii[2];
+        SkTileMode             fTM;
+        int                    fNumStops;
+        SkColor4f              fColor4fs[kMaxStops];
+        float                  fOffsets[kMaxStops];
+    };
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*,
+                  const GradientData&);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace GradientShaderBlocks
+
+namespace ImageShaderBlock {
+
+    struct ImageData {
+        bool operator==(const ImageData& rhs) const {
+            return fTileModes[0] == rhs.fTileModes[0] &&
+                   fTileModes[1] == rhs.fTileModes[1];
+        }
+        bool operator!=(const ImageData& rhs) const { return !(*this == rhs); }
+
+        // TODO: add the other image shader parameters that could impact code snippet selection
+        // (e.g., sampling options, subsetting, etc.)
+        SkTileMode fTileModes[2];
+    };
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*,
+                  const ImageData&);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace ImageShaderBlock
+
+namespace BlendShaderBlock {
+
+    struct BlendData {
+        SkShader*   fDst;
+        SkShader*   fSrc;
+        // TODO: add support for blenders
+        SkBlendMode fBM;
+    };
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*,
+                  const BlendData&);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace BlendShaderBlock
+
+namespace BlendModeBlock {
+
+    void AddToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*,
+                  SkBlendMode);
+#ifdef SK_DEBUG
+    void Dump(const SkPaintParamsKey&, int headerOffset);
+#endif
+
+} // namespace BlendModeBlock
+
+#ifdef SK_GRAPHITE_ENABLED
+// Bridge between the combinations system and the SkPaintParamsKey
+std::unique_ptr<SkPaintParamsKey> CreateKey(SkShaderCodeDictionary*,
+                                            SkBackend,
+                                            skgpu::ShaderCombo::ShaderType,
+                                            SkTileMode,
+                                            SkBlendMode);
+#endif
+
+#endif // SkKeyHelpers_DEFINED
diff --git a/third_party/skia/src/core/SkM44.cpp b/third_party/skia/src/core/SkM44.cpp
index a70b7fa8a46d6..e01499d62eacd 100644
--- a/third_party/skia/src/core/SkM44.cpp
+++ b/third_party/skia/src/core/SkM44.cpp
@@ -290,11 +290,10 @@ SkM44& SkM44::setRotate(SkV3 axis, SkScalar radians) {
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkM44::dump() const {
-    static const char* format = "|%g %g %g %g|\n"
-                                "|%g %g %g %g|\n"
-                                "|%g %g %g %g|\n"
-                                "|%g %g %g %g|\n";
-    SkDebugf(format,
+    SkDebugf("|%g %g %g %g|\n"
+             "|%g %g %g %g|\n"
+             "|%g %g %g %g|\n"
+             "|%g %g %g %g|\n",
              fMat[0], fMat[4], fMat[8],  fMat[12],
              fMat[1], fMat[5], fMat[9],  fMat[13],
              fMat[2], fMat[6], fMat[10], fMat[14],
diff --git a/third_party/skia/src/core/SkMaskFilter.cpp b/third_party/skia/src/core/SkMaskFilter.cpp
index 86c2ff94572d5..ba4efb4b9c543 100644
--- a/third_party/skia/src/core/SkMaskFilter.cpp
+++ b/third_party/skia/src/core/SkMaskFilter.cpp
@@ -265,7 +265,7 @@ bool SkMaskFilterBase::filterPath(const SkPath& devPath, const SkMatrix& matrix,
         return false;
     }
 #endif
-    if (!SkDraw::DrawToMask(devPath, &clip.getBounds(), this, &matrix, &srcM,
+    if (!SkDraw::DrawToMask(devPath, clip.getBounds(), this, &matrix, &srcM,
                             SkMask::kComputeBoundsAndRenderImage_CreateMode,
                             style)) {
         return false;
diff --git a/third_party/skia/src/core/SkMatrix.cpp b/third_party/skia/src/core/SkMatrix.cpp
index 6e824ea38cbf7..f2e35fe59ca93 100644
--- a/third_party/skia/src/core/SkMatrix.cpp
+++ b/third_party/skia/src/core/SkMatrix.cpp
@@ -940,14 +940,16 @@ void SkMatrix::Scale_pts(const SkMatrix& m, SkPoint dst[], const SkPoint src[],
         SkScalar ty = m.getTranslateY();
         SkScalar sx = m.getScaleX();
         SkScalar sy = m.getScaleY();
+        Sk4s trans4(tx, ty, tx, ty);
+        Sk4s scale4(sx, sy, sx, sy);
         if (count & 1) {
-            dst->fX = src->fX * sx + tx;
-            dst->fY = src->fY * sy + ty;
+            Sk4s p(src->fX, src->fY, 0, 0);
+            p = p * scale4 + trans4;
+            dst->fX = p[0];
+            dst->fY = p[1];
             src += 1;
             dst += 1;
         }
-        Sk4s trans4(tx, ty, tx, ty);
-        Sk4s scale4(sx, sy, sx, sy);
         count >>= 1;
         if (count & 1) {
             (Sk4s::Load(src) * scale4 + trans4).store(dst);
@@ -1658,7 +1660,9 @@ bool SkTreatAsSprite(const SkMatrix& mat, const SkISize& size, const SkSamplingO
     if (!SkSamplingPriv::NoChangeWithIdentityMatrix(sampling)) {
         return false;
     }
-
+    if (paint.isDither()) {
+        return false;
+    }
     // Our path aa is 2-bits, and our rect aa is 8, so we could use 8,
     // but in practice 4 seems enough (still looks smooth) and allows
     // more slightly fractional cases to fall into the fast (sprite) case.
diff --git a/third_party/skia/src/core/SkMatrixProvider.h b/third_party/skia/src/core/SkMatrixProvider.h
index 4f085dfa9bebf..c1642df81877f 100644
--- a/third_party/skia/src/core/SkMatrixProvider.h
+++ b/third_party/skia/src/core/SkMatrixProvider.h
@@ -38,9 +38,6 @@ class SkMatrixProvider {
     SkMatrixProvider(const SkMatrix& localToDevice) : SkMatrixProvider(localToDevice, true) {}
     SkMatrixProvider(const SkM44& localToDevice) : SkMatrixProvider(localToDevice, true) {}
 
-    // Required until C++17 copy elision
-    SkMatrixProvider(const SkMatrixProvider&) = default;
-
     // These should return the "same" matrix, as either a 3x3 or 4x4. Most sites in Skia still
     // call localToDevice, and operate on SkMatrix.
     const SkMatrix& localToDevice() const { return fLocalToDevice33; }
diff --git a/third_party/skia/src/core/SkMipmap.cpp b/third_party/skia/src/core/SkMipmap.cpp
index 5074a0003a8f1..70c2c713b1176 100644
--- a/third_party/skia/src/core/SkMipmap.cpp
+++ b/third_party/skia/src/core/SkMipmap.cpp
@@ -445,6 +445,7 @@ SkMipmap* SkMipmap::Build(const SkPixmap& src, SkDiscardableFactoryProc fact,
             break;
         case kAlpha_8_SkColorType:
         case kGray_8_SkColorType:
+        case kR8_unorm_SkColorType:
             proc_1_2 = downsample_1_2<ColorTypeFilter_8>;
             proc_1_3 = downsample_1_3<ColorTypeFilter_8>;
             proc_2_1 = downsample_2_1<ColorTypeFilter_8>;
diff --git a/third_party/skia/src/core/SkMipmapAccessor.cpp b/third_party/skia/src/core/SkMipmapAccessor.cpp
index 6e5f5f7db5c3a..6b94a5e1365fe 100644
--- a/third_party/skia/src/core/SkMipmapAccessor.cpp
+++ b/third_party/skia/src/core/SkMipmapAccessor.cpp
@@ -28,7 +28,7 @@ static sk_sp<const SkMipmap> try_load_mips(const SkImage_Base* image) {
 
 SkMipmapAccessor::SkMipmapAccessor(const SkImage_Base* image, const SkMatrix& inv,
                                    SkMipmapMode requestedMode) {
-    fResolvedMode = requestedMode;
+    SkMipmapMode resolvedMode = requestedMode;
     fLowerWeight = 0;
 
     auto load_upper_from_base = [&]() {
@@ -44,11 +44,11 @@ SkMipmapAccessor::SkMipmapAccessor(const SkImage_Base* image, const SkMatrix& in
     if (requestedMode != SkMipmapMode::kNone) {
         SkSize scale;
         if (!inv.decomposeScale(&scale, nullptr)) {
-            fResolvedMode = SkMipmapMode::kNone;
+            resolvedMode = SkMipmapMode::kNone;
         } else {
             level = SkMipmap::ComputeLevel({1/scale.width(), 1/scale.height()});
             if (level <= 0) {
-                fResolvedMode = SkMipmapMode::kNone;
+                resolvedMode = SkMipmapMode::kNone;
                 level = 0;
             }
         }
@@ -67,31 +67,31 @@ SkMipmapAccessor::SkMipmapAccessor(const SkImage_Base* image, const SkMatrix& in
         load_upper_from_base();
     }
     // load fCurrMip if needed
-    if (levelNum > 0 || (fResolvedMode == SkMipmapMode::kLinear && lowerWeight > 0)) {
+    if (levelNum > 0 || (resolvedMode == SkMipmapMode::kLinear && lowerWeight > 0)) {
         fCurrMip = try_load_mips(image);
         if (!fCurrMip) {
             load_upper_from_base();
-            fResolvedMode = SkMipmapMode::kNone;
+            resolvedMode = SkMipmapMode::kNone;
         } else {
             SkMipmap::Level levelRec;
 
-            SkASSERT(fResolvedMode != SkMipmapMode::kNone);
+            SkASSERT(resolvedMode != SkMipmapMode::kNone);
             if (levelNum > 0) {
                 if (fCurrMip->getLevel(levelNum - 1, &levelRec)) {
                     fUpper = levelRec.fPixmap;
                 } else {
                     load_upper_from_base();
-                    fResolvedMode = SkMipmapMode::kNone;
+                    resolvedMode = SkMipmapMode::kNone;
                 }
             }
 
-            if (fResolvedMode == SkMipmapMode::kLinear) {
+            if (resolvedMode == SkMipmapMode::kLinear) {
                 if (fCurrMip->getLevel(levelNum, &levelRec)) {
                     fLower = levelRec.fPixmap;
                     fLowerWeight = lowerWeight;
                     fLowerInv = post_scale(fLower);
                 } else {
-                    fResolvedMode = SkMipmapMode::kNearest;
+                    resolvedMode = SkMipmapMode::kNearest;
                 }
             }
         }
diff --git a/third_party/skia/src/core/SkMipmapAccessor.h b/third_party/skia/src/core/SkMipmapAccessor.h
index ea7c90baf0b4d..36b742a27ae74 100644
--- a/third_party/skia/src/core/SkMipmapAccessor.h
+++ b/third_party/skia/src/core/SkMipmapAccessor.h
@@ -40,7 +40,6 @@ class SkMipmapAccessor : ::SkNoncopyable {
     float        fLowerWeight;   // lower * weight + upper * (1 - weight)
     SkMatrix     fUpperInv,
                  fLowerInv;
-    SkMipmapMode fResolvedMode;
 
     // these manage lifetime for the buffers
     SkBitmap              fBaseStorage;
diff --git a/third_party/skia/src/core/SkOverdrawCanvas.cpp b/third_party/skia/src/core/SkOverdrawCanvas.cpp
index b6426bae24a79..4a0651964e675 100644
--- a/third_party/skia/src/core/SkOverdrawCanvas.cpp
+++ b/third_party/skia/src/core/SkOverdrawCanvas.cpp
@@ -50,10 +50,8 @@ class TextDevice : public SkNoPixelsDevice, public SkGlyphRunListPainter::Bitmap
               fOverdrawCanvas{overdrawCanvas},
               fPainter{props, kN32_SkColorType, nullptr, SkStrikeCache::GlobalStrikeCache()} {}
 
-    void paintPaths(SkDrawableGlyphBuffer*, SkScalar, SkPoint, const SkPaint&) const override {}
-
-    void paintMasks(SkDrawableGlyphBuffer* drawables, const SkPaint& paint) const override {
-        for (auto t : drawables->drawable()) {
+    void paintMasks(SkDrawableGlyphBuffer* accepted, const SkPaint& paint) const override {
+        for (auto t : accepted->accepted()) {
             SkGlyphVariant glyph; SkPoint pos;
             std::tie(glyph, pos) = t;
             SkMask mask = glyph.glyph()->mask(pos);
@@ -64,9 +62,11 @@ class TextDevice : public SkNoPixelsDevice, public SkGlyphRunListPainter::Bitmap
     void    drawBitmap(const SkBitmap&, const SkMatrix&, const SkRect* dstOrNull,
                        const SkSamplingOptions&, const SkPaint&) const override {}
 
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override {
+    void onDrawGlyphRunList(SkCanvas* canvas, const SkGlyphRunList& glyphRunList,
+                            const SkPaint& paint) override {
         SkASSERT(!glyphRunList.hasRSXForm());
-        fPainter.drawForBitmapDevice(glyphRunList, paint, fOverdrawCanvas->getTotalMatrix(), this);
+        fPainter.drawForBitmapDevice(canvas, this, glyphRunList, paint,
+                                     fOverdrawCanvas->getTotalMatrix());
     }
 
 private:
@@ -88,7 +88,7 @@ void SkOverdrawCanvas::onDrawGlyphRunList(
     this->getProps(&props);
     TextDevice device{this, props};
 
-    device.drawGlyphRunList(glyphRunList, paint);
+    device.drawGlyphRunList(this, glyphRunList, paint);
 }
 
 void SkOverdrawCanvas::onDrawPatch(const SkPoint cubics[12], const SkColor colors[4],
diff --git a/third_party/skia/src/core/SkPaint.cpp b/third_party/skia/src/core/SkPaint.cpp
index 011d7205b1402..d4c468a158b2d 100644
--- a/third_party/skia/src/core/SkPaint.cpp
+++ b/third_party/skia/src/core/SkPaint.cpp
@@ -142,7 +142,7 @@ void SkPaint::setARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b) {
     this->setColor(SkColorSetARGB(a, r, g, b));
 }
 
-skstd::optional<SkBlendMode> SkPaint::asBlendMode() const {
+std::optional<SkBlendMode> SkPaint::asBlendMode() const {
     return fBlender ? as_BB(fBlender)->asBlendMode()
                     : SkBlendMode::kSrcOver;
 }
diff --git a/third_party/skia/src/core/SkPaintParamsKey.cpp b/third_party/skia/src/core/SkPaintParamsKey.cpp
new file mode 100644
index 0000000000000..ef8ce6453c355
--- /dev/null
+++ b/third_party/skia/src/core/SkPaintParamsKey.cpp
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkPaintParamsKey.h"
+
+#include <cstring>
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkShaderCodeDictionary.h"
+
+//--------------------------------------------------------------------------------------------------
+SkPaintParamsKeyBuilder::SkPaintParamsKeyBuilder(const SkShaderCodeDictionary* dict)
+        : fDict(dict) {
+}
+
+// Block headers have the following structure:
+//  1st byte: codeSnippetID
+//  2nd byte: total blockSize in bytes
+// This call stores the header's offset in the key on the stack to be used in 'endBlock'
+void SkPaintParamsKeyBuilder::beginBlock(int codeSnippetID) {
+    if (!this->isValid()) {
+        return;
+    }
+
+    if (codeSnippetID < 0 || codeSnippetID > fDict->maxCodeSnippetID()) {
+        this->makeInvalid();
+        return;
+    }
+
+    fData.reserve_back(SkPaintParamsKey::kBlockHeaderSizeInBytes);
+    fStack.push_back({ codeSnippetID, this->sizeInBytes() });
+
+    this->addByte(SkTo<uint8_t>(codeSnippetID));
+    this->addByte(0);  // this needs to be patched up with a call to endBlock
+}
+
+// Update the size byte of a block header
+void SkPaintParamsKeyBuilder::endBlock() {
+    if (!this->isValid()) {
+        return;
+    }
+
+    if (fStack.empty()) {
+        SkASSERT(0);
+        this->makeInvalid();
+        return;
+    }
+
+    int headerOffset = fStack.back().fHeaderOffset;
+
+    SkASSERT(fData[headerOffset] == fStack.back().fCodeSnippetID);
+    SkASSERT(fData[headerOffset+SkPaintParamsKey::kBlockSizeOffsetInBytes] == 0);
+
+    int blockSize = this->sizeInBytes() - headerOffset;
+    if (blockSize > SkPaintParamsKey::kMaxBlockSize) {
+        this->makeInvalid();
+        return;
+    }
+
+    fData[headerOffset+SkPaintParamsKey::kBlockSizeOffsetInBytes] = blockSize;
+
+    fStack.pop_back();
+}
+
+void SkPaintParamsKeyBuilder::addBytes(uint32_t numBytes, const uint8_t* data) {
+    if (!this->isValid()) {
+        return;
+    }
+
+    fData.push_back_n(numBytes, data);
+}
+
+std::unique_ptr<SkPaintParamsKey> SkPaintParamsKeyBuilder::snap() {
+    if (!fStack.empty()) {
+        this->makeInvalid();  // fall through
+    }
+
+    auto key = std::unique_ptr<SkPaintParamsKey>(new SkPaintParamsKey(std::move(fData)));
+
+    // Reset for reuse
+    fIsValid = true;
+    fStack.clear();
+
+    return key;
+}
+
+void SkPaintParamsKeyBuilder::makeInvalid() {
+    SkASSERT(fIsValid);
+
+    fStack.clear();
+    fData.reset();
+    this->beginBlock(SkBuiltInCodeSnippetID::kError);
+    this->endBlock();
+
+    SkASSERT(fIsValid);
+    fIsValid = false;
+}
+
+//--------------------------------------------------------------------------------------------------
+SkPaintParamsKey::SkPaintParamsKey(SkTArray<uint8_t, true>&& data) : fData(std::move(data)) {}
+
+bool SkPaintParamsKey::operator==(const SkPaintParamsKey& that) const {
+    return fData == that.fData;
+}
+
+#ifdef SK_DEBUG
+typedef void (*DumpMethod)(const SkPaintParamsKey&, int headerOffset);
+
+namespace {
+
+void dump_unknown_block(const SkPaintParamsKey& key, int headerOffset) {
+    uint8_t id = key.byte(headerOffset);
+    uint8_t blockSize = key.byte(headerOffset+1);
+    SkASSERT(blockSize >= 2 && headerOffset+blockSize <= key.sizeInBytes());
+
+    SkDebugf("Unknown block - id: %d size: %dB\n", id, blockSize);
+}
+
+DumpMethod get_dump_method(SkBuiltInCodeSnippetID id) {
+    switch (id) {
+        case SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw:  return DepthStencilOnlyBlock::Dump;
+
+        // SkShader code snippets
+        case SkBuiltInCodeSnippetID::kSolidColorShader:      return SolidColorShaderBlock::Dump;
+
+        case SkBuiltInCodeSnippetID::kLinearGradientShader:  [[fallthrough]];
+        case SkBuiltInCodeSnippetID::kRadialGradientShader:  [[fallthrough]];
+        case SkBuiltInCodeSnippetID::kSweepGradientShader:   [[fallthrough]];
+        case SkBuiltInCodeSnippetID::kConicalGradientShader: return GradientShaderBlocks::Dump;
+
+        case SkBuiltInCodeSnippetID::kImageShader:           return ImageShaderBlock::Dump;
+        case SkBuiltInCodeSnippetID::kBlendShader:           return BlendShaderBlock::Dump;
+
+        // BlendMode code snippets
+        case SkBuiltInCodeSnippetID::kSimpleBlendMode:       return BlendModeBlock::Dump;
+
+        default:                                             return dump_unknown_block;
+    }
+}
+
+} // anonymous namespace
+
+int SkPaintParamsKey::DumpBlock(const SkPaintParamsKey& key, int headerOffset) {
+    auto [codeSnippetID, blockSize] = key.readCodeSnippetID(headerOffset);
+
+    get_dump_method(codeSnippetID)(key, headerOffset);
+
+    return blockSize;
+}
+
+// This just iterates over the top-level blocks calling block-specific dump methods.
+void SkPaintParamsKey::dump() const {
+    SkDebugf("SkPaintParamsKey %dB:\n", this->sizeInBytes());
+
+    int curHeaderOffset = 0;
+    while (curHeaderOffset < this->sizeInBytes()) {
+        int blockSize = DumpBlock(*this, curHeaderOffset);
+        curHeaderOffset += blockSize;
+    }
+}
+#endif
+
+int SkPaintParamsKey::AddBlockToShaderInfo(SkShaderCodeDictionary* dict,
+                                           const SkPaintParamsKey& key,
+                                           int headerOffset,
+                                           SkShaderInfo* result) {
+    auto [codeSnippetID, blockSize] = key.readCodeSnippetID(headerOffset);
+
+    if (codeSnippetID != SkBuiltInCodeSnippetID::kSimpleBlendMode) {
+        auto entry = dict->getEntry(codeSnippetID);
+
+        result->add(*entry);
+
+        // The child blocks appear right after the parent block's header in the key and go
+        // right after the parent's SnippetEntry in the shader info
+        int childOffset = headerOffset + kBlockHeaderSizeInBytes;
+        for (int i = 0; i < entry->fNumChildren; ++i) {
+            SkASSERT(childOffset < headerOffset + blockSize);
+
+            int childBlockSize = AddBlockToShaderInfo(dict, key, childOffset, result);
+            childOffset += childBlockSize;
+        }
+
+        if (codeSnippetID != SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw) {
+            result->setWritesColor();
+        }
+    }
+
+    return blockSize;
+}
+
+void SkPaintParamsKey::toShaderInfo(SkShaderCodeDictionary* dict, SkShaderInfo* result) const {
+
+    int curHeaderOffset = 0;
+    while (curHeaderOffset < this->sizeInBytes()) {
+        int blockSize = AddBlockToShaderInfo(dict, *this, curHeaderOffset, result);
+        curHeaderOffset += blockSize;
+    }
+}
diff --git a/third_party/skia/src/core/SkPaintParamsKey.h b/third_party/skia/src/core/SkPaintParamsKey.h
new file mode 100644
index 0000000000000..17fbecde468df
--- /dev/null
+++ b/third_party/skia/src/core/SkPaintParamsKey.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPaintParamsKey_DEFINED
+#define SkPaintParamsKey_DEFINED
+
+#include "include/core/SkTypes.h"
+#include "include/private/SkTArray.h"
+#include "src/core/SkBuiltInCodeSnippetID.h"
+
+#include <array>
+#include <limits>
+#include <vector>
+
+enum class SkBackend : uint8_t {
+    kGanesh,
+    kGraphite,
+    kSkVM
+};
+class SkPaintParamsKey;
+class SkShaderCodeDictionary;
+class SkShaderInfo;
+
+class SkPaintParamsKeyBuilder {
+public:
+    SkPaintParamsKeyBuilder(const SkShaderCodeDictionary*);
+
+    void beginBlock(int codeSnippetID);
+    void beginBlock(SkBuiltInCodeSnippetID id) { this->beginBlock(static_cast<int>(id)); }
+    void endBlock();
+
+    void addBytes(uint32_t numBytes, const uint8_t* data);
+    void addByte(uint8_t data) {
+        this->addBytes(1, &data);
+    }
+
+#ifdef SK_DEBUG
+    uint8_t byte(int offset) const { return fData[offset]; }
+#endif
+
+    std::unique_ptr<SkPaintParamsKey> snap();
+
+    int sizeInBytes() const { return fData.count(); }
+
+    bool isValid() const { return fIsValid; }
+
+private:
+    void makeInvalid();
+
+    struct StackFrame {
+        int fCodeSnippetID;
+        int fHeaderOffset;
+    };
+
+    bool fIsValid = true;
+    const SkShaderCodeDictionary* fDict;
+    std::vector<StackFrame> fStack;
+
+    // TODO: It is probably overkill but we could encode the SkBackend in the first byte of
+    // the key.
+    SkTArray<uint8_t, true> fData;
+};
+
+// This class is a compact representation of the shader needed to implement a given
+// PaintParams. Its structure is a series of blocks where each block has a
+// header that consists of 2-bytes:
+//   a 1-byte code-snippet ID
+//   a 1-byte number-of-bytes-in-the-block field (incl. the space for the header)
+// The rest of the data in the block is dependent on the individual code snippet.
+// If a given block has child blocks, they appear in the key right after their
+// parent block's header.
+class SkPaintParamsKey {
+public:
+    static const int kBlockHeaderSizeInBytes = 2;
+    static const int kBlockSizeOffsetInBytes = 1; // offset to the block size w/in the header
+    static const int kMaxBlockSize = std::numeric_limits<uint8_t>::max();
+
+    std::pair<SkBuiltInCodeSnippetID, uint8_t> readCodeSnippetID(int headerOffset) const {
+        SkASSERT(headerOffset < this->sizeInBytes() - kBlockHeaderSizeInBytes);
+
+        SkBuiltInCodeSnippetID id = static_cast<SkBuiltInCodeSnippetID>(fData[headerOffset]);
+        uint8_t blockSize = fData[headerOffset+1];
+        SkASSERT(headerOffset + blockSize <= this->sizeInBytes());
+
+        return { id, blockSize };
+    }
+
+#ifdef SK_DEBUG
+    uint8_t byte(int offset) const {
+        SkASSERT(offset < this->sizeInBytes());
+        return fData[offset];
+    }
+    static int DumpBlock(const SkPaintParamsKey&, int headerOffset);
+    void dump() const;
+#endif
+    void toShaderInfo(SkShaderCodeDictionary*, SkShaderInfo*) const;
+
+    const void* data() const { return fData.data(); }
+    int sizeInBytes() const { return fData.count(); }
+
+    bool operator==(const SkPaintParamsKey& that) const;
+    bool operator!=(const SkPaintParamsKey& that) const { return !(*this == that); }
+
+private:
+    friend class SkPaintParamsKeyBuilder;
+
+    SkPaintParamsKey(SkTArray<uint8_t, true>&&);
+
+    static int AddBlockToShaderInfo(SkShaderCodeDictionary*,
+                                    const SkPaintParamsKey&,
+                                    int headerOffset,
+                                    SkShaderInfo*);
+
+    SkTArray<uint8_t, true> fData;
+};
+
+#endif // SkPaintParamsKey_DEFINED
diff --git a/third_party/skia/src/core/SkPaintPriv.cpp b/third_party/skia/src/core/SkPaintPriv.cpp
index 37674116fb531..17bde60a27e0c 100644
--- a/third_party/skia/src/core/SkPaintPriv.cpp
+++ b/third_party/skia/src/core/SkPaintPriv.cpp
@@ -6,8 +6,11 @@
  */
 
 #include "include/core/SkPaint.h"
+#include "src/core/SkBlenderBase.h"
 #include "src/core/SkColorFilterBase.h"
 #include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkPaintParamsKey.h"
 #include "src/core/SkPaintPriv.h"
 #include "src/core/SkXfermodePriv.h"
 #include "src/shaders/SkColorFilterShader.h"
@@ -49,7 +52,7 @@ bool SkPaintPriv::Overwrites(const SkPaint* paint, ShaderOverrideOpacity overrid
     return SkXfermode::IsOpaque(bm.value(), opacityType);
 }
 
-bool SkPaintPriv::ShouldDither(const SkPaint& p, SkColorType dstCT) {
+bool SkPaintPriv::ShouldDither(const SkPaint& p, SkColorType dstCT, bool shaderOverride) {
     // The paint dither flag can veto.
     if (!p.isDither()) {
         return false;
@@ -62,7 +65,8 @@ bool SkPaintPriv::ShouldDither(const SkPaint& p, SkColorType dstCT) {
 
     // Otherwise, dither is only needed for non-const paints.
     return p.getImageFilter() || p.getMaskFilter() ||
-           (p.getShader() && !as_SB(p.getShader())->isConstant());
+           (p.getShader() && !as_SB(p.getShader())->isConstant()) ||
+           shaderOverride;
 }
 
 // return true if the paint is just a single color (i.e. not a shader). If its
@@ -119,3 +123,35 @@ SkScalar SkPaintPriv::ComputeResScaleForStroking(const SkMatrix& matrix) {
     }
     return 1;
 }
+
+std::vector<std::unique_ptr<SkPaintParamsKey>> SkPaintPriv::ToKeys(const SkPaint& paint,
+                                                                   SkShaderCodeDictionary* dict,
+                                                                   SkBackend backend) {
+    std::vector<std::unique_ptr<SkPaintParamsKey>> keys;
+
+    // TODO: actually split the SkPaint into multiple PaintParams and generate the keys
+    // for them separately.
+    // TODO: actually collect and return the SkUniformData vector for each PaintParams derived
+    // from the SkPaint
+    {
+        SkPaintParamsKeyBuilder builder(dict);
+
+        if (paint.getShader()) {
+            as_SB(paint.getShader())->addToKey(dict, backend, &builder, nullptr);
+        } else {
+            SolidColorShaderBlock::AddToKey(dict, backend, &builder, nullptr, paint.getColor4f());
+        }
+
+        if (paint.getBlender()) {
+            as_BB(paint.getBlender())->addToKey(dict, backend, &builder, nullptr);
+        } else {
+            BlendModeBlock::AddToKey(dict, backend, &builder, nullptr, SkBlendMode::kSrcOver);
+        }
+
+        SkASSERT(builder.sizeInBytes() > 0);
+
+        keys.push_back(builder.snap());
+    }
+
+    return keys;
+}
diff --git a/third_party/skia/src/core/SkPaintPriv.h b/third_party/skia/src/core/SkPaintPriv.h
index 1f0955e20f729..bf80c174f9e40 100644
--- a/third_party/skia/src/core/SkPaintPriv.h
+++ b/third_party/skia/src/core/SkPaintPriv.h
@@ -10,7 +10,12 @@
 
 #include "include/core/SkPaint.h"
 
+#include <vector>
+
+enum class SkBackend : uint8_t;
+class SkPaintParamsKey;
 class SkReadBuffer;
+class SkShaderCodeDictionary;
 class SkWriteBuffer;
 
 class SkPaintPriv {
@@ -29,7 +34,7 @@ class SkPaintPriv {
      */
     static bool Overwrites(const SkPaint* paint, ShaderOverrideOpacity);
 
-    static bool ShouldDither(const SkPaint&, SkColorType);
+    static bool ShouldDither(const SkPaint&, SkColorType, bool shaderOverride=false);
 
     /*
      * The luminance color is used to determine which Gamma Canonical color to map to.  This is
@@ -58,6 +63,18 @@ class SkPaintPriv {
     static void RemoveColorFilter(SkPaint*, SkColorSpace* dstCS);
 
     static SkScalar ComputeResScaleForStroking(const SkMatrix&);
+
+    /**
+        Return the SkPaintParamsKeys that would be needed to draw the provided paint.
+
+        @param paint      the paint to be decomposed
+        @param dictionary dictionary of code fragments available to be used in the SkPaintParamKeys
+        @param backend    the backend that would be carrying out the drawing
+        @return           the SkPaintParamsKeys that would be needed to draw this paint
+    */
+    static std::vector<std::unique_ptr<SkPaintParamsKey>> ToKeys(const SkPaint& paint,
+                                                                 SkShaderCodeDictionary* dictionary,
+                                                                 SkBackend backend);
 };
 
 #endif
diff --git a/third_party/skia/src/core/SkPath.cpp b/third_party/skia/src/core/SkPath.cpp
index 56810de7e2fb0..0f51db92b04b3 100644
--- a/third_party/skia/src/core/SkPath.cpp
+++ b/third_party/skia/src/core/SkPath.cpp
@@ -1402,8 +1402,8 @@ SkPath& SkPath::addPath(const SkPath& srcPath, const SkMatrix& matrix, AddPathMo
     SkMatrixPriv::MapPtsProc mapPtsProc = SkMatrixPriv::GetMapPtsProc(matrix);
     bool firstVerb = true;
     for (auto [verb, pts, w] : SkPathPriv::Iterate(*src)) {
+        SkPoint mappedPts[3];
         switch (verb) {
-            SkPoint mappedPts[3];
             case SkPathVerb::kMove:
                 mapPtsProc(matrix, mappedPts, &pts[0], 1);
                 if (firstVerb && mode == kExtend_AddPathMode && !isEmpty()) {
diff --git a/third_party/skia/src/core/SkPathPriv.h b/third_party/skia/src/core/SkPathPriv.h
index 149329b3ce2a0..efddfbe4b699c 100644
--- a/third_party/skia/src/core/SkPathPriv.h
+++ b/third_party/skia/src/core/SkPathPriv.h
@@ -429,7 +429,7 @@ class SkPathEdgeIter {
     SkPoint         fScratch[2];    // for auto-close lines
     bool            fNeedsCloseLine;
     bool            fNextIsNewContour;
-    SkDEBUGCODE(bool fIsConic);
+    SkDEBUGCODE(bool fIsConic;)
 
     enum {
         kIllegalEdgeValue = 99
@@ -460,7 +460,7 @@ class SkPathEdgeIter {
         bool            fIsNewContour;
 
         // Returns true when it holds an Edge, false when the path is done.
-        operator bool() { return fPts != nullptr; }
+        explicit operator bool() { return fPts != nullptr; }
     };
 
     Result next() {
diff --git a/third_party/skia/src/core/SkPixmap.cpp b/third_party/skia/src/core/SkPixmap.cpp
index e27bb31251909..fb30856dc04c3 100644
--- a/third_party/skia/src/core/SkPixmap.cpp
+++ b/third_party/skia/src/core/SkPixmap.cpp
@@ -109,6 +109,7 @@ float SkPixmap::getAlphaf(int x, int y) const {
         case kRGB_888x_SkColorType:
         case kRGB_101010x_SkColorType:
         case kBGR_101010x_SkColorType:
+        case kR8_unorm_SkColorType:
             return 1;
         case kAlpha_8_SkColorType:
             value = static_cast<const uint8_t*>(srcPtr)[0] * (1.0f/255);
@@ -276,6 +277,10 @@ SkColor SkPixmap::getColor(int x, int y) const {
             uint8_t value = *this->addr8(x, y);
             return SkColorSetRGB(value, value, value);
         }
+        case kR8_unorm_SkColorType: {
+            uint8_t value = *this->addr8(x, y);
+            return SkColorSetRGB(value, 0, 0);
+        }
         case kAlpha_8_SkColorType: {
             return SkColorSetA(0, *this->addr8(x, y));
         }
@@ -490,6 +495,7 @@ bool SkPixmap::computeIsOpaque() const {
         case kRGB_888x_SkColorType:
         case kRGB_101010x_SkColorType:
         case kBGR_101010x_SkColorType:
+        case kR8_unorm_SkColorType:
             return true;
             break;
         case kARGB_4444_SkColorType: {
diff --git a/third_party/skia/src/core/SkPromiseImageTexture.cpp b/third_party/skia/src/core/SkPromiseImageTexture.cpp
index b727b659642cc..c1bee7fe70678 100644
--- a/third_party/skia/src/core/SkPromiseImageTexture.cpp
+++ b/third_party/skia/src/core/SkPromiseImageTexture.cpp
@@ -8,41 +8,12 @@
 #include "include/core/SkPromiseImageTexture.h"
 
 #if SK_SUPPORT_GPU
-#include "src/core/SkMessageBus.h"
-
-std::atomic<uint32_t> SkPromiseImageTexture::gUniqueID{1};
 
 SkPromiseImageTexture::SkPromiseImageTexture(const GrBackendTexture& backendTexture) {
     SkASSERT(backendTexture.isValid());
     fBackendTexture = backendTexture;
-    fUniqueID = gUniqueID.fetch_add(1, std::memory_order_relaxed);
-}
-
-SkPromiseImageTexture::~SkPromiseImageTexture() {
-    for (const auto& msg : fMessages) {
-        SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(msg);
-    }
 }
 
-void SkPromiseImageTexture::addKeyToInvalidate(uint32_t contextID, const GrUniqueKey& key) {
-    SkASSERT(contextID != SK_InvalidUniqueID);
-    SkASSERT(key.isValid());
-    for (const auto& msg : fMessages) {
-        if (msg.contextID() == contextID && msg.key() == key) {
-            return;
-        }
-    }
-    fMessages.emplace_back(key, contextID, /* inThreadSafeCache */ false);
-}
-
-#if GR_TEST_UTILS
-SkTArray<GrUniqueKey> SkPromiseImageTexture::testingOnly_uniqueKeysToInvalidate() const {
-    SkTArray<GrUniqueKey> results;
-    for (const auto& msg : fMessages) {
-        results.push_back(msg.key());
-    }
-    return results;
-}
-#endif // GR_TEST_UTILS
+SkPromiseImageTexture::~SkPromiseImageTexture() {}
 
 #endif // SK_SUPPORT_GPU
diff --git a/third_party/skia/src/core/SkRasterPipeline.cpp b/third_party/skia/src/core/SkRasterPipeline.cpp
index 6d8d68d0ea3ee..74c29eee96fd8 100644
--- a/third_party/skia/src/core/SkRasterPipeline.cpp
+++ b/third_party/skia/src/core/SkRasterPipeline.cpp
@@ -190,6 +190,10 @@ void SkRasterPipeline::append_load(SkColorType ct, const SkRasterPipeline_Memory
                                              this->append(alpha_to_gray);
                                              break;
 
+        case kR8_unorm_SkColorType:          this->append(load_a8, ctx);
+                                             this->append(alpha_to_red);
+                                             break;
+
         case kRGB_888x_SkColorType:          this->append(load_8888, ctx);
                                              this->append(force_opaque);
                                              break;
@@ -241,6 +245,10 @@ void SkRasterPipeline::append_load_dst(SkColorType ct, const SkRasterPipeline_Me
                                               this->append(alpha_to_gray_dst);
                                               break;
 
+        case kR8_unorm_SkColorType:           this->append(load_a8_dst, ctx);
+                                              this->append(alpha_to_red_dst);
+                                              break;
+
         case kRGB_888x_SkColorType:           this->append(load_8888_dst, ctx);
                                               this->append(force_opaque_dst);
                                               break;
@@ -277,6 +285,7 @@ void SkRasterPipeline::append_store(SkColorType ct, const SkRasterPipeline_Memor
         case kUnknown_SkColorType: SkASSERT(false); break;
 
         case kAlpha_8_SkColorType:            this->append(store_a8,      ctx); break;
+        case kR8_unorm_SkColorType:           this->append(store_r8,      ctx); break;
         case kA16_unorm_SkColorType:          this->append(store_a16,     ctx); break;
         case kA16_float_SkColorType:          this->append(store_af16,    ctx); break;
         case kRGB_565_SkColorType:            this->append(store_565,     ctx); break;
diff --git a/third_party/skia/src/core/SkRasterPipeline.h b/third_party/skia/src/core/SkRasterPipeline.h
index 3b03020b2b48b..c5bb1373ca8a8 100644
--- a/third_party/skia/src/core/SkRasterPipeline.h
+++ b/third_party/skia/src/core/SkRasterPipeline.h
@@ -57,10 +57,12 @@ class SkData;
     M(load_8888)   M(load_8888_dst) M(store_8888)  M(gather_8888)  \
     M(load_rg88)   M(load_rg88_dst) M(store_rg88)  M(gather_rg88)  \
     M(load_a16)    M(load_a16_dst)  M(store_a16)   M(gather_a16)   \
+    M(store_r8) \
     M(load_rg1616) M(load_rg1616_dst) M(store_rg1616) M(gather_rg1616) \
     M(load_16161616) M(load_16161616_dst) M(store_16161616) M(gather_16161616) \
     M(load_1010102) M(load_1010102_dst) M(store_1010102) M(gather_1010102) \
     M(alpha_to_gray) M(alpha_to_gray_dst)                          \
+    M(alpha_to_red) M(alpha_to_red_dst)                            \
     M(bt709_luminance_or_luma_to_alpha) M(bt709_luminance_or_luma_to_rgb) \
     M(bilerp_clamp_8888) M(bicubic_clamp_8888)                     \
     M(store_u16_be)                                                \
diff --git a/third_party/skia/src/core/SkRasterPipelineBlitter.cpp b/third_party/skia/src/core/SkRasterPipelineBlitter.cpp
index b49f5c9da4892..6f4e496aa2296 100644
--- a/third_party/skia/src/core/SkRasterPipelineBlitter.cpp
+++ b/third_party/skia/src/core/SkRasterPipelineBlitter.cpp
@@ -203,17 +203,26 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
     // to zero.  We only dither non-constant shaders, so is_constant won't change here.
     if (paint.isDither() && !is_constant) {
         switch (dst.info().colorType()) {
-            case kARGB_4444_SkColorType:    blitter->fDitherRate =   1/15.0f; break;
-            case   kRGB_565_SkColorType:    blitter->fDitherRate =   1/63.0f; break;
-            case    kGray_8_SkColorType:
-            case  kRGB_888x_SkColorType:
+            case kARGB_4444_SkColorType:
+                blitter->fDitherRate = 1 / 15.0f;
+                break;
+            case kRGB_565_SkColorType:
+                blitter->fDitherRate = 1 / 63.0f;
+                break;
+            case kGray_8_SkColorType:
+            case kRGB_888x_SkColorType:
             case kRGBA_8888_SkColorType:
             case kBGRA_8888_SkColorType:
-            case kSRGBA_8888_SkColorType:   blitter->fDitherRate =  1/255.0f; break;
+            case kSRGBA_8888_SkColorType:
+            case kR8_unorm_SkColorType:
+                blitter->fDitherRate = 1 / 255.0f;
+                break;
             case kRGB_101010x_SkColorType:
             case kRGBA_1010102_SkColorType:
             case kBGR_101010x_SkColorType:
-            case kBGRA_1010102_SkColorType: blitter->fDitherRate = 1/1023.0f; break;
+            case kBGRA_1010102_SkColorType:
+                blitter->fDitherRate = 1 / 1023.0f;
+                break;
 
             case kUnknown_SkColorType:
             case kAlpha_8_SkColorType:
@@ -225,7 +234,9 @@ SkBlitter* SkRasterPipelineBlitter::Create(const SkPixmap& dst,
             case kA16_unorm_SkColorType:
             case kR16G16_float_SkColorType:
             case kR16G16_unorm_SkColorType:
-            case kR16G16B16A16_unorm_SkColorType: blitter->fDitherRate = 0.0f; break;
+            case kR16G16B16A16_unorm_SkColorType:
+                blitter->fDitherRate = 0.0f;
+                break;
         }
         if (blitter->fDitherRate > 0.0f) {
             colorPipeline->append(SkRasterPipeline::dither, &blitter->fDitherRate);
diff --git a/third_party/skia/src/core/SkReadBuffer.cpp b/third_party/skia/src/core/SkReadBuffer.cpp
index b162c8094c0a8..88f7a925d74db 100644
--- a/third_party/skia/src/core/SkReadBuffer.cpp
+++ b/third_party/skia/src/core/SkReadBuffer.cpp
@@ -332,7 +332,7 @@ sk_sp<SkImage> SkReadBuffer::readImage() {
             image = fProcs.fImageProc(data->data(), data->size(), fProcs.fImageCtx);
         }
         if (!image) {
-            skstd::optional<SkAlphaType> alphaType = skstd::nullopt;
+            std::optional<SkAlphaType> alphaType = std::nullopt;
             if (flags & SkWriteBufferImageFlags::kUnpremul) {
                 alphaType = kUnpremul_SkAlphaType;
             }
diff --git a/third_party/skia/src/core/SkRecordedDrawable.cpp b/third_party/skia/src/core/SkRecordedDrawable.cpp
index 229c4a47017ef..bb5732e711daa 100644
--- a/third_party/skia/src/core/SkRecordedDrawable.cpp
+++ b/third_party/skia/src/core/SkRecordedDrawable.cpp
@@ -13,6 +13,19 @@
 #include "src/core/SkRecordDraw.h"
 #include "src/core/SkRecordedDrawable.h"
 
+size_t SkRecordedDrawable::onApproximateBytesUsed() {
+    size_t drawablesSize = 0;
+    if (fDrawableList) {
+        for (auto&& drawable : *fDrawableList) {
+            drawablesSize += drawable->approximateBytesUsed();
+        }
+    }
+    return sizeof(*this) +
+           (fRecord ? fRecord->bytesUsed() : 0) +
+           (fBBH ? fBBH->bytesUsed() : 0) +
+           drawablesSize;
+}
+
 void SkRecordedDrawable::onDraw(SkCanvas* canvas) {
     SkDrawable* const* drawables = nullptr;
     int drawableCount = 0;
diff --git a/third_party/skia/src/core/SkRecordedDrawable.h b/third_party/skia/src/core/SkRecordedDrawable.h
index 2f8f6cc01e8cc..15914b4e9ec79 100644
--- a/third_party/skia/src/core/SkRecordedDrawable.h
+++ b/third_party/skia/src/core/SkRecordedDrawable.h
@@ -25,6 +25,7 @@ class SkRecordedDrawable : public SkDrawable {
 
 protected:
     SkRect onGetBounds() override { return fBounds; }
+    size_t onApproximateBytesUsed() override;
 
     void onDraw(SkCanvas* canvas) override;
 
diff --git a/third_party/skia/src/core/SkRecorder.h b/third_party/skia/src/core/SkRecorder.h
index 4aca2d870c28a..1bd8996e2f304 100644
--- a/third_party/skia/src/core/SkRecorder.h
+++ b/third_party/skia/src/core/SkRecorder.h
@@ -25,6 +25,7 @@ class SkDrawableList : SkNoncopyable {
 
     int count() const { return fArray.count(); }
     SkDrawable* const* begin() const { return fArray.begin(); }
+    SkDrawable* const* end() const { return fArray.end(); }
 
     void append(SkDrawable* drawable);
 
diff --git a/third_party/skia/src/core/SkRuntimeEffect.cpp b/third_party/skia/src/core/SkRuntimeEffect.cpp
index 0f0d3308c8caf..3e5543cad1eb8 100644
--- a/third_party/skia/src/core/SkRuntimeEffect.cpp
+++ b/third_party/skia/src/core/SkRuntimeEffect.cpp
@@ -11,6 +11,7 @@
 #include "include/core/SkData.h"
 #include "include/core/SkSurface.h"
 #include "include/private/SkMutex.h"
+#include "include/sksl/DSLCore.h"
 #include "src/core/SkBlenderBase.h"
 #include "src/core/SkCanvasPriv.h"
 #include "src/core/SkColorFilterBase.h"
@@ -30,9 +31,9 @@
 #include "src/sksl/SkSLSharedCompiler.h"
 #include "src/sksl/SkSLUtil.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
 #include "src/sksl/ir/SkSLFunctionDefinition.h"
 #include "src/sksl/ir/SkSLVarDeclarations.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
 
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrRecordingContext.h"
@@ -64,25 +65,25 @@ static bool init_uniform_type(const SkSL::Context& ctx,
                               const SkSL::Type* type,
                               SkRuntimeEffect::Uniform* v) {
     using Type = SkRuntimeEffect::Uniform::Type;
-    if (*type == *ctx.fTypes.fFloat)    { v->type = Type::kFloat;    return true; }
-    if (*type == *ctx.fTypes.fHalf)     { v->type = Type::kFloat;    return true; }
-    if (*type == *ctx.fTypes.fFloat2)   { v->type = Type::kFloat2;   return true; }
-    if (*type == *ctx.fTypes.fHalf2)    { v->type = Type::kFloat2;   return true; }
-    if (*type == *ctx.fTypes.fFloat3)   { v->type = Type::kFloat3;   return true; }
-    if (*type == *ctx.fTypes.fHalf3)    { v->type = Type::kFloat3;   return true; }
-    if (*type == *ctx.fTypes.fFloat4)   { v->type = Type::kFloat4;   return true; }
-    if (*type == *ctx.fTypes.fHalf4)    { v->type = Type::kFloat4;   return true; }
-    if (*type == *ctx.fTypes.fFloat2x2) { v->type = Type::kFloat2x2; return true; }
-    if (*type == *ctx.fTypes.fHalf2x2)  { v->type = Type::kFloat2x2; return true; }
-    if (*type == *ctx.fTypes.fFloat3x3) { v->type = Type::kFloat3x3; return true; }
-    if (*type == *ctx.fTypes.fHalf3x3)  { v->type = Type::kFloat3x3; return true; }
-    if (*type == *ctx.fTypes.fFloat4x4) { v->type = Type::kFloat4x4; return true; }
-    if (*type == *ctx.fTypes.fHalf4x4)  { v->type = Type::kFloat4x4; return true; }
-
-    if (*type == *ctx.fTypes.fInt)  { v->type = Type::kInt;  return true; }
-    if (*type == *ctx.fTypes.fInt2) { v->type = Type::kInt2; return true; }
-    if (*type == *ctx.fTypes.fInt3) { v->type = Type::kInt3; return true; }
-    if (*type == *ctx.fTypes.fInt4) { v->type = Type::kInt4; return true; }
+    if (type->matches(*ctx.fTypes.fFloat))    { v->type = Type::kFloat;    return true; }
+    if (type->matches(*ctx.fTypes.fHalf))     { v->type = Type::kFloat;    return true; }
+    if (type->matches(*ctx.fTypes.fFloat2))   { v->type = Type::kFloat2;   return true; }
+    if (type->matches(*ctx.fTypes.fHalf2))    { v->type = Type::kFloat2;   return true; }
+    if (type->matches(*ctx.fTypes.fFloat3))   { v->type = Type::kFloat3;   return true; }
+    if (type->matches(*ctx.fTypes.fHalf3))    { v->type = Type::kFloat3;   return true; }
+    if (type->matches(*ctx.fTypes.fFloat4))   { v->type = Type::kFloat4;   return true; }
+    if (type->matches(*ctx.fTypes.fHalf4))    { v->type = Type::kFloat4;   return true; }
+    if (type->matches(*ctx.fTypes.fFloat2x2)) { v->type = Type::kFloat2x2; return true; }
+    if (type->matches(*ctx.fTypes.fHalf2x2))  { v->type = Type::kFloat2x2; return true; }
+    if (type->matches(*ctx.fTypes.fFloat3x3)) { v->type = Type::kFloat3x3; return true; }
+    if (type->matches(*ctx.fTypes.fHalf3x3))  { v->type = Type::kFloat3x3; return true; }
+    if (type->matches(*ctx.fTypes.fFloat4x4)) { v->type = Type::kFloat4x4; return true; }
+    if (type->matches(*ctx.fTypes.fHalf4x4))  { v->type = Type::kFloat4x4; return true; }
+
+    if (type->matches(*ctx.fTypes.fInt))  { v->type = Type::kInt;  return true; }
+    if (type->matches(*ctx.fTypes.fInt2)) { v->type = Type::kInt2; return true; }
+    if (type->matches(*ctx.fTypes.fInt3)) { v->type = Type::kInt3; return true; }
+    if (type->matches(*ctx.fTypes.fInt4)) { v->type = Type::kInt4; return true; }
 
     return false;
 }
@@ -105,7 +106,7 @@ static bool verify_child_effects(const std::vector<SkRuntimeEffect::Child>& refl
 
     // Verify that each child object's type matches its declared type in the SkSL.
     for (size_t i = 0; i < effectPtrs.size(); ++i) {
-        skstd::optional<ChildType> effectType = effectPtrs[i].type();
+        std::optional<ChildType> effectType = effectPtrs[i].type();
         if (effectType && effectType != reflected[i].type) {
             return false;
         }
@@ -166,6 +167,15 @@ static std::vector<skvm::Val> make_skvm_uniforms(skvm::Builder* p,
     return uniform;
 }
 
+SkSL::ProgramSettings SkRuntimeEffect::MakeSettings(const Options& options, bool optimize) {
+    SkSL::ProgramSettings settings;
+    settings.fInlineThreshold = 0;
+    settings.fForceNoInline = options.forceNoInline;
+    settings.fEnforceES2Restrictions = options.enforceES2Restrictions;
+    settings.fOptimize = optimize;
+    return settings;
+}
+
 // TODO: Many errors aren't caught until we process the generated Program here. Catching those
 // in the IR generator would provide better errors messages (with locations).
 #define RETURN_FAILURE(...) return Result{nullptr, SkStringPrintf(__VA_ARGS__)}
@@ -179,11 +189,8 @@ SkRuntimeEffect::Result SkRuntimeEffect::MakeFromSource(SkString sksl,
         // calling the Make overload at the end, which creates its own (non-reentrant)
         // SharedCompiler instance
         SkSL::SharedCompiler compiler;
-        SkSL::Program::Settings settings;
-        settings.fInlineThreshold = 0;
-        settings.fForceNoInline = options.forceNoInline;
-        settings.fEnforceES2Restrictions = options.enforceES2Restrictions;
-        program = compiler->convertProgram(kind, SkSL::String(sksl.c_str(), sksl.size()), settings);
+        SkSL::Program::Settings settings = MakeSettings(options, /*optimize=*/true);
+        program = compiler->convertProgram(kind, std::string(sksl.c_str(), sksl.size()), settings);
 
         if (!program) {
             RETURN_FAILURE("%s", compiler->errorText().c_str());
@@ -197,10 +204,21 @@ SkRuntimeEffect::Result SkRuntimeEffect::MakeFromDSL(std::unique_ptr<SkSL::Progr
                                                      SkSL::ProgramKind kind) {
     // This factory is used for all DSL runtime effects, which don't have anything stored in the
     // program's source. Populate it so that we can compute fHash, and serialize these effects.
-    program->fSource = std::make_unique<SkSL::String>(program->description());
+    program->fSource = std::make_unique<std::string>(program->description());
     return MakeInternal(std::move(program), options, kind);
 }
 
+sk_sp<SkRuntimeEffect> SkRuntimeEffect::MakeFromDSL(std::unique_ptr<SkSL::Program> program,
+                                                    const Options& options,
+                                                    SkSL::ProgramKind kind,
+                                                    SkSL::ErrorReporter* errors) {
+    Result result = MakeFromDSL(std::move(program), options, kind);
+    if (!result.effect) {
+        errors->error(result.errorText.c_str(), SkSL::PositionInfo(nullptr, -1));
+    }
+    return std::move(result.effect);
+}
+
 SkRuntimeEffect::Result SkRuntimeEffect::MakeInternal(std::unique_ptr<SkSL::Program> program,
                                                       const Options& options,
                                                       SkSL::ProgramKind kind) {
@@ -249,6 +267,17 @@ SkRuntimeEffect::Result SkRuntimeEffect::MakeInternal(std::unique_ptr<SkSL::Prog
         flags |= kSamplesOutsideMain_Flag;
     }
 
+    // Determine if this effect uses of the color transform intrinsics. Effects need to know this
+    // so they can allocate color transform objects, etc.
+    if (SkSL::Analysis::CallsColorTransformIntrinsics(*program)) {
+        flags |= kUsesColorTransform_Flag;
+    }
+
+    // Shaders are the only thing that cares about this, but it's inexpensive (and safe) to call.
+    if (SkSL::Analysis::ReturnsOpaqueColor(*main)) {
+        flags |= kAlwaysOpaque_Flag;
+    }
+
     size_t offset = 0;
     std::vector<Uniform> uniforms;
     std::vector<Child> children;
@@ -333,6 +362,50 @@ SkRuntimeEffect::Result SkRuntimeEffect::MakeInternal(std::unique_ptr<SkSL::Prog
     return Result{std::move(effect), SkString()};
 }
 
+sk_sp<SkRuntimeEffect> SkRuntimeEffect::makeUnoptimizedClone() {
+    // Compile with maximally-permissive options; any restrictions we need to enforce were already
+    // handled when the original SkRuntimeEffect was made. We don't keep around the Options struct
+    // from when it was initially made so we don't know what was originally requested.
+    Options options;
+    options.forceNoInline = true;
+    options.enforceES2Restrictions = false;
+    options.allowFragCoord = true;
+
+    // We do know the original ProgramKind, so we don't need to re-derive it.
+    SkSL::ProgramKind kind = fBaseProgram->fConfig->fKind;
+
+    // Attempt to recompile the program's source with optimizations off. This ensures that the
+    // Debugger shows results on every line, even for things that could be optimized away (static
+    // branches, unused variables, etc). If recompilation fails, we fall back to the original code.
+    std::unique_ptr<SkSL::Program> program;
+    {
+        // We keep this SharedCompiler in a separate scope to make sure it's destroyed before
+        // calling MakeInternal at the end, which creates its own (non-reentrant) SharedCompiler
+        // instance.
+        SkSL::SharedCompiler compiler;
+        SkSL::Program::Settings settings = MakeSettings(options, /*optimize=*/false);
+        program = compiler->convertProgram(kind, *fBaseProgram->fSource, settings);
+
+        if (!program) {
+            // Turning off compiler optimizations can theoretically expose a program error that
+            // had been optimized away (e.g. "all control paths return a value" might appear if
+            // optimizing a program simplifies its control flow).
+            // If this happens, the debugger will just have to show the optimized code.
+            return sk_ref_sp(this);
+        }
+    }
+
+    SkRuntimeEffect::Result result = MakeInternal(std::move(program), options, kind);
+    if (!result.effect) {
+        // Nothing in MakeInternal should change as a result of optimizations being toggled.
+        SkDEBUGFAILF("makeUnoptimizedClone: MakeInternal failed\n%s",
+                     result.errorText.c_str());
+        return sk_ref_sp(this);
+    }
+
+    return result.effect;
+}
+
 SkRuntimeEffect::Result SkRuntimeEffect::MakeForColorFilter(SkString sksl, const Options& options) {
     auto result = MakeFromSource(std::move(sksl), options, SkSL::ProgramKind::kRuntimeColorFilter);
     SkASSERT(!result.effect || result.effect->allowColorFilter());
@@ -365,6 +438,15 @@ SkRuntimeEffect::Result SkRuntimeEffect::MakeForShader(std::unique_ptr<SkSL::Pro
     return result;
 }
 
+sk_sp<SkRuntimeEffect> SkRuntimeEffect::MakeForShader(std::unique_ptr<SkSL::Program> program,
+                                                      const Options& options,
+                                                      SkSL::ErrorReporter* errors) {
+    auto result = MakeFromDSL(std::move(program), options, SkSL::ProgramKind::kRuntimeShader,
+            errors);
+    SkASSERT(!result || result->allowShader());
+    return result;
+}
+
 SkRuntimeEffect::Result SkRuntimeEffect::MakeForBlender(std::unique_ptr<SkSL::Program> program,
                                                         const Options& options) {
     auto result = MakeFromDSL(std::move(program), options, SkSL::ProgramKind::kRuntimeBlender);
@@ -519,6 +601,14 @@ std::unique_ptr<SkFilterColorProgram> SkFilterColorProgram::Make(const SkRuntime
         return nullptr;
     }
 
+    // TODO(skia:10479): Can we support this? When the color filter is invoked like this, there
+    // may not be a real working space? If there is, we'd need to add it as a parameter to eval,
+    // and then coordinate where the relevant uniforms go. For now, just fall back to the slow
+    // path if we see these intrinsics being called.
+    if (effect->usesColorTransform()) {
+        return nullptr;
+    }
+
     // We require that any children are color filters (not shaders or blenders). In theory, we could
     // detect the coords being passed to shader children, and replicate those calls, but that's very
     // complicated, and has diminishing returns. (eg, for table lookup color filters).
@@ -543,21 +633,6 @@ std::unique_ptr<SkFilterColorProgram> SkFilterColorProgram::Make(const SkRuntime
         uniform.push_back(p.uniform32(skslUniforms.push(/*placeholder*/ 0)).id);
     }
 
-    auto is_simple_uniform = [&](skvm::Color c, int* baseOffset) {
-        skvm::Uniform ur, ug, ub, ua;
-        if (!p.allUniform(c.r.id, &ur, c.g.id, &ug, c.b.id, &ub, c.a.id, &ua)) {
-            return false;
-        }
-        skvm::Ptr uniPtr = skslUniforms.base;
-        if (ur.ptr != uniPtr || ug.ptr != uniPtr || ub.ptr != uniPtr || ua.ptr != uniPtr) {
-            return false;
-        }
-        *baseOffset = ur.offset;
-        return ug.offset == ur.offset + 4 &&
-               ub.offset == ur.offset + 8 &&
-               ua.offset == ur.offset + 12;
-    };
-
     // We reserve a uniform color for each child invocation. While processing the SkSL, we record
     // the index of the child, and the color being filtered (in a SampleCall struct).
     // When we run this program later, we use the SampleCall to evaluate the correct child, and
@@ -568,37 +643,99 @@ std::unique_ptr<SkFilterColorProgram> SkFilterColorProgram::Make(const SkRuntime
     skvm::Uniforms childColorUniforms{p.uniform(), 0};
     skvm::Color inputColor = p.uniformColor(/*placeholder*/ SkColors::kWhite, &childColorUniforms);
     std::vector<SkFilterColorProgram::SampleCall> sampleCalls;
-    std::vector<skvm::Color> childColors;
-    auto ids_equal = [](skvm::Color x, skvm::Color y) {
-        return x.r.id == y.r.id && x.g.id == y.g.id && x.b.id == y.b.id && x.a.id == y.a.id;
-    };
-    bool allSampleCallsSupported = true;
-    auto sampleColorFilter = [&](int ix, skvm::Color c) {
-        skvm::Color result = p.uniformColor(/*placeholder*/ SkColors::kWhite, &childColorUniforms);
-        SkFilterColorProgram::SampleCall call;
-        call.fChild = ix;
-        if (ids_equal(c, inputColor)) {
-            call.fKind = SkFilterColorProgram::SampleCall::Kind::kInputColor;
-        } else if (p.allImm(c.r.id, &call.fImm.fR,
-                            c.g.id, &call.fImm.fG,
-                            c.b.id, &call.fImm.fB,
-                            c.a.id, &call.fImm.fA)) {
-            call.fKind = SkFilterColorProgram::SampleCall::Kind::kImmediate;
-        } else if (auto it = std::find_if(childColors.begin(),
-                                          childColors.end(),
-                                          [&](skvm::Color x) { return ids_equal(x, c); });
-                   it != childColors.end()) {
-            call.fKind = SkFilterColorProgram::SampleCall::Kind::kPrevious;
-            call.fPrevious = SkTo<int>(it - childColors.begin());
-        } else if (is_simple_uniform(c, &call.fOffset)) {
-            call.fKind = SkFilterColorProgram::SampleCall::Kind::kUniform;
-        } else {
-            allSampleCallsSupported = false;
+
+    class Callbacks : public SkSL::SkVMCallbacks {
+    public:
+        Callbacks(skvm::Builder* builder,
+                  const skvm::Uniforms* skslUniforms,
+                  skvm::Uniforms* childColorUniforms,
+                  skvm::Color inputColor,
+                  std::vector<SkFilterColorProgram::SampleCall>* sampleCalls)
+                : fBuilder(builder)
+                , fSkslUniforms(skslUniforms)
+                , fChildColorUniforms(childColorUniforms)
+                , fInputColor(inputColor)
+                , fSampleCalls(sampleCalls) {}
+
+        bool isSimpleUniform(skvm::Color c, int* baseOffset) {
+            skvm::Uniform ur, ug, ub, ua;
+            if (!fBuilder->allUniform(c.r.id, &ur, c.g.id, &ug, c.b.id, &ub, c.a.id, &ua)) {
+                return false;
+            }
+            skvm::Ptr uniPtr = fSkslUniforms->base;
+            if (ur.ptr != uniPtr || ug.ptr != uniPtr || ub.ptr != uniPtr || ua.ptr != uniPtr) {
+                return false;
+            }
+            *baseOffset = ur.offset;
+            return ug.offset == ur.offset + 4 &&
+                   ub.offset == ur.offset + 8 &&
+                   ua.offset == ur.offset + 12;
+        }
+
+        static bool IDsEqual(skvm::Color x, skvm::Color y) {
+            return x.r.id == y.r.id && x.g.id == y.g.id && x.b.id == y.b.id && x.a.id == y.a.id;
+        }
+
+        skvm::Color sampleColorFilter(int ix, skvm::Color c) override {
+            skvm::Color result =
+                    fBuilder->uniformColor(/*placeholder*/ SkColors::kWhite, fChildColorUniforms);
+            SkFilterColorProgram::SampleCall call;
+            call.fChild = ix;
+            if (IDsEqual(c, fInputColor)) {
+                call.fKind = SkFilterColorProgram::SampleCall::Kind::kInputColor;
+            } else if (fBuilder->allImm(c.r.id, &call.fImm.fR,
+                                        c.g.id, &call.fImm.fG,
+                                        c.b.id, &call.fImm.fB,
+                                        c.a.id, &call.fImm.fA)) {
+                call.fKind = SkFilterColorProgram::SampleCall::Kind::kImmediate;
+            } else if (auto it = std::find_if(fChildColors.begin(),
+                                              fChildColors.end(),
+                                              [&](skvm::Color x) { return IDsEqual(x, c); });
+                       it != fChildColors.end()) {
+                call.fKind = SkFilterColorProgram::SampleCall::Kind::kPrevious;
+                call.fPrevious = SkTo<int>(it - fChildColors.begin());
+            } else if (isSimpleUniform(c, &call.fOffset)) {
+                call.fKind = SkFilterColorProgram::SampleCall::Kind::kUniform;
+            } else {
+                fAllSampleCallsSupported = false;
+            }
+            fSampleCalls->push_back(call);
+            fChildColors.push_back(result);
+            return result;
+        }
+
+        // We did an early return from this function if we saw any child that wasn't a shader, so
+        // it should be impossible for either of these callbacks to occur:
+        skvm::Color sampleShader(int, skvm::Coord) override {
+            SkDEBUGFAIL("Unexpected child type");
+            return {};
+        }
+        skvm::Color sampleBlender(int, skvm::Color, skvm::Color) override {
+            SkDEBUGFAIL("Unexpected child type");
+            return {};
+        }
+
+        // We did an early return from this function if we saw any call to these intrinsics, so it
+        // should be impossible for either of these callbacks to occur:
+        skvm::Color toLinearSrgb(skvm::Color color) override {
+            SkDEBUGFAIL("Unexpected color transform intrinsic");
+            return {};
+        }
+        skvm::Color fromLinearSrgb(skvm::Color color) override {
+            SkDEBUGFAIL("Unexpected color transform intrinsic");
+            return {};
         }
-        sampleCalls.push_back(call);
-        childColors.push_back(result);
-        return result;
+
+        skvm::Builder* fBuilder;
+        const skvm::Uniforms* fSkslUniforms;
+        skvm::Uniforms* fChildColorUniforms;
+        skvm::Color fInputColor;
+        std::vector<SkFilterColorProgram::SampleCall>* fSampleCalls;
+
+        std::vector<skvm::Color> fChildColors;
+        bool fAllSampleCallsSupported = true;
     };
+    Callbacks callbacks(&p, &skslUniforms, &childColorUniforms, inputColor, &sampleCalls);
 
     // Emit the skvm instructions for the SkSL
     skvm::Coord zeroCoord = {p.splat(0.0f), p.splat(0.0f)};
@@ -611,15 +748,13 @@ std::unique_ptr<SkFilterColorProgram> SkFilterColorProgram::Make(const SkRuntime
                                              /*local=*/zeroCoord,
                                              inputColor,
                                              inputColor,
-                                             /*sampleShader=*/nullptr,
-                                             sampleColorFilter,
-                                             /*sampleBlender=*/nullptr);
+                                             &callbacks);
 
     // Then store the result to the *third* arg ptr
     p.store({skvm::PixelFormat::FLOAT, 32, 32, 32, 32, 0, 32, 64, 96},
             p.varying<skvm::F32>(), result);
 
-    if (!allSampleCallsSupported) {
+    if (!callbacks.fAllSampleCallsSupported) {
         return nullptr;
     }
 
@@ -731,7 +866,7 @@ static GrFPResult make_effect_fp(sk_sp<SkRuntimeEffect> effect,
                                  const GrFPArgs& childArgs) {
     SkSTArray<8, std::unique_ptr<GrFragmentProcessor>> childFPs;
     for (const auto& child : children) {
-        skstd::optional<ChildType> type = child.type();
+        std::optional<ChildType> type = child.type();
         if (type == ChildType::kShader) {
             // Convert a SkShader into a child FP.
             auto childFP = as_SB(child.shader())->asFragmentProcessor(childArgs);
@@ -766,6 +901,7 @@ static GrFPResult make_effect_fp(sk_sp<SkRuntimeEffect> effect,
     }
     auto fp = GrSkSLFP::MakeWithData(std::move(effect),
                                      name,
+                                     childArgs.fDstColorInfo->refColorSpace(),
                                      std::move(inputFP),
                                      std::move(destColorFP),
                                      std::move(uniforms),
@@ -775,6 +911,72 @@ static GrFPResult make_effect_fp(sk_sp<SkRuntimeEffect> effect,
 }
 #endif
 
+class RuntimeEffectVMCallbacks : public SkSL::SkVMCallbacks {
+public:
+    RuntimeEffectVMCallbacks(skvm::Builder* builder,
+                             skvm::Uniforms* uniforms,
+                             SkArenaAlloc* alloc,
+                             const std::vector<SkRuntimeEffect::ChildPtr>& children,
+                             skvm::Color inColor,
+                             const SkColorInfo& colorInfo)
+            : fBuilder(builder)
+            , fUniforms(uniforms)
+            , fAlloc(alloc)
+            , fChildren(children)
+            , fInColor(inColor)
+            , fColorInfo(colorInfo) {}
+
+    skvm::Color sampleShader(int ix, skvm::Coord coord) override {
+        if (SkShader* shader = fChildren[ix].shader()) {
+            SkOverrideDeviceMatrixProvider matrixProvider(SkMatrix::I());
+            return as_SB(shader)->program(fBuilder, coord, coord, fInColor, matrixProvider,
+                                          /*localM=*/nullptr, fColorInfo, fUniforms, fAlloc);
+        }
+        return fInColor;
+    }
+
+    skvm::Color sampleColorFilter(int ix, skvm::Color color) override {
+        if (SkColorFilter* colorFilter = fChildren[ix].colorFilter()) {
+            return as_CFB(colorFilter)->program(fBuilder, color, fColorInfo, fUniforms, fAlloc);
+        }
+        return color;
+    }
+
+    skvm::Color sampleBlender(int ix, skvm::Color src, skvm::Color dst) override {
+        if (SkBlender* blender = fChildren[ix].blender()) {
+            return as_BB(blender)->program(fBuilder, src, dst, fColorInfo, fUniforms, fAlloc);
+        }
+        return blend(SkBlendMode::kSrcOver, src, dst);
+    }
+
+    skvm::Color toLinearSrgb(skvm::Color color) override {
+        if (!fColorInfo.colorSpace()) {
+            // These intrinsics do nothing when color management is disabled
+            return color;
+        }
+        return SkColorSpaceXformSteps{fColorInfo.colorSpace(),    kUnpremul_SkAlphaType,
+                                      sk_srgb_linear_singleton(), kUnpremul_SkAlphaType}
+                .program(fBuilder, fUniforms, color);
+    }
+
+    skvm::Color fromLinearSrgb(skvm::Color color) override {
+        if (!fColorInfo.colorSpace()) {
+            // These intrinsics do nothing when color management is disabled
+            return color;
+        }
+        return SkColorSpaceXformSteps{sk_srgb_linear_singleton(), kUnpremul_SkAlphaType,
+                                      fColorInfo.colorSpace(),    kUnpremul_SkAlphaType}
+                .program(fBuilder, fUniforms, color);
+    }
+
+    skvm::Builder* fBuilder;
+    skvm::Uniforms* fUniforms;
+    SkArenaAlloc* fAlloc;
+    const std::vector<SkRuntimeEffect::ChildPtr>& fChildren;
+    const skvm::Color fInColor;
+    const SkColorInfo& fColorInfo;
+};
+
 class SkRuntimeColorFilter : public SkColorFilterBase {
 public:
     SkRuntimeColorFilter(sk_sp<SkRuntimeEffect> effect,
@@ -815,27 +1017,7 @@ class SkRuntimeColorFilter : public SkColorFilterBase {
                 get_xformed_uniforms(fEffect.get(), fUniforms, colorInfo.colorSpace());
         SkASSERT(inputs);
 
-        auto sampleShader = [&](int ix, skvm::Coord coord) {
-            if (SkShader* shader = fChildren[ix].shader()) {
-                SkOverrideDeviceMatrixProvider matrixProvider(SkMatrix::I());
-                return as_SB(shader)->program(p, coord, coord, c, matrixProvider,
-                                              /*localM=*/nullptr, colorInfo, uniforms, alloc);
-            }
-            return c;
-        };
-        auto sampleColorFilter = [&](int ix, skvm::Color color) {
-            if (SkColorFilter* colorFilter = fChildren[ix].colorFilter()) {
-                return as_CFB(colorFilter)->program(p, color, colorInfo, uniforms, alloc);
-            }
-            return color;
-        };
-        auto sampleBlender = [&](int ix, skvm::Color src, skvm::Color dst) {
-            if (SkBlender* blender = fChildren[ix].blender()) {
-                return as_BB(blender)->program(p, src, dst, colorInfo, uniforms, alloc);
-            }
-            return blend(SkBlendMode::kSrcOver, src, dst);
-        };
-
+        RuntimeEffectVMCallbacks callbacks(p, uniforms, alloc, fChildren, c, colorInfo);
         std::vector<skvm::Val> uniform = make_skvm_uniforms(p, uniforms, fEffect->uniformSize(),
                                                             *inputs);
 
@@ -844,7 +1026,7 @@ class SkRuntimeColorFilter : public SkColorFilterBase {
         skvm::Coord zeroCoord = { p->splat(0.0f), p->splat(0.0f) };
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p,/*debugTrace=*/nullptr,
                                    SkMakeSpan(uniform), /*device=*/zeroCoord, /*local=*/zeroCoord,
-                                   c, c, sampleShader, sampleColorFilter, sampleBlender);
+                                   c, c, &callbacks);
     }
 
     SkPMColor4f onFilterColor4f(const SkPMColor4f& color, SkColorSpace* dstCS) const override {
@@ -922,25 +1104,23 @@ class SkRTShader : public SkShaderBase {
                sk_sp<SkSL::SkVMDebugTrace> debugTrace,
                sk_sp<SkData> uniforms,
                const SkMatrix* localMatrix,
-               SkSpan<SkRuntimeEffect::ChildPtr> children,
-               bool isOpaque)
+               SkSpan<SkRuntimeEffect::ChildPtr> children)
             : SkShaderBase(localMatrix)
             , fEffect(std::move(effect))
             , fDebugTrace(std::move(debugTrace))
-            , fIsOpaque(isOpaque)
             , fUniforms(std::move(uniforms))
             , fChildren(children.begin(), children.end()) {}
 
     SkRuntimeEffect::TracedShader makeTracedClone(const SkIPoint& coord) {
-        sk_sp<SkSL::SkVMDebugTrace> debugTrace = make_skvm_debug_trace(fEffect.get(), coord);
-        auto shader = sk_make_sp<SkRTShader>(fEffect, debugTrace, fUniforms,
-                                             &this->getLocalMatrix(), SkMakeSpan(fChildren),
-                                             fIsOpaque);
+        sk_sp<SkRuntimeEffect> unoptimized = fEffect->makeUnoptimizedClone();
+        sk_sp<SkSL::SkVMDebugTrace> debugTrace = make_skvm_debug_trace(unoptimized.get(), coord);
+        auto debugShader = sk_make_sp<SkRTShader>(unoptimized, debugTrace, fUniforms,
+                                                  &this->getLocalMatrix(), SkMakeSpan(fChildren));
 
-        return SkRuntimeEffect::TracedShader{std::move(shader), std::move(debugTrace)};
+        return SkRuntimeEffect::TracedShader{std::move(debugShader), std::move(debugTrace)};
     }
 
-    bool isOpaque() const override { return fIsOpaque; }
+    bool isOpaque() const override { return fEffect->alwaysOpaque(); }
 
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs& args) const override {
@@ -964,11 +1144,6 @@ class SkRTShader : public SkShaderBase {
             return nullptr;
         }
 
-        // If the shader was created with isOpaque = true, we *force* that result here.
-        // CPU does the same thing (in SkShaderBase::program).
-        if (fIsOpaque) {
-            fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), GrSwizzle::RGB1());
-        }
         return GrMatrixEffect::Make(matrix, std::move(fp));
     }
 #endif
@@ -992,40 +1167,16 @@ class SkRTShader : public SkShaderBase {
         }
         local = SkShaderBase::ApplyMatrix(p,inv,local,uniforms);
 
-        auto sampleShader = [&](int ix, skvm::Coord coord) {
-            if (SkShader* shader = fChildren[ix].shader()) {
-                SkOverrideDeviceMatrixProvider matrixProvider(SkMatrix::I());
-                return as_SB(shader)->program(p, device, coord, paint, matrixProvider,
-                                              /*localM=*/nullptr, colorInfo, uniforms, alloc);
-            }
-            return paint;
-        };
-        auto sampleColorFilter = [&](int ix, skvm::Color color) {
-            if (SkColorFilter* colorFilter = fChildren[ix].colorFilter()) {
-                return as_CFB(colorFilter)->program(p, color, colorInfo, uniforms, alloc);
-            }
-            return color;
-        };
-        auto sampleBlender = [&](int ix, skvm::Color src, skvm::Color dst) {
-            if (SkBlender* blender = fChildren[ix].blender()) {
-                return as_BB(blender)->program(p, src, dst, colorInfo, uniforms, alloc);
-            }
-            return blend(SkBlendMode::kSrcOver, src, dst);
-        };
-
+        RuntimeEffectVMCallbacks callbacks(p, uniforms, alloc, fChildren, paint, colorInfo);
         std::vector<skvm::Val> uniform = make_skvm_uniforms(p, uniforms, fEffect->uniformSize(),
                                                             *inputs);
 
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p, fDebugTrace.get(),
-                                   SkMakeSpan(uniform), device, local, paint, paint, sampleShader,
-                                   sampleColorFilter, sampleBlender);
+                                   SkMakeSpan(uniform), device, local, paint, paint, &callbacks);
     }
 
     void flatten(SkWriteBuffer& buffer) const override {
         uint32_t flags = 0;
-        if (fIsOpaque) {
-            flags |= kIsOpaque_Flag;
-        }
         if (!this->getLocalMatrix().isIdentity()) {
             flags |= kHasLocalMatrix_Flag;
         }
@@ -1045,13 +1196,11 @@ class SkRTShader : public SkShaderBase {
 
 private:
     enum Flags {
-        kIsOpaque_Flag          = 1 << 0,
         kHasLocalMatrix_Flag    = 1 << 1,
     };
 
     sk_sp<SkRuntimeEffect> fEffect;
     sk_sp<SkSL::SkVMDebugTrace> fDebugTrace;
-    bool fIsOpaque;
 
     sk_sp<SkData> fUniforms;
     std::vector<SkRuntimeEffect::ChildPtr> fChildren;
@@ -1063,7 +1212,6 @@ sk_sp<SkFlattenable> SkRTShader::CreateProc(SkReadBuffer& buffer) {
     sk_sp<SkData> uniforms = buffer.readByteArrayAsData();
     uint32_t flags = buffer.read32();
 
-    bool isOpaque = SkToBool(flags & kIsOpaque_Flag);
     SkMatrix localM, *localMPtr = nullptr;
     if (flags & kHasLocalMatrix_Flag) {
         buffer.readMatrix(&localM);
@@ -1080,7 +1228,7 @@ sk_sp<SkFlattenable> SkRTShader::CreateProc(SkReadBuffer& buffer) {
         return nullptr;
     }
 
-    return effect->makeShader(std::move(uniforms), SkMakeSpan(children), localMPtr, isOpaque);
+    return effect->makeShader(std::move(uniforms), SkMakeSpan(children), localMPtr);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1103,27 +1251,7 @@ class SkRuntimeBlender : public SkBlenderBase {
                                                     colorInfo.colorSpace());
         SkASSERT(inputs);
 
-        auto sampleShader = [&](int ix, skvm::Coord coord) {
-            if (SkShader* shader = fChildren[ix].shader()) {
-                SkOverrideDeviceMatrixProvider matrixProvider(SkMatrix::I());
-                return as_SB(shader)->program(p, coord, coord, src, matrixProvider,
-                                              /*localM=*/nullptr, colorInfo, uniforms, alloc);
-            }
-            return src;
-        };
-        auto sampleColorFilter = [&](int ix, skvm::Color color) {
-            if (SkColorFilter* colorFilter = fChildren[ix].colorFilter()) {
-                return as_CFB(colorFilter)->program(p, color, colorInfo, uniforms, alloc);
-            }
-            return color;
-        };
-        auto sampleBlender = [&](int ix, skvm::Color src, skvm::Color dst) {
-            if (SkBlender* blender = fChildren[ix].blender()) {
-                return as_BB(blender)->program(p, src, dst, colorInfo, uniforms, alloc);
-            }
-            return blend(SkBlendMode::kSrcOver, src, dst);
-        };
-
+        RuntimeEffectVMCallbacks callbacks(p, uniforms, alloc, fChildren, src, colorInfo);
         std::vector<skvm::Val> uniform = make_skvm_uniforms(p, uniforms, fEffect->uniformSize(),
                                                             *inputs);
 
@@ -1131,7 +1259,7 @@ class SkRuntimeBlender : public SkBlenderBase {
         skvm::Coord zeroCoord = {p->splat(0.0f), p->splat(0.0f)};
         return SkSL::ProgramToSkVM(*fEffect->fBaseProgram, fEffect->fMain, p,/*debugTrace=*/nullptr,
                                    SkMakeSpan(uniform), /*device=*/zeroCoord, /*local=*/zeroCoord,
-                                   src, dst, sampleShader, sampleColorFilter, sampleBlender);
+                                   src, dst, &callbacks);
     }
 
 #if SK_SUPPORT_GPU
@@ -1193,19 +1321,17 @@ sk_sp<SkFlattenable> SkRuntimeBlender::CreateProc(SkReadBuffer& buffer) {
 sk_sp<SkShader> SkRuntimeEffect::makeShader(sk_sp<SkData> uniforms,
                                             sk_sp<SkShader> childShaders[],
                                             size_t childCount,
-                                            const SkMatrix* localMatrix,
-                                            bool isOpaque) const {
+                                            const SkMatrix* localMatrix) const {
     SkSTArray<4, ChildPtr> children(childCount);
     for (size_t i = 0; i < childCount; ++i) {
         children.emplace_back(childShaders[i]);
     }
-    return this->makeShader(std::move(uniforms), SkMakeSpan(children), localMatrix, isOpaque);
+    return this->makeShader(std::move(uniforms), SkMakeSpan(children), localMatrix);
 }
 
 sk_sp<SkShader> SkRuntimeEffect::makeShader(sk_sp<SkData> uniforms,
                                             SkSpan<ChildPtr> children,
-                                            const SkMatrix* localMatrix,
-                                            bool isOpaque) const {
+                                            const SkMatrix* localMatrix) const {
     if (!this->allowShader()) {
         return nullptr;
     }
@@ -1219,7 +1345,7 @@ sk_sp<SkShader> SkRuntimeEffect::makeShader(sk_sp<SkData> uniforms,
         return nullptr;
     }
     return sk_make_sp<SkRTShader>(sk_ref_sp(this), /*debugTrace=*/nullptr, std::move(uniforms),
-                                  localMatrix, children, isOpaque);
+                                  localMatrix, children);
 }
 
 sk_sp<SkImage> SkRuntimeEffect::makeImage(GrRecordingContext* rContext,
@@ -1257,6 +1383,7 @@ sk_sp<SkImage> SkRuntimeEffect::makeImage(GrRecordingContext* rContext,
         }
         auto fp = GrSkSLFP::MakeWithData(sk_ref_sp(this),
                                          "runtime_image",
+                                         colorInfo.refColorSpace(),
                                          /*inputFP=*/nullptr,
                                          /*destColorFP=*/nullptr,
                                          std::move(uniforms),
@@ -1292,7 +1419,7 @@ sk_sp<SkImage> SkRuntimeEffect::makeImage(GrRecordingContext* rContext,
     }
     SkCanvas* canvas = surf->getCanvas();
     SkTLazy<SkCanvas> tempCanvas;
-    auto shader = this->makeShader(std::move(uniforms), children, localMatrix, false);
+    auto shader = this->makeShader(std::move(uniforms), children, localMatrix);
     if (!shader) {
         return nullptr;
     }
@@ -1367,7 +1494,7 @@ SkRuntimeEffect::TracedShader SkRuntimeEffect::MakeTraced(sk_sp<SkShader> shader
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-skstd::optional<ChildType> SkRuntimeEffect::ChildPtr::type() const {
+std::optional<ChildType> SkRuntimeEffect::ChildPtr::type() const {
     if (fChild) {
         switch (fChild->getFlattenableType()) {
             case SkFlattenable::kSkShader_Type:
@@ -1380,7 +1507,7 @@ skstd::optional<ChildType> SkRuntimeEffect::ChildPtr::type() const {
                 break;
         }
     }
-    return skstd::nullopt;
+    return std::nullopt;
 }
 
 SkShader* SkRuntimeEffect::ChildPtr::shader() const {
@@ -1426,11 +1553,9 @@ sk_sp<SkImage> SkRuntimeShaderBuilder::makeImage(GrRecordingContext* recordingCo
                                      mipmapped);
 }
 
-sk_sp<SkShader> SkRuntimeShaderBuilder::makeShader(const SkMatrix* localMatrix, bool isOpaque) {
-    return this->effect()->makeShader(this->uniforms(),
-                                      SkMakeSpan(this->children(), this->numChildren()),
-                                      localMatrix,
-                                      isOpaque);
+sk_sp<SkShader> SkRuntimeShaderBuilder::makeShader(const SkMatrix* localMatrix) {
+    return this->effect()->makeShader(
+            this->uniforms(), SkMakeSpan(this->children(), this->numChildren()), localMatrix);
 }
 
 SkRuntimeBlendBuilder::SkRuntimeBlendBuilder(sk_sp<SkRuntimeEffect> effect)
diff --git a/third_party/skia/src/core/SkSLTypeShared.h b/third_party/skia/src/core/SkSLTypeShared.h
new file mode 100644
index 0000000000000..88f6a3f0967f0
--- /dev/null
+++ b/third_party/skia/src/core/SkSLTypeShared.h
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSLTypeShared_DEFINED
+#define SkSLTypeShared_DEFINED
+
+#include "include/core/SkTypes.h"
+
+/**
+ * Types of shader-language-specific boxed variables we can create.
+ */
+enum class SkSLType : char {
+    kVoid,
+    kBool,
+    kBool2,
+    kBool3,
+    kBool4,
+    kShort,
+    kShort2,
+    kShort3,
+    kShort4,
+    kUShort,
+    kUShort2,
+    kUShort3,
+    kUShort4,
+    kFloat,
+    kFloat2,
+    kFloat3,
+    kFloat4,
+    kFloat2x2,
+    kFloat3x3,
+    kFloat4x4,
+    kHalf,
+    kHalf2,
+    kHalf3,
+    kHalf4,
+    kHalf2x2,
+    kHalf3x3,
+    kHalf4x4,
+    kInt,
+    kInt2,
+    kInt3,
+    kInt4,
+    kUInt,
+    kUInt2,
+    kUInt3,
+    kUInt4,
+    kTexture2DSampler,
+    kTextureExternalSampler,
+    kTexture2DRectSampler,
+    kTexture2D,
+    kSampler,
+    kInput,
+
+    kLast = kInput
+};
+static const int kSkSLTypeCount = static_cast<int>(SkSLType::kLast) + 1;
+
+/** Is the shading language type float (including vectors/matrices)? */
+static constexpr bool SkSLTypeIsFloatType(SkSLType type) {
+    switch (type) {
+        case SkSLType::kFloat:
+        case SkSLType::kFloat2:
+        case SkSLType::kFloat3:
+        case SkSLType::kFloat4:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf:
+        case SkSLType::kHalf2:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
+        case SkSLType::kHalf2x2:
+        case SkSLType::kHalf3x3:
+        case SkSLType::kHalf4x4:
+            return true;
+
+        case SkSLType::kVoid:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kShort:
+        case SkSLType::kShort2:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort:
+        case SkSLType::kUShort2:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kInt:
+        case SkSLType::kInt2:
+        case SkSLType::kInt3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt:
+        case SkSLType::kUInt2:
+        case SkSLType::kUInt3:
+        case SkSLType::kUInt4:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
+            return false;
+    }
+    SkUNREACHABLE;
+}
+
+/** Is the shading language type integral (including vectors)? */
+static constexpr bool SkSLTypeIsIntegralType(SkSLType type) {
+    switch (type) {
+        case SkSLType::kShort:
+        case SkSLType::kShort2:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort:
+        case SkSLType::kUShort2:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kInt:
+        case SkSLType::kInt2:
+        case SkSLType::kInt3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt:
+        case SkSLType::kUInt2:
+        case SkSLType::kUInt3:
+        case SkSLType::kUInt4:
+            return true;
+
+        case SkSLType::kFloat:
+        case SkSLType::kFloat2:
+        case SkSLType::kFloat3:
+        case SkSLType::kFloat4:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf:
+        case SkSLType::kHalf2:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
+        case SkSLType::kHalf2x2:
+        case SkSLType::kHalf3x3:
+        case SkSLType::kHalf4x4:
+        case SkSLType::kVoid:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
+            return false;
+    }
+    SkUNREACHABLE;
+}
+
+/**
+ * Is the shading language type supported as a uniform (ie, does it have a corresponding set
+ * function on GrGLSLProgramDataManager)?
+ */
+static constexpr bool SkSLTypeCanBeUniformValue(SkSLType type) {
+    return SkSLTypeIsFloatType(type) || SkSLTypeIsIntegralType(type);
+}
+
+/** If the type represents a single value or vector return the vector length, else -1. */
+static constexpr int SkSLTypeVecLength(SkSLType type) {
+    switch (type) {
+        case SkSLType::kFloat:
+        case SkSLType::kHalf:
+        case SkSLType::kBool:
+        case SkSLType::kShort:
+        case SkSLType::kUShort:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
+            return 1;
+
+        case SkSLType::kFloat2:
+        case SkSLType::kHalf2:
+        case SkSLType::kBool2:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+            return 2;
+
+        case SkSLType::kFloat3:
+        case SkSLType::kHalf3:
+        case SkSLType::kBool3:
+        case SkSLType::kShort3:
+        case SkSLType::kUShort3:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+            return 3;
+
+        case SkSLType::kFloat4:
+        case SkSLType::kHalf4:
+        case SkSLType::kBool4:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort4:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+            return 4;
+
+        case SkSLType::kFloat2x2:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf2x2:
+        case SkSLType::kHalf3x3:
+        case SkSLType::kHalf4x4:
+        case SkSLType::kVoid:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
+            return -1;
+    }
+    SkUNREACHABLE;
+}
+
+static constexpr bool SkSLTypeIsCombinedSamplerType(SkSLType type) {
+    switch (type) {
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+            return true;
+
+        case SkSLType::kVoid:
+        case SkSLType::kFloat:
+        case SkSLType::kFloat2:
+        case SkSLType::kFloat3:
+        case SkSLType::kFloat4:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf:
+        case SkSLType::kHalf2:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
+        case SkSLType::kHalf2x2:
+        case SkSLType::kHalf3x3:
+        case SkSLType::kHalf4x4:
+        case SkSLType::kInt:
+        case SkSLType::kInt2:
+        case SkSLType::kInt3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt:
+        case SkSLType::kUInt2:
+        case SkSLType::kUInt3:
+        case SkSLType::kUInt4:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kShort:
+        case SkSLType::kShort2:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort:
+        case SkSLType::kUShort2:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
+            return false;
+    }
+    SkUNREACHABLE;
+}
+
+#endif // SkSLTypeShared_DEFINED
diff --git a/third_party/skia/src/core/SkSafeRange.h b/third_party/skia/src/core/SkSafeRange.h
index 0d322cc0d1012..a8a944655c104 100644
--- a/third_party/skia/src/core/SkSafeRange.h
+++ b/third_party/skia/src/core/SkSafeRange.h
@@ -18,7 +18,7 @@
 
 class SkSafeRange {
 public:
-    operator bool() const { return fOK; }
+    explicit operator bool() const { return fOK; }
 
     bool ok() const { return fOK; }
 
diff --git a/third_party/skia/src/core/SkScalerCache.cpp b/third_party/skia/src/core/SkScalerCache.cpp
index 6866ff89ef2ba..f239c590f90fc 100644
--- a/third_party/skia/src/core/SkScalerCache.cpp
+++ b/third_party/skia/src/core/SkScalerCache.cpp
@@ -7,6 +7,7 @@
 
 #include "src/core/SkScalerCache.h"
 
+#include "include/core/SkDrawable.h"
 #include "include/core/SkGraphics.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkTypeface.h"
@@ -40,7 +41,7 @@ std::tuple<SkGlyph*, size_t> SkScalerCache::glyph(SkPackedGlyphID packedGlyphID)
 }
 
 std::tuple<SkGlyphDigest, size_t> SkScalerCache::digest(SkPackedGlyphID packedGlyphID) {
-    SkGlyphDigest* digest = fDigestForPackedGlyphID.find(packedGlyphID);
+    SkGlyphDigest* digest = fDigestForPackedGlyphID.find(packedGlyphID.value());
 
     if (digest != nullptr) {
         return {*digest, 0};
@@ -53,7 +54,7 @@ std::tuple<SkGlyphDigest, size_t> SkScalerCache::digest(SkPackedGlyphID packedGl
 SkGlyphDigest SkScalerCache::addGlyph(SkGlyph* glyph) {
     size_t index = fGlyphForIndex.size();
     SkGlyphDigest digest = SkGlyphDigest{index, *glyph};
-    fDigestForPackedGlyphID.set(glyph->getPackedID(), digest);
+    fDigestForPackedGlyphID.set(digest);
     fGlyphForIndex.push_back(glyph);
     return digest;
 }
@@ -70,12 +71,38 @@ std::tuple<const SkPath*, size_t> SkScalerCache::mergePath(
         SkGlyph* glyph, const SkPath* path, bool hairline) {
     SkAutoMutexExclusive lock{fMu};
     size_t pathDelta = 0;
+    if (glyph->setPathHasBeenCalled()) {
+        SkDEBUGFAIL("Re-adding path to existing glyph. This should not happen.");
+    }
     if (glyph->setPath(&fAlloc, path, hairline)) {
         pathDelta = glyph->path()->approximateBytesUsed();
     }
     return {glyph->path(), pathDelta};
 }
 
+std::tuple<SkDrawable*, size_t> SkScalerCache::prepareDrawable(SkGlyph* glyph) {
+    size_t delta = 0;
+    if (glyph->setDrawable(&fAlloc, fScalerContext.get())) {
+        delta = glyph->drawable()->approximateBytesUsed();
+        SkASSERT(delta > 0);
+    }
+    return {glyph->drawable(), delta};
+}
+
+std::tuple<SkDrawable*, size_t> SkScalerCache::mergeDrawable(SkGlyph* glyph,
+                                                             sk_sp<SkDrawable> drawable) {
+    SkAutoMutexExclusive lock{fMu};
+    size_t delta = 0;
+    if (glyph->setDrawableHasBeenCalled()) {
+        SkDEBUGFAIL("Re-adding drawable to existing glyph. This should not happen.");
+    }
+    if (glyph->setDrawable(&fAlloc, std::move(drawable))) {
+        delta = glyph->drawable()->approximateBytesUsed();
+        SkASSERT(delta > 0);
+    }
+    return {glyph->drawable(), delta};
+}
+
 int SkScalerCache::countCachedGlyphs() const {
     SkAutoMutexExclusive lock(fMu);
     return fDigestForPackedGlyphID.count();
@@ -109,14 +136,20 @@ std::tuple<const void*, size_t> SkScalerCache::prepareImage(SkGlyph* glyph) {
 std::tuple<SkGlyph*, size_t> SkScalerCache::mergeGlyphAndImage(
         SkPackedGlyphID toID, const SkGlyph& from) {
     SkAutoMutexExclusive lock{fMu};
-    // TODO(herb): remove finding the glyph when we are sure there are no glyph collisions.
-    SkGlyphDigest* digest = fDigestForPackedGlyphID.find(toID);
+    // TODO(herb): remove finding the glyph when setting the metrics and image are separated
+    SkGlyphDigest* digest = fDigestForPackedGlyphID.find(toID.value());
     if (digest != nullptr) {
-        // Since there is no search for replacement glyphs, this glyph should not exist yet.
-        SkDEBUGFAIL("This implies adding to an existing glyph. This should not happen.");
-
-        // Just return what we have. The invariants have already been cast in stone.
-        return {fGlyphForIndex[digest->index()], 0};
+        SkGlyph* to = fGlyphForIndex[digest->index()];
+        size_t delta = 0;
+        if (from.setImageHasBeenCalled()) {
+            if (to->setImageHasBeenCalled()) {
+                // Should never set an image on a glyph which already has an image.
+                SkDEBUGFAIL("Re-adding image to existing glyph. This should not happen.");
+            }
+            // TODO: assert that any metrics on `from` are the same.
+            delta = to->setMetricsAndImage(&fAlloc, from);
+        }
+        return {to, delta};
     } else {
         SkGlyph* glyph = fAlloc.make<SkGlyph>(toID);
         size_t delta = glyph->setMetricsAndImage(&fAlloc, from);
@@ -155,9 +188,9 @@ std::tuple<SkSpan<const SkGlyph*>, size_t> SkScalerCache::prepareImages(
 }
 
 template <typename Fn>
-size_t SkScalerCache::commonFilterLoop(SkDrawableGlyphBuffer* drawables, Fn&& fn) {
+size_t SkScalerCache::commonFilterLoop(SkDrawableGlyphBuffer* accepted, Fn&& fn) {
     size_t total = 0;
-    for (auto [i, packedID, pos] : SkMakeEnumerate(drawables->input())) {
+    for (auto [i, packedID, pos] : SkMakeEnumerate(accepted->input())) {
         if (SkScalarsAreFinite(pos.x(), pos.y())) {
             auto [digest, size] = this->digest(packedID);
             total += size;
@@ -169,16 +202,16 @@ size_t SkScalerCache::commonFilterLoop(SkDrawableGlyphBuffer* drawables, Fn&& fn
     return total;
 }
 
-size_t SkScalerCache::prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* drawables) {
+size_t SkScalerCache::prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* accepted) {
     SkAutoMutexExclusive lock{fMu};
     size_t imageDelta = 0;
-    size_t delta = this->commonFilterLoop(drawables,
+    size_t delta = this->commonFilterLoop(accepted,
         [&](size_t i, SkGlyphDigest digest, SkPoint pos) SK_REQUIRES(fMu) {
             // If the glyph is too large, then no image is created.
             SkGlyph* glyph = fGlyphForIndex[digest.index()];
             auto [image, imageSize] = this->prepareImage(glyph);
             if (image != nullptr) {
-                drawables->push_back(glyph, i);
+                accepted->accept(glyph, i);
                 imageDelta += imageSize;
             }
         });
@@ -188,14 +221,15 @@ size_t SkScalerCache::prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* drawables
 
 // Note: this does not actually fill out the image. That happens at atlas building time.
 size_t SkScalerCache::prepareForMaskDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
     SkAutoMutexExclusive lock{fMu};
-    size_t delta = this->commonFilterLoop(drawables,
+    size_t delta = this->commonFilterLoop(accepted,
         [&](size_t i, SkGlyphDigest digest, SkPoint pos) SK_REQUIRES(fMu) {
+            // N.B. this must have the same behavior as RemoteStrike::prepareForMaskDrawing.
             if (digest.canDrawAsMask()) {
-                drawables->push_back(fGlyphForIndex[digest.index()], i);
+                accepted->accept(fGlyphForIndex[digest.index()], i);
             } else {
-                rejects->reject(i);
+                rejected->reject(i, digest.maxDimension());
             }
         });
 
@@ -203,14 +237,15 @@ size_t SkScalerCache::prepareForMaskDrawing(
 }
 
 size_t SkScalerCache::prepareForSDFTDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
     SkAutoMutexExclusive lock{fMu};
-    size_t delta = this->commonFilterLoop(drawables,
+    size_t delta = this->commonFilterLoop(accepted,
         [&](size_t i, SkGlyphDigest digest, SkPoint pos) SK_REQUIRES(fMu) {
             if (digest.canDrawAsSDFT()) {
-                drawables->push_back(fGlyphForIndex[digest.index()], i);
+                accepted->accept(fGlyphForIndex[digest.index()], i);
             } else {
-                rejects->reject(i);
+                // Assume whatever follows SDF doesn't care about the maximum rejected size.
+                rejected->reject(i);
             }
         });
 
@@ -218,31 +253,47 @@ size_t SkScalerCache::prepareForSDFTDrawing(
 }
 
 size_t SkScalerCache::prepareForPathDrawing(
-        SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) {
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
     SkAutoMutexExclusive lock{fMu};
     size_t pathDelta = 0;
-    size_t delta = this->commonFilterLoop(drawables,
+    size_t delta = this->commonFilterLoop(accepted,
         [&](size_t i, SkGlyphDigest digest, SkPoint pos) SK_REQUIRES(fMu) {
             SkGlyph* glyph = fGlyphForIndex[digest.index()];
-            if (!digest.isColor()) {
-                auto [path, pathSize] = this->preparePath(glyph);
-                pathDelta += pathSize;
-                if (path != nullptr) {
-                    // Save off the path to draw later.
-                    drawables->push_back(path, i);
-                } else {
-                    // Glyph does not have a path. It is probably bitmap only.
-                    rejects->reject(i, glyph->maxDimension());
-                }
+            auto [path, pathSize] = this->preparePath(glyph);
+            pathDelta += pathSize;
+            if (path != nullptr) {
+                // Save off the path to draw later.
+                accepted->accept(path, i);
             } else {
-                // Glyph is color.
-                rejects->reject(i, glyph->maxDimension());
+                // Glyph does not have a path.
+                rejected->reject(i, digest.maxDimension());
             }
         });
 
     return delta + pathDelta;
 }
 
+size_t SkScalerCache::prepareForDrawableDrawing(
+        SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) {
+    SkAutoMutexExclusive lock{fMu};
+    size_t drawableDelta = 0;
+    size_t delta = this->commonFilterLoop(accepted,
+        [&](size_t i, SkGlyphDigest digest, SkPoint pos) SK_REQUIRES(fMu) {
+            SkGlyph* glyph = fGlyphForIndex[digest.index()];
+            auto [drawable, drawableSize] = this->prepareDrawable(glyph);
+            drawableDelta += drawableSize;
+            if (drawable != nullptr) {
+                // Save off the drawable to draw later.
+                accepted->accept(drawable, i);
+            } else {
+                // Glyph does not have a drawable.
+                rejected->reject(i, glyph->maxDimension());
+            }
+        });
+
+    return delta + drawableDelta;
+}
+
 void SkScalerCache::findIntercepts(const SkScalar bounds[2], SkScalar scale, SkScalar xPos,
         SkGlyph* glyph, SkScalar* array, int* count) {
     SkAutoMutexExclusive lock{fMu};
diff --git a/third_party/skia/src/core/SkScalerCache.h b/third_party/skia/src/core/SkScalerCache.h
index 62e71a64a5c09..0bfd5c3cb1e19 100644
--- a/third_party/skia/src/core/SkScalerCache.h
+++ b/third_party/skia/src/core/SkScalerCache.h
@@ -21,33 +21,6 @@
 
 class SkScalerContext;
 
-// The value stored in fDigestForPackedGlyphID.
-// index() is the index into fGlyphForIndex.
-class SkGlyphDigest {
-public:
-    // Default ctor is only needed for the hash table.
-    SkGlyphDigest() = default;
-    SkGlyphDigest(size_t i, const SkGlyph& glyph)
-        : fIndex{SkTo<uint32_t>(i)}
-        , fIsEmpty(glyph.isEmpty())
-        , fIsColor(glyph.isColor())
-        , fCanDrawAsMask{SkStrikeForGPU::CanDrawAsMask(glyph)}
-        , fCanDrawAsSDFT{SkStrikeForGPU::CanDrawAsSDFT(glyph)} {}
-    int index()          const {return fIndex;        }
-    bool isEmpty()       const {return fIsEmpty;      }
-    bool isColor()       const {return fIsColor;      }
-    bool canDrawAsMask() const {return fCanDrawAsMask;}
-    bool canDrawAsSDFT() const {return fCanDrawAsSDFT;}
-
-private:
-    static_assert(SkPackedGlyphID::kEndData == 20);
-    uint32_t fIndex : SkPackedGlyphID::kEndData;
-    uint32_t fIsEmpty       : 1;
-    uint32_t fIsColor       : 1;
-    uint32_t fCanDrawAsMask : 1;
-    uint32_t fCanDrawAsSDFT : 1;
-};
-
 // This class represents a strike: a specific combination of typeface, size, matrix, etc., and
 // holds the glyphs for that strike.
 class SkScalerCache {
@@ -66,6 +39,10 @@ class SkScalerCache {
     std::tuple<const SkPath*, size_t> mergePath(
             SkGlyph* glyph, const SkPath* path, bool hairline) SK_EXCLUDES(fMu);
 
+    // If the drawable has never been set, then add a drawble to glyph.
+    std::tuple<SkDrawable*, size_t> mergeDrawable(
+            SkGlyph* glyph, sk_sp<SkDrawable> drawable) SK_EXCLUDES(fMu);
+
     /** Return the number of glyphs currently cached. */
     int countCachedGlyphs() const SK_EXCLUDES(fMu);
 
@@ -88,7 +65,7 @@ class SkScalerCache {
     std::tuple<SkSpan<const SkGlyph*>, size_t> prepareImages(
             SkSpan<const SkPackedGlyphID> glyphIDs, const SkGlyph* results[]) SK_EXCLUDES(fMu);
 
-    size_t prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* drawables) SK_EXCLUDES(fMu);
+    size_t prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* accepted) SK_EXCLUDES(fMu);
 
     // SkStrikeForGPU APIs
     const SkGlyphPositionRoundingSpec& roundingSpec() const {
@@ -96,13 +73,16 @@ class SkScalerCache {
     }
 
     size_t prepareForMaskDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) SK_EXCLUDES(fMu);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) SK_EXCLUDES(fMu);
 
     size_t prepareForSDFTDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) SK_EXCLUDES(fMu);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) SK_EXCLUDES(fMu);
 
     size_t prepareForPathDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) SK_EXCLUDES(fMu);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) SK_EXCLUDES(fMu);
+
+    size_t prepareForDrawableDrawing(
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) SK_EXCLUDES(fMu);
 
     void dump() const SK_EXCLUDES(fMu);
 
@@ -110,7 +90,7 @@ class SkScalerCache {
 
 private:
     template <typename Fn>
-    size_t commonFilterLoop(SkDrawableGlyphBuffer* drawables, Fn&& fn) SK_REQUIRES(fMu);
+    size_t commonFilterLoop(SkDrawableGlyphBuffer* accepted, Fn&& fn) SK_REQUIRES(fMu);
 
     // Return a glyph. Create it if it doesn't exist, and initialize the glyph with metrics and
     // advances using a scaler.
@@ -126,6 +106,9 @@ class SkScalerCache {
     // If the path has never been set, then use the scaler context to add the glyph.
     std::tuple<const SkPath*, size_t> preparePath(SkGlyph*) SK_REQUIRES(fMu);
 
+    // If the drawable has never been set, then use the scaler context to add the glyph.
+    std::tuple<SkDrawable*, size_t> prepareDrawable(SkGlyph*) SK_REQUIRES(fMu);
+
     enum PathDetail {
         kMetricsOnly,
         kMetricsAndPath
@@ -148,7 +131,7 @@ class SkScalerCache {
     // SkGlyphDigest's fIndex field stores the index. This pointer provides an unchanging
     // reference to the SkGlyph as long as the strike is alive, and fGlyphForIndex
     // provides a dense index for glyphs.
-    SkTHashMap<SkPackedGlyphID, SkGlyphDigest> fDigestForPackedGlyphID SK_GUARDED_BY(fMu);
+    SkTHashTable<SkGlyphDigest, uint32_t, SkGlyphDigest> fDigestForPackedGlyphID SK_GUARDED_BY(fMu);
     std::vector<SkGlyph*> fGlyphForIndex SK_GUARDED_BY(fMu);
 
     // so we don't grow our arrays a lot
diff --git a/third_party/skia/src/core/SkScalerContext.cpp b/third_party/skia/src/core/SkScalerContext.cpp
index 42504a8630c33..b13e96ebd8681 100644
--- a/third_party/skia/src/core/SkScalerContext.cpp
+++ b/third_party/skia/src/core/SkScalerContext.cpp
@@ -8,6 +8,7 @@
 #include "include/core/SkPaint.h"
 #include "src/core/SkScalerContext.h"
 
+#include "include/core/SkDrawable.h"
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkMaskFilter.h"
 #include "include/core/SkPathEffect.h"
@@ -695,6 +696,14 @@ void SkScalerContext::getPath(SkGlyph& glyph, SkArenaAlloc* alloc) {
     this->internalGetPath(glyph, alloc);
 }
 
+sk_sp<SkDrawable> SkScalerContext::getDrawable(SkGlyph& glyph) {
+    return this->generateDrawable(glyph);
+}
+//TODO: make pure virtual
+sk_sp<SkDrawable> SkScalerContext::generateDrawable(const SkGlyph&) {
+    return nullptr;
+}
+
 void SkScalerContext::getFontMetrics(SkFontMetrics* fm) {
     SkASSERT(fm);
     this->generateFontMetrics(fm);
@@ -1004,7 +1013,7 @@ void SkScalerContext::MakeRecAndEffects(const SkFont& font, const SkPaint& paint
 
     SkTypeface* typeface = font.getTypefaceOrDefault();
 
-    rec->fFontID = typeface->uniqueID();
+    rec->fTypefaceID = typeface->uniqueID();
     rec->fTextSize = font.getSize();
     rec->fPreScaleX = font.getScaleX();
     rec->fPreSkewX  = font.getSkewX();
diff --git a/third_party/skia/src/core/SkScalerContext.h b/third_party/skia/src/core/SkScalerContext.h
index 303eb1fbcaaa6..bd9494e0d5b76 100644
--- a/third_party/skia/src/core/SkScalerContext.h
+++ b/third_party/skia/src/core/SkScalerContext.h
@@ -53,10 +53,10 @@ enum SkAxisAlignment : uint32_t {
  */
 SK_BEGIN_REQUIRE_DENSE
 struct SkScalerContextRec {
-    uint32_t    fFontID;
-    SkScalar    fTextSize, fPreScaleX, fPreSkewX;
-    SkScalar    fPost2x2[2][2];
-    SkScalar    fFrameWidth, fMiterLimit;
+    SkTypefaceID fTypefaceID;
+    SkScalar     fTextSize, fPreScaleX, fPreSkewX;
+    SkScalar     fPost2x2[2][2];
+    SkScalar     fFrameWidth, fMiterLimit;
 
     // This will be set if to the paint's foreground color if
     // kNeedsForegroundColor is set, which will usually be the case for COLRv0 and
@@ -295,6 +295,7 @@ class SkScalerContext {
     SkGlyph     makeGlyph(SkPackedGlyphID, SkArenaAlloc*);
     void        getImage(const SkGlyph&);
     void        getPath(SkGlyph&, SkArenaAlloc*);
+    sk_sp<SkDrawable> getDrawable(SkGlyph&);
     void        getFontMetrics(SkFontMetrics*);
 
     /** Return the size in bytes of the associated gamma lookup table
@@ -396,6 +397,16 @@ class SkScalerContext {
      */
     virtual bool SK_WARN_UNUSED_RESULT generatePath(const SkGlyph&, SkPath*) = 0;
 
+    /** Returns the drawable for the glyph (if any).
+     *
+     *  The generated drawable will be lifetime scoped to the lifetime of this scaler context.
+     *  This means the drawable may refer to the scaler context and associated font data.
+     *
+     *  The drawable does not need to be flattenable (e.g. implement getFactory and getTypeName).
+     *  Any necessary serialization will be done with newPictureSnapshot.
+     */
+    virtual sk_sp<SkDrawable> generateDrawable(const SkGlyph&); // TODO: = 0
+
     /** Retrieves font metrics. */
     virtual void generateFontMetrics(SkFontMetrics*) = 0;
 
diff --git a/third_party/skia/src/core/SkScanPriv.h b/third_party/skia/src/core/SkScanPriv.h
index 2bec85f7b85a7..02c4552439145 100644
--- a/third_party/skia/src/core/SkScanPriv.h
+++ b/third_party/skia/src/core/SkScanPriv.h
@@ -56,7 +56,7 @@ static inline void insert_edge_after(EdgeType* edge, EdgeType* afterMe) {
 }
 
 template<class EdgeType>
-static void backward_insert_edge_based_on_x(EdgeType* edge) {
+void backward_insert_edge_based_on_x(EdgeType* edge) {
     SkFixed x = edge->fX;
     EdgeType* prev = edge->fPrev;
     while (prev->fPrev && prev->fX > x) {
@@ -73,7 +73,7 @@ static void backward_insert_edge_based_on_x(EdgeType* edge) {
 // of the prior insertion, and search to the right, or with some additional caching, binary
 // search the starting point. More work could be done to determine optimal new edge insertion.
 template<class EdgeType>
-static EdgeType* backward_insert_start(EdgeType* prev, SkFixed x) {
+EdgeType* backward_insert_start(EdgeType* prev, SkFixed x) {
     while (prev->fPrev && prev->fX > x) {
         prev = prev->fPrev;
     }
diff --git a/third_party/skia/src/core/SkShaderCodeDictionary.cpp b/third_party/skia/src/core/SkShaderCodeDictionary.cpp
new file mode 100644
index 0000000000000..63cc2c633f607
--- /dev/null
+++ b/third_party/skia/src/core/SkShaderCodeDictionary.cpp
@@ -0,0 +1,444 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkShaderCodeDictionary.h"
+
+#include "include/private/SkSLString.h"
+#include "src/core/SkOpts.h"
+
+namespace {
+
+void add_indent(std::string* result, int indent) {
+    result->append(4*indent, ' ');
+}
+
+} // anonymous namespace
+
+// TODO: SkShaderInfo::toSkSL needs to work outside of both just graphite and metal. To do
+// so we'll need to switch over to using SkSL's uniform capabilities.
+#if SK_SUPPORT_GPU && defined(SK_GRAPHITE_ENABLED) && defined(SK_METAL)
+
+#include <set>
+
+// TODO: switch this over to using SkSL's uniform system
+namespace skgpu::mtl {
+std::string GetMtlUniforms(int bufferID,
+                           const char* name,
+                           const std::vector<SkShaderInfo::SnippetEntry>&);
+} // namespace skgpu::mtl
+
+// Emit the glue code needed to invoke a single static helper isolated w/in its own scope.
+// The structure of this will be:
+//
+//     half4 outColor%d;
+//     {
+//         half4 child-outColor%d;  // for each child
+//         {
+//             /* emitted snippet sksl assigns to child-outColor%d */
+//         }
+//
+//         /* emitted snippet sksl assigns to outColor%d - taking a vector of child var names */
+//     }
+// Where the %d is filled in with 'entryIndex'.
+std::string SkShaderInfo::emitGlueCodeForEntry(int* entryIndex,
+                                               std::string* result,
+                                               int indent) const {
+    const SkShaderInfo::SnippetEntry& entry = fEntries[*entryIndex];
+    int curEntryIndex = *entryIndex;
+
+    std::string scopeOutputVar(std::string("outColor") + std::to_string(curEntryIndex));
+
+    add_indent(result, indent);
+    SkSL::String::appendf(result, "half4 %s;\n", scopeOutputVar.c_str());
+    add_indent(result, indent);
+    *result += "{\n";
+
+    // Although the children appear after the parent in the shader info they are emitted
+    // before the parent
+    std::vector<std::string> childNames;
+    for (int j = 0; j < entry.fNumChildren; ++j) {
+        *entryIndex += 1;
+        std::string childOutputVar = this->emitGlueCodeForEntry(entryIndex, result, indent+1);
+        childNames.push_back(childOutputVar);
+    }
+
+    *result += (entry.fGlueCodeGenerator)(scopeOutputVar, curEntryIndex,
+                                          entry, childNames, indent+1);
+    add_indent(result, indent);
+    *result += "}\n";
+
+    return scopeOutputVar;
+}
+
+// The current, incomplete, model for shader construction is:
+//   each static code snippet (which can have an arbitrary signature) gets emitted once as a
+//            preamble
+//   glue code is then generated w/in the "main" method. The glue code is responsible for:
+//            1) gathering the correct (mangled) uniforms
+//            2) passing the uniforms and any other parameters to the helper method
+//   The result of the last code snippet is then copied into "sk_FragColor".
+// Note: that each entry's 'fStaticFunctionName' field must match the name of the method defined
+// in the 'fStaticSkSL' field.
+std::string SkShaderInfo::toSkSL() const {
+    // The uniforms are mangled by having their index in 'fEntries' as a suffix (i.e., "_%d")
+    std::string result = skgpu::mtl::GetMtlUniforms(2, "FS", fEntries);
+
+    std::set<const char*> emittedStaticSnippets;
+    for (auto c : fEntries) {
+        if (emittedStaticSnippets.find(c.fStaticFunctionName) == emittedStaticSnippets.end()) {
+            result += c.fStaticSkSL;
+            emittedStaticSnippets.insert(c.fStaticFunctionName);
+        }
+    }
+
+    result += "layout(location = 0, index = 0) out half4 sk_FragColor;\n";
+    result += "void main() {\n";
+
+    // TODO: for some effects (e.g., SW blending) we will need to feed the output variable
+    // name from the prior step into the current step's glue code (and deal with the
+    // initial color issue).
+    std::string lastOutputVar;
+    for (int entryIndex = 0; entryIndex < (int) fEntries.size(); ++entryIndex) {
+        lastOutputVar = this->emitGlueCodeForEntry(&entryIndex, &result, 1);
+    }
+
+    SkSL::String::appendf(&result, "    sk_FragColor = %s;\n", lastOutputVar.c_str());
+    result += "}\n";
+
+    return result;
+}
+#endif
+
+SkShaderCodeDictionary::Entry* SkShaderCodeDictionary::makeEntry(
+        std::unique_ptr<SkPaintParamsKey> key) {
+    return fArena.make([&](void *ptr) { return new(ptr) Entry(std::move(key)); });
+}
+
+size_t SkShaderCodeDictionary::Hash::operator()(const SkPaintParamsKey* key) const {
+    return SkOpts::hash_fn(key->data(), key->sizeInBytes(), 0);
+}
+
+const SkShaderCodeDictionary::Entry* SkShaderCodeDictionary::findOrCreate(
+        std::unique_ptr<SkPaintParamsKey> key) {
+    SkAutoSpinlock lock{fSpinLock};
+
+    auto iter = fHash.find(key.get());
+    if (iter != fHash.end()) {
+        SkASSERT(fEntryVector[iter->second->uniqueID().asUInt()] == iter->second);
+        return iter->second;
+    }
+
+    Entry* newEntry = this->makeEntry(std::move(key));
+    newEntry->setUniqueID(fEntryVector.size());
+    fHash.insert(std::make_pair(newEntry->paintParamsKey(), newEntry));
+    fEntryVector.push_back(newEntry);
+
+    return newEntry;
+}
+
+const SkShaderCodeDictionary::Entry* SkShaderCodeDictionary::lookup(
+        SkUniquePaintParamsID codeID) const {
+
+    if (!codeID.isValid()) {
+        return nullptr;
+    }
+
+    SkAutoSpinlock lock{fSpinLock};
+
+    SkASSERT(codeID.asUInt() < fEntryVector.size());
+
+    return fEntryVector[codeID.asUInt()];
+}
+
+SkSpan<const SkUniform> SkShaderCodeDictionary::getUniforms(SkBuiltInCodeSnippetID id) const {
+    return fBuiltInCodeSnippets[(int) id].fUniforms;
+}
+
+const SkShaderInfo::SnippetEntry* SkShaderCodeDictionary::getEntry(SkBuiltInCodeSnippetID id) const {
+    return &fBuiltInCodeSnippets[(int) id];
+}
+
+void SkShaderCodeDictionary::getShaderInfo(SkUniquePaintParamsID uniqueID, SkShaderInfo* info) {
+    auto entry = this->lookup(uniqueID);
+
+    entry->paintParamsKey()->toShaderInfo(this, info);
+}
+
+int SkShaderCodeDictionary::addUserDefinedSnippet() {
+    fUserDefinedCodeSnippets.push_back({});
+    return kBuiltInCodeSnippetIDCount + fUserDefinedCodeSnippets.size() - 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+namespace {
+
+// The default glue code just calls a helper function with the signature:
+//    half4 fStaticFunctionName(/* all uniforms as parameters */);
+// and stores the result in a variable named "resultName".
+std::string GenerateDefaultGlueCode(const std::string& resultName,
+                                    int entryIndex,
+                                    const SkShaderInfo::SnippetEntry& entry,
+                                    const std::vector<std::string>& childNames,
+                                    int indent) {
+    SkASSERT(childNames.empty());
+
+    std::string result;
+
+    add_indent(&result, indent);
+    SkSL::String::appendf(&result, "%s = %s(", resultName.c_str(), entry.fStaticFunctionName);
+    for (size_t i = 0; i < entry.fUniforms.size(); ++i) {
+        // The uniform names are mangled w/ the entry's index as a suffix
+        result += entry.fUniforms[i].name() + std::string("_") + std::to_string(entryIndex);
+
+        if (i+1 < entry.fUniforms.size()) {
+            result += ", ";
+        }
+    }
+    result += ");\n";
+
+    return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+static constexpr int kFourStopGradient = 4;
+
+// TODO: For the sprint we unify all the gradient uniforms into a standard set of 6:
+//   kMaxStops colors
+//   kMaxStops offsets
+//   2 points
+//   2 radii
+static constexpr int kNumGradientUniforms = 7;
+static constexpr SkUniform kGradientUniforms[kNumGradientUniforms] = {
+        { "colors",  SkSLType::kFloat4, kFourStopGradient },
+        { "offsets", SkSLType::kFloat, kFourStopGradient },
+        { "point0",  SkSLType::kFloat2 },
+        { "point1",  SkSLType::kFloat2 },
+        { "radius0", SkSLType::kFloat },
+        { "radius1", SkSLType::kFloat },
+        { "padding", SkSLType::kFloat2 } // TODO: add automatic uniform padding
+};
+
+static const char *kLinearGradient4Name = "linear_grad_4_shader";
+static const char *kLinearGradient4SkSL =
+        // TODO: This should use local coords
+        "half4 linear_grad_4_shader(float4 colorsParam[4],\n"
+        "                           float offsetsParam[4],\n"
+        "                           float2 point0Param,\n"
+        "                           float2 point1Param,\n"
+        "                           float radius0Param,\n"
+        "                           float radius1Param,\n"
+        "                           float2 padding) {\n"
+        "    float2 pos = sk_FragCoord.xy;\n"
+        "    float2 delta = point1Param - point0Param;\n"
+        "    float2 pt = pos - point0Param;\n"
+        "    float t = dot(pt, delta) / dot(delta, delta);\n"
+        "    float4 result = colorsParam[0];\n"
+        "    result = mix(result, colorsParam[1],\n"
+        "                 clamp((t-offsetsParam[0])/(offsetsParam[1]-offsetsParam[0]),\n"
+        "                       0, 1));\n"
+        "    result = mix(result, colorsParam[2],\n"
+        "                 clamp((t-offsetsParam[1])/(offsetsParam[2]-offsetsParam[1]),\n"
+        "                       0, 1));\n"
+        "    result = mix(result, colorsParam[3],\n"
+        "                 clamp((t-offsetsParam[2])/(offsetsParam[3]-offsetsParam[2]),\n"
+        "                 0, 1));\n"
+        "    return half4(result);\n"
+        "}\n";
+
+//--------------------------------------------------------------------------------------------------
+static constexpr int kNumSolidShaderUniforms = 1;
+static constexpr SkUniform kSolidShaderUniforms[kNumSolidShaderUniforms] = {
+        { "color", SkSLType::kFloat4 }
+};
+
+static const char* kSolidShaderName = "solid_shader";
+static const char* kSolidShaderSkSL =
+        "half4 solid_shader(float4 colorParam) {\n"
+        "    return half4(colorParam);\n"
+        "}\n";
+
+//--------------------------------------------------------------------------------------------------
+static constexpr int kNumImageShaderUniforms = 0;
+
+static const char* kImageShaderName = "image_shader";
+static const char* kImageShaderSkSL =
+        "half4 image_shader() {\n"
+        "    float c = fract(abs(sk_FragCoord.x/10.0));\n"
+        "    return half4(c, c, c, 1.0);\n"
+        "}\n";
+
+//--------------------------------------------------------------------------------------------------
+static constexpr int kNumBlendShaderUniforms = 0;
+static constexpr int kNumBlendShaderChildren = 2;
+
+// Note: we're counting on the compiler to inline this code and trim it down to just the used
+// branch(es).
+static const char* kBlendShaderName = "blend_shader";
+static const char* kBlendShaderSkSL =
+        "const int kClear      = 0;\n"
+        "const int kSrc        = 1;\n"
+        "const int kDst        = 2;\n"
+        "const int kSrcOver    = 3;\n"
+        "const int kDstOver    = 4;\n"
+        "const int kSrcIn      = 5;\n"
+        "const int kDstIn      = 6;\n"
+        "const int kSrcOut     = 7;\n"
+        "const int kDstOut     = 8;\n"
+        "const int kSrcATop    = 9;\n"
+        "const int kDstATop    = 10;\n"
+        "const int kXor        = 11;\n"
+        "const int kPlus       = 12;\n"
+        "const int kModulate   = 13;\n"
+        "const int kScreen     = 14;\n"
+        "const int kOverlay    = 15;\n"
+        "const int kDarken     = 16;\n"
+        "const int kLighten    = 17;\n"
+        "const int kColorDodge = 18;\n"
+        "const int kColorBurn  = 19;\n"
+        "const int kHardLight  = 20;\n"
+        "const int kSoftLight  = 21;\n"
+        "const int kDifference = 22;\n"
+        "const int kExclusion  = 23;\n"
+        "const int kMultiply   = 24;\n"
+        "const int kHue        = 25;\n"
+        "const int kSaturation = 26;\n"
+        "const int kColor      = 27;\n"
+        "const int kLuminosity = 28;\n"
+        "\n"
+        "half4 blend(int mode, half4 src, half4 dst) {\n"
+        "    switch (mode) {\n"
+        "        case kClear:      { return blend_clear(src, dst); }\n"
+        "        case kSrc:        { return blend_src(src, dst); }\n"
+        "        case kDst:        { return blend_dst(src, dst); }\n"
+        "        case kSrcOver:    { return blend_src_over(src, dst); }\n"
+        "        case kDstOver:    { return blend_dst_over(src, dst); }\n"
+        "        case kSrcIn:      { return blend_src_in(src, dst); }\n"
+        "        case kDstIn:      { return blend_dst_in(src, dst); }\n"
+        "        case kSrcOut:     { return blend_src_out(src, dst); }\n"
+        "        case kDstOut:     { return blend_dst_out(src, dst); }\n"
+        "        case kSrcATop:    { return blend_src_atop(src, dst); }\n"
+        "        case kDstATop:    { return blend_dst_atop(src, dst); }\n"
+        "        case kXor:        { return blend_xor(src, dst); }\n"
+        "        case kPlus:       { return blend_plus(src, dst); }\n"
+        "        case kModulate:   { return blend_modulate(src, dst); }\n"
+        "        case kScreen:     { return blend_screen(src, dst); }\n"
+        "        case kOverlay:    { return blend_overlay(src, dst); }\n"
+        "        case kDarken:     { return blend_darken(src, dst); }\n"
+        "        case kLighten:    { return blend_lighten(src, dst); }\n"
+        "        case kColorDodge: { return blend_color_dodge(src, dst); }\n"
+        "        case kColorBurn:  { return blend_color_burn(src, dst); }\n"
+        "        case kHardLight:  { return blend_hard_light(src, dst); }\n"
+        "        case kSoftLight:  { return blend_soft_light(src, dst); }\n"
+        "        case kDifference: { return blend_difference(src, dst); }\n"
+        "        case kExclusion:  { return blend_exclusion(src, dst); }\n"
+        "        case kMultiply:   { return blend_multiply(src, dst); }\n"
+        "        case kHue:        { return blend_hue(src, dst); }\n"
+        "        case kSaturation: { return blend_saturation(src, dst); }\n"
+        "        case kColor:      { return blend_color(src, dst); }\n"
+        "        case kLuminosity: { return blend_luminosity(src, dst); }\n"
+        "        default: return half4(0);  // Avoids 'blend can exit without returning a value' error\n"
+        "    }\n"
+        "}\n";
+
+std::string GenerateBlendShaderGlueCode(const std::string& resultName,
+                                        int entryIndex,
+                                        const SkShaderInfo::SnippetEntry& entry,
+                                        const std::vector<std::string>& childNames,
+                                        int indent) {
+    SkASSERT(childNames.size() == kNumBlendShaderChildren);
+
+    std::string result;
+
+    add_indent(&result, indent);
+    // TODO: actually feed in the blend mode either through a uniform or, somehow, from the
+    // SkPaintParamsKey
+    SkSL::String::appendf(&result, "%s = blend(kModulate, %s, %s);\n",
+                          resultName.c_str(),
+                          childNames[1].c_str(),
+                          childNames[0].c_str());
+
+    return result;
+}
+
+//--------------------------------------------------------------------------------------------------
+static constexpr int kNumErrorUniforms = 0;
+static const char* kErrorName = "error";
+static const char* kErrorSkSL =
+        "half4 error() {\n"
+        "    return half4(1.0, 0.0, 1.0, 1.0);\n"
+        "}\n";
+
+} // anonymous namespace
+
+static constexpr int kNoChildren = 0;
+
+SkShaderCodeDictionary::SkShaderCodeDictionary() {
+    // The 0th index is reserved as invalid
+    fEntryVector.push_back(nullptr);
+
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kDepthStencilOnlyDraw] = {
+            { nullptr, kNumErrorUniforms },
+            kErrorName, kErrorSkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kError] = {
+            { nullptr, kNumErrorUniforms },
+            kErrorName, kErrorSkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kSolidColorShader] = {
+            SkMakeSpan(kSolidShaderUniforms, kNumSolidShaderUniforms),
+            kSolidShaderName, kSolidShaderSkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kLinearGradientShader] = {
+            SkMakeSpan(kGradientUniforms, kNumGradientUniforms),
+            kLinearGradient4Name, kLinearGradient4SkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kRadialGradientShader] = {
+            SkMakeSpan(kGradientUniforms, kNumGradientUniforms),
+            kLinearGradient4Name, kLinearGradient4SkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kSweepGradientShader] = {
+            SkMakeSpan(kGradientUniforms, kNumGradientUniforms),
+            kLinearGradient4Name, kLinearGradient4SkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kConicalGradientShader] = {
+            SkMakeSpan(kGradientUniforms, kNumGradientUniforms),
+            kLinearGradient4Name, kLinearGradient4SkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kImageShader] = {
+            { nullptr, kNumImageShaderUniforms },
+            kImageShaderName, kImageShaderSkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kBlendShader] = {
+            { nullptr, kNumBlendShaderUniforms },
+            kBlendShaderName, kBlendShaderSkSL,
+            GenerateBlendShaderGlueCode,
+            kNumBlendShaderChildren
+    };
+    fBuiltInCodeSnippets[(int) SkBuiltInCodeSnippetID::kSimpleBlendMode] = {
+            { nullptr, kNumErrorUniforms },
+            kErrorName, kErrorSkSL,
+            GenerateDefaultGlueCode,
+            kNoChildren
+    };
+}
diff --git a/third_party/skia/src/core/SkShaderCodeDictionary.h b/third_party/skia/src/core/SkShaderCodeDictionary.h
new file mode 100644
index 0000000000000..9d69e52dda078
--- /dev/null
+++ b/third_party/skia/src/core/SkShaderCodeDictionary.h
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkShaderCodeDictionary_DEFINED
+#define SkShaderCodeDictionary_DEFINED
+
+#include <array>
+#include <unordered_map>
+#include <vector>
+#include "include/core/SkSpan.h"
+#include "include/private/SkSpinlock.h"
+#include "include/private/SkUniquePaintParamsID.h"
+#include "src/core/SkArenaAlloc.h"
+#include "src/core/SkPaintParamsKey.h"
+#include "src/core/SkUniform.h"
+
+class SkShaderInfo {
+public:
+    struct SnippetEntry;
+    using GenerateGlueCodeForEntry = std::string (*)(const std::string& resultName,
+                                                     int entryIndex, // for uniform name mangling
+                                                     const SnippetEntry&,
+                                                     const std::vector<std::string>& childNames,
+                                                     int indent);
+
+    struct SnippetEntry {
+        SkSpan<const SkUniform> fUniforms;
+        const char* fStaticFunctionName;
+        const char* fStaticSkSL;
+        GenerateGlueCodeForEntry fGlueCodeGenerator;
+        int fNumChildren;
+    };
+
+    void add(const SnippetEntry& entry) {
+        fEntries.push_back(entry);
+    }
+
+    // TODO: writing to color should be a property of the SnippetEntries and accumulated as the
+    // entries are added. _Not_ set manually via 'setWritesColor'.
+    void setWritesColor() { fWritesColor = true; }
+    bool writesColor() const { return fWritesColor; }
+
+#if SK_SUPPORT_GPU && defined(SK_GRAPHITE_ENABLED) && defined(SK_METAL)
+    std::string toSkSL() const;
+#endif
+
+private:
+    std::string emitGlueCodeForEntry(int* entryIndex, std::string* result, int indent) const;
+
+    std::vector<SnippetEntry> fEntries;
+    bool fWritesColor = false;
+};
+
+class SkShaderCodeDictionary {
+public:
+    SkShaderCodeDictionary();
+
+    struct Entry {
+    public:
+        SkUniquePaintParamsID uniqueID() const {
+            SkASSERT(fUniqueID.isValid());
+            return fUniqueID;
+        }
+        const SkPaintParamsKey* paintParamsKey() const { return fKey.get(); }
+
+    private:
+        friend class SkShaderCodeDictionary;
+
+        Entry(std::unique_ptr<SkPaintParamsKey> key) : fKey(std::move(key)) {}
+
+        void setUniqueID(uint32_t newID) {
+            SkASSERT(!fUniqueID.isValid());
+            fUniqueID = SkUniquePaintParamsID(newID);
+        }
+
+        SkUniquePaintParamsID fUniqueID;  // fixed-size (uint32_t) unique ID assigned to a key
+        std::unique_ptr<SkPaintParamsKey> fKey; // variable-length paint key descriptor
+    };
+
+    const Entry* findOrCreate(std::unique_ptr<SkPaintParamsKey>) SK_EXCLUDES(fSpinLock);
+
+    const Entry* lookup(SkUniquePaintParamsID) const SK_EXCLUDES(fSpinLock);
+
+    SkSpan<const SkUniform> getUniforms(SkBuiltInCodeSnippetID) const;
+    const SkShaderInfo::SnippetEntry* getEntry(SkBuiltInCodeSnippetID) const;
+
+    void getShaderInfo(SkUniquePaintParamsID, SkShaderInfo*);
+
+    int maxCodeSnippetID() const {
+        return static_cast<int>(SkBuiltInCodeSnippetID::kLast) + fUserDefinedCodeSnippets.size();
+    }
+
+    // TODO: this is still experimental but, most likely, it will need to be made thread-safe
+    // It returns the code snippet ID to use to identify the supplied user-defined code
+    // TODO: add hooks for user to actually provide code.
+    int addUserDefinedSnippet();
+
+private:
+    Entry* makeEntry(std::unique_ptr<SkPaintParamsKey>);
+
+    struct Hash {
+        size_t operator()(const SkPaintParamsKey*) const;
+    };
+
+    std::array<SkShaderInfo::SnippetEntry, kBuiltInCodeSnippetIDCount> fBuiltInCodeSnippets;
+    std::vector<SkShaderInfo::SnippetEntry> fUserDefinedCodeSnippets;
+
+    // TODO: can we do something better given this should have write-seldom/read-often behavior?
+    mutable SkSpinlock fSpinLock;
+
+    std::unordered_map<const SkPaintParamsKey*, Entry*, Hash> fHash SK_GUARDED_BY(fSpinLock);
+    std::vector<Entry*> fEntryVector SK_GUARDED_BY(fSpinLock);
+
+    SkArenaAlloc fArena{256};
+};
+
+#endif // SkShaderCodeDictionary_DEFINED
diff --git a/third_party/skia/src/core/SkSpecialImage.cpp b/third_party/skia/src/core/SkSpecialImage.cpp
index 1e31b03dd6dd9..5515fbf7ca15c 100644
--- a/third_party/skia/src/core/SkSpecialImage.cpp
+++ b/third_party/skia/src/core/SkSpecialImage.cpp
@@ -10,6 +10,8 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkImage.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkTileMode.h"
 #include "src/core/SkSpecialSurface.h"
 #include "src/core/SkSurfacePriv.h"
 #include "src/image/SkImage_Base.h"
@@ -22,6 +24,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/image/SkImage_Gpu.h"
+#include "src/shaders/SkImageShader.h"
 #endif
 
 // Currently the raster imagefilters can only handle certain imageinfos. Call this to know if
@@ -64,6 +67,10 @@ class SkSpecialImage_Base : public SkSpecialImage {
     // already been mapped from the content rect by the non-virtual asImage().
     virtual sk_sp<SkImage> onAsImage(const SkIRect* subset) const = 0;
 
+    virtual sk_sp<SkShader> onAsShader(SkTileMode,
+                                       const SkSamplingOptions&,
+                                       const SkMatrix&) const = 0;
+
     virtual sk_sp<SkSurface> onMakeTightSurface(
             SkColorType colorType, const SkColorSpace* colorSpace,
             const SkISize& size, SkAlphaType at) const = 0;
@@ -138,6 +145,21 @@ sk_sp<SkImage> SkSpecialImage::asImage(const SkIRect* subset) const {
     }
 }
 
+sk_sp<SkShader> SkSpecialImage::asShader(SkTileMode tileMode,
+                                         const SkSamplingOptions& sampling,
+                                         const SkMatrix& lm) const {
+    return as_SIB(this)->onAsShader(tileMode, sampling, lm);
+}
+
+sk_sp<SkShader> SkSpecialImage::asShader(const SkSamplingOptions& sampling) const {
+    return this->asShader(sampling, SkMatrix::I());
+}
+
+sk_sp<SkShader> SkSpecialImage::asShader(const SkSamplingOptions& sampling,
+                                         const SkMatrix& lm) const {
+    return this->asShader(SkTileMode::kClamp, sampling, lm);
+}
+
 #if defined(SK_DEBUG) || SK_SUPPORT_GPU
 static bool rect_fits(const SkIRect& rect, int width, int height) {
     if (0 == width && 0 == height) {
@@ -252,7 +274,19 @@ class SkSpecialImage_Raster : public SkSpecialImage_Base {
         return fBitmap.asImage();
     }
 
-sk_sp<SkSurface> onMakeTightSurface(SkColorType colorType, const SkColorSpace* colorSpace,
+    sk_sp<SkShader> onAsShader(SkTileMode tileMode,
+                               const SkSamplingOptions& sampling,
+                               const SkMatrix& lm) const override {
+        // TODO(skbug.com/12784): SkImage::makeShader() doesn't support a subset yet, but SkBitmap
+        // supports subset views so create the shader from the subset bitmap instead of fBitmap.
+        SkBitmap subsetBM;
+        if (!this->getROPixels(&subsetBM)) {
+            return nullptr;
+        }
+        return subsetBM.asImage()->makeShader(tileMode, tileMode, sampling, lm);
+    }
+
+    sk_sp<SkSurface> onMakeTightSurface(SkColorType colorType, const SkColorSpace* colorSpace,
                                         const SkISize& size, SkAlphaType at) const override {
         // Ignore the requested color type, the raster backend currently only supports N32
         colorType = kN32_SkColorType;   // TODO: find ways to allow f16
@@ -395,7 +429,7 @@ class SkSpecialImage_Gpu : public SkSpecialImage_Base {
 
         SkImageInfo ii = SkImageInfo::Make(size, colorType, at, sk_ref_sp(colorSpace));
 
-        return SkSpecialSurface::MakeRenderTarget(fContext, ii, props);
+        return SkSpecialSurface::MakeRenderTarget(fContext, ii, props, fView.origin());
     }
 
     sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const override {
@@ -438,6 +472,23 @@ class SkSpecialImage_Gpu : public SkSpecialImage_Base {
         return wrap_proxy_in_image(fContext, fView, this->colorType(), fAlphaType, fColorSpace);
     }
 
+    sk_sp<SkShader> onAsShader(SkTileMode tileMode,
+                               const SkSamplingOptions& sampling,
+                               const SkMatrix& lm) const override {
+        // The special image's logical (0,0) is at its subset's topLeft() so we need to account for
+        // that in the local matrix used when sampling.
+        SkMatrix subsetOrigin = SkMatrix::Translate(-this->subset().topLeft());
+        subsetOrigin.postConcat(lm);
+        // However, we don't need to modify the subset itself since that is defined with respect to
+        // the base image, and the local matrix is applied before any tiling/clamping.
+        const SkRect subset = SkRect::Make(this->subset());
+
+        // asImage() w/o a subset makes no copy; create the SkImageShader directly to remember the
+        // subset used to access the image.
+        return SkImageShader::MakeSubset(
+                this->asImage(), subset, tileMode, tileMode, sampling, &subsetOrigin);
+    }
+
     sk_sp<SkSurface> onMakeTightSurface(SkColorType colorType, const SkColorSpace* colorSpace,
                                         const SkISize& size, SkAlphaType at) const override {
         // TODO (michaelludwig): Why does this ignore colorType but onMakeSurface doesn't ignore it?
@@ -446,7 +497,8 @@ class SkSpecialImage_Gpu : public SkSpecialImage_Base {
         colorType = colorSpace && colorSpace->gammaIsLinear()
             ? kRGBA_F16_SkColorType : kRGBA_8888_SkColorType;
         SkImageInfo info = SkImageInfo::Make(size, colorType, at, sk_ref_sp(colorSpace));
-        return SkSurface::MakeRenderTarget(fContext, SkBudgeted::kYes, info);
+        return SkSurface::MakeRenderTarget(
+                fContext, SkBudgeted::kYes, info, 0, fView.origin(), nullptr);
     }
 
 private:
diff --git a/third_party/skia/src/core/SkSpecialImage.h b/third_party/skia/src/core/SkSpecialImage.h
index f8d06619a45ec..fa1bbf776a88d 100644
--- a/third_party/skia/src/core/SkSpecialImage.h
+++ b/third_party/skia/src/core/SkSpecialImage.h
@@ -25,10 +25,13 @@ class SkBitmap;
 class SkCanvas;
 class SkImage;
 struct SkImageInfo;
+class SkMatrix;
 class SkPaint;
 class SkPixmap;
+class SkShader;
 class SkSpecialSurface;
 class SkSurface;
+enum class SkTileMode;
 
 enum {
     kNeedNewImageUniqueID_SpecialImage = 0
@@ -126,8 +129,20 @@ class SkSpecialImage : public SkRefCnt {
      * When the 'subset' parameter is specified the returned image will be tight even if that
      * entails a copy! The 'subset' is relative to this special image's content rect.
      */
+    // TODO: The only version that uses the subset is the tile image filter, and that doesn't need
+    // to if it can be rewritten to use asShader() and SkTileModes. Similarly, the only use case of
+    // asImage() w/o a subset is SkImage::makeFiltered() and that could/should return an SkShader so
+    // that users don't need to worry about correctly applying the subset, etc.
     sk_sp<SkImage> asImage(const SkIRect* subset = nullptr) const;
 
+    /**
+     * Create an SkShader that samples the contents of this special image, applying tile mode for
+     * any sample that falls outside its internal subset.
+     */
+    sk_sp<SkShader> asShader(SkTileMode, const SkSamplingOptions&, const SkMatrix&) const;
+    sk_sp<SkShader> asShader(const SkSamplingOptions& sampling) const;
+    sk_sp<SkShader> asShader(const SkSamplingOptions& sampling, const SkMatrix& lm) const;
+
     /**
      *  If the SpecialImage is backed by a gpu texture, return true.
      */
diff --git a/third_party/skia/src/core/SkSpecialSurface.cpp b/third_party/skia/src/core/SkSpecialSurface.cpp
index d0b9bb2f2996b..3aed94ca27b0a 100644
--- a/third_party/skia/src/core/SkSpecialSurface.cpp
+++ b/third_party/skia/src/core/SkSpecialSurface.cpp
@@ -157,14 +157,15 @@ class SkSpecialSurface_Gpu : public SkSpecialSurface_Base {
 
 sk_sp<SkSpecialSurface> SkSpecialSurface::MakeRenderTarget(GrRecordingContext* rContext,
                                                            const SkImageInfo& ii,
-                                                           const SkSurfaceProps& props) {
+                                                           const SkSurfaceProps& props,
+                                                           GrSurfaceOrigin surfaceOrigin) {
     if (!rContext) {
         return nullptr;
     }
 
     auto device = rContext->priv().createDevice(SkBudgeted::kYes, ii, SkBackingFit::kApprox, 1,
                                                 GrMipmapped::kNo, GrProtected::kNo,
-                                                kBottomLeft_GrSurfaceOrigin, props,
+                                                surfaceOrigin, props,
                                                 skgpu::BaseDevice::InitContents::kUninit);
     if (!device) {
         return nullptr;
diff --git a/third_party/skia/src/core/SkSpecialSurface.h b/third_party/skia/src/core/SkSpecialSurface.h
index 88c53558443da..cb929b8e82d36 100644
--- a/third_party/skia/src/core/SkSpecialSurface.h
+++ b/third_party/skia/src/core/SkSpecialSurface.h
@@ -62,7 +62,8 @@ class SkSpecialSurface : public SkRefCnt {
      */
     static sk_sp<SkSpecialSurface> MakeRenderTarget(GrRecordingContext*,
                                                     const SkImageInfo&,
-                                                    const SkSurfaceProps&);
+                                                    const SkSurfaceProps&,
+                                                    GrSurfaceOrigin);
 #endif
 
     /**
diff --git a/third_party/skia/src/core/SkStrikeCache.cpp b/third_party/skia/src/core/SkStrikeCache.cpp
index f787ccffc82c6..f90647f54683d 100644
--- a/third_party/skia/src/core/SkStrikeCache.cpp
+++ b/third_party/skia/src/core/SkStrikeCache.cpp
@@ -107,7 +107,7 @@ void SkStrikeCache::DumpMemoryStatistics(SkTraceMemoryDump* dump) {
         }
 
         SkString dumpName = SkStringPrintf(
-                "%s/%s_%d/%p", gGlyphCacheDumpName, fontName.c_str(), rec.fFontID, &strike);
+                "%s/%s_%d/%p", gGlyphCacheDumpName, fontName.c_str(), rec.fTypefaceID, &strike);
 
         dump->dumpNumericValue(dumpName.c_str(),
                                "size", "bytes", strike.fMemoryUsed);
diff --git a/third_party/skia/src/core/SkStrikeCache.h b/third_party/skia/src/core/SkStrikeCache.h
index 521a45f929330..2de0d00d47cf2 100644
--- a/third_party/skia/src/core/SkStrikeCache.h
+++ b/third_party/skia/src/core/SkStrikeCache.h
@@ -11,6 +11,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include "include/core/SkDrawable.h"
 #include "include/private/SkSpinlock.h"
 #include "include/private/SkTemplates.h"
 #include "src/core/SkDescriptor.h"
@@ -61,6 +62,12 @@ class SkStrike final : public SkRefCnt, public SkStrikeForGPU {
         return glyphPath;
     }
 
+    const SkDrawable* mergeDrawable(SkGlyph* glyph, sk_sp<SkDrawable> drawable) {
+        auto [glyphDrawable, increase] = fScalerCache.mergeDrawable(glyph, std::move(drawable));
+        this->updateDelta(increase);
+        return glyphDrawable;
+    }
+
     // [[deprecated]]
     SkScalerContext* getScalerContext() const {
         return fScalerCache.getScalerContext();
@@ -96,8 +103,8 @@ class SkStrike final : public SkRefCnt, public SkStrikeForGPU {
         return glyphs;
     }
 
-    void prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* drawables) {
-        size_t increase = fScalerCache.prepareForDrawingMasksCPU(drawables);
+    void prepareForDrawingMasksCPU(SkDrawableGlyphBuffer* accepted) {
+        size_t increase = fScalerCache.prepareForDrawingMasksCPU(accepted);
         this->updateDelta(increase);
     }
 
@@ -118,20 +125,26 @@ class SkStrike final : public SkRefCnt, public SkStrikeForGPU {
 #endif
 
     void prepareForMaskDrawing(
-            SkDrawableGlyphBuffer* drawbles, SkSourceGlyphBuffer* rejects) override {
-        size_t increase = fScalerCache.prepareForMaskDrawing(drawbles, rejects);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override {
+        size_t increase = fScalerCache.prepareForMaskDrawing(accepted, rejected);
         this->updateDelta(increase);
     }
 
     void prepareForSDFTDrawing(
-            SkDrawableGlyphBuffer* drawbles, SkSourceGlyphBuffer* rejects) override {
-        size_t increase = fScalerCache.prepareForSDFTDrawing(drawbles, rejects);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override {
+        size_t increase = fScalerCache.prepareForSDFTDrawing(accepted, rejected);
         this->updateDelta(increase);
     }
 
     void prepareForPathDrawing(
-            SkDrawableGlyphBuffer* drawbles, SkSourceGlyphBuffer* rejects) override {
-        size_t increase = fScalerCache.prepareForPathDrawing(drawbles, rejects);
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override {
+        size_t increase = fScalerCache.prepareForPathDrawing(accepted, rejected);
+        this->updateDelta(increase);
+    }
+
+    void prepareForDrawableDrawing(
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) override {
+        size_t increase = fScalerCache.prepareForDrawableDrawing(accepted, rejected);
         this->updateDelta(increase);
     }
 
diff --git a/third_party/skia/src/core/SkStrikeForGPU.cpp b/third_party/skia/src/core/SkStrikeForGPU.cpp
index 9f1f32cda8805..731ed1f6005c8 100644
--- a/third_party/skia/src/core/SkStrikeForGPU.cpp
+++ b/third_party/skia/src/core/SkStrikeForGPU.cpp
@@ -20,8 +20,8 @@ bool SkStrikeForGPU::CanDrawAsSDFT(const SkGlyph& glyph) {
 }
 
 bool SkStrikeForGPU::CanDrawAsPath(const SkGlyph& glyph) {
-    SkASSERT(glyph.isColor() || glyph.setPathHasBeenCalled());
-    return !glyph.isColor() && glyph.path() != nullptr;
+    SkASSERT(glyph.setPathHasBeenCalled());
+    return glyph.path() != nullptr;
 }
 
 bool SkStrikeForGPU::FitsInAtlas(const SkGlyph& glyph) {
diff --git a/third_party/skia/src/core/SkStrikeForGPU.h b/third_party/skia/src/core/SkStrikeForGPU.h
index bfaadd1b2cdbb..757fb499843ef 100644
--- a/third_party/skia/src/core/SkStrikeForGPU.h
+++ b/third_party/skia/src/core/SkStrikeForGPU.h
@@ -12,7 +12,6 @@
 #include "include/core/SkPoint.h"
 #include "include/core/SkSpan.h"
 #include "include/core/SkTypes.h"
-#include "src/core/SkGlyph.h"
 
 #include <memory>
 
@@ -34,13 +33,16 @@ class SkStrikeForGPU {
     virtual const SkDescriptor& getDescriptor() const = 0;
 
     virtual void prepareForMaskDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) = 0;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) = 0;
 
     virtual void prepareForSDFTDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) = 0;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) = 0;
 
     virtual void prepareForPathDrawing(
-            SkDrawableGlyphBuffer* drawables, SkSourceGlyphBuffer* rejects) = 0;
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) = 0;
+
+    virtual void prepareForDrawableDrawing(
+            SkDrawableGlyphBuffer* accepted, SkSourceGlyphBuffer* rejected) = 0;
 
     virtual const SkGlyphPositionRoundingSpec& roundingSpec() const = 0;
 
diff --git a/third_party/skia/src/core/SkStrikeSpec.cpp b/third_party/skia/src/core/SkStrikeSpec.cpp
index 6507635ec8842..6147cf36811c1 100644
--- a/third_party/skia/src/core/SkStrikeSpec.cpp
+++ b/third_party/skia/src/core/SkStrikeSpec.cpp
@@ -171,25 +171,22 @@ SkStrikeSpec SkStrikeSpec::MakePDFVector(const SkTypeface& typeface, int* size)
 }
 
 #if SK_SUPPORT_GPU
-std::tuple<SkStrikeSpec, SkScalar, SkScalar, SkScalar>
+std::tuple<SkStrikeSpec, SkScalar, GrSDFTMatrixRange>
 SkStrikeSpec::MakeSDFT(const SkFont& font, const SkPaint& paint,
                        const SkSurfaceProps& surfaceProps, const SkMatrix& deviceMatrix,
                        const GrSDFTControl& control) {
+    // Add filter to the paint which creates the SDFT data for A8 masks.
     SkPaint dfPaint{paint};
     dfPaint.setMaskFilter(GrSDFMaskFilter::Make());
-    SkScalar strikeToSourceScale;
-    SkFont dfFont = control.getSDFFont(font, deviceMatrix, &strikeToSourceScale);
+
+    auto [dfFont, strikeToSourceScale, matrixRange] = control.getSDFFont(font, deviceMatrix);
 
     // Fake-gamma and subpixel antialiasing are applied in the shader, so we ignore the
     // passed-in scaler context flags. (It's only used when we fall-back to bitmap text).
     SkScalerContextFlags flags = SkScalerContextFlags::kNone;
-
-    SkScalar minScale, maxScale;
-    std::tie(minScale, maxScale) = control.computeSDFMinMaxScale(font.getSize(), deviceMatrix);
-
     SkStrikeSpec strikeSpec(dfFont, dfPaint, surfaceProps, flags, SkMatrix::I());
 
-    return std::make_tuple(std::move(strikeSpec), strikeToSourceScale, minScale, maxScale);
+    return std::make_tuple(std::move(strikeSpec), strikeToSourceScale, matrixRange);
 }
 
 sk_sp<GrTextStrike> SkStrikeSpec::findOrCreateGrStrike(GrStrikeCache* cache) const {
diff --git a/third_party/skia/src/core/SkStrikeSpec.h b/third_party/skia/src/core/SkStrikeSpec.h
index a544483a7f35a..530eb1bb6d4e2 100644
--- a/third_party/skia/src/core/SkStrikeSpec.h
+++ b/third_party/skia/src/core/SkStrikeSpec.h
@@ -71,7 +71,7 @@ class SkStrikeSpec {
 
 #if SK_SUPPORT_GPU
     // Create a strike spec for scaled distance field text.
-    static std::tuple<SkStrikeSpec, SkScalar, SkScalar, SkScalar> MakeSDFT(
+    static std::tuple<SkStrikeSpec, SkScalar, GrSDFTMatrixRange> MakeSDFT(
             const SkFont& font,
             const SkPaint& paint,
             const SkSurfaceProps& surfaceProps,
diff --git a/third_party/skia/src/core/SkString.cpp b/third_party/skia/src/core/SkString.cpp
index 5cc23b268d915..543079ba8b538 100644
--- a/third_party/skia/src/core/SkString.cpp
+++ b/third_party/skia/src/core/SkString.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "include/core/SkString.h"
-#include "include/core/SkStringView.h"
 #include "include/private/SkTPin.h"
 #include "include/private/SkTo.h"
 #include "src/core/SkSafeMath.h"
@@ -15,6 +14,7 @@
 
 #include <cstdio>
 #include <new>
+#include <string_view>
 #include <utility>
 #include <vector>
 
@@ -26,6 +26,10 @@ struct StringBuffer {
     int    fLength;
 };
 
+template <int SIZE>
+static StringBuffer apply_format_string(const char* format, va_list args, char (&stackBuffer)[SIZE],
+                                        SkString* heapBuffer) SK_PRINTF_LIKE(1, 0);
+
 template <int SIZE>
 static StringBuffer apply_format_string(const char* format, va_list args, char (&stackBuffer)[SIZE],
                                         SkString* heapBuffer) {
@@ -299,7 +303,7 @@ SkString::SkString(const std::string& src) {
     fRec = Rec::Make(src.c_str(), src.size());
 }
 
-SkString::SkString(skstd::string_view src) {
+SkString::SkString(std::string_view src) {
     fRec = Rec::Make(src.data(), src.length());
 }
 
diff --git a/third_party/skia/src/core/SkStringView.cpp b/third_party/skia/src/core/SkStringView.cpp
deleted file mode 100644
index c279994dd0289..0000000000000
--- a/third_party/skia/src/core/SkStringView.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2021 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#include "include/core/SkStringView.h"
-
-#include <algorithm>
-
-namespace skstd {
-
-bool operator==(string_view left, string_view right) {
-    if (left.length() != right.length()) {
-        return false;
-    }
-    return !string_view::traits_type::compare(left.data(), right.data(), left.length());
-}
-
-bool operator!=(string_view left, string_view right) {
-    return !(left == right);
-}
-
-bool operator<(string_view left, string_view right) {
-    int result = string_view::traits_type::compare(left.data(), right.data(),
-                                                   std::min(left.length(), right.length()));
-    if (!result) {
-        result = left.length() - right.length();
-    }
-    return result < 0;
-}
-
-bool operator<=(string_view left, string_view right) {
-    return !(left > right);
-}
-
-bool operator>(string_view left, string_view right) {
-    return right < left;
-}
-
-bool operator>=(string_view left, string_view right) {
-    return !(left < right);
-}
-
-} // namespace skstd
diff --git a/third_party/skia/src/core/SkTLazy.h b/third_party/skia/src/core/SkTLazy.h
index 2fca86c0ec3da..eadddc63f7e92 100644
--- a/third_party/skia/src/core/SkTLazy.h
+++ b/third_party/skia/src/core/SkTLazy.h
@@ -9,9 +9,7 @@
 #define SkTLazy_DEFINED
 
 #include "include/core/SkTypes.h"
-#include <new>
-#include <type_traits>
-#include <utility>
+#include <optional>
 
 /**
  *  Efficient way to defer allocating/initializing a class until it is needed
@@ -20,27 +18,19 @@
 template <typename T> class SkTLazy {
 public:
     SkTLazy() = default;
-    explicit SkTLazy(const T* src) : fPtr(src ? new (&fStorage) T(*src) : nullptr) {}
-    SkTLazy(const SkTLazy& that) : fPtr(that.fPtr ? new (&fStorage) T(*that.fPtr) : nullptr) {}
-    SkTLazy(SkTLazy&& that) : fPtr(that.fPtr ? new (&fStorage) T(std::move(*that.fPtr)) : nullptr){}
+    explicit SkTLazy(const T* src) : fValue(src ? std::optional<T>(*src) : std::nullopt) {}
+    SkTLazy(const SkTLazy& that) : fValue(that.fValue) {}
+    SkTLazy(SkTLazy&& that) : fValue(std::move(that.fValue)) {}
 
-    ~SkTLazy() { this->reset(); }
+    ~SkTLazy() = default;
 
     SkTLazy& operator=(const SkTLazy& that) {
-        if (that.isValid()) {
-            this->set(*that);
-        } else {
-            this->reset();
-        }
+        fValue = that.fValue;
         return *this;
     }
 
     SkTLazy& operator=(SkTLazy&& that) {
-        if (that.isValid()) {
-            this->set(std::move(*that));
-        } else {
-            this->reset();
-        }
+        fValue = std::move(that.fValue);
         return *this;
     }
 
@@ -51,9 +41,8 @@ template <typename T> class SkTLazy {
      *  instance is always returned.
      */
     template <typename... Args> T* init(Args&&... args) {
-        this->reset();
-        fPtr = new (&fStorage) T(std::forward<Args>(args)...);
-        return fPtr;
+        fValue.emplace(std::forward<Args>(args)...);
+        return this->get();
     }
 
     /**
@@ -63,56 +52,61 @@ template <typename T> class SkTLazy {
      *  contents.
      */
     T* set(const T& src) {
-        if (this->isValid()) {
-            *fPtr = src;
-        } else {
-            fPtr = new (&fStorage) T(src);
-        }
-        return fPtr;
+        fValue = src;
+        return this->get();
     }
 
     T* set(T&& src) {
-        if (this->isValid()) {
-            *fPtr = std::move(src);
-        } else {
-            fPtr = new (&fStorage) T(std::move(src));
-        }
-        return fPtr;
+        fValue = std::move(src);
+        return this->get();
     }
 
     /**
      * Destroy the lazy object (if it was created via init() or set())
      */
     void reset() {
-        if (this->isValid()) {
-            fPtr->~T();
-            fPtr = nullptr;
-        }
+        fValue.reset();
     }
 
     /**
      *  Returns true if a valid object has been initialized in the SkTLazy,
      *  false otherwise.
      */
-    bool isValid() const { return SkToBool(fPtr); }
+    bool isValid() const { return fValue.has_value(); }
 
     /**
      * Returns the object. This version should only be called when the caller
      * knows that the object has been initialized.
      */
-    T* get() const { SkASSERT(this->isValid()); return fPtr; }
-    T* operator->() const { return this->get(); }
-    T& operator*() const { return *this->get(); }
+    T* get() {
+        SkASSERT(fValue.has_value());
+        return &fValue.value();
+    }
+    const T* get() const {
+        SkASSERT(fValue.has_value());
+        return &fValue.value();
+    }
+
+    T* operator->() { return this->get(); }
+    const T* operator->() const { return this->get(); }
+
+    T& operator*() {
+        SkASSERT(fValue.has_value());
+        return *fValue;
+    }
+    const T& operator*() const {
+        SkASSERT(fValue.has_value());
+        return *fValue;
+    }
 
     /**
      * Like above but doesn't assert if object isn't initialized (in which case
      * nullptr is returned).
      */
-    T* getMaybeNull() const { return fPtr; }
+    const T* getMaybeNull() const { return fValue.has_value() ? this->get() : nullptr; }
 
 private:
-    alignas(T) char fStorage[sizeof(T)];
-    T*              fPtr{nullptr}; // nullptr or fStorage
+    std::optional<T> fValue;
 };
 
 /**
diff --git a/third_party/skia/src/core/SkTSort.h b/third_party/skia/src/core/SkTSort.h
index 3475dab508136..a2905d4800297 100644
--- a/third_party/skia/src/core/SkTSort.h
+++ b/third_party/skia/src/core/SkTSort.h
@@ -111,7 +111,7 @@ template <typename T> void SkTHeapSort(T array[], size_t count) {
 
 /** Sorts the array of size count using comparator lessThan using an Insertion Sort algorithm. */
 template <typename T, typename C>
-static void SkTInsertionSort(T* left, int count, const C& lessThan) {
+void SkTInsertionSort(T* left, int count, const C& lessThan) {
     T* right = left + count - 1;
     for (T* next = left + 1; next <= right; ++next) {
         if (!lessThan(*next, *(next - 1))) {
@@ -130,7 +130,7 @@ static void SkTInsertionSort(T* left, int count, const C& lessThan) {
 ///////////////////////////////////////////////////////////////////////////////
 
 template <typename T, typename C>
-static T* SkTQSort_Partition(T* left, int count, T* pivot, const C& lessThan) {
+T* SkTQSort_Partition(T* left, int count, T* pivot, const C& lessThan) {
     T* right = left + count - 1;
     using std::swap;
     T pivotValue = *pivot;
diff --git a/third_party/skia/src/core/SkTextBlob.cpp b/third_party/skia/src/core/SkTextBlob.cpp
index 88ce235f4f227..f40d64571b6c5 100644
--- a/third_party/skia/src/core/SkTextBlob.cpp
+++ b/third_party/skia/src/core/SkTextBlob.cpp
@@ -23,7 +23,7 @@
 #include <new>
 
 #if SK_SUPPORT_GPU
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 #endif
 
 namespace {
@@ -149,7 +149,7 @@ SkTextBlob::SkTextBlob(const SkRect& bounds)
 SkTextBlob::~SkTextBlob() {
 #if SK_SUPPORT_GPU
     if (SK_InvalidUniqueID != fCacheID.load()) {
-        GrTextBlobCache::PostPurgeBlobMessage(fUniqueID, fCacheID);
+        GrTextBlobRedrawCoordinator::PostPurgeBlobMessage(fUniqueID, fCacheID);
     }
 #endif
 
diff --git a/third_party/skia/src/core/SkTypeface.cpp b/third_party/skia/src/core/SkTypeface.cpp
index 851cb0cedfb20..c3af6d7d5f821 100644
--- a/third_party/skia/src/core/SkTypeface.cpp
+++ b/third_party/skia/src/core/SkTypeface.cpp
@@ -23,7 +23,7 @@
 #include "src/utils/SkUTF.h"
 
 SkTypeface::SkTypeface(const SkFontStyle& style, bool isFixedPitch)
-    : fUniqueID(SkTypefaceCache::NewFontID()), fStyle(style), fIsFixedPitch(isFixedPitch) { }
+    : fUniqueID(SkTypefaceCache::NewTypefaceID()), fStyle(style), fIsFixedPitch(isFixedPitch) { }
 
 SkTypeface::~SkTypeface() { }
 
@@ -222,6 +222,9 @@ sk_sp<SkTypeface> SkTypeface::MakeDeserialize(SkStream* stream) {
         SkFontArguments args;
         args.setCollectionIndex(desc.getCollectionIndex());
         args.setVariationDesignPosition({desc.getVariation(), desc.getVariationCoordinateCount()});
+        args.setPalette({desc.getPaletteIndex(),
+                         desc.getPaletteEntryOverrides(),
+                         desc.getPaletteEntryOverrideCount()});
         sk_sp<SkFontMgr> defaultFm = SkFontMgr::RefDefault();
         sk_sp<SkTypeface> typeface = defaultFm->makeFromStream(desc.detachStream(), args);
         if (typeface) {
@@ -290,6 +293,15 @@ std::unique_ptr<SkStreamAsset> SkTypeface::openStream(int* ttcIndex) const {
     return this->onOpenStream(ttcIndex);
 }
 
+std::unique_ptr<SkStreamAsset> SkTypeface::openExistingStream(int* ttcIndex) const {
+    int ttcIndexStorage;
+    if (nullptr == ttcIndex) {
+        // So our subclasses don't need to check for null param
+        ttcIndex = &ttcIndexStorage;
+    }
+    return this->onOpenExistingStream(ttcIndex);
+}
+
 std::unique_ptr<SkScalerContext> SkTypeface::createScalerContext(
         const SkScalerContextEffects& effects, const SkDescriptor* desc) const {
     std::unique_ptr<SkScalerContext> scalerContext = this->onCreateScalerContext(effects, desc);
@@ -438,6 +450,10 @@ bool SkTypeface::onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
     return false;
 }
 
+std::unique_ptr<SkStreamAsset> SkTypeface::onOpenExistingStream(int* ttcIndex) const {
+    return this->onOpenStream(ttcIndex);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "include/core/SkPaint.h"
diff --git a/third_party/skia/src/core/SkTypefaceCache.cpp b/third_party/skia/src/core/SkTypefaceCache.cpp
index 578ca1a0aa25b..3272d6a9701c1 100644
--- a/third_party/skia/src/core/SkTypefaceCache.cpp
+++ b/third_party/skia/src/core/SkTypefaceCache.cpp
@@ -57,7 +57,7 @@ SkTypefaceCache& SkTypefaceCache::Get() {
     return gCache;
 }
 
-SkFontID SkTypefaceCache::NewFontID() {
+SkTypefaceID SkTypefaceCache::NewTypefaceID() {
     static std::atomic<int32_t> nextID{1};
     return nextID.fetch_add(1, std::memory_order_relaxed);
 }
@@ -89,8 +89,8 @@ static bool DumpProc(SkTypeface* face, void* ctx) {
     SkString n;
     face->getFamilyName(&n);
     SkFontStyle s = face->fontStyle();
-    SkFontID id = face->uniqueID();
-    SkDebugf("SkTypefaceCache: face %p fontID %d weight %d width %d style %d name %s\n",
+    SkTypefaceID id = face->uniqueID();
+    SkDebugf("SkTypefaceCache: face %p typefaceID %d weight %d width %d style %d name %s\n",
              face, id, s.weight(), s.width(), s.slant(), n.c_str());
     return false;
 }
diff --git a/third_party/skia/src/core/SkTypefaceCache.h b/third_party/skia/src/core/SkTypefaceCache.h
index ac3faafec041b..80bc341e73b5d 100644
--- a/third_party/skia/src/core/SkTypefaceCache.h
+++ b/third_party/skia/src/core/SkTypefaceCache.h
@@ -47,10 +47,10 @@ class SkTypefaceCache {
     void purgeAll();
 
     /**
-     *  Helper: returns a unique fontID to pass to the constructor of
+     *  Helper: returns a unique typefaceID to pass to the constructor of
      *  your subclass of SkTypeface
      */
-    static SkFontID NewFontID();
+    static SkTypefaceID NewTypefaceID();
 
     // These are static wrappers around a global instance of a cache.
 
diff --git a/third_party/skia/src/core/SkTypeface_remote.cpp b/third_party/skia/src/core/SkTypeface_remote.cpp
index 2c9f990eb814a..48124d1d682d0 100644
--- a/third_party/skia/src/core/SkTypeface_remote.cpp
+++ b/third_party/skia/src/core/SkTypeface_remote.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "include/core/SkPaint.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkScalerCache.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkTraceEvent.h"
@@ -59,6 +59,17 @@ bool SkScalerContextProxy::generatePath(const SkGlyph& glyph, SkPath* path) {
     return false;
 }
 
+sk_sp<SkDrawable> SkScalerContextProxy::generateDrawable(const SkGlyph&) {
+    TRACE_EVENT1("skia", "generateDrawable", "rec", TRACE_STR_COPY(this->getRec().dump().c_str()));
+    if (this->getProxyTypeface()->isLogging()) {
+        SkDebugf("GlyphCacheMiss generateDrawable: %s\n", this->getRec().dump().c_str());
+    }
+
+    fDiscardableManager->notifyCacheMiss(
+            SkStrikeClient::CacheMissType::kGlyphDrawable, fRec.fTextSize);
+    return nullptr;
+}
+
 void SkScalerContextProxy::generateFontMetrics(SkFontMetrics* metrics) {
     TRACE_EVENT1(
             "skia", "generateFontMetrics", "rec", TRACE_STR_COPY(this->getRec().dump().c_str()));
diff --git a/third_party/skia/src/core/SkTypeface_remote.h b/third_party/skia/src/core/SkTypeface_remote.h
index b407729521fe7..3f2f6a2b25995 100644
--- a/third_party/skia/src/core/SkTypeface_remote.h
+++ b/third_party/skia/src/core/SkTypeface_remote.h
@@ -11,10 +11,10 @@
 #include "include/core/SkFontStyle.h"
 #include "include/core/SkPaint.h"
 #include "include/core/SkTypeface.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkAdvancedTypefaceMetrics.h"
 #include "src/core/SkDescriptor.h"
 #include "src/core/SkFontDescriptor.h"
-#include "src/core/SkRemoteGlyphCache.h"
 #include "src/core/SkScalerContext.h"
 
 class SkTypefaceProxy;
@@ -32,6 +32,7 @@ class SkScalerContextProxy : public SkScalerContext {
     void generateMetrics(SkGlyph* glyph, SkArenaAlloc*) override;
     void generateImage(const SkGlyph& glyph) override;
     bool generatePath(const SkGlyph& glyphID, SkPath* path) override;
+    sk_sp<SkDrawable> generateDrawable(const SkGlyph&) override;
     void generateFontMetrics(SkFontMetrics* metrics) override;
     SkTypefaceProxy* getProxyTypeface() const;
 
@@ -42,7 +43,7 @@ class SkScalerContextProxy : public SkScalerContext {
 
 class SkTypefaceProxy : public SkTypeface {
 public:
-    SkTypefaceProxy(SkFontID fontId,
+    SkTypefaceProxy(SkTypefaceID typefaceID,
                     int glyphCount,
                     const SkFontStyle& style,
                     bool isFixed,
@@ -50,12 +51,12 @@ class SkTypefaceProxy : public SkTypeface {
                     sk_sp<SkStrikeClient::DiscardableHandleManager> manager,
                     bool isLogging = true)
             : INHERITED{style, false}
-            , fFontId{fontId}
+            , fTypefaceID{typefaceID}
             , fGlyphCount{glyphCount}
             , fIsLogging{isLogging}
             , fGlyphMaskNeedsCurrentColor(glyphMaskNeedsCurrentColor)
             , fDiscardableManager{std::move(manager)} {}
-    SkFontID remoteTypefaceID() const {return fFontId;}
+    SkTypefaceID remoteTypefaceID() const {return fTypefaceID;}
     int glyphCount() const {return fGlyphCount;}
     bool isLogging() const {return fIsLogging;}
 
@@ -130,7 +131,7 @@ class SkTypefaceProxy : public SkTypeface {
     }
 
 private:
-    const SkFontID                                  fFontId;
+    const SkTypefaceID                              fTypefaceID;
     const int                                       fGlyphCount;
     const bool                                      fIsLogging;
     const bool                                      fGlyphMaskNeedsCurrentColor;
diff --git a/third_party/skia/experimental/graphite/src/Uniform.h b/third_party/skia/src/core/SkUniform.h
similarity index 51%
rename from third_party/skia/experimental/graphite/src/Uniform.h
rename to third_party/skia/src/core/SkUniform.h
index 65e2e4d58bf1a..f13e8d0ea43ee 100644
--- a/third_party/skia/experimental/graphite/src/Uniform.h
+++ b/third_party/skia/src/core/SkUniform.h
@@ -5,47 +5,45 @@
  * found in the LICENSE file.
  */
 
-#ifndef skgpu_Uniform_DEFINED
-#define skgpu_Uniform_DEFINED
+#ifndef SkUniform_DEFINED
+#define SkUniform_DEFINED
 
-#include "experimental/graphite/src/DrawTypes.h"
+#include "src/core/SkSLTypeShared.h"
 
-namespace skgpu {
+// TODO: can SkRuntimeEffect::Uniform be absorbed into this class!?
 
 /**
  * Describes a uniform. Uniforms consist of:
  *  type:       The type of the uniform
  *  count:      Number of elements of 'type' in the array or kNonArray if not an array.
  */
-class Uniform {
+class SkUniform {
 public:
     static constexpr int kNonArray = 0;
 
-    constexpr Uniform(const char* name, SLType type) : Uniform(name, type, kNonArray) {}
+    constexpr SkUniform(const char* name, SkSLType type) : SkUniform(name, type, kNonArray) {}
 
-    constexpr Uniform(const char* name, SLType type, int count)
+    constexpr SkUniform(const char* name, SkSLType type, int count)
             : fType      (static_cast<unsigned>(type))
             , fCount     (static_cast<unsigned>(count))
             , fName      (name) {
     }
 
-    constexpr Uniform(const Uniform&) = default;
-    Uniform& operator=(const Uniform&) = default;
+    constexpr SkUniform(const SkUniform&) = default;
+    SkUniform& operator=(const SkUniform&) = default;
 
-    constexpr bool isInitialized() const { return this->type() != SLType::kVoid; }
+    constexpr bool isInitialized() const { return this->type() != SkSLType::kVoid; }
 
     constexpr const char* name() const  { return fName; }
-    constexpr SLType   type() const  { return static_cast<SLType>(fType);  }
-    constexpr uint32_t count() const { return static_cast<uint32_t>(fCount); }
+    constexpr SkSLType    type() const  { return static_cast<SkSLType>(fType);  }
+    constexpr uint32_t    count() const { return static_cast<uint32_t>(fCount); }
 
 private:
     uint32_t    fType    : 6;
     uint32_t    fCount   : 26;
     const char* fName;
 
-    static_assert(kSLTypeCount <= (1 << 6));
+    static_assert(kSkSLTypeCount <= (1 << 6));
 };
 
-} // namespace skgpu
-
-#endif // skgpu_Uniform_DEFINED
+#endif // SkUniform_DEFINED
diff --git a/third_party/skia/src/core/SkUniformData.cpp b/third_party/skia/src/core/SkUniformData.cpp
new file mode 100644
index 0000000000000..83460e8090802
--- /dev/null
+++ b/third_party/skia/src/core/SkUniformData.cpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkUniformData.h"
+
+#include "src/core/SkOpts.h"
+
+sk_sp<SkUniformData> SkUniformData::Make(SkSpan<const SkUniform> uniforms, size_t dataSize) {
+    // TODO: the offsets and data should just be allocated right after UniformData in an arena
+    uint32_t* offsets = new uint32_t[uniforms.size()];
+    char* data = new char[dataSize];
+
+    return sk_sp<SkUniformData>(new SkUniformData(uniforms, offsets, data, dataSize));
+}
+
+bool SkUniformData::operator==(const SkUniformData& other) const {
+    if (this->uniforms().size() != other.uniforms().size() ||
+        this->dataSize() != other.dataSize()) {
+        return false;
+    }
+
+    return !memcmp(this->uniforms().data(), other.uniforms().data(),
+                   this->uniforms().size_bytes()) &&
+           !memcmp(this->data(), other.data(), this->dataSize()) &&
+           !memcmp(this->offsets(), other.offsets(), this->count()*sizeof(uint32_t));
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+void SkUniformBlock::add(sk_sp<SkUniformData> uniforms) {
+    fUniformData.push_back(std::move(uniforms));
+}
+
+size_t SkUniformBlock::totalSize() const {
+    size_t total = 0;
+
+    // TODO: It seems like we need to worry about alignment between the separate sets of uniforms
+    for (auto& u : fUniformData) {
+        total += u->dataSize();
+    }
+
+    return total;
+}
+
+int SkUniformBlock::count() const {
+    int total = 0;
+
+    for (auto& u : fUniformData) {
+        total += u->count();
+    }
+
+    return total;
+}
+
+bool SkUniformBlock::operator==(const SkUniformBlock& other) const {
+    if (fUniformData.size() != other.fUniformData.size()) {
+        return false;
+    }
+
+    for (size_t i = 0; i < fUniformData.size(); ++i) {
+        if (*fUniformData[i] != *other.fUniformData[i]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+size_t SkUniformBlock::hash() const {
+    int32_t hash = 0;
+
+    for (auto& u : fUniformData) {
+        hash = SkOpts::hash_fn(u->data(), u->dataSize(), hash);
+    }
+
+    return hash;
+}
diff --git a/third_party/skia/src/core/SkUniformData.h b/third_party/skia/src/core/SkUniformData.h
new file mode 100644
index 0000000000000..152bf9ed78072
--- /dev/null
+++ b/third_party/skia/src/core/SkUniformData.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkUniformData_DEFINED
+#define SkUniformData_DEFINED
+
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSpan.h"
+#include "src/core/SkUniform.h"
+#include <vector>
+
+/*
+ * TODO: Here is the plan of record for SkUniformData
+ *    allocate them (and their ancillary data (offsets & data)) in an arena - and rm SkRefCnt
+ *    remove the offsets - these should be recomputable as/if needed
+ *    allow a scratch buffer to be used to collect the uniform data when processing a PaintParams
+ *       - this can be reset for each draw and be copied into a cache if it needs to be preserved
+ *    if possible, clear out the cache (and delete the arena) once the DrawPass is created/the
+ *               uniforms are copied into a buffer
+ *       - this will mean we'll get w/in DrawPass reuse but not cross-DrawPass reuse
+ *       - we could also explore getting w/in a Recording (i.e. cross-DrawPass) and w/in a
+ *               Recorder reuse (i.e., cross-Recordings, but single-threaded)
+ *    have the SkUniformData's data layout match what is required by the DrawList so we can just
+ *               copy it into the buffer
+ */
+
+class SkUniformData : public SkRefCnt {
+public:
+
+    // TODO: should we require a name (e.g., "gradient_uniforms") for each uniform block so
+    // we can better name the Metal FS uniform struct?
+    static sk_sp<SkUniformData> Make(SkSpan<const SkUniform>, size_t dataSize);
+
+    ~SkUniformData() override {
+        // TODO: fOffsets and fData should just be allocated right after UniformData in an arena
+        delete [] fOffsets;
+        delete [] fData;
+    }
+
+    int count() const { return static_cast<unsigned int>(fUniforms.size()); }
+    SkSpan<const SkUniform> uniforms() const { return fUniforms; }
+    uint32_t* offsets() { return fOffsets; }
+    const uint32_t* offsets() const { return fOffsets; }
+    uint32_t offset(int index) {
+        SkASSERT(index >= 0 && static_cast<size_t>(index) < fUniforms.size());
+        return fOffsets[index];
+    }
+    char* data() { return fData; }
+    const char* data() const { return fData; }
+    size_t dataSize() const { return fDataSize; }
+
+    bool operator==(const SkUniformData&) const;
+    bool operator!=(const SkUniformData& other) const { return !(*this == other);  }
+
+private:
+    SkUniformData(SkSpan<const SkUniform> uniforms,
+                  uint32_t* offsets,
+                  char* data,
+                  size_t dataSize)
+            : fUniforms(uniforms)
+            , fOffsets(offsets)
+            , fData(data)
+            , fDataSize(dataSize) {
+    }
+
+    SkSpan<const SkUniform> fUniforms;
+    uint32_t* fOffsets; // offset of each uniform in 'fData'
+    char* fData;
+    const size_t fDataSize;
+};
+
+class SkUniformBlock {
+public:
+    SkUniformBlock() = default;
+    SkUniformBlock(sk_sp<SkUniformData> initial) {
+        fUniformData.push_back(std::move(initial));
+    }
+
+    void add(sk_sp<SkUniformData>);
+
+    bool empty() const { return fUniformData.empty(); }
+    size_t totalSize() const;  // TODO: cache this?
+    int count() const;         // TODO: cache this?
+
+    bool operator==(const SkUniformBlock&) const;
+    bool operator!=(const SkUniformBlock& other) const { return !(*this == other);  }
+    size_t hash() const;
+
+    using container = std::vector<sk_sp<SkUniformData>>;
+    using iterator = container::iterator;
+    using const_iterator = container::const_iterator;
+
+    inline iterator begin() noexcept { return fUniformData.begin(); }
+    inline const_iterator cbegin() const noexcept { return fUniformData.cbegin(); }
+    inline iterator end() noexcept { return fUniformData.end(); }
+    inline const_iterator cend() const noexcept { return fUniformData.cend(); }
+
+private:
+    // TODO: SkUniformData should be held uniquely
+    std::vector<sk_sp<SkUniformData>> fUniformData;
+};
+
+#endif // SkUniformData_DEFINED
diff --git a/third_party/skia/src/core/SkVM.cpp b/third_party/skia/src/core/SkVM.cpp
index efe4df65a16e8..75b1e2e21511d 100644
--- a/third_party/skia/src/core/SkVM.cpp
+++ b/third_party/skia/src/core/SkVM.cpp
@@ -17,6 +17,7 @@
 #include "src/core/SkOpts.h"
 #include "src/core/SkStreamPriv.h"
 #include "src/core/SkVM.h"
+#include "src/utils/SkVMVisualizer.h"
 #include <algorithm>
 #include <atomic>
 #include <queue>
@@ -36,6 +37,10 @@
     #endif
 #endif
 
+#if !defined(SK_BUILD_FOR_WIN)
+#include <unistd.h>
+#endif
+
 // #define SKVM_LLVM_WAIT_FOR_COMPILATION
 
 bool gSkVMAllowJIT{false};
@@ -150,9 +155,10 @@ namespace skvm {
         return { fma, fp16 };
     }
 
-    Builder::Builder()                  : fFeatures(detect_features()) {}
-    Builder::Builder(Features features) : fFeatures(features         ) {}
-
+    Builder::Builder(bool createDuplicates)
+        : fFeatures(detect_features()), fCreateDuplicates(createDuplicates) {}
+    Builder::Builder(Features features, bool createDuplicates)
+        : fFeatures(features         ), fCreateDuplicates(createDuplicates) {}
 
     struct Program::Impl {
         std::vector<InterpreterInstruction> instructions;
@@ -160,6 +166,7 @@ namespace skvm {
         int loop = 0;
         std::vector<int> strides;
         std::vector<TraceHook*> traceHooks;
+        std::unique_ptr<viz::Visualizer> visualizer;
 
         std::atomic<void*> jit_entry{nullptr};   // TODO: minimal std::memory_orders
         size_t jit_size = 0;
@@ -270,6 +277,7 @@ namespace skvm {
                                                                   VarSlot{immB}, "=", V{z}); break;
             case Op::trace_enter: write(o, op, TraceHookID{immA}, V{x}, V{y}, FnIdx{immB}); break;
             case Op::trace_exit:  write(o, op, TraceHookID{immA}, V{x}, V{y}, FnIdx{immB}); break;
+            case Op::trace_scope: write(o, op, TraceHookID{immA}, V{x}, V{y}, Shift{immB}); break;
 
             case Op::store8:   write(o, op, Ptr{immA}, V{x}               ); break;
             case Op::store16:  write(o, op, Ptr{immA}, V{x}               ); break;
@@ -339,6 +347,8 @@ namespace skvm {
             case Op::from_fp16: write(o, V{id}, "=", op, V{x}); break;
             case Op::trunc:     write(o, V{id}, "=", op, V{x}); break;
             case Op::round:     write(o, V{id}, "=", op, V{x}); break;
+
+            case Op::duplicate: write(o, V{id}, "=", op, Hex{immA}); break;
         }
 
         write(o, "\n");
@@ -360,6 +370,13 @@ namespace skvm {
         }
     }
 
+    void Program::visualize(SkWStream* output, const char* code) const {
+        if (fImpl->visualizer) {
+            fImpl->visualizer->dump(output, code);
+        }
+    }
+
+    viz::Visualizer* Program::visualizer() { return fImpl->visualizer.get(); }
     void Program::dump(SkWStream* o) const {
         SkDebugfStream debug;
         if (!o) { o = &debug; }
@@ -394,6 +411,8 @@ namespace skvm {
                                                    R{x}, R{y}, FnIdx{immB}); break;
                 case Op::trace_exit:  write(o, op, TraceHookID{immA},
                                                    R{x}, R{y}, FnIdx{immB}); break;
+                case Op::trace_scope: write(o, op, TraceHookID{immA},
+                                                   R{x}, R{y}, Shift{immB}); break;
 
                 case Op::store8:   write(o, op, Ptr{immA}, R{x}                  ); break;
                 case Op::store16:  write(o, op, Ptr{immA}, R{x}                  ); break;
@@ -461,12 +480,14 @@ namespace skvm {
                 case Op::from_fp16: write(o, R{d}, "=", op, R{x}); break;
                 case Op::trunc:     write(o, R{d}, "=", op, R{x}); break;
                 case Op::round:     write(o, R{d}, "=", op, R{x}); break;
+
+                case Op::duplicate: write(o, R{d}, "=", op, Hex{immA}); break;
             }
             write(o, "\n");
         }
     }
-
-    std::vector<Instruction> eliminate_dead_code(std::vector<Instruction> program) {
+    std::vector<Instruction> eliminate_dead_code(std::vector<Instruction> program,
+                                                 viz::Visualizer* visualizer) {
         // Determine which Instructions are live by working back from side effects.
         std::vector<bool> live(program.size(), false);
         for (Val id = program.size(); id--;) {
@@ -496,6 +517,11 @@ namespace skvm {
             }
         }
 
+        if (visualizer) {
+            visualizer->addInstructions(program);
+            visualizer->markAsDeadCode(live, new_id);
+        }
+
         // Eliminate any non-live ops.
         auto it = std::remove_if(program.begin(), program.end(), [&](const Instruction& inst) {
             Val id = (Val)(&inst - program.data());
@@ -506,7 +532,8 @@ namespace skvm {
         return program;
     }
 
-    std::vector<OptimizedInstruction> finalize(const std::vector<Instruction> program) {
+    std::vector<OptimizedInstruction> finalize(const std::vector<Instruction> program,
+                                               viz::Visualizer* visualizer) {
         std::vector<OptimizedInstruction> optimized(program.size());
         for (Val id = 0; id < (Val)program.size(); id++) {
             Instruction inst = program[id];
@@ -550,23 +577,38 @@ namespace skvm {
             }
         }
 
+        if (visualizer) {
+            visualizer->finalize(program, optimized);
+        }
+
         return optimized;
     }
 
-    std::vector<OptimizedInstruction> Builder::optimize() const {
+    std::vector<OptimizedInstruction> Builder::optimize(viz::Visualizer* visualizer) const {
         std::vector<Instruction> program = this->program();
-        program = eliminate_dead_code(std::move(program));
-        return    finalize           (std::move(program));
+        program = eliminate_dead_code(std::move(program), visualizer);
+        return    finalize           (std::move(program), visualizer);
     }
 
-    Program Builder::done(const char* debug_name, bool allow_jit) const {
+    Program Builder::done(const char* debug_name,
+                          bool allow_jit) const {
+        return this->done(debug_name, allow_jit, /*visualizer=*/nullptr);
+    }
+
+    Program Builder::done(const char* debug_name,
+                          bool allow_jit,
+                          std::unique_ptr<viz::Visualizer> visualizer) const {
         char buf[64] = "skvm-jit-";
         if (!debug_name) {
             *SkStrAppendU32(buf+9, this->hash()) = '\0';
             debug_name = buf;
         }
 
-        return {this->optimize(), fStrides, fTraceHooks, debug_name, allow_jit};
+        auto optimized = this->optimize(visualizer ? visualizer.get() : nullptr);
+        return {optimized,
+                std::move(visualizer),
+                fStrides,
+                fTraceHooks, debug_name, allow_jit};
     }
 
     uint64_t Builder::hash() const {
@@ -604,9 +646,15 @@ namespace skvm {
         // and index is varying but doesn't touch memory, so it's fine to dedup too.
         if (!touches_varying_memory(inst.op) && !is_trace(inst.op)) {
             if (Val* id = fIndex.find(inst)) {
+                if (fCreateDuplicates) {
+                    inst.op = Op::duplicate;
+                    inst.immA = *id;
+                    fProgram.push_back(inst);
+                }
                 return *id;
             }
         }
+
         Val id = static_cast<Val>(fProgram.size());
         fProgram.push_back(inst);
         fIndex.set(inst, id);
@@ -633,42 +681,44 @@ namespace skvm {
         return traceHookID;
     }
 
+    bool Builder::mergeMasks(I32& mask, I32& traceMask) {
+        if (this->isImm(mask.id,      0)) { return false; }
+        if (this->isImm(traceMask.id, 0)) { return false; }
+        if (this->isImm(mask.id,     ~0)) { mask = traceMask; }
+        if (this->isImm(traceMask.id,~0)) { traceMask = mask; }
+        return true;
+    }
+
     void Builder::trace_line(int traceHookID, I32 mask, I32 traceMask, int line) {
         SkASSERT(traceHookID >= 0);
         SkASSERT(traceHookID < (int)fTraceHooks.size());
-        if (this->isImm(mask.id,      0)) { return; }
-        if (this->isImm(traceMask.id, 0)) { return; }
-        if (this->isImm(mask.id,     ~0)) { mask = traceMask; }
-        if (this->isImm(traceMask.id,~0)) { traceMask = mask; }
+        if (!this->mergeMasks(mask, traceMask)) { return; }
         (void)push(Op::trace_line, mask.id,traceMask.id,NA,NA, traceHookID, line);
     }
     void Builder::trace_var(int traceHookID, I32 mask, I32 traceMask, int slot, I32 val) {
         SkASSERT(traceHookID >= 0);
         SkASSERT(traceHookID < (int)fTraceHooks.size());
-        if (this->isImm(mask.id,      0)) { return; }
-        if (this->isImm(traceMask.id, 0)) { return; }
-        if (this->isImm(mask.id,     ~0)) { mask = traceMask; }
-        if (this->isImm(traceMask.id,~0)) { traceMask = mask; }
+        if (!this->mergeMasks(mask, traceMask)) { return; }
         (void)push(Op::trace_var, mask.id,traceMask.id,val.id,NA, traceHookID, slot);
     }
     void Builder::trace_enter(int traceHookID, I32 mask, I32 traceMask, int fnIdx) {
         SkASSERT(traceHookID >= 0);
         SkASSERT(traceHookID < (int)fTraceHooks.size());
-        if (this->isImm(mask.id,      0)) { return; }
-        if (this->isImm(traceMask.id, 0)) { return; }
-        if (this->isImm(mask.id,     ~0)) { mask = traceMask; }
-        if (this->isImm(traceMask.id,~0)) { traceMask = mask; }
+        if (!this->mergeMasks(mask, traceMask)) { return; }
         (void)push(Op::trace_enter, mask.id,traceMask.id,NA,NA, traceHookID, fnIdx);
     }
     void Builder::trace_exit(int traceHookID, I32 mask, I32 traceMask, int fnIdx) {
         SkASSERT(traceHookID >= 0);
         SkASSERT(traceHookID < (int)fTraceHooks.size());
-        if (this->isImm(mask.id,      0)) { return; }
-        if (this->isImm(traceMask.id, 0)) { return; }
-        if (this->isImm(mask.id,     ~0)) { mask = traceMask; }
-        if (this->isImm(traceMask.id,~0)) { traceMask = mask; }
+        if (!this->mergeMasks(mask, traceMask)) { return; }
         (void)push(Op::trace_exit, mask.id,traceMask.id,NA,NA, traceHookID, fnIdx);
     }
+    void Builder::trace_scope(int traceHookID, I32 mask, I32 traceMask, int delta) {
+        SkASSERT(traceHookID >= 0);
+        SkASSERT(traceHookID < (int)fTraceHooks.size());
+        if (!this->mergeMasks(mask, traceMask)) { return; }
+        (void)push(Op::trace_scope, mask.id,traceMask.id,NA,NA, traceHookID, delta);
+    }
 
     void Builder::store8 (Ptr ptr, I32 val) { (void)push(Op::store8 , val.id,NA,NA,NA, ptr.ix); }
     void Builder::store16(Ptr ptr, I32 val) { (void)push(Op::store16, val.id,NA,NA,NA, ptr.ix); }
@@ -797,18 +847,28 @@ namespace skvm {
     }
 
     F32 Builder::approx_pow2(F32 x) {
+        constexpr float kInfinityBits = 0x7f800000;
+
         F32 f = fract(x);
         F32 approx = add(x,         121.274057500f);
             approx = sub(approx, mul( 1.490129070f, f));
             approx = add(approx, div(27.728023300f, sub(4.84252568f, f)));
+            approx = mul(1.0f * (1<<23), approx);
+            approx = clamp(approx, 0, kInfinityBits);  // guard against underflow/overflow
 
-        return pun_to_F32(round(mul(1.0f * (1<<23), approx)));
+        return pun_to_F32(round(approx));
     }
 
     F32 Builder::approx_powf(F32 x, F32 y) {
         // TODO: assert this instead?  Sometimes x is very slightly negative.  See skia:10210.
         x = max(0.0f, x);
 
+        if (this->isImm(x.id, 1.0f)) { return x; }                    // 1^y is one
+        if (this->isImm(x.id, 2.0f)) { return this->approx_pow2(y); } // 2^y is pow2(y)
+        if (this->isImm(y.id, 0.5f)) { return this->sqrt(x); }        // x^0.5 is sqrt(x)
+        if (this->isImm(y.id, 1.0f)) { return x; }                    // x^1 is x
+        if (this->isImm(y.id, 2.0f)) { return x * x; }                // x^2 is x*x
+
         auto is_x = bit_or(eq(x, 0.0f),
                            eq(x, 1.0f));
         return select(is_x, x, approx_pow2(mul(approx_log2(x), y)));
@@ -1143,8 +1203,9 @@ namespace skvm {
             case kA16_float_SkColorType:    return {FLOAT,  0, 0,0,16, 0, 0,0,0};
             case kR16G16_float_SkColorType: return {FLOAT, 16,16,0, 0, 0,16,0,0};
 
-            case kAlpha_8_SkColorType: return {UNORM, 0,0,0,8, 0,0,0,0};
-            case kGray_8_SkColorType:  return {UNORM, 8,8,8,0, 0,0,0,0};  // Subtle.
+            case kAlpha_8_SkColorType:  return {UNORM, 0,0,0,8, 0,0,0,0};
+            case kGray_8_SkColorType:   return {UNORM, 8,8,8,0, 0,0,0,0};  // Subtle.
+            case kR8_unorm_SkColorType: return {UNORM, 8,0,0,0, 0,0,0,0};
 
             case kRGB_565_SkColorType:   return {UNORM, 5,6,5,0, 11,5,0,0};  // (BGR)
             case kARGB_4444_SkColorType: return {UNORM, 4,4,4,4, 12,8,4,0};  // (ABGR)
@@ -2657,6 +2718,7 @@ namespace skvm {
                 case Op::trace_var:
                 case Op::trace_enter:
                 case Op::trace_exit:
+                case Op::trace_scope:
                     /* Force this program to run in the interpreter. */
                     return false;
 
@@ -3058,9 +3120,11 @@ namespace skvm {
     }
 
     Program::Program(const std::vector<OptimizedInstruction>& instructions,
+                     std::unique_ptr<viz::Visualizer> visualizer,
                      const std::vector<int>& strides,
                      const std::vector<TraceHook*>& traceHooks,
                      const char* debug_name, bool allow_jit) : Program() {
+        fImpl->visualizer = std::move(visualizer);
         fImpl->strides = strides;
         fImpl->traceHooks = traceHooks;
         if (gSkVMAllowJIT && allow_jit) {
@@ -3595,6 +3659,7 @@ namespace skvm {
                 case Op::trace_var:
                 case Op::trace_enter:
                 case Op::trace_exit:
+                case Op::trace_scope:
                     /* Force this program to run in the interpreter. */
                     return false;
 
@@ -3952,6 +4017,8 @@ namespace skvm {
                     a->vcvtph2ps(dst(), dst());        // f16 xmm -> f32 ymm
                     break;
 
+                case Op::duplicate: break;
+
             #elif defined(__aarch64__)
                 case Op::assert_true: {
                     a->uminv4s(dst(), r(x));   // uminv acts like an all() across the vector.
@@ -3966,6 +4033,7 @@ namespace skvm {
                 case Op::trace_var:
                 case Op::trace_enter:
                 case Op::trace_exit:
+                case Op::trace_scope:
                     /* Force this program to run in the interpreter. */
                     return false;
 
@@ -4212,6 +4280,8 @@ namespace skvm {
                     a->xtns2h(dst(x), r(x));     // pack even 16-bit lanes into bottom four lanes
                     a->fcvtl (dst(), dst());     // 4x f16 -> 4x f32
                     break;
+
+                case Op::duplicate: break;
             #endif
             }
 
@@ -4244,9 +4314,17 @@ namespace skvm {
 
         enter();
         for (Val id = 0; id < (Val)instructions.size(); id++) {
+            if (fImpl->visualizer && is_trace(instructions[id].op)) {
+                // Make sure trace commands stay on JIT for visualizer
+                continue;
+            }
+            auto start = a->size();
             if (instructions[id].can_hoist && !emit(id, /*scalar=*/false)) {
                 return false;
             }
+            if (fImpl->visualizer && instructions[id].can_hoist) {
+                fImpl->visualizer->addMachineCommands(id, start, a->size());
+            }
         }
 
         // This point marks a kind of canonical fixed point for register contents: if loop
@@ -4272,9 +4350,17 @@ namespace skvm {
             a->cmp(N, K);
             jump_if_less(&tail);
             for (Val id = 0; id < (Val)instructions.size(); id++) {
+                if (fImpl->visualizer != nullptr && is_trace(instructions[id].op)) {
+                    // Make sure trace commands stay on JIT for visualizer
+                    continue;
+                }
+                auto start = a->size();
                 if (!instructions[id].can_hoist && !emit(id, /*scalar=*/false)) {
                     return false;
                 }
+                if (fImpl->visualizer && !instructions[id].can_hoist) {
+                    fImpl->visualizer->addMachineCommands(id, start, a->size());
+                }
             }
             restore_incoming_regs();
             for (int i = 0; i < (int)fImpl->strides.size(); i++) {
@@ -4291,6 +4377,10 @@ namespace skvm {
             a->cmp(N, 1);
             jump_if_less(&done);
             for (Val id = 0; id < (Val)instructions.size(); id++) {
+                if (fImpl->visualizer && is_trace(instructions[id].op)) {
+                    // Make sure trace commands stay on JIT for visualizer
+                    continue;
+                }
                 if (!instructions[id].can_hoist && !emit(id, /*scalar=*/true)) {
                     return false;
                 }
diff --git a/third_party/skia/src/core/SkVM.h b/third_party/skia/src/core/SkVM.h
index 9b3c0bf67549b..166a0573a33bc 100644
--- a/third_party/skia/src/core/SkVM.h
+++ b/third_party/skia/src/core/SkVM.h
@@ -42,6 +42,10 @@ class SkWStream;
 
 namespace skvm {
 
+    namespace viz {
+        class Visualizer;
+    }
+
     class Assembler {
     public:
         explicit Assembler(void* buf);
@@ -434,7 +438,8 @@ namespace skvm {
     // Order matters a little: Ops <=store128 are treated as having side effects.
     #define SKVM_OPS(M)                                              \
         M(assert_true)                                               \
-        M(trace_line) M(trace_var) M(trace_enter) M(trace_exit)      \
+        M(trace_line) M(trace_var)                                   \
+        M(trace_enter) M(trace_exit) M(trace_scope)                  \
         M(store8)   M(store16)   M(store32) M(store64) M(store128)   \
         M(load8)    M(load16)    M(load32)  M(load64) M(load128)     \
         M(index)                                                     \
@@ -455,7 +460,8 @@ namespace skvm {
         M(neq_f32) M(eq_f32) M(eq_i32)                               \
         M(gte_f32) M(gt_f32) M(gt_i32)                               \
         M(bit_and)     M(bit_or)     M(bit_xor)     M(bit_clear)     \
-        M(select)
+        M(select)                                                    \
+        M(duplicate)
     // End of SKVM_OPS
 
     enum class Op : int {
@@ -474,7 +480,7 @@ namespace skvm {
         return Op::store8 <= op && op <= Op::index;
     }
     static inline bool is_trace(Op op) {
-        return Op::trace_line <= op && op <= Op::trace_exit;
+        return Op::trace_line <= op && op <= Op::trace_scope;
     }
 
     using Val = int;
@@ -486,15 +492,8 @@ namespace skvm {
     // varyings and uniforms. Varyings use Ptr, have a stride associated with them, and are
     // evaluated everytime through the loop. Uniforms use UPtr, don't have a stride, and are
     // usually hoisted above the loop.
-    struct Ptr {
-        Ptr() = default;
-        Ptr(int ix_) : ix(ix_) {}
-        int ix;
-    };
-    struct UPtr : public Ptr {
-        UPtr() = default;
-        UPtr(int ix_) : Ptr(ix_) {}
-    };
+    struct Ptr { int ix; };
+    struct UPtr : public Ptr {};
 
     bool operator!=(Ptr a, Ptr b);
 
@@ -611,19 +610,23 @@ namespace skvm {
         virtual void var(int slot, int32_t val) = 0;
         virtual void enter(int fnIdx) = 0;
         virtual void exit(int fnIdx) = 0;
+        virtual void scope(int delta) = 0;
     };
 
     class Builder {
     public:
+        Builder(bool createDuplicates = false);
+        Builder(Features, bool createDuplicates = false);
 
-        Builder();
-        explicit Builder(Features);
-
-        Program done(const char* debug_name = nullptr, bool allow_jit=true) const;
+        Program done(const char* debug_name,
+                     bool allow_jit,
+                     std::unique_ptr<viz::Visualizer> visualizer) const;
+        Program done(const char* debug_name = nullptr,
+                     bool allow_jit=true) const;
 
         // Mostly for debugging, tests, etc.
         std::vector<Instruction> program() const { return fProgram; }
-        std::vector<OptimizedInstruction> optimize() const;
+        std::vector<OptimizedInstruction> optimize(viz::Visualizer* visualizer = nullptr) const;
 
         // Returns a trace-hook ID which must be passed to the trace opcodes.
         int attachTraceHook(TraceHook*);
@@ -632,7 +635,7 @@ namespace skvm {
         template <typename T>
         Ptr varying() { return this->arg(sizeof(T)); }
         Ptr varying(int stride) { SkASSERT(stride > 0); return this->arg(stride); }
-        UPtr uniform() { Ptr p = this->arg(0); return UPtr{p.ix}; }
+        UPtr uniform() { Ptr p = this->arg(0); return UPtr{{p.ix}}; }
 
         // TODO: allow uniform (i.e. Ptr) offsets to store* and load*?
         // TODO: sign extension (signed types) for <32-bit loads?
@@ -644,10 +647,12 @@ namespace skvm {
         void assert_true(I32 cond)            { assert_true(cond, cond); }
 
         // Insert debug traces into the instruction stream
+        bool mergeMasks(I32& mask, I32& traceMask);
         void trace_line (int traceHookID, I32 mask, I32 traceMask, int line);
         void trace_var  (int traceHookID, I32 mask, I32 traceMask, int slot, I32 val);
         void trace_enter(int traceHookID, I32 mask, I32 traceMask, int fnIdx);
         void trace_exit (int traceHookID, I32 mask, I32 traceMask, int fnIdx);
+        void trace_scope(int traceHookID, I32 mask, I32 traceMask, int delta);
 
         // Store {8,16,32,64,128}-bit varying.
         void store8  (Ptr ptr, I32 val);
@@ -1007,12 +1012,15 @@ namespace skvm {
         std::vector<TraceHook*>                       fTraceHooks;
         std::vector<int>                              fStrides;
         const Features                                fFeatures;
+        bool                                          fCreateDuplicates;
     };
 
     // Optimization passes and data structures normally used by Builder::optimize(),
     // extracted here so they can be unit tested.
-    std::vector<Instruction>          eliminate_dead_code(std::vector<Instruction>);
-    std::vector<OptimizedInstruction> finalize           (std::vector<Instruction>);
+    std::vector<Instruction> eliminate_dead_code(std::vector<Instruction>,
+                                                 viz::Visualizer* visualizer = nullptr);
+    std::vector<OptimizedInstruction> finalize(std::vector<Instruction>,
+                                               viz::Visualizer* visualizer = nullptr);
 
     using Reg = int;
 
@@ -1026,6 +1034,7 @@ namespace skvm {
     class Program {
     public:
         Program(const std::vector<OptimizedInstruction>& instructions,
+                std::unique_ptr<viz::Visualizer> visualizer,
                 const std::vector<int>& strides,
                 const std::vector<TraceHook*>& traceHooks,
                 const char* debug_name, bool allow_jit);
@@ -1058,8 +1067,10 @@ namespace skvm {
         bool hasJIT() const;         // Has this Program been JITted?
         bool hasTraceHooks() const;  // Is this program instrumented for debugging?
 
+        void visualize(SkWStream* output, const char* code) const;
         void dump(SkWStream* = nullptr) const;
         void disassemble(SkWStream* = nullptr) const;
+        viz::Visualizer* visualizer();
 
     private:
         void setupInterpreter(const std::vector<OptimizedInstruction>&);
diff --git a/third_party/skia/src/core/SkVMBlitter.cpp b/third_party/skia/src/core/SkVMBlitter.cpp
index e726f1c8c0401..5b7b31ebc18ca 100644
--- a/third_party/skia/src/core/SkVMBlitter.cpp
+++ b/third_party/skia/src/core/SkVMBlitter.cpp
@@ -109,17 +109,26 @@ namespace {
 
             float rate = 0.0f;
             switch (dst.colorType()) {
-                case kARGB_4444_SkColorType:    rate =   1/15.0f; break;
-                case   kRGB_565_SkColorType:    rate =   1/63.0f; break;
-                case    kGray_8_SkColorType:
-                case  kRGB_888x_SkColorType:
+                case kARGB_4444_SkColorType:
+                    rate = 1 / 15.0f;
+                    break;
+                case kRGB_565_SkColorType:
+                    rate = 1 / 63.0f;
+                    break;
+                case kGray_8_SkColorType:
+                case kRGB_888x_SkColorType:
                 case kRGBA_8888_SkColorType:
                 case kBGRA_8888_SkColorType:
-                case kSRGBA_8888_SkColorType:   rate =  1/255.0f; break;
+                case kSRGBA_8888_SkColorType:
+                case kR8_unorm_SkColorType:
+                    rate = 1 / 255.0f;
+                    break;
                 case kRGB_101010x_SkColorType:
                 case kRGBA_1010102_SkColorType:
                 case kBGR_101010x_SkColorType:
-                case kBGRA_1010102_SkColorType: rate = 1/1023.0f; break;
+                case kBGRA_1010102_SkColorType:
+                    rate = 1 / 1023.0f;
+                    break;
 
                 case kUnknown_SkColorType:
                 case kAlpha_8_SkColorType:
@@ -131,7 +140,8 @@ namespace {
                 case kA16_unorm_SkColorType:
                 case kR16G16_float_SkColorType:
                 case kR16G16_unorm_SkColorType:
-                case kR16G16B16A16_unorm_SkColorType: return c;
+                case kR16G16B16A16_unorm_SkColorType:
+                    return c;
             }
 
             // See SkRasterPipeline dither stage.
@@ -366,6 +376,9 @@ void SkVMBlitter::BuildProgram(skvm::Builder* p, const Params& params,
             cov.a = select(src.a < dst.a, min(cov.r, min(cov.g, cov.b)),
                            max(cov.r, max(cov.g, cov.b)));
         } break;
+
+        case Coverage::kCount:
+            SkUNREACHABLE;
     }
     if (params.clip) {
         skvm::Color clip = as_SB(params.clip)->program(p, device, /*local=*/device, paint,
@@ -535,24 +548,24 @@ SkVMBlitter::SkVMBlitter(const SkPixmap& device,
         : fDevice(device)
         , fSprite(sprite ? *sprite : SkPixmap{})
         , fSpriteOffset(spriteOffset)
-        , fUniforms(skvm::UPtr{0}, kBlitterUniformsCount)
+        , fUniforms(skvm::UPtr{{0}}, kBlitterUniformsCount)
         , fParams(EffectiveParams(device, sprite, paint, matrices, std::move(clip)))
         , fKey(CacheKey(fParams, &fUniforms, &fAlloc, ok)) {}
 
 SkVMBlitter::~SkVMBlitter() {
-    if (SkLRUCache<Key, skvm::Program>* cache = TryAcquireProgramCache()) {
-        auto cache_program = [&](skvm::Program&& program, Coverage coverage) {
-            if (!program.empty() && !program.hasTraceHooks()) {
-                cache->insert_or_update(fKey.withCoverage(coverage), std::move(program));
+    if (fStoreToCache) {
+        if (SkLRUCache<Key, skvm::Program>* cache = TryAcquireProgramCache()) {
+            auto cache_program = [&](SkTLazy<skvm::Program>& program, Coverage coverage) {
+                if (program.isValid() && !program->hasTraceHooks()) {
+                    cache->insert_or_update(fKey.withCoverage(coverage), std::move(*program));
+                }
+            };
+            for (int c = 0; c < Coverage::kCount; c++) {
+                cache_program(fPrograms[c], static_cast<Coverage>(c));
             }
-        };
-        cache_program(std::move(fBlitH),         Coverage::Full);
-        cache_program(std::move(fBlitAntiH),     Coverage::UniformF);
-        cache_program(std::move(fBlitMaskA8),    Coverage::MaskA8);
-        cache_program(std::move(fBlitMask3D),    Coverage::Mask3D);
-        cache_program(std::move(fBlitMaskLCD16), Coverage::MaskLCD16);
 
-        ReleaseProgramCache();
+            ReleaseProgramCache();
+        }
     }
 }
 
@@ -582,20 +595,30 @@ SkString SkVMBlitter::DebugName(const Key& key) {
 
 void SkVMBlitter::ReleaseProgramCache() {}
 
-skvm::Program SkVMBlitter::buildProgram(Coverage coverage) {
+skvm::Program* SkVMBlitter::buildProgram(Coverage coverage) {
+    // eg, blitter re-use...
+    if (fProgramPtrs[coverage]) {
+        return fProgramPtrs[coverage];
+    }
+
+    // Next, cache lookup...
     Key key = fKey.withCoverage(coverage);
     {
-        skvm::Program p;
+        skvm::Program* p = nullptr;
         if (SkLRUCache<Key, skvm::Program>* cache = TryAcquireProgramCache()) {
-            if (skvm::Program* found = cache->find(key)) {
-                p = std::move(*found);
-            }
+            p = cache->find(key);
             ReleaseProgramCache();
         }
-        if (!p.empty()) {
+        if (p) {
+            SkASSERT(!p->empty());
+            fProgramPtrs[coverage] = p;
             return p;
         }
     }
+
+    // Okay, let's build it...
+    fStoreToCache = true;
+
     // We don't really _need_ to rebuild fUniforms here.
     // It's just more natural to have effects unconditionally emit them,
     // and more natural to rebuild fUniforms than to emit them into a temporary buffer.
@@ -608,7 +631,7 @@ skvm::Program SkVMBlitter::buildProgram(Coverage coverage) {
               "%zu, prev was %zu", fUniforms.buf.size(), prev);
 
     skvm::Program program = builder.done(DebugName(key).c_str());
-    if (false) {
+    if ((false)) {
         static std::atomic<int> missed{0},
                                 total{0};
         if (!program.hasJIT()) {
@@ -623,7 +646,8 @@ skvm::Program SkVMBlitter::buildProgram(Coverage coverage) {
                                 total.load(), missed.load()); });
         }
     }
-    return program;
+    fProgramPtrs[coverage] = fPrograms[coverage].set(std::move(program));
+    return fProgramPtrs[coverage];
 }
 
 void SkVMBlitter::updateUniforms(int right, int y) {
@@ -640,24 +664,19 @@ const void* SkVMBlitter::isSprite(int x, int y) const {
 }
 
 void SkVMBlitter::blitH(int x, int y, int w) {
-    if (fBlitH.empty()) {
-        fBlitH = this->buildProgram(Coverage::Full);
-    }
+    skvm::Program* blit_h = this->buildProgram(Coverage::Full);
     this->updateUniforms(x+w, y);
     if (const void* sprite = this->isSprite(x,y)) {
-        fBlitH.eval(w, fUniforms.buf.data(), fDevice.addr(x,y), sprite);
+        blit_h->eval(w, fUniforms.buf.data(), fDevice.addr(x,y), sprite);
     } else {
-        fBlitH.eval(w, fUniforms.buf.data(), fDevice.addr(x,y));
+        blit_h->eval(w, fUniforms.buf.data(), fDevice.addr(x,y));
     }
 }
 
 void SkVMBlitter::blitAntiH(int x, int y, const SkAlpha cov[], const int16_t runs[]) {
-    if (fBlitAntiH.empty()) {
-        fBlitAntiH = this->buildProgram(Coverage::UniformF);
-    }
-    if (fBlitH.empty()) {
-        fBlitH = this->buildProgram(Coverage::Full);
-    }
+    skvm::Program* blit_anti_h = this->buildProgram(Coverage::UniformF);
+    skvm::Program* blit_h = this->buildProgram(Coverage::Full);
+
     for (int16_t run = *runs; run > 0; run = *runs) {
         const SkAlpha coverage = *cov;
         if (coverage != 0x00) {
@@ -665,16 +684,16 @@ void SkVMBlitter::blitAntiH(int x, int y, const SkAlpha cov[], const int16_t run
             const void* sprite = this->isSprite(x,y);
             if (coverage == 0xFF) {
                 if (sprite) {
-                    fBlitH.eval(run, fUniforms.buf.data(), fDevice.addr(x,y), sprite);
+                    blit_h->eval(run, fUniforms.buf.data(), fDevice.addr(x,y), sprite);
                 } else {
-                    fBlitH.eval(run, fUniforms.buf.data(), fDevice.addr(x,y));
+                    blit_h->eval(run, fUniforms.buf.data(), fDevice.addr(x,y));
                 }
             } else {
                 const float covF = *cov * (1/255.0f);
                 if (sprite) {
-                    fBlitAntiH.eval(run, fUniforms.buf.data(), fDevice.addr(x,y), sprite, &covF);
+                    blit_anti_h->eval(run, fUniforms.buf.data(), fDevice.addr(x,y), sprite, &covF);
                 } else {
-                    fBlitAntiH.eval(run, fUniforms.buf.data(), fDevice.addr(x,y), &covF);
+                    blit_anti_h->eval(run, fUniforms.buf.data(), fDevice.addr(x,y), &covF);
                 }
             }
         }
@@ -694,24 +713,15 @@ void SkVMBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
         default: SkUNREACHABLE;     // ARGB and SDF masks shouldn't make it here.
 
         case SkMask::k3D_Format:
-            if (fBlitMask3D.empty()) {
-                fBlitMask3D = this->buildProgram(Coverage::Mask3D);
-            }
-            program = &fBlitMask3D;
+            program = this->buildProgram(Coverage::Mask3D);
             break;
 
         case SkMask::kA8_Format:
-            if (fBlitMaskA8.empty()) {
-                fBlitMaskA8 = this->buildProgram(Coverage::MaskA8);
-            }
-            program = &fBlitMaskA8;
+            program = this->buildProgram(Coverage::MaskA8);
             break;
 
         case SkMask::kLCD16_Format:
-            if (fBlitMaskLCD16.empty()) {
-                fBlitMaskLCD16 = this->buildProgram(Coverage::MaskLCD16);
-            }
-            program = &fBlitMaskLCD16;
+            program = this->buildProgram(Coverage::MaskLCD16);
             break;
     }
 
@@ -724,7 +734,7 @@ void SkVMBlitter::blitMask(const SkMask& mask, const SkIRect& clip) {
             auto  mptr = (const uint8_t*)mask.getAddr(x,y);
             this->updateUniforms(x+w,y);
 
-            if (program == &fBlitMask3D) {
+            if (mask.fFormat == SkMask::k3D_Format) {
                 size_t plane = mask.computeImageSize();
                 if (const void* sprite = this->isSprite(x,y)) {
                     program->eval(w, fUniforms.buf.data(), dptr, sprite, mptr + 1*plane
diff --git a/third_party/skia/src/core/SkVMBlitter.h b/third_party/skia/src/core/SkVMBlitter.h
index 5445048ac1e3b..647916cb7c059 100644
--- a/third_party/skia/src/core/SkVMBlitter.h
+++ b/third_party/skia/src/core/SkVMBlitter.h
@@ -11,6 +11,7 @@
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkBlitter.h"
 #include "src/core/SkLRUCache.h"
+#include "src/core/SkTLazy.h"
 #include "src/core/SkVM.h"
 
 class SkVMBlitter final : public SkBlitter {
@@ -39,7 +40,7 @@ class SkVMBlitter final : public SkBlitter {
     ~SkVMBlitter() override;
 
 private:
-    enum class Coverage { Full, UniformF, MaskA8, MaskLCD16, Mask3D };
+    enum Coverage { Full, UniformF, MaskA8, MaskLCD16, Mask3D, kCount };
     struct Key {
         uint64_t shader,
                  clip,
@@ -84,7 +85,7 @@ class SkVMBlitter final : public SkBlitter {
     static SkString DebugName(const Key& key);
     static void ReleaseProgramCache();
 
-    skvm::Program buildProgram(Coverage coverage);
+    skvm::Program* buildProgram(Coverage coverage);
     void updateUniforms(int right, int y);
     const void* isSprite(int x, int y) const;
 
@@ -99,11 +100,9 @@ class SkVMBlitter final : public SkBlitter {
     SkArenaAlloc    fAlloc{2*sizeof(void*)};  // but a few effects need to ref large content.
     const Params    fParams;
     const Key       fKey;
-    skvm::Program   fBlitH,
-                    fBlitAntiH,
-                    fBlitMaskA8,
-                    fBlitMask3D,
-                    fBlitMaskLCD16;
+    bool            fStoreToCache = false;
+    skvm::Program*         fProgramPtrs[Coverage::kCount] = {nullptr};
+    SkTLazy<skvm::Program> fPrograms[Coverage::kCount];
 
     friend class Viewer;
 };
diff --git a/third_party/skia/src/core/SkVptr.h b/third_party/skia/src/core/SkVptr.h
deleted file mode 100644
index 2a33ad06c76f1..0000000000000
--- a/third_party/skia/src/core/SkVptr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkVptr_DEFINED
-#define SkVptr_DEFINED
-
-#include <string.h>
-#include <type_traits>
-
-// Experimentally, see if we can get at the vptr of objects with one.
-
-template <typename T>
-static inline void* SkVptr(const T& object) {
-    static_assert(std::has_virtual_destructor<T>::value, "");
-    void* vptr;
-    memcpy(&vptr, (const void*)&object, sizeof(vptr));
-    return vptr;
-}
-
-#endif//SkVptr_DEFINED
diff --git a/third_party/skia/src/core/SkXfermode.cpp b/third_party/skia/src/core/SkXfermode.cpp
index 516faac3ea566..9b1a9a1eff49d 100644
--- a/third_party/skia/src/core/SkXfermode.cpp
+++ b/third_party/skia/src/core/SkXfermode.cpp
@@ -63,17 +63,41 @@ class SkProcCoeffXfermode : public SkXfermode {
     using INHERITED = SkXfermode;
 };
 
-const char* SkBlendMode_Name(SkBlendMode mode) {
-    SkASSERT((unsigned) mode <= (unsigned)SkBlendMode::kLastMode);
-    const char* gModeStrings[] = {
-        "Clear", "Src", "Dst", "SrcOver", "DstOver", "SrcIn", "DstIn",
-        "SrcOut", "DstOut", "SrcATop", "DstATop", "Xor", "Plus",
-        "Modulate", "Screen", "Overlay", "Darken", "Lighten", "ColorDodge",
-        "ColorBurn", "HardLight", "SoftLight", "Difference", "Exclusion",
-        "Multiply", "Hue", "Saturation", "Color",  "Luminosity"
-    };
-    return gModeStrings[(int)mode];
-    static_assert(SK_ARRAY_COUNT(gModeStrings) == (size_t)SkBlendMode::kLastMode + 1, "mode_count");
+const char* SkBlendMode_Name(SkBlendMode bm) {
+    switch (bm) {
+        case SkBlendMode::kClear:      return "Clear";
+        case SkBlendMode::kSrc:        return "Src";
+        case SkBlendMode::kDst:        return "Dst";
+        case SkBlendMode::kSrcOver:    return "SrcOver";
+        case SkBlendMode::kDstOver:    return "DstOver";
+        case SkBlendMode::kSrcIn:      return "SrcIn";
+        case SkBlendMode::kDstIn:      return "DstIn";
+        case SkBlendMode::kSrcOut:     return "SrcOut";
+        case SkBlendMode::kDstOut:     return "DstOut";
+        case SkBlendMode::kSrcATop:    return "SrcATop";
+        case SkBlendMode::kDstATop:    return "DstATop";
+        case SkBlendMode::kXor:        return "Xor";
+        case SkBlendMode::kPlus:       return "Plus";
+        case SkBlendMode::kModulate:   return "Modulate";
+        case SkBlendMode::kScreen:     return "Screen";
+
+        case SkBlendMode::kOverlay:    return "Overlay";
+        case SkBlendMode::kDarken:     return "Darken";
+        case SkBlendMode::kLighten:    return "Lighten";
+        case SkBlendMode::kColorDodge: return "ColorDodge";
+        case SkBlendMode::kColorBurn:  return "ColorBurn";
+        case SkBlendMode::kHardLight:  return "HardLight";
+        case SkBlendMode::kSoftLight:  return "SoftLight";
+        case SkBlendMode::kDifference: return "Difference";
+        case SkBlendMode::kExclusion:  return "Exclusion";
+        case SkBlendMode::kMultiply:   return "Multiply";
+
+        case SkBlendMode::kHue:        return "Hue";
+        case SkBlendMode::kSaturation: return "Saturation";
+        case SkBlendMode::kColor:      return "Color";
+        case SkBlendMode::kLuminosity: return "Luminosity";
+    }
+    SkUNREACHABLE;
 }
 
 sk_sp<SkXfermode> SkXfermode::Make(SkBlendMode mode) {
@@ -149,4 +173,3 @@ const GrXPFactory* SkBlendMode_AsXPFactory(SkBlendMode mode) {
     return GrCustomXfermode::Get(mode);
 }
 #endif
-
diff --git a/third_party/skia/src/core/SkZip.h b/third_party/skia/src/core/SkZip.h
index 1688dd3921c91..1f32bfed8f6cc 100644
--- a/third_party/skia/src/core/SkZip.h
+++ b/third_party/skia/src/core/SkZip.h
@@ -66,7 +66,7 @@ class SkZip {
 
     // Allow SkZip<const T> to be constructed from SkZip<T>.
     template<typename... Us,
-            typename = std::enable_if<skstd::conjunction<CanConvertToConst<Us, Ts>...>::value>>
+            typename = std::enable_if<std::conjunction<CanConvertToConst<Us, Ts>...>::value>>
     constexpr SkZip(const SkZip<Us...>& that)
         : fPointers(that.data())
         , fSize{that.size()} { }
diff --git a/third_party/skia/src/effects/Sk2DPathEffect.cpp b/third_party/skia/src/effects/Sk2DPathEffect.cpp
index d35813d85a018..a59c9ab2058d0 100644
--- a/third_party/skia/src/effects/Sk2DPathEffect.cpp
+++ b/third_party/skia/src/effects/Sk2DPathEffect.cpp
@@ -82,6 +82,11 @@ class Sk2DPathEffect : public SkPathEffectBase {
             SkRegion::Iterator iter(rgn);
             for (; !iter.done(); iter.next()) {
                 const SkIRect& rect = iter.rect();
+#if defined(SK_BUILD_FOR_FUZZER)
+                if (rect.height() > 100) {
+                    continue;
+                }
+#endif
                 for (int y = rect.fTop; y < rect.fBottom; ++y) {
                     this->nextSpan(rect.fLeft, y, rect.width(), dst);
                 }
diff --git a/third_party/skia/src/effects/SkTableColorFilter.cpp b/third_party/skia/src/effects/SkTableColorFilter.cpp
index eb7d9f0a774e7..343ee957fe509 100644
--- a/third_party/skia/src/effects/SkTableColorFilter.cpp
+++ b/third_party/skia/src/effects/SkTableColorFilter.cpp
@@ -130,7 +130,7 @@ class ColorTableEffect : public GrFragmentProcessor {
 private:
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
diff --git a/third_party/skia/src/effects/imagefilters/BUILD.bazel b/third_party/skia/src/effects/imagefilters/BUILD.bazel
index 42e23dc4c32e4..93a695102843d 100644
--- a/third_party/skia/src/effects/imagefilters/BUILD.bazel
+++ b/third_party/skia/src/effects/imagefilters/BUILD.bazel
@@ -174,6 +174,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrTextureProxy_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu:SurfaceFillContext_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
@@ -238,6 +239,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrTextureProxy_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu:SurfaceFillContext_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
@@ -327,6 +329,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrTextureProxy_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu:SurfaceFillContext_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
diff --git a/third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
index a7c7aa4d8a072..7adb7763863c5 100644
--- a/third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp
@@ -193,6 +193,7 @@ sk_sp<SkSpecialImage> SkAlphaThresholdImageFilter::onFilterImage(const Context&
         GrSurfaceProxyView inputView = (input->view(context));
         SkASSERT(inputView.asTextureProxy());
         const GrProtected isProtected = inputView.proxy()->isProtected();
+        const GrSurfaceOrigin origin = inputView.origin();
 
         offset->fX = bounds.left();
         offset->fY = bounds.top();
@@ -227,7 +228,7 @@ sk_sp<SkSpecialImage> SkAlphaThresholdImageFilter::onFilterImage(const Context&
         }
 
         return DrawWithFP(context, std::move(thresholdFP), bounds, ctx.colorType(),
-                          ctx.colorSpace(), ctx.surfaceProps(), isProtected);
+                          ctx.colorSpace(), ctx.surfaceProps(), origin, isProtected);
     }
 #endif
 
diff --git a/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
index 55be373696edc..e8f20bb3f39b9 100644
--- a/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkBlurImageFilter.cpp
@@ -31,6 +31,15 @@
 #endif // SK_GPU_V1
 #endif // SK_SUPPORT_GPU
 
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
+    #include <immintrin.h>
+    #define SK_PREFETCH(ptr) _mm_prefetch(reinterpret_cast<const char*>(ptr), _MM_HINT_T0)
+#elif defined(__GNUC__)
+    #define SK_PREFETCH(ptr) __builtin_prefetch(ptr)
+#else
+    #define SK_PREFETCH(ptr)
+#endif
+
 namespace {
 
 class SkBlurImageFilter final : public SkImageFilter_Base {
diff --git a/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
index 920195f793b81..eae2d53c77e14 100644
--- a/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp
@@ -22,6 +22,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/SurfaceFillContext.h"
 #include "src/gpu/effects/GrTextureEffect.h"
@@ -175,7 +176,7 @@ class GrDisplacementMapEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
@@ -449,7 +450,7 @@ GrDisplacementMapEffect::onMakeProgramImpl() const {
     return std::make_unique<Impl>();
 }
 
-void GrDisplacementMapEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrDisplacementMapEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     static constexpr int kChannelSelectorKeyBits = 2;  // Max value is 3, so 2 bits are required
 
     uint32_t xKey = static_cast<uint32_t>(fXChannelSelector);
@@ -531,7 +532,7 @@ void GrDisplacementMapEffect::Impl::emitCode(EmitArgs& args) {
     const GrDisplacementMapEffect& displacementMap = args.fFp.cast<GrDisplacementMapEffect>();
 
     fScaleUni = args.fUniformHandler->addUniform(&displacementMap, kFragment_GrShaderFlag,
-                                                 kHalf2_GrSLType, "Scale");
+                                                 SkSLType::kHalf2, "Scale");
     const char* scaleUni = args.fUniformHandler->getUniformCStr(fScaleUni);
 
     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
diff --git a/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
index ca42f53033ec3..7ada217ed0f8e 100644
--- a/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -24,6 +24,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/SurfaceFillContext.h"
 #include "src/gpu/effects/GrTextureEffect.h"
@@ -636,7 +637,7 @@ class LightingEffect : public GrFragmentProcessor {
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
 private:
-    void onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         b->add32(fBoundaryMode << 2 | fLight->type());
     }
 
@@ -1766,46 +1767,46 @@ void LightingEffect::ImplBase::emitCode(EmitArgs& args) {
     GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
     fSurfaceScaleUni = uniformHandler->addUniform(&le,
                                                   kFragment_GrShaderFlag,
-                                                  kHalf_GrSLType, "SurfaceScale");
+                                                  SkSLType::kHalf, "SurfaceScale");
     fLight->emitLightColorUniform(&le, uniformHandler);
     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
     SkString lightFunc;
     this->emitLightFunc(&le, uniformHandler, fragBuilder, &lightFunc);
     const GrShaderVar gSobelArgs[] = {
-        GrShaderVar("a", kHalf_GrSLType),
-        GrShaderVar("b", kHalf_GrSLType),
-        GrShaderVar("c", kHalf_GrSLType),
-        GrShaderVar("d", kHalf_GrSLType),
-        GrShaderVar("e", kHalf_GrSLType),
-        GrShaderVar("f", kHalf_GrSLType),
-        GrShaderVar("scale", kHalf_GrSLType),
+        GrShaderVar("a", SkSLType::kHalf),
+        GrShaderVar("b", SkSLType::kHalf),
+        GrShaderVar("c", SkSLType::kHalf),
+        GrShaderVar("d", SkSLType::kHalf),
+        GrShaderVar("e", SkSLType::kHalf),
+        GrShaderVar("f", SkSLType::kHalf),
+        GrShaderVar("scale", SkSLType::kHalf),
     };
 
     SkString sobelFuncName = fragBuilder->getMangledFunctionName("sobel");
-    fragBuilder->emitFunction(kHalf_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf,
                               sobelFuncName.c_str(),
                               {gSobelArgs, SK_ARRAY_COUNT(gSobelArgs)},
                               "return (-a + b - 2.0 * c + 2.0 * d -e + f) * scale;");
     const GrShaderVar gPointToNormalArgs[] = {
-        GrShaderVar("x", kHalf_GrSLType),
-        GrShaderVar("y", kHalf_GrSLType),
-        GrShaderVar("scale", kHalf_GrSLType),
+        GrShaderVar("x", SkSLType::kHalf),
+        GrShaderVar("y", SkSLType::kHalf),
+        GrShaderVar("scale", SkSLType::kHalf),
     };
     SkString pointToNormalName = fragBuilder->getMangledFunctionName("pointToNormal");
-    fragBuilder->emitFunction(kHalf3_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf3,
                               pointToNormalName.c_str(),
                               {gPointToNormalArgs, SK_ARRAY_COUNT(gPointToNormalArgs)},
                               "return normalize(half3(-x * scale, -y * scale, 1));");
 
     const GrShaderVar gInteriorNormalArgs[] = {
-        GrShaderVar("m", kHalf_GrSLType, 9),
-        GrShaderVar("surfaceScale", kHalf_GrSLType),
+        GrShaderVar("m", SkSLType::kHalf, 9),
+        GrShaderVar("surfaceScale", SkSLType::kHalf),
     };
     SkString normalBody = emitNormalFunc(le.boundaryMode(),
                                          pointToNormalName.c_str(),
                                          sobelFuncName.c_str());
     SkString normalName = fragBuilder->getMangledFunctionName("normal");
-    fragBuilder->emitFunction(kHalf3_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf3,
                               normalName.c_str(),
                               {gInteriorNormalArgs, SK_ARRAY_COUNT(gInteriorNormalArgs)},
                               normalBody.c_str());
@@ -1858,18 +1859,18 @@ void DiffuseLightingEffect::Impl::emitLightFunc(const GrFragmentProcessor* owner
                                                 GrGLSLFPFragmentBuilder* fragBuilder,
                                                 SkString* funcName) {
     const char* kd;
-    fKDUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf_GrSLType, "KD", &kd);
+    fKDUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf, "KD", &kd);
 
     const GrShaderVar gLightArgs[] = {
-        GrShaderVar("normal", kHalf3_GrSLType),
-        GrShaderVar("surfaceToLight", kHalf3_GrSLType),
-        GrShaderVar("lightColor", kHalf3_GrSLType)
+        GrShaderVar("normal", SkSLType::kHalf3),
+        GrShaderVar("surfaceToLight", SkSLType::kHalf3),
+        GrShaderVar("lightColor", SkSLType::kHalf3)
     };
     SkString lightBody;
     lightBody.appendf("half colorScale = %s * dot(normal, surfaceToLight);", kd);
     lightBody.appendf("return half4(saturate(lightColor * colorScale), 1.0);");
     *funcName = fragBuilder->getMangledFunctionName("light");
-    fragBuilder->emitFunction(kHalf4_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf4,
                               funcName->c_str(),
                               {gLightArgs, SK_ARRAY_COUNT(gLightArgs)},
                               lightBody.c_str());
@@ -1957,17 +1958,17 @@ void SpecularLightingEffect::Impl::emitLightFunc(const GrFragmentProcessor* owne
     const char* ks;
     const char* shininess;
 
-    fKSUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf_GrSLType, "KS", &ks);
+    fKSUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf, "KS", &ks);
     fShininessUni = uniformHandler->addUniform(owner,
                                                kFragment_GrShaderFlag,
-                                               kHalf_GrSLType,
+                                               SkSLType::kHalf,
                                                "Shininess",
                                                &shininess);
 
     const GrShaderVar gLightArgs[] = {
-        GrShaderVar("normal", kHalf3_GrSLType),
-        GrShaderVar("surfaceToLight", kHalf3_GrSLType),
-        GrShaderVar("lightColor", kHalf3_GrSLType)
+        GrShaderVar("normal", SkSLType::kHalf3),
+        GrShaderVar("surfaceToLight", SkSLType::kHalf3),
+        GrShaderVar("lightColor", SkSLType::kHalf3)
     };
     SkString lightBody;
     lightBody.appendf("half3 halfDir = half3(normalize(surfaceToLight + half3(0, 0, 1)));");
@@ -1976,7 +1977,7 @@ void SpecularLightingEffect::Impl::emitLightFunc(const GrFragmentProcessor* owne
     lightBody.appendf("half3 color = saturate(lightColor * colorScale);");
     lightBody.appendf("return half4(color, max(max(color.r, color.g), color.b));");
     *funcName = fragBuilder->getMangledFunctionName("light");
-    fragBuilder->emitFunction(kHalf4_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf4,
                               funcName->c_str(),
                               {gLightArgs, SK_ARRAY_COUNT(gLightArgs)},
                               lightBody.c_str());
@@ -1993,7 +1994,7 @@ void SpecularLightingEffect::Impl::onSetData(const GrGLSLProgramDataManager& pdm
 ///////////////////////////////////////////////////////////////////////////////
 void GpuLight::emitLightColorUniform(const GrFragmentProcessor* owner,
                                      GrGLSLUniformHandler* uniformHandler) {
-    fColorUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf3_GrSLType,
+    fColorUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf3,
                                            "LightColor");
 }
 
@@ -2025,7 +2026,7 @@ void GpuDistantLight::emitSurfaceToLight(const GrFragmentProcessor* owner,
                                          GrGLSLFPFragmentBuilder* fragBuilder,
                                          const char* z) {
     const char* dir;
-    fDirectionUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf3_GrSLType,
+    fDirectionUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf3,
                                                "LightDirection", &dir);
     fragBuilder->codeAppend(dir);
 }
@@ -2045,7 +2046,7 @@ void GpuPointLight::emitSurfaceToLight(const GrFragmentProcessor* owner,
                                        GrGLSLFPFragmentBuilder* fragBuilder,
                                        const char* z) {
     const char* loc;
-    fLocationUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf3_GrSLType,
+    fLocationUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf3,
                                               "LightLocation", &loc);
     fragBuilder->codeAppendf("normalize(%s - half3(sk_FragCoord.xy, %s))",
                              loc, z);
@@ -2071,7 +2072,7 @@ void GpuSpotLight::emitSurfaceToLight(const GrFragmentProcessor* owner,
                                       GrGLSLFPFragmentBuilder* fragBuilder,
                                       const char* z) {
     const char* location;
-    fLocationUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf3_GrSLType,
+    fLocationUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf3,
                                               "LightLocation", &location);
 
     fragBuilder->codeAppendf("normalize(%s - half3(sk_FragCoord.xy, %s))",
@@ -2089,20 +2090,20 @@ void GpuSpotLight::emitLightColor(const GrFragmentProcessor* owner,
     const char* cosOuter;
     const char* coneScale;
     const char* s;
-    fExponentUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf_GrSLType,
+    fExponentUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf,
                                               "Exponent", &exponent);
     fCosInnerConeAngleUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag,
-                                                       kHalf_GrSLType, "CosInnerConeAngle",
+                                                       SkSLType::kHalf, "CosInnerConeAngle",
                                                        &cosInner);
     fCosOuterConeAngleUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag,
-                                                       kHalf_GrSLType, "CosOuterConeAngle",
+                                                       SkSLType::kHalf, "CosOuterConeAngle",
                                                        &cosOuter);
-    fConeScaleUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf_GrSLType,
+    fConeScaleUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf,
                                                "ConeScale", &coneScale);
-    fSUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, kHalf3_GrSLType, "S", &s);
+    fSUni = uniformHandler->addUniform(owner, kFragment_GrShaderFlag, SkSLType::kHalf3, "S", &s);
 
     const GrShaderVar gLightColorArgs[] = {
-        GrShaderVar("surfaceToLight", kHalf3_GrSLType)
+        GrShaderVar("surfaceToLight", SkSLType::kHalf3)
     };
     SkString lightColorBody;
     lightColorBody.appendf("half cosAngle = -dot(surfaceToLight, %s);", s);
@@ -2116,7 +2117,7 @@ void GpuSpotLight::emitLightColor(const GrFragmentProcessor* owner,
     lightColorBody.appendf("}");
     lightColorBody.appendf("return %s * scale;", color);
     fLightColorFunc = fragBuilder->getMangledFunctionName("lightColor");
-    fragBuilder->emitFunction(kHalf3_GrSLType,
+    fragBuilder->emitFunction(SkSLType::kHalf3,
                               fLightColorFunc.c_str(),
                               {gLightColorArgs, SK_ARRAY_COUNT(gLightColorArgs)},
                               lightColorBody.c_str());
diff --git a/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp
index 136c01291975d..2175b225ed965 100644
--- a/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkMagnifierImageFilter.cpp
@@ -176,6 +176,7 @@ sk_sp<SkSpecialImage> SkMagnifierImageFilter::onFilterImage(const Context& ctx,
         SkASSERT(inputView.asTextureProxy());
 
         const auto isProtected = inputView.proxy()->isProtected();
+        const auto origin = inputView.origin();
 
         offset->fX = bounds.left();
         offset->fY = bounds.top();
@@ -204,7 +205,7 @@ sk_sp<SkSpecialImage> SkMagnifierImageFilter::onFilterImage(const Context& ctx,
         }
 
         return DrawWithFP(context, std::move(fp), bounds, ctx.colorType(), ctx.colorSpace(),
-                          ctx.surfaceProps(), isProtected);
+                          ctx.surfaceProps(), origin, isProtected);
     }
 #endif
 
diff --git a/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
index a5fd88777ea3e..eb400a5ad07ec 100644
--- a/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp
@@ -372,6 +372,7 @@ sk_sp<SkSpecialImage> SkMatrixConvolutionImageFilter::onFilterImage(const Contex
         SkASSERT(inputView.asTextureProxy());
 
         const auto isProtected = inputView.proxy()->isProtected();
+        const auto origin = inputView.origin();
 
         offset->fX = dstBounds.left();
         offset->fY = dstBounds.top();
@@ -403,7 +404,7 @@ sk_sp<SkSpecialImage> SkMatrixConvolutionImageFilter::onFilterImage(const Contex
         // evaluating the FP, and the dst rect just uses the size of dstBounds.
         dstBounds.offset(input->subset().x(), input->subset().y());
         return DrawWithFP(context, std::move(fp), dstBounds, ctx.colorType(), ctx.colorSpace(),
-                          ctx.surfaceProps(), isProtected);
+                          ctx.surfaceProps(), origin, isProtected);
     }
 #endif
 
diff --git a/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index 3ee3cd88276bc..b5c11abe23434 100644
--- a/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -22,6 +22,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/SurfaceFillContext.h"
 #include "src/gpu/effects/GrTextureEffect.h"
@@ -30,6 +31,10 @@
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
 #endif
 
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
+    #include <immintrin.h>
+#endif
+
 namespace {
 
 enum class MorphType {
@@ -207,7 +212,7 @@ class GrMorphologyEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
     GrMorphologyEffect(std::unique_ptr<GrFragmentProcessor> inputFP, GrSurfaceProxyView,
@@ -230,7 +235,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrMorphologyEffect::onMakeProg
             const GrMorphologyEffect& me = args.fFp.cast<GrMorphologyEffect>();
 
             GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
-            fRangeUni = uniformHandler->addUniform(&me, kFragment_GrShaderFlag, kFloat2_GrSLType,
+            fRangeUni = uniformHandler->addUniform(&me, kFragment_GrShaderFlag, SkSLType::kFloat2,
                                                    "Range");
             const char* range = uniformHandler->getUniformCStr(fRangeUni);
 
@@ -286,7 +291,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrMorphologyEffect::onMakeProg
     return std::make_unique<Impl>();
 }
 
-void GrMorphologyEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrMorphologyEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = static_cast<uint32_t>(fRadius);
     key |= (static_cast<uint32_t>(fType) << 8);
     key |= (static_cast<uint32_t>(fDirection) << 9);
diff --git a/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp b/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
index 41b75988629ea..25d551d0fb3a1 100644
--- a/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkRuntimeImageFilter.cpp
@@ -27,13 +27,17 @@ class SkRuntimeImageFilter final : public SkImageFilter_Base {
                          sk_sp<SkImageFilter> input)
             : INHERITED(&input, 1, /*cropRect=*/nullptr)
             , fShaderBuilder(std::move(effect), std::move(uniforms))
-            , fChildShaderName(fShaderBuilder.effect()->children().front().name) {}
+            , fChildShaderNames(&fShaderBuilder.effect()->children().front().name, 1) {}
     SkRuntimeImageFilter(const SkRuntimeShaderBuilder& builder,
-                         const char* childShaderName,
-                         sk_sp<SkImageFilter> input)
-            : INHERITED(&input, 1, /*cropRect=*/nullptr)
-            , fShaderBuilder(builder)
-            , fChildShaderName(childShaderName) {}
+                         const char* childShaderNames[],
+                         const sk_sp<SkImageFilter> inputs[],
+                         int inputCount)
+            : INHERITED(inputs, inputCount, /*cropRect=*/nullptr)
+            , fShaderBuilder(builder) {
+        for (int i = 0; i < inputCount; i++) {
+            fChildShaderNames.push_back(SkString(childShaderNames[i]));
+        }
+    }
 
     bool onAffectsTransparentBlack() const override { return true; }
     MatrixCapability onGetCTMCapability() const override { return MatrixCapability::kTranslate; }
@@ -48,7 +52,7 @@ class SkRuntimeImageFilter final : public SkImageFilter_Base {
 
     mutable SkSpinlock fShaderBuilderLock;
     mutable SkRuntimeShaderBuilder fShaderBuilder;
-    SkString fChildShaderName;
+    SkSTArray<1, SkString> fChildShaderNames;
 
     using INHERITED = SkImageFilter_Base;
 };
@@ -59,7 +63,7 @@ sk_sp<SkImageFilter> SkMakeRuntimeImageFilter(sk_sp<SkRuntimeEffect> effect,
     // Rather than replicate all of the checks from makeShader here, just try to create a shader
     // once, to determine if everything is valid.
     sk_sp<SkShader> child = nullptr;
-    auto shader = effect->makeShader(uniforms, &child, 1, nullptr, false);
+    auto shader = effect->makeShader(uniforms, &child, 1);
     if (!shader) {
         // Could be wrong signature, wrong uniform block size, wrong number/type of children, etc...
         return nullptr;
@@ -74,7 +78,8 @@ void SkRegisterRuntimeImageFilterFlattenable() {
 }
 
 sk_sp<SkFlattenable> SkRuntimeImageFilter::CreateProc(SkReadBuffer& buffer) {
-    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
+    // We don't know how many inputs to expect yet. Passing -1 allows any number of children.
+    SK_IMAGEFILTER_UNFLATTEN_COMMON(common, -1);
     if (common.cropRect()) {
         return nullptr;
     }
@@ -93,11 +98,14 @@ sk_sp<SkFlattenable> SkRuntimeImageFilter::CreateProc(SkReadBuffer& buffer) {
         return nullptr;
     }
 
-    // Read the child shader name and make sure it matches one declared in the effect
-    SkString childShaderName;
-    buffer.readString(&childShaderName);
-    if (!buffer.validate(effect->findChild(childShaderName.c_str()) != nullptr)) {
-        return nullptr;
+    // Read the child shader names
+    SkSTArray<4, const char*> childShaderNames;
+    SkSTArray<4, SkString> childShaderNameStrings;
+    childShaderNames.resize(common.inputCount());
+    childShaderNameStrings.resize(common.inputCount());
+    for (int i = 0; i < common.inputCount(); i++) {
+        buffer.readString(&childShaderNameStrings[i]);
+        childShaderNames[i] = childShaderNameStrings[i].c_str();
     }
 
     SkRuntimeShaderBuilder builder(std::move(effect), std::move(uniforms));
@@ -125,7 +133,8 @@ sk_sp<SkFlattenable> SkRuntimeImageFilter::CreateProc(SkReadBuffer& buffer) {
         return nullptr;
     }
 
-    return SkImageFilters::RuntimeShader(builder, childShaderName.c_str(), common.getInput(0));
+    return SkImageFilters::RuntimeShader(
+            builder, childShaderNames.data(), common.inputs(), common.inputCount());
 }
 
 void SkRuntimeImageFilter::flatten(SkWriteBuffer& buffer) const {
@@ -133,7 +142,9 @@ void SkRuntimeImageFilter::flatten(SkWriteBuffer& buffer) const {
     fShaderBuilderLock.acquire();
     buffer.writeString(fShaderBuilder.effect()->source().c_str());
     buffer.writeDataAsByteArray(fShaderBuilder.uniforms().get());
-    buffer.writeString(fChildShaderName.c_str());
+    for (const SkString& name : fChildShaderNames) {
+        buffer.writeString(name.c_str());
+    }
     for (size_t x = 0; x < fShaderBuilder.numChildren(); x++) {
         buffer.writeFlattenable(fShaderBuilder.children()[x].flattenable());
     }
@@ -144,12 +155,6 @@ void SkRuntimeImageFilter::flatten(SkWriteBuffer& buffer) const {
 
 sk_sp<SkSpecialImage> SkRuntimeImageFilter::onFilterImage(const Context& ctx,
                                                           SkIPoint* offset) const {
-    SkIPoint inputOffset = SkIPoint::Make(0, 0);
-    sk_sp<SkSpecialImage> input(this->filterInput(0, ctx, &inputOffset));
-    if (!input) {
-        return nullptr;
-    }
-
     SkIRect outputBounds = SkIRect(ctx.desiredOutput());
     sk_sp<SkSpecialSurface> surf(ctx.makeSurface(outputBounds.size()));
     if (!surf) {
@@ -160,20 +165,35 @@ sk_sp<SkSpecialImage> SkRuntimeImageFilter::onFilterImage(const Context& ctx,
     SkMatrix inverse;
     SkAssertResult(ctm.invert(&inverse));
 
-    SkMatrix localM = inverse *
-                      SkMatrix::Translate(inputOffset) *
-                      SkMatrix::Translate(-input->subset().topLeft());
-    sk_sp<SkShader> inputShader =
-            input->asImage()->makeShader(SkSamplingOptions(SkFilterMode::kLinear), &localM);
-    SkASSERT(inputShader);
+    const int inputCount = this->countInputs();
+    SkASSERT(inputCount == fChildShaderNames.count());
+
+    SkSTArray<1, sk_sp<SkShader>> inputShaders;
+    for (int i = 0; i < inputCount; i++) {
+        SkIPoint inputOffset = SkIPoint::Make(0, 0);
+        sk_sp<SkSpecialImage> input(this->filterInput(i, ctx, &inputOffset));
+        if (!input) {
+            return nullptr;
+        }
+
+        SkMatrix localM = inverse * SkMatrix::Translate(inputOffset);
+        sk_sp<SkShader> inputShader =
+                input->asShader(SkSamplingOptions(SkFilterMode::kLinear), localM);
+        SkASSERT(inputShader);
+        inputShaders.push_back(std::move(inputShader));
+    }
 
     // lock the mutation of the builder and creation of the shader so that the builder's state is
     // const and is safe for multi-threaded access.
     fShaderBuilderLock.acquire();
-    fShaderBuilder.child(fChildShaderName.c_str()) = inputShader;
-    sk_sp<SkShader>   shader = fShaderBuilder.makeShader(nullptr, false);
-    // Remove the shader from the builder to avoid unnecessarily prolonging the shader's lifetime
-    fShaderBuilder.child(fChildShaderName.c_str()) = nullptr;
+    for (int i = 0; i < inputCount; i++) {
+        fShaderBuilder.child(fChildShaderNames[i].c_str()) = inputShaders[i];
+    }
+    sk_sp<SkShader> shader = fShaderBuilder.makeShader();
+    // Remove the inputs from the builder to avoid unnecessarily prolonging the shader's lifetime
+    for (int i = 0; i < inputCount; i++) {
+        fShaderBuilder.child(fChildShaderNames[i].c_str()) = nullptr;
+    }
     fShaderBuilderLock.release();
 
     SkASSERT(shader.get());
@@ -196,6 +216,10 @@ sk_sp<SkSpecialImage> SkRuntimeImageFilter::onFilterImage(const Context& ctx,
     return surf->makeImageSnapshot();
 }
 
+static bool child_is_shader(const SkRuntimeEffect::Child* child) {
+    return child && child->type == SkRuntimeEffect::ChildType::kShader;
+}
+
 sk_sp<SkImageFilter> SkImageFilters::RuntimeShader(const SkRuntimeShaderBuilder& builder,
                                                    const char* childShaderName,
                                                    sk_sp<SkImageFilter> input) {
@@ -207,13 +231,32 @@ sk_sp<SkImageFilter> SkImageFilters::RuntimeShader(const SkRuntimeShaderBuilder&
             return nullptr;
         }
         childShaderName = children.front().name.c_str();
-    } else if (builder.effect()->findChild(childShaderName) == nullptr) {
-        // there was no child declared in the runtime effect that matches the provided name
-        return nullptr;
+    }
+
+    return SkImageFilters::RuntimeShader(builder, &childShaderName, &input, 1);
+}
+
+sk_sp<SkImageFilter> SkImageFilters::RuntimeShader(const SkRuntimeShaderBuilder& builder,
+                                                   const char* childShaderNames[],
+                                                   const sk_sp<SkImageFilter> inputs[],
+                                                   int inputCount) {
+    for (int i = 0; i < inputCount; i++) {
+        const char* name = childShaderNames[i];
+        // All names must be non-null, and present as a child shader in the effect:
+        if (!name || !child_is_shader(builder.effect()->findChild(name))) {
+            return nullptr;
+        }
+
+        // We don't allow duplicates, either:
+        for (int j = 0; j < i; j++) {
+            if (!strcmp(name, childShaderNames[j])) {
+                return nullptr;
+            }
+        }
     }
 
     return sk_sp<SkImageFilter>(
-            new SkRuntimeImageFilter(builder, childShaderName, std::move(input)));
+            new SkRuntimeImageFilter(builder, childShaderNames, inputs, inputCount));
 }
 
 #endif  // SK_ENABLE_SKSL
diff --git a/third_party/skia/src/gpu/BUILD.bazel b/third_party/skia/src/gpu/BUILD.bazel
index 84df1d02719b8..32dd1c193bbaa 100644
--- a/third_party/skia/src/gpu/BUILD.bazel
+++ b/third_party/skia/src/gpu/BUILD.bazel
@@ -1,3 +1,5 @@
+# https://github.com/bazelbuild/bazel-skylib
+load("@bazel_skylib//lib:selects.bzl", "selects")
 load("//bazel:macros.bzl", "generated_cc_atom")
 
 cc_library(
@@ -75,7 +77,6 @@ cc_library(
         ":GrSPIRVVaryingHandler_src",
         ":GrSWMaskHelper_src",
         ":GrShaderCaps_src",
-        ":GrShaderUtils_src",
         ":GrShaderVar_src",
         ":GrStagingBufferManager_src",
         ":GrStencilSettings_src",
@@ -101,6 +102,8 @@ cc_library(
         ":GrXferProcessor_src",
         ":GrYUVABackendTextures_src",
         ":GrYUVATextureProxies_src",
+        ":ResourceKey_src",
+        ":ShaderErrorHandler_src",
         ":SkGr_src",
         ":SurfaceContext_src",
         ":SurfaceFillContext_src",
@@ -147,7 +150,7 @@ cc_library(
         "//src/gpu/ops:DefaultPathRenderer_src",
         "//src/gpu/ops:DrawAtlasOp_src",
         "//src/gpu/ops:DrawAtlasPathOp_src",
-        "//src/gpu/ops:DrawVerticesOp_src",
+        "//src/gpu/ops:DrawCustomMeshOp_src",
         "//src/gpu/ops:DrawableOp_src",
         "//src/gpu/ops:FillRRectOp_src",
         "//src/gpu/ops:FillRectOp_src",
@@ -188,11 +191,12 @@ cc_library(
         "//src/gpu/tessellate/shaders:GrTessellationShader_src",
         "//src/gpu/text:GrAtlasManager_src",
         "//src/gpu/text:GrDistanceFieldAdjustTable_src",
+        "//src/gpu/text:GrGlyphVector_src",
         "//src/gpu/text:GrSDFMaskFilter_src",
         "//src/gpu/text:GrSDFTControl_src",
         "//src/gpu/text:GrSlug_src",
         "//src/gpu/text:GrStrikeCache_src",
-        "//src/gpu/text:GrTextBlobCache_src",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_src",
         "//src/gpu/text:GrTextBlob_src",
     ],
 )
@@ -253,6 +257,14 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "glx_srcs",
+    deps = [
+        "//src/gpu/gl/glx:GrGLMakeGLXInterface_src",
+        "//src/gpu/gl/glx:GrGLMakeNativeInterface_glx_src",
+    ],
+)
+
 cc_library(
     name = "webgl_srcs",
     deps = [
@@ -270,6 +282,14 @@ cc_library(
     ],
 )
 
+selects.config_setting_group(
+    name = "gl_and_linux",
+    match_all = [
+        "//bazel/common_config_settings:gl_standard",
+        "//bazel/common_config_settings:linux_x64",
+    ],
+)
+
 cc_library(
     name = "srcs",
     visibility = ["//:__subpackages__"],
@@ -280,6 +300,7 @@ cc_library(
         ],
         "//conditions:default": [],
     }) + select({
+        ":gl_and_linux": [":glx_srcs"],
         "//bazel/common_config_settings:webgl_standard": [":webgl_srcs"],
         "//conditions:default": [],
     }),
@@ -421,7 +442,6 @@ generated_cc_atom(
         ":GrCaps_hdr",
         ":GrDataUtils_hdr",
         ":GrGpu_hdr",
-        "//include/private:GrResourceKey_hdr",
     ],
 )
 
@@ -518,10 +538,10 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrTexture_hdr",
+        ":ResourceKey_hdr",
         "//include/core:SkImageGenerator_hdr",
         "//include/gpu:GrBackendSurface_hdr",
         "//include/gpu:GrDirectContext_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//include/private:SkMutex_hdr",
     ],
 )
@@ -579,7 +599,10 @@ generated_cc_atom(
     name = "GrBaseContextPriv_hdr",
     hdrs = ["GrBaseContextPriv.h"],
     visibility = ["//:__subpackages__"],
-    deps = ["//include/private:GrContext_Base_hdr"],
+    deps = [
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/private:GrContext_Base_hdr",
+    ],
 )
 
 generated_cc_atom(
@@ -778,6 +801,7 @@ generated_cc_atom(
     deps = [
         ":GrColorInfo_hdr",
         ":GrColorSpaceXform_hdr",
+        ":KeyBuilder_hdr",
         "//include/core:SkColorSpace_hdr",
         "//src/core:SkColorSpacePriv_hdr",
         "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr",
@@ -807,7 +831,7 @@ generated_cc_atom(
         ":GrCaps_hdr",
         "//include/gpu:GrContextThreadSafeProxy_hdr",
         "//include/private:GrContext_Base_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
     ],
 )
 
@@ -837,7 +861,7 @@ generated_cc_atom(
         ":GrBaseContextPriv_hdr",
         ":GrCaps_hdr",
         ":GrContextThreadSafeProxyPriv_hdr",
-        ":GrShaderUtils_hdr",
+        "//include/gpu:ShaderErrorHandler_hdr",
         "//include/private:GrContext_Base_hdr",
         "//src/gpu/effects:GrSkSLFP_hdr",
     ],
@@ -963,6 +987,7 @@ generated_cc_atom(
         ":GrCaps_hdr",
         ":GrDefaultGeoProcFactory_hdr",
         ":GrGeometryProcessor_hdr",
+        ":KeyBuilder_hdr",
         "//include/core:SkRefCnt_hdr",
         "//src/core:SkArenaAlloc_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -1031,7 +1056,7 @@ generated_cc_atom(
         "//src/gpu/effects:GrSkSLFP_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
         "//src/gpu/text:GrAtlasManager_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
         "//src/image:SkImage_Base_hdr",
         "//src/image:SkImage_Gpu_hdr",
     ],
@@ -1050,7 +1075,6 @@ generated_cc_atom(
         ":GrGpu_hdr",
         ":GrResourceProvider_hdr",
         ":GrSemaphore_hdr",
-        ":GrShaderUtils_hdr",
         ":GrThreadSafePipelineBuilder_hdr",
         ":SurfaceContext_hdr",
         "//include/core:SkString_hdr",
@@ -1075,6 +1099,7 @@ generated_cc_atom(
         "//src/gpu/vk:GrVkGpu_hdr",
         "//src/image:SkImage_GpuBase_hdr",
         "//src/utils:SkJSONWriter_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
 
@@ -1369,6 +1394,7 @@ generated_cc_atom(
         ":GrPipeline_hdr",
         ":GrProcessorAnalysis_hdr",
         ":GrShaderCaps_hdr",
+        ":KeyBuilder_hdr",
         "//src/core:SkRuntimeEffectPriv_hdr",
         "//src/gpu/effects:GrBlendFragmentProcessor_hdr",
         "//src/gpu/effects:GrSkSLFP_hdr",
@@ -1404,6 +1430,7 @@ generated_cc_atom(
     deps = [
         ":GrGeometryProcessor_hdr",
         ":GrPipeline_hdr",
+        ":KeyBuilder_hdr",
         "//src/core:SkMatrixPriv_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
@@ -1467,7 +1494,7 @@ generated_cc_atom(
     hdrs = ["GrGpuResource.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//include/private:GrResourceKey_hdr",
+        ":ResourceKey_hdr",
         "//include/private:GrTypesPriv_hdr",
         "//include/private:SkNoncopyable_hdr",
     ],
@@ -1648,6 +1675,7 @@ generated_cc_atom(
     srcs = ["GrMeshDrawTarget.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":BufferWriter_hdr",
         ":GrMeshDrawTarget_hdr",
         ":GrResourceProvider_hdr",
     ],
@@ -1860,6 +1888,7 @@ generated_cc_atom(
         ":GrCaps_hdr",
         ":GrPipeline_hdr",
         ":GrXferProcessor_hdr",
+        ":KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
     ],
@@ -2008,6 +2037,7 @@ generated_cc_atom(
         ":GrRenderTarget_hdr",
         ":GrShaderCaps_hdr",
         ":GrTexture_hdr",
+        ":KeyBuilder_hdr",
         "//include/private:SkChecksum_hdr",
         "//include/private:SkTo_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
@@ -2044,8 +2074,8 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrTextureProxy_hdr",
+        ":ResourceKey_hdr",
         "//include/gpu:GrTypes_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//src/core:SkTDynamicHash_hdr",
     ],
 )
@@ -2073,8 +2103,7 @@ generated_cc_atom(
         "//include/gpu:GrDirectContext_hdr",
         "//include/gpu/vk:GrVkTypes_hdr",
         "//include/private:GrImageContext_hdr",
-        "//include/private:GrResourceKey_hdr",
-        "//include/private:GrSingleOwner_hdr",
+        "//include/private:SingleOwner_hdr",
         "//include/private:SkImageInfoPriv_hdr",
         "//src/core:SkAutoPixmapStorage_hdr",
         "//src/core:SkCompressedDataUtils_hdr",
@@ -2135,7 +2164,7 @@ generated_cc_atom(
         "//src/core:SkArenaAlloc_hdr",
         "//src/gpu/effects:GrSkSLFP_hdr",
         "//src/gpu/ops:AtlasTextOp_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
         "//src/gpu/text:GrTextBlob_hdr",
         "//src/utils:SkJSONWriter_hdr",
     ],
@@ -2352,9 +2381,9 @@ generated_cc_atom(
         ":GrGpuResourceCacheAccess_hdr",
         ":GrGpuResourcePriv_hdr",
         ":GrGpuResource_hdr",
+        ":ResourceKey_hdr",
         "//include/core:SkRefCnt_hdr",
         "//include/gpu:GrDirectContext_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//include/private:SkTArray_hdr",
         "//include/private:SkTHash_hdr",
         "//src/core:SkMessageBus_hdr",
@@ -2380,7 +2409,7 @@ generated_cc_atom(
         ":GrTracing_hdr",
         ":SkGr_hdr",
         "//include/gpu:GrDirectContext_hdr",
-        "//include/private:GrSingleOwner_hdr",
+        "//include/private:SingleOwner_hdr",
         "//include/private:SkTo_hdr",
         "//include/utils:SkRandom_hdr",
         "//src/core:SkMessageBus_hdr",
@@ -2434,10 +2463,10 @@ generated_cc_atom(
         ":GrResourceProvider_hdr",
         ":GrSemaphore_hdr",
         ":GrTexture_hdr",
+        ":ResourceKey_hdr",
         ":SkGr_hdr",
         "//include/gpu:GrBackendSemaphore_hdr",
-        "//include/private:GrResourceKey_hdr",
-        "//include/private:GrSingleOwner_hdr",
+        "//include/private:SingleOwner_hdr",
         "//src/core:SkConvertPixels_hdr",
         "//src/core:SkMathPriv_hdr",
         "//src/core:SkMipmap_hdr",
@@ -2577,30 +2606,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "GrShaderUtils_hdr",
-    hdrs = ["GrShaderUtils.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//include/core:SkTypes_hdr",
-        "//include/gpu:GrContextOptions_hdr",
-        "//include/private:SkSLProgramKind_hdr",
-        "//include/private:SkSLString_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "GrShaderUtils_src",
-    srcs = ["GrShaderUtils.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":GrShaderUtils_hdr",
-        "//include/core:SkString_hdr",
-        "//include/gpu:GrContextOptions_hdr",
-        "//include/private:SkSLString_hdr",
-    ],
-)
-
 generated_cc_atom(
     name = "GrShaderVar_hdr",
     hdrs = ["GrShaderVar.h"],
@@ -2608,6 +2613,7 @@ generated_cc_atom(
     deps = [
         "//include/core:SkString_hdr",
         "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkSLTypeShared_hdr",
     ],
 )
 
@@ -2672,6 +2678,7 @@ generated_cc_atom(
     deps = [
         ":GrProcessor_hdr",
         ":GrStencilSettings_hdr",
+        ":KeyBuilder_hdr",
     ],
 )
 
@@ -3015,7 +3022,6 @@ generated_cc_atom(
         "//include/core:SkTypes_hdr",
         "//include/gpu:GrDirectContext_hdr",
         "//include/gpu:GrTypes_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//src/core:SkMipmap_hdr",
     ],
 )
@@ -3108,6 +3114,7 @@ generated_cc_atom(
         "//include/private:GrTypesPriv_hdr",
         "//include/private:SkTArray_hdr",
         "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkSLTypeShared_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
     ],
 )
@@ -3137,6 +3144,8 @@ generated_cc_atom(
     deps = [
         "//include/core:SkScalar_hdr",
         "//include/core:SkTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkSLTypeShared_hdr",
     ],
 )
 
@@ -3265,6 +3274,7 @@ generated_cc_atom(
         ":GrCaps_hdr",
         ":GrPipeline_hdr",
         ":GrXferProcessor_hdr",
+        ":KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
     ],
@@ -3432,3 +3442,53 @@ generated_cc_atom(
         "//src/gpu/effects:GrMatrixEffect_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "KeyBuilder_hdr",
+    hdrs = ["KeyBuilder.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkString_hdr",
+        "//include/private:SkTArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceKey_hdr",
+    hdrs = ["ResourceKey.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkData_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkOnce_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/private:SkTo_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceKey_src",
+    srcs = ["ResourceKey.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":ResourceKey_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShaderErrorHandler_src",
+    srcs = ["ShaderErrorHandler.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/gpu:ShaderErrorHandler_hdr",
+        "//src/utils:SkShaderUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkRenderEngineAbortf_hdr",
+    hdrs = ["SkRenderEngineAbortf.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
diff --git a/third_party/skia/src/gpu/BaseDevice.cpp b/third_party/skia/src/gpu/BaseDevice.cpp
index 36fa788eb596c..90f422251d938 100644
--- a/third_party/skia/src/gpu/BaseDevice.cpp
+++ b/third_party/skia/src/gpu/BaseDevice.cpp
@@ -14,7 +14,7 @@
 #include "src/gpu/SurfaceContext.h"
 #include "src/gpu/SurfaceFillContext.h"
 
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fContext->priv().singleOwner())
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fContext->priv().singleOwner())
 
 namespace skgpu {
 
diff --git a/third_party/skia/src/gpu/BaseDevice.h b/third_party/skia/src/gpu/BaseDevice.h
index 6bcdf5ee6aba9..7c9e2c3492dc7 100644
--- a/third_party/skia/src/gpu/BaseDevice.h
+++ b/third_party/skia/src/gpu/BaseDevice.h
@@ -58,6 +58,7 @@ class BaseDevice : public SkBaseDevice {
                       const GrBackendSemaphore* waitSemaphores,
                       bool deleteSemaphoresAfterWait) = 0;
     virtual void discard() = 0;
+    virtual void resolveMSAA() = 0;
 
     virtual bool replaceBackingProxy(SkSurface::ContentChangeMode,
                                      sk_sp<GrRenderTargetProxy>,
diff --git a/third_party/skia/src/gpu/BufferWriter.h b/third_party/skia/src/gpu/BufferWriter.h
index 40e9193a666cf..9c7f81c19c1d0 100644
--- a/third_party/skia/src/gpu/BufferWriter.h
+++ b/third_party/skia/src/gpu/BufferWriter.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef BufferWriter_DEFINED
-#define BufferWriter_DEFINED
+#ifndef skgpu_BufferWriter_DEFINED
+#define skgpu_BufferWriter_DEFINED
 
 #include "include/core/SkRect.h"
 #include "include/private/SkColorData.h"
@@ -18,21 +18,86 @@ namespace skgpu {
 
 struct BufferWriter {
 public:
-    operator bool() const { return fPtr != nullptr; }
+    // Marks a read-only position in the underlying buffer
+    struct Mark {
+    public:
+        Mark() : Mark(nullptr) {}
+        Mark(void* ptr, size_t offset = 0)
+                : fMark(reinterpret_cast<uintptr_t>(ptr) + offset) {
+            SkASSERT(ptr || offset == 0);
+        }
+
+        bool operator< (const Mark& o) const { return fMark <  o.fMark; }
+        bool operator<=(const Mark& o) const { return fMark <= o.fMark; }
+        bool operator==(const Mark& o) const { return fMark == o.fMark; }
+        bool operator!=(const Mark& o) const { return fMark != o.fMark; }
+        bool operator>=(const Mark& o) const { return fMark >= o.fMark; }
+        bool operator> (const Mark& o) const { return fMark >  o.fMark; }
+
+        ptrdiff_t operator-(const Mark& o) const { return fMark - o.fMark; }
+
+        explicit operator bool() const { return *this != Mark(); }
+    private:
+        uintptr_t fMark;
+    };
+
+    explicit operator bool() const { return fPtr != nullptr; }
+
+    Mark mark(size_t offset=0) const {
+        this->validate(offset);
+        return Mark(fPtr, offset);
+    }
 
 protected:
     BufferWriter() = default;
-    BufferWriter(void* ptr) : fPtr(ptr) {}
+    BufferWriter(void* ptr, size_t size) : fPtr(ptr) {
+        SkDEBUGCODE(fEnd = Mark(ptr, ptr ? size : 0);)
+    }
+    BufferWriter(void* ptr, Mark end = {}) : fPtr(ptr) {
+        SkDEBUGCODE(fEnd = end;)
+    }
 
     BufferWriter& operator=(const BufferWriter&) = delete;
     BufferWriter& operator=(BufferWriter&& that) {
         fPtr = that.fPtr;
         that.fPtr = nullptr;
+        SkDEBUGCODE(fEnd = that.fEnd;)
+        SkDEBUGCODE(that.fEnd = Mark();)
         return *this;
     }
 
+    // makeOffset effectively splits the current writer from {fPtr, fEnd} into {fPtr, p} and
+    // a new writer {p, fEnd}. The same data range is accessible, but each byte can only be
+    // set by a single writer. Automatically validates that there is enough bytes remaining in this
+    // writer to do such a split.
+    //
+    // This splitting and validation means that providers of BufferWriters to callers can easily
+    // and correctly track everything in a single BufferWriter field and use
+    //    return std::exchange(fCurrWriter, fCurrWriter.makeOffset(requestedBytes));
+    // This exposes the current writer position to the caller and sets the provider's new current
+    // position to be just after the requested bytes.
+    //
+    // Templated so that it can create subclasses directly.
+    template<typename W>
+    W makeOffset(size_t offsetInBytes) const {
+        this->validate(offsetInBytes);
+        void* p = SkTAddOffset<void>(fPtr, offsetInBytes);
+        Mark end{SkDEBUGCODE(fEnd)};
+        SkDEBUGCODE(fEnd = Mark(p);)
+        return W{p, end};
+    }
+
+    void validate(size_t bytesToWrite) const {
+        // If the buffer writer had an end marked, make sure we're not crossing it.
+        // Ideally, all creators of BufferWriters mark the end, but a lot of legacy code is not set
+        // up to easily do this.
+        SkASSERT(fPtr || bytesToWrite == 0);
+        SkASSERT(!fEnd || Mark(fPtr, bytesToWrite) <= fEnd);
+    }
+
 protected:
-    void* fPtr;
+    void* fPtr = nullptr;
+    SkDEBUGCODE(mutable Mark fEnd = {};)
 };
 
 /**
@@ -47,7 +112,12 @@ struct VertexWriter : public BufferWriter {
     inline constexpr static uint32_t kIEEE_32_infinity = 0x7f800000;
 
     VertexWriter() = default;
-    VertexWriter(void* ptr) : BufferWriter(ptr) {}
+    // DEPRECATED: Prefer specifying the size of the buffer being written to as well
+    explicit VertexWriter(void* ptr) : BufferWriter(ptr, Mark()) {}
+
+    VertexWriter(void* ptr, size_t size) : BufferWriter(ptr, size) {}
+    VertexWriter(void* ptr, Mark end) : BufferWriter(ptr, end) {}
+
     VertexWriter(const VertexWriter&) = delete;
     VertexWriter(VertexWriter&& that) { *this = std::move(that); }
 
@@ -57,15 +127,8 @@ struct VertexWriter : public BufferWriter {
         return *this;
     }
 
-    bool operator==(const VertexWriter& that) const { return fPtr == that.fPtr; }
-
-    // TODO: Remove this call. We want all users of VertexWriter to have to go through the vertex
-    // writer functions to write data. We do not want them to directly access fPtr and copy their
-    // own data.
-    void* ptr() const { return fPtr; }
-
-    VertexWriter makeOffset(ptrdiff_t offsetInBytes) const {
-        return {SkTAddOffset<void>(fPtr, offsetInBytes)};
+    VertexWriter makeOffset(size_t offsetInBytes) const {
+        return this->BufferWriter::makeOffset<VertexWriter>(offsetInBytes);
     }
 
     template <typename T>
@@ -201,6 +264,7 @@ struct VertexWriter : public BufferWriter {
 template <typename T>
 inline VertexWriter& operator<<(VertexWriter& w, const T& val) {
     static_assert(std::is_pod<T>::value, "");
+    w.validate(sizeof(T));
     memcpy(w.fPtr, &val, sizeof(T));
     w = w.makeOffset(sizeof(T));
     return w;
@@ -224,6 +288,7 @@ inline VertexWriter& operator<<(VertexWriter& w, const VertexWriter::Skip<T>& va
 template <typename T>
 inline VertexWriter& operator<<(VertexWriter& w, const VertexWriter::ArrayDesc<T>& array) {
     static_assert(std::is_pod<T>::value, "");
+    w.validate(array.fCount * sizeof(T));
     memcpy(w.fPtr, array.fArray, array.fCount * sizeof(T));
     w = w.makeOffset(sizeof(T) * array.fCount);
     return w;
@@ -239,11 +304,16 @@ inline VertexWriter& operator<<(VertexWriter& w, const VertexWriter::RepeatDesc<
 
 template <>
 SK_MAYBE_UNUSED inline VertexWriter& operator<<(VertexWriter& w, const Sk4f& vector) {
+    w.validate(sizeof(vector));
     vector.store(w.fPtr);
     w = w.makeOffset(sizeof(vector));
     return w;
 }
 
+// Allow r-value/temporary writers to be appended to
+template <typename T>
+inline VertexWriter& operator<<(VertexWriter&& w, const T& val) { return w << val; }
+
 template <typename T>
 struct VertexWriter::is_quad<VertexWriter::TriStrip<T>> : std::true_type {};
 
@@ -297,7 +367,10 @@ SK_MAYBE_UNUSED inline VertexWriter& operator<<(VertexWriter& w, const VertexCol
 
 struct IndexWriter : public BufferWriter {
     IndexWriter() = default;
-    IndexWriter(void* ptr) : BufferWriter(ptr) {}
+
+    IndexWriter(void* ptr, size_t size) : BufferWriter(ptr, size) {}
+    IndexWriter(void* ptr, Mark end) : BufferWriter(ptr, end) {}
+
     IndexWriter(const IndexWriter&) = delete;
     IndexWriter(IndexWriter&& that) { *this = std::move(that); }
 
@@ -307,31 +380,40 @@ struct IndexWriter : public BufferWriter {
         return *this;
     }
 
-    IndexWriter makeAdvance(int numIndices) const {
-        return {SkTAddOffset<void>(fPtr, numIndices * sizeof(uint16_t))};
+    IndexWriter makeOffset(int numIndices) const {
+        return this->BufferWriter::makeOffset<IndexWriter>(numIndices * sizeof(uint16_t));
     }
 
     void writeArray(const uint16_t* array, int count) {
-        memcpy(fPtr, array, count * sizeof(uint16_t));
-        fPtr = SkTAddOffset<void>(fPtr, count * sizeof(uint16_t));
+        size_t arraySize = count * sizeof(uint16_t);
+        this->validate(arraySize);
+        memcpy(fPtr, array, arraySize);
+        fPtr = SkTAddOffset<void>(fPtr, arraySize);
     }
 
     friend IndexWriter& operator<<(IndexWriter& w, uint16_t val);
 };
 
 inline IndexWriter& operator<<(IndexWriter& w, uint16_t val) {
+    w.validate(sizeof(uint16_t));
     memcpy(w.fPtr, &val, sizeof(uint16_t));
-    w = w.makeAdvance(1);
+    w = w.makeOffset(1);
     return w;
 }
 
 inline IndexWriter& operator<<(IndexWriter& w, int val) { return (w << SkTo<uint16_t>(val)); }
 
+template<typename T>
+inline IndexWriter& operator<<(IndexWriter&& w, const T& val) { return w << val; }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 struct UniformWriter : public BufferWriter {
     UniformWriter() = default;
-    UniformWriter(void* ptr) : BufferWriter(ptr) {}
+
+    UniformWriter(void* ptr, size_t size) : BufferWriter(ptr, size) {}
+    UniformWriter(void* ptr, Mark end) : BufferWriter(ptr, end) {}
+
     UniformWriter(const UniformWriter&) = delete;
     UniformWriter(UniformWriter&& that) { *this = std::move(that); }
 
@@ -342,6 +424,7 @@ struct UniformWriter : public BufferWriter {
     }
 
     void write(const void* src, size_t bytes) {
+        this->validate(bytes);
         memcpy(fPtr, src, bytes);
         fPtr = SkTAddOffset<void>(fPtr, bytes);
     }
@@ -349,4 +432,4 @@ struct UniformWriter : public BufferWriter {
 
 }  // namespace skgpu
 
-#endif // BufferWriter_DEFINED
+#endif // skgpu_BufferWriter_DEFINED
diff --git a/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.cpp b/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.cpp
index fe2012bb4aa32..f220b597122d8 100644
--- a/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -177,7 +177,7 @@ GrSurfaceProxyView GrAHardwareBufferImageGenerator::makeView(GrRecordingContext*
             GrInternalSurfaceFlags::kReadOnly, SkBackingFit::kExact, SkBudgeted::kNo,
             GrProtected(fIsProtectedContent), GrSurfaceProxy::UseAllocator::kYes);
 
-    GrSwizzle readSwizzle = context->priv().caps()->getReadSwizzle(backendFormat, grColorType);
+    skgpu::Swizzle readSwizzle = context->priv().caps()->getReadSwizzle(backendFormat, grColorType);
 
     return GrSurfaceProxyView(std::move(texProxy), fSurfaceOrigin, readSwizzle);
 }
diff --git a/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.h b/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.h
index b02ae4e2de4cd..01cc8cf3feddc 100644
--- a/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.h
+++ b/third_party/skia/src/gpu/GrAHardwareBufferImageGenerator.h
@@ -38,17 +38,18 @@ class GrAHardwareBufferImageGenerator : public SkImageGenerator {
 
     static void DeleteGLTexture(void* ctx);
 
-protected:
+private:
+    GrAHardwareBufferImageGenerator(const SkImageInfo&, AHardwareBuffer*, SkAlphaType,
+                                    bool isProtectedContent, uint32_t bufferFormat,
+                                    GrSurfaceOrigin surfaceOrigin);
 
     bool onIsValid(GrRecordingContext*) const override;
 
     GrSurfaceProxyView onGenerateTexture(GrRecordingContext*, const SkImageInfo&, const SkIPoint&,
                                          GrMipmapped, GrImageTexGenPolicy) override;
 
-private:
-    GrAHardwareBufferImageGenerator(const SkImageInfo&, AHardwareBuffer*, SkAlphaType,
-                                    bool isProtectedContent, uint32_t bufferFormat,
-                                    GrSurfaceOrigin surfaceOrigin);
+    GrSurfaceOrigin origin() const override { return fSurfaceOrigin; }
+
     GrSurfaceProxyView makeView(GrRecordingContext* context);
 
     void releaseTextureRef();
diff --git a/third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp b/third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp
index 30fd9e6dfb40c..2d8430f8350c2 100644
--- a/third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp
+++ b/third_party/skia/src/gpu/GrAHardwareBufferUtils.cpp
@@ -414,7 +414,7 @@ static GrBackendTexture make_vk_backend_texture(
         usageFlags,                                  // VkImageUsageFlags
         VK_SHARING_MODE_EXCLUSIVE,                   // VkSharingMode
         0,                                           // queueFamilyCount
-        0,                                           // pQueueFamilyIndices
+        nullptr,                                     // pQueueFamilyIndices
         VK_IMAGE_LAYOUT_UNDEFINED,                   // initialLayout
     };
 
diff --git a/third_party/skia/src/gpu/GrAttachment.cpp b/third_party/skia/src/gpu/GrAttachment.cpp
index 2966058991d5a..cece935612e3c 100644
--- a/third_party/skia/src/gpu/GrAttachment.cpp
+++ b/third_party/skia/src/gpu/GrAttachment.cpp
@@ -7,7 +7,6 @@
 
 #include "src/gpu/GrAttachment.h"
 
-#include "include/private/GrResourceKey.h"
 #include "src/gpu/GrBackendUtils.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrDataUtils.h"
@@ -34,7 +33,7 @@ size_t GrAttachment::onGpuMemorySize() const {
     return 0;
 }
 
-static void build_key(GrResourceKey::Builder* builder,
+static void build_key(skgpu::ResourceKey::Builder* builder,
                       const GrCaps& caps,
                       const GrBackendFormat& format,
                       SkISize dimensions,
@@ -69,10 +68,10 @@ void GrAttachment::ComputeSharedAttachmentUniqueKey(const GrCaps& caps,
                                                     GrMipmapped mipmapped,
                                                     GrProtected isProtected,
                                                     GrMemoryless memoryless,
-                                                    GrUniqueKey* key) {
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+                                                    skgpu::UniqueKey* key) {
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
 
-    GrUniqueKey::Builder builder(key, kDomain, 5);
+    skgpu::UniqueKey::Builder builder(key, kDomain, 5);
     build_key(&builder, caps, format, dimensions, requiredUsage, sampleCnt, mipmapped, isProtected,
               memoryless);
 }
@@ -85,15 +84,15 @@ void GrAttachment::ComputeScratchKey(const GrCaps& caps,
                                      GrMipmapped mipmapped,
                                      GrProtected isProtected,
                                      GrMemoryless memoryless,
-                                     GrScratchKey* key) {
-    static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
+                                     skgpu::ScratchKey* key) {
+    static const skgpu::ScratchKey::ResourceType kType = skgpu::ScratchKey::GenerateResourceType();
 
-    GrScratchKey::Builder builder(key, kType, 5);
+    skgpu::ScratchKey::Builder builder(key, kType, 5);
     build_key(&builder, caps, format, dimensions, requiredUsage, sampleCnt, mipmapped, isProtected,
               memoryless);
 }
 
-void GrAttachment::computeScratchKey(GrScratchKey* key) const {
+void GrAttachment::computeScratchKey(skgpu::ScratchKey* key) const {
     if (!SkToBool(fSupportedUsages & UsageFlags::kStencilAttachment)) {
         auto isProtected = this->isProtected() ? GrProtected::kYes : GrProtected::kNo;
         ComputeScratchKey(*this->getGpu()->caps(),
diff --git a/third_party/skia/src/gpu/GrAttachment.h b/third_party/skia/src/gpu/GrAttachment.h
index 42d07022d139d..72345c67fec42 100644
--- a/third_party/skia/src/gpu/GrAttachment.h
+++ b/third_party/skia/src/gpu/GrAttachment.h
@@ -12,7 +12,6 @@
 #include "src/gpu/GrSurface.h"
 
 class GrRenderTarget;
-class GrResourceKey;
 
 /**
  * This is a generic attachment class for out GrSurfaces. It always represents a single gpu
@@ -55,7 +54,7 @@ class GrAttachment : public GrSurface {
                                                  GrMipmapped mipmapped,
                                                  GrProtected isProtected,
                                                  GrMemoryless memoryless,
-                                                 GrUniqueKey* key);
+                                                 skgpu::UniqueKey* key);
 
     // TODO: Once attachments start having multiple usages, we'll need to figure out how to search
     // the cache for an attachment that simply contains the requested usage instead of equaling it.
@@ -67,7 +66,7 @@ class GrAttachment : public GrSurface {
                                   GrMipmapped mipmapped,
                                   GrProtected,
                                   GrMemoryless,
-                                  GrScratchKey* key);
+                                  skgpu::ScratchKey* key);
 
 protected:
     GrAttachment(GrGpu* gpu, SkISize dimensions, UsageFlags supportedUsages, int sampleCnt,
@@ -82,7 +81,7 @@ class GrAttachment : public GrSurface {
 private:
     size_t onGpuMemorySize() const final;
 
-    void computeScratchKey(GrScratchKey*) const final;
+    void computeScratchKey(skgpu::ScratchKey*) const final;
 
     const char* getResourceType() const override {
         if (fSupportedUsages == UsageFlags::kStencilAttachment) {
diff --git a/third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp b/third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp
index 33d67fe415932..7dd91c51fc1ed 100644
--- a/third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp
+++ b/third_party/skia/src/gpu/GrBackendTextureImageGenerator.cpp
@@ -142,8 +142,8 @@ GrSurfaceProxyView GrBackendTextureImageGenerator::onGenerateTexture(
     }
     fRefHelper->fBorrowingContextID = dContext->directContextID();
     if (!fRefHelper->fBorrowedTextureKey.isValid()) {
-        static const auto kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(&fRefHelper->fBorrowedTextureKey, kDomain, 1);
+        static const auto kDomain = skgpu::UniqueKey::GenerateDomain();
+        skgpu::UniqueKey::Builder builder(&fRefHelper->fBorrowedTextureKey, kDomain, 1);
         builder[0] = this->uniqueID();
     }
     fBorrowingMutex.release();
@@ -163,7 +163,8 @@ GrSurfaceProxyView GrBackendTextureImageGenerator::onGenerateTexture(
     GrMipmapStatus mipmapStatus = fBackendTexture.hasMipmaps()
             ? GrMipmapStatus::kValid : GrMipmapStatus::kNotAllocated;
 
-    GrSwizzle readSwizzle = dContext->priv().caps()->getReadSwizzle(backendFormat, grColorType);
+    skgpu::Swizzle readSwizzle = dContext->priv().caps()->getReadSwizzle(backendFormat,
+                                                                         grColorType);
 
     // Must make copies of member variables to capture in the lambda since this image generator may
     // be deleted before we actually execute the lambda.
diff --git a/third_party/skia/src/gpu/GrBackendTextureImageGenerator.h b/third_party/skia/src/gpu/GrBackendTextureImageGenerator.h
index 72bdc96ea7d12..8e7e745013e3b 100644
--- a/third_party/skia/src/gpu/GrBackendTextureImageGenerator.h
+++ b/third_party/skia/src/gpu/GrBackendTextureImageGenerator.h
@@ -10,9 +10,9 @@
 #include "include/core/SkImageGenerator.h"
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/GrDirectContext.h"
-#include "include/private/GrResourceKey.h"
 #include "include/private/SkMutex.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/ResourceKey.h"
 
 class GrSemaphore;
 
@@ -70,7 +70,7 @@ class GrBackendTextureImageGenerator : public SkImageGenerator {
 
         // We use this key so that we don't rewrap the GrBackendTexture in a GrTexture for each
         // proxy created from this generator for a particular borrowing context.
-        GrUniqueKey                      fBorrowedTextureKey;
+        skgpu::UniqueKey                 fBorrowedTextureKey;
         // There is no ref associated with this pointer. We rely on our atomic bookkeeping with the
         // context ID to know when this pointer is valid and safe to use. This is used to make sure
         // all uses of the wrapped texture are finished on the borrowing context before we open
diff --git a/third_party/skia/src/gpu/GrBaseContextPriv.h b/third_party/skia/src/gpu/GrBaseContextPriv.h
index 86960c77bd6f0..cde8661ad26a8 100644
--- a/third_party/skia/src/gpu/GrBaseContextPriv.h
+++ b/third_party/skia/src/gpu/GrBaseContextPriv.h
@@ -8,6 +8,7 @@
 #ifndef GrBaseContextPriv_DEFINED
 #define GrBaseContextPriv_DEFINED
 
+#include "include/gpu/GrContextOptions.h"
 #include "include/private/GrContext_Base.h"
 
 /** Class that exposes methods on GrContext_Base that are only intended for use internal to Skia.
@@ -34,8 +35,6 @@ class GrBaseContextPriv {
     GrContextOptions::ShaderErrorHandler* getShaderErrorHandler() const;
 
 protected:
-    // Required until C++17 copy elision
-    GrBaseContextPriv(const GrBaseContextPriv&) = default;
     explicit GrBaseContextPriv(GrContext_Base* context) : fContext(context) {}
 
     GrContext_Base* fContext;
diff --git a/third_party/skia/src/gpu/GrBlurUtils.cpp b/third_party/skia/src/gpu/GrBlurUtils.cpp
index 2f2e79f7e2507..4ed0971527bba 100644
--- a/third_party/skia/src/gpu/GrBlurUtils.cpp
+++ b/third_party/skia/src/gpu/GrBlurUtils.cpp
@@ -53,7 +53,7 @@ static bool draw_mask(skgpu::v1::SurfaceDrawContext* sdc,
         return false;
     }
 
-    mask.concatSwizzle(GrSwizzle("aaaa"));
+    mask.concatSwizzle(skgpu::Swizzle("aaaa"));
 
     SkMatrix matrix = SkMatrix::Translate(-SkIntToScalar(maskBounds.fLeft),
                                           -SkIntToScalar(maskBounds.fTop));
@@ -101,7 +101,7 @@ static GrSurfaceProxyView sw_create_filtered_mask(GrRecordingContext* rContext,
                                                   const SkIRect& unclippedDevShapeBounds,
                                                   const SkIRect& clipBounds,
                                                   SkIRect* drawRect,
-                                                  GrUniqueKey* key) {
+                                                  skgpu::UniqueKey* key) {
     SkASSERT(filter);
     SkASSERT(!shape.style().applies());
 
@@ -133,7 +133,7 @@ static GrSurfaceProxyView sw_create_filtered_mask(GrRecordingContext* rContext,
         devPath.transform(viewMatrix);
 
         SkMask srcM, dstM;
-        if (!SkDraw::DrawToMask(devPath, &clipBounds, filter, &viewMatrix, &srcM,
+        if (!SkDraw::DrawToMask(devPath, clipBounds, filter, &viewMatrix, &srcM,
                                 SkMask::kComputeBoundsAndRenderImage_CreateMode, fillOrHairline)) {
             return {};
         }
@@ -237,12 +237,17 @@ static std::unique_ptr<skgpu::v1::SurfaceDrawContext> create_mask_GPU(
 
 static bool get_unclipped_shape_dev_bounds(const GrStyledShape& shape, const SkMatrix& matrix,
                                            SkIRect* devBounds) {
-    SkRect shapeBounds = shape.styledBounds();
-    if (shapeBounds.isEmpty()) {
-        return false;
-    }
     SkRect shapeDevBounds;
-    matrix.mapRect(&shapeDevBounds, shapeBounds);
+    if (shape.inverseFilled()) {
+        shapeDevBounds = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+                          SK_ScalarInfinity, SK_ScalarInfinity};
+    } else {
+        SkRect shapeBounds = shape.styledBounds();
+        if (shapeBounds.isEmpty()) {
+            return false;
+        }
+        matrix.mapRect(&shapeDevBounds, shapeBounds);
+    }
     // Even though these are "unclipped" bounds we still clip to the int32_t range.
     // This is the largest int32_t that is representable exactly as a float. The next 63 larger ints
     // would round down to this value when cast to a float, but who really cares.
@@ -283,7 +288,7 @@ static bool get_shape_and_clip_bounds(skgpu::v1::SurfaceDrawContext* sdc,
 // The key and clip-bounds are computed together because the caching decision can impact the
 // clip-bound - since we only cache un-clipped masks the clip can be removed entirely.
 // A 'false' return value indicates that the shape is known to be clipped away.
-static bool compute_key_and_clip_bounds(GrUniqueKey* maskKey,
+static bool compute_key_and_clip_bounds(skgpu::UniqueKey* maskKey,
                                         SkIRect* boundsForClip,
                                         const GrCaps* caps,
                                         const SkMatrix& viewMatrix,
@@ -326,8 +331,8 @@ static bool compute_key_and_clip_bounds(GrUniqueKey* maskKey,
     }
 
     if (useCache) {
-        static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(maskKey, kDomain, 5 + 2 + shape.unstyledKeySize(),
+        static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+        skgpu::UniqueKey::Builder builder(maskKey, kDomain, 5 + 2 + shape.unstyledKeySize(),
                                      "Mask Filtered Masks");
 
         // We require the upper left 2x2 of the matrix to match exactly for a cache hit.
@@ -375,7 +380,7 @@ static GrSurfaceProxyView hw_create_filtered_mask(GrDirectContext* dContext,
                                                   const SkIRect& unclippedDevShapeBounds,
                                                   const SkIRect& clipBounds,
                                                   SkIRect* maskRect,
-                                                  GrUniqueKey* key) {
+                                                  skgpu::UniqueKey* key) {
     if (!filter->canFilterMaskGPU(shape,
                                   unclippedDevShapeBounds,
                                   clipBounds,
@@ -508,7 +513,7 @@ static void draw_shape_with_mask_filter(GrRecordingContext* rContext,
         }
     }
 
-    GrUniqueKey maskKey;
+    skgpu::UniqueKey maskKey;
     SkIRect boundsForClip;
     if (!compute_key_and_clip_bounds(&maskKey, &boundsForClip,
                                      sdc->caps(),
diff --git a/third_party/skia/src/gpu/GrCaps.cpp b/third_party/skia/src/gpu/GrCaps.cpp
index 00de8c41e5e15..23cb03709838f 100644
--- a/third_party/skia/src/gpu/GrCaps.cpp
+++ b/third_party/skia/src/gpu/GrCaps.cpp
@@ -31,6 +31,7 @@ GrCaps::GrCaps(const GrContextOptions& options) {
     fConservativeRasterSupport = false;
     fWireframeSupport = false;
     fMSAAResolvesAutomatically = false;
+    fPreferDiscardableMSAAAttachment = false;
     fUsePrimitiveRestart = false;
     fPreferClientSideDynamicBuffers = false;
     fPreferFullscreenClears = false;
@@ -421,11 +422,11 @@ bool GrCaps::areColorTypeAndFormatCompatible(GrColorType grCT,
     return this->onAreColorTypeAndFormatCompatible(grCT, format);
 }
 
-GrSwizzle GrCaps::getReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrCaps::getReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
     SkImage::CompressionType compression = GrBackendFormatToCompressionType(format);
     if (compression != SkImage::CompressionType::kNone) {
         if (colorType == GrColorType::kRGB_888x || colorType == GrColorType::kRGBA_8888) {
-            return GrSwizzle::RGBA();
+            return skgpu::Swizzle::RGBA();
         }
         SkDEBUGFAILF("Illegal color type (%d) and compressed format (%d) combination.",
                      (int)colorType, (int)compression);
diff --git a/third_party/skia/src/gpu/GrCaps.h b/third_party/skia/src/gpu/GrCaps.h
index 53bd1cd8df692..bb9e301a3faf7 100644
--- a/third_party/skia/src/gpu/GrCaps.h
+++ b/third_party/skia/src/gpu/GrCaps.h
@@ -18,19 +18,22 @@
 #include "src/gpu/GrSamplerState.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrSurfaceProxy.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 
 class GrBackendFormat;
 class GrBackendRenderTarget;
 class GrBackendTexture;
 struct GrContextOptions;
-class GrProcessorKeyBuilder;
 class GrProgramDesc;
 class GrProgramInfo;
 class GrRenderTargetProxy;
 class GrSurface;
 class SkJSONWriter;
 
+namespace skgpu {
+class KeyBuilder;
+}
+
 /**
  * Represents the capabilities of a GrContext.
  */
@@ -72,6 +75,13 @@ class GrCaps : public SkRefCnt {
     // an MSAA-render-to-texture extension: Any render target we create internally will use the
     // extension, and any wrapped render target is the client's responsibility.
     bool msaaResolvesAutomatically() const { return fMSAAResolvesAutomatically; }
+    // If true then when doing MSAA draws, we will prefer to discard the msaa attachment on load
+    // and stores. The use of this feature for specific draws depends on the render target having a
+    // resolve attachment, and if we need to load previous data the resolve attachment must be
+    // usable as an input attachment/texture. Otherwise we will just write out and store the msaa
+    // attachment like normal.
+    // This flag is similar to enabling gl render to texture for msaa rendering.
+    bool preferDiscardableMSAAAttachment() const { return fPreferDiscardableMSAAAttachment; }
     bool halfFloatVertexAttributeSupport() const { return fHalfFloatVertexAttributeSupport; }
 
     // Primitive restart functionality is core in ES 3.0, but using it will cause slowdowns on some
@@ -436,16 +446,16 @@ class GrCaps : public SkRefCnt {
     bool clampToBorderSupport() const { return fClampToBorderSupport; }
 
     /**
-     * Returns the GrSwizzle to use when sampling or reading back from a texture with the passed in
-     * GrBackendFormat and GrColorType.
+     * Returns the skgpu::Swizzle to use when sampling or reading back from a texture with the
+     * passed in GrBackendFormat and GrColorType.
      */
-    GrSwizzle getReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const;
+    skgpu::Swizzle getReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const;
 
     /**
-     * Returns the GrSwizzle to use when writing colors to a surface with the passed in
+     * Returns the skgpu::Swizzle to use when writing colors to a surface with the passed in
      * GrBackendFormat and GrColorType.
      */
-    virtual GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const = 0;
+    virtual skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const = 0;
 
     virtual uint64_t computeFormatKey(const GrBackendFormat&) const = 0;
 
@@ -456,7 +466,7 @@ class GrCaps : public SkRefCnt {
      * in parameters. Currently this extra keying is only needed when building a vulkan pipeline
      * with immutable samplers.
      */
-    virtual void addExtraSamplerKey(GrProcessorKeyBuilder*,
+    virtual void addExtraSamplerKey(skgpu::KeyBuilder*,
                                     GrSamplerState,
                                     const GrBackendFormat&) const {}
 
@@ -541,6 +551,7 @@ class GrCaps : public SkRefCnt {
     bool fConservativeRasterSupport                  : 1;
     bool fWireframeSupport                           : 1;
     bool fMSAAResolvesAutomatically                  : 1;
+    bool fPreferDiscardableMSAAAttachment            : 1;
     bool fUsePrimitiveRestart                        : 1;
     bool fPreferClientSideDynamicBuffers             : 1;
     bool fPreferFullscreenClears                     : 1;
@@ -626,7 +637,7 @@ class GrCaps : public SkRefCnt {
                                                          const GrBackendFormat& srcFormat,
                                                          GrColorType dstColorType) const = 0;
 
-    virtual GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const = 0;
+    virtual skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const = 0;
 
     virtual GrDstSampleFlags onGetDstSampleFlagsForProxy(const GrRenderTargetProxy*) const {
         return GrDstSampleFlags::kNone;
diff --git a/third_party/skia/src/gpu/GrColorSpaceXform.cpp b/third_party/skia/src/gpu/GrColorSpaceXform.cpp
index 701665dd545d2..72d55c58ef8a0 100644
--- a/third_party/skia/src/gpu/GrColorSpaceXform.cpp
+++ b/third_party/skia/src/gpu/GrColorSpaceXform.cpp
@@ -10,6 +10,7 @@
 #include "include/core/SkColorSpace.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/gpu/GrColorInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 
@@ -82,7 +83,7 @@ bool GrColorSpaceXformEffect::onIsEqual(const GrFragmentProcessor& s) const {
     return GrColorSpaceXform::Equals(fColorXform.get(), other.fColorXform.get());
 }
 
-void GrColorSpaceXformEffect::onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
+void GrColorSpaceXformEffect::onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const {
     b->add32(GrColorSpaceXform::XformKey(fColorXform.get()));
 }
 
diff --git a/third_party/skia/src/gpu/GrColorSpaceXform.h b/third_party/skia/src/gpu/GrColorSpaceXform.h
index c81667e856102..6f09299390704 100644
--- a/third_party/skia/src/gpu/GrColorSpaceXform.h
+++ b/third_party/skia/src/gpu/GrColorSpaceXform.h
@@ -96,7 +96,7 @@ class GrColorSpaceXformEffect : public GrFragmentProcessor {
     SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& input) const override;
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
     sk_sp<GrColorSpaceXform> fColorXform;
diff --git a/third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp b/third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp
index 573fa6ee3c03f..161aaba024575 100644
--- a/third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/third_party/skia/src/gpu/GrContextThreadSafeProxy.cpp
@@ -41,7 +41,7 @@ GrContextThreadSafeProxy::~GrContextThreadSafeProxy() = default;
 void GrContextThreadSafeProxy::init(sk_sp<const GrCaps> caps,
                                     sk_sp<GrThreadSafePipelineBuilder> pipelineBuilder) {
     fCaps = std::move(caps);
-    fTextBlobCache = std::make_unique<GrTextBlobCache>(fContextID);
+    fTextBlobRedrawCoordinator = std::make_unique<GrTextBlobRedrawCoordinator>(fContextID);
     fThreadSafeCache = std::make_unique<GrThreadSafeCache>();
     fPipelineBuilder = std::move(pipelineBuilder);
 }
@@ -164,7 +164,7 @@ GrBackendFormat GrContextThreadSafeProxy::compressedBackendFormat(SkImage::Compr
 
 void GrContextThreadSafeProxy::abandonContext() {
     if (!fAbandoned.exchange(true)) {
-        fTextBlobCache->freeAll();
+        fTextBlobRedrawCoordinator->freeAll();
     }
 }
 
diff --git a/third_party/skia/src/gpu/GrContextThreadSafeProxyPriv.h b/third_party/skia/src/gpu/GrContextThreadSafeProxyPriv.h
index e71ccc132f048..36335603c99f0 100644
--- a/third_party/skia/src/gpu/GrContextThreadSafeProxyPriv.h
+++ b/third_party/skia/src/gpu/GrContextThreadSafeProxyPriv.h
@@ -12,7 +12,7 @@
 #include "include/private/GrContext_Base.h"
 
 #include "src/gpu/GrCaps.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 
 /**
  * Class that adds methods to GrContextThreadSafeProxy that are only intended for use internal to
@@ -34,8 +34,12 @@ class GrContextThreadSafeProxyPriv {
     const GrCaps* caps() const { return fProxy->fCaps.get(); }
     sk_sp<const GrCaps> refCaps() const { return fProxy->fCaps; }
 
-    GrTextBlobCache* getTextBlobCache() { return fProxy->fTextBlobCache.get(); }
-    const GrTextBlobCache* getTextBlobCache() const { return fProxy->fTextBlobCache.get(); }
+    GrTextBlobRedrawCoordinator* getTextBlobRedrawCoordinator() {
+        return fProxy->fTextBlobRedrawCoordinator.get();
+    }
+    const GrTextBlobRedrawCoordinator* getTextBlobRedrawCoordinator() const {
+        return fProxy->fTextBlobRedrawCoordinator.get();
+    }
 
     GrThreadSafeCache* threadSafeCache() { return fProxy->fThreadSafeCache.get(); }
     const GrThreadSafeCache* threadSafeCache() const { return fProxy->fThreadSafeCache.get(); }
@@ -48,8 +52,6 @@ class GrContextThreadSafeProxyPriv {
 
 private:
     explicit GrContextThreadSafeProxyPriv(GrContextThreadSafeProxy* proxy) : fProxy(proxy) {}
-    // Required until C++17 copy elision
-    GrContextThreadSafeProxyPriv(const GrContextThreadSafeProxyPriv&) = default;
     GrContextThreadSafeProxyPriv& operator=(const GrContextThreadSafeProxyPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrContext_Base.cpp b/third_party/skia/src/gpu/GrContext_Base.cpp
index 50144c73abe73..9a9c541707c4a 100644
--- a/third_party/skia/src/gpu/GrContext_Base.cpp
+++ b/third_party/skia/src/gpu/GrContext_Base.cpp
@@ -7,10 +7,10 @@
 
 #include "include/private/GrContext_Base.h"
 
+#include "include/gpu/ShaderErrorHandler.h"
 #include "src/gpu/GrBaseContextPriv.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrContextThreadSafeProxyPriv.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 
 GrContext_Base::GrContext_Base(sk_sp<GrContextThreadSafeProxy> proxy)
@@ -54,5 +54,5 @@ sk_sp<const GrCaps> GrBaseContextPriv::refCaps() const {
 GrContextOptions::ShaderErrorHandler* GrBaseContextPriv::getShaderErrorHandler() const {
     const GrContextOptions& options(this->options());
     return options.fShaderErrorHandler ? options.fShaderErrorHandler
-                                       : GrShaderUtils::DefaultShaderErrorHandler();
+                                       : skgpu::DefaultShaderErrorHandler();
 }
diff --git a/third_party/skia/src/gpu/GrDataUtils.cpp b/third_party/skia/src/gpu/GrDataUtils.cpp
index 232c1d998281c..af836eac0f9db 100644
--- a/third_party/skia/src/gpu/GrDataUtils.cpp
+++ b/third_party/skia/src/gpu/GrDataUtils.cpp
@@ -22,7 +22,7 @@
 #include "src/gpu/GrColor.h"
 #include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrPixmap.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 
 struct ETC1Block {
     uint32_t fHigh;
@@ -344,9 +344,9 @@ void GrFillInCompressedData(SkImage::CompressionType type, SkISize dimensions,
     }
 }
 
-static GrSwizzle get_load_and_src_swizzle(GrColorType ct, SkRasterPipeline::StockStage* load,
-                                          bool* isNormalized, bool* isSRGB) {
-    GrSwizzle swizzle("rgba");
+static skgpu::Swizzle get_load_and_src_swizzle(GrColorType ct, SkRasterPipeline::StockStage* load,
+                                               bool* isNormalized, bool* isSRGB) {
+    skgpu::Swizzle swizzle("rgba");
     *isNormalized = true;
     *isSRGB = false;
     switch (ct) {
@@ -354,15 +354,15 @@ static GrSwizzle get_load_and_src_swizzle(GrColorType ct, SkRasterPipeline::Stoc
         case GrColorType::kAlpha_16:         *load = SkRasterPipeline::load_a16;      break;
         case GrColorType::kBGR_565:          *load = SkRasterPipeline::load_565;      break;
         case GrColorType::kABGR_4444:        *load = SkRasterPipeline::load_4444;     break;
-        case GrColorType::kARGB_4444:        swizzle = GrSwizzle("bgra");
+        case GrColorType::kARGB_4444:        swizzle = skgpu::Swizzle("bgra");
                                              *load = SkRasterPipeline::load_4444;     break;
-        case GrColorType::kBGRA_4444:        swizzle = GrSwizzle("gbar");
+        case GrColorType::kBGRA_4444:        swizzle = skgpu::Swizzle("gbar");
                                              *load = SkRasterPipeline::load_4444;     break;
         case GrColorType::kRGBA_8888:        *load = SkRasterPipeline::load_8888;     break;
         case GrColorType::kRG_88:            *load = SkRasterPipeline::load_rg88;     break;
         case GrColorType::kRGBA_1010102:     *load = SkRasterPipeline::load_1010102;  break;
         case GrColorType::kBGRA_1010102:     *load = SkRasterPipeline::load_1010102;
-                                             swizzle = GrSwizzle("bgra");
+                                             swizzle = skgpu::Swizzle("bgra");
                                              break;
         case GrColorType::kAlpha_F16:        *load = SkRasterPipeline::load_af16;     break;
         case GrColorType::kRGBA_F16_Clamped: *load = SkRasterPipeline::load_f16;      break;
@@ -382,30 +382,35 @@ static GrSwizzle get_load_and_src_swizzle(GrColorType ct, SkRasterPipeline::Stoc
                                              *isNormalized = false;
                                              break;
         case GrColorType::kAlpha_8xxx:       *load = SkRasterPipeline::load_8888;
-                                             swizzle = GrSwizzle("000r");
+                                             swizzle = skgpu::Swizzle("000r");
                                              break;
         case GrColorType::kAlpha_F32xxx:     *load = SkRasterPipeline::load_f32;
-                                             swizzle = GrSwizzle("000r");
+                                             swizzle = skgpu::Swizzle("000r");
                                              break;
         case GrColorType::kGray_8xxx:       *load = SkRasterPipeline::load_8888;
-                                             swizzle = GrSwizzle("rrr1");
+                                             swizzle = skgpu::Swizzle("rrr1");
                                              break;
         case GrColorType::kGray_8:           *load = SkRasterPipeline::load_a8;
-                                             swizzle = GrSwizzle("aaa1");
+                                             swizzle = skgpu::Swizzle("aaa1");
+                                             break;
+        case GrColorType::kR_8xxx:           *load = SkRasterPipeline::load_8888;
+                                             swizzle = skgpu::Swizzle("r001");
+                                             break;
+        case GrColorType::kR_8:              *load = SkRasterPipeline::load_a8;
+                                             swizzle = skgpu::Swizzle("a001");
                                              break;
         case GrColorType::kGrayAlpha_88:    *load = SkRasterPipeline::load_rg88;
-                                             swizzle = GrSwizzle("rrrg");
+                                             swizzle = skgpu::Swizzle("rrrg");
                                              break;
         case GrColorType::kBGRA_8888:        *load = SkRasterPipeline::load_8888;
-                                             swizzle = GrSwizzle("bgra");
+                                             swizzle = skgpu::Swizzle("bgra");
                                              break;
         case GrColorType::kRGB_888x:         *load = SkRasterPipeline::load_8888;
-                                             swizzle = GrSwizzle("rgb1");
+                                             swizzle = skgpu::Swizzle("rgb1");
                                              break;
 
         // These are color types we don't expect to ever have to load.
         case GrColorType::kRGB_888:
-        case GrColorType::kR_8:
         case GrColorType::kR_16:
         case GrColorType::kR_F16:
         case GrColorType::kGray_F16:
@@ -421,9 +426,10 @@ enum class LumMode {
     kToAlpha
 };
 
-static GrSwizzle get_dst_swizzle_and_store(GrColorType ct, SkRasterPipeline::StockStage* store,
-                                           LumMode* lumMode, bool* isNormalized, bool* isSRGB) {
-    GrSwizzle swizzle("rgba");
+static skgpu::Swizzle get_dst_swizzle_and_store(GrColorType ct, SkRasterPipeline::StockStage* store,
+                                                LumMode* lumMode, bool* isNormalized,
+                                                bool* isSRGB) {
+    skgpu::Swizzle swizzle("rgba");
     *isNormalized = true;
     *isSRGB = false;
     *lumMode = LumMode::kNone;
@@ -432,14 +438,14 @@ static GrSwizzle get_dst_swizzle_and_store(GrColorType ct, SkRasterPipeline::Sto
         case GrColorType::kAlpha_16:         *store = SkRasterPipeline::store_a16;      break;
         case GrColorType::kBGR_565:          *store = SkRasterPipeline::store_565;      break;
         case GrColorType::kABGR_4444:        *store = SkRasterPipeline::store_4444;     break;
-        case GrColorType::kARGB_4444:        swizzle = GrSwizzle("bgra");
+        case GrColorType::kARGB_4444:        swizzle = skgpu::Swizzle("bgra");
                                              *store = SkRasterPipeline::store_4444;     break;
-        case GrColorType::kBGRA_4444:        swizzle = GrSwizzle("argb");
+        case GrColorType::kBGRA_4444:        swizzle = skgpu::Swizzle("argb");
                                              *store = SkRasterPipeline::store_4444;     break;
         case GrColorType::kRGBA_8888:        *store = SkRasterPipeline::store_8888;     break;
         case GrColorType::kRG_88:            *store = SkRasterPipeline::store_rg88;     break;
         case GrColorType::kRGBA_1010102:     *store = SkRasterPipeline::store_1010102;  break;
-        case GrColorType::kBGRA_1010102:     swizzle = GrSwizzle("bgra");
+        case GrColorType::kBGRA_1010102:     swizzle = skgpu::Swizzle("bgra");
                                              *store = SkRasterPipeline::store_1010102;
                                              break;
         case GrColorType::kRGBA_F16_Clamped: *store = SkRasterPipeline::store_f16;      break;
@@ -462,24 +468,27 @@ static GrSwizzle get_dst_swizzle_and_store(GrColorType ct, SkRasterPipeline::Sto
                                              *isNormalized = false;
                                              break;
         case GrColorType::kAlpha_8xxx:       *store = SkRasterPipeline::store_8888;
-                                             swizzle = GrSwizzle("a000");
+                                             swizzle = skgpu::Swizzle("a000");
                                              break;
         case GrColorType::kAlpha_F32xxx:     *store = SkRasterPipeline::store_f32;
-                                             swizzle = GrSwizzle("a000");
+                                             swizzle = skgpu::Swizzle("a000");
+                                             break;
+        case GrColorType::kBGRA_8888:        swizzle = skgpu::Swizzle("bgra");
+                                             *store = SkRasterPipeline::store_8888;
                                              break;
-        case GrColorType::kBGRA_8888:        swizzle = GrSwizzle("bgra");
+        case GrColorType::kRGB_888x:         swizzle = skgpu::Swizzle("rgb1");
                                              *store = SkRasterPipeline::store_8888;
                                              break;
-        case GrColorType::kRGB_888x:         swizzle = GrSwizzle("rgb1");
+        case GrColorType::kR_8xxx:           swizzle = skgpu::Swizzle("r001");
                                              *store = SkRasterPipeline::store_8888;
                                              break;
-        case GrColorType::kR_8:              swizzle = GrSwizzle("agbr");
+        case GrColorType::kR_8:              swizzle = skgpu::Swizzle("agbr");
                                              *store = SkRasterPipeline::store_a8;
                                              break;
-        case GrColorType::kR_16:             swizzle = GrSwizzle("agbr");
+        case GrColorType::kR_16:             swizzle = skgpu::Swizzle("agbr");
                                              *store = SkRasterPipeline::store_a16;
                                              break;
-        case GrColorType::kR_F16:            swizzle = GrSwizzle("agbr");
+        case GrColorType::kR_F16:            swizzle = skgpu::Swizzle("agbr");
                                              *store = SkRasterPipeline::store_af16;
                                              break;
         case GrColorType::kGray_F16:         *lumMode = LumMode::kToAlpha;
@@ -489,12 +498,12 @@ static GrSwizzle get_dst_swizzle_and_store(GrColorType ct, SkRasterPipeline::Sto
                                              *store = SkRasterPipeline::store_a8;
                                              break;
         case GrColorType::kGrayAlpha_88:     *lumMode = LumMode::kToRGB;
-                                             swizzle = GrSwizzle("ragb");
+                                             swizzle = skgpu::Swizzle("ragb");
                                              *store = SkRasterPipeline::store_rg88;
                                              break;
         case GrColorType::kGray_8xxx:        *lumMode = LumMode::kToRGB;
                                              *store = SkRasterPipeline::store_8888;
-                                             swizzle = GrSwizzle("r000");
+                                             swizzle = skgpu::Swizzle("r000");
                                              break;
 
         // These are color types we don't expect to ever have to store.
@@ -611,14 +620,14 @@ bool GrConvertPixels(const GrPixmap& dst, const GrCPixmap& src, bool flipY) {
 
     bool clampGamut;
     SkTLazy<SkColorSpaceXformSteps> steps;
-    GrSwizzle loadStoreSwizzle;
+    skgpu::Swizzle loadStoreSwizzle;
     if (alphaOrCSConversion) {
         steps.init(src.colorSpace(), src.alphaType(), dst.colorSpace(), dst.alphaType());
         clampGamut = dstIsNormalized && dst.alphaType() == kPremul_SkAlphaType;
     } else {
         clampGamut = dstIsNormalized && !srcIsNormalized && dst.alphaType() == kPremul_SkAlphaType;
         if (!clampGamut) {
-            loadStoreSwizzle = GrSwizzle::Concat(loadSwizzle, storeSwizzle);
+            loadStoreSwizzle = skgpu::Swizzle::Concat(loadSwizzle, storeSwizzle);
         }
     }
     int cnt = 1;
@@ -718,8 +727,8 @@ bool GrClearImage(const GrImageInfo& dstInfo, void* dst, size_t dstRB, std::arra
     bool isNormalized;
     bool dstIsSRGB;
     SkRasterPipeline::StockStage store;
-    GrSwizzle storeSwizzle = get_dst_swizzle_and_store(dstInfo.colorType(), &store, &lumMode,
-                                                       &isNormalized, &dstIsSRGB);
+    skgpu::Swizzle storeSwizzle = get_dst_swizzle_and_store(dstInfo.colorType(), &store, &lumMode,
+                                                            &isNormalized, &dstIsSRGB);
     char block[64];
     SkArenaAlloc alloc(block, sizeof(block), 1024);
     SkRasterPipeline_<256> pipeline;
diff --git a/third_party/skia/src/gpu/GrDefaultGeoProcFactory.cpp b/third_party/skia/src/gpu/GrDefaultGeoProcFactory.cpp
index 2bb005102c2f4..b2918e5581c6d 100644
--- a/third_party/skia/src/gpu/GrDefaultGeoProcFactory.cpp
+++ b/third_party/skia/src/gpu/GrDefaultGeoProcFactory.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkArenaAlloc.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
@@ -48,7 +49,7 @@ class DefaultGeoProc : public GrGeometryProcessor {
 
     const char* name() const override { return "DefaultGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         uint32_t key = fFlags;
         key |= fCoverage == 0xff      ?  0x80 : 0;
         key |= fLocalCoordsWillBeRead ? 0x100 : 0;
@@ -110,7 +111,7 @@ class DefaultGeoProc : public GrGeometryProcessor {
             // Setup pass through color
             fragBuilder->codeAppendf("half4 %s;", args.fOutputColor);
             if (gp.hasVertexColor() || tweakAlpha) {
-                GrGLSLVarying varying(kHalf4_GrSLType);
+                GrGLSLVarying varying(SkSLType::kHalf4);
                 varyingHandler->addVarying("color", &varying);
 
                 // Start with the attribute or with uniform color
@@ -120,7 +121,7 @@ class DefaultGeoProc : public GrGeometryProcessor {
                     const char* colorUniformName;
                     fColorUniform = uniformHandler->addUniform(nullptr,
                                                                kVertex_GrShaderFlag,
-                                                               kHalf4_GrSLType,
+                                                               SkSLType::kHalf4,
                                                                "Color",
                                                                &colorUniformName);
                     vertBuilder->codeAppendf("half4 color = %s;", colorUniformName);
@@ -176,7 +177,7 @@ class DefaultGeoProc : public GrGeometryProcessor {
                 const char* fragCoverage;
                 fCoverageUniform = uniformHandler->addUniform(nullptr,
                                                               kFragment_GrShaderFlag,
-                                                              kHalf_GrSLType,
+                                                              SkSLType::kHalf,
                                                               "Coverage",
                                                               &fragCoverage);
                 fragBuilder->codeAppendf("half4 %s = half4(%s);",
@@ -211,19 +212,19 @@ class DefaultGeoProc : public GrGeometryProcessor {
             , fCoverage(coverage)
             , fFlags(gpTypeFlags)
             , fLocalCoordsWillBeRead(localCoordsWillBeRead) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         if (fFlags & kColorAttribute_GPFlag) {
             fInColor = MakeColorAttribute("inColor",
                                           SkToBool(fFlags & kColorAttributeIsWide_GPFlag));
         }
         if (fFlags & kLocalCoordAttribute_GPFlag) {
             fInLocalCoords = {"inLocalCoord", kFloat2_GrVertexAttribType,
-                                              kFloat2_GrSLType};
+                                              SkSLType::kFloat2};
         }
         if (fFlags & kCoverageAttribute_GPFlag) {
-            fInCoverage = {"inCoverage", kFloat_GrVertexAttribType, kHalf_GrSLType};
+            fInCoverage = {"inCoverage", kFloat_GrVertexAttribType, SkSLType::kHalf};
         }
-        this->setVertexAttributes(&fInPosition, 4);
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 4);
     }
 
     Attribute fInPosition;
diff --git a/third_party/skia/src/gpu/GrDirectContext.cpp b/third_party/skia/src/gpu/GrDirectContext.cpp
index ad4133338a51f..32bf707e10dae 100644
--- a/third_party/skia/src/gpu/GrDirectContext.cpp
+++ b/third_party/skia/src/gpu/GrDirectContext.cpp
@@ -22,7 +22,6 @@
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrSemaphore.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/GrThreadSafePipelineBuilder.h"
 #include "src/gpu/SurfaceContext.h"
 #include "src/gpu/effects/GrSkSLFP.h"
@@ -30,6 +29,7 @@
 #include "src/gpu/text/GrAtlasManager.h"
 #include "src/gpu/text/GrStrikeCache.h"
 #include "src/image/SkImage_GpuBase.h"
+#include "src/utils/SkShaderUtils.h"
 #if SK_GPU_V1
 #include "src/gpu/ops/SmallPathAtlasMgr.h"
 #else
@@ -67,7 +67,7 @@ class SmallPathAtlasMgr {
 #   endif
 #endif
 
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(this->singleOwner())
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
 
 GrDirectContext::DirectContextID GrDirectContext::DirectContextID::Next() {
     static std::atomic<uint32_t> nextID{1};
@@ -223,7 +223,7 @@ bool GrDirectContext::init() {
         return false;
     }
 
-    SkASSERT(this->getTextBlobCache());
+    SkASSERT(this->getTextBlobRedrawCoordinator());
     SkASSERT(this->threadSafeCache());
 
     fStrikeCache = std::make_unique<GrStrikeCache>();
@@ -324,7 +324,7 @@ void GrDirectContext::purgeUnlockedResources(bool scratchResourcesOnly) {
 
     // The textBlob Cache doesn't actually hold any GPU resource but this is a convenient
     // place to purge stale blobs
-    this->getTextBlobCache()->purgeStaleBlobs();
+    this->getTextBlobRedrawCoordinator()->purgeStaleBlobs();
 
     fGpu->releaseUnlockedBackendObjects();
 }
@@ -348,7 +348,7 @@ void GrDirectContext::performDeferredCleanup(std::chrono::milliseconds msNotUsed
 
     // The textBlob Cache doesn't actually hold any GPU resource but this is a convenient
     // place to purge stale blobs
-    this->getTextBlobCache()->purgeStaleBlobs();
+    this->getTextBlobRedrawCoordinator()->purgeStaleBlobs();
 }
 
 void GrDirectContext::purgeUnlockedResources(size_t bytesToPurge, bool preferScratchResources) {
@@ -463,7 +463,7 @@ void GrDirectContext::dumpMemoryStatistics(SkTraceMemoryDump* traceMemoryDump) c
     ASSERT_SINGLE_OWNER
     fResourceCache->dumpMemoryStatistics(traceMemoryDump);
     traceMemoryDump->dumpNumericValue("skia/gr_text_blob_cache", "size", "bytes",
-                                      this->getTextBlobCache()->usedBytes());
+                                      this->getTextBlobRedrawCoordinator()->usedBytes());
 }
 
 GrBackendTexture GrDirectContext::createBackendTexture(int width, int height,
@@ -540,7 +540,7 @@ static bool update_texture_with_pixmaps(GrDirectContext* context,
         return false;
     }
 
-    GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(format, ct);
+    skgpu::Swizzle swizzle = context->priv().caps()->getReadSwizzle(format, ct);
     GrSurfaceProxyView view(std::move(proxy), textureOrigin, swizzle);
     skgpu::SurfaceContext surfaceContext(context, std::move(view), src[0].info().colorInfo());
     SkAutoSTArray<15, GrCPixmap> tmpSrc(numLevels);
@@ -696,7 +696,7 @@ bool GrDirectContext::updateBackendTexture(const GrBackendTexture& backendTextur
         return false;
     }
 
-    GrSwizzle swizzle = this->caps()->getWriteSwizzle(format, grColorType);
+    skgpu::Swizzle swizzle = this->caps()->getWriteSwizzle(format, grColorType);
     SkColor4f swizzledColor = swizzle.applyTo(color);
 
     return fGpu->clearBackendTexture(backendTexture,
diff --git a/third_party/skia/src/gpu/GrDirectContextPriv.cpp b/third_party/skia/src/gpu/GrDirectContextPriv.cpp
index c0966ca6573ce..163d250e56e3d 100644
--- a/third_party/skia/src/gpu/GrDirectContextPriv.cpp
+++ b/third_party/skia/src/gpu/GrDirectContextPriv.cpp
@@ -24,13 +24,13 @@
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/text/GrAtlasManager.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 #include "src/image/SkImage_Base.h"
 #include "src/image/SkImage_Gpu.h"
 
 #define ASSERT_OWNED_PROXY(P) \
     SkASSERT(!(P) || !((P)->peekTexture()) || (P)->peekTexture()->getContext() == this->context())
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(this->context()->singleOwner())
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->context()->singleOwner())
 #define RETURN_VALUE_IF_ABANDONED(value) if (this->context()->abandoned()) { return (value); }
 
 GrSemaphoresSubmitted GrDirectContextPriv::flushSurfaces(
diff --git a/third_party/skia/src/gpu/GrDirectContextPriv.h b/third_party/skia/src/gpu/GrDirectContextPriv.h
index 7da6137316eec..523527c067a92 100644
--- a/third_party/skia/src/gpu/GrDirectContextPriv.h
+++ b/third_party/skia/src/gpu/GrDirectContextPriv.h
@@ -141,8 +141,6 @@ class GrDirectContextPriv : public GrRecordingContextPriv {
 
 private:
     explicit GrDirectContextPriv(GrDirectContext* dContext) : GrRecordingContextPriv(dContext) {}
-    // Required until C++17 copy elision
-    GrDirectContextPriv(const GrDirectContextPriv&) = default;
     GrDirectContextPriv& operator=(const GrDirectContextPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp b/third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp
index 225fdcc409249..d6ed1cf34c7b3 100644
--- a/third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp
+++ b/third_party/skia/src/gpu/GrDistanceFieldGenFromVector.cpp
@@ -239,15 +239,18 @@ void PathSegment::init() {
     if (fType == PathSegment::kLine) {
         fScalingFactorSqd = fScalingFactor = 1.0;
         double hypotenuse = p0.distance(p2);
-
-        const double cosTheta = (p2x - p0x) / hypotenuse;
-        const double sinTheta = (p2y - p0y) / hypotenuse;
-
-        // rotates the segment to the x-axis, with p0 at the origin
-        fXformMatrix.setAffine(
-            cosTheta, sinTheta, -(cosTheta * p0x) - (sinTheta * p0y),
-            -sinTheta, cosTheta, (sinTheta * p0x) - (cosTheta * p0y)
-        );
+        if (SkTAbs(hypotenuse) < 1.0e-100) {
+            fXformMatrix.reset();
+        } else {
+            const double cosTheta = (p2x - p0x) / hypotenuse;
+            const double sinTheta = (p2y - p0y) / hypotenuse;
+
+            // rotates the segment to the x-axis, with p0 at the origin
+            fXformMatrix.setAffine(
+                cosTheta, sinTheta, -(cosTheta * p0x) - (sinTheta * p0y),
+                -sinTheta, cosTheta, (sinTheta * p0x) - (cosTheta * p0y)
+            );
+        }
     } else {
         SkASSERT(fType == PathSegment::kQuad);
 
@@ -757,6 +760,7 @@ bool GrGenerateDistanceFieldFromPath(unsigned char* distanceField,
     }
 
     // transform to device space + SDF offset
+    // TODO: remove degenerate segments while doing this?
     workingPath.transform(dfMatrix);
 
     SkDEBUGCODE(pathBounds = workingPath.getBounds().roundOut());
diff --git a/third_party/skia/src/gpu/GrDrawIndirectCommand.h b/third_party/skia/src/gpu/GrDrawIndirectCommand.h
index d645223bd9bd8..47f0e704792df 100644
--- a/third_party/skia/src/gpu/GrDrawIndirectCommand.h
+++ b/third_party/skia/src/gpu/GrDrawIndirectCommand.h
@@ -52,7 +52,7 @@ struct GrDrawIndirectWriter {
 
     bool operator==(const GrDrawIndirectWriter& that) { return fData == that.fData; }
 
-    operator bool() const { return fData != nullptr; }
+    explicit operator bool() const { return fData != nullptr; }
 
     GrDrawIndirectWriter makeOffset(int drawCount) const { return {fData + drawCount}; }
 
@@ -87,7 +87,7 @@ struct GrDrawIndexedIndirectWriter {
 
     bool operator==(const GrDrawIndexedIndirectWriter& that) { return fData == that.fData; }
 
-    operator bool() const { return fData != nullptr; }
+    explicit operator bool() const { return fData != nullptr; }
 
     GrDrawIndexedIndirectWriter makeOffset(int drawCount) const { return {fData + drawCount}; }
 
diff --git a/third_party/skia/src/gpu/GrDrawOpAtlas.cpp b/third_party/skia/src/gpu/GrDrawOpAtlas.cpp
index 2900287d3adf4..37f2183ab3660 100644
--- a/third_party/skia/src/gpu/GrDrawOpAtlas.cpp
+++ b/third_party/skia/src/gpu/GrDrawOpAtlas.cpp
@@ -136,7 +136,8 @@ bool GrDrawOpAtlas::Plot::addSubImage(
     dataPtr += fBytesPerPixel * fWidth * rect.fTop;
     dataPtr += fBytesPerPixel * rect.fLeft;
     // copy into the data buffer, swizzling as we go if this is ARGB data
-    if (4 == fBytesPerPixel && kN32_SkColorType == kBGRA_8888_SkColorType) {
+    bool kBGRAIsNative = kN32_SkColorType == kBGRA_8888_SkColorType;
+    if (4 == fBytesPerPixel && kBGRAIsNative) {
         for (int i = 0; i < height; ++i) {
             SkOpts::RGBA_to_BGRA((uint32_t*)dataPtr, (const uint32_t*)imagePtr, width);
             dataPtr += fBytesPerPixel * fWidth;
@@ -564,9 +565,9 @@ bool GrDrawOpAtlas::createPages(
     int numPlotsY = fTextureHeight/fPlotHeight;
 
     for (uint32_t i = 0; i < this->maxPages(); ++i) {
-        GrSwizzle swizzle = proxyProvider->caps()->getReadSwizzle(fFormat, fColorType);
+        skgpu::Swizzle swizzle = proxyProvider->caps()->getReadSwizzle(fFormat, fColorType);
         if (GrColorTypeIsAlphaOnly(fColorType)) {
-            swizzle = GrSwizzle::Concat(swizzle, GrSwizzle("aaaa"));
+            swizzle = skgpu::Swizzle::Concat(swizzle, skgpu::Swizzle("aaaa"));
         }
         sk_sp<GrSurfaceProxy> proxy = proxyProvider->createProxy(
                 fFormat, dims, GrRenderable::kNo, 1, GrMipmapped::kNo, SkBackingFit::kExact,
diff --git a/third_party/skia/src/gpu/GrDrawingManager.cpp b/third_party/skia/src/gpu/GrDrawingManager.cpp
index 57777f16ca6e8..20663fea368e1 100644
--- a/third_party/skia/src/gpu/GrDrawingManager.cpp
+++ b/third_party/skia/src/gpu/GrDrawingManager.cpp
@@ -753,7 +753,8 @@ void GrDrawingManager::addAtlasTask(sk_sp<GrRenderTask> atlasTask,
 }
 #endif // SK_GPU_V1
 
-GrTextureResolveRenderTask* GrDrawingManager::newTextureResolveRenderTask(const GrCaps& caps) {
+GrTextureResolveRenderTask* GrDrawingManager::newTextureResolveRenderTaskBefore(
+        const GrCaps& caps) {
     // Unlike in the "new opsTask" case, we do not want to close the active opsTask, nor (if we are
     // in sorting and opsTask reduction mode) the render tasks that depend on any proxy's current
     // state. This is because those opsTasks can still receive new ops and because if they refer to
@@ -767,6 +768,38 @@ GrTextureResolveRenderTask* GrDrawingManager::newTextureResolveRenderTask(const
     return static_cast<GrTextureResolveRenderTask*>(task);
 }
 
+void GrDrawingManager::newTextureResolveRenderTask(sk_sp<GrSurfaceProxy> proxy,
+                                                   GrSurfaceProxy::ResolveFlags flags,
+                                                   const GrCaps& caps) {
+    SkDEBUGCODE(this->validate());
+    SkASSERT(fContext);
+
+    if (!proxy->requiresManualMSAAResolve()) {
+        SkDEBUGCODE(this->validate());
+        return;
+    }
+
+    GrRenderTask* lastTask = this->getLastRenderTask(proxy.get());
+    if (!proxy->asRenderTargetProxy()->isMSAADirty() && (!lastTask || lastTask->isClosed())) {
+        SkDEBUGCODE(this->validate());
+        return;
+    }
+
+    this->closeActiveOpsTask();
+
+    auto resolveTask = sk_make_sp<GrTextureResolveRenderTask>();
+    // Add proxy also adds all the needed dependencies we need
+    resolveTask->addProxy(this, std::move(proxy), flags, caps);
+
+    auto task = this->appendTask(std::move(resolveTask));
+    task->makeClosed(fContext);
+
+    // We have closed the previous active oplist but since a new oplist isn't being added there
+    // shouldn't be an active one.
+    SkASSERT(!fActiveOpsTask);
+    SkDEBUGCODE(this->validate());
+}
+
 void GrDrawingManager::newWaitRenderTask(sk_sp<GrSurfaceProxy> proxy,
                                          std::unique_ptr<std::unique_ptr<GrSemaphore>[]> semaphores,
                                          int numSemaphores) {
diff --git a/third_party/skia/src/gpu/GrDrawingManager.h b/third_party/skia/src/gpu/GrDrawingManager.h
index 65b84fcba1c28..39510160a867f 100644
--- a/third_party/skia/src/gpu/GrDrawingManager.h
+++ b/third_party/skia/src/gpu/GrDrawingManager.h
@@ -63,9 +63,15 @@ class GrDrawingManager {
 #endif
 
     // Create a render task that can resolve MSAA and/or regenerate mipmap levels on proxies. This
-    // method will only add the new render task to the list. It is up to the caller to call
-    // addProxy() on the returned object.
-    GrTextureResolveRenderTask* newTextureResolveRenderTask(const GrCaps&);
+    // method will only add the new render task to the list. However, it adds the task before the
+    // last task in the list. It is up to the caller to call addProxy() on the returned object.
+    GrTextureResolveRenderTask* newTextureResolveRenderTaskBefore(const GrCaps&);
+
+    // Creates a render task that can resolve MSAA and/or regenerate mimap levels on the passed in
+    // proxy. The task is appended to the end of the current list of tasks.
+    void newTextureResolveRenderTask(sk_sp<GrSurfaceProxy> proxy,
+                                     GrSurfaceProxy::ResolveFlags,
+                                     const GrCaps&);
 
     // Create a new render task that will cause the gpu to wait on semaphores before executing any
     // more RenderTasks that target proxy. It is possible for this wait to also block additional
diff --git a/third_party/skia/src/gpu/GrEagerVertexAllocator.h b/third_party/skia/src/gpu/GrEagerVertexAllocator.h
index 7828b0e1ef13b..b6cba664a6684 100644
--- a/third_party/skia/src/gpu/GrEagerVertexAllocator.h
+++ b/third_party/skia/src/gpu/GrEagerVertexAllocator.h
@@ -8,6 +8,7 @@
 #ifndef GrEagerVertexAllocator_DEFINED
 #define GrEagerVertexAllocator_DEFINED
 
+#include "src/gpu/BufferWriter.h"
 #include "src/gpu/GrThreadSafeCache.h"
 
 class GrMeshDrawTarget;
@@ -23,14 +24,16 @@ class GrMeshDrawTarget;
 // actual vertex count.
 class GrEagerVertexAllocator {
 public:
-    template<typename T> T* lock(int eagerCount) {
-        return static_cast<T*>(this->lock(sizeof(T), eagerCount));
-    }
     virtual void* lock(size_t stride, int eagerCount) = 0;
 
     virtual void unlock(int actualCount) = 0;
 
     virtual ~GrEagerVertexAllocator() {}
+
+    skgpu::VertexWriter lockWriter(size_t stride, int eagerCount) {
+        void* p = this->lock(stride, eagerCount);
+        return p ? skgpu::VertexWriter{p, stride * eagerCount} : skgpu::VertexWriter{};
+    }
 };
 
 // GrEagerVertexAllocator implementation that uses GrMeshDrawTarget::makeVertexSpace and
@@ -51,9 +54,6 @@ class GrEagerDynamicVertexAllocator : public GrEagerVertexAllocator {
     }
 #endif
 
-    // Un-shadow GrEagerVertexAllocator::lock<T>.
-    using GrEagerVertexAllocator::lock;
-
     // Mark "final" as a hint for the compiler to not use the vtable.
     void* lock(size_t stride, int eagerCount) final;
 
diff --git a/third_party/skia/src/gpu/GrFragmentProcessor.cpp b/third_party/skia/src/gpu/GrFragmentProcessor.cpp
index 23101b2699433..f78339c4458aa 100644
--- a/third_party/skia/src/gpu/GrFragmentProcessor.cpp
+++ b/third_party/skia/src/gpu/GrFragmentProcessor.cpp
@@ -11,6 +11,7 @@
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrProcessorAnalysis.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "src/gpu/effects/GrTextureEffect.h"
@@ -245,11 +246,11 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::ClampOutput(
 }
 
 std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
-        std::unique_ptr<GrFragmentProcessor> fp, const GrSwizzle& swizzle) {
+        std::unique_ptr<GrFragmentProcessor> fp, const skgpu::Swizzle& swizzle) {
     class SwizzleFragmentProcessor : public GrFragmentProcessor {
     public:
         static std::unique_ptr<GrFragmentProcessor> Make(std::unique_ptr<GrFragmentProcessor> fp,
-                                                         const GrSwizzle& swizzle) {
+                                                         const skgpu::Swizzle& swizzle) {
             return std::unique_ptr<GrFragmentProcessor>(
                     new SwizzleFragmentProcessor(std::move(fp), swizzle));
         }
@@ -261,7 +262,8 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
         }
 
     private:
-        SwizzleFragmentProcessor(std::unique_ptr<GrFragmentProcessor> fp, const GrSwizzle& swizzle)
+        SwizzleFragmentProcessor(std::unique_ptr<GrFragmentProcessor> fp,
+                                 const skgpu::Swizzle& swizzle)
                 : INHERITED(kSwizzleFragmentProcessor_ClassID, ProcessorOptimizationFlags(fp.get()))
                 , fSwizzle(swizzle) {
             this->registerChild(std::move(fp));
@@ -274,7 +276,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
                     SkString childColor = this->invokeChild(0, args);
 
                     const SwizzleFragmentProcessor& sfp = args.fFp.cast<SwizzleFragmentProcessor>();
-                    const GrSwizzle& swizzle = sfp.fSwizzle;
+                    const skgpu::Swizzle& swizzle = sfp.fSwizzle;
                     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
 
                     fragBuilder->codeAppendf("return %s.%s;",
@@ -284,7 +286,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
             return std::make_unique<Impl>();
         }
 
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override {
             b->add32(fSwizzle.asKey());
         }
 
@@ -297,7 +299,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
             return fSwizzle.applyTo(ConstantOutputForConstantInput(this->childProcessor(0), input));
         }
 
-        GrSwizzle fSwizzle;
+        skgpu::Swizzle fSwizzle;
 
         using INHERITED = GrFragmentProcessor;
     };
@@ -305,7 +307,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SwizzleOutput(
     if (!fp) {
         return nullptr;
     }
-    if (GrSwizzle::RGBA() == swizzle) {
+    if (skgpu::Swizzle::RGBA() == swizzle) {
         return fp;
     }
     return SwizzleFragmentProcessor::Make(std::move(fp), swizzle);
@@ -403,7 +405,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::Compose(
 
         ComposeProcessor(const ComposeProcessor& that) : INHERITED(that) {}
 
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
         bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
@@ -527,7 +529,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::SurfaceColor() {
             this->setWillReadDstColor();
         }
 
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
         bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
@@ -579,7 +581,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::DeviceSpace(
             return std::make_unique<Impl>();
         }
 
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
         bool onIsEqual(const GrFragmentProcessor& processor) const override { return true; }
 
@@ -825,7 +827,7 @@ std::unique_ptr<GrFragmentProcessor> GrFragmentProcessor::HighPrecision(
             return std::make_unique<Impl>();
         }
 
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
         bool onIsEqual(const GrFragmentProcessor& other) const override { return true; }
 
         SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& input) const override {
@@ -851,7 +853,7 @@ SkString ProgramImpl::invokeChild(int childIndex,
                                   const char* inputColor,
                                   const char* destColor,
                                   EmitArgs& args,
-                                  SkSL::String skslCoords) {
+                                  std::string_view skslCoords) {
     SkASSERT(childIndex >= 0);
 
     if (!inputColor) {
@@ -881,7 +883,11 @@ SkString ProgramImpl::invokeChild(int childIndex,
     if (args.fFragBuilder->getProgramBuilder()->fragmentProcessorHasCoordsParam(childProc)) {
         SkASSERT(!childProc->sampleUsage().isFragCoord() || skslCoords == "sk_FragCoord.xy");
         // The child's function takes a half4 color and a float2 coordinate
-        invocation.appendf(", %s", skslCoords.empty() ? args.fSampleCoord : skslCoords.c_str());
+        if (!skslCoords.empty()) {
+            invocation.appendf(", %.*s", (int)skslCoords.size(), skslCoords.data());
+        } else {
+            invocation.appendf(", %s", args.fSampleCoord);
+        }
     }
 
     invocation.append(")");
@@ -909,7 +915,7 @@ SkString ProgramImpl::invokeChildWithMatrix(int childIndex,
     // Every uniform matrix has the same (initial) name. Resolve that into the mangled name:
     GrShaderVar uniform = args.fUniformHandler->getUniformMapping(
             args.fFp, SkString(SkSL::SampleUsage::MatrixUniformName()));
-    SkASSERT(uniform.getType() == kFloat3x3_GrSLType);
+    SkASSERT(uniform.getType() == SkSLType::kFloat3x3);
     const SkString& matrixName(uniform.getName());
 
     auto invocation = SkStringPrintf("%s(%s", this->childProcessor(childIndex)->functionName(),
diff --git a/third_party/skia/src/gpu/GrFragmentProcessor.h b/third_party/skia/src/gpu/GrFragmentProcessor.h
index 517297a50ba75..c191e2f5cc744 100644
--- a/third_party/skia/src/gpu/GrFragmentProcessor.h
+++ b/third_party/skia/src/gpu/GrFragmentProcessor.h
@@ -20,11 +20,14 @@ class GrGLSLFPFragmentBuilder;
 class GrGLSLProgramDataManager;
 class GrPaint;
 class GrPipeline;
-class GrProcessorKeyBuilder;
 struct GrShaderCaps;
-class GrSwizzle;
 class GrTextureEffect;
 
+namespace skgpu {
+class KeyBuilder;
+class Swizzle;
+}
+
 /**
  * Some fragment-processor creation methods have preconditions that might not be satisfied by the
  * calling code. Those methods can return a `GrFPResult` from their factory methods. If creation
@@ -103,7 +106,7 @@ class GrFragmentProcessor : public GrProcessor {
      *  the output.
      */
     static std::unique_ptr<GrFragmentProcessor> SwizzleOutput(std::unique_ptr<GrFragmentProcessor>,
-                                                              const GrSwizzle&);
+                                                              const skgpu::Swizzle&);
 
     /**
      *  Returns a fragment processor that calls the passed in fragment processor, and then clamps
@@ -179,7 +182,7 @@ class GrFragmentProcessor : public GrProcessor {
 
     std::unique_ptr<ProgramImpl> makeProgramImpl() const;
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
         this->onAddToKey(caps, b);
         for (const auto& child : fChildProcessors) {
             if (child) {
@@ -426,7 +429,7 @@ class GrFragmentProcessor : public GrProcessor {
      */
     virtual std::unique_ptr<ProgramImpl> onMakeProgramImpl() const = 0;
 
-    virtual void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const = 0;
+    virtual void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const = 0;
 
     /**
      * Subclass implements this to support isEqual(). It will only be called if it is known that
@@ -539,7 +542,7 @@ class GrFragmentProcessor::ProgramImpl {
     // Invoke the child with the default input and destination colors (solid white)
     inline SkString invokeChild(int childIndex,
                                 EmitArgs& parentArgs,
-                                SkSL::String skslCoords = "") {
+                                std::string_view skslCoords = {}) {
         return this->invokeChild(childIndex,
                                  /*inputColor=*/nullptr,
                                  /*destColor=*/nullptr,
@@ -558,7 +561,7 @@ class GrFragmentProcessor::ProgramImpl {
     inline SkString invokeChild(int childIndex,
                                 const char* inputColor,
                                 EmitArgs& parentArgs,
-                                SkSL::String skslCoords = "") {
+                                std::string_view skslCoords = {}) {
         return this->invokeChild(childIndex,
                                  inputColor,
                                  /*destColor=*/nullptr,
@@ -590,7 +593,7 @@ class GrFragmentProcessor::ProgramImpl {
                          const char* inputColor,
                          const char* destColor,
                          EmitArgs& parentArgs,
-                         SkSL::String skslCoords = "");
+                         std::string_view skslCoords = {});
 
     /**
      * As invokeChild, but transforms the coordinates according to the matrix expression attached
@@ -616,7 +619,7 @@ class GrFragmentProcessor::ProgramImpl {
         ProgramImpl& operator*() const;
         ProgramImpl* operator->() const;
         Iter& operator++();
-        operator bool() const { return !fFPStack.empty(); }
+        explicit operator bool() const { return !fFPStack.empty(); }
 
         // Because each iterator carries a stack we want to avoid copies.
         Iter(const Iter&) = delete;
diff --git a/third_party/skia/src/gpu/GrGeometryProcessor.cpp b/third_party/skia/src/gpu/GrGeometryProcessor.cpp
index f0c59d231b1e1..63fcfdaeba5aa 100644
--- a/third_party/skia/src/gpu/GrGeometryProcessor.cpp
+++ b/third_party/skia/src/gpu/GrGeometryProcessor.cpp
@@ -9,6 +9,7 @@
 
 #include "src/core/SkMatrixPriv.h"
 #include "src/gpu/GrPipeline.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -33,6 +34,13 @@ uint32_t GrGeometryProcessor::ComputeCoordTransformsKey(const GrFragmentProcesso
     return key;
 }
 
+void GrGeometryProcessor::getAttributeKey(skgpu::KeyBuilder* b) const {
+    b->appendComment("vertex attributes");
+    fVertexAttributes.addToKey(b);
+    b->appendComment("instance attributes");
+    fInstanceAttributes.addToKey(b);
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 static inline GrSamplerState::Filter clamp_filter(GrTextureType type,
@@ -45,13 +53,13 @@ static inline GrSamplerState::Filter clamp_filter(GrTextureType type,
 
 GrGeometryProcessor::TextureSampler::TextureSampler(GrSamplerState samplerState,
                                                     const GrBackendFormat& backendFormat,
-                                                    const GrSwizzle& swizzle) {
+                                                    const skgpu::Swizzle& swizzle) {
     this->reset(samplerState, backendFormat, swizzle);
 }
 
 void GrGeometryProcessor::TextureSampler::reset(GrSamplerState samplerState,
                                                 const GrBackendFormat& backendFormat,
-                                                const GrSwizzle& swizzle) {
+                                                const skgpu::Swizzle& swizzle) {
     fSamplerState = samplerState;
     fSamplerState.setFilterMode(clamp_filter(backendFormat.textureType(), samplerState.filter()));
     fBackendFormat = backendFormat;
@@ -86,11 +94,11 @@ ProgramImpl::emitCode(EmitArgs& args, const GrPipeline& pipeline) {
     if (!args.fGeomProc.willUseTessellationShaders()) {
         GrGLSLVertexBuilder* vBuilder = args.fVertBuilder;
         // Emit the vertex position to the hardware in the normalized window coordinates it expects.
-        SkASSERT(kFloat2_GrSLType == gpArgs.fPositionVar.getType() ||
-                 kFloat3_GrSLType == gpArgs.fPositionVar.getType());
+        SkASSERT(SkSLType::kFloat2 == gpArgs.fPositionVar.getType() ||
+                 SkSLType::kFloat3 == gpArgs.fPositionVar.getType());
         vBuilder->emitNormalizedSkPosition(gpArgs.fPositionVar.c_str(),
                                            gpArgs.fPositionVar.getType());
-        if (kFloat2_GrSLType == gpArgs.fPositionVar.getType()) {
+        if (SkSLType::kFloat2 == gpArgs.fPositionVar.getType()) {
             args.fVaryingHandler->setNoPerspective();
         }
     }
@@ -104,12 +112,12 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
                                                         const GrShaderVar& localCoordsVar,
                                                         const GrShaderVar& positionVar,
                                                         const GrPipeline& pipeline) {
-    SkASSERT(localCoordsVar.getType() == kFloat2_GrSLType ||
-             localCoordsVar.getType() == kFloat3_GrSLType ||
-             localCoordsVar.getType() == kVoid_GrSLType);
-    SkASSERT(positionVar.getType() == kFloat2_GrSLType ||
-             positionVar.getType() == kFloat3_GrSLType ||
-             positionVar.getType() == kVoid_GrSLType);
+    SkASSERT(localCoordsVar.getType() == SkSLType::kFloat2 ||
+             localCoordsVar.getType() == SkSLType::kFloat3 ||
+             localCoordsVar.getType() == SkSLType::kVoid);
+    SkASSERT(positionVar.getType() == SkSLType::kFloat2 ||
+             positionVar.getType() == SkSLType::kFloat3 ||
+             positionVar.getType() == SkSLType::kVoid);
 
     enum class BaseCoord { kNone, kLocal, kPosition };
 
@@ -118,8 +126,8 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
             return localCoordsVar;
         }
         SkASSERT(localCoordsShader == kVertex_GrShaderType);
-        SkASSERT(GrSLTypeIsFloatType(localCoordsVar.getType()));
-        if (baseLocalCoordVarying.type() == kVoid_GrSLType) {
+        SkASSERT(SkSLTypeIsFloatType(localCoordsVar.getType()));
+        if (baseLocalCoordVarying.type() == SkSLType::kVoid) {
             // Initialize to the GP provided coordinate
             baseLocalCoordVarying = GrGLSLVarying(localCoordsVar.getType());
             varyingHandler->addVarying("LocalCoord", &baseLocalCoordVarying);
@@ -130,7 +138,7 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
         return baseLocalCoordVarying.fsInVar();
     };
 
-    bool canUsePosition = positionVar.getType() != kVoid_GrSLType;
+    bool canUsePosition = positionVar.getType() != SkSLType::kVoid;
 
     FPCoordsMap result;
     // Performs a pre-order traversal of FP hierarchy rooted at fp and identifies FPs that are
@@ -159,7 +167,7 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
                     lastMatrixTraversalIndex = traversalIndex;
                     break;
                 case SkSL::SampleUsage::Kind::kFragCoord:
-                    hasPerspective = positionVar.getType() == kFloat3_GrSLType;
+                    hasPerspective = positionVar.getType() == SkSLType::kFloat3;
                     lastMatrixFP = nullptr;
                     lastMatrixTraversalIndex = -1;
                     baseCoord = BaseCoord::kPosition;
@@ -193,8 +201,8 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
                 // If there is an already a varying that incorporates all matrices from the root to
                 // lastMatrixFP just use it. Otherwise, we add it.
                 auto& [varying, inputCoords, varyingIdx] = fTransformVaryingsMap[lastMatrixFP];
-                if (varying.type() == kVoid_GrSLType) {
-                    varying = GrGLSLVarying(hasPerspective ? kFloat3_GrSLType : kFloat2_GrSLType);
+                if (varying.type() == SkSLType::kVoid) {
+                    varying = GrGLSLVarying(hasPerspective ? SkSLType::kFloat3 : SkSLType::kFloat2);
                     SkString strVaryingName = SkStringPrintf("TransformedCoords_%d",
                                                              lastMatrixTraversalIndex);
                     varyingHandler->addVarying(strVaryingName.c_str(), &varying);
@@ -218,15 +226,15 @@ ProgramImpl::FPCoordsMap ProgramImpl::collectTransforms(GrGLSLVertexBuilder* vb,
                      baseCoord);
                 // If we have a varying then we never need a param. Otherwise, if one of our
                 // children takes a non-explicit coord then we'll need our coord.
-                hasCoordsParam |= varyingFSVar.getType() == kVoid_GrSLType &&
-                                  !child->sampleUsage().isExplicit()       &&
-                                  !child->sampleUsage().isFragCoord()      &&
+                hasCoordsParam |= varyingFSVar.getType() == SkSLType::kVoid &&
+                                  !child->sampleUsage().isExplicit()        &&
+                                  !child->sampleUsage().isFragCoord()       &&
                                   result[child].hasCoordsParam;
             }
         }
     };
 
-    bool hasPerspective = GrSLTypeVecLength(localCoordsVar.getType()) == 3;
+    bool hasPerspective = SkSLTypeVecLength(localCoordsVar.getType()) == 3;
     for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) {
         liftTransforms(liftTransforms, pipeline.getFragmentProcessor(i), hasPerspective);
     }
@@ -285,15 +293,15 @@ void ProgramImpl::emitTransformCode(GrGLSLVertexBuilder* vb, GrGLSLUniformHandle
         }
 
         SkString inputStr;
-        if (inputCoords.getType() == kFloat2_GrSLType) {
+        if (inputCoords.getType() == SkSLType::kFloat2) {
             inputStr = SkStringPrintf("%s.xy1", inputCoords.getName().c_str());
         } else {
-            SkASSERT(inputCoords.getType() == kFloat3_GrSLType);
+            SkASSERT(inputCoords.getType() == SkSLType::kFloat3);
             inputStr = inputCoords.getName();
         }
 
         vb->codeAppend("{\n");
-        if (info.varying.type() == kFloat2_GrSLType) {
+        if (info.varying.type() == SkSLType::kFloat2) {
             if (vb->getProgramBuilder()->shaderCaps()->nonsquareMatrixSupport()) {
                 vb->codeAppendf("%s = float3x2(%s) * %s",
                                 info.varying.vsOut(),
@@ -306,7 +314,7 @@ void ProgramImpl::emitTransformCode(GrGLSLVertexBuilder* vb, GrGLSLUniformHandle
                                 inputStr.c_str());
             }
         } else {
-            SkASSERT(info.varying.type() == kFloat3_GrSLType);
+            SkASSERT(info.varying.type() == SkSLType::kFloat3);
             vb->codeAppendf("%s = %s * %s",
                             info.varying.vsOut(),
                             transformExpression.c_str(),
@@ -327,7 +335,7 @@ void ProgramImpl::setupUniformColor(GrGLSLFPFragmentBuilder* fragBuilder,
     const char* stagedLocalVarName;
     *colorUniform = uniformHandler->addUniform(nullptr,
                                                kFragment_GrShaderFlag,
-                                               kHalf4_GrSLType,
+                                               SkSLType::kHalf4,
                                                "Color",
                                                &stagedLocalVarName);
     fragBuilder->codeAppendf("%s = %s;", outputName, stagedLocalVarName);
@@ -362,11 +370,11 @@ void ProgramImpl::SetTransform(const GrGLSLProgramDataManager& pdman,
 static void write_passthrough_vertex_position(GrGLSLVertexBuilder* vertBuilder,
                                               const GrShaderVar& inPos,
                                               GrShaderVar* outPos) {
-    SkASSERT(inPos.getType() == kFloat3_GrSLType || inPos.getType() == kFloat2_GrSLType);
+    SkASSERT(inPos.getType() == SkSLType::kFloat3 || inPos.getType() == SkSLType::kFloat2);
     SkString outName = vertBuilder->newTmpVarName(inPos.getName().c_str());
     outPos->set(inPos.getType(), outName.c_str());
     vertBuilder->codeAppendf("float%d %s = %s;",
-                             GrSLTypeVecLength(inPos.getType()),
+                             SkSLTypeVecLength(inPos.getType()),
                              outName.c_str(),
                              inPos.getName().c_str());
 }
@@ -379,7 +387,7 @@ static void write_vertex_position(GrGLSLVertexBuilder* vertBuilder,
                                   const char* matrixName,
                                   GrShaderVar* outPos,
                                   ProgramImpl::UniformHandle* matrixUniform) {
-    SkASSERT(inPos.getType() == kFloat3_GrSLType || inPos.getType() == kFloat2_GrSLType);
+    SkASSERT(inPos.getType() == SkSLType::kFloat3 || inPos.getType() == SkSLType::kFloat2);
     SkString outName = vertBuilder->newTmpVarName(inPos.getName().c_str());
 
     if (matrix.isIdentity() && !shaderCaps.reducedShaderMode()) {
@@ -392,12 +400,12 @@ static void write_vertex_position(GrGLSLVertexBuilder* vertBuilder,
     const char* mangledMatrixName;
     *matrixUniform = uniformHandler->addUniform(nullptr,
                                                 kVertex_GrShaderFlag,
-                                                useCompactTransform ? kFloat4_GrSLType
-                                                                    : kFloat3x3_GrSLType,
+                                                useCompactTransform ? SkSLType::kFloat4
+                                                                    : SkSLType::kFloat3x3,
                                                 matrixName,
                                                 &mangledMatrixName);
 
-    if (inPos.getType() == kFloat3_GrSLType) {
+    if (inPos.getType() == SkSLType::kFloat3) {
         // A float3 stays a float3 whether or not the matrix adds perspective
         if (useCompactTransform) {
             vertBuilder->codeAppendf("float3 %s = %s.xz1 * %s + %s.yw0;\n",
@@ -411,7 +419,7 @@ static void write_vertex_position(GrGLSLVertexBuilder* vertBuilder,
                                      mangledMatrixName,
                                      inPos.getName().c_str());
         }
-        outPos->set(kFloat3_GrSLType, outName.c_str());
+        outPos->set(SkSLType::kFloat3, outName.c_str());
         return;
     }
     if (matrix.hasPerspective()) {
@@ -421,7 +429,7 @@ static void write_vertex_position(GrGLSLVertexBuilder* vertBuilder,
                                  outName.c_str(),
                                  mangledMatrixName,
                                  inPos.getName().c_str());
-        outPos->set(kFloat3_GrSLType, outName.c_str());
+        outPos->set(SkSLType::kFloat3, outName.c_str());
         return;
     }
     if (useCompactTransform) {
@@ -441,14 +449,14 @@ static void write_vertex_position(GrGLSLVertexBuilder* vertBuilder,
                                  mangledMatrixName,
                                  inPos.getName().c_str());
     }
-    outPos->set(kFloat2_GrSLType, outName.c_str());
+    outPos->set(SkSLType::kFloat2, outName.c_str());
 }
 
 void ProgramImpl::WriteOutputPosition(GrGLSLVertexBuilder* vertBuilder,
                                       GrGPArgs* gpArgs,
                                       const char* posName) {
     // writeOutputPosition assumes the incoming pos name points to a float2 variable
-    GrShaderVar inPos(posName, kFloat2_GrSLType);
+    GrShaderVar inPos(posName, SkSLType::kFloat2);
     write_passthrough_vertex_position(vertBuilder, inPos, &gpArgs->fPositionVar);
 }
 
@@ -459,7 +467,7 @@ void ProgramImpl::WriteOutputPosition(GrGLSLVertexBuilder* vertBuilder,
                                       const char* posName,
                                       const SkMatrix& mat,
                                       UniformHandle* viewMatrixUniform) {
-    GrShaderVar inPos(posName, kFloat2_GrSLType);
+    GrShaderVar inPos(posName, SkSLType::kFloat2);
     write_vertex_position(vertBuilder,
                           uniformHandler,
                           shaderCaps,
@@ -486,3 +494,90 @@ void ProgramImpl::WriteLocalCoord(GrGLSLVertexBuilder* vertBuilder,
                           &gpArgs->fLocalCoordVar,
                           localMatrixUniform);
 }
+
+//////////////////////////////////////////////////////////////////////////////
+
+using Attribute    = GrGeometryProcessor::Attribute;
+using AttributeSet = GrGeometryProcessor::AttributeSet;
+
+GrGeometryProcessor::Attribute AttributeSet::Iter::operator*() const {
+    if (fCurr->offset().has_value()) {
+        return *fCurr;
+    }
+    return Attribute(fCurr->name(), fCurr->cpuType(), fCurr->gpuType(), fImplicitOffset);
+}
+
+void AttributeSet::Iter::operator++() {
+    if (fRemaining) {
+        fRemaining--;
+        fImplicitOffset += Attribute::AlignOffset(fCurr->size());
+        fCurr++;
+        this->skipUninitialized();
+    }
+}
+
+void AttributeSet::Iter::skipUninitialized() {
+    if (!fRemaining) {
+        fCurr = nullptr;
+    } else {
+        while (!fCurr->isInitialized()) {
+            ++fCurr;
+        }
+    }
+}
+
+void AttributeSet::initImplicit(const Attribute* attrs, int count) {
+    fAttributes = attrs;
+    fRawCount   = count;
+    fCount      = 0;
+    fStride     = 0;
+    for (int i = 0; i < count; ++i) {
+        if (attrs[i].isInitialized()) {
+            fCount++;
+            fStride += Attribute::AlignOffset(attrs[i].size());
+        }
+    }
+}
+
+void AttributeSet::initExplicit(const Attribute* attrs, int count, size_t stride) {
+    fAttributes = attrs;
+    fRawCount   = count;
+    fCount      = count;
+    fStride     = stride;
+    SkASSERT(Attribute::AlignOffset(fStride) == fStride);
+    for (int i = 0; i < count; ++i) {
+        SkASSERT(attrs[i].isInitialized());
+        SkASSERT(attrs[i].offset().has_value());
+        SkASSERT(Attribute::AlignOffset(*attrs[i].offset()) == *attrs[i].offset());
+        SkASSERT(*attrs[i].offset() + attrs[i].size() <= fStride);
+    }
+}
+
+void AttributeSet::addToKey(skgpu::KeyBuilder* b) const {
+    int rawCount = SkAbs32(fRawCount);
+    b->addBits(16, SkToU16(this->stride()), "stride");
+    b->addBits(16, rawCount, "attribute count");
+    size_t implicitOffset = 0;
+    for (int i = 0; i < rawCount; ++i) {
+        const Attribute& attr = fAttributes[i];
+        b->appendComment(attr.isInitialized() ? attr.name() : "unusedAttr");
+        static_assert(kGrVertexAttribTypeCount < (1 << 8), "");
+        static_assert(kSkSLTypeCount           < (1 << 8), "");
+        b->addBits(8,  attr.isInitialized() ? attr.cpuType() : 0xff, "attrType");
+        b->addBits(8 , attr.isInitialized() ? static_cast<int>(attr.gpuType()) : 0xff,
+                   "attrGpuType");
+        int16_t offset = -1;
+        if (attr.isInitialized()) {
+            if (attr.offset().has_value()) {
+                offset = *attr.offset();
+            } else {
+                offset = implicitOffset;
+                implicitOffset += Attribute::AlignOffset(attr.size());
+            }
+        }
+        b->addBits(16, static_cast<uint16_t>(offset), "attrOffset");
+    }
+}
+
+AttributeSet::Iter AttributeSet::begin() const { return Iter(fAttributes, fCount); }
+AttributeSet::Iter AttributeSet::end() const { return Iter(); }
diff --git a/third_party/skia/src/gpu/GrGeometryProcessor.h b/third_party/skia/src/gpu/GrGeometryProcessor.h
index f0d3e8f4218a5..9acca894b3ac2 100644
--- a/third_party/skia/src/gpu/GrGeometryProcessor.h
+++ b/third_party/skia/src/gpu/GrGeometryProcessor.h
@@ -13,7 +13,7 @@
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrShaderVar.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
@@ -63,98 +63,111 @@ class GrGeometryProcessor : public GrProcessor {
     /** Describes a vertex or instance attribute. */
     class Attribute {
     public:
+        static constexpr size_t AlignOffset(size_t offset) { return SkAlign4(offset); }
+
         constexpr Attribute() = default;
+        /**
+         * Makes an attribute whose offset will be implicitly determined by the types and ordering
+         * of an array attributes.
+         */
         constexpr Attribute(const char* name,
                             GrVertexAttribType cpuType,
-                            GrSLType gpuType)
+                            SkSLType gpuType)
                 : fName(name), fCPUType(cpuType), fGPUType(gpuType) {
-            SkASSERT(name && gpuType != kVoid_GrSLType);
+            SkASSERT(name && gpuType != SkSLType::kVoid);
+        }
+        /**
+         * Makes an attribute with an explicit offset.
+         */
+        constexpr Attribute(const char*        name,
+                            GrVertexAttribType cpuType,
+                            SkSLType           gpuType,
+                            size_t             offset)
+                : fName(name), fCPUType(cpuType), fGPUType(gpuType), fOffset(SkToU32(offset)) {
+            SkASSERT(AlignOffset(offset) == offset);
+            SkASSERT(name && gpuType != SkSLType::kVoid);
         }
         constexpr Attribute(const Attribute&) = default;
 
         Attribute& operator=(const Attribute&) = default;
 
-        constexpr bool isInitialized() const { return fGPUType != kVoid_GrSLType; }
+        constexpr bool isInitialized() const { return fGPUType != SkSLType::kVoid; }
 
-        constexpr const char* name() const { return fName; }
+        constexpr const char*           name() const { return fName; }
         constexpr GrVertexAttribType cpuType() const { return fCPUType; }
-        constexpr GrSLType           gpuType() const { return fGPUType; }
+        constexpr SkSLType           gpuType() const { return fGPUType; }
+        /**
+         * Returns the offset if attributes were specified with explicit offsets. Otherwise,
+         * offsets (and total vertex stride) are implicitly determined from attribute order and
+         * types.
+         */
+        std::optional<size_t> offset() const {
+            if (fOffset != kImplicitOffset) {
+                SkASSERT(AlignOffset(fOffset) == fOffset);
+                return {fOffset};
+            }
+            return std::nullopt;
+        }
 
         inline constexpr size_t size() const;
-        constexpr size_t sizeAlign4() const { return SkAlign4(this->size()); }
 
         GrShaderVar asShaderVar() const {
             return {fName, fGPUType, GrShaderVar::TypeModifier::In};
         }
 
     private:
-        const char* fName = nullptr;
+        static constexpr uint32_t kImplicitOffset = 1;  // 1 is not valid because it isn't aligned.
+
+        const char*        fName    = nullptr;
         GrVertexAttribType fCPUType = kFloat_GrVertexAttribType;
-        GrSLType fGPUType = kVoid_GrSLType;
+        SkSLType           fGPUType = SkSLType::kVoid;
+        uint32_t           fOffset  = kImplicitOffset;
     };
 
-    class Iter {
-    public:
-        Iter() : fCurr(nullptr), fRemaining(0) {}
-        Iter(const Iter& iter) : fCurr(iter.fCurr), fRemaining(iter.fRemaining) {}
-        Iter& operator= (const Iter& iter) {
-            fCurr = iter.fCurr;
-            fRemaining = iter.fRemaining;
-            return *this;
-        }
-        Iter(const Attribute* attrs, int count) : fCurr(attrs), fRemaining(count) {
-            this->skipUninitialized();
-        }
+    /**
+     * A set of attributes that can iterated. The iterator handles hides two pieces of complexity:
+     * 1) It skips uninitialized attributes.
+     * 2) It always returns an attribute with a known offset.
+     */
+    class AttributeSet {
+        class Iter {
+        public:
+            Iter() = default;
+            Iter(const Iter& iter) = default;
+            Iter& operator=(const Iter& iter) = default;
 
-        bool operator!=(const Iter& that) const { return fCurr != that.fCurr; }
-        const Attribute& operator*() const { return *fCurr; }
-        void operator++() {
-            if (fRemaining) {
-                fRemaining--;
-                fCurr++;
+            Iter(const Attribute* attrs, int count) : fCurr(attrs), fRemaining(count) {
                 this->skipUninitialized();
             }
-        }
 
-    private:
-        void skipUninitialized() {
-            if (!fRemaining) {
-                fCurr = nullptr;
-            } else {
-                while (!fCurr->isInitialized()) {
-                    ++fCurr;
-                }
-            }
-        }
+            bool operator!=(const Iter& that) const { return fCurr != that.fCurr; }
+            Attribute operator*() const;
+            void operator++();
 
-        const Attribute* fCurr;
-        int fRemaining;
-    };
+        private:
+            void skipUninitialized();
+
+            const Attribute* fCurr           = nullptr;
+            int              fRemaining      = 0;
+            size_t           fImplicitOffset = 0;
+        };
 
-    class AttributeSet {
     public:
-        Iter begin() const { return Iter(fAttributes, fCount); }
-        Iter end() const { return Iter(); }
+        Iter begin() const;
+        Iter end() const;
 
         int count() const { return fCount; }
         size_t stride() const { return fStride; }
 
-    private:
-        friend class GrGeometryProcessor;
-
-        void init(const Attribute* attrs, int count) {
-            fAttributes = attrs;
-            fRawCount = count;
-            fCount = 0;
-            fStride = 0;
-            for (int i = 0; i < count; ++i) {
-                if (attrs[i].isInitialized()) {
-                    fCount++;
-                    fStride += attrs[i].sizeAlign4();
-                }
-            }
-        }
+        // Init with implicit offsets and stride. No attributes can have a predetermined stride.
+        void initImplicit(const Attribute* attrs, int count);
+        // Init with explicit offsets and stride. All attributes must be initialized and have
+        // an explicit offset aligned to 4 bytes and with no attribute crossing stride boundaries.
+        void initExplicit(const Attribute* attrs, int count, size_t stride);
+
+        void addToKey(skgpu::KeyBuilder* b) const;
 
+    private:
         const Attribute* fAttributes = nullptr;
         int              fRawCount = 0;
         int              fCount = 0;
@@ -165,21 +178,21 @@ class GrGeometryProcessor : public GrProcessor {
 
     int numTextureSamplers() const { return fTextureSamplerCnt; }
     const TextureSampler& textureSampler(int index) const;
-    int numVertexAttributes() const { return fVertexAttributes.fCount; }
+    int numVertexAttributes() const { return fVertexAttributes.count(); }
     const AttributeSet& vertexAttributes() const { return fVertexAttributes; }
-    int numInstanceAttributes() const { return fInstanceAttributes.fCount; }
+    int numInstanceAttributes() const { return fInstanceAttributes.count(); }
     const AttributeSet& instanceAttributes() const { return fInstanceAttributes; }
 
-    bool hasVertexAttributes() const { return SkToBool(fVertexAttributes.fCount); }
-    bool hasInstanceAttributes() const { return SkToBool(fInstanceAttributes.fCount); }
+    bool hasVertexAttributes() const { return SkToBool(fVertexAttributes.count()); }
+    bool hasInstanceAttributes() const { return SkToBool(fInstanceAttributes.count()); }
 
     /**
      * A common practice is to populate the the vertex/instance's memory using an implicit array of
      * structs. In this case, it is best to assert that:
      *     stride == sizeof(struct)
      */
-    size_t vertexStride() const { return fVertexAttributes.fStride; }
-    size_t instanceStride() const { return fInstanceAttributes.fStride; }
+    size_t vertexStride() const { return fVertexAttributes.stride(); }
+    size_t instanceStride() const { return fInstanceAttributes.stride(); }
 
     bool willUseTessellationShaders() const {
         return fShaders & (kTessControl_GrShaderFlag | kTessEvaluation_GrShaderFlag);
@@ -194,30 +207,12 @@ class GrGeometryProcessor : public GrProcessor {
     inline static constexpr int kCoordTransformKeyBits = 4;
 
     /**
-     * Adds a key on the GrProcessorKeyBuilder that reflects any variety in the code that the
+     * Adds a key on the skgpu::KeyBuilder that reflects any variety in the code that the
      * geometry processor subclass can emit.
      */
-    virtual void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const = 0;
-
-    void getAttributeKey(GrProcessorKeyBuilder* b) const {
-        // Ensure that our CPU and GPU type fields fit together in a 32-bit value, and we never
-        // collide with the "uninitialized" value.
-        static_assert(kGrVertexAttribTypeCount < (1 << 8), "");
-        static_assert(kGrSLTypeCount           < (1 << 8), "");
-
-        auto add_attributes = [=](const Attribute* attrs, int attrCount) {
-            for (int i = 0; i < attrCount; ++i) {
-                const Attribute& attr = attrs[i];
-                b->appendComment(attr.isInitialized() ? attr.name() : "unusedAttr");
-                b->addBits(8, attr.isInitialized() ? attr.cpuType() : 0xff, "attrType");
-                b->addBits(8, attr.isInitialized() ? attr.gpuType() : 0xff, "attrGpuType");
-            }
-        };
-        b->add32(fVertexAttributes.fRawCount, "numVertexAttributes");
-        add_attributes(fVertexAttributes.fAttributes, fVertexAttributes.fRawCount);
-        b->add32(fInstanceAttributes.fRawCount, "numInstanceAttributes");
-        add_attributes(fInstanceAttributes.fAttributes, fInstanceAttributes.fRawCount);
-    }
+    virtual void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const = 0;
+
+    void getAttributeKey(skgpu::KeyBuilder* b) const;
 
     /**
      * Returns a new instance of the appropriate implementation class for the given
@@ -231,15 +226,22 @@ class GrGeometryProcessor : public GrProcessor {
     static Attribute MakeColorAttribute(const char* name, bool wideColor) {
         return { name,
                  wideColor ? kFloat4_GrVertexAttribType : kUByte4_norm_GrVertexAttribType,
-                 kHalf4_GrSLType };
+                 SkSLType::kHalf4 };
+    }
+    void setVertexAttributes(const Attribute* attrs, int attrCount, size_t stride) {
+        fVertexAttributes.initExplicit(attrs, attrCount, stride);
+    }
+    void setInstanceAttributes(const Attribute* attrs, int attrCount, size_t stride) {
+        SkASSERT(attrCount >= 0);
+        fInstanceAttributes.initExplicit(attrs, attrCount, stride);
     }
 
-    void setVertexAttributes(const Attribute* attrs, int attrCount) {
-        fVertexAttributes.init(attrs, attrCount);
+    void setVertexAttributesWithImplicitOffsets(const Attribute* attrs, int attrCount) {
+        fVertexAttributes.initImplicit(attrs, attrCount);
     }
-    void setInstanceAttributes(const Attribute* attrs, int attrCount) {
+    void setInstanceAttributesWithImplicitOffsets(const Attribute* attrs, int attrCount) {
         SkASSERT(attrCount >= 0);
-        fInstanceAttributes.init(attrs, attrCount);
+        fInstanceAttributes.initImplicit(attrs, attrCount);
     }
     void setWillUseTessellationShaders() {
         fShaders |= kTessControl_GrShaderFlag | kTessEvaluation_GrShaderFlag;
@@ -497,25 +499,25 @@ class GrGeometryProcessor::TextureSampler {
 public:
     TextureSampler() = default;
 
-    TextureSampler(GrSamplerState, const GrBackendFormat&, const GrSwizzle&);
+    TextureSampler(GrSamplerState, const GrBackendFormat&, const skgpu::Swizzle&);
 
     TextureSampler(const TextureSampler&) = delete;
     TextureSampler& operator=(const TextureSampler&) = delete;
 
-    void reset(GrSamplerState, const GrBackendFormat&, const GrSwizzle&);
+    void reset(GrSamplerState, const GrBackendFormat&, const skgpu::Swizzle&);
 
     const GrBackendFormat& backendFormat() const { return fBackendFormat; }
     GrTextureType textureType() const { return fBackendFormat.textureType(); }
 
     GrSamplerState samplerState() const { return fSamplerState; }
-    const GrSwizzle& swizzle() const { return fSwizzle; }
+    const skgpu::Swizzle& swizzle() const { return fSwizzle; }
 
     bool isInitialized() const { return fIsInitialized; }
 
 private:
     GrSamplerState  fSamplerState;
     GrBackendFormat fBackendFormat;
-    GrSwizzle       fSwizzle;
+    skgpu::Swizzle  fSwizzle;
     bool            fIsInitialized = false;
 };
 
diff --git a/third_party/skia/src/gpu/GrGpu.h b/third_party/skia/src/gpu/GrGpu.h
index 80165448e643b..0698a4df8c72c 100644
--- a/third_party/skia/src/gpu/GrGpu.h
+++ b/third_party/skia/src/gpu/GrGpu.h
@@ -18,8 +18,8 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrPixmap.h"
-#include "src/gpu/GrSwizzle.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/Swizzle.h"
 
 class GrAttachment;
 class GrBackendRenderTarget;
diff --git a/third_party/skia/src/gpu/GrGpuBuffer.cpp b/third_party/skia/src/gpu/GrGpuBuffer.cpp
index dc17bb69a0d00..285260b0f770b 100644
--- a/third_party/skia/src/gpu/GrGpuBuffer.cpp
+++ b/third_party/skia/src/gpu/GrGpuBuffer.cpp
@@ -58,10 +58,11 @@ bool GrGpuBuffer::updateData(const void* src, size_t srcSizeInBytes) {
     return result;
 }
 
-void GrGpuBuffer::ComputeScratchKeyForDynamicBuffer(size_t size, GrGpuBufferType intendedType,
-                                                 GrScratchKey* key) {
-    static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
-    GrScratchKey::Builder builder(key, kType, 1 + (sizeof(size_t) + 3) / 4);
+void GrGpuBuffer::ComputeScratchKeyForDynamicBuffer(size_t size,
+                                                    GrGpuBufferType intendedType,
+                                                    skgpu::ScratchKey* key) {
+    static const skgpu::ScratchKey::ResourceType kType = skgpu::ScratchKey::GenerateResourceType();
+    skgpu::ScratchKey::Builder builder(key, kType, 1 + (sizeof(size_t) + 3) / 4);
     builder[0] = SkToU32(intendedType);
     builder[1] = (uint32_t)size;
     if (sizeof(size_t) > 4) {
@@ -69,7 +70,7 @@ void GrGpuBuffer::ComputeScratchKeyForDynamicBuffer(size_t size, GrGpuBufferType
     }
 }
 
-void GrGpuBuffer::computeScratchKey(GrScratchKey* key) const {
+void GrGpuBuffer::computeScratchKey(skgpu::ScratchKey* key) const {
     if (SkIsPow2(fSizeInBytes) && kDynamic_GrAccessPattern == fAccessPattern) {
         ComputeScratchKeyForDynamicBuffer(fSizeInBytes, fIntendedType, key);
     }
diff --git a/third_party/skia/src/gpu/GrGpuBuffer.h b/third_party/skia/src/gpu/GrGpuBuffer.h
index 605441600c33a..c69699a25b8b2 100644
--- a/third_party/skia/src/gpu/GrGpuBuffer.h
+++ b/third_party/skia/src/gpu/GrGpuBuffer.h
@@ -19,7 +19,7 @@ class GrGpuBuffer : public GrGpuResource, public GrBuffer {
      * Computes a scratch key for a GPU-side buffer with a "dynamic" access pattern. (Buffers with
      * "static" and "stream" patterns are disqualified by nature from being cached and reused.)
      */
-    static void ComputeScratchKeyForDynamicBuffer(size_t size, GrGpuBufferType, GrScratchKey*);
+    static void ComputeScratchKeyForDynamicBuffer(size_t size, GrGpuBufferType, skgpu::ScratchKey*);
 
     GrAccessPattern accessPattern() const { return fAccessPattern; }
 
@@ -93,7 +93,7 @@ class GrGpuBuffer : public GrGpuResource, public GrBuffer {
 
     size_t onGpuMemorySize() const override { return fSizeInBytes; }
     const char* getResourceType() const override { return "Buffer Object"; }
-    void computeScratchKey(GrScratchKey* key) const override;
+    void computeScratchKey(skgpu::ScratchKey* key) const override;
 
     size_t            fSizeInBytes;
     GrAccessPattern   fAccessPattern;
diff --git a/third_party/skia/src/gpu/GrGpuResource.cpp b/third_party/skia/src/gpu/GrGpuResource.cpp
index faa1378a86a5f..cea182b7e8ccf 100644
--- a/third_party/skia/src/gpu/GrGpuResource.cpp
+++ b/third_party/skia/src/gpu/GrGpuResource.cpp
@@ -141,7 +141,7 @@ void GrGpuResource::removeUniqueKey() {
     get_resource_cache(fGpu)->resourceAccess().removeUniqueKey(this);
 }
 
-void GrGpuResource::setUniqueKey(const GrUniqueKey& key) {
+void GrGpuResource::setUniqueKey(const skgpu::UniqueKey& key) {
     SkASSERT(this->internalHasRef());
     SkASSERT(key.isValid());
 
diff --git a/third_party/skia/src/gpu/GrGpuResource.h b/third_party/skia/src/gpu/GrGpuResource.h
index 3a5c064775e95..a152a38adf6a1 100644
--- a/third_party/skia/src/gpu/GrGpuResource.h
+++ b/third_party/skia/src/gpu/GrGpuResource.h
@@ -8,9 +8,9 @@
 #ifndef GrGpuResource_DEFINED
 #define GrGpuResource_DEFINED
 
-#include "include/private/GrResourceKey.h"
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkNoncopyable.h"
+#include "src/gpu/ResourceKey.h"
 
 class GrGpu;
 class GrResourceCache;
@@ -172,7 +172,7 @@ class GrGpuResource : public GrIORef<GrGpuResource> {
 
     /** Returns the current unique key for the resource. It will be invalid if the resource has no
         associated unique key. */
-    const GrUniqueKey& getUniqueKey() const { return fUniqueKey; }
+    const skgpu::UniqueKey& getUniqueKey() const { return fUniqueKey; }
 
     /**
      * Internal-only helper class used for manipulations of the resource by the cache.
@@ -264,7 +264,7 @@ class GrGpuResource : public GrIORef<GrGpuResource> {
      * resources and populate the scratchKey with the key.
      * By default resources are not recycled as scratch.
      **/
-    virtual void computeScratchKey(GrScratchKey*) const {}
+    virtual void computeScratchKey(skgpu::ScratchKey*) const {}
 
     /**
      * Removes references to objects in the underlying 3D API without freeing them.
@@ -280,7 +280,7 @@ class GrGpuResource : public GrIORef<GrGpuResource> {
     virtual size_t onGpuMemorySize() const = 0;
 
     // See comments in CacheAccess and ResourcePriv.
-    void setUniqueKey(const GrUniqueKey&);
+    void setUniqueKey(const skgpu::UniqueKey&);
     void removeUniqueKey();
     void notifyARefCntIsZero(LastRemovedRef removedRef) const;
     void removeScratchKey();
@@ -300,8 +300,8 @@ class GrGpuResource : public GrIORef<GrGpuResource> {
     GrStdSteadyClock::time_point fTimeWhenBecamePurgeable;
 
     static const size_t kInvalidGpuMemorySize = ~static_cast<size_t>(0);
-    GrScratchKey fScratchKey;
-    GrUniqueKey fUniqueKey;
+    skgpu::ScratchKey fScratchKey;
+    skgpu::UniqueKey fUniqueKey;
 
     // This is not ref'ed but abandon() or release() will be called before the GrGpu object
     // is destroyed. Those calls set will this to NULL.
diff --git a/third_party/skia/src/gpu/GrGpuResourceCacheAccess.h b/third_party/skia/src/gpu/GrGpuResourceCacheAccess.h
index 43eded6bb11be..dcb580ad0b94e 100644
--- a/third_party/skia/src/gpu/GrGpuResourceCacheAccess.h
+++ b/third_party/skia/src/gpu/GrGpuResourceCacheAccess.h
@@ -57,7 +57,7 @@ class GrGpuResource::CacheAccess {
     }
 
     /** Called by the cache to assign a new unique key. */
-    void setUniqueKey(const GrUniqueKey& key) { fResource->fUniqueKey = key; }
+    void setUniqueKey(const skgpu::UniqueKey& key) { fResource->fUniqueKey = key; }
 
     /** Is the resource ref'ed */
     bool hasRef() const { return fResource->hasRef(); }
diff --git a/third_party/skia/src/gpu/GrGpuResourcePriv.h b/third_party/skia/src/gpu/GrGpuResourcePriv.h
index d3ea5072074c2..466e1da2e5faf 100644
--- a/third_party/skia/src/gpu/GrGpuResourcePriv.h
+++ b/third_party/skia/src/gpu/GrGpuResourcePriv.h
@@ -22,7 +22,7 @@ class GrGpuResource::ResourcePriv {
      * removeUniqueKey(). If another resource is using the key then its unique key is removed and
      * this resource takes over the key.
      */
-    void setUniqueKey(const GrUniqueKey& key) { fResource->setUniqueKey(key); }
+    void setUniqueKey(const skgpu::UniqueKey& key) { fResource->setUniqueKey(key); }
 
     /** Removes the unique key from a resource. If the resource has a scratch key, it may be
         preserved for recycling as scratch. */
@@ -60,7 +60,7 @@ class GrGpuResource::ResourcePriv {
      * Otherwise it returns a key for which isNullScratch is true. The resource may currently be
      * used as a uniquely keyed resource rather than scratch. Check isScratch().
      */
-    const GrScratchKey& getScratchKey() const { return fResource->fScratchKey; }
+    const skgpu::ScratchKey& getScratchKey() const { return fResource->fScratchKey; }
 
     /**
      * If the resource has a scratch key, the key will be removed. Since scratch keys are installed
diff --git a/third_party/skia/src/gpu/GrImageContextPriv.h b/third_party/skia/src/gpu/GrImageContextPriv.h
index 147bff25205c2..272a858908b9c 100644
--- a/third_party/skia/src/gpu/GrImageContextPriv.h
+++ b/third_party/skia/src/gpu/GrImageContextPriv.h
@@ -28,14 +28,13 @@ class GrImageContextPriv : public GrBaseContextPriv {
     }
 
     /** This is only useful for debug purposes */
-    SkDEBUGCODE(GrSingleOwner* singleOwner() const { return this->context()->singleOwner(); } )
+    SkDEBUGCODE(skgpu::SingleOwner* singleOwner() const { return this->context()->singleOwner(); } )
 
 protected:
     explicit GrImageContextPriv(GrImageContext* iContext) : GrBaseContextPriv(iContext) {}
-    // Required until C++17 copy elision
-    GrImageContextPriv(const GrImageContextPriv&) = default;
 
 private:
+    GrImageContextPriv(const GrImageContextPriv&) = delete;
     GrImageContextPriv& operator=(const GrImageContextPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrMemoryPool.cpp b/third_party/skia/src/gpu/GrMemoryPool.cpp
index 8cc227c93f16c..60b5316738740 100644
--- a/third_party/skia/src/gpu/GrMemoryPool.cpp
+++ b/third_party/skia/src/gpu/GrMemoryPool.cpp
@@ -32,20 +32,24 @@ std::unique_ptr<GrMemoryPool> GrMemoryPool::Make(size_t preallocSize, size_t min
 GrMemoryPool::GrMemoryPool(size_t preallocSize, size_t minAllocSize)
         : fAllocator(SkBlockAllocator::GrowthPolicy::kFixed, minAllocSize,
                      preallocSize - offsetof(GrMemoryPool, fAllocator) - sizeof(SkBlockAllocator)) {
-    SkDEBUGCODE(fAllocationCount = 0;)
+    SkDEBUGCODE(
+        fDebug = new Debug;
+        fDebug->fAllocationCount = 0;
+    )
 }
 
 GrMemoryPool::~GrMemoryPool() {
     this->reportLeaks();
-    SkASSERT(0 == fAllocationCount);
+    SkASSERT(0 == fDebug->fAllocationCount);
     SkASSERT(this->isEmpty());
+    SkDEBUGCODE(delete fDebug;)
 }
 
 void GrMemoryPool::reportLeaks() const {
 #ifdef SK_DEBUG
     int i = 0;
-    int n = fAllocatedIDs.count();
-    for (int id : fAllocatedIDs) {
+    int n = fDebug->fAllocatedIDs.count();
+    for (int id : fDebug->fAllocatedIDs) {
         if (++i == 1) {
             SkDebugf("Leaked %d IDs (in no particular order): %d%s", n, id, (n == i) ? "\n" : "");
         } else if (i < 11) {
@@ -85,8 +89,8 @@ void* GrMemoryPool::allocate(size_t size) {
     }();
 
     // You can set a breakpoint here when a leaked ID is allocated to see the stack frame.
-    fAllocatedIDs.add(header->fID);
-    fAllocationCount++;
+    fDebug->fAllocatedIDs.add(header->fID);
+    fDebug->fAllocationCount++;
 #endif
 
     // User-facing pointer is after the header padding
@@ -104,8 +108,8 @@ void GrMemoryPool::release(void* p) {
 #endif
 
 #if defined(SK_DEBUG)
-    fAllocatedIDs.remove(header->fID);
-    fAllocationCount--;
+    fDebug->fAllocatedIDs.remove(header->fID);
+    fDebug->fAllocationCount--;
 #endif
 
     SkBlockAllocator::Block* block = fAllocator.owningBlock<kAlignment>(header, header->fStart);
@@ -138,8 +142,8 @@ void GrMemoryPool::validate() const {
     for (const auto* b : fAllocator.blocks()) {
         allocCount += b->metadata();
     }
-    SkASSERT(allocCount == fAllocationCount);
-    SkASSERT(fAllocationCount == fAllocatedIDs.count());
+    SkASSERT(allocCount == fDebug->fAllocationCount);
+    SkASSERT(fDebug->fAllocationCount == fDebug->fAllocatedIDs.count());
     SkASSERT(allocCount > 0 || this->isEmpty());
 }
 #endif
diff --git a/third_party/skia/src/gpu/GrMemoryPool.h b/third_party/skia/src/gpu/GrMemoryPool.h
index 089fca187a33e..b5c7cc6d725ae 100644
--- a/third_party/skia/src/gpu/GrMemoryPool.h
+++ b/third_party/skia/src/gpu/GrMemoryPool.h
@@ -88,6 +88,7 @@ class GrMemoryPool {
      */
     size_t preallocSize() const {
         // Account for the debug-only fields in this count, the offset is 0 for release builds
+        static_assert(std::is_standard_layout<GrMemoryPool>::value, "");
         return offsetof(GrMemoryPool, fAllocator) + fAllocator.preallocSize();
     }
 
@@ -119,8 +120,14 @@ class GrMemoryPool {
     GrMemoryPool(size_t preallocSize, size_t minAllocSize);
 
 #ifdef SK_DEBUG
-    SkTHashSet<int>  fAllocatedIDs;
-    int              fAllocationCount;
+    // Because this exists preallocSize wants to use offsetof, so keep GrMemoryPool standard layout
+    // without depending on SkTHashSet being standard layout. Note that std::unique_ptr may not be
+    // standard layout.
+    struct Debug{
+        SkTHashSet<int>  fAllocatedIDs;
+        int              fAllocationCount;
+    };
+    Debug* fDebug{nullptr};
 #endif
 
     SkBlockAllocator fAllocator; // Must be the last field, in order to use extra allocated space
diff --git a/third_party/skia/src/gpu/GrMeshDrawTarget.cpp b/third_party/skia/src/gpu/GrMeshDrawTarget.cpp
index cf1a0ff50cb21..3a2491b29676a 100644
--- a/third_party/skia/src/gpu/GrMeshDrawTarget.cpp
+++ b/third_party/skia/src/gpu/GrMeshDrawTarget.cpp
@@ -7,8 +7,44 @@
 
 #include "src/gpu/GrMeshDrawTarget.h"
 
+#include "src/gpu/BufferWriter.h"
 #include "src/gpu/GrResourceProvider.h"
 
 uint32_t GrMeshDrawTarget::contextUniqueID() const {
     return this->resourceProvider()->contextUniqueID();
 }
+
+template<typename W>
+static W make_writer(void* p, int count, size_t elementSize) {
+    // Don't worry about overflow in calculating byte size if 'p' is not null, presumably the actual
+    // allocation validated it, so it should be safe after the fact.
+    return p ? W{p, count * elementSize} : W{};
+}
+
+skgpu::VertexWriter GrMeshDrawTarget::makeVertexWriter(
+        size_t vertexSize, int vertexCount, sk_sp<const GrBuffer>* buffer, int* startVertex) {
+    void* p = this->makeVertexSpace(vertexSize, vertexCount, buffer, startVertex);
+    return make_writer<skgpu::VertexWriter>(p, vertexCount, vertexSize);
+}
+
+skgpu::IndexWriter GrMeshDrawTarget::makeIndexWriter(
+        int indexCount, sk_sp<const GrBuffer>* buffer, int* startIndex) {
+    void* p = this->makeIndexSpace(indexCount, buffer, startIndex);
+    return make_writer<skgpu::IndexWriter>(p, indexCount, sizeof(uint16_t));
+}
+
+skgpu::VertexWriter GrMeshDrawTarget::makeVertexWriterAtLeast(
+        size_t vertexSize, int minVertexCount, int fallbackVertexCount,
+        sk_sp<const GrBuffer>* buffer, int* startVertex, int* actualVertexCount) {
+    void* p = this->makeVertexSpaceAtLeast(vertexSize, minVertexCount, fallbackVertexCount,
+                                           buffer, startVertex, actualVertexCount);
+    return make_writer<skgpu::VertexWriter>(p, *actualVertexCount, vertexSize);
+}
+
+skgpu::IndexWriter GrMeshDrawTarget::makeIndexWriterAtLeast(
+        int minIndexCount, int fallbackIndexCount, sk_sp<const GrBuffer>* buffer,
+        int* startIndex, int* actualIndexCount) {
+    void* p = this->makeIndexSpaceAtLeast(minIndexCount, fallbackIndexCount, buffer,
+                                          startIndex, actualIndexCount);
+    return make_writer<skgpu::IndexWriter>(p, *actualIndexCount, sizeof(uint16_t));
+}
diff --git a/third_party/skia/src/gpu/GrMeshDrawTarget.h b/third_party/skia/src/gpu/GrMeshDrawTarget.h
index ff7c9df89cc25..9ba4389b0dc5f 100644
--- a/third_party/skia/src/gpu/GrMeshDrawTarget.h
+++ b/third_party/skia/src/gpu/GrMeshDrawTarget.h
@@ -15,7 +15,12 @@ class GrAtlasManager;
 class GrStrikeCache;
 class GrThreadSafeCache;
 
-namespace skgpu { namespace v1 { class SmallPathAtlasMgr; }}
+namespace skgpu {
+    namespace v1 { class SmallPathAtlasMgr; }
+
+    struct IndexWriter;
+    struct VertexWriter;
+} // namespace skgpu
 
 /*
  * Abstract interface that supports creating vertices, indices, and meshes, as well as
@@ -94,6 +99,17 @@ class GrMeshDrawTarget {
                                                                      sk_sp<const GrBuffer>*,
                                                                      size_t* offsetInBytes) = 0;
 
+    /** Helpers for ops that only need to use the VertexWriter to fill the data directly. */
+    skgpu::VertexWriter makeVertexWriter(size_t vertexSize, int vertexCount,
+                                         sk_sp<const GrBuffer>*, int* startVertex);
+    skgpu::IndexWriter makeIndexWriter(int indexCount, sk_sp<const GrBuffer>*, int* startIndex);
+    skgpu::VertexWriter makeVertexWriterAtLeast(size_t vertexSize, int minVertexCount,
+                                                int fallbackVertexCount, sk_sp<const GrBuffer>*,
+                                                int* startVertex, int* actualVertexCount);
+    skgpu::IndexWriter makeIndexWriterAtLeast(int minIndexCount, int fallbackIndexCount,
+                                              sk_sp<const GrBuffer>*, int* startIndex,
+                                              int* actualIndexCount);
+
     /** Helpers for ops which over-allocate and then return excess data to the pool. */
     virtual void putBackIndices(int indices) = 0;
     virtual void putBackVertices(int vertices, size_t vertexStride) = 0;
diff --git a/third_party/skia/src/gpu/GrPersistentCacheUtils.cpp b/third_party/skia/src/gpu/GrPersistentCacheUtils.cpp
index c5c3ab20c65e2..5750226f7c886 100644
--- a/third_party/skia/src/gpu/GrPersistentCacheUtils.cpp
+++ b/third_party/skia/src/gpu/GrPersistentCacheUtils.cpp
@@ -27,7 +27,7 @@ int GetCurrentVersion() {
 }
 
 sk_sp<SkData> PackCachedShaders(SkFourByteTag shaderType,
-                                const SkSL::String shaders[],
+                                const std::string shaders[],
                                 const SkSL::Program::Inputs inputs[],
                                 int numInputs,
                                 const ShaderMetadata* meta) {
@@ -74,7 +74,7 @@ SkFourByteTag GetType(SkReadBuffer* reader) {
 }
 
 bool UnpackCachedShaders(SkReadBuffer* reader,
-                         SkSL::String shaders[],
+                         std::string shaders[],
                          SkSL::Program::Inputs inputs[],
                          int numInputs,
                          ShaderMetadata* meta) {
diff --git a/third_party/skia/src/gpu/GrPersistentCacheUtils.h b/third_party/skia/src/gpu/GrPersistentCacheUtils.h
index 4f4ccd3ec8c47..5fdb200909317 100644
--- a/third_party/skia/src/gpu/GrPersistentCacheUtils.h
+++ b/third_party/skia/src/gpu/GrPersistentCacheUtils.h
@@ -21,7 +21,7 @@ namespace GrPersistentCacheUtils {
 
 struct ShaderMetadata {
     SkSL::Program::Settings* fSettings = nullptr;
-    SkTArray<SkSL::String> fAttributeNames;
+    SkTArray<std::string> fAttributeNames;
     bool fHasCustomColorOutput = false;
     bool fHasSecondaryColorOutput = false;
     sk_sp<SkData> fPlatformData;
@@ -30,7 +30,7 @@ struct ShaderMetadata {
 int GetCurrentVersion();
 
 sk_sp<SkData> PackCachedShaders(SkFourByteTag shaderType,
-                                const SkSL::String shaders[],
+                                const std::string shaders[],
                                 const SkSL::Program::Inputs inputs[],
                                 int numInputs,
                                 const ShaderMetadata* meta = nullptr);
@@ -38,7 +38,7 @@ sk_sp<SkData> PackCachedShaders(SkFourByteTag shaderType,
 SkFourByteTag GetType(SkReadBuffer* reader);
 
 bool UnpackCachedShaders(SkReadBuffer* reader,
-                         SkSL::String shaders[],
+                         std::string shaders[],
                          SkSL::Program::Inputs inputs[],
                          int numInputs,
                          ShaderMetadata* meta = nullptr);
diff --git a/third_party/skia/src/gpu/GrPipeline.cpp b/third_party/skia/src/gpu/GrPipeline.cpp
index 78be6bab2a14c..f850312b7b622 100644
--- a/third_party/skia/src/gpu/GrPipeline.cpp
+++ b/third_party/skia/src/gpu/GrPipeline.cpp
@@ -10,6 +10,7 @@
 #include "src/gpu/GrAppliedClip.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
 
@@ -63,7 +64,7 @@ GrXferBarrierType GrPipeline::xferBarrierType(const GrCaps& caps) const {
 
 GrPipeline::GrPipeline(GrScissorTest scissorTest,
                        sk_sp<const GrXferProcessor> xp,
-                       const GrSwizzle& writeSwizzle,
+                       const skgpu::Swizzle& writeSwizzle,
                        InputFlags inputFlags)
         : fWindowRectsState()
         , fFlags((Flags)inputFlags)
@@ -74,7 +75,7 @@ GrPipeline::GrPipeline(GrScissorTest scissorTest,
     }
 }
 
-void GrPipeline::genKey(GrProcessorKeyBuilder* b, const GrCaps& caps) const {
+void GrPipeline::genKey(skgpu::KeyBuilder* b, const GrCaps& caps) const {
     // kSnapVerticesToPixelCenters is implemented in a shader.
     InputFlags ignoredFlags = InputFlags::kSnapVerticesToPixelCenters;
     b->add32((uint32_t)fFlags & ~(uint32_t)ignoredFlags, "flags");
diff --git a/third_party/skia/src/gpu/GrPipeline.h b/third_party/skia/src/gpu/GrPipeline.h
index 93ea95ecd2cd1..085b90260fa1f 100644
--- a/third_party/skia/src/gpu/GrPipeline.h
+++ b/third_party/skia/src/gpu/GrPipeline.h
@@ -61,7 +61,7 @@ class GrPipeline {
         InputFlags fInputFlags = InputFlags::kNone;
         const GrCaps* fCaps = nullptr;
         GrDstProxyView fDstProxyView;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
     };
 
     /**
@@ -71,7 +71,7 @@ class GrPipeline {
      **/
     GrPipeline(GrScissorTest scissor,
                SkBlendMode blend,
-               const GrSwizzle& writeSwizzle,
+               const skgpu::Swizzle& writeSwizzle,
                InputFlags flags = InputFlags::kNone)
             : GrPipeline(scissor,
                          GrPorterDuffXPFactory::MakeNoCoverageXP(blend),
@@ -80,7 +80,7 @@ class GrPipeline {
 
     GrPipeline(GrScissorTest,
                sk_sp<const GrXferProcessor>,
-               const GrSwizzle& writeSwizzle,
+               const skgpu::Swizzle& writeSwizzle,
                InputFlags = InputFlags::kNone);
 
     GrPipeline(const InitArgs& args, sk_sp<const GrXferProcessor>, const GrAppliedHardClip&);
@@ -190,9 +190,9 @@ class GrPipeline {
     GrXferBarrierType xferBarrierType(const GrCaps&) const;
 
     // Used by Vulkan and Metal to cache their respective pipeline objects
-    void genKey(GrProcessorKeyBuilder*, const GrCaps&) const;
+    void genKey(skgpu::KeyBuilder*, const GrCaps&) const;
 
-    const GrSwizzle& writeSwizzle() const { return fWriteSwizzle; }
+    const skgpu::Swizzle& writeSwizzle() const { return fWriteSwizzle; }
 
     void visitProxies(const GrVisitProxyFunc&) const;
 
@@ -225,7 +225,7 @@ class GrPipeline {
     // This value is also the index in fFragmentProcessors where coverage processors begin.
     int fNumColorProcessors = 0;
 
-    GrSwizzle fWriteSwizzle;
+    skgpu::Swizzle fWriteSwizzle;
 };
 
 GR_MAKE_BITFIELD_CLASS_OPS(GrPipeline::InputFlags)
diff --git a/third_party/skia/src/gpu/GrPixmap.h b/third_party/skia/src/gpu/GrPixmap.h
index f914fed359de7..ff49b06d52829 100644
--- a/third_party/skia/src/gpu/GrPixmap.h
+++ b/third_party/skia/src/gpu/GrPixmap.h
@@ -62,7 +62,7 @@ template <typename T, typename DERIVED> class GrPixmapBase {
 
     GrPixmapBase(GrImageInfo info, T* addr, size_t rowBytes)
             : fAddr(addr), fRowBytes(rowBytes), fInfo(std::move(info)) {
-        if (fRowBytes < info.minRowBytes() || !addr) {
+        if (fRowBytes < fInfo.minRowBytes() || !addr) {
             *this = {};
         }
     }
diff --git a/third_party/skia/src/gpu/GrProcessor.h b/third_party/skia/src/gpu/GrProcessor.h
index 104537bd4d42a..861764433778b 100644
--- a/third_party/skia/src/gpu/GrProcessor.h
+++ b/third_party/skia/src/gpu/GrProcessor.h
@@ -32,6 +32,7 @@ class GrProcessor {
     enum ClassID {
         kNull_ClassID,  // Reserved ID for missing (null) processors
 
+        kAttributeTestProcessor_ClassID,
         kBigKeyProcessor_ClassID,
         kBlendFragmentProcessor_ClassID,
         kBlockInputFragmentProcessor_ClassID,
diff --git a/third_party/skia/src/gpu/GrProgramDesc.cpp b/third_party/skia/src/gpu/GrProgramDesc.cpp
index ec5830b8db027..a74c05c8c51ee 100644
--- a/third_party/skia/src/gpu/GrProgramDesc.cpp
+++ b/third_party/skia/src/gpu/GrProgramDesc.cpp
@@ -17,6 +17,7 @@
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 
@@ -45,7 +46,7 @@ static inline uint16_t texture_type_key(GrTextureType type) {
     return SkToU16(value);
 }
 
-static uint32_t sampler_key(GrTextureType textureType, const GrSwizzle& swizzle,
+static uint32_t sampler_key(GrTextureType textureType, const skgpu::Swizzle& swizzle,
                             const GrCaps& caps) {
     int samplerTypeKey = texture_type_key(textureType);
 
@@ -54,7 +55,7 @@ static uint32_t sampler_key(GrTextureType textureType, const GrSwizzle& swizzle,
     return SkToU32(samplerTypeKey | swizzleKey << kSamplerOrImageTypeKeyBits);
 }
 
-static void add_geomproc_sampler_keys(GrProcessorKeyBuilder* b,
+static void add_geomproc_sampler_keys(skgpu::KeyBuilder* b,
                                       const GrGeometryProcessor& geomProc,
                                       const GrCaps& caps) {
     int numTextureSamplers = geomProc.numTextureSamplers();
@@ -82,7 +83,7 @@ static constexpr uint32_t kClassIDBits = 8;
  */
 static void gen_geomproc_key(const GrGeometryProcessor& geomProc,
                              const GrCaps& caps,
-                             GrProcessorKeyBuilder* b) {
+                             skgpu::KeyBuilder* b) {
     b->appendComment(geomProc.name());
     b->addBits(kClassIDBits, geomProc.classID(), "geomProcClassID");
 
@@ -95,7 +96,7 @@ static void gen_geomproc_key(const GrGeometryProcessor& geomProc,
 static void gen_xp_key(const GrXferProcessor& xp,
                        const GrCaps& caps,
                        const GrPipeline& pipeline,
-                       GrProcessorKeyBuilder* b) {
+                       skgpu::KeyBuilder* b) {
     b->appendComment(xp.name());
     b->addBits(kClassIDBits, xp.classID(), "xpClassID");
 
@@ -114,7 +115,7 @@ static void gen_xp_key(const GrXferProcessor& xp,
 
 static void gen_fp_key(const GrFragmentProcessor& fp,
                        const GrCaps& caps,
-                       GrProcessorKeyBuilder* b) {
+                       skgpu::KeyBuilder* b) {
     b->appendComment(fp.name());
     b->addBits(kClassIDBits, fp.classID(), "fpClassID");
     b->addBits(GrGeometryProcessor::kCoordTransformKeyBits,
@@ -141,7 +142,7 @@ static void gen_fp_key(const GrFragmentProcessor& fp,
     }
 }
 
-static void gen_key(GrProcessorKeyBuilder* b,
+static void gen_key(skgpu::KeyBuilder* b,
                     const GrProgramInfo& programInfo,
                     const GrCaps& caps) {
     gen_geomproc_key(programInfo.geomProc(), caps, b);
@@ -170,7 +171,7 @@ void GrProgramDesc::Build(GrProgramDesc* desc,
                           const GrProgramInfo& programInfo,
                           const GrCaps& caps) {
     desc->reset();
-    GrProcessorKeyBuilder b(desc->key());
+    skgpu::KeyBuilder b(desc->key());
     gen_key(&b, programInfo, caps);
     desc->fInitialKeyLength = desc->keyLength();
 }
@@ -178,7 +179,7 @@ void GrProgramDesc::Build(GrProgramDesc* desc,
 SkString GrProgramDesc::Describe(const GrProgramInfo& programInfo,
                                  const GrCaps& caps) {
     GrProgramDesc desc;
-    GrProcessorStringKeyBuilder b(desc.key());
+    skgpu::StringKeyBuilder b(desc.key());
     gen_key(&b, programInfo, caps);
     b.flush();
     return b.description();
diff --git a/third_party/skia/src/gpu/GrProgramDesc.h b/third_party/skia/src/gpu/GrProgramDesc.h
index c83a4b1241d04..381fec3f4dc0d 100644
--- a/third_party/skia/src/gpu/GrProgramDesc.h
+++ b/third_party/skia/src/gpu/GrProgramDesc.h
@@ -19,86 +19,6 @@ class GrCaps;
 class GrProgramInfo;
 class GrRenderTarget;
 
-class GrProcessorKeyBuilder {
-public:
-    GrProcessorKeyBuilder(SkTArray<uint32_t, true>* data) : fData(data) {}
-
-    virtual ~GrProcessorKeyBuilder() {
-        // Ensure that flush was called before we went out of scope
-        SkASSERT(fBitsUsed == 0);
-    }
-
-    virtual void addBits(uint32_t numBits, uint32_t val, const char* label) {
-        SkASSERT(numBits > 0 && numBits <= 32);
-        SkASSERT(numBits == 32 || (val < (1u << numBits)));
-
-        fCurValue |= (val << fBitsUsed);
-        fBitsUsed += numBits;
-
-        if (fBitsUsed >= 32) {
-            // Overflow, start a new working value
-            fData->push_back(fCurValue);
-            uint32_t excess = fBitsUsed - 32;
-            fCurValue = excess ? (val >> (numBits - excess)) : 0;
-            fBitsUsed = excess;
-        }
-
-        SkASSERT(fCurValue < (1u << fBitsUsed));
-    }
-
-    void addBytes(uint32_t numBytes, const void* data, const char* label) {
-        const uint8_t* bytes = reinterpret_cast<const uint8_t*>(data);
-        for (; numBytes --> 0; bytes++) {
-            this->addBits(8, *bytes, label);
-        }
-    }
-
-    void addBool(bool b, const char* label) {
-        this->addBits(1, b, label);
-    }
-
-    void add32(uint32_t v, const char* label = "unknown") {
-        this->addBits(32, v, label);
-    }
-
-    virtual void appendComment(const char* comment) {}
-
-    // Introduces a word-boundary in the key. Must be called before using the key with any cache,
-    // but can also be called to create a break between generic data and backend-specific data.
-    void flush() {
-        if (fBitsUsed) {
-            fData->push_back(fCurValue);
-            fCurValue = 0;
-            fBitsUsed = 0;
-        }
-    }
-
-private:
-    SkTArray<uint32_t, true>* fData;
-    uint32_t fCurValue = 0;
-    uint32_t fBitsUsed = 0;  // ... in current value
-};
-
-class GrProcessorStringKeyBuilder : public GrProcessorKeyBuilder {
-public:
-    GrProcessorStringKeyBuilder(SkTArray<uint32_t, true>* data) : INHERITED(data) {}
-
-    void addBits(uint32_t numBits, uint32_t val, const char* label) override {
-        INHERITED::addBits(numBits, val, label);
-        fDescription.appendf("%s: %u\n", label, val);
-    }
-
-    void appendComment(const char* comment) override {
-        fDescription.appendf("%s\n", comment);
-    }
-
-    SkString description() const { return fDescription; }
-
-private:
-    using INHERITED = GrProcessorKeyBuilder;
-    SkString fDescription;
-};
-
 /** This class is used to generate a generic program cache key. The Dawn, Metal and Vulkan
  *  backends derive backend-specific versions which add additional information.
  */
diff --git a/third_party/skia/src/gpu/GrProxyProvider.cpp b/third_party/skia/src/gpu/GrProxyProvider.cpp
index c18c4d6cba346..55efee9bbf3d6 100644
--- a/third_party/skia/src/gpu/GrProxyProvider.cpp
+++ b/third_party/skia/src/gpu/GrProxyProvider.cpp
@@ -11,8 +11,7 @@
 #include "include/core/SkImage.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/private/GrImageContext.h"
-#include "include/private/GrResourceKey.h"
-#include "include/private/GrSingleOwner.h"
+#include "include/private/SingleOwner.h"
 #include "include/private/SkImageInfoPriv.h"
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkCompressedDataUtils.h"
@@ -37,7 +36,7 @@
 #include "include/gpu/vk/GrVkTypes.h"
 #endif
 
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fImageContext->priv().singleOwner())
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fImageContext->priv().singleOwner())
 
 GrProxyProvider::GrProxyProvider(GrImageContext* imageContext) : fImageContext(imageContext) {}
 
@@ -50,7 +49,7 @@ GrProxyProvider::~GrProxyProvider() {
     }
 }
 
-bool GrProxyProvider::assignUniqueKeyToProxy(const GrUniqueKey& key, GrTextureProxy* proxy) {
+bool GrProxyProvider::assignUniqueKeyToProxy(const skgpu::UniqueKey& key, GrTextureProxy* proxy) {
     ASSERT_SINGLE_OWNER
     SkASSERT(key.isValid());
     if (this->isAbandoned() || !proxy) {
@@ -102,7 +101,7 @@ void GrProxyProvider::removeUniqueKeyFromProxy(GrTextureProxy* proxy) {
     this->processInvalidUniqueKey(proxy->getUniqueKey(), proxy, InvalidateGPUResource::kYes);
 }
 
-sk_sp<GrTextureProxy> GrProxyProvider::findProxyByUniqueKey(const GrUniqueKey& key) {
+sk_sp<GrTextureProxy> GrProxyProvider::findProxyByUniqueKey(const skgpu::UniqueKey& key) {
     ASSERT_SINGLE_OWNER
 
     if (this->isAbandoned()) {
@@ -213,7 +212,7 @@ sk_sp<GrTextureProxy> GrProxyProvider::createWrapped(sk_sp<GrTexture> tex,
     }
 }
 
-sk_sp<GrTextureProxy> GrProxyProvider::findOrCreateProxyByUniqueKey(const GrUniqueKey& key,
+sk_sp<GrTextureProxy> GrProxyProvider::findOrCreateProxyByUniqueKey(const skgpu::UniqueKey& key,
                                                                     UseAllocator useAllocator) {
     ASSERT_SINGLE_OWNER
 
@@ -248,10 +247,11 @@ sk_sp<GrTextureProxy> GrProxyProvider::findOrCreateProxyByUniqueKey(const GrUniq
     return result;
 }
 
-GrSurfaceProxyView GrProxyProvider::findCachedProxyWithColorTypeFallback(const GrUniqueKey& key,
-                                                                         GrSurfaceOrigin origin,
-                                                                         GrColorType ct,
-                                                                         int sampleCnt) {
+GrSurfaceProxyView GrProxyProvider::findCachedProxyWithColorTypeFallback(
+        const skgpu::UniqueKey& key,
+        GrSurfaceOrigin origin,
+        GrColorType ct,
+        int sampleCnt) {
     auto proxy = this->findOrCreateProxyByUniqueKey(key);
     if (!proxy) {
         return {};
@@ -264,7 +264,7 @@ GrSurfaceProxyView GrProxyProvider::findCachedProxyWithColorTypeFallback(const G
         std::tie(ct, expectedFormat) = caps->getFallbackColorTypeAndFormat(ct, sampleCnt);
         SkASSERT(expectedFormat == proxy->backendFormat());
     }
-    GrSwizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
+    skgpu::Swizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
     return {std::move(proxy), origin, swizzle};
 }
 
@@ -862,12 +862,14 @@ sk_sp<GrTextureProxy> GrProxyProvider::MakeFullyLazyProxy(LazyInstantiateCallbac
     }
 }
 
-void GrProxyProvider::processInvalidUniqueKey(const GrUniqueKey& key, GrTextureProxy* proxy,
+void GrProxyProvider::processInvalidUniqueKey(const skgpu::UniqueKey& key,
+                                              GrTextureProxy* proxy,
                                               InvalidateGPUResource invalidateGPUResource) {
     this->processInvalidUniqueKeyImpl(key, proxy, invalidateGPUResource, RemoveTableEntry::kYes);
 }
 
-void GrProxyProvider::processInvalidUniqueKeyImpl(const GrUniqueKey& key, GrTextureProxy* proxy,
+void GrProxyProvider::processInvalidUniqueKeyImpl(const skgpu::UniqueKey& key,
+                                                  GrTextureProxy* proxy,
                                                   InvalidateGPUResource invalidateGPUResource,
                                                   RemoveTableEntry removeTableEntry) {
     SkASSERT(key.isValid());
diff --git a/third_party/skia/src/gpu/GrProxyProvider.h b/third_party/skia/src/gpu/GrProxyProvider.h
index d89bfa9c726e7..83781e802a1e5 100644
--- a/third_party/skia/src/gpu/GrProxyProvider.h
+++ b/third_party/skia/src/gpu/GrProxyProvider.h
@@ -9,9 +9,9 @@
 #define GrProxyProvider_DEFINED
 
 #include "include/gpu/GrTypes.h"
-#include "include/private/GrResourceKey.h"
 #include "src/core/SkTDynamicHash.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/ResourceKey.h"
 
 class GrImageContext;
 class GrBackendRenderTarget;
@@ -34,7 +34,7 @@ class GrProxyProvider {
      * Assigns a unique key to a proxy. The proxy will be findable via this key using
      * findProxyByUniqueKey(). It is an error if an existing proxy already has a key.
      */
-    bool assignUniqueKeyToProxy(const GrUniqueKey&, GrTextureProxy*);
+    bool assignUniqueKeyToProxy(const skgpu::UniqueKey&, GrTextureProxy*);
 
     /*
      * Sets the unique key of the provided proxy to the unique key of the surface. The surface must
@@ -51,13 +51,13 @@ class GrProxyProvider {
     /*
      * Finds a proxy by unique key.
      */
-    sk_sp<GrTextureProxy> findProxyByUniqueKey(const GrUniqueKey&);
+    sk_sp<GrTextureProxy> findProxyByUniqueKey(const skgpu::UniqueKey&);
 
     /*
      * Finds a proxy by unique key or creates a new one that wraps a resource matching the unique
      * key.
      */
-    sk_sp<GrTextureProxy> findOrCreateProxyByUniqueKey(const GrUniqueKey&,
+    sk_sp<GrTextureProxy> findOrCreateProxyByUniqueKey(const skgpu::UniqueKey&,
                                                        UseAllocator = UseAllocator::kYes);
 
     /**
@@ -66,7 +66,7 @@ class GrProxyProvider {
      * the proxy is renderable then it was created via a fallback code path so the fallback
      * color type will be used to create the view.
      */
-    GrSurfaceProxyView findCachedProxyWithColorTypeFallback(const GrUniqueKey&,
+    GrSurfaceProxyView findCachedProxyWithColorTypeFallback(const skgpu::UniqueKey&,
                                                             GrSurfaceOrigin,
                                                             GrColorType,
                                                             int sampleCnt);
@@ -223,7 +223,7 @@ class GrProxyProvider {
      * (in which case we don't want it cluttering up the hash table) or the client has indicated
      * that it will never refer to the unique key again.
      */
-    void processInvalidUniqueKey(const GrUniqueKey&, GrTextureProxy*, InvalidateGPUResource);
+    void processInvalidUniqueKey(const skgpu::UniqueKey&, GrTextureProxy*, InvalidateGPUResource);
 
     GrDDLProvider isDDLProvider() const;
 
@@ -278,7 +278,7 @@ class GrProxyProvider {
     // processInvalidUniqueKey() with control over removing hash table entries,
     // which is not safe while iterating with foreach().
     enum class RemoveTableEntry { kNo, kYes };
-    void processInvalidUniqueKeyImpl(const GrUniqueKey&, GrTextureProxy*,
+    void processInvalidUniqueKeyImpl(const skgpu::UniqueKey&, GrTextureProxy*,
                                      InvalidateGPUResource, RemoveTableEntry);
 
     bool isAbandoned() const;
@@ -296,11 +296,11 @@ class GrProxyProvider {
     sk_sp<GrTextureProxy> createWrapped(sk_sp<GrTexture> tex, UseAllocator useAllocator);
 
     struct UniquelyKeyedProxyHashTraits {
-        static const GrUniqueKey& GetKey(const GrTextureProxy& p) { return p.getUniqueKey(); }
+        static const skgpu::UniqueKey& GetKey(const GrTextureProxy& p) { return p.getUniqueKey(); }
 
-        static uint32_t Hash(const GrUniqueKey& key) { return key.hash(); }
+        static uint32_t Hash(const skgpu::UniqueKey& key) { return key.hash(); }
     };
-    typedef SkTDynamicHash<GrTextureProxy, GrUniqueKey, UniquelyKeyedProxyHashTraits> UniquelyKeyedProxyHash;
+    typedef SkTDynamicHash<GrTextureProxy, skgpu::UniqueKey, UniquelyKeyedProxyHashTraits> UniquelyKeyedProxyHash;
 
     // This holds the texture proxies that have unique keys. The resourceCache does not get a ref
     // on these proxies but they must send a message to the resourceCache when they are deleted.
diff --git a/third_party/skia/src/gpu/GrRecordingContext.cpp b/third_party/skia/src/gpu/GrRecordingContext.cpp
index 0418670dbb89a..b437eae1e5db3 100644
--- a/third_party/skia/src/gpu/GrRecordingContext.cpp
+++ b/third_party/skia/src/gpu/GrRecordingContext.cpp
@@ -21,7 +21,7 @@
 #include "src/gpu/SurfaceContext.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "src/gpu/text/GrTextBlob.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 
 #if SK_GPU_V1
 #include "src/gpu/ops/AtlasTextOp.h"
@@ -144,12 +144,12 @@ GrRecordingContext::OwnedArenas&& GrRecordingContext::detachArenas() {
     return std::move(fArenas);
 }
 
-GrTextBlobCache* GrRecordingContext::getTextBlobCache() {
-    return fThreadSafeProxy->priv().getTextBlobCache();
+GrTextBlobRedrawCoordinator* GrRecordingContext::getTextBlobRedrawCoordinator() {
+    return fThreadSafeProxy->priv().getTextBlobRedrawCoordinator();
 }
 
-const GrTextBlobCache* GrRecordingContext::getTextBlobCache() const {
-    return fThreadSafeProxy->priv().getTextBlobCache();
+const GrTextBlobRedrawCoordinator* GrRecordingContext::getTextBlobRedrawCoordinator() const {
+    return fThreadSafeProxy->priv().getTextBlobRedrawCoordinator();
 }
 
 GrThreadSafeCache* GrRecordingContext::threadSafeCache() {
diff --git a/third_party/skia/src/gpu/GrRecordingContextPriv.cpp b/third_party/skia/src/gpu/GrRecordingContextPriv.cpp
index 5a829e4393df8..bc3dd725bb7d5 100644
--- a/third_party/skia/src/gpu/GrRecordingContextPriv.cpp
+++ b/third_party/skia/src/gpu/GrRecordingContextPriv.cpp
@@ -83,7 +83,7 @@ std::unique_ptr<skgpu::SurfaceContext> GrRecordingContextPriv::makeSC(GrSurfaceP
     if (proxy->asRenderTargetProxy()) {
         // Will we ever want a swizzle that is not the default write swizzle for the format and
         // colorType here? If so we will need to manually pass that in.
-        GrSwizzle writeSwizzle;
+        skgpu::Swizzle writeSwizzle;
         if (info.colorType() != GrColorType::kUnknown) {
             writeSwizzle = this->caps()->getWriteSwizzle(proxy->backendFormat(),
                                                          info.colorType());
@@ -139,7 +139,7 @@ std::unique_ptr<skgpu::SurfaceContext> GrRecordingContextPriv::makeSC(const GrIm
         return nullptr;
     }
 
-    GrSwizzle swizzle;
+    skgpu::Swizzle swizzle;
     if (info.colorType() != GrColorType::kUnknown &&
         !this->caps()->isFormatCompressed(format)) {
         swizzle = this->caps()->getReadSwizzle(format, info.colorType());
@@ -184,8 +184,8 @@ std::unique_ptr<skgpu::SurfaceFillContext> GrRecordingContextPriv::makeSFC(GrIma
     if (!proxy) {
         return nullptr;
     }
-    GrSwizzle readSwizzle  = this->caps()->getReadSwizzle (format, info.colorType());
-    GrSwizzle writeSwizzle = this->caps()->getWriteSwizzle(format, info.colorType());
+    skgpu::Swizzle readSwizzle  = this->caps()->getReadSwizzle (format, info.colorType());
+    skgpu::Swizzle writeSwizzle = this->caps()->getWriteSwizzle(format, info.colorType());
 
     GrSurfaceProxyView readView(            proxy, origin,  readSwizzle);
     GrSurfaceProxyView writeView(std::move(proxy), origin, writeSwizzle);
@@ -210,8 +210,8 @@ std::unique_ptr<skgpu::SurfaceFillContext> GrRecordingContextPriv::makeSFC(
         int sampleCount,
         GrMipmapped mipmapped,
         GrProtected isProtected,
-        GrSwizzle readSwizzle,
-        GrSwizzle writeSwizzle,
+        skgpu::Swizzle readSwizzle,
+        skgpu::Swizzle writeSwizzle,
         GrSurfaceOrigin origin,
         SkBudgeted budgeted) {
 
@@ -332,8 +332,8 @@ std::unique_ptr<skgpu::SurfaceFillContext> GrRecordingContextPriv::makeSFCFromBa
     if (!this->caps()->areColorTypeAndFormatCompatible(info.colorType(), format)) {
         return nullptr;
     }
-    GrSwizzle readSwizzle  = this->caps()->getReadSwizzle (format, info.colorType());
-    GrSwizzle writeSwizzle = this->caps()->getWriteSwizzle(format, info.colorType());
+    skgpu::Swizzle readSwizzle  = this->caps()->getReadSwizzle (format, info.colorType());
+    skgpu::Swizzle writeSwizzle = this->caps()->getWriteSwizzle(format, info.colorType());
 
     sk_sp<GrTextureProxy> proxy(this->proxyProvider()->wrapRenderableBackendTexture(
             tex, sampleCount, kBorrow_GrWrapOwnership, GrWrapCacheable::kNo,
diff --git a/third_party/skia/src/gpu/GrRecordingContextPriv.h b/third_party/skia/src/gpu/GrRecordingContextPriv.h
index 5f55a2308cfb9..32384421347dd 100644
--- a/third_party/skia/src/gpu/GrRecordingContextPriv.h
+++ b/third_party/skia/src/gpu/GrRecordingContextPriv.h
@@ -15,11 +15,11 @@
 #include "src/gpu/text/GrSDFTControl.h"
 
 class GrImageInfo;
-class GrSwizzle;
 class SkDeferredDisplayList;
 namespace skgpu {
     class SurfaceContext;
     class SurfaceFillContext;
+    class Swizzle;
 }
 
 /** Class that exposes methods on GrRecordingContext that are only intended for use internal to
@@ -53,7 +53,9 @@ class GrRecordingContextPriv : public GrImageContextPriv {
         this->context()->detachProgramData(dst);
     }
 
-    GrTextBlobCache* getTextBlobCache() { return this->context()->getTextBlobCache(); }
+    GrTextBlobRedrawCoordinator* getTextBlobCache() {
+        return this->context()->getTextBlobRedrawCoordinator();
+    }
 
     GrThreadSafeCache* threadSafeCache() { return this->context()->threadSafeCache(); }
 
@@ -171,8 +173,8 @@ class GrRecordingContextPriv : public GrImageContextPriv {
                                                        int sampleCount,
                                                        GrMipmapped,
                                                        GrProtected,
-                                                       GrSwizzle readSwizzle,
-                                                       GrSwizzle writeSwizzle,
+                                                       skgpu::Swizzle readSwizzle,
+                                                       skgpu::Swizzle writeSwizzle,
                                                        GrSurfaceOrigin,
                                                        SkBudgeted);
 
@@ -203,10 +205,9 @@ class GrRecordingContextPriv : public GrImageContextPriv {
 
 protected:
     explicit GrRecordingContextPriv(GrRecordingContext* rContext) : GrImageContextPriv(rContext) {}
-    // Required until C++17 copy elision
-    GrRecordingContextPriv(const GrRecordingContextPriv&) = default;
 
 private:
+    GrRecordingContextPriv(const GrRecordingContextPriv&) = delete;
     GrRecordingContextPriv& operator=(const GrRecordingContextPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrRefCnt.h b/third_party/skia/src/gpu/GrRefCnt.h
index 88219a9d42f06..8ef7814d04e05 100644
--- a/third_party/skia/src/gpu/GrRefCnt.h
+++ b/third_party/skia/src/gpu/GrRefCnt.h
@@ -14,14 +14,9 @@
 
 // We have to use auto for the function pointers here because if the actual functions live on the
 // base class of T we need the function here to be a pointer to a function of the base class and not
-// a function on T. In C++17 RefBase and UnrefBase can be removed and the Ref and Unref paramenters
-// can be "auto".
-template <typename T,
-          typename RefBase                 = T,
-          typename UnrefBase               = RefBase,
-          void (RefBase::*Ref)() const     = RefBase::Ref,
-          void (UnrefBase::*Unref)() const = UnrefBase::Unref>
-class gr_sp {
+// a function on T. Thus we can't have something like void(T::*Ref)() since we may need T or we may
+// need some base class of T.
+template <typename T, auto Ref, auto Unref> class gr_sp {
 private:
     static inline T* SafeRef(T* obj) {
         if (obj) {
@@ -46,12 +41,10 @@ class gr_sp {
      * Shares the underlying object by calling Ref(), so that both the argument and the newly
      * created gr_sp both have a reference to it.
      */
-    gr_sp(const gr_sp& that) : fPtr(SafeRef(that.get())) {}
+    gr_sp(const gr_sp<T, Ref, Unref>& that) : fPtr(SafeRef(that.get())) {}
     template <typename U,
-              typename URefBase,
-              typename UUnrefBase,
               typename = typename std::enable_if<std::is_convertible<U*, T*>::value>::type>
-    gr_sp(const gr_sp<U, URefBase, UUnrefBase, Ref, Unref>& that) : fPtr(SafeRef(that.get())) {}
+    gr_sp(const gr_sp<U, Ref, Unref>& that) : fPtr(SafeRef(that.get())) {}
 
     gr_sp(const sk_sp<T>& that) : fPtr(SafeRef(that.get())) {}
 
@@ -61,7 +54,7 @@ class gr_sp {
      * new gr_sp will have a reference to the object, and the argument will point to null.
      * No call to Ref() or Unref() will be made.
      */
-    gr_sp(gr_sp&& that) : fPtr(that.release()) {}
+    gr_sp(gr_sp<T, Ref, Unref>&& that) : fPtr(that.release()) {}
 
     /**
      * Copies the underlying object pointer from the argument to the gr_sp. It will then call
@@ -92,7 +85,7 @@ class gr_sp {
      * Shares the underlying object referenced by the argument by calling Ref() on it. If this gr_sp
      * previously had a reference to an object (i.e. not null) it will call Unref() on that object.
      */
-    gr_sp& operator=(const gr_sp& that) {
+    gr_sp& operator=(const gr_sp<T, Ref, Unref>& that) {
         if (this != &that) {
             this->reset(SafeRef(that.get()));
         }
@@ -114,7 +107,7 @@ class gr_sp {
      * a reference to another object, Unref() will be called on that object. No call to Ref() will
      * be made.
      */
-    gr_sp& operator=(gr_sp&& that) {
+    gr_sp& operator=(gr_sp<T, Ref, Unref>&& that) {
         this->reset(that.release());
         return *this;
     }
@@ -179,19 +172,14 @@ class gr_sp {
  * if it is in use on the GPU.
  */
 template <typename T>
-using gr_cb = gr_sp<T,
-                    GrIORef<GrGpuResource>,
-                    GrIORef<GrGpuResource>,
-                    &T::addCommandBufferUsage,
-                    &T::removeCommandBufferUsage>;
+using gr_cb = gr_sp<T, &T::addCommandBufferUsage, &T::removeCommandBufferUsage>;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /**
  * This class mimics sk_sp but instead of calling unref it calls recycle instead.
  */
-template <typename T>
-using gr_rp = gr_sp<T, GrManagedResource, GrRecycledResource, &T::ref, &T::recycle>;
+template <typename T> using gr_rp = gr_sp<T, &T::ref, &T::recycle>;
 
 /**
  *  Returns a gr_rp wrapping the provided ptr AND calls ref on it (if not null).
diff --git a/third_party/skia/src/gpu/GrRenderTargetProxy.h b/third_party/skia/src/gpu/GrRenderTargetProxy.h
index 54540e49347c6..3f80846ad8702 100644
--- a/third_party/skia/src/gpu/GrRenderTargetProxy.h
+++ b/third_party/skia/src/gpu/GrRenderTargetProxy.h
@@ -14,7 +14,7 @@
 #include "src/gpu/GrNativeRect.h"
 #include "src/gpu/GrSubRunAllocator.h"
 #include "src/gpu/GrSurfaceProxy.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 
 class GrResourceProvider;
 
diff --git a/third_party/skia/src/gpu/GrResourceAllocator.cpp b/third_party/skia/src/gpu/GrResourceAllocator.cpp
index f266d780b050b..84b3bf7122d7d 100644
--- a/third_party/skia/src/gpu/GrResourceAllocator.cpp
+++ b/third_party/skia/src/gpu/GrResourceAllocator.cpp
@@ -105,7 +105,7 @@ static bool can_proxy_use_scratch(const GrCaps& caps, GrSurfaceProxy* proxy) {
 }
 
 GrResourceAllocator::Register::Register(GrSurfaceProxy* originatingProxy,
-                                        GrScratchKey scratchKey,
+                                        skgpu::ScratchKey scratchKey,
                                         GrResourceProvider* provider)
         : fOriginatingProxy(originatingProxy)
         , fScratchKey(std::move(scratchKey)) {
@@ -113,7 +113,7 @@ GrResourceAllocator::Register::Register(GrSurfaceProxy* originatingProxy,
     SkASSERT(!originatingProxy->isInstantiated());
     SkASSERT(!originatingProxy->isLazy());
     SkDEBUGCODE(fUniqueID = CreateUniqueID();)
-    if (scratchKey.isValid()) {
+    if (fScratchKey.isValid()) {
         if (can_proxy_use_scratch(*provider->caps(), originatingProxy)) {
             fExistingSurface = provider->findAndRefScratchTexture(fScratchKey);
         }
@@ -276,13 +276,15 @@ GrResourceAllocator::Register* GrResourceAllocator::findOrCreateRegisterFor(GrSu
             return *p;
         }
         // No need for a scratch key. These don't go in the free pool.
-        Register* r = fInternalAllocator.make<Register>(proxy, GrScratchKey(), resourceProvider);
+        Register* r = fInternalAllocator.make<Register>(proxy,
+                                                        skgpu::ScratchKey(),
+                                                        resourceProvider);
         fUniqueKeyRegisters.set(uniqueKey, r);
         return r;
     }
 
     // Then look in the free pool
-    GrScratchKey scratchKey;
+    skgpu::ScratchKey scratchKey;
     proxy->priv().computeScratchKey(*fDContext->priv().caps(), &scratchKey);
 
     auto filter = [] (const Register* r) {
diff --git a/third_party/skia/src/gpu/GrResourceAllocator.h b/third_party/skia/src/gpu/GrResourceAllocator.h
index 9047cbb297bd6..5e3673c88c9ba 100644
--- a/third_party/skia/src/gpu/GrResourceAllocator.h
+++ b/third_party/skia/src/gpu/GrResourceAllocator.h
@@ -134,21 +134,21 @@ class GrResourceAllocator {
     Register* findOrCreateRegisterFor(GrSurfaceProxy* proxy);
 
     struct FreePoolTraits {
-        static const GrScratchKey& GetKey(const Register& r) {
+        static const skgpu::ScratchKey& GetKey(const Register& r) {
             return r.scratchKey();
         }
 
-        static uint32_t Hash(const GrScratchKey& key) { return key.hash(); }
+        static uint32_t Hash(const skgpu::ScratchKey& key) { return key.hash(); }
         static void OnFree(Register* r) { }
     };
-    typedef SkTMultiMap<Register, GrScratchKey, FreePoolTraits> FreePoolMultiMap;
+    typedef SkTMultiMap<Register, skgpu::ScratchKey, FreePoolTraits> FreePoolMultiMap;
 
     typedef SkTHashMap<uint32_t, Interval*, GrCheapHash>        IntvlHash;
 
     struct UniqueKeyHash {
-        uint32_t operator()(const GrUniqueKey& key) const { return key.hash(); }
+        uint32_t operator()(const skgpu::UniqueKey& key) const { return key.hash(); }
     };
-    typedef SkTHashMap<GrUniqueKey, Register*, UniqueKeyHash> UniqueKeyRegisterHash;
+    typedef SkTHashMap<skgpu::UniqueKey, Register*, UniqueKeyHash> UniqueKeyRegisterHash;
 
     // Each proxy – with some exceptions – is assigned a register. After all assignments are made,
     // another pass is performed to instantiate and assign actual surfaces to the proxies. Right
@@ -157,10 +157,10 @@ class GrResourceAllocator {
     class Register {
     public:
         // It's OK to pass an invalid scratch key iff the proxy has a unique key.
-        Register(GrSurfaceProxy* originatingProxy, GrScratchKey, GrResourceProvider*);
+        Register(GrSurfaceProxy* originatingProxy, skgpu::ScratchKey, GrResourceProvider*);
 
-        const GrScratchKey& scratchKey() const { return fScratchKey; }
-        const GrUniqueKey& uniqueKey() const { return fOriginatingProxy->getUniqueKey(); }
+        const skgpu::ScratchKey& scratchKey() const { return fScratchKey; }
+        const skgpu::UniqueKey& uniqueKey() const { return fOriginatingProxy->getUniqueKey(); }
 
         bool accountedForInBudget() const { return fAccountedForInBudget; }
         void setAccountedForInBudget() { fAccountedForInBudget = true; }
@@ -178,10 +178,10 @@ class GrResourceAllocator {
         SkDEBUGCODE(uint32_t uniqueID() const { return fUniqueID; })
 
     private:
-        GrSurfaceProxy*  fOriginatingProxy;
-        GrScratchKey     fScratchKey; // free pool wants a reference to this.
-        sk_sp<GrSurface> fExistingSurface; // queried from resource cache. may be null.
-        bool             fAccountedForInBudget = false;
+        GrSurfaceProxy*   fOriginatingProxy;
+        skgpu::ScratchKey fScratchKey; // free pool wants a reference to this.
+        sk_sp<GrSurface>  fExistingSurface; // queried from resource cache. may be null.
+        bool              fAccountedForInBudget = false;
 
 #ifdef SK_DEBUG
         uint32_t         fUniqueID;
diff --git a/third_party/skia/src/gpu/GrResourceCache.cpp b/third_party/skia/src/gpu/GrResourceCache.cpp
index cfa0c96246c79..a31b335287326 100644
--- a/third_party/skia/src/gpu/GrResourceCache.cpp
+++ b/third_party/skia/src/gpu/GrResourceCache.cpp
@@ -9,7 +9,7 @@
 #include <atomic>
 #include <vector>
 #include "include/gpu/GrDirectContext.h"
-#include "include/private/GrSingleOwner.h"
+#include "include/private/SingleOwner.h"
 #include "include/private/SkTo.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkMessageBus.h"
@@ -26,39 +26,11 @@
 #include "src/gpu/GrTracing.h"
 #include "src/gpu/SkGr.h"
 
-DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage, uint32_t, true);
+DECLARE_SKMESSAGEBUS_MESSAGE(skgpu::UniqueKeyInvalidatedMessage, uint32_t, true);
 
 DECLARE_SKMESSAGEBUS_MESSAGE(GrTextureFreedMessage, GrDirectContext::DirectContextID, true);
 
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fSingleOwner)
-
-//////////////////////////////////////////////////////////////////////////////
-
-GrScratchKey::ResourceType GrScratchKey::GenerateResourceType() {
-    static std::atomic<int32_t> nextType{INHERITED::kInvalidDomain + 1};
-
-    int32_t type = nextType.fetch_add(1, std::memory_order_relaxed);
-    if (type > SkTo<int32_t>(UINT16_MAX)) {
-        SK_ABORT("Too many Resource Types");
-    }
-
-    return static_cast<ResourceType>(type);
-}
-
-GrUniqueKey::Domain GrUniqueKey::GenerateDomain() {
-    static std::atomic<int32_t> nextDomain{INHERITED::kInvalidDomain + 1};
-
-    int32_t domain = nextDomain.fetch_add(1, std::memory_order_relaxed);
-    if (domain > SkTo<int32_t>(UINT16_MAX)) {
-        SK_ABORT("Too many GrUniqueKey Domains");
-    }
-
-    return static_cast<Domain>(domain);
-}
-
-uint32_t GrResourceKeyHash(const uint32_t* data, size_t size) {
-    return SkOpts::hash(data, size);
-}
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fSingleOwner)
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -109,7 +81,7 @@ inline bool GrResourceCache::TextureAwaitingUnref::finished() { return !fNumUnre
 
 //////////////////////////////////////////////////////////////////////////////
 
-GrResourceCache::GrResourceCache(GrSingleOwner* singleOwner,
+GrResourceCache::GrResourceCache(skgpu::SingleOwner* singleOwner,
                                  GrDirectContext::DirectContextID owningContextID,
                                  uint32_t familyID)
         : fInvalidUniqueKeyInbox(familyID)
@@ -290,7 +262,7 @@ class GrResourceCache::AvailableForScratchUse {
     }
 };
 
-GrGpuResource* GrResourceCache::findAndRefScratchResource(const GrScratchKey& scratchKey) {
+GrGpuResource* GrResourceCache::findAndRefScratchResource(const skgpu::ScratchKey& scratchKey) {
     SkASSERT(scratchKey.isValid());
 
     GrGpuResource* resource = fScratchMap.find(scratchKey, AvailableForScratchUse());
@@ -330,7 +302,7 @@ void GrResourceCache::removeUniqueKey(GrGpuResource* resource) {
     this->validate();
 }
 
-void GrResourceCache::changeUniqueKey(GrGpuResource* resource, const GrUniqueKey& newKey) {
+void GrResourceCache::changeUniqueKey(GrGpuResource* resource, const skgpu::UniqueKey& newKey) {
     ASSERT_SINGLE_OWNER
     SkASSERT(resource);
     SkASSERT(this->isInCache(resource));
@@ -522,7 +494,7 @@ void GrResourceCache::didChangeBudgetStatus(GrGpuResource* resource) {
 }
 
 void GrResourceCache::purgeAsNeeded() {
-    SkTArray<GrUniqueKeyInvalidatedMessage> invalidKeyMsgs;
+    SkTArray<skgpu::UniqueKeyInvalidatedMessage> invalidKeyMsgs;
     fInvalidUniqueKeyInbox.poll(&invalidKeyMsgs);
     if (invalidKeyMsgs.count()) {
         SkASSERT(fProxyProvider);
@@ -919,8 +891,8 @@ void GrResourceCache::validate() const {
                 ++fLocked;
             }
 
-            const GrScratchKey& scratchKey = resource->resourcePriv().getScratchKey();
-            const GrUniqueKey& uniqueKey = resource->getUniqueKey();
+            const skgpu::ScratchKey& scratchKey = resource->resourcePriv().getScratchKey();
+            const skgpu::UniqueKey& uniqueKey = resource->getUniqueKey();
 
             if (resource->cacheAccess().isUsableAsScratch()) {
                 SkASSERT(!uniqueKey.isValid());
diff --git a/third_party/skia/src/gpu/GrResourceCache.h b/third_party/skia/src/gpu/GrResourceCache.h
index 94a50ed8ed143..99f54f934efc6 100644
--- a/third_party/skia/src/gpu/GrResourceCache.h
+++ b/third_party/skia/src/gpu/GrResourceCache.h
@@ -10,7 +10,6 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrDirectContext.h"
-#include "include/private/GrResourceKey.h"
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
 #include "src/core/SkMessageBus.h"
@@ -20,15 +19,19 @@
 #include "src/gpu/GrGpuResource.h"
 #include "src/gpu/GrGpuResourceCacheAccess.h"
 #include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/ResourceKey.h"
 
 class GrCaps;
 class GrProxyProvider;
 class SkString;
 class SkTraceMemoryDump;
-class GrSingleOwner;
 class GrTexture;
 class GrThreadSafeCache;
 
+namespace skgpu {
+class SingleOwner;
+}
+
 struct GrTextureFreedMessage {
     GrTexture* fTexture;
     GrDirectContext::DirectContextID fIntendedRecipient;
@@ -58,7 +61,7 @@ static inline bool SkShouldPostMessageToBus(
  */
 class GrResourceCache {
 public:
-    GrResourceCache(GrSingleOwner* owner,
+    GrResourceCache(skgpu::SingleOwner* owner,
                     GrDirectContext::DirectContextID owningContextID,
                     uint32_t familyID);
     ~GrResourceCache();
@@ -123,11 +126,11 @@ class GrResourceCache {
     /**
      * Find a resource that matches a scratch key.
      */
-    GrGpuResource* findAndRefScratchResource(const GrScratchKey& scratchKey);
+    GrGpuResource* findAndRefScratchResource(const skgpu::ScratchKey& scratchKey);
 
 #ifdef SK_DEBUG
     // This is not particularly fast and only used for validation, so debug only.
-    int countScratchEntriesForKey(const GrScratchKey& scratchKey) const {
+    int countScratchEntriesForKey(const skgpu::ScratchKey& scratchKey) const {
         return fScratchMap.countForKey(scratchKey);
     }
 #endif
@@ -135,7 +138,7 @@ class GrResourceCache {
     /**
      * Find a resource that matches a unique key.
      */
-    GrGpuResource* findAndRefUniqueResource(const GrUniqueKey& key) {
+    GrGpuResource* findAndRefUniqueResource(const skgpu::UniqueKey& key) {
         GrGpuResource* resource = fUniqueHash.find(key);
         if (resource) {
             this->refAndMakeResourceMRU(resource);
@@ -146,7 +149,7 @@ class GrResourceCache {
     /**
      * Query whether a unique key exists in the cache.
      */
-    bool hasUniqueKey(const GrUniqueKey& key) const {
+    bool hasUniqueKey(const skgpu::UniqueKey& key) const {
         return SkToBool(fUniqueHash.find(key));
     }
 
@@ -260,7 +263,7 @@ class GrResourceCache {
     void insertResource(GrGpuResource*);
     void removeResource(GrGpuResource*);
     void notifyARefCntReachedZero(GrGpuResource*, GrGpuResource::LastRemovedRef);
-    void changeUniqueKey(GrGpuResource*, const GrUniqueKey&);
+    void changeUniqueKey(GrGpuResource*, const skgpu::UniqueKey&);
     void removeUniqueKey(GrGpuResource*);
     void willRemoveScratchKey(const GrGpuResource*);
     void didChangeBudgetStatus(GrGpuResource*);
@@ -291,21 +294,21 @@ class GrResourceCache {
     class AvailableForScratchUse;
 
     struct ScratchMapTraits {
-        static const GrScratchKey& GetKey(const GrGpuResource& r) {
+        static const skgpu::ScratchKey& GetKey(const GrGpuResource& r) {
             return r.resourcePriv().getScratchKey();
         }
 
-        static uint32_t Hash(const GrScratchKey& key) { return key.hash(); }
+        static uint32_t Hash(const skgpu::ScratchKey& key) { return key.hash(); }
         static void OnFree(GrGpuResource*) { }
     };
-    typedef SkTMultiMap<GrGpuResource, GrScratchKey, ScratchMapTraits> ScratchMap;
+    typedef SkTMultiMap<GrGpuResource, skgpu::ScratchKey, ScratchMapTraits> ScratchMap;
 
     struct UniqueHashTraits {
-        static const GrUniqueKey& GetKey(const GrGpuResource& r) { return r.getUniqueKey(); }
+        static const skgpu::UniqueKey& GetKey(const GrGpuResource& r) { return r.getUniqueKey(); }
 
-        static uint32_t Hash(const GrUniqueKey& key) { return key.hash(); }
+        static uint32_t Hash(const skgpu::UniqueKey& key) { return key.hash(); }
     };
-    typedef SkTDynamicHash<GrGpuResource, GrUniqueKey, UniqueHashTraits> UniqueHash;
+    typedef SkTDynamicHash<GrGpuResource, skgpu::UniqueKey, UniqueHashTraits> UniqueHash;
 
     class TextureAwaitingUnref {
     public:
@@ -337,7 +340,7 @@ class GrResourceCache {
     using TextureFreedMessageBus = SkMessageBus<GrTextureFreedMessage,
                                                 GrDirectContext::DirectContextID>;
 
-    typedef SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Inbox InvalidUniqueKeyInbox;
+    typedef SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Inbox InvalidUniqueKeyInbox;
     typedef SkTDPQueue<GrGpuResource*, CompareTimestamp, AccessResourceIndex> PurgeableQueue;
     typedef SkTDArray<GrGpuResource*> ResourceArray;
 
@@ -382,7 +385,7 @@ class GrResourceCache {
 
     GrDirectContext::DirectContextID    fOwningContextID;
     uint32_t                            fContextUniqueID = SK_InvalidUniqueID;
-    GrSingleOwner*                      fSingleOwner = nullptr;
+    skgpu::SingleOwner*                 fSingleOwner = nullptr;
 
     // This resource is allowed to be in the nonpurgeable array for the sake of validate() because
     // we're in the midst of converting it to purgeable status.
@@ -433,7 +436,7 @@ class GrResourceCache::ResourceAccess {
     /**
      * Called by GrGpuResources to change their unique keys.
      */
-    void changeUniqueKey(GrGpuResource* resource, const GrUniqueKey& newKey) {
+    void changeUniqueKey(GrGpuResource* resource, const skgpu::UniqueKey& newKey) {
          fCache->changeUniqueKey(resource, newKey);
     }
 
diff --git a/third_party/skia/src/gpu/GrResourceProvider.cpp b/third_party/skia/src/gpu/GrResourceProvider.cpp
index 7bb1101c2dbd8..7a1b8da2b2fac 100644
--- a/third_party/skia/src/gpu/GrResourceProvider.cpp
+++ b/third_party/skia/src/gpu/GrResourceProvider.cpp
@@ -8,8 +8,7 @@
 #include "src/gpu/GrResourceProvider.h"
 
 #include "include/gpu/GrBackendSemaphore.h"
-#include "include/private/GrResourceKey.h"
-#include "include/private/GrSingleOwner.h"
+#include "include/private/SingleOwner.h"
 #include "src/core/SkConvertPixels.h"
 #include "src/core/SkMathPriv.h"
 #include "src/core/SkMipmap.h"
@@ -25,13 +24,16 @@
 #include "src/gpu/GrResourceCache.h"
 #include "src/gpu/GrSemaphore.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/ResourceKey.h"
 #include "src/gpu/SkGr.h"
 
 const int GrResourceProvider::kMinScratchTextureSize = 16;
 
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fSingleOwner)
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fSingleOwner)
 
-GrResourceProvider::GrResourceProvider(GrGpu* gpu, GrResourceCache* cache, GrSingleOwner* owner)
+GrResourceProvider::GrResourceProvider(GrGpu* gpu,
+                                       GrResourceCache* cache,
+                                       skgpu::SingleOwner* owner)
         : fCache(cache)
         , fGpu(gpu)
 #ifdef SK_DEBUG
@@ -304,7 +306,7 @@ sk_sp<GrTexture> GrResourceProvider::createApproxTexture(SkISize dimensions,
                                isProtected);
 }
 
-sk_sp<GrTexture> GrResourceProvider::findAndRefScratchTexture(const GrScratchKey& key) {
+sk_sp<GrTexture> GrResourceProvider::findAndRefScratchTexture(const skgpu::ScratchKey& key) {
     ASSERT_SINGLE_OWNER
     SkASSERT(!this->isAbandoned());
     SkASSERT(key.isValid());
@@ -333,7 +335,7 @@ sk_sp<GrTexture> GrResourceProvider::findAndRefScratchTexture(SkISize dimensions
     // We could make initial clears work with scratch textures but it is a rare case so we just opt
     // to fall back to making a new texture.
     if (fGpu->caps()->reuseScratchTextures() || renderable == GrRenderable::kYes) {
-        GrScratchKey key;
+        skgpu::ScratchKey key;
         GrTexture::ComputeScratchKey(*this->caps(), format, dimensions, renderable,
                                      renderTargetSampleCnt, mipmapped, isProtected, &key);
         return this->findAndRefScratchTexture(key);
@@ -390,7 +392,7 @@ sk_sp<GrRenderTarget> GrResourceProvider::wrapVulkanSecondaryCBAsRenderTarget(
 
 }
 
-void GrResourceProvider::assignUniqueKeyToResource(const GrUniqueKey& key,
+void GrResourceProvider::assignUniqueKeyToResource(const skgpu::UniqueKey& key,
                                                    GrGpuResource* resource) {
     ASSERT_SINGLE_OWNER
     if (this->isAbandoned() || !resource) {
@@ -399,7 +401,7 @@ void GrResourceProvider::assignUniqueKeyToResource(const GrUniqueKey& key,
     resource->resourcePriv().setUniqueKey(key);
 }
 
-sk_sp<GrGpuResource> GrResourceProvider::findResourceByUniqueKey(const GrUniqueKey& key) {
+sk_sp<GrGpuResource> GrResourceProvider::findResourceByUniqueKey(const skgpu::UniqueKey& key) {
     ASSERT_SINGLE_OWNER
     return this->isAbandoned() ? nullptr
                                : sk_sp<GrGpuResource>(fCache->findAndRefUniqueResource(key));
@@ -408,7 +410,7 @@ sk_sp<GrGpuResource> GrResourceProvider::findResourceByUniqueKey(const GrUniqueK
 sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(GrGpuBufferType intendedType,
                                                                     size_t size,
                                                                     const void* staticData,
-                                                                    const GrUniqueKey& key) {
+                                                                    const skgpu::UniqueKey& key) {
     if (auto buffer = this->findByUniqueKey<GrGpuBuffer>(key)) {
         return std::move(buffer);
     }
@@ -425,7 +427,7 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(GrGpuBufferT
 sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
         GrGpuBufferType intendedType,
         size_t size,
-        const GrUniqueKey& uniqueKey,
+        const skgpu::UniqueKey& uniqueKey,
         InitializeBufferFn initializeBufferFn) {
     if (auto buffer = this->findByUniqueKey<GrGpuBuffer>(uniqueKey)) {
         return std::move(buffer);
@@ -437,11 +439,11 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
         buffer->resourcePriv().setUniqueKey(uniqueKey);
 
         // Map the buffer. Use a staging buffer on the heap if mapping isn't supported.
-        skgpu::VertexWriter vertexWriter = buffer->map();
+        skgpu::VertexWriter vertexWriter = {buffer->map(), size};
         SkAutoTMalloc<char> stagingBuffer;
         if (!vertexWriter) {
             SkASSERT(!buffer->isMapped());
-            vertexWriter = stagingBuffer.reset(size);
+            vertexWriter = {stagingBuffer.reset(size), size};
         }
 
         initializeBufferFn(std::move(vertexWriter), size);
@@ -456,11 +458,12 @@ sk_sp<const GrGpuBuffer> GrResourceProvider::findOrMakeStaticBuffer(
     return nullptr;
 }
 
-sk_sp<const GrGpuBuffer> GrResourceProvider::createPatternedIndexBuffer(const uint16_t* pattern,
-                                                                        int patternSize,
-                                                                        int reps,
-                                                                        int vertCount,
-                                                                        const GrUniqueKey* key) {
+sk_sp<const GrGpuBuffer> GrResourceProvider::createPatternedIndexBuffer(
+        const uint16_t* pattern,
+        int patternSize,
+        int reps,
+        int vertCount,
+        const skgpu::UniqueKey* key) {
     size_t bufferSize = patternSize * reps * sizeof(uint16_t);
 
     sk_sp<GrGpuBuffer> buffer(
@@ -565,7 +568,7 @@ sk_sp<GrGpuBuffer> GrResourceProvider::createBuffer(size_t size, GrGpuBufferType
     size_t mid = floorPow2 + (floorPow2 >> 1);
     allocSize = (allocSize <= mid) ? mid : ceilPow2;
 
-    GrScratchKey key;
+    skgpu::ScratchKey key;
     GrGpuBuffer::ComputeScratchKeyForDynamicBuffer(allocSize, intendedType, &key);
     auto buffer =
             sk_sp<GrGpuBuffer>(static_cast<GrGpuBuffer*>(this->cache()->findAndRefScratchResource(
@@ -602,7 +605,7 @@ bool GrResourceProvider::attachStencilAttachment(GrRenderTarget* rt, bool useMSA
     }
 
     if (!rt->wasDestroyed() && rt->canAttemptStencilAttachment(useMSAASurface)) {
-        GrUniqueKey sbKey;
+        skgpu::UniqueKey sbKey;
 
 #if 0
         if (this->caps()->oversizedStencilSupport()) {
@@ -660,7 +663,7 @@ sk_sp<GrAttachment> GrResourceProvider::getDiscardableMSAAAttachment(SkISize dim
         return nullptr;
     }
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     GrAttachment::ComputeSharedAttachmentUniqueKey(*this->caps(),
                                                    format,
                                                    dimensions,
@@ -731,7 +734,7 @@ sk_sp<GrAttachment> GrResourceProvider::refScratchMSAAAttachment(SkISize dimensi
                                           GrMipmapped::kNo,
                                           GrTextureType::kNone));
 
-    GrScratchKey key;
+    skgpu::ScratchKey key;
     GrAttachment::ComputeScratchKey(*this->caps(), format, dimensions,
                                     GrAttachment::UsageFlags::kColorAttachment, sampleCnt,
                                     GrMipmapped::kNo, isProtected, memoryless, &key);
diff --git a/third_party/skia/src/gpu/GrResourceProvider.h b/third_party/skia/src/gpu/GrResourceProvider.h
index d679feb1cd843..c769a7a620dd6 100644
--- a/third_party/skia/src/gpu/GrResourceProvider.h
+++ b/third_party/skia/src/gpu/GrResourceProvider.h
@@ -23,7 +23,6 @@ class GrPath;
 class GrRenderTarget;
 class GrResourceProviderPriv;
 class GrSemaphore;
-class GrSingleOwner;
 class GrTexture;
 struct GrVkDrawableInfo;
 
@@ -32,14 +31,17 @@ class SkDescriptor;
 class SkPath;
 class SkTypeface;
 
-namespace skgpu { struct VertexWriter; }
+namespace skgpu {
+class SingleOwner;
+struct VertexWriter;
+}
 
 /**
  * A factory for arbitrary resource types.
  */
 class GrResourceProvider {
 public:
-    GrResourceProvider(GrGpu*, GrResourceCache*, GrSingleOwner*);
+    GrResourceProvider(GrGpu*, GrResourceCache*, skgpu::SingleOwner*);
 
     /**
      * Finds a resource in the cache, based on the specified key. Prior to calling this, the caller
@@ -48,7 +50,7 @@ class GrResourceProvider {
      */
     template <typename T = GrGpuResource>
     typename std::enable_if<std::is_base_of<GrGpuResource, T>::value, sk_sp<T>>::type
-    findByUniqueKey(const GrUniqueKey& key) {
+    findByUniqueKey(const skgpu::UniqueKey& key) {
         return sk_sp<T>(static_cast<T*>(this->findResourceByUniqueKey(key).release()));
     }
 
@@ -114,7 +116,7 @@ class GrResourceProvider {
      * Search the cache for a scratch texture matching the provided arguments. Failing that
      * it returns null. If non-null, the resulting texture is always budgeted.
      */
-    sk_sp<GrTexture> findAndRefScratchTexture(const GrScratchKey&);
+    sk_sp<GrTexture> findAndRefScratchTexture(const skgpu::ScratchKey&);
     sk_sp<GrTexture> findAndRefScratchTexture(SkISize dimensions,
                                               const GrBackendFormat&,
                                               GrTextureType textureType,
@@ -195,8 +197,10 @@ class GrResourceProvider {
      * @return The buffer if successful, otherwise nullptr.
      */
     using InitializeBufferFn = void(*)(skgpu::VertexWriter, size_t bufferSize);
-    sk_sp<const GrGpuBuffer> findOrMakeStaticBuffer(GrGpuBufferType intendedType, size_t size,
-                                                    const GrUniqueKey& key, InitializeBufferFn);
+    sk_sp<const GrGpuBuffer> findOrMakeStaticBuffer(GrGpuBufferType intendedType,
+                                                    size_t size,
+                                                    const skgpu::UniqueKey& key,
+                                                    InitializeBufferFn);
 
     /**
      * Either finds and refs, or creates a static buffer with the given parameters and contents.
@@ -208,8 +212,10 @@ class GrResourceProvider {
      *
      * @return The buffer if successful, otherwise nullptr.
      */
-    sk_sp<const GrGpuBuffer> findOrMakeStaticBuffer(GrGpuBufferType intendedType, size_t size,
-                                                    const void* staticData, const GrUniqueKey& key);
+    sk_sp<const GrGpuBuffer> findOrMakeStaticBuffer(GrGpuBufferType intendedType,
+                                                    size_t size,
+                                                    const void* staticData,
+                                                    const skgpu::UniqueKey& key);
 
     /**
      * Either finds and refs, or creates an index buffer with a repeating pattern for drawing
@@ -228,7 +234,7 @@ class GrResourceProvider {
                                                               int patternSize,
                                                               int reps,
                                                               int vertCount,
-                                                              const GrUniqueKey& key) {
+                                                              const skgpu::UniqueKey& key) {
         if (auto buffer = this->findByUniqueKey<const GrGpuBuffer>(key)) {
             return buffer;
         }
@@ -315,7 +321,7 @@ class GrResourceProvider {
      * Assigns a unique key to a resource. If the key is associated with another resource that
      * association is removed and replaced by this resource.
      */
-    void assignUniqueKeyToResource(const GrUniqueKey&, GrGpuResource*);
+    void assignUniqueKeyToResource(const skgpu::UniqueKey&, GrGpuResource*);
 
     std::unique_ptr<GrSemaphore> SK_WARN_UNUSED_RESULT makeSemaphore(bool isOwned = true);
 
@@ -338,7 +344,7 @@ class GrResourceProvider {
     inline const GrResourceProviderPriv priv() const;  // NOLINT(readability-const-return-type)
 
 private:
-    sk_sp<GrGpuResource> findResourceByUniqueKey(const GrUniqueKey&);
+    sk_sp<GrGpuResource> findResourceByUniqueKey(const skgpu::UniqueKey&);
 
     /*
      * Try to find an existing scratch texture that exactly matches 'desc'. If successful
@@ -402,7 +408,7 @@ class GrResourceProvider {
                                                         int patternSize,
                                                         int reps,
                                                         int vertCount,
-                                                        const GrUniqueKey* key);
+                                                        const skgpu::UniqueKey* key);
 
     sk_sp<const GrGpuBuffer> createNonAAQuadIndexBuffer();
     sk_sp<const GrGpuBuffer> createAAQuadIndexBuffer();
@@ -414,7 +420,7 @@ class GrResourceProvider {
     sk_sp<const GrGpuBuffer> fAAQuadIndexBuffer;
 
     // In debug builds we guard against improper thread handling
-    SkDEBUGCODE(mutable GrSingleOwner* fSingleOwner;)
+    SkDEBUGCODE(mutable skgpu::SingleOwner* fSingleOwner;)
 };
 
 #endif
diff --git a/third_party/skia/src/gpu/GrResourceProviderPriv.h b/third_party/skia/src/gpu/GrResourceProviderPriv.h
index 2665671b7cc8a..7800c20e81e26 100644
--- a/third_party/skia/src/gpu/GrResourceProviderPriv.h
+++ b/third_party/skia/src/gpu/GrResourceProviderPriv.h
@@ -19,8 +19,6 @@ class GrResourceProviderPriv {
 
 private:
     explicit GrResourceProviderPriv(GrResourceProvider* provider) : fResourceProvider(provider) {}
-    // Required until C++17 copy elision
-    GrResourceProviderPriv(const GrResourceProviderPriv&) = default;
     GrResourceProviderPriv& operator=(const GrResourceProviderPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrSPIRVUniformHandler.cpp b/third_party/skia/src/gpu/GrSPIRVUniformHandler.cpp
index a66815406c92f..c7e48c690d117 100644
--- a/third_party/skia/src/gpu/GrSPIRVUniformHandler.cpp
+++ b/third_party/skia/src/gpu/GrSPIRVUniformHandler.cpp
@@ -28,143 +28,143 @@ const char* GrSPIRVUniformHandler::getUniformCStr(UniformHandle u) const {
 // FIXME: this code was ripped from GrVkUniformHandler; should be refactored.
 namespace {
 
-uint32_t grsltype_to_alignment_mask(GrSLType type) {
+uint32_t sksltype_to_alignment_mask(SkSLType type) {
     switch(type) {
-        case kShort_GrSLType: // fall through
-        case kUShort_GrSLType:
+        case SkSLType::kShort: // fall through
+        case SkSLType::kUShort:
             return 0x1;
-        case kShort2_GrSLType: // fall through
-        case kUShort2_GrSLType:
+        case SkSLType::kShort2: // fall through
+        case SkSLType::kUShort2:
             return 0x3;
-        case kShort3_GrSLType: // fall through
-        case kShort4_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
+        case SkSLType::kShort3: // fall through
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
             return 0x7;
-        case kInt_GrSLType:
-        case kUInt_GrSLType:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
             return 0x3;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
             return 0x7;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
             return 0xF;
-        case kHalf_GrSLType: // fall through
-        case kFloat_GrSLType:
+        case SkSLType::kHalf: // fall through
+        case SkSLType::kFloat:
             return 0x3;
-        case kHalf2_GrSLType: // fall through
-        case kFloat2_GrSLType:
+        case SkSLType::kHalf2: // fall through
+        case SkSLType::kFloat2:
             return 0x7;
-        case kHalf3_GrSLType: // fall through
-        case kFloat3_GrSLType:
+        case SkSLType::kHalf3: // fall through
+        case SkSLType::kFloat3:
             return 0xF;
-        case kHalf4_GrSLType: // fall through
-        case kFloat4_GrSLType:
+        case SkSLType::kHalf4: // fall through
+        case SkSLType::kFloat4:
             return 0xF;
-        case kHalf2x2_GrSLType: // fall through
-        case kFloat2x2_GrSLType:
+        case SkSLType::kHalf2x2: // fall through
+        case SkSLType::kFloat2x2:
             return 0x7;
-        case kHalf3x3_GrSLType: // fall through
-        case kFloat3x3_GrSLType:
+        case SkSLType::kHalf3x3: // fall through
+        case SkSLType::kFloat3x3:
             return 0xF;
-        case kHalf4x4_GrSLType: // fall through
-        case kFloat4x4_GrSLType:
+        case SkSLType::kHalf4x4: // fall through
+        case SkSLType::kFloat4x4:
             return 0xF;
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
 }
 
-static inline uint32_t grsltype_to_size(GrSLType type) {
+static inline uint32_t sksltype_to_size(SkSLType type) {
     switch(type) {
-        case kShort_GrSLType:
+        case SkSLType::kShort:
             return sizeof(int16_t);
-        case kShort2_GrSLType:
+        case SkSLType::kShort2:
             return 2 * sizeof(int16_t);
-        case kShort3_GrSLType:
+        case SkSLType::kShort3:
             return 3 * sizeof(int16_t);
-        case kShort4_GrSLType:
+        case SkSLType::kShort4:
             return 4 * sizeof(int16_t);
-        case kUShort_GrSLType:
+        case SkSLType::kUShort:
             return sizeof(uint16_t);
-        case kUShort2_GrSLType:
+        case SkSLType::kUShort2:
             return 2 * sizeof(uint16_t);
-        case kUShort3_GrSLType:
+        case SkSLType::kUShort3:
             return 3 * sizeof(uint16_t);
-        case kUShort4_GrSLType:
+        case SkSLType::kUShort4:
             return 4 * sizeof(uint16_t);
-        case kHalf_GrSLType: // fall through
-        case kFloat_GrSLType:
+        case SkSLType::kHalf: // fall through
+        case SkSLType::kFloat:
             return sizeof(float);
-        case kHalf2_GrSLType: // fall through
-        case kFloat2_GrSLType:
+        case SkSLType::kHalf2: // fall through
+        case SkSLType::kFloat2:
             return 2 * sizeof(float);
-        case kHalf3_GrSLType: // fall through
-        case kFloat3_GrSLType:
+        case SkSLType::kHalf3: // fall through
+        case SkSLType::kFloat3:
             return 3 * sizeof(float);
-        case kHalf4_GrSLType: // fall through
-        case kFloat4_GrSLType:
+        case SkSLType::kHalf4: // fall through
+        case SkSLType::kFloat4:
             return 4 * sizeof(float);
-        case kInt_GrSLType: // fall through
-        case kUInt_GrSLType:
+        case SkSLType::kInt: // fall through
+        case SkSLType::kUInt:
             return sizeof(int32_t);
-        case kInt2_GrSLType: // fall through
-        case kUInt2_GrSLType:
+        case SkSLType::kInt2: // fall through
+        case SkSLType::kUInt2:
             return 2 * sizeof(int32_t);
-        case kInt3_GrSLType: // fall through
-        case kUInt3_GrSLType:
+        case SkSLType::kInt3: // fall through
+        case SkSLType::kUInt3:
             return 3 * sizeof(int32_t);
-        case kInt4_GrSLType: // fall through
-        case kUInt4_GrSLType:
+        case SkSLType::kInt4: // fall through
+        case SkSLType::kUInt4:
             return 4 * sizeof(int32_t);
-        case kHalf2x2_GrSLType: // fall through
-        case kFloat2x2_GrSLType:
+        case SkSLType::kHalf2x2: // fall through
+        case SkSLType::kFloat2x2:
             //TODO: this will be 4 * szof(float) on std430.
             return 8 * sizeof(float);
-        case kHalf3x3_GrSLType: // fall through
-        case kFloat3x3_GrSLType:
+        case SkSLType::kHalf3x3: // fall through
+        case SkSLType::kFloat3x3:
             return 12 * sizeof(float);
-        case kHalf4x4_GrSLType: // fall through
-        case kFloat4x4_GrSLType:
+        case SkSLType::kHalf4x4: // fall through
+        case SkSLType::kFloat4x4:
             return 16 * sizeof(float);
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kSampler_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kSampler:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
 }
 
-uint32_t get_ubo_offset(uint32_t* currentOffset, GrSLType type, int arrayCount) {
-    uint32_t alignmentMask = grsltype_to_alignment_mask(type);
+uint32_t get_ubo_offset(uint32_t* currentOffset, SkSLType type, int arrayCount) {
+    uint32_t alignmentMask = sksltype_to_alignment_mask(type);
     // We want to use the std140 layout here, so we must make arrays align to 16 bytes.
-    if (arrayCount || type == kFloat2x2_GrSLType) {
+    if (arrayCount || type == SkSLType::kFloat2x2) {
         alignmentMask = 0xF;
     }
     uint32_t offsetDiff = *currentOffset & alignmentMask;
@@ -174,11 +174,11 @@ uint32_t get_ubo_offset(uint32_t* currentOffset, GrSLType type, int arrayCount)
     uint32_t uniformOffset = *currentOffset + offsetDiff;
     SkASSERT(sizeof(float) == 4);
     if (arrayCount) {
-        uint32_t elementSize = std::max<uint32_t>(16, grsltype_to_size(type));
+        uint32_t elementSize = std::max<uint32_t>(16, sksltype_to_size(type));
         SkASSERT(0 == (elementSize & 0xF));
         *currentOffset = uniformOffset + elementSize * arrayCount;
     } else {
-        *currentOffset = uniformOffset + grsltype_to_size(type);
+        *currentOffset = uniformOffset + sksltype_to_size(type);
     }
     return uniformOffset;
 }
@@ -188,7 +188,7 @@ uint32_t get_ubo_offset(uint32_t* currentOffset, GrSLType type, int arrayCount)
 GrGLSLUniformHandler::UniformHandle GrSPIRVUniformHandler::internalAddUniformArray(
         const GrFragmentProcessor* owner,
         uint32_t visibility,
-        GrSLType type,
+        SkSLType type,
         const char* name,
         bool mangleName,
         int arrayCount,
@@ -226,7 +226,7 @@ GrGLSLUniformHandler::UniformHandle GrSPIRVUniformHandler::internalAddUniformArr
 
 GrGLSLUniformHandler::SamplerHandle GrSPIRVUniformHandler::addSampler(const GrBackendFormat&,
                                                                      GrSamplerState,
-                                                                     const GrSwizzle& swizzle,
+                                                                     const skgpu::Swizzle& swizzle,
                                                                      const char* name,
                                                                      const GrShaderCaps* caps) {
     int binding = fSamplers.count() * 2;
@@ -237,7 +237,7 @@ GrGLSLUniformHandler::SamplerHandle GrSPIRVUniformHandler::addSampler(const GrBa
 
     SPIRVUniformInfo tempInfo;
     tempInfo.fVariable = GrShaderVar{std::move(mangleName),
-                                     kSampler_GrSLType,
+                                     SkSLType::kSampler,
                                      GrShaderVar::TypeModifier::Uniform,
                                      GrShaderVar::kNonArray,
                                      std::move(layoutQualifier),
@@ -256,7 +256,7 @@ GrGLSLUniformHandler::SamplerHandle GrSPIRVUniformHandler::addSampler(const GrBa
     SkString texLayoutQualifier;
     texLayoutQualifier.appendf("set = %d, binding = %d", kSamplerTextureDescriptorSet, binding + 1);
     tempInfo.fVariable = GrShaderVar{std::move(mangleTexName),
-                                     kTexture2D_GrSLType,
+                                     SkSLType::kTexture2D,
                                      GrShaderVar::TypeModifier::Uniform,
                                      GrShaderVar::kNonArray,
                                      std::move(texLayoutQualifier),
@@ -276,7 +276,8 @@ const char* GrSPIRVUniformHandler::samplerVariable(
     return fSamplerReferences[handle.toIndex()].c_str();
 }
 
-GrSwizzle GrSPIRVUniformHandler::samplerSwizzle(GrGLSLUniformHandler::SamplerHandle handle) const {
+skgpu::Swizzle GrSPIRVUniformHandler::samplerSwizzle(
+        GrGLSLUniformHandler::SamplerHandle handle) const {
     return fSamplerSwizzles[handle.toIndex()];
 }
 
@@ -307,5 +308,5 @@ void GrSPIRVUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkStrin
 
 uint32_t GrSPIRVUniformHandler::getRTFlipOffset() const {
     uint32_t currentOffset = fCurrentUBOOffset;
-    return get_ubo_offset(&currentOffset, kFloat2_GrSLType, 0);
+    return get_ubo_offset(&currentOffset, SkSLType::kFloat2, 0);
 }
diff --git a/third_party/skia/src/gpu/GrSPIRVUniformHandler.h b/third_party/skia/src/gpu/GrSPIRVUniformHandler.h
index 5cb1aaa911c5a..410f2d8f24bc0 100644
--- a/third_party/skia/src/gpu/GrSPIRVUniformHandler.h
+++ b/third_party/skia/src/gpu/GrSPIRVUniformHandler.h
@@ -49,14 +49,14 @@ class GrSPIRVUniformHandler : public GrGLSLUniformHandler {
 private:
     explicit GrSPIRVUniformHandler(GrGLSLProgramBuilder* program);
 
-    SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const GrSwizzle&,
+    SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const skgpu::Swizzle&,
                              const char* name, const GrShaderCaps*) override;
     const char* samplerVariable(SamplerHandle handle) const override;
-    GrSwizzle samplerSwizzle(SamplerHandle handle) const override;
+    skgpu::Swizzle samplerSwizzle(SamplerHandle handle) const override;
     void appendUniformDecls(GrShaderFlags visibility, SkString*) const override;
     UniformHandle internalAddUniformArray(const GrFragmentProcessor* owner,
                                           uint32_t visibility,
-                                          GrSLType type,
+                                          SkSLType type,
                                           const char* name,
                                           bool mangleName,
                                           int arrayCount,
@@ -65,7 +65,7 @@ class GrSPIRVUniformHandler : public GrGLSLUniformHandler {
     UniformInfoArray    fUniforms;
     UniformInfoArray    fSamplers;
     UniformInfoArray    fTextures;
-    SkTArray<GrSwizzle> fSamplerSwizzles;
+    SkTArray<skgpu::Swizzle> fSamplerSwizzles;
     SkTArray<SkString>  fSamplerReferences;
 
     uint32_t fCurrentUBOOffset = 0;
diff --git a/third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp b/third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp
index ef970d65c501d..3b942f2527093 100644
--- a/third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp
+++ b/third_party/skia/src/gpu/GrSPIRVVaryingHandler.cpp
@@ -7,73 +7,73 @@
 
 #include "src/gpu/GrSPIRVVaryingHandler.h"
 
-/** Returns the number of locations take up by a given GrSLType. We assume that all
+/** Returns the number of locations take up by a given SkSLType. We assume that all
     scalar values are 32 bits. */
-static inline int grsltype_to_location_size(GrSLType type) {
+static inline int sksltype_to_location_size(SkSLType type) {
     // If a new GrSL type is added, this function will need to be updated.
-    static_assert(kGrSLTypeCount == 41);
+    static_assert(kSkSLTypeCount == 41);
 
     switch(type) {
-        case kVoid_GrSLType:
+        case SkSLType::kVoid:
             return 0;
-        case kFloat_GrSLType: // fall through
-        case kHalf_GrSLType:
+        case SkSLType::kFloat: // fall through
+        case SkSLType::kHalf:
             return 1;
-        case kFloat2_GrSLType: // fall through
-        case kHalf2_GrSLType:
+        case SkSLType::kFloat2: // fall through
+        case SkSLType::kHalf2:
             return 1;
-        case kFloat3_GrSLType:
-        case kHalf3_GrSLType:
+        case SkSLType::kFloat3:
+        case SkSLType::kHalf3:
             return 1;
-        case kFloat4_GrSLType:
-        case kHalf4_GrSLType:
+        case SkSLType::kFloat4:
+        case SkSLType::kHalf4:
             return 1;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
-        case kShort2_GrSLType:
-        case kUShort2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
             return 1;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kShort3_GrSLType:
-        case kUShort3_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kShort3:
+        case SkSLType::kUShort3:
             return 1;
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort4_GrSLType:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort4:
             return 1;
-        case kFloat2x2_GrSLType:
-        case kHalf2x2_GrSLType:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kHalf2x2:
             return 2;
-        case kFloat3x3_GrSLType:
-        case kHalf3x3_GrSLType:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kHalf3x3:
             return 3;
-        case kFloat4x4_GrSLType:
-        case kHalf4x4_GrSLType:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf4x4:
             return 4;
-        case kTexture2DSampler_GrSLType:
+        case SkSLType::kTexture2DSampler:
             return 0;
-        case kTextureExternalSampler_GrSLType:
+        case SkSLType::kTextureExternalSampler:
              return 0;
-        case kTexture2DRectSampler_GrSLType:
+        case SkSLType::kTexture2DRectSampler:
              return 0;
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
              return 1;
-        case kInt_GrSLType: // fall through
-        case kShort_GrSLType:
+        case SkSLType::kInt: // fall through
+        case SkSLType::kShort:
              return 1;
-        case kUInt_GrSLType: // fall through
-        case kUShort_GrSLType:
+        case SkSLType::kUInt: // fall through
+        case SkSLType::kUShort:
              return 1;
-        case kTexture2D_GrSLType:
+        case SkSLType::kTexture2D:
              return 0;
-        case kSampler_GrSLType:
+        case SkSLType::kSampler:
              return 0;
-        case kInput_GrSLType:
+        case SkSLType::kInput:
             return 0;
     }
     SK_ABORT("Unexpected type");
@@ -86,7 +86,7 @@ static void finalize_helper(GrSPIRVVaryingHandler::VarArray& vars) {
         location.appendf("location = %d", locationIndex);
         var.addLayoutQualifier(location.c_str());
 
-        int elementSize = grsltype_to_location_size(var.getType());
+        int elementSize = sksltype_to_location_size(var.getType());
         SkASSERT(elementSize > 0);
         int numElements = var.isArray() ? var.getArrayCount() : 1;
         SkASSERT(numElements > 0);
diff --git a/third_party/skia/src/gpu/GrShaderCaps.cpp b/third_party/skia/src/gpu/GrShaderCaps.cpp
index e473ba23a41f3..fe9e092f5fbb4 100644
--- a/third_party/skia/src/gpu/GrShaderCaps.cpp
+++ b/third_party/skia/src/gpu/GrShaderCaps.cpp
@@ -76,7 +76,6 @@ void GrShaderCaps::dumpJSON(SkJSONWriter* writer) const {
     writer->appendBool("Color space math needs float", fColorSpaceMathNeedsFloat);
     writer->appendBool("Builtin fma() support", fBuiltinFMASupport);
     writer->appendBool("Builtin determinant() support", fBuiltinDeterminantSupport);
-    writer->appendBool("Can use do-while loops", fCanUseDoLoops);
     writer->appendBool("Use node pools", fUseNodePools);
 
     writer->appendS32("Max FS Samplers", fMaxFragmentSamplers);
diff --git a/third_party/skia/src/gpu/GrShaderVar.cpp b/third_party/skia/src/gpu/GrShaderVar.cpp
index accbe2c373ce3..271c13a3216bc 100644
--- a/third_party/skia/src/gpu/GrShaderVar.cpp
+++ b/third_party/skia/src/gpu/GrShaderVar.cpp
@@ -30,7 +30,7 @@ void GrShaderVar::appendDecl(const GrShaderCaps* shaderCaps, SkString* out) cons
     if (this->getTypeModifier() != TypeModifier::None) {
         out->appendf("%s ", type_modifier_string(this->getTypeModifier()));
     }
-    GrSLType effectiveType = this->getType();
+    SkSLType effectiveType = this->getType();
     if (this->isArray()) {
         SkASSERT(this->getArrayCount() > 0);
         out->appendf("%s %s[%d]",
diff --git a/third_party/skia/src/gpu/GrShaderVar.h b/third_party/skia/src/gpu/GrShaderVar.h
index b5771ccda2605..960b36c64db61 100644
--- a/third_party/skia/src/gpu/GrShaderVar.h
+++ b/third_party/skia/src/gpu/GrShaderVar.h
@@ -10,6 +10,7 @@
 
 #include "include/core/SkString.h"
 #include "include/private/GrTypesPriv.h"
+#include "src/core/SkSLTypeShared.h"
 
 struct GrShaderCaps;
 
@@ -33,33 +34,33 @@ class GrShaderVar {
 
     /** Defaults to a void with no type modifier or layout qualifier. */
     GrShaderVar()
-            : fType(kVoid_GrSLType)
+            : fType(SkSLType::kVoid)
             , fTypeModifier(TypeModifier::None)
             , fCount(kNonArray) {}
 
-    GrShaderVar(SkString name, GrSLType type, int arrayCount = kNonArray)
+    GrShaderVar(SkString name, SkSLType type, int arrayCount = kNonArray)
             : fType(type)
             , fTypeModifier(TypeModifier::None)
             , fCount(arrayCount)
             , fName(std::move(name)) {}
-    GrShaderVar(const char* name, GrSLType type, int arrayCount = kNonArray)
+    GrShaderVar(const char* name, SkSLType type, int arrayCount = kNonArray)
         : GrShaderVar(SkString(name), type, arrayCount) {}
 
-    GrShaderVar(SkString name, GrSLType type, TypeModifier typeModifier)
+    GrShaderVar(SkString name, SkSLType type, TypeModifier typeModifier)
             : fType(type)
             , fTypeModifier(typeModifier)
             , fCount(kNonArray)
             , fName(std::move(name)) {}
-    GrShaderVar(const char* name, GrSLType type, TypeModifier typeModifier)
+    GrShaderVar(const char* name, SkSLType type, TypeModifier typeModifier)
         : GrShaderVar(SkString(name), type, typeModifier) {}
 
-    GrShaderVar(SkString name, GrSLType type, TypeModifier typeModifier, int arrayCount)
+    GrShaderVar(SkString name, SkSLType type, TypeModifier typeModifier, int arrayCount)
             : fType(type)
             , fTypeModifier(typeModifier)
             , fCount(arrayCount)
             , fName(std::move(name)) {}
 
-    GrShaderVar(SkString name, GrSLType type, TypeModifier typeModifier, int arrayCount,
+    GrShaderVar(SkString name, SkSLType type, TypeModifier typeModifier, int arrayCount,
                 SkString layoutQualifier, SkString extraModifier)
             : fType(type)
             , fTypeModifier(typeModifier)
@@ -74,9 +75,8 @@ class GrShaderVar {
     GrShaderVar& operator=(GrShaderVar&&) = default;
 
     /** Sets as a non-array. */
-    void set(GrSLType type,
-             const char* name) {
-        SkASSERT(kVoid_GrSLType != type);
+    void set(SkSLType type, const char* name) {
+        SkASSERT(SkSLType::kVoid != type);
         fType = type;
         fName = name;
     }
@@ -94,7 +94,7 @@ class GrShaderVar {
     const char* c_str() const { return this->getName().c_str(); }
 
     /** Get the type. */
-    GrSLType getType() const { return fType; }
+    SkSLType getType() const { return fType; }
 
     TypeModifier getTypeModifier() const { return fTypeModifier; }
     void setTypeModifier(TypeModifier type) { fTypeModifier = type; }
@@ -127,7 +127,7 @@ class GrShaderVar {
     void appendDecl(const GrShaderCaps*, SkString* out) const;
 
 private:
-    GrSLType        fType;
+    SkSLType        fType;
     TypeModifier    fTypeModifier;
     int             fCount;
 
diff --git a/third_party/skia/src/gpu/GrStencilSettings.cpp b/third_party/skia/src/gpu/GrStencilSettings.cpp
index 7313858855092..c2572ae4dd9ea 100644
--- a/third_party/skia/src/gpu/GrStencilSettings.cpp
+++ b/third_party/skia/src/gpu/GrStencilSettings.cpp
@@ -9,6 +9,7 @@
 #include "src/gpu/GrStencilSettings.h"
 
 #include "src/gpu/GrProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 
 constexpr const GrUserStencilSettings gUnused(
     GrUserStencilSettings::StaticInit<
@@ -243,7 +244,7 @@ const GrUserStencilSettings* GrStencilSettings::SetClipBitSettings(bool setToIns
     return setToInside ? &gSetStencilClipBit : &gZeroStencilClipBit;
 }
 
-void GrStencilSettings::genKey(GrProcessorKeyBuilder* b, bool includeRefs) const {
+void GrStencilSettings::genKey(skgpu::KeyBuilder* b, bool includeRefs) const {
     b->addBits(6, fFlags, "stencilFlags");
     if (this->isDisabled()) {
         return;
diff --git a/third_party/skia/src/gpu/GrStencilSettings.h b/third_party/skia/src/gpu/GrStencilSettings.h
index e7b475b309cc0..6790f8fe33d1e 100644
--- a/third_party/skia/src/gpu/GrStencilSettings.h
+++ b/third_party/skia/src/gpu/GrStencilSettings.h
@@ -12,7 +12,9 @@
 #include "include/core/SkRegion.h"
 #include "src/gpu/GrUserStencilSettings.h"
 
-class GrProcessorKeyBuilder;
+namespace skgpu {
+class KeyBuilder;
+}
 
 enum class GrStencilTest : uint16_t {
     kAlways,
@@ -68,7 +70,7 @@ class GrStencilSettings {
     bool usesWrapOp() const { SkASSERT(this->isValid());
                               return !(fFlags & kNoWrapOps_StencilFlag); }
 
-    void genKey(GrProcessorKeyBuilder* b, bool includeRefsAndMasks) const;
+    void genKey(skgpu::KeyBuilder* b, bool includeRefsAndMasks) const;
 
     bool operator!=(const GrStencilSettings& that) const { return !(*this == that); }
     bool operator==(const GrStencilSettings&) const;
diff --git a/third_party/skia/src/gpu/GrSurfaceProxy.cpp b/third_party/skia/src/gpu/GrSurfaceProxy.cpp
index b94afa6141ab7..48db1b7b47b1b 100644
--- a/third_party/skia/src/gpu/GrSurfaceProxy.cpp
+++ b/third_party/skia/src/gpu/GrSurfaceProxy.cpp
@@ -174,7 +174,7 @@ void GrSurfaceProxy::assign(sk_sp<GrSurface> surface) {
 
 bool GrSurfaceProxy::instantiateImpl(GrResourceProvider* resourceProvider, int sampleCnt,
                                      GrRenderable renderable, GrMipmapped mipMapped,
-                                     const GrUniqueKey* uniqueKey) {
+                                     const skgpu::UniqueKey* uniqueKey) {
     SkASSERT(!this->isLazy());
     if (fTarget) {
         if (uniqueKey && uniqueKey->isValid()) {
@@ -205,7 +205,7 @@ void GrSurfaceProxy::deinstantiate() {
     fTarget = nullptr;
 }
 
-void GrSurfaceProxy::computeScratchKey(const GrCaps& caps, GrScratchKey* key) const {
+void GrSurfaceProxy::computeScratchKey(const GrCaps& caps, skgpu::ScratchKey* key) const {
     SkASSERT(!this->isFullyLazy());
     GrRenderable renderable = GrRenderable::kNo;
     int sampleCount = 1;
@@ -312,11 +312,11 @@ sk_sp<GrSurfaceProxy> GrSurfaceProxy::Copy(GrRecordingContext* rContext,
                                                    1,
                                                    mipMapped,
                                                    src->isProtected(),
-                                                   GrSwizzle::RGBA(),
-                                                   GrSwizzle::RGBA(),
+                                                   skgpu::Swizzle::RGBA(),
+                                                   skgpu::Swizzle::RGBA(),
                                                    origin,
                                                    budgeted);
-        GrSurfaceProxyView view(std::move(src), origin, GrSwizzle::RGBA());
+        GrSurfaceProxyView view(std::move(src), origin, skgpu::Swizzle::RGBA());
         if (dstContext && dstContext->blitTexture(std::move(view), srcRect, dstPoint)) {
             if (outTask) {
                 *outTask = dstContext->refRenderTask();
@@ -446,7 +446,7 @@ bool GrSurfaceProxyPriv::doLazyInstantiation(GrResourceProvider* resourceProvide
     if (GrTextureProxy* texProxy = fProxy->asTextureProxy()) {
         texProxy->setTargetKeySync(syncKey);
         if (syncKey) {
-            const GrUniqueKey& key = texProxy->getUniqueKey();
+            const skgpu::UniqueKey& key = texProxy->getUniqueKey();
             if (key.isValid()) {
                 if (!surface->asTexture()->getUniqueKey().isValid()) {
                     // If 'surface' is newly created, attach the unique key
diff --git a/third_party/skia/src/gpu/GrSurfaceProxy.h b/third_party/skia/src/gpu/GrSurfaceProxy.h
index 874262a3476ce..01a1d21efeea7 100644
--- a/third_party/skia/src/gpu/GrSurfaceProxy.h
+++ b/third_party/skia/src/gpu/GrSurfaceProxy.h
@@ -231,9 +231,9 @@ class GrSurfaceProxy : public SkNVRefCnt<GrSurfaceProxy> {
     virtual const GrRenderTargetProxy* asRenderTargetProxy() const { return nullptr; }
 
     /** @return The unique key for this proxy. May be invalid. */
-    virtual const GrUniqueKey& getUniqueKey() const {
+    virtual const skgpu::UniqueKey& getUniqueKey() const {
         // Base class never has a valid unique key.
-        static const GrUniqueKey kInvalidKey;
+        static const skgpu::UniqueKey kInvalidKey;
         return kInvalidKey;
     }
 
@@ -391,7 +391,7 @@ class GrSurfaceProxy : public SkNVRefCnt<GrSurfaceProxy> {
     bool ignoredByResourceAllocator() const { return fIgnoredByResourceAllocator; }
     void setIgnoredByResourceAllocator() { fIgnoredByResourceAllocator = true; }
 
-    void computeScratchKey(const GrCaps&, GrScratchKey*) const;
+    void computeScratchKey(const GrCaps&, skgpu::ScratchKey*) const;
 
     virtual sk_sp<GrSurface> createSurface(GrResourceProvider*) const = 0;
     void assign(sk_sp<GrSurface> surface);
@@ -410,7 +410,7 @@ class GrSurfaceProxy : public SkNVRefCnt<GrSurfaceProxy> {
     }
 
     bool instantiateImpl(GrResourceProvider* resourceProvider, int sampleCnt, GrRenderable,
-                         GrMipmapped, const GrUniqueKey*);
+                         GrMipmapped, const skgpu::UniqueKey*);
 
     // For deferred proxies this will be null until the proxy is instantiated.
     // For wrapped proxies it will point to the wrapped resource.
diff --git a/third_party/skia/src/gpu/GrSurfaceProxyPriv.h b/third_party/skia/src/gpu/GrSurfaceProxyPriv.h
index 56f08a7b6266a..be57b701eb00d 100644
--- a/third_party/skia/src/gpu/GrSurfaceProxyPriv.h
+++ b/third_party/skia/src/gpu/GrSurfaceProxyPriv.h
@@ -17,7 +17,7 @@ class GrResourceProvider;
     data members or virtual methods. */
 class GrSurfaceProxyPriv {
 public:
-    void computeScratchKey(const GrCaps& caps, GrScratchKey* key) const {
+    void computeScratchKey(const GrCaps& caps, skgpu::ScratchKey* key) const {
         return fProxy->computeScratchKey(caps, key);
     }
 
@@ -46,8 +46,6 @@ class GrSurfaceProxyPriv {
 
 private:
     explicit GrSurfaceProxyPriv(GrSurfaceProxy* proxy) : fProxy(proxy) {}
-    // Required until C++17 copy elision
-    GrSurfaceProxyPriv(const GrSurfaceProxyPriv&) = default;
     GrSurfaceProxyPriv& operator=(const GrSurfaceProxyPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrSurfaceProxyView.h b/third_party/skia/src/gpu/GrSurfaceProxyView.h
index a04301855faf5..98e2a052a43c6 100644
--- a/third_party/skia/src/gpu/GrSurfaceProxyView.h
+++ b/third_party/skia/src/gpu/GrSurfaceProxyView.h
@@ -12,14 +12,14 @@
 #include "include/gpu/GrTypes.h"
 #include "src/gpu/GrRenderTargetProxy.h"
 #include "src/gpu/GrSurfaceProxy.h"
-#include "src/gpu/GrSwizzle.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/Swizzle.h"
 
 class GrSurfaceProxyView {
 public:
     GrSurfaceProxyView() = default;
 
-    GrSurfaceProxyView(sk_sp<GrSurfaceProxy> proxy, GrSurfaceOrigin origin, GrSwizzle swizzle)
+    GrSurfaceProxyView(sk_sp<GrSurfaceProxy> proxy, GrSurfaceOrigin origin, skgpu::Swizzle swizzle)
             : fProxy(std::move(proxy)), fOrigin(origin), fSwizzle(swizzle) {}
 
     // This entry point is used when we don't care about the origin or the swizzle.
@@ -29,7 +29,7 @@ class GrSurfaceProxyView {
     GrSurfaceProxyView(GrSurfaceProxyView&& view) = default;
     GrSurfaceProxyView(const GrSurfaceProxyView&) = default;
 
-    operator bool() const { return SkToBool(fProxy.get()); }
+    explicit operator bool() const { return SkToBool(fProxy.get()); }
 
     GrSurfaceProxyView& operator=(const GrSurfaceProxyView&) = default;
     GrSurfaceProxyView& operator=(GrSurfaceProxyView&& view) = default;
@@ -77,16 +77,18 @@ class GrSurfaceProxyView {
     }
 
     GrSurfaceOrigin origin() const { return fOrigin; }
-    GrSwizzle swizzle() const { return fSwizzle; }
+    skgpu::Swizzle swizzle() const { return fSwizzle; }
 
-    void concatSwizzle(GrSwizzle swizzle) { fSwizzle = GrSwizzle::Concat(fSwizzle, swizzle); }
+    void concatSwizzle(skgpu::Swizzle swizzle) {
+        fSwizzle = skgpu::Swizzle::Concat(fSwizzle, swizzle);
+    }
 
-    GrSurfaceProxyView makeSwizzle(GrSwizzle swizzle) const & {
-        return {fProxy, fOrigin, GrSwizzle::Concat(fSwizzle, swizzle)};
+    GrSurfaceProxyView makeSwizzle(skgpu::Swizzle swizzle) const & {
+        return {fProxy, fOrigin, skgpu::Swizzle::Concat(fSwizzle, swizzle)};
     }
 
-    GrSurfaceProxyView makeSwizzle(GrSwizzle swizzle) && {
-        return {std::move(fProxy), fOrigin, GrSwizzle::Concat(fSwizzle, swizzle)};
+    GrSurfaceProxyView makeSwizzle(skgpu::Swizzle swizzle) && {
+        return {std::move(fProxy), fOrigin, skgpu::Swizzle::Concat(fSwizzle, swizzle)};
     }
 
     void reset() {
@@ -134,7 +136,7 @@ class GrSurfaceProxyView {
 private:
     sk_sp<GrSurfaceProxy> fProxy;
     GrSurfaceOrigin fOrigin = kTopLeft_GrSurfaceOrigin;
-    GrSwizzle fSwizzle;
+    skgpu::Swizzle fSwizzle;
 };
 
 #endif
diff --git a/third_party/skia/src/gpu/GrTexture.cpp b/third_party/skia/src/gpu/GrTexture.cpp
index 949dcf10a6828..d36c551c7a6f2 100644
--- a/third_party/skia/src/gpu/GrTexture.cpp
+++ b/third_party/skia/src/gpu/GrTexture.cpp
@@ -8,7 +8,6 @@
 #include "include/core/SkMath.h"
 #include "include/core/SkTypes.h"
 #include "include/gpu/GrTypes.h"
-#include "include/private/GrResourceKey.h"
 #include "src/core/SkMipmap.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrGpu.h"
@@ -86,7 +85,7 @@ bool GrTexture::StealBackendTexture(sk_sp<GrTexture> texture,
     return true;
 }
 
-void GrTexture::computeScratchKey(GrScratchKey* key) const {
+void GrTexture::computeScratchKey(skgpu::ScratchKey* key) const {
     if (!this->getGpu()->caps()->isFormatCompressed(this->backendFormat())) {
         int sampleCount = 1;
         GrRenderable renderable = GrRenderable::kNo;
@@ -107,8 +106,8 @@ void GrTexture::ComputeScratchKey(const GrCaps& caps,
                                   int sampleCnt,
                                   GrMipmapped mipMapped,
                                   GrProtected isProtected,
-                                  GrScratchKey* key) {
-    static const GrScratchKey::ResourceType kType = GrScratchKey::GenerateResourceType();
+                                  skgpu::ScratchKey* key) {
+    static const skgpu::ScratchKey::ResourceType kType = skgpu::ScratchKey::GenerateResourceType();
     SkASSERT(!dimensions.isEmpty());
     SkASSERT(sampleCnt > 0);
     SkASSERT(1 == sampleCnt || renderable == GrRenderable::kYes);
@@ -120,7 +119,7 @@ void GrTexture::ComputeScratchKey(const GrCaps& caps,
 
     uint64_t formatKey = caps.computeFormatKey(format);
 
-    GrScratchKey::Builder builder(key, kType, 5);
+    skgpu::ScratchKey::Builder builder(key, kType, 5);
     builder[0] = dimensions.width();
     builder[1] = dimensions.height();
     builder[2] = formatKey & 0xFFFFFFFF;
diff --git a/third_party/skia/src/gpu/GrTexture.h b/third_party/skia/src/gpu/GrTexture.h
index f703b1efd4446..61049dc7f3992 100644
--- a/third_party/skia/src/gpu/GrTexture.h
+++ b/third_party/skia/src/gpu/GrTexture.h
@@ -61,14 +61,14 @@ class GrTexture : virtual public GrSurface {
                                   int sampleCnt,
                                   GrMipmapped,
                                   GrProtected,
-                                  GrScratchKey* key);
+                                  skgpu::ScratchKey* key);
 
 protected:
     GrTexture(GrGpu*, const SkISize&, GrProtected, GrTextureType, GrMipmapStatus);
 
     virtual bool onStealBackendTexture(GrBackendTexture*, SkImage::BackendTextureReleaseProc*) = 0;
 
-    void computeScratchKey(GrScratchKey*) const override;
+    void computeScratchKey(skgpu::ScratchKey*) const override;
 
 private:
     size_t onGpuMemorySize() const override;
diff --git a/third_party/skia/src/gpu/GrTextureProxy.cpp b/third_party/skia/src/gpu/GrTextureProxy.cpp
index d7b5abfb203cf..13095595474e7 100644
--- a/third_party/skia/src/gpu/GrTextureProxy.cpp
+++ b/third_party/skia/src/gpu/GrTextureProxy.cpp
@@ -166,7 +166,7 @@ bool GrTextureProxy::ProxiesAreCompatibleAsDynamicState(const GrSurfaceProxy* fi
            first->backendFormat() == second->backendFormat();
 }
 
-void GrTextureProxy::setUniqueKey(GrProxyProvider* proxyProvider, const GrUniqueKey& key) {
+void GrTextureProxy::setUniqueKey(GrProxyProvider* proxyProvider, const skgpu::UniqueKey& key) {
     SkASSERT(key.isValid());
     SkASSERT(!fUniqueKey.isValid()); // proxies can only ever get one uniqueKey
 
diff --git a/third_party/skia/src/gpu/GrTextureProxy.h b/third_party/skia/src/gpu/GrTextureProxy.h
index f0605557064cf..6879501bcf7e3 100644
--- a/third_party/skia/src/gpu/GrTextureProxy.h
+++ b/third_party/skia/src/gpu/GrTextureProxy.h
@@ -69,7 +69,7 @@ class GrTextureProxy : virtual public GrSurfaceProxy {
     /**
      * Return the texture proxy's unique key. It will be invalid if the proxy doesn't have one.
      */
-    const GrUniqueKey& getUniqueKey() const override {
+    const skgpu::UniqueKey& getUniqueKey() const override {
 #ifdef SK_DEBUG
         if (this->isInstantiated() && fUniqueKey.isValid() && fSyncTargetKey &&
             fCreatingProvider == GrDDLProvider::kNo) {
@@ -185,7 +185,7 @@ class GrTextureProxy : virtual public GrSurfaceProxy {
     // uniquely-keyed textureProxy is also always set on the backing GrTexture.
     GrDDLProvider    fCreatingProvider = GrDDLProvider::kNo;
 
-    GrUniqueKey      fUniqueKey;
+    skgpu::UniqueKey      fUniqueKey;
     GrProxyProvider* fProxyProvider; // only set when fUniqueKey is valid
 
     LazySurfaceDesc callbackDesc() const override;
@@ -198,7 +198,7 @@ class GrTextureProxy : virtual public GrSurfaceProxy {
     size_t onUninstantiatedGpuMemorySize() const override;
 
     // Methods made available via GrTextureProxy::CacheAccess
-    void setUniqueKey(GrProxyProvider*, const GrUniqueKey&);
+    void setUniqueKey(GrProxyProvider*, const skgpu::UniqueKey&);
     void clearUniqueKey();
 
     SkDEBUGCODE(void onValidateSurface(const GrSurface*) override;)
diff --git a/third_party/skia/src/gpu/GrTextureProxyCacheAccess.h b/third_party/skia/src/gpu/GrTextureProxyCacheAccess.h
index ce2e4c26674eb..2748b51b003a3 100644
--- a/third_party/skia/src/gpu/GrTextureProxyCacheAccess.h
+++ b/third_party/skia/src/gpu/GrTextureProxyCacheAccess.h
@@ -15,7 +15,7 @@
  */
 class GrTextureProxy::CacheAccess {
 private:
-    void setUniqueKey(GrProxyProvider* proxyProvider, const GrUniqueKey& key) {
+    void setUniqueKey(GrProxyProvider* proxyProvider, const skgpu::UniqueKey& key) {
         fTextureProxy->setUniqueKey(proxyProvider, key);
     }
 
@@ -24,8 +24,6 @@ class GrTextureProxy::CacheAccess {
     }
 
     explicit CacheAccess(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {}
-    // Required until C++17 copy elision
-    CacheAccess(const CacheAccess&) = default;
     CacheAccess& operator=(const CacheAccess&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrTextureProxyPriv.h b/third_party/skia/src/gpu/GrTextureProxyPriv.h
index f45217eff8a85..6b48b1b66962e 100644
--- a/third_party/skia/src/gpu/GrTextureProxyPriv.h
+++ b/third_party/skia/src/gpu/GrTextureProxyPriv.h
@@ -30,8 +30,6 @@ class GrTextureProxyPriv {
 
 private:
     explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {}
-    // Required until C++17 copy elision
-    GrTextureProxyPriv(const GrTextureProxyPriv&) = default;
     GrTextureProxyPriv& operator=(const GrTextureProxyPriv&) = delete;
 
     // No taking addresses of this type.
diff --git a/third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp b/third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp
index 4c07fe07bcbde..f31ced5784180 100644
--- a/third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp
+++ b/third_party/skia/src/gpu/GrTextureRenderTargetProxy.cpp
@@ -120,7 +120,7 @@ bool GrTextureRenderTargetProxy::instantiate(GrResourceProvider* resourceProvide
         return false;
     }
 
-    const GrUniqueKey& key = this->getUniqueKey();
+    const skgpu::UniqueKey& key = this->getUniqueKey();
 
     if (!this->instantiateImpl(resourceProvider, this->numSamples(), GrRenderable::kYes,
                                this->mipmapped(), key.isValid() ? &key : nullptr)) {
diff --git a/third_party/skia/src/gpu/GrTextureResolveManager.h b/third_party/skia/src/gpu/GrTextureResolveManager.h
index f610c6b64af70..46d35ca6035c0 100644
--- a/third_party/skia/src/gpu/GrTextureResolveManager.h
+++ b/third_party/skia/src/gpu/GrTextureResolveManager.h
@@ -27,7 +27,7 @@ class GrTextureResolveManager {
 
     GrTextureResolveRenderTask* newTextureResolveRenderTask(const GrCaps& caps) const {
         SkASSERT(fDrawingManager);
-        return fDrawingManager->newTextureResolveRenderTask(caps);
+        return fDrawingManager->newTextureResolveRenderTaskBefore(caps);
     }
 
 private:
diff --git a/third_party/skia/src/gpu/GrThreadSafeCache.cpp b/third_party/skia/src/gpu/GrThreadSafeCache.cpp
index 44b022539e46d..03f54663bf41a 100644
--- a/third_party/skia/src/gpu/GrThreadSafeCache.cpp
+++ b/third_party/skia/src/gpu/GrThreadSafeCache.cpp
@@ -108,7 +108,7 @@ void GrThreadSafeCache::makeExistingEntryMRU(Entry* entry) {
 }
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalFind(
-                                                       const GrUniqueKey& key) {
+                                                       const skgpu::UniqueKey& key) {
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (tmp) {
         this->makeExistingEntryMRU(tmp);
@@ -119,7 +119,7 @@ std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalFind(
 }
 
 #ifdef SK_DEBUG
-bool GrThreadSafeCache::has(const GrUniqueKey& key) {
+bool GrThreadSafeCache::has(const skgpu::UniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
@@ -127,7 +127,7 @@ bool GrThreadSafeCache::has(const GrUniqueKey& key) {
 }
 #endif
 
-GrSurfaceProxyView GrThreadSafeCache::find(const GrUniqueKey& key) {
+GrSurfaceProxyView GrThreadSafeCache::find(const skgpu::UniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
     GrSurfaceProxyView view;
@@ -136,13 +136,13 @@ GrSurfaceProxyView GrThreadSafeCache::find(const GrUniqueKey& key) {
 }
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::findWithData(
-                                                                        const GrUniqueKey& key) {
+        const skgpu::UniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
     return this->internalFind(key);
 }
 
-GrThreadSafeCache::Entry* GrThreadSafeCache::getEntry(const GrUniqueKey& key,
+GrThreadSafeCache::Entry* GrThreadSafeCache::getEntry(const skgpu::UniqueKey& key,
                                                       const GrSurfaceProxyView& view) {
     Entry* entry;
 
@@ -166,7 +166,7 @@ GrThreadSafeCache::Entry* GrThreadSafeCache::makeNewEntryMRU(Entry* entry) {
     return entry;
 }
 
-GrThreadSafeCache::Entry* GrThreadSafeCache::getEntry(const GrUniqueKey& key,
+GrThreadSafeCache::Entry* GrThreadSafeCache::getEntry(const skgpu::UniqueKey& key,
                                                       sk_sp<VertexData> vertData) {
     Entry* entry;
 
@@ -193,7 +193,7 @@ void GrThreadSafeCache::recycleEntry(Entry* dead) {
 }
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalAdd(
-                                                                const GrUniqueKey& key,
+                                                                const skgpu::UniqueKey& key,
                                                                 const GrSurfaceProxyView& view) {
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (!tmp) {
@@ -205,7 +205,8 @@ std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::internalAdd(
     return { tmp->view(), tmp->refCustomData() };
 }
 
-GrSurfaceProxyView GrThreadSafeCache::add(const GrUniqueKey& key, const GrSurfaceProxyView& view) {
+GrSurfaceProxyView GrThreadSafeCache::add(const skgpu::UniqueKey& key,
+                                          const GrSurfaceProxyView& view) {
     SkAutoSpinlock lock{fSpinLock};
 
     GrSurfaceProxyView newView;
@@ -214,14 +215,14 @@ GrSurfaceProxyView GrThreadSafeCache::add(const GrUniqueKey& key, const GrSurfac
 }
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::addWithData(
-                                                                const GrUniqueKey& key,
+                                                                const skgpu::UniqueKey& key,
                                                                 const GrSurfaceProxyView& view) {
     SkAutoSpinlock lock{fSpinLock};
 
     return this->internalAdd(key, view);
 }
 
-GrSurfaceProxyView GrThreadSafeCache::findOrAdd(const GrUniqueKey& key,
+GrSurfaceProxyView GrThreadSafeCache::findOrAdd(const skgpu::UniqueKey& key,
                                                 const GrSurfaceProxyView& v) {
     SkAutoSpinlock lock{fSpinLock};
 
@@ -236,7 +237,7 @@ GrSurfaceProxyView GrThreadSafeCache::findOrAdd(const GrUniqueKey& key,
 }
 
 std::tuple<GrSurfaceProxyView, sk_sp<SkData>> GrThreadSafeCache::findOrAddWithData(
-                                                                      const GrUniqueKey& key,
+                                                                      const skgpu::UniqueKey& key,
                                                                       const GrSurfaceProxyView& v) {
     SkAutoSpinlock lock{fSpinLock};
 
@@ -260,8 +261,8 @@ sk_sp<GrThreadSafeCache::VertexData> GrThreadSafeCache::MakeVertexData(sk_sp<GrG
     return sk_sp<VertexData>(new VertexData(std::move(buffer), vertexCount, vertexSize));
 }
 
-std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCache::internalFindVerts(
-                                                                         const GrUniqueKey& key) {
+std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>>
+        GrThreadSafeCache::internalFindVerts(const skgpu::UniqueKey& key) {
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
     if (tmp) {
         this->makeExistingEntryMRU(tmp);
@@ -271,15 +272,15 @@ std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCach
     return {};
 }
 
-std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCache::findVertsWithData(
-                                                                          const GrUniqueKey& key) {
+std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>>
+        GrThreadSafeCache::findVertsWithData(const skgpu::UniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
     return this->internalFindVerts(key);
 }
 
 std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCache::internalAddVerts(
-                                                                    const GrUniqueKey& key,
+                                                                    const skgpu::UniqueKey& key,
                                                                     sk_sp<VertexData> vertData,
                                                                     IsNewerBetter isNewerBetter) {
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
@@ -297,7 +298,7 @@ std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCach
 }
 
 std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCache::addVertsWithData(
-                                                                    const GrUniqueKey& key,
+                                                                    const skgpu::UniqueKey& key,
                                                                     sk_sp<VertexData> vertData,
                                                                     IsNewerBetter isNewerBetter) {
     SkAutoSpinlock lock{fSpinLock};
@@ -305,7 +306,7 @@ std::tuple<sk_sp<GrThreadSafeCache::VertexData>, sk_sp<SkData>> GrThreadSafeCach
     return this->internalAddVerts(key, std::move(vertData), isNewerBetter);
 }
 
-void GrThreadSafeCache::remove(const GrUniqueKey& key) {
+void GrThreadSafeCache::remove(const skgpu::UniqueKey& key) {
     SkAutoSpinlock lock{fSpinLock};
 
     Entry* tmp = fUniquelyKeyedEntryMap.find(key);
@@ -363,7 +364,7 @@ GrThreadSafeCache::CreateLazyView(GrDirectContext* dContext,
 
     // TODO: It seems like this 'newCT' usage should be 'origCT' but this is
     // what skgpu::v1::SurfaceDrawContext::MakeWithFallback does
-    GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(format, newCT);
+    skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(format, newCT);
 
     return {{std::move(proxy), origin, swizzle}, std::move(trampoline)};
 }
diff --git a/third_party/skia/src/gpu/GrThreadSafeCache.h b/third_party/skia/src/gpu/GrThreadSafeCache.h
index b44e706945521..61a8664ae1973 100644
--- a/third_party/skia/src/gpu/GrThreadSafeCache.h
+++ b/third_party/skia/src/gpu/GrThreadSafeCache.h
@@ -82,20 +82,21 @@ class GrThreadSafeCache {
     // Drop uniquely held refs that were last accessed before 'purgeTime'
     void dropUniqueRefsOlderThan(GrStdSteadyClock::time_point purgeTime)  SK_EXCLUDES(fSpinLock);
 
-    SkDEBUGCODE(bool has(const GrUniqueKey&)  SK_EXCLUDES(fSpinLock);)
+    SkDEBUGCODE(bool has(const skgpu::UniqueKey&)  SK_EXCLUDES(fSpinLock);)
 
-    GrSurfaceProxyView find(const GrUniqueKey&)  SK_EXCLUDES(fSpinLock);
+    GrSurfaceProxyView find(const skgpu::UniqueKey&)  SK_EXCLUDES(fSpinLock);
     std::tuple<GrSurfaceProxyView, sk_sp<SkData>> findWithData(
-                                                      const GrUniqueKey&)  SK_EXCLUDES(fSpinLock);
+            const skgpu::UniqueKey&)  SK_EXCLUDES(fSpinLock);
 
-    GrSurfaceProxyView add(const GrUniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
+    GrSurfaceProxyView add(
+            const skgpu::UniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
     std::tuple<GrSurfaceProxyView, sk_sp<SkData>> addWithData(
-                            const GrUniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
+            const skgpu::UniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
 
-    GrSurfaceProxyView findOrAdd(const GrUniqueKey&,
+    GrSurfaceProxyView findOrAdd(const skgpu::UniqueKey&,
                                  const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
     std::tuple<GrSurfaceProxyView, sk_sp<SkData>> findOrAddWithData(
-                            const GrUniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
+            const skgpu::UniqueKey&, const GrSurfaceProxyView&)  SK_EXCLUDES(fSpinLock);
 
     // To hold vertex data in the cache and have it transparently transition from cpu-side to
     // gpu-side while being shared between all the threads we need a ref counted object that
@@ -162,16 +163,16 @@ class GrThreadSafeCache {
                                             size_t vertexSize);
 
     std::tuple<sk_sp<VertexData>, sk_sp<SkData>> findVertsWithData(
-                                                        const GrUniqueKey&)  SK_EXCLUDES(fSpinLock);
+            const skgpu::UniqueKey&)  SK_EXCLUDES(fSpinLock);
 
     typedef bool (*IsNewerBetter)(SkData* incumbent, SkData* challenger);
 
     std::tuple<sk_sp<VertexData>, sk_sp<SkData>> addVertsWithData(
-                                                        const GrUniqueKey&,
+                                                        const skgpu::UniqueKey&,
                                                         sk_sp<VertexData>,
                                                         IsNewerBetter)  SK_EXCLUDES(fSpinLock);
 
-    void remove(const GrUniqueKey&)  SK_EXCLUDES(fSpinLock);
+    void remove(const skgpu::UniqueKey&)  SK_EXCLUDES(fSpinLock);
 
     // To allow gpu-created resources to have priority, we pre-emptively place a lazy proxy
     // in the thread-safe cache (with findOrAdd). The Trampoline object allows that lazy proxy to
@@ -188,13 +189,13 @@ class GrThreadSafeCache {
                                                                             SkBackingFit);
 private:
     struct Entry {
-        Entry(const GrUniqueKey& key, const GrSurfaceProxyView& view)
+        Entry(const skgpu::UniqueKey& key, const GrSurfaceProxyView& view)
                 : fKey(key)
                 , fView(view)
                 , fTag(Entry::kView) {
         }
 
-        Entry(const GrUniqueKey& key, sk_sp<VertexData> vertData)
+        Entry(const skgpu::UniqueKey& key, sk_sp<VertexData> vertData)
                 : fKey(key)
                 , fVertData(std::move(vertData))
                 , fTag(Entry::kVertData) {
@@ -216,7 +217,7 @@ class GrThreadSafeCache {
             return false;
         }
 
-        const GrUniqueKey& key() const {
+        const skgpu::UniqueKey& key() const {
             SkASSERT(fTag != kEmpty);
             return fKey;
         }
@@ -241,7 +242,7 @@ class GrThreadSafeCache {
             return fVertData;
         }
 
-        void set(const GrUniqueKey& key, const GrSurfaceProxyView& view) {
+        void set(const skgpu::UniqueKey& key, const GrSurfaceProxyView& view) {
             SkASSERT(fTag == kEmpty);
             fKey = key;
             fView = view;
@@ -258,7 +259,7 @@ class GrThreadSafeCache {
             fTag = kEmpty;
         }
 
-        void set(const GrUniqueKey& key, sk_sp<VertexData> vertData) {
+        void set(const skgpu::UniqueKey& key, sk_sp<VertexData> vertData) {
             SkASSERT(fTag == kEmpty || fTag == kVertData);
             fKey = key;
             fVertData = vertData;
@@ -270,15 +271,15 @@ class GrThreadSafeCache {
         SK_DECLARE_INTERNAL_LLIST_INTERFACE(Entry);
 
         // for SkTDynamicHash
-        static const GrUniqueKey& GetKey(const Entry& e) {
+        static const skgpu::UniqueKey& GetKey(const Entry& e) {
             SkASSERT(e.fTag != kEmpty);
             return e.fKey;
         }
-        static uint32_t Hash(const GrUniqueKey& key) { return key.hash(); }
+        static uint32_t Hash(const skgpu::UniqueKey& key) { return key.hash(); }
 
     private:
         // Note: the unique key is stored here bc it is never attached to a proxy or a GrTexture
-        GrUniqueKey             fKey;
+        skgpu::UniqueKey             fKey;
         union {
             GrSurfaceProxyView  fView;
             sk_sp<VertexData>   fVertData;
@@ -294,27 +295,24 @@ class GrThreadSafeCache {
     void makeExistingEntryMRU(Entry*)  SK_REQUIRES(fSpinLock);
     Entry* makeNewEntryMRU(Entry*)  SK_REQUIRES(fSpinLock);
 
-    Entry* getEntry(const GrUniqueKey&, const GrSurfaceProxyView&)  SK_REQUIRES(fSpinLock);
-    Entry* getEntry(const GrUniqueKey&, sk_sp<VertexData>)  SK_REQUIRES(fSpinLock);
+    Entry* getEntry(const skgpu::UniqueKey&, const GrSurfaceProxyView&)  SK_REQUIRES(fSpinLock);
+    Entry* getEntry(const skgpu::UniqueKey&, sk_sp<VertexData>)  SK_REQUIRES(fSpinLock);
 
     void recycleEntry(Entry*)  SK_REQUIRES(fSpinLock);
 
     std::tuple<GrSurfaceProxyView, sk_sp<SkData>> internalFind(
-                                                        const GrUniqueKey&)  SK_REQUIRES(fSpinLock);
+            const skgpu::UniqueKey&)  SK_REQUIRES(fSpinLock);
     std::tuple<GrSurfaceProxyView, sk_sp<SkData>> internalAdd(
-                                                const GrUniqueKey&,
-                                                const GrSurfaceProxyView&)  SK_REQUIRES(fSpinLock);
+            const skgpu::UniqueKey&, const GrSurfaceProxyView&)  SK_REQUIRES(fSpinLock);
 
     std::tuple<sk_sp<VertexData>, sk_sp<SkData>> internalFindVerts(
-                                                        const GrUniqueKey&)  SK_REQUIRES(fSpinLock);
+            const skgpu::UniqueKey&)  SK_REQUIRES(fSpinLock);
     std::tuple<sk_sp<VertexData>, sk_sp<SkData>> internalAddVerts(
-                                                        const GrUniqueKey&,
-                                                        sk_sp<VertexData>,
-                                                        IsNewerBetter)  SK_REQUIRES(fSpinLock);
+            const skgpu::UniqueKey&, sk_sp<VertexData>, IsNewerBetter)  SK_REQUIRES(fSpinLock);
 
     mutable SkSpinlock fSpinLock;
 
-    SkTDynamicHash<Entry, GrUniqueKey> fUniquelyKeyedEntryMap  SK_GUARDED_BY(fSpinLock);
+    SkTDynamicHash<Entry, skgpu::UniqueKey> fUniquelyKeyedEntryMap  SK_GUARDED_BY(fSpinLock);
     // The head of this list is the MRU
     SkTInternalLList<Entry>            fUniquelyKeyedEntryList  SK_GUARDED_BY(fSpinLock);
 
diff --git a/third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h b/third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
index b36f894a5fcd7..c62726595ab9a 100644
--- a/third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
+++ b/third_party/skia/src/gpu/GrThreadSafePipelineBuilder.h
@@ -10,7 +10,6 @@
 
 #include "include/core/SkRefCnt.h"
 #include "include/gpu/GrConfig.h"
-#include <array>
 #include <atomic>
 
 #if GR_TEST_UTILS
@@ -78,10 +77,10 @@ class GrThreadSafePipelineBuilder : public SkRefCnt {
         std::atomic<int> fShaderCompilations{0};
 
         std::atomic<int> fNumInlineCompilationFailures{0};
-        std::array<std::atomic<int>, kNumProgramCacheResults> fInlineProgramCacheStats = {};
+        std::atomic<int> fInlineProgramCacheStats[kNumProgramCacheResults]{};
 
         std::atomic<int> fNumPreCompilationFailures{0};
-        std::array<std::atomic<int>, kNumProgramCacheResults> fPreProgramCacheStats = {};
+        std::atomic<int> fPreProgramCacheStats[kNumProgramCacheResults]{};
 
         std::atomic<int> fNumCompilationFailures{0};
         std::atomic<int> fNumPartialCompilationSuccesses{0};
diff --git a/third_party/skia/src/gpu/GrUniformDataManager.cpp b/third_party/skia/src/gpu/GrUniformDataManager.cpp
index 5c49193d6ede2..19a7df530d203 100644
--- a/third_party/skia/src/gpu/GrUniformDataManager.cpp
+++ b/third_party/skia/src/gpu/GrUniformDataManager.cpp
@@ -32,16 +32,16 @@ void* GrUniformDataManager::getBufferPtrAndMarkDirty(const Uniform& uni) const {
 int GrUniformDataManager::copyUniforms(void* dest,
                                        const void* src,
                                        int numUniforms,
-                                       GrSLType uniformType) const {
+                                       SkSLType uniformType) const {
     if (fWrite16BitUniforms) {
         switch (uniformType) {
-            case kHalf_GrSLType:
-            case kHalf2_GrSLType:
-            case kHalf3_GrSLType:
-            case kHalf4_GrSLType:
-            case kHalf2x2_GrSLType:
-            case kHalf3x3_GrSLType:
-            case kHalf4x4_GrSLType: {
+            case SkSLType::kHalf:
+            case SkSLType::kHalf2:
+            case SkSLType::kHalf3:
+            case SkSLType::kHalf4:
+            case SkSLType::kHalf2x2:
+            case SkSLType::kHalf3x3:
+            case SkSLType::kHalf4x4: {
                 const float* floatBits = static_cast<const float*>(src);
                 SkHalf* halfBits = static_cast<SkHalf*>(dest);
                 while (numUniforms-- > 0) {
@@ -50,14 +50,14 @@ int GrUniformDataManager::copyUniforms(void* dest,
                 return 2;
             }
 
-            case kShort_GrSLType:
-            case kShort2_GrSLType:
-            case kShort3_GrSLType:
-            case kShort4_GrSLType:
-            case kUShort_GrSLType:
-            case kUShort2_GrSLType:
-            case kUShort3_GrSLType:
-            case kUShort4_GrSLType: {
+            case SkSLType::kShort:
+            case SkSLType::kShort2:
+            case SkSLType::kShort3:
+            case SkSLType::kShort4:
+            case SkSLType::kUShort:
+            case SkSLType::kUShort2:
+            case SkSLType::kUShort3:
+            case SkSLType::kUShort4: {
                 const int32_t* intBits = static_cast<const int32_t*>(src);
                 short* shortBits = static_cast<short*>(dest);
                 while (numUniforms-- > 0) {
@@ -76,7 +76,7 @@ int GrUniformDataManager::copyUniforms(void* dest,
     return 4;
 }
 
-template <int N, GrSLType FullType, GrSLType HalfType>
+template <int N, SkSLType FullType, SkSLType HalfType>
 void GrUniformDataManager::set(UniformHandle u, const void* v) const {
     const Uniform& uni = fUniforms[u.toIndex()];
     SkASSERT(uni.fType == FullType || uni.fType == HalfType);
@@ -85,7 +85,7 @@ void GrUniformDataManager::set(UniformHandle u, const void* v) const {
     this->copyUniforms(buffer, v, N, uni.fType);
 }
 
-template <int N, GrSLType FullType, GrSLType HalfType>
+template <int N, SkSLType FullType, SkSLType HalfType>
 void GrUniformDataManager::setv(UniformHandle u, int arrayCount, const void* v) const {
     const Uniform& uni = fUniforms[u.toIndex()];
     SkASSERT(uni.fType == FullType || uni.fType == HalfType);
@@ -106,45 +106,45 @@ void GrUniformDataManager::setv(UniformHandle u, int arrayCount, const void* v)
 }
 
 void GrUniformDataManager::set1i(UniformHandle u, int32_t i0) const {
-    this->set<1, kInt_GrSLType, kShort_GrSLType>(u, &i0);
+    this->set<1, SkSLType::kInt, SkSLType::kShort>(u, &i0);
 }
 
 void GrUniformDataManager::set1iv(UniformHandle u,
                                   int arrayCount,
                                   const int32_t v[]) const {
-    this->setv<1, kInt_GrSLType, kShort_GrSLType>(u, arrayCount, v);
+    this->setv<1, SkSLType::kInt, SkSLType::kShort>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set1f(UniformHandle u, float v0) const {
-    this->set<1, kFloat_GrSLType, kHalf_GrSLType>(u, &v0);
+    this->set<1, SkSLType::kFloat, SkSLType::kHalf>(u, &v0);
 }
 
 void GrUniformDataManager::set1fv(UniformHandle u,
                                   int arrayCount,
                                   const float v[]) const {
-    this->setv<1, kFloat_GrSLType, kHalf_GrSLType>(u, arrayCount, v);
+    this->setv<1, SkSLType::kFloat, SkSLType::kHalf>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set2i(UniformHandle u, int32_t i0, int32_t i1) const {
     int32_t v[2] = { i0, i1 };
-    this->set<2, kInt2_GrSLType, kShort2_GrSLType>(u, v);
+    this->set<2, SkSLType::kInt2, SkSLType::kShort2>(u, v);
 }
 
 void GrUniformDataManager::set2iv(UniformHandle u,
                                   int arrayCount,
                                   const int32_t v[]) const {
-    this->setv<2, kInt2_GrSLType, kShort2_GrSLType>(u, arrayCount, v);
+    this->setv<2, SkSLType::kInt2, SkSLType::kShort2>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set2f(UniformHandle u, float v0, float v1) const {
     float v[2] = { v0, v1 };
-    this->set<2, kFloat2_GrSLType, kHalf2_GrSLType>(u, v);
+    this->set<2, SkSLType::kFloat2, SkSLType::kHalf2>(u, v);
 }
 
 void GrUniformDataManager::set2fv(UniformHandle u,
                                   int arrayCount,
                                   const float v[]) const {
-    this->setv<2, kFloat2_GrSLType, kHalf2_GrSLType>(u, arrayCount, v);
+    this->setv<2, SkSLType::kFloat2, SkSLType::kHalf2>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set3i(UniformHandle u,
@@ -152,24 +152,24 @@ void GrUniformDataManager::set3i(UniformHandle u,
                                  int32_t i1,
                                  int32_t i2) const {
     int32_t v[3] = { i0, i1, i2 };
-    this->set<3, kInt3_GrSLType, kShort3_GrSLType>(u, v);
+    this->set<3, SkSLType::kInt3, SkSLType::kShort3>(u, v);
 }
 
 void GrUniformDataManager::set3iv(UniformHandle u,
                                   int arrayCount,
                                   const int32_t v[]) const {
-    this->setv<3, kInt3_GrSLType, kShort3_GrSLType>(u, arrayCount, v);
+    this->setv<3, SkSLType::kInt3, SkSLType::kShort3>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set3f(UniformHandle u, float v0, float v1, float v2) const {
     float v[3] = { v0, v1, v2 };
-    this->set<3, kFloat3_GrSLType, kHalf3_GrSLType>(u, v);
+    this->set<3, SkSLType::kFloat3, SkSLType::kHalf3>(u, v);
 }
 
 void GrUniformDataManager::set3fv(UniformHandle u,
                                   int arrayCount,
                                   const float v[]) const {
-    this->setv<3, kFloat3_GrSLType, kHalf3_GrSLType>(u, arrayCount, v);
+    this->setv<3, SkSLType::kFloat3, SkSLType::kHalf3>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set4i(UniformHandle u,
@@ -178,13 +178,13 @@ void GrUniformDataManager::set4i(UniformHandle u,
                                  int32_t i2,
                                  int32_t i3) const {
     int32_t v[4] = { i0, i1, i2, i3 };
-    this->set<4, kInt4_GrSLType, kShort4_GrSLType>(u, v);
+    this->set<4, SkSLType::kInt4, SkSLType::kShort4>(u, v);
 }
 
 void GrUniformDataManager::set4iv(UniformHandle u,
                                   int arrayCount,
                                   const int32_t v[]) const {
-    this->setv<4, kInt4_GrSLType, kShort4_GrSLType>(u, arrayCount, v);
+    this->setv<4, SkSLType::kInt4, SkSLType::kShort4>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::set4f(UniformHandle u,
@@ -193,40 +193,40 @@ void GrUniformDataManager::set4f(UniformHandle u,
                                  float v2,
                                  float v3) const {
     float v[4] = { v0, v1, v2, v3 };
-    this->set<4, kFloat4_GrSLType, kHalf4_GrSLType>(u, v);
+    this->set<4, SkSLType::kFloat4, SkSLType::kHalf4>(u, v);
 }
 
 void GrUniformDataManager::set4fv(UniformHandle u,
                                   int arrayCount,
                                   const float v[]) const {
-    this->setv<4, kFloat4_GrSLType, kHalf4_GrSLType>(u, arrayCount, v);
+    this->setv<4, SkSLType::kFloat4, SkSLType::kHalf4>(u, arrayCount, v);
 }
 
 void GrUniformDataManager::setMatrix2f(UniformHandle u, const float matrix[]) const {
-    this->setMatrices<2, kFloat2x2_GrSLType, kHalf2x2_GrSLType>(u, 1, matrix);
+    this->setMatrices<2, SkSLType::kFloat2x2, SkSLType::kHalf2x2>(u, 1, matrix);
 }
 
 void GrUniformDataManager::setMatrix2fv(UniformHandle u, int arrayCount, const float m[]) const {
-    this->setMatrices<2, kFloat2x2_GrSLType, kHalf2x2_GrSLType>(u, arrayCount, m);
+    this->setMatrices<2, SkSLType::kFloat2x2, SkSLType::kHalf2x2>(u, arrayCount, m);
 }
 
 void GrUniformDataManager::setMatrix3f(UniformHandle u, const float matrix[]) const {
-    this->setMatrices<3, kFloat3x3_GrSLType, kHalf3x3_GrSLType>(u, 1, matrix);
+    this->setMatrices<3, SkSLType::kFloat3x3, SkSLType::kHalf3x3>(u, 1, matrix);
 }
 
 void GrUniformDataManager::setMatrix3fv(UniformHandle u, int arrayCount, const float m[]) const {
-    this->setMatrices<3, kFloat3x3_GrSLType, kHalf3x3_GrSLType>(u, arrayCount, m);
+    this->setMatrices<3, SkSLType::kFloat3x3, SkSLType::kHalf3x3>(u, arrayCount, m);
 }
 
 void GrUniformDataManager::setMatrix4f(UniformHandle u, const float matrix[]) const {
-    this->setMatrices<4, kFloat4x4_GrSLType, kHalf4x4_GrSLType>(u, 1, matrix);
+    this->setMatrices<4, SkSLType::kFloat4x4, SkSLType::kHalf4x4>(u, 1, matrix);
 }
 
 void GrUniformDataManager::setMatrix4fv(UniformHandle u, int arrayCount, const float m[]) const {
-    this->setMatrices<4, kFloat4x4_GrSLType, kHalf4x4_GrSLType>(u, arrayCount, m);
+    this->setMatrices<4, SkSLType::kFloat4x4, SkSLType::kHalf4x4>(u, arrayCount, m);
 }
 
-template <int N, GrSLType FullType, GrSLType HalfType>
+template <int N, SkSLType FullType, SkSLType HalfType>
 inline void GrUniformDataManager::setMatrices(UniformHandle u,
                                               int arrayCount,
                                               const float matrices[]) const {
diff --git a/third_party/skia/src/gpu/GrUniformDataManager.h b/third_party/skia/src/gpu/GrUniformDataManager.h
index dba80586f7e79..69eb17b7c555f 100644
--- a/third_party/skia/src/gpu/GrUniformDataManager.h
+++ b/third_party/skia/src/gpu/GrUniformDataManager.h
@@ -13,6 +13,7 @@
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkTArray.h"
 #include "src/core/SkAutoMalloc.h"
+#include "src/core/SkSLTypeShared.h"
 
 /**
  * Subclass of GrGLSLProgramDataManager used to store uniforms for a program in a CPU buffer that
@@ -54,19 +55,19 @@ class GrUniformDataManager : public GrGLSLProgramDataManager {
 protected:
     struct Uniform {
         uint32_t fOffset : 24;
-        GrSLType fType : 8;
+        SkSLType fType   : 8;
         SkDEBUGCODE(
             int  fArrayCount;
         );
     };
 
-    int copyUniforms(void* dest, const void* src, int numUniforms, GrSLType uniformType) const;
+    int copyUniforms(void* dest, const void* src, int numUniforms, SkSLType uniformType) const;
 
-    template <int N, GrSLType kFullType, GrSLType kHalfType>
+    template <int N, SkSLType kFullType, SkSLType kHalfType>
     inline void set(UniformHandle u, const void* v) const;
-    template <int N, GrSLType kFullType, GrSLType kHalfType>
+    template <int N, SkSLType kFullType, SkSLType kHalfType>
     inline void setv(UniformHandle u, int arrayCount, const void* v) const;
-    template <int N, GrSLType FullType, GrSLType HalfType>
+    template <int N, SkSLType FullType, SkSLType HalfType>
     inline void setMatrices(UniformHandle, int arrayCount, const float matrices[]) const;
 
     void* getBufferPtrAndMarkDirty(const Uniform& uni) const;
diff --git a/third_party/skia/src/gpu/GrUtil.h b/third_party/skia/src/gpu/GrUtil.h
index 431720c80fa27..f160f4ef21cb2 100644
--- a/third_party/skia/src/gpu/GrUtil.h
+++ b/third_party/skia/src/gpu/GrUtil.h
@@ -9,6 +9,8 @@
 
 #include "include/core/SkScalar.h"
 #include "include/core/SkTypes.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/core/SkSLTypeShared.h"
 
 class GrStyle;
 class SkMatrix;
@@ -45,4 +47,17 @@ GrIntelGpuFamily GrGetIntelGpuFamily(uint32_t deviceID);
 // If we can, we draw lots faster (raster device does this same test).
 bool GrIsStrokeHairlineOrEquivalent(const GrStyle&, const SkMatrix&, SkScalar* outCoverage);
 
+static inline SkSLType SkSLCombinedSamplerTypeForTextureType(GrTextureType type) {
+    switch (type) {
+        case GrTextureType::k2D:
+            return SkSLType::kTexture2DSampler;
+        case GrTextureType::kRectangle:
+            return SkSLType::kTexture2DRectSampler;
+        case GrTextureType::kExternal:
+            return SkSLType::kTextureExternalSampler;
+        default:
+            SK_ABORT("Unexpected texture type");
+    }
+}
+
 #endif
diff --git a/third_party/skia/src/gpu/GrVertexChunkArray.cpp b/third_party/skia/src/gpu/GrVertexChunkArray.cpp
index 27490f6469fa0..5a43227eb2fff 100644
--- a/third_party/skia/src/gpu/GrVertexChunkArray.cpp
+++ b/third_party/skia/src/gpu/GrVertexChunkArray.cpp
@@ -24,10 +24,10 @@ bool GrVertexChunkBuilder::allocChunk(int minCount) {
     fCurrChunkVertexCount = 0;
     GrVertexChunk* chunk = &fChunks->push_back();
     int minAllocCount = std::max(minCount, fMinVerticesPerChunk);
-    fCurrChunkVertexWriter = {fTarget->makeVertexSpaceAtLeast(fStride, minAllocCount,
-                                                                minAllocCount, &chunk->fBuffer,
-                                                                &chunk->fBase,
-                                                                &fCurrChunkVertexCapacity)};
+    fCurrChunkVertexWriter = fTarget->makeVertexWriterAtLeast(fStride, minAllocCount,
+                                                              minAllocCount, &chunk->fBuffer,
+                                                              &chunk->fBase,
+                                                              &fCurrChunkVertexCapacity);
     if (!fCurrChunkVertexWriter || !chunk->fBuffer || fCurrChunkVertexCapacity < minCount) {
         SkDebugf("WARNING: Failed to allocate vertex buffer for GrVertexChunk.\n");
         fChunks->pop_back();
diff --git a/third_party/skia/src/gpu/GrVertexChunkArray.h b/third_party/skia/src/gpu/GrVertexChunkArray.h
index 6ff36a64af1cd..5de51f3005bf3 100644
--- a/third_party/skia/src/gpu/GrVertexChunkArray.h
+++ b/third_party/skia/src/gpu/GrVertexChunkArray.h
@@ -54,7 +54,7 @@ class GrVertexChunkBuilder : SkNoncopyable {
         SkASSERT(count > 0);
         if (fCurrChunkVertexCount + count > fCurrChunkVertexCapacity && !this->allocChunk(count)) {
             SkDEBUGCODE(fLastAppendAmount = 0;)
-            return {nullptr};
+            return {};
         }
         SkASSERT(fCurrChunkVertexCount + count <= fCurrChunkVertexCapacity);
         fCurrChunkVertexCount += count;
diff --git a/third_party/skia/src/gpu/GrXferProcessor.cpp b/third_party/skia/src/gpu/GrXferProcessor.cpp
index c36048a1a6412..85351d04633d5 100644
--- a/third_party/skia/src/gpu/GrXferProcessor.cpp
+++ b/third_party/skia/src/gpu/GrXferProcessor.cpp
@@ -9,6 +9,7 @@
 
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrPipeline.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 
@@ -31,7 +32,7 @@ bool GrXferProcessor::hasSecondaryOutput() const {
 }
 
 void GrXferProcessor::addToKey(const GrShaderCaps& caps,
-                               GrProcessorKeyBuilder* b,
+                               skgpu::KeyBuilder* b,
                                const GrSurfaceOrigin* originIfDstTexture,
                                bool usesInputAttachmentForDstRead) const {
     uint32_t key = this->willReadDstColor() ? 0x1 : 0x0;
@@ -265,10 +266,10 @@ void ProgramImpl::emitCode(const EmitArgs& args) {
 }
 
 void ProgramImpl::emitWriteSwizzle(GrGLSLXPFragmentBuilder* x,
-                                   const GrSwizzle& swizzle,
+                                   const skgpu::Swizzle& swizzle,
                                    const char* outColor,
                                    const char* outColorSecondary) const {
-    if (GrSwizzle::RGBA() != swizzle) {
+    if (skgpu::Swizzle::RGBA() != swizzle) {
         x->codeAppendf("%s = %s.%s;", outColor, outColor, swizzle.asString().c_str());
         if (outColorSecondary) {
             x->codeAppendf("%s = %s.%s;",
diff --git a/third_party/skia/src/gpu/GrXferProcessor.h b/third_party/skia/src/gpu/GrXferProcessor.h
index f0490076ba9c2..cebc4298dd62b 100644
--- a/third_party/skia/src/gpu/GrXferProcessor.h
+++ b/third_party/skia/src/gpu/GrXferProcessor.h
@@ -68,11 +68,10 @@ class GrXferProcessor : public GrProcessor, public GrNonAtomicRef<GrXferProcesso
     class ProgramImpl;
 
     /**
-     * Adds a key on the GrProcessorKeyBuilder calls onAddToKey(...) to get the specific subclass's
-     * key.
+     * Adds a key on the skgpu::KeyBuilder calls onAddToKey(...) to get the specific subclass's key.
      */
     void addToKey(const GrShaderCaps&,
-                  GrProcessorKeyBuilder*,
+                  skgpu::KeyBuilder*,
                   const GrSurfaceOrigin* originIfDstTexture,
                   bool usesInputAttachmentForDstRead) const;
 
@@ -145,10 +144,10 @@ class GrXferProcessor : public GrProcessor, public GrNonAtomicRef<GrXferProcesso
 
 private:
     /**
-     * Adds a key on the GrProcessorKeyBuilder that reflects any variety in the code that may be
-     * emitted by the xfer processor subclass.
+     * Adds a key on the skgpu::KeyBuilder that reflects any variety in the code that may be emitted
+     * by the xfer processor subclass.
      */
-    virtual void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const = 0;
+    virtual void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const = 0;
 
     /**
      * If we are not performing a dst read, returns whether the subclass will set a secondary
@@ -296,7 +295,7 @@ class GrXferProcessor::ProgramImpl {
                  const char* outputSecondary,
                  const SamplerHandle dstTextureSamplerHandle,
                  GrSurfaceOrigin dstTextureOrigin,
-                 const GrSwizzle& writeSwizzle)
+                 const skgpu::Swizzle& writeSwizzle)
                 : fXPFragBuilder(fragBuilder)
                 , fUniformHandler(uniformHandler)
                 , fShaderCaps(caps)
@@ -318,7 +317,7 @@ class GrXferProcessor::ProgramImpl {
         const char* fOutputSecondary;
         const SamplerHandle fDstTextureSamplerHandle;
         GrSurfaceOrigin fDstTextureOrigin;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
     };
     /**
      * This is similar to emitCode() in the base class, except it takes a full shader builder.
@@ -372,7 +371,7 @@ class GrXferProcessor::ProgramImpl {
     }
 
     virtual void emitWriteSwizzle(GrGLSLXPFragmentBuilder*,
-                                  const GrSwizzle&,
+                                  const skgpu::Swizzle&,
                                   const char* outColor,
                                   const char* outColorSecondary) const;
 
diff --git a/third_party/skia/src/gpu/GrYUVATextureProxies.h b/third_party/skia/src/gpu/GrYUVATextureProxies.h
index c6c4a688df21d..9734d023f9756 100644
--- a/third_party/skia/src/gpu/GrYUVATextureProxies.h
+++ b/third_party/skia/src/gpu/GrYUVATextureProxies.h
@@ -58,7 +58,7 @@ class GrYUVATextureProxies {
     sk_sp<GrSurfaceProxy> refProxy(int i) const { return fProxies[i]; }
 
     GrSurfaceProxyView makeView(int i) const {
-        return {fProxies[i], fTextureOrigin, GrSwizzle::RGBA()};
+        return {fProxies[i], fTextureOrigin, skgpu::Swizzle::RGBA()};
     }
 
     bool isValid() const { return fYUVAInfo.isValid(); }
diff --git a/third_party/skia/src/gpu/KeyBuilder.h b/third_party/skia/src/gpu/KeyBuilder.h
new file mode 100644
index 0000000000000..b0848e4c625a3
--- /dev/null
+++ b/third_party/skia/src/gpu/KeyBuilder.h
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef skgpu_KeyBuilder_DEFINED
+#define skgpu_KeyBuilder_DEFINED
+
+#include "include/core/SkString.h"
+#include "include/private/SkTArray.h"
+
+namespace skgpu {
+
+class KeyBuilder {
+public:
+    KeyBuilder(SkTArray<uint32_t, true>* data) : fData(data) {}
+
+    virtual ~KeyBuilder() {
+        // Ensure that flush was called before we went out of scope
+        SkASSERT(fBitsUsed == 0);
+    }
+
+    virtual void addBits(uint32_t numBits, uint32_t val, const char* label) {
+        SkASSERT(numBits > 0 && numBits <= 32);
+        SkASSERT(numBits == 32 || (val < (1u << numBits)));
+
+        fCurValue |= (val << fBitsUsed);
+        fBitsUsed += numBits;
+
+        if (fBitsUsed >= 32) {
+            // Overflow, start a new working value
+            fData->push_back(fCurValue);
+            uint32_t excess = fBitsUsed - 32;
+            fCurValue = excess ? (val >> (numBits - excess)) : 0;
+            fBitsUsed = excess;
+        }
+
+        SkASSERT(fCurValue < (1u << fBitsUsed));
+    }
+
+    void addBytes(uint32_t numBytes, const void* data, const char* label) {
+        const uint8_t* bytes = reinterpret_cast<const uint8_t*>(data);
+        for (; numBytes --> 0; bytes++) {
+            this->addBits(8, *bytes, label);
+        }
+    }
+
+    void addBool(bool b, const char* label) {
+        this->addBits(1, b, label);
+    }
+
+    void add32(uint32_t v, const char* label = "unknown") {
+        this->addBits(32, v, label);
+    }
+
+    virtual void appendComment(const char* comment) {}
+
+    // Introduces a word-boundary in the key. Must be called before using the key with any cache,
+    // but can also be called to create a break between generic data and backend-specific data.
+    void flush() {
+        if (fBitsUsed) {
+            fData->push_back(fCurValue);
+            fCurValue = 0;
+            fBitsUsed = 0;
+        }
+    }
+
+private:
+    SkTArray<uint32_t, true>* fData;
+    uint32_t fCurValue = 0;
+    uint32_t fBitsUsed = 0;  // ... in current value
+};
+
+class StringKeyBuilder : public KeyBuilder {
+public:
+    StringKeyBuilder(SkTArray<uint32_t, true>* data) : KeyBuilder(data) {}
+
+    void addBits(uint32_t numBits, uint32_t val, const char* label) override {
+        KeyBuilder::addBits(numBits, val, label);
+        fDescription.appendf("%s: %u\n", label, val);
+    }
+
+    void appendComment(const char* comment) override {
+        fDescription.appendf("%s\n", comment);
+    }
+
+    SkString description() const { return fDescription; }
+
+private:
+    SkString fDescription;
+};
+
+} // namespace skgpu
+
+#endif // skgpu_KeyBuilder_DEFINED
diff --git a/third_party/skia/src/gpu/ResourceKey.cpp b/third_party/skia/src/gpu/ResourceKey.cpp
new file mode 100644
index 0000000000000..71cfb40b89d05
--- /dev/null
+++ b/third_party/skia/src/gpu/ResourceKey.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/core/SkOpts.h"
+#include "src/gpu/ResourceKey.h"
+
+namespace skgpu {
+
+ScratchKey::ResourceType ScratchKey::GenerateResourceType() {
+    static std::atomic<int32_t> nextType{ResourceKey::kInvalidDomain + 1};
+
+    int32_t type = nextType.fetch_add(1, std::memory_order_relaxed);
+    if (type > SkTo<int32_t>(UINT16_MAX)) {
+        SK_ABORT("Too many Resource Types");
+    }
+
+    return static_cast<ResourceType>(type);
+}
+
+UniqueKey::Domain UniqueKey::GenerateDomain() {
+    static std::atomic<int32_t> nextDomain{ResourceKey::kInvalidDomain + 1};
+
+    int32_t domain = nextDomain.fetch_add(1, std::memory_order_relaxed);
+    if (domain > SkTo<int32_t>(UINT16_MAX)) {
+        SK_ABORT("Too many skgpu::UniqueKey Domains");
+    }
+
+    return static_cast<Domain>(domain);
+}
+
+uint32_t ResourceKeyHash(const uint32_t* data, size_t size) {
+    return SkOpts::hash(data, size);
+}
+
+} // namespace skgpu
+
diff --git a/third_party/skia/include/private/GrResourceKey.h b/third_party/skia/src/gpu/ResourceKey.h
similarity index 70%
rename from third_party/skia/include/private/GrResourceKey.h
rename to third_party/skia/src/gpu/ResourceKey.h
index fab99782b4f38..42ee7f496159c 100644
--- a/third_party/skia/include/private/GrResourceKey.h
+++ b/third_party/skia/src/gpu/ResourceKey.h
@@ -5,25 +5,28 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrResourceKey_DEFINED
-#define GrResourceKey_DEFINED
+#ifndef skgpu_ResourceKey_DEFINED
+#define skgpu_ResourceKey_DEFINED
 
 #include "include/core/SkData.h"
 #include "include/core/SkString.h"
-#include "include/gpu/GrTypes.h"
 #include "include/private/SkOnce.h"
 #include "include/private/SkTemplates.h"
 #include "include/private/SkTo.h"
 
 #include <new>
 
-uint32_t GrResourceKeyHash(const uint32_t* data, size_t size);
+class TestResource;
+
+namespace skgpu {
+
+uint32_t ResourceKeyHash(const uint32_t* data, size_t size);
 
 /**
- * Base class for all GrGpuResource cache keys. There are two types of cache keys. Refer to the
+ * Base class for all gpu Resource cache keys. There are two types of cache keys. Refer to the
  * comments for each key type below.
  */
-class GrResourceKey {
+class ResourceKey {
 public:
     uint32_t hash() const {
         this->validate();
@@ -46,7 +49,7 @@ class GrResourceKey {
                 return;
             }
             uint32_t* hash = &fKey->fKey[kHash_MetaDataIdx];
-            *hash = GrResourceKeyHash(hash + 1, fKey->internalSize() - sizeof(uint32_t));
+            *hash = ResourceKeyHash(hash + 1, fKey->internalSize() - sizeof(uint32_t));
             fKey->validate();
             fKey = nullptr;
         }
@@ -59,7 +62,7 @@ class GrResourceKey {
         }
 
     protected:
-        Builder(GrResourceKey* key, uint32_t domain, int data32Count) : fKey(key) {
+        Builder(ResourceKey* key, uint32_t domain, int data32Count) : fKey(key) {
             size_t count = SkToSizeT(data32Count);
             SkASSERT(domain != kInvalidDomain);
             key->fKey.reset(kMetaDataCnt + count);
@@ -70,13 +73,13 @@ class GrResourceKey {
         }
 
     private:
-        GrResourceKey* fKey;
+        ResourceKey* fKey;
     };
 
 protected:
     static const uint32_t kInvalidDomain = 0;
 
-    GrResourceKey() { this->reset(); }
+    ResourceKey() { this->reset(); }
 
     /** Reset to an invalid key. */
     void reset() {
@@ -85,14 +88,14 @@ class GrResourceKey {
         fKey[kDomainAndSize_MetaDataIdx] = kInvalidDomain;
     }
 
-    bool operator==(const GrResourceKey& that) const {
+    bool operator==(const ResourceKey& that) const {
         // Both keys should be sized to at least contain the meta data. The metadata contains each
         // key's length. So the second memcmp should only run if the keys have the same length.
         return 0 == memcmp(fKey.get(), that.fKey.get(), kMetaDataCnt*sizeof(uint32_t)) &&
                0 == memcmp(&fKey[kMetaDataCnt], &that.fKey[kMetaDataCnt], this->dataSize());
     }
 
-    GrResourceKey& operator=(const GrResourceKey& that) {
+    ResourceKey& operator=(const ResourceKey& that) {
         if (this != &that) {
             if (!that.isValid()) {
                 this->reset();
@@ -152,12 +155,12 @@ class GrResourceKey {
     void validate() const {
         SkASSERT(this->isValid());
         SkASSERT(fKey[kHash_MetaDataIdx] ==
-                 GrResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
-                                   this->internalSize() - sizeof(uint32_t)));
+                 ResourceKeyHash(&fKey[kHash_MetaDataIdx] + 1,
+                                 this->internalSize() - sizeof(uint32_t)));
         SkASSERT(SkIsAlign4(this->internalSize()));
     }
 
-    friend class TestResource;  // For unit test to access kMetaDataCnt.
+    friend class ::TestResource;  // For unit test to access kMetaDataCnt.
 
     // bmp textures require 5 uint32_t values.
     SkAutoSTMalloc<kMetaDataCnt + 5, uint32_t> fKey;
@@ -184,10 +187,7 @@ class GrResourceKey {
  *  consume_blur(texture[0]);
  *  texture[0]->unref();  // texture 0 can now be recycled for the next request with scratchKey
  */
-class GrScratchKey : public GrResourceKey {
-private:
-    using INHERITED = GrResourceKey;
-
+class ScratchKey : public ResourceKey {
 public:
     /** Uniquely identifies the type of resource that is cached as scratch. */
     typedef uint32_t ResourceType;
@@ -196,29 +196,29 @@ class GrScratchKey : public GrResourceKey {
     static ResourceType GenerateResourceType();
 
     /** Creates an invalid scratch key. It must be initialized using a Builder object before use. */
-    GrScratchKey() {}
+    ScratchKey() {}
 
-    GrScratchKey(const GrScratchKey& that) { *this = that; }
+    ScratchKey(const ScratchKey& that) { *this = that; }
 
     /** reset() returns the key to the invalid state. */
-    using INHERITED::reset;
+    using ResourceKey::reset;
 
-    using INHERITED::isValid;
+    using ResourceKey::isValid;
 
     ResourceType resourceType() const { return this->domain(); }
 
-    GrScratchKey& operator=(const GrScratchKey& that) {
-        this->INHERITED::operator=(that);
+    ScratchKey& operator=(const ScratchKey& that) {
+        this->ResourceKey::operator=(that);
         return *this;
     }
 
-    bool operator==(const GrScratchKey& that) const { return this->INHERITED::operator==(that); }
-    bool operator!=(const GrScratchKey& that) const { return !(*this == that); }
+    bool operator==(const ScratchKey& that) const { return this->ResourceKey::operator==(that); }
+    bool operator!=(const ScratchKey& that) const { return !(*this == that); }
 
-    class Builder : public INHERITED::Builder {
+    class Builder : public ResourceKey::Builder {
     public:
-        Builder(GrScratchKey* key, ResourceType type, int data32Count)
-                : INHERITED::Builder(key, type, data32Count) {}
+        Builder(ScratchKey* key, ResourceType type, int data32Count)
+                : ResourceKey::Builder(key, type, data32Count) {}
     };
 };
 
@@ -236,34 +236,31 @@ class GrScratchKey : public GrResourceKey {
  * Unique keys preempt scratch keys. While a resource has a unique key it is inaccessible via its
  * scratch key. It can become scratch again if the unique key is removed.
  */
-class GrUniqueKey : public GrResourceKey {
-private:
-    using INHERITED = GrResourceKey;
-
+class UniqueKey : public ResourceKey {
 public:
     typedef uint32_t Domain;
     /** Generate a Domain for unique keys. */
     static Domain GenerateDomain();
 
     /** Creates an invalid unique key. It must be initialized using a Builder object before use. */
-    GrUniqueKey() : fTag(nullptr) {}
+    UniqueKey() : fTag(nullptr) {}
 
-    GrUniqueKey(const GrUniqueKey& that) { *this = that; }
+    UniqueKey(const UniqueKey& that) { *this = that; }
 
     /** reset() returns the key to the invalid state. */
-    using INHERITED::reset;
+    using ResourceKey::reset;
 
-    using INHERITED::isValid;
+    using ResourceKey::isValid;
 
-    GrUniqueKey& operator=(const GrUniqueKey& that) {
-        this->INHERITED::operator=(that);
+    UniqueKey& operator=(const UniqueKey& that) {
+        this->ResourceKey::operator=(that);
         this->setCustomData(sk_ref_sp(that.getCustomData()));
         fTag = that.fTag;
         return *this;
     }
 
-    bool operator==(const GrUniqueKey& that) const { return this->INHERITED::operator==(that); }
-    bool operator!=(const GrUniqueKey& that) const { return !(*this == that); }
+    bool operator==(const UniqueKey& that) const { return this->ResourceKey::operator==(that); }
+    bool operator!=(const UniqueKey& that) const { return !(*this == that); }
 
     void setCustomData(sk_sp<SkData> data) { fData = std::move(data); }
     SkData* getCustomData() const { return fData.get(); }
@@ -274,21 +271,23 @@ class GrUniqueKey : public GrResourceKey {
 #ifdef SK_DEBUG
     void dump(const char* label) const {
         SkDebugf("%s tag: %s\n", label, fTag ? fTag : "None");
-        this->INHERITED::dump();
+        this->ResourceKey::dump();
     }
 #endif
 
-    class Builder : public INHERITED::Builder {
+    class Builder : public ResourceKey::Builder {
     public:
-        Builder(GrUniqueKey* key, Domain type, int data32Count, const char* tag = nullptr)
-                : INHERITED::Builder(key, type, data32Count) {
+        Builder(UniqueKey* key, Domain type, int data32Count, const char* tag = nullptr)
+                : ResourceKey::Builder(key, type, data32Count) {
             key->fTag = tag;
         }
 
         /** Used to build a key that wraps another key and adds additional data. */
-        Builder(GrUniqueKey* key, const GrUniqueKey& innerKey, Domain domain, int extraData32Cnt,
+        Builder(UniqueKey* key, const UniqueKey& innerKey, Domain domain, int extraData32Cnt,
                 const char* tag = nullptr)
-                : INHERITED::Builder(key, domain, Data32CntForInnerKey(innerKey) + extraData32Cnt) {
+                : ResourceKey::Builder(key,
+                                       domain,
+                                       Data32CntForInnerKey(innerKey) + extraData32Cnt) {
             SkASSERT(&innerKey != key);
             // add the inner key to the end of the key so that op[] can be indexed normally.
             uint32_t* innerKeyData = &this->operator[](extraData32Cnt);
@@ -299,7 +298,7 @@ class GrUniqueKey : public GrResourceKey {
         }
 
     private:
-        static int Data32CntForInnerKey(const GrUniqueKey& innerKey) {
+        static int Data32CntForInnerKey(const UniqueKey& innerKey) {
             // key data + domain
             return SkToInt((innerKey.dataSize() >> 2) + 1);
         }
@@ -311,52 +310,56 @@ class GrUniqueKey : public GrResourceKey {
 };
 
 /**
- * It is common to need a frequently reused GrUniqueKey where the only requirement is that the key
+ * It is common to need a frequently reused UniqueKey where the only requirement is that the key
  * is unique. These macros create such a key in a thread safe manner so the key can be truly global
  * and only constructed once.
  */
 
 /** Place outside of function/class definitions. */
-#define GR_DECLARE_STATIC_UNIQUE_KEY(name) static SkOnce name##_once
+#define SKGPU_DECLARE_STATIC_UNIQUE_KEY(name) static SkOnce name##_once
 
 /** Place inside function where the key is used. */
-#define GR_DEFINE_STATIC_UNIQUE_KEY(name)                         \
-    static SkAlignedSTStorage<1, GrUniqueKey> name##_storage;     \
-    name##_once(gr_init_static_unique_key_once, &name##_storage); \
-    static const GrUniqueKey& name = *reinterpret_cast<GrUniqueKey*>(name##_storage.get())
-
-static inline void gr_init_static_unique_key_once(SkAlignedSTStorage<1, GrUniqueKey>* keyStorage) {
-    GrUniqueKey* key = new (keyStorage->get()) GrUniqueKey;
-    GrUniqueKey::Builder builder(key, GrUniqueKey::GenerateDomain(), 0);
+#define SKGPU_DEFINE_STATIC_UNIQUE_KEY(name)                                \
+    static SkAlignedSTStorage<1, skgpu::UniqueKey> name##_storage;          \
+    name##_once(skgpu::skgpu_init_static_unique_key_once, &name##_storage); \
+    static const skgpu::UniqueKey& name =                                   \
+        *reinterpret_cast<skgpu::UniqueKey*>(name##_storage.get())
+
+static inline void skgpu_init_static_unique_key_once(SkAlignedSTStorage<1, UniqueKey>* keyStorage) {
+    UniqueKey* key = new (keyStorage->get()) UniqueKey;
+    UniqueKey::Builder builder(key, UniqueKey::GenerateDomain(), 0);
 }
 
 // The cache listens for these messages to purge junk resources proactively.
-class GrUniqueKeyInvalidatedMessage {
+class UniqueKeyInvalidatedMessage {
 public:
-    GrUniqueKeyInvalidatedMessage() = default;
-    GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key, uint32_t contextUniqueID,
-                                  bool inThreadSafeCache = false)
+    UniqueKeyInvalidatedMessage() = default;
+    UniqueKeyInvalidatedMessage(const UniqueKey& key,
+                                uint32_t contextUniqueID,
+                                bool inThreadSafeCache = false)
             : fKey(key), fContextID(contextUniqueID), fInThreadSafeCache(inThreadSafeCache) {
         SkASSERT(SK_InvalidUniqueID != contextUniqueID);
     }
 
-    GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage&) = default;
+    UniqueKeyInvalidatedMessage(const UniqueKeyInvalidatedMessage&) = default;
 
-    GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage&) = default;
+    UniqueKeyInvalidatedMessage& operator=(const UniqueKeyInvalidatedMessage&) = default;
 
-    const GrUniqueKey& key() const { return fKey; }
+    const UniqueKey& key() const { return fKey; }
     uint32_t contextID() const { return fContextID; }
     bool inThreadSafeCache() const { return fInThreadSafeCache; }
 
 private:
-    GrUniqueKey fKey;
+    UniqueKey fKey;
     uint32_t fContextID = SK_InvalidUniqueID;
     bool fInThreadSafeCache = false;
 };
 
-static inline bool SkShouldPostMessageToBus(const GrUniqueKeyInvalidatedMessage& msg,
+static inline bool SkShouldPostMessageToBus(const UniqueKeyInvalidatedMessage& msg,
                                             uint32_t msgBusUniqueID) {
     return msg.contextID() == msgBusUniqueID;
 }
 
-#endif
+} // namespace skgpu
+
+#endif // skgpu_ResourceKey_DEFINED
diff --git a/third_party/skia/src/gpu/ShaderErrorHandler.cpp b/third_party/skia/src/gpu/ShaderErrorHandler.cpp
new file mode 100644
index 0000000000000..fac8847ef2910
--- /dev/null
+++ b/third_party/skia/src/gpu/ShaderErrorHandler.cpp
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/gpu/ShaderErrorHandler.h"
+
+#include "src/utils/SkShaderUtils.h"
+
+namespace skgpu {
+
+ShaderErrorHandler* DefaultShaderErrorHandler() {
+    class DefaultShaderErrorHandler : public ShaderErrorHandler {
+    public:
+        void compileError(const char* shader, const char* errors) override {
+            std::string message = SkShaderUtils::BuildShaderErrorMessage(shader, errors);
+            SkShaderUtils::VisitLineByLine(message, [](int, const char* lineText) {
+                SkDebugf("%s\n", lineText);
+            });
+            SkDEBUGFAIL("Shader compilation failed!");
+        }
+    };
+
+    static DefaultShaderErrorHandler gHandler;
+    return &gHandler;
+}
+
+}  // namespace SkShaderUtils
diff --git a/third_party/skia/src/gpu/SkGr.cpp b/third_party/skia/src/gpu/SkGr.cpp
index 475ded94b1136..930147fb9bd0e 100644
--- a/third_party/skia/src/gpu/SkGr.cpp
+++ b/third_party/skia/src/gpu/SkGr.cpp
@@ -48,12 +48,12 @@
 #include "src/image/SkImage_Base.h"
 #include "src/shaders/SkShaderBase.h"
 
-void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& imageBounds) {
+void GrMakeKeyFromImageID(skgpu::UniqueKey* key, uint32_t imageID, const SkIRect& imageBounds) {
     SkASSERT(key);
     SkASSERT(imageID);
     SkASSERT(!imageBounds.isEmpty());
-    static const GrUniqueKey::Domain kImageIDDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey::Builder builder(key, kImageIDDomain, 5, "Image");
+    static const skgpu::UniqueKey::Domain kImageIDDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey::Builder builder(key, kImageIDDomain, 5, "Image");
     builder[0] = imageID;
     builder[1] = imageBounds.fLeft;
     builder[2] = imageBounds.fTop;
@@ -63,18 +63,19 @@ void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& ima
 
 ////////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkIDChangeListener> GrMakeUniqueKeyInvalidationListener(GrUniqueKey* key,
+sk_sp<SkIDChangeListener> GrMakeUniqueKeyInvalidationListener(skgpu::UniqueKey* key,
                                                               uint32_t contextID) {
     class Listener : public SkIDChangeListener {
     public:
-        Listener(const GrUniqueKey& key, uint32_t contextUniqueID) : fMsg(key, contextUniqueID) {}
+        Listener(const skgpu::UniqueKey& key, uint32_t contextUniqueID)
+                : fMsg(key, contextUniqueID) {}
 
         void changed() override {
-            SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(fMsg);
+            SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Post(fMsg);
         }
 
     private:
-        GrUniqueKeyInvalidatedMessage fMsg;
+        skgpu::UniqueKeyInvalidatedMessage fMsg;
     };
 
     auto listener = sk_make_sp<Listener>(*key, contextID);
@@ -176,7 +177,7 @@ GrMakeCachedBitmapProxyView(GrRecordingContext* rContext,
     GrProxyProvider* proxyProvider = rContext->priv().proxyProvider();
     const GrCaps* caps = rContext->priv().caps();
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     SkIPoint origin = bitmap.pixelRefOrigin();
     SkIRect subset = SkIRect::MakePtSize(origin, bitmap.dimensions());
     GrMakeKeyFromImageID(&key, bitmap.pixelRef()->getGenerationID(), subset);
@@ -205,7 +206,7 @@ GrMakeCachedBitmapProxyView(GrRecordingContext* rContext,
         installKey(proxy.get());
     }
 
-    GrSwizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
+    skgpu::Swizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
     if (mipmapped == GrMipmapped::kNo || proxy->mipmapped() == GrMipmapped::kYes) {
         return {{std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle}, ct};
     }
@@ -244,7 +245,7 @@ GrMakeUncachedBitmapProxyView(GrRecordingContext* rContext,
     GrColorType ct = choose_bmp_texture_colortype(caps, bitmap);
 
     if (auto proxy = make_bmp_proxy(proxyProvider, bitmap, ct, mipmapped, fit, budgeted)) {
-        GrSwizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
+        skgpu::Swizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
         SkASSERT(mipmapped == GrMipmapped::kNo || proxy->mipmapped() == GrMipmapped::kYes);
         return {{std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle}, ct};
     }
@@ -271,7 +272,7 @@ SkColor4f SkColor4fPrepForDst(SkColor4f color, const GrColorInfo& colorInfo) {
 
 static inline bool blender_requires_shader(const SkBlender* blender) {
     SkASSERT(blender);
-    skstd::optional<SkBlendMode> mode = as_BB(blender)->asBlendMode();
+    std::optional<SkBlendMode> mode = as_BB(blender)->asBlendMode();
     return !mode.has_value() || *mode != SkBlendMode::kDst;
 }
 
@@ -295,6 +296,7 @@ static inline float dither_range_for_config(GrColorType dstColorType) {
         case GrColorType::kGrayAlpha_88:
         case GrColorType::kGray_8xxx:
         case GrColorType::kR_8:
+        case GrColorType::kR_8xxx:
         case GrColorType::kRG_88:
         case GrColorType::kRGB_888:
         case GrColorType::kRGB_888x:
@@ -418,7 +420,7 @@ static inline bool skpaint_to_grpaint_impl(
         const GrColorInfo& dstColorInfo,
         const SkPaint& skPaint,
         const SkMatrixProvider& matrixProvider,
-        skstd::optional<std::unique_ptr<GrFragmentProcessor>> shaderFP,
+        std::optional<std::unique_ptr<GrFragmentProcessor>> shaderFP,
         SkBlender* primColorBlender,
         GrPaint* grPaint) {
     // Convert SkPaint color to 4f format in the destination color space
@@ -546,7 +548,10 @@ static inline bool skpaint_to_grpaint_impl(
 
 #ifndef SK_IGNORE_GPU_DITHER
     GrColorType ct = dstColorInfo.colorType();
-    if (SkPaintPriv::ShouldDither(skPaint, GrColorTypeToSkColorType(ct)) && paintFP != nullptr) {
+    // Checking shaderFP.has_value() detects the SkPaintToGrPaintReplaceShader scenario even if the
+    // parameter was initialized with a nullptr (signaling a GP varying color).
+    const bool shaderOverride = SkToBool(paintFP) && (shaderFP.has_value() || primColorBlender);
+    if (SkPaintPriv::ShouldDither(skPaint, GrColorTypeToSkColorType(ct), shaderOverride)) {
         float ditherRange = dither_range_for_config(ct);
         paintFP = make_dither_effect(
                 context, std::move(paintFP), ditherRange, context->priv().caps());
@@ -601,7 +606,7 @@ bool SkPaintToGrPaint(GrRecordingContext* context,
                                    dstColorInfo,
                                    skPaint,
                                    matrixProvider,
-                                   /*shaderFP=*/skstd::nullopt,
+                                   /*shaderFP=*/std::nullopt,
                                    /*primColorBlender=*/nullptr,
                                    grPaint);
 }
@@ -634,7 +639,7 @@ bool SkPaintToGrPaintWithBlend(GrRecordingContext* context,
                                    dstColorInfo,
                                    skPaint,
                                    matrixProvider,
-                                   /*shaderFP=*/skstd::nullopt,
+                                   /*shaderFP=*/std::nullopt,
                                    primColorBlender,
                                    grPaint);
 }
diff --git a/third_party/skia/src/gpu/SkGr.h b/third_party/skia/src/gpu/SkGr.h
index 54d0ede7f1b89..d1fc5a7f7a5f5 100644
--- a/third_party/skia/src/gpu/SkGr.h
+++ b/third_party/skia/src/gpu/SkGr.h
@@ -30,7 +30,6 @@ class GrPaint;
 class GrRecordingContext;
 class GrResourceProvider;
 class GrTextureProxy;
-class GrUniqueKey;
 class SkBitmap;
 class SkData;
 class SkMatrix;
@@ -40,6 +39,10 @@ class SkPixelRef;
 class SkPixmap;
 struct SkIRect;
 
+namespace skgpu {
+class UniqueKey;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Color type conversions
 
@@ -187,15 +190,16 @@ GrMakeUncachedBitmapProxyView(GrRecordingContext*,
  *      - SkImage
  *      - SkImageGenerator
  */
-void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& imageBounds);
+void GrMakeKeyFromImageID(skgpu::UniqueKey* key, uint32_t imageID, const SkIRect& imageBounds);
 
 /**
- * Makes a SkIDChangeListener from a GrUniqueKey. The key will be invalidated in the resource
+ * Makes a SkIDChangeListener from a skgpu::UniqueKey. The key will be invalidated in the resource
  * cache if the ID becomes invalid. This also modifies the key so that it will cause the listener
  * to be deregistered if the key is destroyed (to prevent unbounded listener growth when resources
  * are purged before listeners trigger).
  */
-sk_sp<SkIDChangeListener> GrMakeUniqueKeyInvalidationListener(GrUniqueKey*, uint32_t contextID);
+sk_sp<SkIDChangeListener> GrMakeUniqueKeyInvalidationListener(skgpu::UniqueKey*,
+                                                              uint32_t contextID);
 
 static inline bool GrValidCubicResampler(SkCubicResampler cubic) {
     return cubic.B >= 0 && cubic.C >= 0;
diff --git a/third_party/skia/src/gpu/SkRenderEngineAbortf.h b/third_party/skia/src/gpu/SkRenderEngineAbortf.h
new file mode 100644
index 0000000000000..10cb491128a0c
--- /dev/null
+++ b/third_party/skia/src/gpu/SkRenderEngineAbortf.h
@@ -0,0 +1,26 @@
+/*
+* Copyright 2021 Google LLC
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#ifndef SkRenderEngineAbortf_DEFINED
+#define SkRenderEngineAbortf_DEFINED
+
+#include "include/core/SkTypes.h"
+
+#ifdef SK_IN_RENDERENGINE
+    #include "log/log_main.h"
+
+    #ifdef LOG_TAG
+        #undef LOG_TAG
+    #endif
+    #define LOG_TAG "Skia_in_RenderEngine"
+
+    #define RENDERENGINE_ABORTF(...) LOG_ALWAYS_FATAL(__VA_ARGS__)
+#else
+    #define RENDERENGINE_ABORTF(...)
+#endif
+
+#endif// SkRenderEngineAbortf_DEFINED
diff --git a/third_party/skia/src/gpu/SurfaceContext.cpp b/third_party/skia/src/gpu/SurfaceContext.cpp
index f1f815d32607f..8b2d621ab5947 100644
--- a/third_party/skia/src/gpu/SurfaceContext.cpp
+++ b/third_party/skia/src/gpu/SurfaceContext.cpp
@@ -30,7 +30,7 @@
 #include "src/gpu/effects/GrBicubicEffect.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 
-#define ASSERT_SINGLE_OWNER         GR_ASSERT_SINGLE_OWNER(this->singleOwner())
+#define ASSERT_SINGLE_OWNER         SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
 #define RETURN_FALSE_IF_ABANDONED   if (this->fContext->abandoned()) { return false;   }
 #define RETURN_NULLPTR_IF_ABANDONED if (this->fContext->abandoned()) { return nullptr; }
 
@@ -54,7 +54,7 @@ const GrDrawingManager* SurfaceContext::drawingManager() const {
 }
 
 #ifdef SK_DEBUG
-GrSingleOwner* SurfaceContext::singleOwner() const { return fContext->priv().singleOwner(); }
+skgpu::SingleOwner* SurfaceContext::singleOwner() const { return fContext->priv().singleOwner(); }
 #endif
 
 static bool alpha_types_compatible(SkAlphaType srcAlphaType, SkAlphaType dstAlphaType) {
@@ -160,7 +160,7 @@ bool SurfaceContext::readPixels(GrDirectContext* dContext, GrPixmap dst, SkIPoin
                 fp = dContext->priv().createPMToUPMEffect(GrTextureEffect::Make(
                         this->readSurfaceView(), this->colorInfo().alphaType()));
                 if (dst.colorType() == GrColorType::kBGRA_8888) {
-                    fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), GrSwizzle::BGRA());
+                    fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), skgpu::Swizzle::BGRA());
                     dst = GrPixmap(dst.info().makeColorType(GrColorType::kRGBA_8888),
                                    dst.addr(),
                                    dst.rowBytes());
@@ -395,7 +395,7 @@ bool SurfaceContext::internalWritePixels(GrDirectContext* dContext,
     if ((!caps->surfaceSupportsWritePixels(dstSurface) || canvas2DFastPath) && numLevels == 1) {
         GrColorInfo tempColorInfo;
         GrBackendFormat format;
-        GrSwizzle tempReadSwizzle;
+        skgpu::Swizzle tempReadSwizzle;
         if (canvas2DFastPath) {
             tempColorInfo = {GrColorType::kRGBA_8888,
                              kUnpremul_SkAlphaType,
@@ -453,7 +453,7 @@ bool SurfaceContext::internalWritePixels(GrDirectContext* dContext,
                         GrTextureEffect::Make(std::move(tempView), tempColorInfo.alphaType()));
                 // Important: check the original src color type here!
                 if (origSrcBase.colorType() == GrColorType::kBGRA_8888) {
-                    fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), GrSwizzle::BGRA());
+                    fp = GrFragmentProcessor::SwizzleOutput(std::move(fp), skgpu::Swizzle::BGRA());
                 }
             } else {
                 fp = GrTextureEffect::Make(std::move(tempView), tempColorInfo.alphaType());
diff --git a/third_party/skia/src/gpu/SurfaceContext.h b/third_party/skia/src/gpu/SurfaceContext.h
index 675fffb0601cd..a1e99e1ad1164 100644
--- a/third_party/skia/src/gpu/SurfaceContext.h
+++ b/third_party/skia/src/gpu/SurfaceContext.h
@@ -24,7 +24,6 @@
 class GrDrawingManager;
 class GrRecordingContext;
 class GrRenderTargetProxy;
-class GrSingleOwner;
 class GrSurface;
 class GrSurfaceProxy;
 class GrTextureProxy;
@@ -32,7 +31,7 @@ struct SkIPoint;
 struct SkIRect;
 
 namespace skgpu {
-
+class SingleOwner;
 class SurfaceFillContext;
 
 /**
@@ -63,7 +62,7 @@ class SurfaceContext {
     GrImageInfo imageInfo() const { return {fColorInfo, fReadView.proxy()->dimensions()}; }
 
     GrSurfaceOrigin origin() const { return fReadView.origin(); }
-    GrSwizzle readSwizzle() const { return fReadView.swizzle(); }
+    skgpu::Swizzle readSwizzle() const { return fReadView.swizzle(); }
     // TODO: See if it makes sense for this to return a const& instead and require the callers to
     // make a copy (which refs the proxy) if needed.
     GrSurfaceProxyView readSurfaceView() { return fReadView; }
@@ -189,7 +188,7 @@ class SurfaceContext {
 
     SkDEBUGCODE(void validate() const;)
 
-    SkDEBUGCODE(GrSingleOwner* singleOwner() const;)
+    SkDEBUGCODE(skgpu::SingleOwner* singleOwner() const;)
 
     GrRecordingContext* fContext;
 
diff --git a/third_party/skia/src/gpu/SurfaceFillContext.h b/third_party/skia/src/gpu/SurfaceFillContext.h
index 65bfca1b032fb..c74c048942e0f 100644
--- a/third_party/skia/src/gpu/SurfaceFillContext.h
+++ b/third_party/skia/src/gpu/SurfaceFillContext.h
@@ -23,6 +23,8 @@ class SurfaceFillContext : public SurfaceContext {
      */
     virtual void discard() = 0;
 
+    virtual void resolveMSAA() = 0;
+
     /**
      * Clear the rect of the render target to the given color.
      * @param rect  the rect to clear to
diff --git a/third_party/skia/src/gpu/GrSwizzle.cpp b/third_party/skia/src/gpu/Swizzle.cpp
similarity index 71%
rename from third_party/skia/src/gpu/GrSwizzle.cpp
rename to third_party/skia/src/gpu/Swizzle.cpp
index 3bef983b11f5d..4aaec3a6adde0 100644
--- a/third_party/skia/src/gpu/GrSwizzle.cpp
+++ b/third_party/skia/src/gpu/Swizzle.cpp
@@ -5,24 +5,29 @@
  * found in the LICENSE file.
  */
 
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 
 #include "src/core/SkRasterPipeline.h"
 
-void GrSwizzle::apply(SkRasterPipeline* pipeline) const {
+namespace skgpu {
+
+void Swizzle::apply(SkRasterPipeline* pipeline) const {
     SkASSERT(pipeline);
     switch (fKey) {
-        case GrSwizzle("rgba").asKey():
+        case Swizzle("rgba").asKey():
             return;
-        case GrSwizzle("bgra").asKey():
+        case Swizzle("bgra").asKey():
             pipeline->append(SkRasterPipeline::swap_rb);
             return;
-        case GrSwizzle("aaa1").asKey():
+        case Swizzle("aaa1").asKey():
             pipeline->append(SkRasterPipeline::alpha_to_gray);
             return;
-        case GrSwizzle("rgb1").asKey():
+        case Swizzle("rgb1").asKey():
             pipeline->append(SkRasterPipeline::force_opaque);
             return;
+        case Swizzle("a001").asKey():
+            pipeline->append(SkRasterPipeline::alpha_to_red);
+            return;
         default: {
             static_assert(sizeof(uintptr_t) >= 4 * sizeof(char));
             // Rather than allocate the 4 control bytes on the heap somewhere, just jam them right
@@ -35,7 +40,7 @@ void GrSwizzle::apply(SkRasterPipeline* pipeline) const {
     }
 }
 
-SkString GrSwizzle::asString() const {
+SkString Swizzle::asString() const {
     char swiz[5];
     uint16_t key = fKey;
     for (int i = 0; i < 4; ++i) {
@@ -45,3 +50,5 @@ SkString GrSwizzle::asString() const {
     swiz[4] = '\0';
     return SkString(swiz);
 }
+
+} // namespace skgpu
diff --git a/third_party/skia/src/gpu/GrSwizzle.h b/third_party/skia/src/gpu/Swizzle.h
similarity index 69%
rename from third_party/skia/src/gpu/GrSwizzle.h
rename to third_party/skia/src/gpu/Swizzle.h
index 9a8edbe0550d6..7ffe34f412abc 100644
--- a/third_party/skia/src/gpu/GrSwizzle.h
+++ b/third_party/skia/src/gpu/Swizzle.h
@@ -5,28 +5,29 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrSwizzle_DEFINED
-#define GrSwizzle_DEFINED
+#ifndef skgpu_Swizzle_DEFINED
+#define skgpu_Swizzle_DEFINED
 
 #include "include/core/SkString.h"
 #include "include/private/SkColorData.h"
-#include "src/gpu/GrColor.h"
 
 class SkRasterPipeline;
 
+namespace skgpu {
+
 /** Represents a rgba swizzle. It can be converted either into a string or a eight bit int. */
-class GrSwizzle {
+class Swizzle {
 public:
-    constexpr GrSwizzle() : GrSwizzle("rgba") {}
-    explicit constexpr GrSwizzle(const char c[4]);
+    constexpr Swizzle() : Swizzle("rgba") {}
+    explicit constexpr Swizzle(const char c[4]);
 
-    constexpr GrSwizzle(const GrSwizzle&);
-    constexpr GrSwizzle& operator=(const GrSwizzle& that);
+    constexpr Swizzle(const Swizzle&);
+    constexpr Swizzle& operator=(const Swizzle& that);
 
-    static constexpr GrSwizzle Concat(const GrSwizzle& a, const GrSwizzle& b);
+    static constexpr Swizzle Concat(const Swizzle& a, const Swizzle& b);
 
-    constexpr bool operator==(const GrSwizzle& that) const { return fKey == that.fKey; }
-    constexpr bool operator!=(const GrSwizzle& that) const { return !(*this == that); }
+    constexpr bool operator==(const Swizzle& that) const { return fKey == that.fKey; }
+    constexpr bool operator!=(const Swizzle& that) const { return !(*this == that); }
 
     /** Compact representation of the swizzle suitable for a key. */
     constexpr uint16_t asKey() const { return fKey; }
@@ -52,13 +53,13 @@ class GrSwizzle {
 
     void apply(SkRasterPipeline*) const;
 
-    static constexpr GrSwizzle RGBA() { return GrSwizzle("rgba"); }
-    static constexpr GrSwizzle BGRA() { return GrSwizzle("bgra"); }
-    static constexpr GrSwizzle RRRA() { return GrSwizzle("rrra"); }
-    static constexpr GrSwizzle RGB1() { return GrSwizzle("rgb1"); }
+    static constexpr Swizzle RGBA() { return Swizzle("rgba"); }
+    static constexpr Swizzle BGRA() { return Swizzle("bgra"); }
+    static constexpr Swizzle RRRA() { return Swizzle("rrra"); }
+    static constexpr Swizzle RGB1() { return Swizzle("rgb1"); }
 
 private:
-    explicit constexpr GrSwizzle(uint16_t key) : fKey(key) {}
+    explicit constexpr Swizzle(uint16_t key) : fKey(key) {}
 
     static constexpr float ComponentIndexToFloat(std::array<float, 4>, int idx);
     static constexpr int CToI(char c);
@@ -67,18 +68,18 @@ class GrSwizzle {
     uint16_t fKey;
 };
 
-constexpr GrSwizzle::GrSwizzle(const char c[4])
+constexpr Swizzle::Swizzle(const char c[4])
         : fKey((CToI(c[0]) << 0) | (CToI(c[1]) << 4) | (CToI(c[2]) << 8) | (CToI(c[3]) << 12)) {}
 
-constexpr GrSwizzle::GrSwizzle(const GrSwizzle& that)
+constexpr Swizzle::Swizzle(const Swizzle& that)
         : fKey(that.fKey) {}
 
-constexpr GrSwizzle& GrSwizzle::operator=(const GrSwizzle& that) {
+constexpr Swizzle& Swizzle::operator=(const Swizzle& that) {
     fKey = that.fKey;
     return *this;
 }
 
-constexpr std::array<float, 4> GrSwizzle::applyTo(std::array<float, 4> color) const {
+constexpr std::array<float, 4> Swizzle::applyTo(std::array<float, 4> color) const {
     uint32_t key = fKey;
     // Index of the input color that should be mapped to output r.
     int idx = (key & 15);
@@ -95,7 +96,7 @@ constexpr std::array<float, 4> GrSwizzle::applyTo(std::array<float, 4> color) co
     return { outR, outG, outB, outA };
 }
 
-constexpr float GrSwizzle::ComponentIndexToFloat(std::array<float, 4> color, int idx) {
+constexpr float Swizzle::ComponentIndexToFloat(std::array<float, 4> color, int idx) {
     if (idx <= 3) {
         return color[idx];
     }
@@ -108,7 +109,7 @@ constexpr float GrSwizzle::ComponentIndexToFloat(std::array<float, 4> color, int
     SkUNREACHABLE;
 }
 
-constexpr int GrSwizzle::CToI(char c) {
+constexpr int Swizzle::CToI(char c) {
     switch (c) {
         // r...a must map to 0...3 because other methods use them as indices into fSwiz.
         case 'r': return 0;
@@ -121,7 +122,7 @@ constexpr int GrSwizzle::CToI(char c) {
     }
 }
 
-constexpr char GrSwizzle::IToC(int idx) {
+constexpr char Swizzle::IToC(int idx) {
     switch (idx) {
         case CToI('r'): return 'r';
         case CToI('g'): return 'g';
@@ -133,7 +134,7 @@ constexpr char GrSwizzle::IToC(int idx) {
     }
 }
 
-constexpr GrSwizzle GrSwizzle::Concat(const GrSwizzle& a, const GrSwizzle& b) {
+constexpr Swizzle Swizzle::Concat(const Swizzle& a, const Swizzle& b) {
     uint16_t key = 0;
     for (int i = 0; i < 4; ++i) {
         int idx = (b.fKey >> (4U * i)) & 0xfU;
@@ -144,6 +145,8 @@ constexpr GrSwizzle GrSwizzle::Concat(const GrSwizzle& a, const GrSwizzle& b) {
         }
         key |= (idx << (4U * i));
     }
-    return GrSwizzle(key);
+    return Swizzle(key);
 }
+
+} // namespace skgpu
 #endif
diff --git a/third_party/skia/src/gpu/d3d/BUILD.bazel b/third_party/skia/src/gpu/d3d/BUILD.bazel
index 4c80608219da0..d00a50648ceed 100644
--- a/third_party/skia/src/gpu/d3d/BUILD.bazel
+++ b/third_party/skia/src/gpu/d3d/BUILD.bazel
@@ -95,6 +95,7 @@ generated_cc_atom(
         "//src/gpu:GrProgramInfo_hdr",
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrStencilSettings_hdr",
+        "//src/gpu:KeyBuilder_hdr",
     ],
 )
 
@@ -317,9 +318,9 @@ generated_cc_atom(
         "//src/gpu:GrDirectContextPriv_hdr",
         "//src/gpu:GrPersistentCacheUtils_hdr",
         "//src/gpu:GrShaderCaps_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu:GrStencilSettings_hdr",
         "//src/sksl:SkSLCompiler_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
 
@@ -417,6 +418,7 @@ generated_cc_atom(
         "//include/gpu:GrBackendSurface_hdr",
         "//include/gpu/d3d:GrD3DTypes_hdr",
         "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:KeyBuilder_hdr",
     ],
 )
 
diff --git a/third_party/skia/src/gpu/d3d/GrD3DCaps.cpp b/third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
index 61b7ebc4507ec..803dd5343fc53 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
+++ b/third_party/skia/src/gpu/d3d/GrD3DCaps.cpp
@@ -16,6 +16,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrStencilSettings.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/d3d/GrD3DCaps.h"
 #include "src/gpu/d3d/GrD3DGpu.h"
 #include "src/gpu/d3d/GrD3DRenderTarget.h"
@@ -380,7 +381,7 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("rgb1");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("rgb1");
             }
         }
     }
@@ -392,17 +393,24 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
         info.init(adapterDesc, device, format);
         info.fFormatColorType = GrColorType::kR_8;
         if (SkToBool(info.fFlags & FormatInfo::kTexturable_Flag)) {
-            info.fColorTypeInfoCount = 2;
+            info.fColorTypeInfoCount = 3;
             info.fColorTypeInfos.reset(new ColorTypeInfo[info.fColorTypeInfoCount]());
             int ctIdx = 0;
+            // Format: DXGI_FORMAT_R8_UNORM, Surface: kR_8
+            {
+                constexpr GrColorType ct = GrColorType::kR_8;
+                auto& ctInfo = info.fColorTypeInfos[ctIdx++];
+                ctInfo.fColorType = ct;
+                ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
+            }
             // Format: DXGI_FORMAT_R8_UNORM, Surface: kAlpha_8
             {
                 constexpr GrColorType ct = GrColorType::kAlpha_8;
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
             // Format: DXGI_FORMAT_R8_UNORM, Surface: kGray_8
             {
@@ -410,7 +418,7 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("rrr1");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("rrr1");
             }
         }
     }
@@ -494,8 +502,8 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
         }
     }
@@ -553,8 +561,8 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("argb");
-                ctInfo.fWriteSwizzle = GrSwizzle("gbar");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("argb");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("gbar");
             }
         }
     }
@@ -593,8 +601,8 @@ void GrD3DCaps::initFormatTable(const DXGI_ADAPTER_DESC& adapterDesc, ID3D12Devi
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
         }
     }
@@ -974,7 +982,8 @@ GrBackendFormat GrD3DCaps::getBackendFormatFromCompressionType(
     SkUNREACHABLE;
 }
 
-GrSwizzle GrD3DCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrD3DCaps::onGetReadSwizzle(const GrBackendFormat& format,
+                                           GrColorType colorType) const {
     DXGI_FORMAT dxgiFormat;
     SkAssertResult(format.asDxgiFormat(&dxgiFormat));
     const auto& info = this->getFormatInfo(dxgiFormat);
@@ -989,7 +998,8 @@ GrSwizzle GrD3DCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType
     return {};
 }
 
-GrSwizzle GrD3DCaps::getWriteSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrD3DCaps::getWriteSwizzle(const GrBackendFormat& format,
+                                          GrColorType colorType) const {
     DXGI_FORMAT dxgiFormat;
     SkAssertResult(format.asDxgiFormat(&dxgiFormat));
     const auto& info = this->getFormatInfo(dxgiFormat);
@@ -1038,7 +1048,7 @@ GrCaps::SupportedRead GrD3DCaps::onSupportedReadPixelsColorType(
     return { GrColorType::kUnknown, 0 };
 }
 
-void GrD3DCaps::addExtraSamplerKey(GrProcessorKeyBuilder* b,
+void GrD3DCaps::addExtraSamplerKey(skgpu::KeyBuilder* b,
                                    GrSamplerState samplerState,
                                    const GrBackendFormat& format) const {
     // TODO
@@ -1054,7 +1064,7 @@ GrProgramDesc GrD3DCaps::makeDesc(GrRenderTarget* rt,
     GrProgramDesc desc;
     GrProgramDesc::Build(&desc, programInfo, *this);
 
-    GrProcessorKeyBuilder b(desc.key());
+    skgpu::KeyBuilder b(desc.key());
 
     GrD3DRenderTarget* d3dRT = (GrD3DRenderTarget*) rt;
     d3dRT->genKey(&b);
diff --git a/third_party/skia/src/gpu/d3d/GrD3DCaps.h b/third_party/skia/src/gpu/d3d/GrD3DCaps.h
index bdb04956ec9f1..8d6774943ae30 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DCaps.h
+++ b/third_party/skia/src/gpu/d3d/GrD3DCaps.h
@@ -90,11 +90,11 @@ class GrD3DCaps : public GrCaps {
         return fColorTypeToFormatTable[idx];
     }
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
 
-    void addExtraSamplerKey(GrProcessorKeyBuilder*,
+    void addExtraSamplerKey(skgpu::KeyBuilder*,
                             GrSamplerState,
                             const GrBackendFormat&) const override;
 
@@ -140,7 +140,7 @@ class GrD3DCaps : public GrCaps {
     SupportedRead onSupportedReadPixelsColorType(GrColorType, const GrBackendFormat&,
                                                  GrColorType) const override;
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     // ColorTypeInfo for a specific format
     struct ColorTypeInfo {
@@ -156,8 +156,8 @@ class GrD3DCaps : public GrCaps {
         };
         uint32_t fFlags = 0;
 
-        GrSwizzle fReadSwizzle;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fReadSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
     };
 
     struct FormatInfo {
diff --git a/third_party/skia/src/gpu/d3d/GrD3DOpsRenderPass.cpp b/third_party/skia/src/gpu/d3d/GrD3DOpsRenderPass.cpp
index 902132f94ddd5..f80e5678f39a0 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DOpsRenderPass.cpp
+++ b/third_party/skia/src/gpu/d3d/GrD3DOpsRenderPass.cpp
@@ -92,7 +92,7 @@ void set_stencil_ref(GrD3DGpu* gpu, const GrProgramInfo& info) {
 
 void set_blend_factor(GrD3DGpu* gpu, const GrProgramInfo& info) {
     const GrXferProcessor& xferProcessor = info.pipeline().getXferProcessor();
-    const GrSwizzle& swizzle = info.pipeline().writeSwizzle();
+    const skgpu::Swizzle& swizzle = info.pipeline().writeSwizzle();
     const GrXferProcessor::BlendInfo& blendInfo = xferProcessor.getBlendInfo();
     GrBlendCoeff srcCoeff = blendInfo.fSrcBlend;
     GrBlendCoeff dstCoeff = blendInfo.fDstBlend;
diff --git a/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp b/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp
index 8ffe9e630eaa5..b5b61cd0d47f9 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp
+++ b/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp
@@ -17,7 +17,6 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrPersistentCacheUtils.h"
 #include "src/gpu/GrShaderCaps.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/d3d/GrD3DGpu.h"
 #include "src/gpu/d3d/GrD3DPipeline.h"
@@ -25,6 +24,7 @@
 #include "src/gpu/d3d/GrD3DRootSignature.h"
 #include "src/gpu/d3d/GrD3DUtil.h"
 #include "src/sksl/SkSLCompiler.h"
+#include "src/utils/SkShaderUtils.h"
 
 #include <d3dcompiler.h>
 
@@ -78,7 +78,7 @@ static const bool gPrintSKSL = false;
 static const bool gPrintHLSL = false;
 
 static gr_cp<ID3DBlob> GrCompileHLSLShader(GrD3DGpu* gpu,
-                                           const SkSL::String& hlsl,
+                                           const std::string& hlsl,
                                            SkSL::ProgramKind kind) {
     TRACE_EVENT0("skia.shaders", "driver_compile_shader");
     const char* compileTarget = nullptr;
@@ -114,7 +114,7 @@ static gr_cp<ID3DBlob> GrCompileHLSLShader(GrD3DGpu* gpu,
 
 bool GrD3DPipelineStateBuilder::loadHLSLFromCache(SkReadBuffer* reader, gr_cp<ID3DBlob> shaders[]) {
 
-    SkSL::String hlsl[kGrShaderTypeCount];
+    std::string hlsl[kGrShaderTypeCount];
     SkSL::Program::Inputs inputs[kGrShaderTypeCount];
 
     if (!GrPersistentCacheUtils::UnpackCachedShaders(reader, hlsl, inputs, kGrShaderTypeCount)) {
@@ -135,14 +135,14 @@ bool GrD3DPipelineStateBuilder::loadHLSLFromCache(SkReadBuffer* reader, gr_cp<ID
 
 gr_cp<ID3DBlob> GrD3DPipelineStateBuilder::compileD3DProgram(
         SkSL::ProgramKind kind,
-        const SkSL::String& sksl,
+        const std::string& sksl,
         const SkSL::Program::Settings& settings,
         SkSL::Program::Inputs* outInputs,
-        SkSL::String* outHLSL) {
+        std::string* outHLSL) {
 #ifdef SK_DEBUG
-    SkSL::String src = GrShaderUtils::PrettyPrint(sksl);
+    std::string src = SkShaderUtils::PrettyPrint(sksl);
 #else
-    const SkSL::String& src = sksl;
+    const std::string& src = sksl;
 #endif
 
     std::unique_ptr<SkSL::Program> program = fGpu->shaderCompiler()->convertProgram(
@@ -156,14 +156,14 @@ gr_cp<ID3DBlob> GrD3DPipelineStateBuilder::compileD3DProgram(
     *outInputs = program->fInputs;
 
     if (gPrintSKSL || gPrintHLSL) {
-        GrShaderUtils::PrintShaderBanner(kind);
+        SkShaderUtils::PrintShaderBanner(kind);
         if (gPrintSKSL) {
             SkDebugf("SKSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(sksl));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(sksl));
         }
         if (gPrintHLSL) {
             SkDebugf("HLSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(*outHLSL));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(*outHLSL));
         }
     }
 
@@ -245,32 +245,26 @@ static void setup_vertex_input_layout(const GrGeometryProcessor& geomProc,
     }
 
     unsigned int currentAttrib = 0;
-    unsigned int vertexAttributeOffset = 0;
 
-    for (const auto& attrib : geomProc.vertexAttributes()) {
+    for (auto attrib : geomProc.vertexAttributes()) {
         // When using SPIRV-Cross it converts the location modifier in SPIRV to be
         // TEXCOORD<N> where N is the location value for eveery vertext attribute
         inputElements[currentAttrib] = { "TEXCOORD", currentAttrib,
                                         attrib_type_to_format(attrib.cpuType()),
-                                        vertexSlot, vertexAttributeOffset,
+                                        vertexSlot, SkToU32(*attrib.offset()),
                                         D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0 };
-        vertexAttributeOffset += attrib.sizeAlign4();
         currentAttrib++;
     }
-    SkASSERT(vertexAttributeOffset == geomProc.vertexStride());
 
-    unsigned int instanceAttributeOffset = 0;
-    for (const auto& attrib : geomProc.instanceAttributes()) {
+    for (auto attrib : geomProc.instanceAttributes()) {
         // When using SPIRV-Cross it converts the location modifier in SPIRV to be
         // TEXCOORD<N> where N is the location value for eveery vertext attribute
         inputElements[currentAttrib] = { "TEXCOORD", currentAttrib,
                                         attrib_type_to_format(attrib.cpuType()),
-                                        instanceSlot, instanceAttributeOffset,
+                                        instanceSlot, SkToU32(*attrib.offset()),
                                         D3D12_INPUT_CLASSIFICATION_PER_INSTANCE_DATA, 1 };
-        instanceAttributeOffset += attrib.sizeAlign4();
         currentAttrib++;
     }
-    SkASSERT(instanceAttributeOffset == geomProc.instanceStride());
 }
 
 static D3D12_BLEND blend_coeff_to_d3d_blend(GrBlendCoeff coeff) {
@@ -593,12 +587,12 @@ std::unique_ptr<GrD3DPipelineState> GrD3DPipelineStateBuilder::finalize() {
         // We successfully loaded and compiled HLSL
     } else {
         SkSL::Program::Inputs inputs[kGrShaderTypeCount];
-        SkSL::String* sksl[kGrShaderTypeCount] = {
+        std::string* sksl[kGrShaderTypeCount] = {
             &fVS.fCompilerString,
             &fFS.fCompilerString,
         };
-        SkSL::String cached_sksl[kGrShaderTypeCount];
-        SkSL::String hlsl[kGrShaderTypeCount];
+        std::string cached_sksl[kGrShaderTypeCount];
+        std::string hlsl[kGrShaderTypeCount];
 
         if (kSKSL_Tag == shaderType) {
             if (GrPersistentCacheUtils::UnpackCachedShaders(&reader, cached_sksl, inputs,
@@ -627,7 +621,7 @@ std::unique_ptr<GrD3DPipelineState> GrD3DPipelineStateBuilder::finalize() {
                 // Replace the HLSL with formatted SkSL to be cached. This looks odd, but this is
                 // the last time we're going to use these strings, so it's safe.
                 for (int i = 0; i < kGrShaderTypeCount; ++i) {
-                    hlsl[i] = GrShaderUtils::PrettyPrint(*sksl[i]);
+                    hlsl[i] = SkShaderUtils::PrettyPrint(*sksl[i]);
                 }
             }
             sk_sp<SkData> key =
diff --git a/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.h b/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.h
index d80ebd6a996b7..d8025600daafd 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.h
+++ b/third_party/skia/src/gpu/d3d/GrD3DPipelineStateBuilder.h
@@ -53,10 +53,10 @@ class GrD3DPipelineStateBuilder : public GrGLSLProgramBuilder {
     bool loadHLSLFromCache(SkReadBuffer* reader, gr_cp<ID3DBlob> shaders[]);
 
     gr_cp<ID3DBlob> compileD3DProgram(SkSL::ProgramKind kind,
-                                      const SkSL::String& sksl,
+                                      const std::string& sksl,
                                       const SkSL::Program::Settings& settings,
                                       SkSL::Program::Inputs* outInputs,
-                                      SkSL::String* outHLSL);
+                                      std::string* outHLSL);
 
     GrGLSLUniformHandler* uniformHandler() override { return &fUniformHandler; }
     const GrGLSLUniformHandler* uniformHandler() const override { return &fUniformHandler; }
diff --git a/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.cpp b/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.cpp
index edc119c99402b..3f6d0ada6916a 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.cpp
+++ b/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.cpp
@@ -10,6 +10,7 @@
 #include "include/gpu/GrBackendSurface.h"
 #include "include/gpu/d3d/GrD3DTypes.h"
 #include "src/gpu/GrRenderTarget.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/d3d/GrD3DGpu.h"
 #include "src/gpu/d3d/GrD3DResourceProvider.h"
 #include "src/gpu/d3d/GrD3DTextureResource.h"
@@ -190,7 +191,7 @@ DXGI_FORMAT GrD3DRenderTarget::stencilDxgiFormat() const {
     return DXGI_FORMAT_UNKNOWN;
 }
 
-void GrD3DRenderTarget::genKey(GrProcessorKeyBuilder* b) const {
+void GrD3DRenderTarget::genKey(skgpu::KeyBuilder* b) const {
     b->add32(this->dxgiFormat());
     b->add32(this->numSamples());
     b->add32(this->stencilDxgiFormat());
diff --git a/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.h b/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.h
index e3bdb6b27b142..f4477b0936ff0 100644
--- a/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.h
+++ b/third_party/skia/src/gpu/d3d/GrD3DRenderTarget.h
@@ -53,7 +53,7 @@ class GrD3DRenderTarget: public GrRenderTarget, public virtual GrD3DTextureResou
     DXGI_FORMAT stencilDxgiFormat() const;
 
     // Key used for the program desc
-    void genKey(GrProcessorKeyBuilder* b) const;
+    void genKey(skgpu::KeyBuilder* b) const;
 
 protected:
     GrD3DRenderTarget(GrD3DGpu* gpu,
diff --git a/third_party/skia/src/gpu/dawn/BUILD.bazel b/third_party/skia/src/gpu/dawn/BUILD.bazel
index fc84bf1ea770a..74c7e63e51167 100644
--- a/third_party/skia/src/gpu/dawn/BUILD.bazel
+++ b/third_party/skia/src/gpu/dawn/BUILD.bazel
@@ -57,6 +57,7 @@ generated_cc_atom(
         "//src/gpu:GrProgramInfo_hdr",
         "//src/gpu:GrRenderTarget_hdr",
         "//src/gpu:GrStencilSettings_hdr",
+        "//src/gpu:KeyBuilder_hdr",
     ],
 )
 
@@ -166,9 +167,9 @@ generated_cc_atom(
         ":GrDawnTexture_hdr",
         "//src/gpu:GrAutoLocaleSetter_hdr",
         "//src/gpu:GrRenderTarget_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu:GrStencilSettings_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
 
diff --git a/third_party/skia/src/gpu/dawn/GrDawnCaps.cpp b/third_party/skia/src/gpu/dawn/GrDawnCaps.cpp
index ab7d19513ae82..4610c8e6aacda 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnCaps.cpp
+++ b/third_party/skia/src/gpu/dawn/GrDawnCaps.cpp
@@ -11,6 +11,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrStencilSettings.h"
+#include "src/gpu/KeyBuilder.h"
 
 GrDawnCaps::GrDawnCaps(const GrContextOptions& contextOptions) : INHERITED(contextOptions) {
     fMipmapSupport = true;
@@ -44,30 +45,30 @@ bool GrDawnCaps::isFormatTexturable(const GrBackendFormat& format, GrTextureType
     return format.asDawnFormat(&dawnFormat);
 }
 
-static GrSwizzle get_swizzle(const GrBackendFormat& format, GrColorType colorType,
-                             bool forOutput) {
+static skgpu::Swizzle get_swizzle(const GrBackendFormat& format, GrColorType colorType,
+                                  bool forOutput) {
     switch (colorType) {
         case GrColorType::kAlpha_8: // fall through
         case GrColorType::kAlpha_F16:
             if (forOutput) {
-                return GrSwizzle("a000");
+                return skgpu::Swizzle("a000");
             } else {
-                return GrSwizzle("000r");
+                return skgpu::Swizzle("000r");
             }
         case GrColorType::kGray_8:
             if (!forOutput) {
-                return GrSwizzle::RRRA();
+                return skgpu::Swizzle::RRRA();
             }
             break;
         case GrColorType::kRGB_888x:
             if (!forOutput) {
-                return GrSwizzle::RGB1();
+                return skgpu::Swizzle::RGB1();
             }
             break;
         default:
-            return GrSwizzle::RGBA();
+            return skgpu::Swizzle::RGBA();
     }
-    return GrSwizzle::RGBA();
+    return skgpu::Swizzle::RGBA();
 }
 
 bool GrDawnCaps::isFormatRenderable(const GrBackendFormat& format,
@@ -123,12 +124,13 @@ GrBackendFormat GrDawnCaps::getBackendFormatFromCompressionType(SkImage::Compres
     return GrBackendFormat();
 }
 
-GrSwizzle GrDawnCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const
-{
+skgpu::Swizzle GrDawnCaps::onGetReadSwizzle(const GrBackendFormat& format,
+                                            GrColorType colorType) const {
     return get_swizzle(format, colorType, false);
 }
 
-GrSwizzle GrDawnCaps::getWriteSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrDawnCaps::getWriteSwizzle(const GrBackendFormat& format,
+                                           GrColorType colorType) const {
     return get_swizzle(format, colorType, true);
 }
 
@@ -179,7 +181,7 @@ GrProgramDesc GrDawnCaps::makeDesc(GrRenderTarget* rt,
         return desc;
     }
 
-    GrProcessorKeyBuilder b(desc.key());
+    skgpu::KeyBuilder b(desc.key());
     GrStencilSettings stencil = programInfo.nonGLStencilSettings();
     stencil.genKey(&b, true);
 
diff --git a/third_party/skia/src/gpu/dawn/GrDawnCaps.h b/third_party/skia/src/gpu/dawn/GrDawnCaps.h
index 0002c3ded97c9..dbc3741286123 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnCaps.h
+++ b/third_party/skia/src/gpu/dawn/GrDawnCaps.h
@@ -44,7 +44,7 @@ class GrDawnCaps : public GrCaps {
 
     GrBackendFormat getBackendFormatFromCompressionType(SkImage::CompressionType) const override;
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
 
@@ -72,7 +72,7 @@ class GrDawnCaps : public GrCaps {
         return { srcColorType, GrColorTypeBytesPerPixel(srcColorType) };
     }
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     using INHERITED = GrCaps;
 };
diff --git a/third_party/skia/src/gpu/dawn/GrDawnGpu.cpp b/third_party/skia/src/gpu/dawn/GrDawnGpu.cpp
index 848308ac918ee..52a7a94981271 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnGpu.cpp
+++ b/third_party/skia/src/gpu/dawn/GrDawnGpu.cpp
@@ -703,10 +703,10 @@ bool GrDawnGpu::onRegenerateMipMapLevels(GrTexture* tex) {
         "    sk_Position = float4(positions[sk_VertexID], 0.0, 1.0);\n"
         "    texCoord = texCoords[sk_VertexID];\n"
         "}\n";
-    SkSL::String vsSPIRV = this->SkSLToSPIRV(vs,
-                                             SkSL::ProgramKind::kVertex,
-                                             /*rtFlipOffset*/ 0,
-                                             nullptr);
+    std::string vsSPIRV = this->SkSLToSPIRV(vs,
+                                            SkSL::ProgramKind::kVertex,
+                                            /*rtFlipOffset*/ 0,
+                                            nullptr);
 
     const char* fs =
         "layout(set = 0, binding = 0) uniform sampler samp;\n"
@@ -715,10 +715,10 @@ bool GrDawnGpu::onRegenerateMipMapLevels(GrTexture* tex) {
         "void main() {\n"
         "    sk_FragColor = sample(makeSampler2D(tex, samp), texCoord);\n"
         "}\n";
-    SkSL::String fsSPIRV = this->SkSLToSPIRV(fs,
-                                             SkSL::ProgramKind::kFragment,
-                                             /*rtFlipOffset=*/ 0,
-                                             nullptr);
+    std::string fsSPIRV = this->SkSLToSPIRV(fs,
+                                            SkSL::ProgramKind::kFragment,
+                                            /*rtFlipOffset=*/ 0,
+                                            nullptr);
 
     wgpu::VertexState vertexState;
     vertexState.module = this->createShaderModule(vsSPIRV);
@@ -924,10 +924,10 @@ void GrDawnGpu::moveStagingBuffersToBusyAndMapAsync() {
     fSubmittedStagingBuffers.clear();
 }
 
-SkSL::String GrDawnGpu::SkSLToSPIRV(const char* shaderString,
-                                    SkSL::ProgramKind kind,
-                                    uint32_t rtFlipOffset,
-                                    SkSL::Program::Inputs* inputs) {
+std::string GrDawnGpu::SkSLToSPIRV(const char* shaderString,
+                                   SkSL::ProgramKind kind,
+                                   uint32_t rtFlipOffset,
+                                   SkSL::Program::Inputs* inputs) {
     auto errorHandler = this->getContext()->priv().getShaderErrorHandler();
     SkSL::Program::Settings settings;
     settings.fRTFlipOffset = rtFlipOffset;
@@ -944,7 +944,7 @@ SkSL::String GrDawnGpu::SkSLToSPIRV(const char* shaderString,
     if (inputs) {
         *inputs = program->fInputs;
     }
-    SkSL::String code;
+    std::string code;
     if (!this->shaderCompiler()->toSPIRV(*program, &code)) {
         errorHandler->compileError(shaderString, this->shaderCompiler()->errorText().c_str());
         return "";
@@ -952,7 +952,7 @@ SkSL::String GrDawnGpu::SkSLToSPIRV(const char* shaderString,
     return code;
 }
 
-wgpu::ShaderModule GrDawnGpu::createShaderModule(const SkSL::String& spirvSource) {
+wgpu::ShaderModule GrDawnGpu::createShaderModule(const std::string& spirvSource) {
     wgpu::ShaderModuleSPIRVDescriptor desc;
     desc.codeSize = spirvSource.size() / 4;
     desc.code = reinterpret_cast<const uint32_t*>(spirvSource.c_str());
diff --git a/third_party/skia/src/gpu/dawn/GrDawnGpu.h b/third_party/skia/src/gpu/dawn/GrDawnGpu.h
index 67d2c496ffb71..a6b36da8d524f 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnGpu.h
+++ b/third_party/skia/src/gpu/dawn/GrDawnGpu.h
@@ -101,11 +101,11 @@ class GrDawnGpu : public GrGpu {
     void appendCommandBuffer(wgpu::CommandBuffer commandBuffer);
 
     void waitOnAllBusyStagingBuffers();
-    SkSL::String SkSLToSPIRV(const char* shaderString,
-                             SkSL::ProgramKind,
-                             uint32_t rtFlipOffset,
-                             SkSL::Program::Inputs*);
-    wgpu::ShaderModule createShaderModule(const SkSL::String& spirvSource);
+    std::string SkSLToSPIRV(const char* shaderString,
+                            SkSL::ProgramKind,
+                            uint32_t rtFlipOffset,
+                            SkSL::Program::Inputs*);
+    wgpu::ShaderModule createShaderModule(const std::string& spirvSource);
 
 private:
     GrDawnGpu(GrDirectContext*, const GrContextOptions&, const wgpu::Device&);
diff --git a/third_party/skia/src/gpu/dawn/GrDawnProgramBuilder.cpp b/third_party/skia/src/gpu/dawn/GrDawnProgramBuilder.cpp
index f0387ff494dc8..d5151238e1e3d 100644
--- a/third_party/skia/src/gpu/dawn/GrDawnProgramBuilder.cpp
+++ b/third_party/skia/src/gpu/dawn/GrDawnProgramBuilder.cpp
@@ -9,11 +9,11 @@
 
 #include "src/gpu/GrAutoLocaleSetter.h"
 #include "src/gpu/GrRenderTarget.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/dawn/GrDawnGpu.h"
 #include "src/gpu/dawn/GrDawnTexture.h"
 #include "src/gpu/effects/GrTextureEffect.h"
+#include "src/utils/SkShaderUtils.h"
 
 static wgpu::BlendFactor to_dawn_blend_factor(GrBlendCoeff coeff) {
     switch (coeff) {
@@ -338,18 +338,16 @@ sk_sp<GrDawnProgram> GrDawnProgramBuilder::Build(GrDawnGpu* gpu,
     const GrGeometryProcessor& geomProc = programInfo.geomProc();
     int i = 0;
     if (geomProc.numVertexAttributes() > 0) {
-        size_t offset = 0;
-        for (const auto& attrib : geomProc.vertexAttributes()) {
+        for (auto attrib : geomProc.vertexAttributes()) {
             wgpu::VertexAttribute attribute;
             attribute.shaderLocation = i;
-            attribute.offset = offset;
+            attribute.offset = *attrib.offset();
             attribute.format = to_dawn_vertex_format(attrib.cpuType());
             vertexAttributes.push_back(attribute);
-            offset += attrib.sizeAlign4();
             i++;
         }
         wgpu::VertexBufferLayout input;
-        input.arrayStride = offset;
+        input.arrayStride = geomProc.vertexStride();
         input.stepMode = wgpu::VertexStepMode::Vertex;
         input.attributeCount = vertexAttributes.size();
         input.attributes = &vertexAttributes.front();
@@ -357,18 +355,16 @@ sk_sp<GrDawnProgram> GrDawnProgramBuilder::Build(GrDawnGpu* gpu,
     }
     std::vector<wgpu::VertexAttribute> instanceAttributes;
     if (geomProc.numInstanceAttributes() > 0) {
-        size_t offset = 0;
-        for (const auto& attrib : geomProc.instanceAttributes()) {
+        for (auto attrib : geomProc.instanceAttributes()) {
             wgpu::VertexAttribute attribute;
             attribute.shaderLocation = i;
-            attribute.offset = offset;
+            attribute.offset = *attrib.offset();
             attribute.format = to_dawn_vertex_format(attrib.cpuType());
             instanceAttributes.push_back(attribute);
-            offset += attrib.sizeAlign4();
             i++;
         }
         wgpu::VertexBufferLayout input;
-        input.arrayStride = offset;
+        input.arrayStride = geomProc.instanceStride();
         input.stepMode = wgpu::VertexStepMode::Instance;
         input.attributeCount = instanceAttributes.size();
         input.attributes = &instanceAttributes.front();
@@ -430,14 +426,14 @@ wgpu::ShaderModule GrDawnProgramBuilder::createShaderModule(const GrGLSLShaderBu
     SkString source(builder.fCompilerString.c_str());
 
 #if 0
-    SkSL::String sksl = GrShaderUtils::PrettyPrint(builder.fCompilerString);
+    std::string sksl = SkShaderUtils::PrettyPrint(builder.fCompilerString);
     printf("converting program:\n%s\n", sksl.c_str());
 #endif
 
-    SkSL::String spirvSource = fGpu->SkSLToSPIRV(source.c_str(),
-                                                 kind,
-                                                 fUniformHandler.getRTFlipOffset(),
-                                                 inputs);
+    std::string spirvSource = fGpu->SkSLToSPIRV(source.c_str(),
+                                                kind,
+                                                fUniformHandler.getRTFlipOffset(),
+                                                inputs);
     if (inputs->fUseFlipRTUniform) {
         this->addRTFlipUniform(SKSL_RTFLIP_NAME);
     }
diff --git a/third_party/skia/src/gpu/effects/BUILD.bazel b/third_party/skia/src/gpu/effects/BUILD.bazel
index f07b69dd82a2f..5a4e89ce92cf0 100644
--- a/third_party/skia/src/gpu/effects/BUILD.bazel
+++ b/third_party/skia/src/gpu/effects/BUILD.bazel
@@ -33,6 +33,7 @@ generated_cc_atom(
     deps = [
         ":GrBezierEffect_hdr",
         "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -58,6 +59,7 @@ generated_cc_atom(
         ":GrTextureEffect_hdr",
         "//src/core:SkMatrixPriv_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -86,6 +88,7 @@ generated_cc_atom(
         "//src/gpu:GrCaps_hdr",
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -111,6 +114,7 @@ generated_cc_atom(
     deps = [
         ":GrBlendFragmentProcessor_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/glsl:GrGLSLBlend_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -136,6 +140,7 @@ generated_cc_atom(
     deps = [
         ":GrConvexPolyEffect_hdr",
         "//src/core:SkPathPriv_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -164,6 +169,7 @@ generated_cc_atom(
         "//src/gpu:GrColor_hdr",
         "//src/gpu:GrPipeline_hdr",
         "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLBlend_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -192,6 +198,7 @@ generated_cc_atom(
         "//src/gpu:GrProcessor_hdr",
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLBlend_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
@@ -247,6 +254,7 @@ generated_cc_atom(
         "//src/gpu:GrCaps_hdr",
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -272,6 +280,7 @@ generated_cc_atom(
         "//src/core:SkGpuBlurUtils_hdr",
         "//src/gpu:GrTextureProxy_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -300,6 +309,7 @@ generated_cc_atom(
         "//src/gpu:GrTextureProxy_hdr",
         "//src/gpu:GrTexture_hdr",
         "//src/gpu:GrThreadSafeCache_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
@@ -347,6 +357,7 @@ generated_cc_atom(
         ":GrModulateAtlasCoverageEffect_hdr",
         ":GrTextureEffect_hdr",
         "//src/gpu:GrDynamicAtlas_hdr",
+        "//src/gpu:KeyBuilder_hdr",
     ],
 )
 
@@ -400,6 +411,7 @@ generated_cc_atom(
         "//src/gpu:GrProcessorAnalysis_hdr",
         "//src/gpu:GrProcessor_hdr",
         "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLBlend_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
@@ -431,6 +443,7 @@ generated_cc_atom(
         "//src/core:SkTLazy_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
         "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -467,6 +480,7 @@ generated_cc_atom(
     hdrs = ["GrSkSLFP.h"],
     visibility = ["//:__subpackages__"],
     deps = [
+        "//include/core:SkM44_hdr",
         "//include/core:SkRefCnt_hdr",
         "//include/effects:SkRuntimeEffect_hdr",
         "//include/gpu:GrContextOptions_hdr",
@@ -491,6 +505,7 @@ generated_cc_atom(
         "//src/gpu:GrBaseContextPriv_hdr",
         "//src/gpu:GrColorInfo_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
         "//src/sksl:SkSLUtil_hdr",
@@ -521,6 +536,7 @@ generated_cc_atom(
         ":GrTextureEffect_hdr",
         "//src/core:SkMatrixPriv_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
         "//src/sksl:SkSLUtil_hdr",
     ],
@@ -549,6 +565,7 @@ generated_cc_atom(
         "//src/core:SkYUVMath_hdr",
         "//src/gpu:GrTexture_hdr",
         "//src/gpu:GrYUVATextureProxies_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
         "//src/sksl:SkSLUtil_hdr",
diff --git a/third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h b/third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
index ec456107202b3..013d555d5519f 100644
--- a/third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
+++ b/third_party/skia/src/gpu/effects/GrAtlasedShaderHelpers.h
@@ -55,21 +55,21 @@ static void append_index_uv_varyings(GrGeometryProcessor::ProgramImpl::EmitArgs&
     }
 
     // Multiply by 1/atlasDimensions to get normalized texture coordinates
-    uv->reset(kFloat2_GrSLType);
+    uv->reset(SkSLType::kFloat2);
     args.fVaryingHandler->addVarying("TextureCoords", uv);
     args.fVertBuilder->codeAppendf(
             "%s = unormTexCoords * %s;", uv->vsOut(), atlasDimensionsInvName);
 
     // On ANGLE there is a significant cost to using an int varying. We don't know of any case where
     // it is worse to use a float so for now we always do.
-    texIdx->reset(kFloat_GrSLType);
+    texIdx->reset(SkSLType::kFloat);
     // If we computed the local var "texIdx" as an int we will need to cast it to float
     const char* cast = args.fShaderCaps->integerSupport() ? "float" : "";
     args.fVaryingHandler->addVarying("TexIndex", texIdx, Interpolation::kCanBeFlat);
     args.fVertBuilder->codeAppendf("%s = %s(texIdx);", texIdx->vsOut(), cast);
 
     if (st) {
-        st->reset(kFloat2_GrSLType);
+        st->reset(SkSLType::kFloat2);
         args.fVaryingHandler->addVarying("IntTextureCoords", st);
         args.fVertBuilder->codeAppendf("%s = unormTexCoords;", st->vsOut());
     }
diff --git a/third_party/skia/src/gpu/effects/GrBezierEffect.cpp b/third_party/skia/src/gpu/effects/GrBezierEffect.cpp
index 088dc111edb99..4671f8b74f207 100644
--- a/third_party/skia/src/gpu/effects/GrBezierEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrBezierEffect.cpp
@@ -5,8 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/effects/GrBezierEffect.h"
+
+#include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -57,7 +59,7 @@ void GrConicEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
     // emit attributes
     varyingHandler->emitAttributes(gp);
 
-    GrGLSLVarying v(kFloat4_GrSLType);
+    GrGLSLVarying v(SkSLType::kFloat4);
     varyingHandler->addVarying("ConicCoeffs", &v);
     vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inConicCoeffs().name());
 
@@ -88,14 +90,14 @@ void GrConicEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
     // that suffices. Additionally we should assert that the upstream code only lets us get here if
     // either float or half provides the required number of bits.
 
-    GrShaderVar edgeAlpha("edgeAlpha", kHalf_GrSLType, 0);
-    GrShaderVar dklmdx("dklmdx", kFloat3_GrSLType, 0);
-    GrShaderVar dklmdy("dklmdy", kFloat3_GrSLType, 0);
-    GrShaderVar dfdx("dfdx", kFloat_GrSLType, 0);
-    GrShaderVar dfdy("dfdy", kFloat_GrSLType, 0);
-    GrShaderVar gF("gF", kFloat2_GrSLType, 0);
-    GrShaderVar gFM("gFM", kFloat_GrSLType, 0);
-    GrShaderVar func("func", kFloat_GrSLType, 0);
+    GrShaderVar edgeAlpha("edgeAlpha", SkSLType::kHalf, 0);
+    GrShaderVar dklmdx("dklmdx", SkSLType::kFloat3, 0);
+    GrShaderVar dklmdy("dklmdy", SkSLType::kFloat3, 0);
+    GrShaderVar dfdx("dfdx", SkSLType::kFloat, 0);
+    GrShaderVar dfdy("dfdy", SkSLType::kFloat, 0);
+    GrShaderVar gF("gF", SkSLType::kFloat2, 0);
+    GrShaderVar gFM("gFM", SkSLType::kFloat, 0);
+    GrShaderVar func("func", SkSLType::kFloat, 0);
 
     fragBuilder->declAppend(edgeAlpha);
     fragBuilder->declAppend(dklmdx);
@@ -137,7 +139,7 @@ void GrConicEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
         const char* coverageScale;
         fCoverageScaleUniform = uniformHandler->addUniform(nullptr,
                                                            kFragment_GrShaderFlag,
-                                                           kFloat_GrSLType,
+                                                           SkSLType::kFloat,
                                                            "Coverage",
                                                            &coverageScale);
         fragBuilder->codeAppendf("half4 %s = half4(half(%s) * %s);",
@@ -151,7 +153,7 @@ void GrConicEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
 
 GrConicEffect::~GrConicEffect() = default;
 
-void GrConicEffect::addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrConicEffect::addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = 0;
     key |= fCoverageScale == 0xff ? 0x8  : 0x0;
     key |= fUsesLocalCoords       ? 0x10 : 0x0;
@@ -175,7 +177,7 @@ GrConicEffect::GrConicEffect(const SkPMColor4f& color, const SkMatrix& viewMatri
         , fLocalMatrix(viewMatrix)
         , fUsesLocalCoords(usesLocalCoords)
         , fCoverageScale(coverage) {
-    this->setVertexAttributes(kAttributes, SK_ARRAY_COUNT(kAttributes));
+    this->setVertexAttributesWithImplicitOffsets(kAttributes, SK_ARRAY_COUNT(kAttributes));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -245,7 +247,7 @@ void GrQuadEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
     // emit attributes
     varyingHandler->emitAttributes(gp);
 
-    GrGLSLVarying v(kHalf4_GrSLType);
+    GrGLSLVarying v(SkSLType::kHalf4);
     varyingHandler->addVarying("HairQuadEdge", &v);
     vertBuilder->codeAppendf("%s = %s;", v.vsOut(), gp.inHairQuadEdge().name());
 
@@ -290,7 +292,7 @@ void GrQuadEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
         const char* coverageScale;
         fCoverageScaleUniform = uniformHandler->addUniform(nullptr,
                                                            kFragment_GrShaderFlag,
-                                                           kHalf_GrSLType,
+                                                           SkSLType::kHalf,
                                                            "Coverage",
                                                            &coverageScale);
         fragBuilder->codeAppendf("half4 %s = half4(%s * edgeAlpha);", args.fOutputCoverage,
@@ -304,7 +306,7 @@ void GrQuadEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
 
 GrQuadEffect::~GrQuadEffect() = default;
 
-void GrQuadEffect::addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrQuadEffect::addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = 0;
     key |= fCoverageScale != 0xff ? 0x8  : 0x0;
     key |= fUsesLocalCoords       ? 0x10 : 0x0;
@@ -328,7 +330,7 @@ GrQuadEffect::GrQuadEffect(const SkPMColor4f& color, const SkMatrix& viewMatrix,
     , fLocalMatrix(localMatrix)
     , fUsesLocalCoords(usesLocalCoords)
     , fCoverageScale(coverage) {
-    this->setVertexAttributes(kAttributes, SK_ARRAY_COUNT(kAttributes));
+    this->setVertexAttributesWithImplicitOffsets(kAttributes, SK_ARRAY_COUNT(kAttributes));
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/third_party/skia/src/gpu/effects/GrBezierEffect.h b/third_party/skia/src/gpu/effects/GrBezierEffect.h
index f33d8031ab4e3..38d1449ba5561 100644
--- a/third_party/skia/src/gpu/effects/GrBezierEffect.h
+++ b/third_party/skia/src/gpu/effects/GrBezierEffect.h
@@ -79,7 +79,7 @@ class GrConicEffect : public GrGeometryProcessor {
 
     const char* name() const override { return "Conic"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -98,8 +98,8 @@ class GrConicEffect : public GrGeometryProcessor {
     bool                fUsesLocalCoords;
     uint8_t             fCoverageScale;
     inline static constexpr Attribute kAttributes[] = {
-        {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType},
-        {"inConicCoeffs", kFloat4_GrVertexAttribType, kHalf4_GrSLType}
+        {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2},
+        {"inConicCoeffs", kFloat4_GrVertexAttribType, SkSLType::kHalf4}
     };
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST
@@ -141,7 +141,7 @@ class GrQuadEffect : public GrGeometryProcessor {
 
     const char* name() const override { return "Quad"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -161,8 +161,8 @@ class GrQuadEffect : public GrGeometryProcessor {
     uint8_t fCoverageScale;
 
     inline static constexpr Attribute kAttributes[] = {
-        {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType},
-        {"inHairQuadEdge", kFloat4_GrVertexAttribType, kHalf4_GrSLType}
+        {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2},
+        {"inHairQuadEdge", kFloat4_GrVertexAttribType, SkSLType::kHalf4}
     };
 
     GR_DECLARE_GEOMETRY_PROCESSOR_TEST
diff --git a/third_party/skia/src/gpu/effects/GrBicubicEffect.cpp b/third_party/skia/src/gpu/effects/GrBicubicEffect.cpp
index 609ca7370e2f2..1a3217cbfbbda 100644
--- a/third_party/skia/src/gpu/effects/GrBicubicEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrBicubicEffect.cpp
@@ -9,6 +9,7 @@
 
 #include "src/core/SkMatrixPriv.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrMatrixEffect.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -34,7 +35,7 @@ void GrBicubicEffect::Impl::emitCode(EmitArgs& args) {
 
     const char* coeffs;
     fCoefficientUni = args.fUniformHandler->addUniform(&args.fFp, kFragment_GrShaderFlag,
-                                                       kHalf4x4_GrSLType, "coefficients", &coeffs);
+                                                       SkSLType::kHalf4x4, "coefficients", &coeffs);
     // We determine our fractional offset (f) within the texel. We then snap coord to a texel
     // center. The snap prevents cases where the starting coords are near a texel boundary and
     // offsets with imperfect precision would cause us to skip/double hit a texel.
@@ -51,10 +52,8 @@ void GrBicubicEffect::Impl::emitCode(EmitArgs& args) {
         fragBuilder->codeAppend("half4 rowColors[4];");
         for (int y = 0; y < 4; ++y) {
             for (int x = 0; x < 4; ++x) {
-                SkString coord;
-                coord.printf("coord + float2(%d, %d)", x - 1, y - 1);
-                auto childStr =
-                        this->invokeChild(0, args, SkSL::String(coord.c_str(), coord.size()));
+                auto coord = SkSL::String::printf("coord + float2(%d, %d)", x - 1, y - 1);
+                auto childStr = this->invokeChild(0, args, coord);
                 fragBuilder->codeAppendf("rowColors[%d] = %s;", x, childStr.c_str());
             }
             fragBuilder->codeAppendf(
@@ -73,13 +72,13 @@ void GrBicubicEffect::Impl::emitCode(EmitArgs& args) {
         fragBuilder->codeAppendf("half4 w = %s * half4(1.0, f, f2, f2 * f);", coeffs);
         fragBuilder->codeAppend("half4 c[4];");
         for (int i = 0; i < 4; ++i) {
-            SkString coord;
+            std::string coord;
             if (bicubicEffect.fDirection == Direction::kX) {
-                coord.printf("float2(coord + %d, %s.y)", i - 1, args.fSampleCoord);
+                coord = SkSL::String::printf("float2(coord + %d, %s.y)", i - 1, args.fSampleCoord);
             } else {
-                coord.printf("float2(%s.x, coord + %d)", args.fSampleCoord, i - 1);
+                coord = SkSL::String::printf("float2(%s.x, coord + %d)", args.fSampleCoord, i - 1);
             }
-            auto childStr = this->invokeChild(0, args, SkSL::String(coord.c_str(), coord.size()));
+            auto childStr = this->invokeChild(0, args, coord);
             fragBuilder->codeAppendf("c[%d] = %s;", i, childStr.c_str());
         }
         fragBuilder->codeAppend(
@@ -213,7 +212,7 @@ GrBicubicEffect::GrBicubicEffect(const GrBicubicEffect& that)
         , fDirection(that.fDirection)
         , fClamp(that.fClamp) {}
 
-void GrBicubicEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrBicubicEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = (static_cast<uint32_t>(fDirection) << 0) | (static_cast<uint32_t>(fClamp) << 2);
     b->add32(key);
 }
diff --git a/third_party/skia/src/gpu/effects/GrBicubicEffect.h b/third_party/skia/src/gpu/effects/GrBicubicEffect.h
index f002a6f911b56..33d5e80f42b7b 100644
--- a/third_party/skia/src/gpu/effects/GrBicubicEffect.h
+++ b/third_party/skia/src/gpu/effects/GrBicubicEffect.h
@@ -114,7 +114,7 @@ class GrBicubicEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp b/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
index e0f2a2a84ecb1..c377ac529382d 100644
--- a/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -10,6 +10,7 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrAtlasedShaderHelpers.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
@@ -54,7 +55,7 @@ class GrBitmapTextGeoProc::Impl : public ProgramImpl {
 
         const char* atlasDimensionsInvName;
         fAtlasDimensionsInvUniform = uniformHandler->addUniform(nullptr, kVertex_GrShaderFlag,
-                kFloat2_GrSLType, "AtlasSizeInv", &atlasDimensionsInvName);
+                SkSLType::kFloat2, "AtlasSizeInv", &atlasDimensionsInvName);
 
         GrGLSLVarying uv, texIdx;
         append_index_uv_varyings(args,
@@ -127,9 +128,9 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(const GrShaderCaps& caps,
     SkASSERT(numActiveViews <= kMaxTextures);
 
     if (usesW) {
-        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
     } else {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
     }
 
     bool hasVertexColor = kA8_GrMaskFormat == fMaskFormat ||
@@ -139,8 +140,8 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(const GrShaderCaps& caps,
     }
 
     fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType,
-                        caps.integerSupport() ? kUShort2_GrSLType : kFloat2_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+                        caps.integerSupport() ? SkSLType::kUShort2 : SkSLType::kFloat2};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 
     if (numActiveViews) {
         fAtlasDimensions = views[0].proxy()->dimensions();
@@ -177,7 +178,7 @@ void GrBitmapTextGeoProc::addNewViews(const GrSurfaceProxyView* views,
     this->setTextureSamplerCnt(numActiveViews);
 }
 
-void GrBitmapTextGeoProc::addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrBitmapTextGeoProc::addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     b->addBool(fUsesW, "usesW");
     static_assert(kLast_GrMaskFormat < (1u << 2));
     b->addBits(2, fMaskFormat, "maskFormat");
diff --git a/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.h b/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.h
index 682b8905b49ea..5522a457ac693 100644
--- a/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/third_party/skia/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -47,7 +47,7 @@ class GrBitmapTextGeoProc : public GrGeometryProcessor {
 
     void addNewViews(const GrSurfaceProxyView*, int numActiveViews, GrSamplerState);
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps& caps) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp b/third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp
index 75defca1ee64d..ed9581f77d19c 100644
--- a/third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp
+++ b/third_party/skia/src/gpu/effects/GrBlendFragmentProcessor.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 
 #include "src/gpu/GrFragmentProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -138,7 +139,7 @@ class BlendFragmentProcessor : public GrFragmentProcessor {
         return flags;
     }
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override {
         b->add32((int)fMode);
     }
 
diff --git a/third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp b/third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp
index 8a8fe3986e91d..9ddb12bc306d9 100644
--- a/third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp
@@ -5,8 +5,10 @@
  * found in the LICENSE file.
  */
 
-#include "src/core/SkPathPriv.h"
 #include "src/gpu/effects/GrConvexPolyEffect.h"
+
+#include "src/core/SkPathPriv.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -85,7 +87,7 @@ GrFPResult GrConvexPolyEffect::Make(std::unique_ptr<GrFragmentProcessor> inputFP
 
 GrConvexPolyEffect::~GrConvexPolyEffect() {}
 
-void GrConvexPolyEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrConvexPolyEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     static_assert(kGrClipEdgeTypeCnt <= 8);
     uint32_t key = (fEdgeCount << 3) | static_cast<int>(fEdgeType);
     b->add32(key);
diff --git a/third_party/skia/src/gpu/effects/GrConvexPolyEffect.h b/third_party/skia/src/gpu/effects/GrConvexPolyEffect.h
index de19e6f849bef..fa9e60d8fae61 100644
--- a/third_party/skia/src/gpu/effects/GrConvexPolyEffect.h
+++ b/third_party/skia/src/gpu/effects/GrConvexPolyEffect.h
@@ -67,7 +67,7 @@ class GrConvexPolyEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor& other) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrCoverageSetOpXP.cpp b/third_party/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
index 9bf5bd408782d..1140c2a28bb72 100644
--- a/third_party/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
+++ b/third_party/skia/src/gpu/effects/GrCoverageSetOpXP.cpp
@@ -11,6 +11,7 @@
 #include "src/gpu/GrColor.h"
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -27,7 +28,7 @@ class CoverageSetOpXP : public GrXferProcessor {
     std::unique_ptr<ProgramImpl> makeProgramImpl() const override;
 
 private:
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override;
 
@@ -43,7 +44,7 @@ class CoverageSetOpXP : public GrXferProcessor {
     using INHERITED = GrXferProcessor;
 };
 
-void CoverageSetOpXP::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void CoverageSetOpXP::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     b->addBool(fInvertCoverage, "invert coverage");
 }
 
diff --git a/third_party/skia/src/gpu/effects/GrCustomXfermode.cpp b/third_party/skia/src/gpu/effects/GrCustomXfermode.cpp
index 043485a044f46..cc2591a777a90 100644
--- a/third_party/skia/src/gpu/effects/GrCustomXfermode.cpp
+++ b/third_party/skia/src/gpu/effects/GrCustomXfermode.cpp
@@ -13,6 +13,7 @@
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
@@ -91,7 +92,7 @@ class CustomXP : public GrXferProcessor {
 private:
     bool hasHWBlendEquation() const { return kIllegal_GrBlendEquation != fHWBlendEquation; }
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     void onGetBlendInfo(BlendInfo*) const override;
 
@@ -103,7 +104,7 @@ class CustomXP : public GrXferProcessor {
     using INHERITED = GrXferProcessor;
 };
 
-void CustomXP::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void CustomXP::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = 0;
     if (this->hasHWBlendEquation()) {
         SkASSERT(caps.advBlendEqInteraction() > 0);  // 0 will mean !xp.hasHWBlendEquation().
diff --git a/third_party/skia/src/gpu/effects/GrDisableColorXP.cpp b/third_party/skia/src/gpu/effects/GrDisableColorXP.cpp
index cab527eaa3886..aaaf51a9f4a39 100644
--- a/third_party/skia/src/gpu/effects/GrDisableColorXP.cpp
+++ b/third_party/skia/src/gpu/effects/GrDisableColorXP.cpp
@@ -25,7 +25,7 @@ class DisableColorXP : public GrXferProcessor {
 private:
     const char* name() const override { return "Disable Color"; }
     bool onIsEqual(const GrXferProcessor& xpBase) const override { return true; }
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override {
         blendInfo->fWriteColor = false;
     }
@@ -49,7 +49,7 @@ std::unique_ptr<GrXferProcessor::ProgramImpl> DisableColorXP::makeProgramImpl()
         }
 
         void emitWriteSwizzle(GrGLSLXPFragmentBuilder*,
-                              const GrSwizzle&,
+                              const skgpu::Swizzle&,
                               const char*,
                               const char*) const override {
             // Don't write any swizzling. This makes sure the final shader does not output a color.
diff --git a/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index d125cc672d589..688dec3a5978d 100644
--- a/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -9,6 +9,7 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrAtlasedShaderHelpers.h"
 #include "src/gpu/effects/GrDistanceFieldGeoProc.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -63,7 +64,7 @@ class GrDistanceFieldA8TextGeoProc::Impl : public ProgramImpl {
         const char* atlasDimensionsInvName;
         fAtlasDimensionsInvUniform = uniformHandler->addUniform(nullptr,
                                                                 kVertex_GrShaderFlag,
-                                                                kFloat2_GrSLType,
+                                                                SkSLType::kFloat2,
                                                                 "AtlasDimensionsInv",
                                                                 &atlasDimensionsInvName);
 #ifdef SK_GAMMA_APPLY_TO_A8
@@ -71,7 +72,7 @@ class GrDistanceFieldA8TextGeoProc::Impl : public ProgramImpl {
         const char* distanceAdjustUniName = nullptr;
         // width, height, 1/(3*width)
         fDistanceAdjustUni = uniformHandler->addUniform(nullptr, kFragment_GrShaderFlag,
-                                                        kHalf_GrSLType, "DistanceAdjust",
+                                                        SkSLType::kHalf, "DistanceAdjust",
                                                         &distanceAdjustUniName);
 #endif
 
@@ -221,14 +222,14 @@ GrDistanceFieldA8TextGeoProc::GrDistanceFieldA8TextGeoProc(const GrShaderCaps& c
     SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
 
     if (flags & kPerspective_DistanceFieldEffectFlag) {
-        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
     } else {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
     }
-    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType };
+    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4 };
     fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType,
-                        caps.integerSupport() ? kUShort2_GrSLType : kFloat2_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+                        caps.integerSupport() ? SkSLType::kUShort2 : SkSLType::kFloat2};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 
     if (numViews) {
         fAtlasDimensions = views[0].proxy()->dimensions();
@@ -265,7 +266,7 @@ void GrDistanceFieldA8TextGeoProc::addNewViews(const GrSurfaceProxyView* views,
 }
 
 void GrDistanceFieldA8TextGeoProc::addToKey(const GrShaderCaps& caps,
-                                            GrProcessorKeyBuilder* b) const {
+                                            skgpu::KeyBuilder* b) const {
     uint32_t key = 0;
     key |= fFlags;
     key |= ProgramImpl::ComputeMatrixKey(caps, fLocalMatrix) << 16;
@@ -351,7 +352,7 @@ class GrDistanceFieldPathGeoProc::Impl : public ProgramImpl {
         const char* atlasDimensionsInvName;
         fAtlasDimensionsInvUniform = uniformHandler->addUniform(nullptr,
                                                                 kVertex_GrShaderFlag,
-                                                                kFloat2_GrSLType,
+                                                                SkSLType::kFloat2,
                                                                 "AtlasDimensionsInv",
                                                                 &atlasDimensionsInvName);
 
@@ -490,11 +491,11 @@ GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc(const GrShaderCaps& caps,
     SkASSERT(numViews <= kMaxTextures);
     SkASSERT(!(flags & ~kNonLCD_DistanceFieldEffectMask));
 
-    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
     fInColor = MakeColorAttribute("inColor", wideColor);
     fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType,
-                        caps.integerSupport() ? kUShort2_GrSLType : kFloat2_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+                        caps.integerSupport() ? SkSLType::kUShort2 : SkSLType::kFloat2};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 
     if (numViews) {
         fAtlasDimensions = views[0].proxy()->dimensions();
@@ -532,7 +533,7 @@ void GrDistanceFieldPathGeoProc::addNewViews(const GrSurfaceProxyView* views,
 }
 
 void GrDistanceFieldPathGeoProc::addToKey(const GrShaderCaps& caps,
-                                          GrProcessorKeyBuilder* b) const {
+                                          skgpu::KeyBuilder* b) const {
     uint32_t key = fFlags;
     key |= ProgramImpl::ComputeMatrixKey(caps, fMatrix) << 16;
     key |= fMatrix.hasPerspective() << (16 + ProgramImpl::kMatrixKeyBits);
@@ -617,7 +618,7 @@ class GrDistanceFieldLCDTextGeoProc::Impl : public ProgramImpl {
         const char* atlasDimensionsInvName;
         fAtlasDimensionsInvUniform = uniformHandler->addUniform(nullptr,
                                                                 kVertex_GrShaderFlag,
-                                                                kFloat2_GrSLType,
+                                                                SkSLType::kFloat2,
                                                                 "AtlasDimensionsInv",
                                                                 &atlasDimensionsInvName);
 
@@ -648,7 +649,7 @@ class GrDistanceFieldLCDTextGeoProc::Impl : public ProgramImpl {
                                  &texIdx,
                                  &st);
 
-        GrGLSLVarying delta(kFloat_GrSLType);
+        GrGLSLVarying delta(SkSLType::kFloat);
         varyingHandler->addVarying("Delta", &delta);
         if (dfTexEffect.fFlags & kBGR_DistanceFieldEffectFlag) {
             vertBuilder->codeAppendf("%s = -%s.x/3.0;", delta.vsOut(), atlasDimensionsInvName);
@@ -721,7 +722,7 @@ class GrDistanceFieldLCDTextGeoProc::Impl : public ProgramImpl {
         // adjust width based on gamma
         const char* distanceAdjustUniName = nullptr;
         fDistanceAdjustUni = uniformHandler->addUniform(nullptr, kFragment_GrShaderFlag,
-                                                        kHalf3_GrSLType, "DistanceAdjust",
+                                                        SkSLType::kHalf3, "DistanceAdjust",
                                                         &distanceAdjustUniName);
         fragBuilder->codeAppendf("distance -= %s;", distanceAdjustUniName);
 
@@ -800,14 +801,14 @@ GrDistanceFieldLCDTextGeoProc::GrDistanceFieldLCDTextGeoProc(const GrShaderCaps&
     SkASSERT(!(flags & ~kLCD_DistanceFieldEffectMask) && (flags & kUseLCD_DistanceFieldEffectFlag));
 
     if (fFlags & kPerspective_DistanceFieldEffectFlag) {
-        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+        fInPosition = {"inPosition", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
     } else {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
     }
-    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
+    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4};
     fInTextureCoords = {"inTextureCoords", kUShort2_GrVertexAttribType,
-                        caps.integerSupport() ? kUShort2_GrSLType : kFloat2_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+                        caps.integerSupport() ? SkSLType::kUShort2 : SkSLType::kFloat2};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 
     if (numViews) {
         fAtlasDimensions = views[0].proxy()->dimensions();
@@ -845,7 +846,7 @@ void GrDistanceFieldLCDTextGeoProc::addNewViews(const GrSurfaceProxyView* views,
 }
 
 void GrDistanceFieldLCDTextGeoProc::addToKey(const GrShaderCaps& caps,
-                                             GrProcessorKeyBuilder* b) const {
+                                             skgpu::KeyBuilder* b) const {
     uint32_t key = 0;
     key |= ProgramImpl::ComputeMatrixKey(caps, fLocalMatrix);
     key |= fFlags << 16;
diff --git a/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.h b/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
index 0cbcdf031750a..b0c9e6f8e7658 100644
--- a/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
+++ b/third_party/skia/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -92,7 +92,7 @@ class GrDistanceFieldA8TextGeoProc : public GrGeometryProcessor {
 
     void addNewViews(const GrSurfaceProxyView* views, int numViews, GrSamplerState);
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -154,7 +154,7 @@ class GrDistanceFieldPathGeoProc : public GrGeometryProcessor {
 
     void addNewViews(const GrSurfaceProxyView*, int numActiveViews, GrSamplerState);
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -230,7 +230,7 @@ class GrDistanceFieldLCDTextGeoProc : public GrGeometryProcessor {
 
     void addNewViews(const GrSurfaceProxyView*, int numActiveViews, GrSamplerState);
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
index 66f02669938cf..3cffb507bfaf8 100644
--- a/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
+++ b/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp
@@ -10,6 +10,7 @@
 #include "src/core/SkGpuBlurUtils.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
@@ -220,7 +221,7 @@ GrGaussianConvolutionFragmentProcessor::GrGaussianConvolutionFragmentProcessor(
 }
 
 void GrGaussianConvolutionFragmentProcessor::onAddToKey(const GrShaderCaps& shaderCaps,
-                                                        GrProcessorKeyBuilder* b) const {
+                                                        skgpu::KeyBuilder* b) const {
     if (loop_type(shaderCaps) != LoopType::kVariableLength) {
         b->add32(fRadius);
     }
diff --git a/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h b/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
index a0f87f5466dba..905f4d4edf228 100644
--- a/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
+++ b/third_party/skia/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h
@@ -70,7 +70,7 @@ class GrGaussianConvolutionFragmentProcessor : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
index ba8b973e2e599..dc37d9398bef9 100644
--- a/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.cpp
@@ -13,6 +13,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrTextureProxy.h"
 #include "src/gpu/GrThreadSafeCache.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -85,10 +86,10 @@ GrMatrixConvolutionEffect::KernelWrapper::Make(GrRecordingContext* rContext,
     // TODO: Pick cache or dont-cache based on observed perf.
     static constexpr bool kCacheKernelTexture = true;
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     if (kCacheKernelTexture) {
-        static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(&key, kDomain, length, "Matrix Convolution Kernel");
+        static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+        skgpu::UniqueKey::Builder builder(&key, kDomain, length, "Matrix Convolution Kernel");
         // Texture cache key is the exact content of the kernel.
         static_assert(sizeof(float) == 4);
         for (int i = 0; i < length; i++) {
@@ -206,15 +207,15 @@ void GrMatrixConvolutionEffect::Impl::emitCode(EmitArgs& args) {
     GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
     if (mce.fKernel.isSampled()) {
         fKernelBiasUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag,
-                                                    kHalf_GrSLType, "KernelBias");
+                                                    SkSLType::kHalf, "KernelBias");
     } else {
         fKernelUni = uniformHandler->addUniformArray(&mce, kFragment_GrShaderFlag,
-                                                     kHalf4_GrSLType, "Kernel", arrayCount);
+                                                     SkSLType::kHalf4, "Kernel", arrayCount);
     }
-    fKernelOffsetUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, kHalf2_GrSLType,
+    fKernelOffsetUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, SkSLType::kHalf2,
                                                   "KernelOffset");
-    fGainUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, kHalf_GrSLType, "Gain");
-    fBiasUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, kHalf_GrSLType, "Bias");
+    fGainUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, SkSLType::kHalf, "Gain");
+    fBiasUni = uniformHandler->addUniform(&mce, kFragment_GrShaderFlag, SkSLType::kHalf, "Bias");
 
     const char* kernelOffset = uniformHandler->getUniformCStr(fKernelOffsetUni);
     const char* gain = uniformHandler->getUniformCStr(fGainUni);
@@ -301,7 +302,7 @@ std::unique_ptr<GrFragmentProcessor> GrMatrixConvolutionEffect::clone() const {
 }
 
 void GrMatrixConvolutionEffect::onAddToKey(const GrShaderCaps& caps,
-                                           GrProcessorKeyBuilder* b) const {
+                                           skgpu::KeyBuilder* b) const {
     SkASSERT(this->fKernel.size().width() <= 0x7FFF && this->fKernel.size().height() <= 0xFFFF);
     uint32_t key = this->fKernel.size().width() << 16 | this->fKernel.size().height();
     key |= fConvolveAlpha ? 1U << 31 : 0;
diff --git a/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.h b/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
index 024fa3f44a760..af0dd50a024c7 100644
--- a/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
+++ b/third_party/skia/src/gpu/effects/GrMatrixConvolutionEffect.h
@@ -103,7 +103,7 @@ class GrMatrixConvolutionEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrMatrixEffect.cpp b/third_party/skia/src/gpu/effects/GrMatrixEffect.cpp
index 5ba70ae6a3be1..87199f431ab59 100644
--- a/third_party/skia/src/gpu/effects/GrMatrixEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrMatrixEffect.cpp
@@ -33,7 +33,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrMatrixEffect::onMakeProgramI
         void emitCode(EmitArgs& args) override {
             fMatrixVar = args.fUniformHandler->addUniform(&args.fFp,
                                                           kFragment_GrShaderFlag,
-                                                          kFloat3x3_GrSLType,
+                                                          SkSLType::kFloat3x3,
                                                           SkSL::SampleUsage::MatrixUniformName());
             args.fFragBuilder->codeAppendf("return %s;\n",
                                            this->invokeChildWithMatrix(0, args).c_str());
@@ -58,7 +58,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrMatrixEffect::onMakeProgramI
     return std::make_unique<Impl>();
 }
 
-void GrMatrixEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {}
+void GrMatrixEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {}
 
 bool GrMatrixEffect::onIsEqual(const GrFragmentProcessor& other) const {
     const GrMatrixEffect& that = other.cast<GrMatrixEffect>();
diff --git a/third_party/skia/src/gpu/effects/GrMatrixEffect.h b/third_party/skia/src/gpu/effects/GrMatrixEffect.h
index b738d706d0c24..ced35224b981d 100644
--- a/third_party/skia/src/gpu/effects/GrMatrixEffect.h
+++ b/third_party/skia/src/gpu/effects/GrMatrixEffect.h
@@ -33,7 +33,7 @@ class GrMatrixEffect : public GrFragmentProcessor {
     }
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
     bool onIsEqual(const GrFragmentProcessor&) const override;
     SkPMColor4f constantOutputForConstantInput(const SkPMColor4f& inputColor) const override {
         return ConstantOutputForConstantInput(this->childProcessor(0), inputColor);
diff --git a/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp b/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp
index 815d8b8bab098..56dd5a75621d3 100644
--- a/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/effects/GrModulateAtlasCoverageEffect.h"
 
 #include "src/gpu/GrDynamicAtlas.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 
 GrModulateAtlasCoverageEffect::GrModulateAtlasCoverageEffect(
@@ -32,6 +33,11 @@ GrModulateAtlasCoverageEffect::GrModulateAtlasCoverageEffect(
         , fFlags(that.fFlags)
         , fBounds(that.fBounds) {}
 
+void GrModulateAtlasCoverageEffect::onAddToKey(const GrShaderCaps&,
+                                               skgpu::KeyBuilder* b) const {
+    b->add32(fFlags & Flags::kCheckBounds);
+}
+
 std::unique_ptr<GrFragmentProcessor::ProgramImpl>
 GrModulateAtlasCoverageEffect::onMakeProgramImpl() const {
     class Impl : public ProgramImpl {
@@ -44,7 +50,7 @@ GrModulateAtlasCoverageEffect::onMakeProgramImpl() const {
             if (fp.fFlags & Flags::kCheckBounds) {
                 const char* boundsName;
                 fBoundsUniform = uniHandler->addUniform(&fp, kFragment_GrShaderFlag,
-                                                        kFloat4_GrSLType, "bounds", &boundsName);
+                                                        SkSLType::kFloat4, "bounds", &boundsName);
                 // Are we inside the path's valid atlas bounds?
                 f->codeAppendf("if (all(greaterThan(sk_FragCoord.xy, %s.xy)) && "
                                    "all(lessThan(sk_FragCoord.xy, %s.zw))) ",
@@ -56,7 +62,7 @@ GrModulateAtlasCoverageEffect::onMakeProgramImpl() const {
             f->codeAppendf("}");
             const char* coverageMaybeInvertName;
             fCoverageMaybeInvertUniform = uniHandler->addUniform(&fp, kFragment_GrShaderFlag,
-                                                                 kHalf2_GrSLType, "coverageInvert",
+                                                                 SkSLType::kHalf2, "coverageInvert",
                                                                  &coverageMaybeInvertName);
             // Invert coverage, if needed.
             f->codeAppendf("coverage = coverage * %s.x + %s.y;",
diff --git a/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.h b/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.h
index ef8e26d13aaab..781390a5a8a06 100644
--- a/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.h
+++ b/third_party/skia/src/gpu/effects/GrModulateAtlasCoverageEffect.h
@@ -36,9 +36,8 @@ class GrModulateAtlasCoverageEffect : public GrFragmentProcessor {
     }
 
 private:
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
-        b->add32(fFlags & Flags::kCheckBounds);
-    }
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override;
+
     bool onIsEqual(const GrFragmentProcessor& that) const override {
         auto fp = that.cast<GrModulateAtlasCoverageEffect>();
         return fFlags == fp.fFlags && fBounds == fp.fBounds;
diff --git a/third_party/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/third_party/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index ea6e34e25dd74..ed632ac260e52 100644
--- a/third_party/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/third_party/skia/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -16,6 +16,7 @@
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrProcessorAnalysis.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
@@ -385,7 +386,7 @@ class PorterDuffXferProcessor : public GrXferProcessor {
     BlendFormula getBlendFormula() const { return fBlendFormula; }
 
 private:
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onHasSecondaryOutput() const override { return fBlendFormula.hasSecondaryOutput(); }
 
@@ -439,7 +440,7 @@ static void append_color_output(const PorterDuffXferProcessor& xp,
     }
 }
 
-void PorterDuffXferProcessor::onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
+void PorterDuffXferProcessor::onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const {
     b->add32(fBlendFormula.primaryOutput() | (fBlendFormula.secondaryOutput() << 3));
     static_assert(BlendFormula::kLast_OutputType < 8);
 }
@@ -486,7 +487,7 @@ class ShaderPDXferProcessor : public GrXferProcessor {
     std::unique_ptr<ProgramImpl> makeProgramImpl() const override;
 
 private:
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrXferProcessor& xpBase) const override {
         const ShaderPDXferProcessor& xp = xpBase.cast<ShaderPDXferProcessor>();
@@ -501,7 +502,7 @@ class ShaderPDXferProcessor : public GrXferProcessor {
 ///////////////////////////////////////////////////////////////////////////////
 
 
-void ShaderPDXferProcessor::onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
+void ShaderPDXferProcessor::onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const {
     b->add32(static_cast<int>(fXfermode));
 }
 
@@ -547,7 +548,7 @@ class PDLCDXferProcessor : public GrXferProcessor {
 private:
     PDLCDXferProcessor(const SkPMColor4f& blendConstant, float alpha);
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
     void onGetBlendInfo(GrXferProcessor::BlendInfo* blendInfo) const override {
         blendInfo->fSrcBlend = kConstC_GrBlendCoeff;
@@ -598,7 +599,7 @@ std::unique_ptr<GrXferProcessor::ProgramImpl> PDLCDXferProcessor::makeProgramImp
             const char* alpha;
             fAlphaUniform = args.fUniformHandler->addUniform(nullptr,
                                                              kFragment_GrShaderFlag,
-                                                             kHalf_GrSLType,
+                                                             SkSLType::kHalf,
                                                              "alpha",
                                                              &alpha);
             GrGLSLXPFragmentBuilder* fragBuilder = args.fXPFragBuilder;
diff --git a/third_party/skia/src/gpu/effects/GrRRectEffect.cpp b/third_party/skia/src/gpu/effects/GrRRectEffect.cpp
index 7b8258c3c7d8e..22cfc0617da4d 100644
--- a/third_party/skia/src/gpu/effects/GrRRectEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrRRectEffect.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkTLazy.h"
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrConvexPolyEffect.h"
 #include "src/gpu/effects/GrOvalEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -62,7 +63,7 @@ class CircularRRectEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor& other) const override;
 
@@ -161,11 +162,11 @@ void CircularRRectEffect::Impl::emitCode(EmitArgs& args) {
     // edges correspond to components x, y, z, and w, respectively. When a side of the rrect has
     // only rectangular corners, that side's value corresponds to the rect edge's value outset by
     // half a pixel.
-    fInnerRectUniform = uniformHandler->addUniform(&crre, kFragment_GrShaderFlag, kFloat4_GrSLType,
+    fInnerRectUniform = uniformHandler->addUniform(&crre, kFragment_GrShaderFlag, SkSLType::kFloat4,
                                                    "innerRect", &rectName);
     // x is (r + .5) and y is 1/(r + .5)
     fRadiusPlusHalfUniform = uniformHandler->addUniform(&crre, kFragment_GrShaderFlag,
-                                                        kHalf2_GrSLType, "radiusPlusHalf",
+                                                        SkSLType::kHalf2, "radiusPlusHalf",
                                                         &radiusPlusHalfName);
 
     // If we're on a device where float != fp32 then the length calculation could overflow.
@@ -371,7 +372,7 @@ void CircularRRectEffect::Impl::onSetData(const GrGLSLProgramDataManager& pdman,
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void CircularRRectEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void CircularRRectEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     static_assert(kGrClipEdgeTypeCnt <= 8);
     b->add32((fCircularCornerFlags << 3) | static_cast<int>(fEdgeType));
 }
@@ -401,7 +402,7 @@ class EllipticalRRectEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor& other) const override;
 
@@ -512,7 +513,7 @@ void EllipticalRRectEffect::Impl::emitCode(EmitArgs& args) {
     GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
     const char *rectName;
     // The inner rect is the rrect bounds inset by the x/y radii
-    fInnerRectUniform = uniformHandler->addUniform(&erre, kFragment_GrShaderFlag, kFloat4_GrSLType,
+    fInnerRectUniform = uniformHandler->addUniform(&erre, kFragment_GrShaderFlag, SkSLType::kFloat4,
                                                    "innerRect", &rectName);
 
     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
@@ -536,7 +537,7 @@ void EllipticalRRectEffect::Impl::emitCode(EmitArgs& args) {
     // radii uniform values are already in this normalized space.
     const char* scaleName = nullptr;
     if (!args.fShaderCaps->floatIs32Bits()) {
-        fScaleUniform = uniformHandler->addUniform(&erre, kFragment_GrShaderFlag, kHalf2_GrSLType,
+        fScaleUniform = uniformHandler->addUniform(&erre, kFragment_GrShaderFlag, SkSLType::kHalf2,
                                                    "scale", &scaleName);
     }
 
@@ -546,7 +547,7 @@ void EllipticalRRectEffect::Impl::emitCode(EmitArgs& args) {
             const char *invRadiiXYSqdName;
             fInvRadiiSqdUniform = uniformHandler->addUniform(&erre,
                                                              kFragment_GrShaderFlag,
-                                                             kFloat2_GrSLType,
+                                                             SkSLType::kFloat2,
                                                              "invRadiiXY",
                                                              &invRadiiXYSqdName);
             fragBuilder->codeAppend("float2 dxy = max(max(dxy0, dxy1), 0.0);");
@@ -561,7 +562,7 @@ void EllipticalRRectEffect::Impl::emitCode(EmitArgs& args) {
             const char *invRadiiLTRBSqdName;
             fInvRadiiSqdUniform = uniformHandler->addUniform(&erre,
                                                              kFragment_GrShaderFlag,
-                                                             kFloat4_GrSLType,
+                                                             SkSLType::kFloat4,
                                                              "invRadiiLTRB",
                                                              &invRadiiLTRBSqdName);
             if (scaleName) {
@@ -663,7 +664,7 @@ void EllipticalRRectEffect::Impl::onSetData(const GrGLSLProgramDataManager& pdma
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void EllipticalRRectEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void EllipticalRRectEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     static_assert((int)GrClipEdgeType::kLast < (1 << 3));
     b->add32(fRRect.getType() | static_cast<int>(fEdgeType) << 3);
 }
diff --git a/third_party/skia/src/gpu/effects/GrShadowGeoProc.cpp b/third_party/skia/src/gpu/effects/GrShadowGeoProc.cpp
index 4d2528f7f7381..5d24b0988a1a0 100644
--- a/third_party/skia/src/gpu/effects/GrShadowGeoProc.cpp
+++ b/third_party/skia/src/gpu/effects/GrShadowGeoProc.cpp
@@ -53,10 +53,10 @@ class GrRRectShadowGeoProc::Impl : public ProgramImpl {
 
 GrRRectShadowGeoProc::GrRRectShadowGeoProc(const GrSurfaceProxyView& lutView)
         : INHERITED(kGrRRectShadowGeoProc_ClassID) {
-    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
-    fInShadowParams = {"inShadowParams", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+    fInColor = {"inColor", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4};
+    fInShadowParams = {"inShadowParams", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 
     SkASSERT(lutView.proxy());
     fLUTTextureSampler.reset(GrSamplerState::Filter::kLinear, lutView.proxy()->backendFormat(),
diff --git a/third_party/skia/src/gpu/effects/GrShadowGeoProc.h b/third_party/skia/src/gpu/effects/GrShadowGeoProc.h
index ac9d0a6091a20..7837c9466f2a4 100644
--- a/third_party/skia/src/gpu/effects/GrShadowGeoProc.h
+++ b/third_party/skia/src/gpu/effects/GrShadowGeoProc.h
@@ -34,7 +34,7 @@ class GrRRectShadowGeoProc : public GrGeometryProcessor {
     const Attribute& inShadowParams() const { return fInShadowParams; }
     GrColor color() const { return fColor; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrSkSLFP.cpp b/third_party/skia/src/gpu/effects/GrSkSLFP.cpp
index 598c2c0d80915..8b475784201fa 100644
--- a/third_party/skia/src/gpu/effects/GrSkSLFP.cpp
+++ b/third_party/skia/src/gpu/effects/GrSkSLFP.cpp
@@ -15,6 +15,7 @@
 #include "src/gpu/GrBaseContextPriv.h"
 #include "src/gpu/GrColorInfo.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/sksl/SkSLUtil.h"
@@ -42,15 +43,13 @@ class GrSkSLFP::Impl : public ProgramImpl {
                     , fUniformData(uniformData)
                     , fUniformFlags(uniformFlags) {}
 
-            using String = SkSL::String;
-
-            String declareUniform(const SkSL::VarDeclaration* decl) override {
+            std::string declareUniform(const SkSL::VarDeclaration* decl) override {
                 const SkSL::Variable& var = decl->var();
                 if (var.type().isOpaque()) {
                     // Nothing to do. The only opaque types we should see are children, and those
                     // are handled specially, above.
                     SkASSERT(var.type().isEffectChild());
-                    return String(var.name());
+                    return std::string(var.name());
                 }
 
                 const SkSL::Type* type = &var.type();
@@ -65,19 +64,19 @@ class GrSkSLFP::Impl : public ProgramImpl {
                     isArray = true;
                 }
 
-                GrSLType gpuType;
-                SkAssertResult(SkSL::type_to_grsltype(fContext, *type, &gpuType));
+                SkSLType gpuType;
+                SkAssertResult(SkSL::type_to_sksltype(fContext, *type, &gpuType));
 
                 if (*fUniformFlags++ & GrSkSLFP::kSpecialize_Flag) {
                     SkASSERTF(!isArray, "specializing array uniforms is not allowed");
-                    String value = GrGLSLTypeString(gpuType);
+                    std::string value = GrGLSLTypeString(gpuType);
                     value.append("(");
 
-                    bool isFloat = GrSLTypeIsFloatType(gpuType);
+                    bool isFloat = SkSLTypeIsFloatType(gpuType);
                     size_t slots = type->slotCount();
                     for (size_t i = 0; i < slots; ++i) {
-                        value.append(isFloat ? SkSL::to_string(floatData[i])
-                                             : SkSL::to_string(intData[i]));
+                        value.append(isFloat ? skstd::to_string(floatData[i])
+                                             : std::to_string(intData[i]));
                         value.append(",");
                     }
                     value.back() = ')';
@@ -93,11 +92,11 @@ class GrSkSLFP::Impl : public ProgramImpl {
                                                                isArray ? var.type().columns() : 0,
                                                                &uniformName);
                 fSelf->fUniformHandles.push_back(handle);
-                return String(uniformName);
+                return std::string(uniformName);
             }
 
-            String getMangledName(const char* name) override {
-                return String(fArgs.fFragBuilder->getMangledFunctionName(name).c_str());
+            std::string getMangledName(const char* name) override {
+                return std::string(fArgs.fFragBuilder->getMangledFunctionName(name).c_str());
             }
 
             void defineFunction(const char* decl, const char* body, bool isMain) override {
@@ -120,7 +119,7 @@ class GrSkSLFP::Impl : public ProgramImpl {
                 fArgs.fFragBuilder->definitionAppend(declaration);
             }
 
-            String sampleShader(int index, String coords) override {
+            std::string sampleShader(int index, std::string coords) override {
                 // If the child was sampled using the coords passed to main (and they are never
                 // modified), then we will have marked the child as PassThrough. The code generator
                 // doesn't know that, and still supplies coords. Inside invokeChild, we assert that
@@ -137,21 +136,46 @@ class GrSkSLFP::Impl : public ProgramImpl {
                 if (child && child->sampleUsage().isPassThrough()) {
                     coords.clear();
                 }
-                return String(fSelf->invokeChild(index, fInputColor, fArgs, coords).c_str());
+                return std::string(fSelf->invokeChild(index, fInputColor, fArgs, coords).c_str());
             }
 
-            String sampleColorFilter(int index, String color) override {
-                return String(fSelf->invokeChild(index,
+            std::string sampleColorFilter(int index, std::string color) override {
+                return std::string(fSelf->invokeChild(index,
                                                  color.empty() ? fInputColor : color.c_str(),
                                                  fArgs)
                                       .c_str());
             }
 
-            String sampleBlender(int index, String src, String dst) override {
+            std::string sampleBlender(int index, std::string src, std::string dst) override {
                 if (!fSelf->childProcessor(index)) {
-                    return String::printf("blend_src_over(%s, %s)", src.c_str(), dst.c_str());
+                    return SkSL::String::printf("blend_src_over(%s, %s)", src.c_str(), dst.c_str());
+                }
+                return std::string(
+                        fSelf->invokeChild(index, src.c_str(), dst.c_str(), fArgs).c_str());
+            }
+
+            // These intrinsics take and return 3-component vectors, but child FPs operate on
+            // 4-component vectors. We use swizzles here to paper over the difference.
+            std::string toLinearSrgb(std::string color) override {
+                const GrSkSLFP& fp = fArgs.fFp.cast<GrSkSLFP>();
+                if (fp.fToLinearSrgbChildIndex < 0) {
+                    return color;
+                }
+                color = SkSL::String::printf("(%s).rgb1", color.c_str());
+                SkString xformedColor = fSelf->invokeChild(
+                        fp.fToLinearSrgbChildIndex, color.c_str(), fArgs);
+                return SkSL::String::printf("(%s).rgb", xformedColor.c_str());
+            }
+
+            std::string fromLinearSrgb(std::string color) override {
+                const GrSkSLFP& fp = fArgs.fFp.cast<GrSkSLFP>();
+                if (fp.fFromLinearSrgbChildIndex < 0) {
+                    return color;
                 }
-                return String(fSelf->invokeChild(index, src.c_str(), dst.c_str(), fArgs).c_str());
+                color = SkSL::String::printf("(%s).rgb1", color.c_str());
+                SkString xformedColor = fSelf->invokeChild(
+                        fp.fFromLinearSrgbChildIndex, color.c_str(), fArgs);
+                return SkSL::String::printf("(%s).rgb", xformedColor.c_str());
             }
 
             Impl*                         fSelf;
@@ -192,7 +216,7 @@ class GrSkSLFP::Impl : public ProgramImpl {
         SkString inputColorName;
         if (fp.fEffect->samplesOutsideMain()) {
             GrShaderVar inputColorCopy(args.fFragBuilder->getMangledFunctionName("inColor"),
-                                       kHalf4_GrSLType);
+                                       SkSLType::kHalf4);
             args.fFragBuilder->declareGlobal(inputColorCopy);
             inputColorName = inputColorCopy.getName();
             args.fFragBuilder->codeAppendf("%s = %s;\n", inputColorName.c_str(), args.fInputColor);
@@ -265,6 +289,7 @@ class GrSkSLFP::Impl : public ProgramImpl {
 std::unique_ptr<GrSkSLFP> GrSkSLFP::MakeWithData(
         sk_sp<SkRuntimeEffect> effect,
         const char* name,
+        sk_sp<SkColorSpace> dstColorSpace,
         std::unique_ptr<GrFragmentProcessor> inputFP,
         std::unique_ptr<GrFragmentProcessor> destColorFP,
         sk_sp<SkData> uniforms,
@@ -286,6 +311,9 @@ std::unique_ptr<GrSkSLFP> GrSkSLFP::MakeWithData(
     if (destColorFP) {
         fp->setDestColorFP(std::move(destColorFP));
     }
+    if (fp->fEffect->usesColorTransform() && dstColorSpace) {
+        fp->addColorTransformChildren(std::move(dstColorSpace));
+    }
     return fp;
 }
 
@@ -312,7 +340,10 @@ GrSkSLFP::GrSkSLFP(const GrSkSLFP& other)
         , fEffect(other.fEffect)
         , fName(other.fName)
         , fUniformSize(other.fUniformSize)
-        , fInputChildIndex(other.fInputChildIndex) {
+        , fInputChildIndex(other.fInputChildIndex)
+        , fDestColorChildIndex(other.fDestColorChildIndex)
+        , fToLinearSrgbChildIndex(other.fToLinearSrgbChildIndex)
+        , fFromLinearSrgbChildIndex(other.fFromLinearSrgbChildIndex) {
     sk_careful_memcpy(this->uniformFlags(),
                       other.uniformFlags(),
                       fEffect->uniforms().size() * sizeof(UniformFlags));
@@ -347,11 +378,38 @@ void GrSkSLFP::setDestColorFP(std::unique_ptr<GrFragmentProcessor> destColorFP)
     this->registerChild(std::move(destColorFP), SkSL::SampleUsage::PassThrough());
 }
 
+void GrSkSLFP::addColorTransformChildren(sk_sp<SkColorSpace> dstColorSpace) {
+    SkASSERTF(fToLinearSrgbChildIndex == -1 && fFromLinearSrgbChildIndex == -1,
+              "addColorTransformChildren should not be called more than once");
+
+    // We use child FPs for the color transforms. They're really just code snippets that get
+    // invoked, but each one injects a collection of uniforms and helper functions. Doing it
+    // this way leverages per-FP name mangling to avoid conflicts.
+    auto workingToLinear = GrColorSpaceXformEffect::Make(nullptr,
+                                                         dstColorSpace.get(),
+                                                         kUnpremul_SkAlphaType,
+                                                         sk_srgb_linear_singleton(),
+                                                         kUnpremul_SkAlphaType);
+    auto linearToWorking = GrColorSpaceXformEffect::Make(nullptr,
+                                                         sk_srgb_linear_singleton(),
+                                                         kUnpremul_SkAlphaType,
+                                                         dstColorSpace.get(),
+                                                         kUnpremul_SkAlphaType);
+
+    fToLinearSrgbChildIndex = this->numChildProcessors();
+    SkASSERT((size_t)fToLinearSrgbChildIndex >= fEffect->fSampleUsages.size());
+    this->registerChild(std::move(workingToLinear), SkSL::SampleUsage::PassThrough());
+
+    fFromLinearSrgbChildIndex = this->numChildProcessors();
+    SkASSERT((size_t)fFromLinearSrgbChildIndex >= fEffect->fSampleUsages.size());
+    this->registerChild(std::move(linearToWorking), SkSL::SampleUsage::PassThrough());
+}
+
 std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrSkSLFP::onMakeProgramImpl() const {
     return std::make_unique<Impl>();
 }
 
-void GrSkSLFP::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrSkSLFP::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     // In the unlikely event of a hash collision, we also include the uniform size in the key.
     // That ensures that we will (at worst) use the wrong program, but one that expects the same
     // amount of uniform data.
diff --git a/third_party/skia/src/gpu/effects/GrSkSLFP.h b/third_party/skia/src/gpu/effects/GrSkSLFP.h
index fa9d489efa883..2594d900615df 100644
--- a/third_party/skia/src/gpu/effects/GrSkSLFP.h
+++ b/third_party/skia/src/gpu/effects/GrSkSLFP.h
@@ -8,6 +8,7 @@
 #ifndef GrSkSLFP_DEFINED
 #define GrSkSLFP_DEFINED
 
+#include "include/core/SkM44.h"
 #include "include/core/SkRefCnt.h"
 #include "include/effects/SkRuntimeEffect.h"
 #include "include/gpu/GrContextOptions.h"
@@ -102,6 +103,7 @@ class GrSkSLFP : public GrFragmentProcessor {
     static std::unique_ptr<GrSkSLFP> MakeWithData(
             sk_sp<SkRuntimeEffect> effect,
             const char* name,
+            sk_sp<SkColorSpace> dstColorSpace,
             std::unique_ptr<GrFragmentProcessor> inputFP,
             std::unique_ptr<GrFragmentProcessor> destColorFP,
             sk_sp<SkData> uniforms,
@@ -148,6 +150,10 @@ class GrSkSLFP : public GrFragmentProcessor {
                   effect->fChildren.end(),
                   std::forward<Args>(args)...);
 #endif
+        // This factory is used internally (for "runtime FPs"). We don't pass/know the destination
+        // color space, so these effects can't use the color transform intrinsics. Callers of this
+        // factory should instead construct an GrColorSpaceXformEffect as part of the FP tree.
+        SkASSERT(!effect->usesColorTransform());
 
         size_t uniformPayloadSize = UniformPayloadSize(effect.get());
         std::unique_ptr<GrSkSLFP> fp(new (uniformPayloadSize)
@@ -171,10 +177,11 @@ class GrSkSLFP : public GrFragmentProcessor {
     void addChild(std::unique_ptr<GrFragmentProcessor> child, bool mergeOptFlags);
     void setInput(std::unique_ptr<GrFragmentProcessor> input);
     void setDestColorFP(std::unique_ptr<GrFragmentProcessor> destColorFP);
+    void addColorTransformChildren(sk_sp<SkColorSpace> dstColorSpace);
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
@@ -405,6 +412,8 @@ class GrSkSLFP : public GrFragmentProcessor {
     uint32_t               fUniformSize;
     int                    fInputChildIndex = -1;
     int                    fDestColorChildIndex = -1;
+    int                    fToLinearSrgbChildIndex = -1;
+    int                    fFromLinearSrgbChildIndex = -1;
 
     GR_DECLARE_FRAGMENT_PROCESSOR_TEST
 
diff --git a/third_party/skia/src/gpu/effects/GrTextureEffect.cpp b/third_party/skia/src/gpu/effects/GrTextureEffect.cpp
index 2b2beaa4c5fbe..98076d5dad684 100644
--- a/third_party/skia/src/gpu/effects/GrTextureEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrTextureEffect.cpp
@@ -9,6 +9,7 @@
 
 #include "src/core/SkMatrixPriv.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrMatrixEffect.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/sksl/SkSLUtil.h"
@@ -344,7 +345,7 @@ void GrTextureEffect::Impl::emitCode(EmitArgs& args) {
         const char* borderName = nullptr;
         if (te.hasClampToBorderShaderMode()) {
             fBorderUni = args.fUniformHandler->addUniform(
-                    &te, kFragment_GrShaderFlag, kHalf4_GrSLType, "border", &borderName);
+                    &te, kFragment_GrShaderFlag, SkSLType::kHalf4, "border", &borderName);
         }
         auto modeUsesSubset = [](ShaderMode m) {
           switch (m) {
@@ -382,13 +383,13 @@ void GrTextureEffect::Impl::emitCode(EmitArgs& args) {
         const char* subsetName = nullptr;
         if (useSubset[0] || useSubset[1]) {
             fSubsetUni = args.fUniformHandler->addUniform(
-                    &te, kFragment_GrShaderFlag, kFloat4_GrSLType, "subset", &subsetName);
+                    &te, kFragment_GrShaderFlag, SkSLType::kFloat4, "subset", &subsetName);
         }
 
         const char* clampName = nullptr;
         if (useClamp[0] || useClamp[1]) {
             fClampUni = args.fUniformHandler->addUniform(
-                    &te, kFragment_GrShaderFlag, kFloat4_GrSLType, "clamp", &clampName);
+                    &te, kFragment_GrShaderFlag, SkSLType::kFloat4, "clamp", &clampName);
         }
 
         bool unormCoordsRequiredForShaderMode = ShaderModeRequiresUnormCoord(m[0]) ||
@@ -404,7 +405,7 @@ void GrTextureEffect::Impl::emitCode(EmitArgs& args) {
             // TODO: Detect support for textureSize() or polyfill textureSize() in SkSL and
             // always use?
             fIDimsUni = args.fUniformHandler->addUniform(&te, kFragment_GrShaderFlag,
-                                                         kFloat2_GrSLType, "idims", &idims);
+                                                         SkSLType::kFloat2, "idims", &idims);
         }
 
         // Generates a string to read at a coordinate, normalizing coords if necessary.
@@ -720,7 +721,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrTextureEffect::onMakeProgram
     return std::make_unique<Impl>();
 }
 
-void GrTextureEffect::onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
+void GrTextureEffect::onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const {
     auto m0 = static_cast<uint32_t>(fShaderModes[0]);
     b->addBits(8, m0, "shaderMode0");
 
diff --git a/third_party/skia/src/gpu/effects/GrTextureEffect.h b/third_party/skia/src/gpu/effects/GrTextureEffect.h
index d7bbc3a76f842..632c2fc9bddc8 100644
--- a/third_party/skia/src/gpu/effects/GrTextureEffect.h
+++ b/third_party/skia/src/gpu/effects/GrTextureEffect.h
@@ -168,7 +168,7 @@ class GrTextureEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
diff --git a/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp b/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
index 61abd4c46d342..25392c6de7d10 100644
--- a/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
+++ b/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkYUVMath.h"
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/GrYUVATextureProxies.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrMatrixEffect.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -288,9 +289,9 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrYUVtoRGBEffect::onMakeProgra
 
             if (kIdentity_SkYUVColorSpace != yuvEffect.fYUVColorSpace) {
                 fColorSpaceMatrixVar = args.fUniformHandler->addUniform(&yuvEffect,
-                        kFragment_GrShaderFlag, kHalf3x3_GrSLType, "colorSpaceMatrix");
+                        kFragment_GrShaderFlag, SkSLType::kHalf3x3, "colorSpaceMatrix");
                 fColorSpaceTranslateVar = args.fUniformHandler->addUniform(&yuvEffect,
-                        kFragment_GrShaderFlag, kHalf3_GrSLType, "colorSpaceTranslate");
+                        kFragment_GrShaderFlag, SkSLType::kHalf3, "colorSpaceTranslate");
                 fragBuilder->codeAppendf(
                         "color.rgb = saturate(color.rgb * %s + %s);",
                         args.fUniformHandler->getUniformCStr(fColorSpaceMatrixVar),
@@ -336,7 +337,7 @@ std::unique_ptr<GrFragmentProcessor::ProgramImpl> GrYUVtoRGBEffect::onMakeProgra
     return std::make_unique<Impl>();
 }
 
-void GrYUVtoRGBEffect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrYUVtoRGBEffect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t packed = 0;
     int i = 0;
     for (auto [plane, channel] : fLocations) {
diff --git a/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.h b/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.h
index e617750eb30f2..663a68bbb8dc1 100644
--- a/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.h
+++ b/third_party/skia/src/gpu/effects/GrYUVtoRGBEffect.h
@@ -41,7 +41,7 @@ class GrYUVtoRGBEffect : public GrFragmentProcessor {
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override;
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
 
     bool onIsEqual(const GrFragmentProcessor&) const override;
 
diff --git a/third_party/skia/src/gpu/geometry/BUILD.bazel b/third_party/skia/src/gpu/geometry/BUILD.bazel
index d9593032dc26b..242e44c38bbe3 100644
--- a/third_party/skia/src/gpu/geometry/BUILD.bazel
+++ b/third_party/skia/src/gpu/geometry/BUILD.bazel
@@ -43,6 +43,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrAATriangulator_hdr",
+        "//src/gpu:BufferWriter_hdr",
         "//src/gpu:GrEagerVertexAllocator_hdr",
     ],
 )
diff --git a/third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp b/third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp
index 9f2e2530faec8..c561769c5a648 100644
--- a/third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp
+++ b/third_party/skia/src/gpu/geometry/GrAAConvexTessellator.cpp
@@ -20,19 +20,21 @@
 //  test more degenerate cases
 
 // The tolerance for fusing vertices and eliminating colinear lines (It is in device space).
-static const SkScalar kClose = (SK_Scalar1 / 16);
-static const SkScalar kCloseSqd = kClose * kClose;
+static constexpr SkScalar kClose = (SK_Scalar1 / 16);
+static constexpr SkScalar kCloseSqd = kClose * kClose;
 
 // tesselation tolerance values, in device space pixels
-static const SkScalar kQuadTolerance = 0.2f;
-static const SkScalar kCubicTolerance = 0.2f;
-static const SkScalar kConicTolerance = 0.25f;
+static constexpr SkScalar kQuadTolerance = 0.2f;
+static constexpr SkScalar kCubicTolerance = 0.2f;
+static constexpr SkScalar kQuadToleranceSqd = kQuadTolerance * kQuadTolerance;
+static constexpr SkScalar kCubicToleranceSqd = kCubicTolerance * kCubicTolerance;
+static constexpr SkScalar kConicTolerance = 0.25f;
 
 // dot product below which we use a round cap between curve segments
-static const SkScalar kRoundCapThreshold = 0.8f;
+static constexpr SkScalar kRoundCapThreshold = 0.8f;
 
 // dot product above which we consider two adjacent curves to be part of the "same" curve
-static const SkScalar kCurveConnectionThreshold = 0.8f;
+static constexpr SkScalar kCurveConnectionThreshold = 0.8f;
 
 static bool intersect(const SkPoint& p0, const SkPoint& n0,
                       const SkPoint& p1, const SkPoint& n1,
@@ -48,11 +50,16 @@ static bool intersect(const SkPoint& p0, const SkPoint& n0,
 
 // This is a special case version of intersect where we have the vector
 // perpendicular to the second line rather than the vector parallel to it.
-static SkScalar perp_intersect(const SkPoint& p0, const SkPoint& n0,
-                               const SkPoint& p1, const SkPoint& perp) {
+static bool perp_intersect(const SkPoint& p0, const SkPoint& n0,
+                           const SkPoint& p1, const SkPoint& perp,
+                           SkScalar* t) {
     const SkPoint v = p1 - p0;
     SkScalar perpDot = n0.dot(perp);
-    return v.dot(perp) / perpDot;
+    if (SkScalarNearlyZero(perpDot)) {
+        return false;
+    }
+    *t = v.dot(perp) / perpDot;
+    return SkScalarIsFinite(*t);
 }
 
 static bool duplicate_pt(const SkPoint& p0, const SkPoint& p1) {
@@ -355,7 +362,10 @@ bool GrAAConvexTessellator::computePtAlongBisector(int startIdx,
     // First find the point where the edge and the bisector intersect
     SkPoint newP;
 
-    SkScalar t = perp_intersect(fPts[startIdx], bisector, fPts[edgeIdx], norm);
+    SkScalar t;
+    if (!perp_intersect(fPts[startIdx], bisector, fPts[edgeIdx], norm, &t)) {
+        return false;
+    }
     if (SkScalarNearlyEqual(t, 0.0f)) {
         // the start point was one of the original ring points
         SkASSERT(startIdx < fPts.count());
@@ -956,7 +966,7 @@ void GrAAConvexTessellator::quadTo(const SkPoint pts[3]) {
     fPointBuffer.setCount(maxCount);
     SkPoint* target = fPointBuffer.begin();
     int count = GrPathUtils::generateQuadraticPoints(pts[0], pts[1], pts[2],
-                                                     kQuadTolerance, &target, maxCount);
+                                                     kQuadToleranceSqd, &target, maxCount);
     fPointBuffer.setCount(count);
     for (int i = 0; i < count - 1; i++) {
         this->lineTo(fPointBuffer[i], kCurve_CurveState);
@@ -977,7 +987,7 @@ void GrAAConvexTessellator::cubicTo(const SkMatrix& m, const SkPoint srcPts[4])
     fPointBuffer.setCount(maxCount);
     SkPoint* target = fPointBuffer.begin();
     int count = GrPathUtils::generateCubicPoints(pts[0], pts[1], pts[2], pts[3],
-            kCubicTolerance, &target, maxCount);
+            kCubicToleranceSqd, &target, maxCount);
     fPointBuffer.setCount(count);
     for (int i = 0; i < count - 1; i++) {
         this->lineTo(fPointBuffer[i], kCurve_CurveState);
diff --git a/third_party/skia/src/gpu/geometry/GrAATriangulator.cpp b/third_party/skia/src/gpu/geometry/GrAATriangulator.cpp
index 6a7bac24b3934..b6dd4c0c91057 100644
--- a/third_party/skia/src/gpu/geometry/GrAATriangulator.cpp
+++ b/third_party/skia/src/gpu/geometry/GrAATriangulator.cpp
@@ -7,6 +7,7 @@
 
 #include "src/gpu/geometry/GrAATriangulator.h"
 
+#include "src/gpu/BufferWriter.h"
 #include "src/gpu/GrEagerVertexAllocator.h"
 #include <queue>
 #include <vector>
@@ -683,14 +684,15 @@ int GrAATriangulator::polysToAATriangles(Poly* polys,
     int count = count64;
 
     size_t vertexStride = sizeof(SkPoint) + sizeof(float);
-    void* verts = vertexAllocator->lock(vertexStride, count);
+    skgpu::VertexWriter verts = vertexAllocator->lockWriter(vertexStride, count);
     if (!verts) {
         SkDebugf("Could not allocate vertices\n");
         return 0;
     }
 
     TESS_LOG("emitting %d verts\n", count);
-    void* end = this->polysToTriangles(polys, verts, SkPathFillType::kWinding);
+    skgpu::BufferWriter::Mark start = verts.mark();
+    verts = this->polysToTriangles(polys, SkPathFillType::kWinding, std::move(verts));
     // Emit the triangles from the outer mesh.
     for (Vertex* v = fOuterMesh.fHead; v; v = v->fNext) {
         for (Edge* e = v->fFirstEdgeBelow; e; e = e->fNextEdgeBelow) {
@@ -698,13 +700,12 @@ int GrAATriangulator::polysToAATriangles(Poly* polys,
             Vertex* v1 = e->fBottom;
             Vertex* v2 = e->fBottom->fPartner;
             Vertex* v3 = e->fTop->fPartner;
-            end = this->emitTriangle(v0, v1, v2, 0/*winding*/, end);
-            end = this->emitTriangle(v0, v2, v3, 0/*winding*/, end);
+            verts = this->emitTriangle(v0, v1, v2, 0/*winding*/, std::move(verts));
+            verts = this->emitTriangle(v0, v2, v3, 0/*winding*/, std::move(verts));
         }
     }
 
-    int actualCount = static_cast<int>((static_cast<uint8_t*>(end) - static_cast<uint8_t*>(verts))
-                                       / vertexStride);
+    int actualCount = static_cast<int>((verts.mark() - start) / vertexStride);
     SkASSERT(actualCount <= count);
     vertexAllocator->unlock(actualCount);
     return actualCount;
diff --git a/third_party/skia/src/gpu/geometry/GrTriangulator.cpp b/third_party/skia/src/gpu/geometry/GrTriangulator.cpp
index 5a3379c4eaf27..54b9e10b5528f 100644
--- a/third_party/skia/src/gpu/geometry/GrTriangulator.cpp
+++ b/third_party/skia/src/gpu/geometry/GrTriangulator.cpp
@@ -80,32 +80,34 @@ bool GrTriangulator::Comparator::sweep_lt(const SkPoint& a, const SkPoint& b) co
     return fDirection == Direction::kHorizontal ? sweep_lt_horiz(a, b) : sweep_lt_vert(a, b);
 }
 
-static inline void* emit_vertex(Vertex* v, bool emitCoverage, void* data) {
-    skgpu::VertexWriter verts{data};
-    verts << v->fPoint;
+static inline skgpu::VertexWriter emit_vertex(Vertex* v,
+                                              bool emitCoverage,
+                                              skgpu::VertexWriter data) {
+    data << v->fPoint;
 
     if (emitCoverage) {
-        verts << GrNormalizeByteToFloat(v->fAlpha);
+        data << GrNormalizeByteToFloat(v->fAlpha);
     }
 
-    return verts.ptr();
+    return data;
 }
 
-static void* emit_triangle(Vertex* v0, Vertex* v1, Vertex* v2, bool emitCoverage, void* data) {
+static skgpu::VertexWriter emit_triangle(Vertex* v0, Vertex* v1, Vertex* v2,
+                                         bool emitCoverage, skgpu::VertexWriter data) {
     TESS_LOG("emit_triangle %g (%g, %g) %d\n", v0->fID, v0->fPoint.fX, v0->fPoint.fY, v0->fAlpha);
     TESS_LOG("              %g (%g, %g) %d\n", v1->fID, v1->fPoint.fX, v1->fPoint.fY, v1->fAlpha);
     TESS_LOG("              %g (%g, %g) %d\n", v2->fID, v2->fPoint.fX, v2->fPoint.fY, v2->fAlpha);
 #if TESSELLATOR_WIREFRAME
-    data = emit_vertex(v0, emitCoverage, data);
-    data = emit_vertex(v1, emitCoverage, data);
-    data = emit_vertex(v1, emitCoverage, data);
-    data = emit_vertex(v2, emitCoverage, data);
-    data = emit_vertex(v2, emitCoverage, data);
-    data = emit_vertex(v0, emitCoverage, data);
+    data = emit_vertex(v0, emitCoverage, std::move(data));
+    data = emit_vertex(v1, emitCoverage, std::move(data));
+    data = emit_vertex(v1, emitCoverage, std::move(data));
+    data = emit_vertex(v2, emitCoverage, std::move(data));
+    data = emit_vertex(v2, emitCoverage, std::move(data));
+    data = emit_vertex(v0, emitCoverage, std::move(data));
 #else
-    data = emit_vertex(v0, emitCoverage, data);
-    data = emit_vertex(v1, emitCoverage, data);
-    data = emit_vertex(v2, emitCoverage, data);
+    data = emit_vertex(v0, emitCoverage, std::move(data));
+    data = emit_vertex(v1, emitCoverage, std::move(data));
+    data = emit_vertex(v2, emitCoverage, std::move(data));
 #endif
     return data;
 }
@@ -216,10 +218,10 @@ static bool recursive_edge_intersect(const Line& u, SkPoint u0, SkPoint u1,
                           (float) (0.5 * u0.fY + 0.5 * u1.fY)};
             sScale = 0.5;
             if (*s >= 0.5) {
-                u1 = uM;
+                u0 = uM;
                 sShift = 0.5;
             } else {
-                u0 = uM;
+                u1 = uM;
             }
         }
         if (vNeedsSplit) {
@@ -227,10 +229,10 @@ static bool recursive_edge_intersect(const Line& u, SkPoint u0, SkPoint u1,
                           (float) (0.5 * v0.fY + 0.5 * v1.fY)};
             tScale = 0.5;
             if (*t >= 0.5) {
-                v1 = vM;
+                v0 = vM;
                 tShift = 0.5;
             } else {
-                v0 = vM;
+                v1 = vM;
             }
         }
 
@@ -310,7 +312,8 @@ void GrTriangulator::MonotonePoly::addEdge(Edge* edge) {
     }
 }
 
-void* GrTriangulator::emitMonotonePoly(const MonotonePoly* monotonePoly, void* data) const {
+skgpu::VertexWriter GrTriangulator::emitMonotonePoly(const MonotonePoly* monotonePoly,
+                                                     skgpu::VertexWriter data) const {
     SkASSERT(monotonePoly->fWinding != 0);
     Edge* e = monotonePoly->fFirstEdge;
     VertexList vertices;
@@ -334,14 +337,14 @@ void* GrTriangulator::emitMonotonePoly(const MonotonePoly* monotonePoly, void* d
         Vertex* curr = v;
         Vertex* next = v->fNext;
         if (count == 3) {
-            return this->emitTriangle(prev, curr, next, monotonePoly->fWinding, data);
+            return this->emitTriangle(prev, curr, next, monotonePoly->fWinding, std::move(data));
         }
         double ax = static_cast<double>(curr->fPoint.fX) - prev->fPoint.fX;
         double ay = static_cast<double>(curr->fPoint.fY) - prev->fPoint.fY;
         double bx = static_cast<double>(next->fPoint.fX) - curr->fPoint.fX;
         double by = static_cast<double>(next->fPoint.fY) - curr->fPoint.fY;
         if (ax * by - ay * bx >= 0.0) {
-            data = this->emitTriangle(prev, curr, next, monotonePoly->fWinding, data);
+            data = this->emitTriangle(prev, curr, next, monotonePoly->fWinding, std::move(data));
             v->fPrev->fNext = v->fNext;
             v->fNext->fPrev = v->fPrev;
             count--;
@@ -357,8 +360,8 @@ void* GrTriangulator::emitMonotonePoly(const MonotonePoly* monotonePoly, void* d
     return data;
 }
 
-void* GrTriangulator::emitTriangle(Vertex* prev, Vertex* curr, Vertex* next, int winding,
-                                   void* data) const {
+skgpu::VertexWriter GrTriangulator::emitTriangle(
+        Vertex* prev, Vertex* curr, Vertex* next, int winding, skgpu::VertexWriter data) const {
     if (winding > 0) {
         // Ensure our triangles always wind in the same direction as if the path had been
         // triangulated as a simple fan (a la red book).
@@ -370,7 +373,7 @@ void* GrTriangulator::emitTriangle(Vertex* prev, Vertex* curr, Vertex* next, int
         // come from the breadcrumb triangle.
         fBreadcrumbList.append(fAlloc, prev->fPoint, curr->fPoint, next->fPoint, abs(winding) - 1);
     }
-    return emit_triangle(prev, curr, next, fEmitCoverage, data);
+    return emit_triangle(prev, curr, next, fEmitCoverage, std::move(data));
 }
 
 GrTriangulator::Poly::Poly(Vertex* v, int winding)
@@ -430,13 +433,13 @@ Poly* GrTriangulator::Poly::addEdge(Edge* e, Side side, GrTriangulator* tri) {
     }
     return poly;
 }
-void* GrTriangulator::emitPoly(const Poly* poly, void *data) const {
+skgpu::VertexWriter GrTriangulator::emitPoly(const Poly* poly, skgpu::VertexWriter data) const {
     if (poly->fCount < 3) {
         return data;
     }
     TESS_LOG("emit() %d, size %d\n", poly->fID, poly->fCount);
     for (MonotonePoly* m = poly->fHead; m != nullptr; m = m->fNext) {
-        data = this->emitMonotonePoly(m, data);
+        data = this->emitMonotonePoly(m, std::move(data));
     }
     return data;
 }
@@ -937,29 +940,44 @@ bool GrTriangulator::intersectEdgePair(Edge* left, Edge* right, EdgeList* active
     if (left->fTop == right->fTop || left->fBottom == right->fBottom) {
         return false;
     }
+
+    // Check if the lines intersect as determined by isLeftOf and isRightOf, since that is the
+    // source of ground truth. It may suggest an intersection even if Edge::intersect() did not have
+    // the precision to check it. In this case we are explicitly correcting the edge topology to
+    // match the sided-ness checks.
+    Edge* split = nullptr;
+    Vertex* splitAt = nullptr;
     if (c.sweep_lt(left->fTop->fPoint, right->fTop->fPoint)) {
         if (!left->isLeftOf(right->fTop)) {
-            rewind(activeEdges, current, right->fTop, c);
-            return this->splitEdge(left, right->fTop, activeEdges, current, c);
+            split = left;
+            splitAt = right->fTop;
         }
     } else {
         if (!right->isRightOf(left->fTop)) {
-            rewind(activeEdges, current, left->fTop, c);
-            return this->splitEdge(right, left->fTop, activeEdges, current, c);
+            split = right;
+            splitAt = left->fTop;
         }
     }
     if (c.sweep_lt(right->fBottom->fPoint, left->fBottom->fPoint)) {
         if (!left->isLeftOf(right->fBottom)) {
-            rewind(activeEdges, current, right->fBottom, c);
-            return this->splitEdge(left, right->fBottom, activeEdges, current, c);
+            split = left;
+            splitAt = right->fBottom;
         }
     } else {
         if (!right->isRightOf(left->fBottom)) {
-            rewind(activeEdges, current, left->fBottom, c);
-            return this->splitEdge(right, left->fBottom, activeEdges, current, c);
+            split = right;
+            splitAt = left->fBottom;
         }
     }
-    return false;
+
+    if (!split) {
+        return false;
+    }
+
+    // Rewind to the top of the edge that is "moving" since this topology correction can change the
+    // geometry of the split edge.
+    rewind(activeEdges, current, split->fTop, c);
+    return this->splitEdge(split, splitAt, activeEdges, current, c);
 }
 
 Edge* GrTriangulator::makeConnectingEdge(Vertex* prev, Vertex* next, EdgeType type,
@@ -1545,11 +1563,12 @@ std::tuple<Poly*, bool> GrTriangulator::contoursToPolys(VertexList* contours, in
 }
 
 // Stage 6: Triangulate the monotone polygons into a vertex buffer.
-void* GrTriangulator::polysToTriangles(Poly* polys, void* data,
-                                       SkPathFillType overrideFillType) const {
+skgpu::VertexWriter GrTriangulator::polysToTriangles(Poly* polys,
+                                                     SkPathFillType overrideFillType,
+                                                     skgpu::VertexWriter data) const {
     for (Poly* poly = polys; poly; poly = poly->fNext) {
         if (apply_fill_type(overrideFillType, poly)) {
-            data = this->emitPoly(poly, data);
+            data = this->emitPoly(poly, std::move(data));
         }
     }
     return data;
@@ -1628,17 +1647,18 @@ int GrTriangulator::polysToTriangles(Poly* polys, GrEagerVertexAllocator* vertex
     if (fEmitCoverage) {
         vertexStride += sizeof(float);
     }
-    void* verts = vertexAllocator->lock(vertexStride, count);
+    skgpu::VertexWriter verts = vertexAllocator->lockWriter(vertexStride, count);
     if (!verts) {
         SkDebugf("Could not allocate vertices\n");
         return 0;
     }
 
     TESS_LOG("emitting %d verts\n", count);
-    void* end = this->polysToTriangles(polys, verts, fPath.getFillType());
 
-    int actualCount = static_cast<int>((static_cast<uint8_t*>(end) - static_cast<uint8_t*>(verts))
-                                       / vertexStride);
+    skgpu::BufferWriter::Mark start = verts.mark();
+    verts = this->polysToTriangles(polys, fPath.getFillType(), std::move(verts));
+
+    int actualCount = static_cast<int>((verts.mark() - start) / vertexStride);
     SkASSERT(actualCount <= count);
     vertexAllocator->unlock(actualCount);
     return actualCount;
diff --git a/third_party/skia/src/gpu/geometry/GrTriangulator.h b/third_party/skia/src/gpu/geometry/GrTriangulator.h
index 0a4bd3f2ee185..0c43f82d72deb 100644
--- a/third_party/skia/src/gpu/geometry/GrTriangulator.h
+++ b/third_party/skia/src/gpu/geometry/GrTriangulator.h
@@ -88,7 +88,9 @@ class GrTriangulator {
     virtual std::tuple<Poly*, bool> tessellate(const VertexList& vertices, const Comparator&);
 
     // 6) Triangulate the monotone polygons directly into a vertex buffer:
-    void* polysToTriangles(Poly* polys, void* data, SkPathFillType overrideFillType) const;
+    skgpu::VertexWriter polysToTriangles(Poly* polys,
+                                         SkPathFillType overrideFillType,
+                                         skgpu::VertexWriter data) const;
 
     // The vertex sorting in step (3) is a merge sort, since it plays well with the linked list
     // of vertices (and the necessity of inserting new vertices on intersection).
@@ -134,9 +136,11 @@ class GrTriangulator {
     // setting rotates 90 degrees counterclockwise, rather that transposing.
 
     // Additional helpers and driver functions.
-    void* emitMonotonePoly(const MonotonePoly*, void* data) const;
-    void* emitTriangle(Vertex* prev, Vertex* curr, Vertex* next, int winding, void* data) const;
-    void* emitPoly(const Poly*, void *data) const;
+    skgpu::VertexWriter emitMonotonePoly(const MonotonePoly*, skgpu::VertexWriter data) const;
+    skgpu::VertexWriter emitTriangle(Vertex* prev, Vertex* curr, Vertex* next, int winding,
+                                     skgpu::VertexWriter data) const;
+    skgpu::VertexWriter emitPoly(const Poly*, skgpu::VertexWriter data) const;
+
     Poly* makePoly(Poly** head, Vertex* v, int winding) const;
     void appendPointToContour(const SkPoint& p, VertexList* contour) const;
     void appendQuadraticToContour(const SkPoint[3], SkScalar toleranceSqd,
diff --git a/third_party/skia/src/gpu/gl/BUILD.bazel b/third_party/skia/src/gpu/gl/BUILD.bazel
index dc8fd70a91790..f3f0d7a9f12ba 100644
--- a/third_party/skia/src/gpu/gl/BUILD.bazel
+++ b/third_party/skia/src/gpu/gl/BUILD.bazel
@@ -275,6 +275,8 @@ generated_cc_atom(
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrSurfaceProxyPriv_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:GrUtil_hdr",
+        "//src/gpu:SkRenderEngineAbortf_hdr",
         "//src/gpu/gl/builders:GrGLShaderStringBuilder_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/utils:SkJSONWriter_hdr",
@@ -516,6 +518,7 @@ generated_cc_atom(
         ":GrGLGpu_hdr",
         ":GrGLUniformHandler_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:GrUtil_hdr",
         "//src/gpu/gl/builders:GrGLProgramBuilder_hdr",
         "//src/sksl:SkSLCompiler_hdr",
     ],
diff --git a/third_party/skia/src/gpu/gl/GrGLCaps.cpp b/third_party/skia/src/gpu/gl/GrGLCaps.cpp
index f350a01df8cf6..fdecaa7255f5c 100644
--- a/third_party/skia/src/gpu/gl/GrGLCaps.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLCaps.cpp
@@ -7,6 +7,7 @@
 
 #include "src/gpu/gl/GrGLCaps.h"
 
+#include <algorithm>
 #include <memory>
 
 #include "include/gpu/GrContextOptions.h"
@@ -792,7 +793,13 @@ void GrGLCaps::init(const GrContextOptions& contextOptions,
     if (fProgramBinarySupport) {
         GrGLint count;
         GR_GL_GetIntegerv(gli, GR_GL_NUM_PROGRAM_BINARY_FORMATS, &count);
-        fProgramBinarySupport = count > 0;
+        if (count > 0) {
+            fProgramBinaryFormats.resize_back(count);
+            GR_GL_GetIntegerv(gli, GR_GL_PROGRAM_BINARY_FORMATS,
+                              reinterpret_cast<GrGLint*>(fProgramBinaryFormats.data()));
+        } else {
+            fProgramBinarySupport = false;
+        }
     }
     if (GR_IS_GR_GL(standard)) {
         fSamplerObjectSupport =
@@ -1049,11 +1056,16 @@ void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli
         shaderCaps->fVertexIDSupport = ctxInfo.glslGeneration() >= SkSL::GLSLGeneration::k330;
     }
 
+    // isinf() exists in GLSL 1.3 and above, but hardware without proper IEEE support is allowed to
+    // always return false, so it's potentially meaningless. In GLSL 3.3 and GLSL ES3+, isinf() is
+    // required to actually identify infinite values. (GPUs are not required to _produce_ infinite
+    // values via operations like `num / 0.0` until GLSL 4.1.)
+    shaderCaps->fInfinitySupport = (ctxInfo.glslGeneration() >= SkSL::GLSLGeneration::k330);
+
     if (GR_IS_GR_GL(standard)) {
-        shaderCaps->fInfinitySupport = shaderCaps->fNonconstantArrayIndexSupport = true;
+        shaderCaps->fNonconstantArrayIndexSupport = true;
     } else if (GR_IS_GR_GL_ES(standard) || GR_IS_GR_WEBGL(standard)) {
-        // Desktop GLSL 3.30 == ES GLSL 3.00.
-        shaderCaps->fInfinitySupport = shaderCaps->fNonconstantArrayIndexSupport =
+        shaderCaps->fNonconstantArrayIndexSupport =
                 (ctxInfo.glslGeneration() >= SkSL::GLSLGeneration::k330);
     }
 
@@ -1078,11 +1090,6 @@ void GrGLCaps::initGLSL(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli
     }
 
     shaderCaps->fBuiltinDeterminantSupport = ctxInfo.glslGeneration() >= SkSL::GLSLGeneration::k150;
-
-    if (GR_IS_GR_WEBGL(standard)) {
-      // WebGL 1.0 doesn't support do-while loops.
-      shaderCaps->fCanUseDoLoops = version >= GR_GL_VER(2, 0);
-    }
 }
 
 void GrGLCaps::initFSAASupport(const GrContextOptions& contextOptions,
@@ -1554,7 +1561,7 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
             auto& ctInfo = info.fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kRGB_888x;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle::RGB1();
+            ctInfo.fReadSwizzle = skgpu::Swizzle::RGB1();
 
             // External IO ColorTypes:
             ctInfo.fExternalIOFormatCount = 1;
@@ -1612,16 +1619,49 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
         }
 
         if (r8Support) {
-            info.fColorTypeInfoCount = 2;
+            info.fColorTypeInfoCount = 3;
             info.fColorTypeInfos = std::make_unique<ColorTypeInfo[]>(info.fColorTypeInfoCount);
             int ctIdx = 0;
+            // Format: R8, Surface: kR_8
+            {
+                auto& ctInfo = info.fColorTypeInfos[ctIdx++];
+                ctInfo.fColorType = GrColorType::kR_8;
+                ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
+                this->setColorTypeFormat(GrColorType::kR_8, GrGLFormat::kR8);
+
+                // External IO ColorTypes:
+                ctInfo.fExternalIOFormatCount = 2;
+                ctInfo.fExternalIOFormats = std::make_unique<ColorTypeInfo::ExternalIOFormats[]>(
+                        ctInfo.fExternalIOFormatCount);
+                int ioIdx = 0;
+                // Format: R8, Surface: kR_8, Data: kR_8
+                {
+                    auto& ioFormat = ctInfo.fExternalIOFormats[ioIdx++];
+                    ioFormat.fColorType = GrColorType::kR_8;
+                    ioFormat.fExternalType = GR_GL_UNSIGNED_BYTE;
+                    ioFormat.fExternalTexImageFormat = GR_GL_RED;
+                    ioFormat.fExternalReadFormat = GR_GL_RED;
+                    // Not guaranteed by ES/WebGL.
+                    ioFormat.fRequiresImplementationReadQuery = !GR_IS_GR_GL(standard);
+                }
+
+                // Format: R8, Surface: kR_8, Data: kR_8xxx
+                {
+                    auto& ioFormat = ctInfo.fExternalIOFormats[ioIdx++];
+                    ioFormat.fColorType = GrColorType::kR_8xxx;
+                    ioFormat.fExternalType = GR_GL_UNSIGNED_BYTE;
+                    ioFormat.fExternalTexImageFormat = 0;
+                    ioFormat.fExternalReadFormat = GR_GL_RGBA;
+                }
+            }
+
             // Format: R8, Surface: kAlpha_8
             {
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = GrColorType::kAlpha_8;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
                 this->setColorTypeFormat(GrColorType::kAlpha_8, GrGLFormat::kR8);
 
                 // External IO ColorTypes:
@@ -1655,7 +1695,7 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = GrColorType::kGray_8;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("rrr1");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("rrr1");
                 this->setColorTypeFormat(GrColorType::kGray_8, GrGLFormat::kR8);
 
                 // External IO ColorTypes:
@@ -2337,8 +2377,8 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = GrColorType::kAlpha_F16;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
                 this->setColorTypeFormat(GrColorType::kAlpha_F16, GrGLFormat::kR16F);
 
                 // External IO ColorTypes:
@@ -2420,8 +2460,8 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = GrColorType::kAlpha_F16;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("aaa0");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("aaa0");
 
                 int idx = static_cast<int>(GrColorType::kAlpha_F16);
                 if (fColorTypeToFormatTable[idx] == GrGLFormat::kUnknown) {
@@ -2454,6 +2494,62 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
         }
     }
 
+    // Format: RGBx8
+    {
+        FormatInfo& info = this->getFormatInfo(GrGLFormat::kRGBX8);
+        info.fFormatType = FormatType::kNormalizedFixedPoint;
+        info.fInternalFormatForRenderbuffer = GR_GL_RGBX8;
+        info.fDefaultExternalFormat = GR_GL_RGB;
+        info.fDefaultExternalType = GR_GL_UNSIGNED_BYTE;
+        info.fDefaultColorType = GrColorType::kRGB_888x;
+
+        bool supportsRGBXTexStorage = false;
+
+        if (GR_IS_GR_GL_ES(standard) && ctxInfo.hasExtension("GL_ANGLE_rgbx_internal_format")) {
+            info.fFlags =
+                    FormatInfo::kTexturable_Flag | FormatInfo::kTransfers_Flag | msaaRenderFlags;
+            supportsRGBXTexStorage = true;
+        }
+
+        if (texStorageSupported && supportsRGBXTexStorage) {
+            info.fFlags |= FormatInfo::kUseTexStorage_Flag;
+            info.fInternalFormatForTexImageOrStorage = GR_GL_RGBX8;
+            info.fColorTypeInfoCount = 1;
+            info.fColorTypeInfos = std::make_unique<ColorTypeInfo[]>(info.fColorTypeInfoCount);
+            int ctIdx = 0;
+            // Format: RGBX8, Surface: kRGB_888x
+            {
+                auto& ctInfo = info.fColorTypeInfos[ctIdx++];
+                ctInfo.fColorType = GrColorType::kRGB_888x;
+                ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
+                this->setColorTypeFormat(GrColorType::kRGB_888x, GrGLFormat::kRGBX8);
+
+                // External IO ColorTypes:
+                ctInfo.fExternalIOFormatCount = 2;
+                ctInfo.fExternalIOFormats = std::make_unique<ColorTypeInfo::ExternalIOFormats[]>(
+                        ctInfo.fExternalIOFormatCount);
+                int ioIdx = 0;
+                // Format: RGBX8, Surface: kRGB_888x, Data: kRGB_888x
+                {
+                    auto& ioFormat = ctInfo.fExternalIOFormats[ioIdx++];
+                    ioFormat.fColorType = GrColorType::kRGB_888x;
+                    ioFormat.fExternalType = GR_GL_UNSIGNED_BYTE;
+                    ioFormat.fExternalTexImageFormat = GR_GL_RGB;
+                    ioFormat.fExternalReadFormat = 0;
+                }
+
+                // Format: RGBX8, Surface: kRGB_888x, Data: kRGBA_8888
+                {
+                    auto& ioFormat = ctInfo.fExternalIOFormats[ioIdx++];
+                    ioFormat.fColorType = GrColorType::kRGBA_8888;
+                    ioFormat.fExternalType = GR_GL_UNSIGNED_BYTE;
+                    ioFormat.fExternalTexImageFormat = 0;
+                    ioFormat.fExternalReadFormat = GR_GL_RGBA;
+                }
+            }
+        }
+    }
+
     // Format: RGB8
     {
         FormatInfo& info = this->getFormatInfo(GrGLFormat::kRGB8);
@@ -2495,7 +2591,11 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
             auto& ctInfo = info.fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kRGB_888x;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-            this->setColorTypeFormat(GrColorType::kRGB_888x, GrGLFormat::kRGB8);
+
+            int idx = static_cast<int>(GrColorType::kRGB_888x);
+            if (fColorTypeToFormatTable[idx] == GrGLFormat::kUnknown) {
+                this->setColorTypeFormat(GrColorType::kRGB_888x, GrGLFormat::kRGB8);
+            }
 
             // External IO ColorTypes:
             ctInfo.fExternalIOFormatCount = 2;
@@ -2971,8 +3071,8 @@ void GrGLCaps::initFormatTable(const GrGLContextInfo& ctxInfo, const GrGLInterfa
                 auto& ctInfo = info.fColorTypeInfos[ctIdx++];
                 ctInfo.fColorType = GrColorType::kAlpha_16;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
                 this->setColorTypeFormat(GrColorType::kAlpha_16, GrGLFormat::kR16);
 
                 // External IO ColorTypes:
@@ -3901,10 +4001,6 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo,
         // Tegra3 fract() seems to trigger undefined behavior for negative values, so we
         // must avoid this condition.
         shaderCaps->fCanUseFractForNegativeValues = false;
-
-        // Seeing crashes on Tegra3 with inlined functions that have early returns. Looks like the
-        // do { ... break; } while (false); construct is causing a crash in the driver.
-        shaderCaps->fCanUseDoLoops = false;
     }
 
     // On Intel GPU there is an issue where it reads the second argument to atan "- %s.x" as an int
@@ -4269,14 +4365,11 @@ void GrGLCaps::applyDriverCorrectnessWorkarounds(const GrGLContextInfo& ctxInfo,
     // We disable MSAA for all Intel GPUs. Before Gen9, performance was very bad. Even with Gen9,
     // we've seen driver crashes in the wild. We don't have data on Gen11 yet.
     // (crbug.com/527565, crbug.com/983926)
-    if (ctxInfo.vendor() == GrGLVendor::kIntel ||
-        ctxInfo.angleVendor() == GrGLVendor::kIntel) {
-        fMSFBOType = kNone_MSFBOType;
-    }
-
-    // ANGLE doesn't support do-while loops.
-    if (ctxInfo.angleBackend() != GrGLANGLEBackend::kUnknown) {
-        shaderCaps->fCanUseDoLoops = false;
+    if ((ctxInfo.vendor() == GrGLVendor::kIntel ||
+         ctxInfo.angleVendor() == GrGLVendor::kIntel) &&
+         (ctxInfo.renderer() < GrGLRenderer::kIntelIceLake ||
+          !contextOptions.fAllowMSAAOnNewIntel)) {
+         fMSFBOType = kNone_MSFBOType;
     }
 
     // ANGLE's D3D9 backend + AMD GPUs are flaky with program binary caching (skbug.com/10395)
@@ -4555,6 +4648,11 @@ GrCaps::SupportedWrite GrGLCaps::supportedWritePixelsColorType(GrColorType surfa
     return {fallbackCT, transferOffsetAlignment};
 }
 
+bool GrGLCaps::programBinaryFormatIsValid(GrGLenum binaryFormat) const {
+    return std::find(fProgramBinaryFormats.begin(), fProgramBinaryFormats.end(), binaryFormat) !=
+           fProgramBinaryFormats.end();
+}
+
 bool GrGLCaps::onIsWindowRectanglesSupportedForRT(const GrBackendRenderTarget& backendRT) const {
     GrGLFramebufferInfo fbInfo;
     SkAssertResult(backendRT.getGLFramebufferInfo(&fbInfo));
@@ -4751,7 +4849,8 @@ GrBackendFormat GrGLCaps::getBackendFormatFromCompressionType(
     SkUNREACHABLE;
 }
 
-GrSwizzle GrGLCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrGLCaps::onGetReadSwizzle(const GrBackendFormat& format,
+                                          GrColorType colorType) const {
     GrGLFormat glFormat = format.asGLFormat();
     const auto& info = this->getFormatInfo(glFormat);
     for (int i = 0; i < info.fColorTypeInfoCount; ++i) {
@@ -4765,7 +4864,8 @@ GrSwizzle GrGLCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType
     return {};
 }
 
-GrSwizzle GrGLCaps::getWriteSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrGLCaps::getWriteSwizzle(const GrBackendFormat& format,
+                                         GrColorType colorType) const {
     const auto& info = this->getFormatInfo(format.asGLFormat());
     for (int i = 0; i < info.fColorTypeInfoCount; ++i) {
         const auto& ctInfo = info.fColorTypeInfos[i];
diff --git a/third_party/skia/src/gpu/gl/GrGLCaps.h b/third_party/skia/src/gpu/gl/GrGLCaps.h
index 22034c5d930ea..64f907eff184d 100644
--- a/third_party/skia/src/gpu/gl/GrGLCaps.h
+++ b/third_party/skia/src/gpu/gl/GrGLCaps.h
@@ -15,7 +15,7 @@
 #include "include/private/SkTArray.h"
 #include "include/private/SkTHash.h"
 #include "src/gpu/GrCaps.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/gl/GrGLAttachment.h"
 #include "src/gpu/gl/GrGLUtil.h"
 
@@ -448,6 +448,7 @@ class GrGLCaps : public GrCaps {
 
     bool programBinarySupport() const { return fProgramBinarySupport; }
     bool programParameterSupport() const { return fProgramParameterSupport; }
+    bool programBinaryFormatIsValid(GrGLenum binaryFormat) const;
 
     /** Are sampler objects available in this GL? */
     bool samplerObjectSupport() const { return fSamplerObjectSupport; }
@@ -476,7 +477,7 @@ class GrGLCaps : public GrCaps {
 
     GrBackendFormat getBackendFormatFromCompressionType(SkImage::CompressionType) const override;
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
 
@@ -540,7 +541,7 @@ class GrGLCaps : public GrCaps {
     SupportedRead onSupportedReadPixelsColorType(GrColorType, const GrBackendFormat&,
                                                  GrColorType) const override;
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     GrDstSampleFlags onGetDstSampleFlagsForProxy(const GrRenderTargetProxy*) const override;
 
@@ -549,6 +550,7 @@ class GrGLCaps : public GrCaps {
     GrGLStandard fStandard = kNone_GrGLStandard;
 
     SkTArray<GrGLFormat, true> fStencilFormats;
+    SkTArray<GrGLenum, true> fProgramBinaryFormats;
 
     int fMaxFragmentUniformVectors = 0;
 
@@ -630,8 +632,8 @@ class GrGLCaps : public GrCaps {
         };
         uint32_t fFlags = 0;
 
-        GrSwizzle fReadSwizzle;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fReadSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
 
         struct ExternalIOFormats {
             GrColorType fColorType = GrColorType::kUnknown;
diff --git a/third_party/skia/src/gpu/gl/GrGLDefines.h b/third_party/skia/src/gpu/gl/GrGLDefines.h
index 7f6cc5cfd155e..2f8367752a8d3 100644
--- a/third_party/skia/src/gpu/gl/GrGLDefines.h
+++ b/third_party/skia/src/gpu/gl/GrGLDefines.h
@@ -508,6 +508,7 @@
 #define GR_GL_RGB565                         0x8D62
 #define GR_GL_RGB8                           0x8051
 #define GR_GL_SRGB8                          0x8C41
+#define GR_GL_RGBX8                          0x96BA
 
 /* RGB integer sized formats */
 #define GR_GL_RGB8I                          0x8D8F
@@ -869,6 +870,7 @@
 
 /* Program Binary */
 #define GR_GL_NUM_PROGRAM_BINARY_FORMATS     0x87FE
+#define GR_GL_PROGRAM_BINARY_FORMATS         0x87FF
 
 /* Shader Precision-Specified Types */
 #define GR_GL_LOW_FLOAT                      0x8DF0
@@ -1109,7 +1111,7 @@
 #define GR_GL_NUM_SAMPLE_COUNTS                             0x9380
 
 /* EGL Defines */
-#define GR_EGL_NO_DISPLAY                                   ((GrEGLDisplay)0)
+#define GR_EGL_NO_DISPLAY                                   ((GrEGLDisplay)nullptr)
 #define GR_EGL_EXTENSIONS                                   0x3055
 #define GR_EGL_GL_TEXTURE_2D                                0x30B1
 #define GR_EGL_GL_TEXTURE_LEVEL                             0x30BC
@@ -1117,7 +1119,7 @@
 #define GR_EGL_FALSE                                        0x0
 #define GR_EGL_TRUE                                         0x1
 #define GR_EGL_NONE                                         0x3038
-#define GR_EGL_NO_IMAGE                                    ((GrEGLImage)0)
+#define GR_EGL_NO_IMAGE                                     ((GrEGLImage)nullptr)
 
 /* Programs */
 #define GR_GL_PROGRAM_BINARY_RETRIEVABLE_HINT               0x8257
diff --git a/third_party/skia/src/gpu/gl/GrGLGpu.cpp b/third_party/skia/src/gpu/gl/GrGLGpu.cpp
index e8d2182992a1d..797c5ab6f42cd 100644
--- a/third_party/skia/src/gpu/gl/GrGLGpu.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLGpu.cpp
@@ -32,6 +32,8 @@
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrSurfaceProxyPriv.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/GrUtil.h"
+#include "src/gpu/SkRenderEngineAbortf.h"
 #include "src/gpu/gl/GrGLAttachment.h"
 #include "src/gpu/gl/GrGLBuffer.h"
 #include "src/gpu/gl/GrGLOpsRenderPass.h"
@@ -1221,6 +1223,7 @@ bool GrGLGpu::createRenderTargetObjects(const GrGLTexture::Desc& desc,
 
     GL_CALL(GenFramebuffers(1, &rtIDs->fSingleSampleFBOID));
     if (!rtIDs->fSingleSampleFBOID) {
+        RENDERENGINE_ABORTF("%s failed to GenFramebuffers!", __func__);
         return false;
     }
 
@@ -2544,7 +2547,7 @@ void GrGLGpu::flushWireframeState(bool enabled) {
 }
 
 void GrGLGpu::flushBlendAndColorWrite(
-        const GrXferProcessor::BlendInfo& blendInfo, const GrSwizzle& swizzle) {
+        const GrXferProcessor::BlendInfo& blendInfo, const skgpu::Swizzle& swizzle) {
     if (this->glCaps().neverDisableColorWrites() && !blendInfo.fWriteColor) {
         // We need to work around a driver bug by using a blend state that preserves the dst color,
         // rather than disabling color writes.
@@ -2634,7 +2637,7 @@ void GrGLGpu::flushBlendAndColorWrite(
     this->flushColorWrite(blendInfo.fWriteColor);
 }
 
-void GrGLGpu::bindTexture(int unitIdx, GrSamplerState samplerState, const GrSwizzle& swizzle,
+void GrGLGpu::bindTexture(int unitIdx, GrSamplerState samplerState, const skgpu::Swizzle& swizzle,
                           GrGLTexture* texture) {
     SkASSERT(texture);
 
@@ -3069,7 +3072,7 @@ bool GrGLGpu::createCopyProgram(GrTexture* srcTex) {
 
     int progIdx = TextureToCopyProgramIdx(srcTex);
     const GrShaderCaps* shaderCaps = this->caps()->shaderCaps();
-    GrSLType samplerType = GrSLCombinedSamplerTypeForTextureType(srcTex->textureType());
+    SkSLType samplerType = SkSLCombinedSamplerTypeForTextureType(srcTex->textureType());
 
     if (!fCopyProgramArrayBuffer) {
         static const GrGLfloat vdata[] = {
@@ -3091,13 +3094,13 @@ bool GrGLGpu::createCopyProgram(GrTexture* srcTex) {
         return false;
     }
 
-    GrShaderVar aVertex("a_vertex", kHalf2_GrSLType, GrShaderVar::TypeModifier::In);
-    GrShaderVar uTexCoordXform("u_texCoordXform", kHalf4_GrSLType,
+    GrShaderVar aVertex("a_vertex", SkSLType::kHalf2, GrShaderVar::TypeModifier::In);
+    GrShaderVar uTexCoordXform("u_texCoordXform", SkSLType::kHalf4,
                                GrShaderVar::TypeModifier::Uniform);
-    GrShaderVar uPosXform("u_posXform", kHalf4_GrSLType, GrShaderVar::TypeModifier::Uniform);
+    GrShaderVar uPosXform("u_posXform", SkSLType::kHalf4, GrShaderVar::TypeModifier::Uniform);
     GrShaderVar uTexture("u_texture", samplerType, GrShaderVar::TypeModifier::Uniform);
-    GrShaderVar vTexCoord("v_texCoord", kHalf2_GrSLType, GrShaderVar::TypeModifier::Out);
-    GrShaderVar oFragColor("o_FragColor", kHalf4_GrSLType, GrShaderVar::TypeModifier::Out);
+    GrShaderVar vTexCoord("v_texCoord", SkSLType::kHalf2, GrShaderVar::TypeModifier::Out);
+    GrShaderVar oFragColor("o_FragColor", SkSLType::kHalf4, GrShaderVar::TypeModifier::Out);
 
     SkString vshaderTxt;
     if (shaderCaps->noperspectiveInterpolationSupport()) {
@@ -3144,9 +3147,9 @@ bool GrGLGpu::createCopyProgram(GrTexture* srcTex) {
     );
 
     auto errorHandler = this->getContext()->priv().getShaderErrorHandler();
-    SkSL::String sksl(vshaderTxt.c_str(), vshaderTxt.size());
+    std::string sksl(vshaderTxt.c_str(), vshaderTxt.size());
     SkSL::Program::Settings settings;
-    SkSL::String glsl;
+    std::string glsl;
     std::unique_ptr<SkSL::Program> program = GrSkSLtoGLSL(this, SkSL::ProgramKind::kVertex,
                                                           sksl, settings, &glsl, errorHandler);
     GrGLuint vshader = GrGLCompileAndAttachShader(*fGLContext, fCopyPrograms[progIdx].fProgram,
@@ -3192,19 +3195,19 @@ bool GrGLGpu::createMipmapProgram(int progIdx) {
         return false;
     }
 
-    GrShaderVar aVertex("a_vertex", kHalf2_GrSLType, GrShaderVar::TypeModifier::In);
-    GrShaderVar uTexCoordXform("u_texCoordXform", kHalf4_GrSLType,
+    GrShaderVar aVertex("a_vertex", SkSLType::kHalf2, GrShaderVar::TypeModifier::In);
+    GrShaderVar uTexCoordXform("u_texCoordXform", SkSLType::kHalf4,
                                GrShaderVar::TypeModifier::Uniform);
-    GrShaderVar uTexture("u_texture", kTexture2DSampler_GrSLType,
+    GrShaderVar uTexture("u_texture", SkSLType::kTexture2DSampler,
                          GrShaderVar::TypeModifier::Uniform);
     // We need 1, 2, or 4 texture coordinates (depending on parity of each dimension):
     GrShaderVar vTexCoords[] = {
-        GrShaderVar("v_texCoord0", kHalf2_GrSLType, GrShaderVar::TypeModifier::Out),
-        GrShaderVar("v_texCoord1", kHalf2_GrSLType, GrShaderVar::TypeModifier::Out),
-        GrShaderVar("v_texCoord2", kHalf2_GrSLType, GrShaderVar::TypeModifier::Out),
-        GrShaderVar("v_texCoord3", kHalf2_GrSLType, GrShaderVar::TypeModifier::Out),
+        GrShaderVar("v_texCoord0", SkSLType::kHalf2, GrShaderVar::TypeModifier::Out),
+        GrShaderVar("v_texCoord1", SkSLType::kHalf2, GrShaderVar::TypeModifier::Out),
+        GrShaderVar("v_texCoord2", SkSLType::kHalf2, GrShaderVar::TypeModifier::Out),
+        GrShaderVar("v_texCoord3", SkSLType::kHalf2, GrShaderVar::TypeModifier::Out),
     };
-    GrShaderVar oFragColor("o_FragColor", kHalf4_GrSLType,GrShaderVar::TypeModifier::Out);
+    GrShaderVar oFragColor("o_FragColor", SkSLType::kHalf4,GrShaderVar::TypeModifier::Out);
 
     SkString vshaderTxt;
     if (shaderCaps->noperspectiveInterpolationSupport()) {
@@ -3298,9 +3301,9 @@ bool GrGLGpu::createMipmapProgram(int progIdx) {
     fshaderTxt.append("}");
 
     auto errorHandler = this->getContext()->priv().getShaderErrorHandler();
-    SkSL::String sksl(vshaderTxt.c_str(), vshaderTxt.size());
+    std::string sksl(vshaderTxt.c_str(), vshaderTxt.size());
     SkSL::Program::Settings settings;
-    SkSL::String glsl;
+    std::string glsl;
     std::unique_ptr<SkSL::Program> program = GrSkSLtoGLSL(this, SkSL::ProgramKind::kVertex,
                                                           sksl, settings, &glsl, errorHandler);
     GrGLuint vshader = GrGLCompileAndAttachShader(*fGLContext, fMipmapPrograms[progIdx].fProgram,
@@ -3338,7 +3341,7 @@ bool GrGLGpu::copySurfaceAsDraw(GrSurface* dst, bool drawToMultisampleFBO, GrSur
         return false;
     }
     // We don't swizzle at all in our copies.
-    this->bindTexture(0, GrSamplerState::Filter::kNearest, GrSwizzle::RGBA(), srcTex);
+    this->bindTexture(0, GrSamplerState::Filter::kNearest, skgpu::Swizzle::RGBA(), srcTex);
     if (auto* dstRT = static_cast<GrGLRenderTarget*>(dst->asRenderTarget())) {
         this->flushRenderTargetNoColorWrites(dstRT, drawToMultisampleFBO);
     } else {
@@ -3369,7 +3372,7 @@ bool GrGLGpu::copySurfaceAsDraw(GrSurface* dst, bool drawToMultisampleFBO, GrSur
     GrGLAttribArrayState* attribs = fHWVertexArrayState.bindInternalVertexArray(this);
     attribs->enableVertexArrays(this, 1);
     attribs->set(this, 0, fCopyProgramArrayBuffer.get(), kFloat2_GrVertexAttribType,
-                 kFloat2_GrSLType, 2 * sizeof(GrGLfloat), 0);
+                 SkSLType::kFloat2, 2 * sizeof(GrGLfloat), 0);
     // dst rect edges in NDC (-1 to 1)
     int dw = dst->width();
     int dh = dst->height();
@@ -3394,7 +3397,7 @@ bool GrGLGpu::copySurfaceAsDraw(GrSurface* dst, bool drawToMultisampleFBO, GrSur
     GL_CALL(Uniform4f(fCopyPrograms[progIdx].fTexCoordXformUniform,
                       sx1 - sx0, sy1 - sy0, sx0, sy0));
     GL_CALL(Uniform1i(fCopyPrograms[progIdx].fTextureUniform, 0));
-    this->flushBlendAndColorWrite(GrXferProcessor::BlendInfo(), GrSwizzle::RGBA());
+    this->flushBlendAndColorWrite(GrXferProcessor::BlendInfo(), skgpu::Swizzle::RGBA());
     this->flushConservativeRasterState(false);
     this->flushWireframeState(false);
     this->flushScissorTest(GrScissorTest::kDisabled);
@@ -3503,7 +3506,7 @@ bool GrGLGpu::onRegenerateMipMapLevels(GrTexture* texture) {
     // We'll be changing our base level further below:
     this->setTextureUnit(0);
     // The mipmap program does not do any swizzling.
-    this->bindTexture(0, GrSamplerState::Filter::kLinear, GrSwizzle::RGBA(), glTex);
+    this->bindTexture(0, GrSamplerState::Filter::kLinear, skgpu::Swizzle::RGBA(), glTex);
 
     // Vertex data:
     if (!fMipmapProgramArrayBuffer) {
@@ -3525,10 +3528,10 @@ bool GrGLGpu::onRegenerateMipMapLevels(GrTexture* texture) {
     GrGLAttribArrayState* attribs = fHWVertexArrayState.bindInternalVertexArray(this);
     attribs->enableVertexArrays(this, 1);
     attribs->set(this, 0, fMipmapProgramArrayBuffer.get(), kFloat2_GrVertexAttribType,
-                 kFloat2_GrSLType, 2 * sizeof(GrGLfloat), 0);
+                 SkSLType::kFloat2, 2 * sizeof(GrGLfloat), 0);
 
     // Set "simple" state once:
-    this->flushBlendAndColorWrite(GrXferProcessor::BlendInfo(), GrSwizzle::RGBA());
+    this->flushBlendAndColorWrite(GrXferProcessor::BlendInfo(), skgpu::Swizzle::RGBA());
     this->flushScissorTest(GrScissorTest::kDisabled);
     this->disableWindowRectangles();
     this->disableStencil();
@@ -4121,12 +4124,12 @@ std::unique_ptr<GrSemaphore> GrGLGpu::prepareTextureForCrossContextUsage(GrTextu
 }
 
 int GrGLGpu::TextureToCopyProgramIdx(GrTexture* texture) {
-    switch (GrSLCombinedSamplerTypeForTextureType(texture->textureType())) {
-        case kTexture2DSampler_GrSLType:
+    switch (SkSLCombinedSamplerTypeForTextureType(texture->textureType())) {
+        case SkSLType::kTexture2DSampler:
             return 0;
-        case kTexture2DRectSampler_GrSLType:
+        case SkSLType::kTexture2DRectSampler:
             return 1;
-        case kTextureExternalSampler_GrSLType:
+        case SkSLType::kTextureExternalSampler:
             return 2;
         default:
             SK_ABORT("Unexpected samper type");
diff --git a/third_party/skia/src/gpu/gl/GrGLGpu.h b/third_party/skia/src/gpu/gl/GrGLGpu.h
index 0652fa67acaaa..c4ea38242f7f1 100644
--- a/third_party/skia/src/gpu/gl/GrGLGpu.h
+++ b/third_party/skia/src/gpu/gl/GrGLGpu.h
@@ -28,7 +28,10 @@
 class GrGLBuffer;
 class GrGLOpsRenderPass;
 class GrPipeline;
-class GrSwizzle;
+
+namespace skgpu {
+class Swizzle;
+}
 
 class GrGLGpu final : public GrGpu {
 public:
@@ -50,7 +53,7 @@ class GrGLGpu final : public GrGpu {
     const GrGLCaps& glCaps() const { return *fGLContext->caps(); }
 
     // Used by GrGLProgram to configure OpenGL state.
-    void bindTexture(int unitIdx, GrSamplerState samplerState, const GrSwizzle&, GrGLTexture*);
+    void bindTexture(int unitIdx, GrSamplerState samplerState, const skgpu::Swizzle&, GrGLTexture*);
 
     // These functions should be used to bind GL objects. They track the GL state and skip redundant
     // bindings. Making the equivalent glBind calls directly will confuse the state tracking.
@@ -360,7 +363,8 @@ class GrGLGpu final : public GrGpu {
     // binds texture unit in GL
     void setTextureUnit(int unitIdx);
 
-    void flushBlendAndColorWrite(const GrXferProcessor::BlendInfo& blendInfo, const GrSwizzle&);
+    void flushBlendAndColorWrite(const GrXferProcessor::BlendInfo& blendInfo,
+                                 const skgpu::Swizzle&);
 
     void addFinishedProc(GrGpuFinishedProc finishedProc,
                          GrGpuFinishedContext finishedContext) override;
diff --git a/third_party/skia/src/gpu/gl/GrGLProgram.cpp b/third_party/skia/src/gpu/gl/GrGLProgram.cpp
index b590d8c5a927d..678edeeabc228 100644
--- a/third_party/skia/src/gpu/gl/GrGLProgram.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLProgram.cpp
@@ -140,7 +140,7 @@ void GrGLProgram::bindTextures(const GrGeometryProcessor& geomProc,
     // Bind textures from all of the fragment processors.
     pipeline.visitTextureEffects([&](const GrTextureEffect& te) {
         GrSamplerState samplerState = te.samplerState();
-        GrSwizzle swizzle = te.view().swizzle();
+        skgpu::Swizzle swizzle = te.view().swizzle();
         auto* texture = static_cast<GrGLTexture*>(te.texture());
         fGpu->bindTexture(nextTexSamplerIdx++, samplerState, swizzle, texture);
     });
diff --git a/third_party/skia/src/gpu/gl/GrGLProgram.h b/third_party/skia/src/gpu/gl/GrGLProgram.h
index b07c78a751846..1ee9160370e49 100644
--- a/third_party/skia/src/gpu/gl/GrGLProgram.h
+++ b/third_party/skia/src/gpu/gl/GrGLProgram.h
@@ -37,7 +37,7 @@ class GrGLProgram : public SkRefCnt {
      */
     struct Attribute {
         GrVertexAttribType fCPUType;
-        GrSLType fGPUType;
+        SkSLType fGPUType;
         size_t fOffset;
         GrGLint fLocation;
     };
diff --git a/third_party/skia/src/gpu/gl/GrGLProgramDataManager.cpp b/third_party/skia/src/gpu/gl/GrGLProgramDataManager.cpp
index 9e3abeadb0c26..f3fa7b78af69d 100644
--- a/third_party/skia/src/gpu/gl/GrGLProgramDataManager.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLProgramDataManager.cpp
@@ -44,7 +44,7 @@ void GrGLProgramDataManager::setSamplerUniforms(const UniformInfoArray& samplers
 
 void GrGLProgramDataManager::set1i(UniformHandle u, int32_t i) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt_GrSLType || uni.fType == kShort_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt || uni.fType == SkSLType::kShort);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform1i(uni.fLocation, i));
@@ -55,7 +55,7 @@ void GrGLProgramDataManager::set1iv(UniformHandle u,
                                     int arrayCount,
                                     const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt_GrSLType || uni.fType == kShort_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt || uni.fType == SkSLType::kShort);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -65,7 +65,7 @@ void GrGLProgramDataManager::set1iv(UniformHandle u,
 
 void GrGLProgramDataManager::set1f(UniformHandle u, float v0) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat_GrSLType || uni.fType == kHalf_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat || uni.fType == SkSLType::kHalf);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform1f(uni.fLocation, v0));
@@ -76,7 +76,7 @@ void GrGLProgramDataManager::set1fv(UniformHandle u,
                                     int arrayCount,
                                     const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat_GrSLType || uni.fType == kHalf_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat || uni.fType == SkSLType::kHalf);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     // This assert fires in some instances of the two-pt gradient for its VSParams.
@@ -90,7 +90,7 @@ void GrGLProgramDataManager::set1fv(UniformHandle u,
 
 void GrGLProgramDataManager::set2i(UniformHandle u, int32_t i0, int32_t i1) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt2_GrSLType || uni.fType == kShort2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt2 || uni.fType == SkSLType::kShort2);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform2i(uni.fLocation, i0, i1));
@@ -101,7 +101,7 @@ void GrGLProgramDataManager::set2iv(UniformHandle u,
                                     int arrayCount,
                                     const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt2_GrSLType || uni.fType == kShort2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt2 || uni.fType == SkSLType::kShort2);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -111,7 +111,7 @@ void GrGLProgramDataManager::set2iv(UniformHandle u,
 
 void GrGLProgramDataManager::set2f(UniformHandle u, float v0, float v1) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat2_GrSLType || uni.fType == kHalf2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat2 || uni.fType == SkSLType::kHalf2);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform2f(uni.fLocation, v0, v1));
@@ -122,7 +122,7 @@ void GrGLProgramDataManager::set2fv(UniformHandle u,
                                     int arrayCount,
                                     const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat2_GrSLType || uni.fType == kHalf2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat2 || uni.fType == SkSLType::kHalf2);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -132,7 +132,7 @@ void GrGLProgramDataManager::set2fv(UniformHandle u,
 
 void GrGLProgramDataManager::set3i(UniformHandle u, int32_t i0, int32_t i1, int32_t i2) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt3_GrSLType || uni.fType == kShort3_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt3 || uni.fType == SkSLType::kShort3);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform3i(uni.fLocation, i0, i1, i2));
@@ -143,7 +143,7 @@ void GrGLProgramDataManager::set3iv(UniformHandle u,
                                     int arrayCount,
                                     const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt3_GrSLType || uni.fType == kShort3_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt3 || uni.fType == SkSLType::kShort3);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -153,7 +153,7 @@ void GrGLProgramDataManager::set3iv(UniformHandle u,
 
 void GrGLProgramDataManager::set3f(UniformHandle u, float v0, float v1, float v2) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat3_GrSLType || uni.fType == kHalf3_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat3 || uni.fType == SkSLType::kHalf3);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform3f(uni.fLocation, v0, v1, v2));
@@ -164,7 +164,7 @@ void GrGLProgramDataManager::set3fv(UniformHandle u,
                                     int arrayCount,
                                     const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat3_GrSLType || uni.fType == kHalf3_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat3 || uni.fType == SkSLType::kHalf3);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -178,7 +178,7 @@ void GrGLProgramDataManager::set4i(UniformHandle u,
                                    int32_t i2,
                                    int32_t i3) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt4_GrSLType || uni.fType == kShort4_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt4 || uni.fType == SkSLType::kShort4);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform4i(uni.fLocation, i0, i1, i2, i3));
@@ -189,7 +189,7 @@ void GrGLProgramDataManager::set4iv(UniformHandle u,
                                     int arrayCount,
                                     const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt4_GrSLType || uni.fType == kShort4_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt4 || uni.fType == SkSLType::kShort4);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -203,7 +203,7 @@ void GrGLProgramDataManager::set4f(UniformHandle u,
                                    float v2,
                                    float v3) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat4_GrSLType || uni.fType == kHalf4_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat4 || uni.fType == SkSLType::kHalf4);
     SkASSERT(GrShaderVar::kNonArray == uni.fArrayCount);
     if (kUnusedUniform != uni.fLocation) {
         GR_GL_CALL(fGpu->glInterface(), Uniform4f(uni.fLocation, v0, v1, v2, v3));
@@ -214,7 +214,7 @@ void GrGLProgramDataManager::set4fv(UniformHandle u,
                                     int arrayCount,
                                     const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat4_GrSLType || uni.fType == kHalf4_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat4 || uni.fType == SkSLType::kHalf4);
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
@@ -252,8 +252,8 @@ template<int N> inline void GrGLProgramDataManager::setMatrices(UniformHandle u,
                                                                 int arrayCount,
                                                                 const float matrices[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat2x2_GrSLType + (N - 2) ||
-             uni.fType == kHalf2x2_GrSLType + (N - 2));
+    SkASSERT(static_cast<int>(uni.fType) == static_cast<int>(SkSLType::kFloat2x2) + (N - 2) ||
+             static_cast<int>(uni.fType) == static_cast<int>(SkSLType::kHalf2x2) + (N - 2));
     SkASSERT(arrayCount > 0);
     ASSERT_ARRAY_UPLOAD_IN_BOUNDS(uni, arrayCount);
     if (kUnusedUniform != uni.fLocation) {
diff --git a/third_party/skia/src/gpu/gl/GrGLProgramDataManager.h b/third_party/skia/src/gpu/gl/GrGLProgramDataManager.h
index c01006c82a10e..69701a2186735 100644
--- a/third_party/skia/src/gpu/gl/GrGLProgramDataManager.h
+++ b/third_party/skia/src/gpu/gl/GrGLProgramDataManager.h
@@ -81,7 +81,7 @@ class GrGLProgramDataManager : public GrGLSLProgramDataManager {
     struct Uniform {
         GrGLint     fLocation;
 #ifdef SK_DEBUG
-        GrSLType    fType;
+        SkSLType    fType;
         int         fArrayCount;
 #endif
     };
diff --git a/third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp b/third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp
index 3034ddbb39691..6708d92bd140e 100644
--- a/third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLTypesPriv.cpp
@@ -7,7 +7,7 @@
 
 #include "include/core/SkScalar.h"
 #include "include/private/GrGLTypesPriv.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/gl/GrGLDefines.h"
 
 GrGLTextureParameters::SamplerOverriddenState::SamplerOverriddenState()
diff --git a/third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp b/third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp
index c267713020f7b..7dcf69aed4afc 100644
--- a/third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLUniformHandler.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/gl/GrGLUniformHandler.h"
 
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/GrUtil.h"
 #include "src/gpu/gl/GrGLCaps.h"
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/gl/builders/GrGLProgramBuilder.h"
@@ -27,7 +28,7 @@ bool valid_name(const char* name) {
 GrGLSLUniformHandler::UniformHandle GrGLUniformHandler::internalAddUniformArray(
                                                                    const GrFragmentProcessor* owner,
                                                                    uint32_t visibility,
-                                                                   GrSLType type,
+                                                                   SkSLType type,
                                                                    const char* name,
                                                                    bool mangleName,
                                                                    int arrayCount,
@@ -68,7 +69,7 @@ GrGLSLUniformHandler::UniformHandle GrGLUniformHandler::internalAddUniformArray(
 }
 
 GrGLSLUniformHandler::SamplerHandle GrGLUniformHandler::addSampler(
-        const GrBackendFormat& backendFormat, GrSamplerState, const GrSwizzle& swizzle,
+        const GrBackendFormat& backendFormat, GrSamplerState, const skgpu::Swizzle& swizzle,
         const char* name, const GrShaderCaps* shaderCaps) {
     SkASSERT(name && strlen(name));
 
@@ -79,7 +80,7 @@ GrGLSLUniformHandler::SamplerHandle GrGLUniformHandler::addSampler(
 
     GLUniformInfo tempInfo;
     tempInfo.fVariable = GrShaderVar{std::move(mangleName),
-                                     GrSLCombinedSamplerTypeForTextureType(type),
+                                     SkSLCombinedSamplerTypeForTextureType(type),
                                      GrShaderVar::TypeModifier::Uniform};
 
     tempInfo.fVisibility = kFragment_GrShaderFlag;
diff --git a/third_party/skia/src/gpu/gl/GrGLUniformHandler.h b/third_party/skia/src/gpu/gl/GrGLUniformHandler.h
index 76e8e3ce48e48..1cafcfcb5242f 100644
--- a/third_party/skia/src/gpu/gl/GrGLUniformHandler.h
+++ b/third_party/skia/src/gpu/gl/GrGLUniformHandler.h
@@ -46,20 +46,20 @@ class GrGLUniformHandler : public GrGLSLUniformHandler {
 
     UniformHandle internalAddUniformArray(const GrFragmentProcessor* owner,
                                           uint32_t visibility,
-                                          GrSLType type,
+                                          SkSLType type,
                                           const char* name,
                                           bool mangleName,
                                           int arrayCount,
                                           const char** outName) override;
 
-    SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const GrSwizzle&,
+    SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const skgpu::Swizzle&,
                              const char* name, const GrShaderCaps*) override;
 
     const char* samplerVariable(SamplerHandle handle) const override {
         return fSamplers.item(handle.toIndex()).fVariable.c_str();
     }
 
-    GrSwizzle samplerSwizzle(SamplerHandle handle) const override {
+    skgpu::Swizzle samplerSwizzle(SamplerHandle handle) const override {
         return fSamplerSwizzles[handle.toIndex()];
     }
 
@@ -76,9 +76,9 @@ class GrGLUniformHandler : public GrGLSLUniformHandler {
     typedef GrGLProgramDataManager::GLUniformInfo GLUniformInfo;
     typedef GrGLProgramDataManager::UniformInfoArray UniformInfoArray;
 
-    UniformInfoArray    fUniforms;
-    UniformInfoArray    fSamplers;
-    SkTArray<GrSwizzle> fSamplerSwizzles;
+    UniformInfoArray         fUniforms;
+    UniformInfoArray         fSamplers;
+    SkTArray<skgpu::Swizzle> fSamplerSwizzles;
 
     friend class GrGLProgramBuilder;
 
diff --git a/third_party/skia/src/gpu/gl/GrGLUtil.cpp b/third_party/skia/src/gpu/gl/GrGLUtil.cpp
index cafbc4018c333..03996aad5e28f 100644
--- a/third_party/skia/src/gpu/gl/GrGLUtil.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLUtil.cpp
@@ -243,6 +243,25 @@ static GrGLRenderer get_renderer(const char* rendererString, const GrGLExtension
         if (strstr(intelString, "Bay Trail")) {
             return GrGLRenderer::kIntelValleyView;
         }
+        // In Mesa, 'RKL' can be followed by 'Graphics', same for 'TGL' and 'ADL'.
+        // Referenced from the following Mesa source code:
+        // https://github.com/mesa3d/mesa/blob/master/include/pci_ids/iris_pci_ids.h
+        if (strstr(intelString, "RKL")) {
+            return GrGLRenderer::kIntelRocketLake;
+        }
+        if (strstr(intelString, "TGL")) {
+            return GrGLRenderer::kIntelTigerLake;
+        }
+        // For Windows on ADL-S devices, 'AlderLake-S' might be followed by 'Intel(R)'.
+        if (strstr(intelString, "ADL") || strstr(intelString, "AlderLake")) {
+            return GrGLRenderer::kIntelAlderLake;
+        }
+        // For Windows on TGL or other ADL devices, we might only get 'Xe' from the string.
+        // Since they are both 12th gen, we could temporarily use 'kIntelTigerLake' to cover
+        // both TGL and ADL.
+        if (strstr(intelString, "Xe")) {
+            return GrGLRenderer::kIntelTigerLake;
+        }
         // There are many possible intervening strings here:
         // 'Intel(R)' is a common prefix
         // 'Iris' may appear, followed by '(R)' or '(TM)'
@@ -291,6 +310,11 @@ static GrGLRenderer get_renderer(const char* rendererString, const GrGLExtension
                 if (intelNumber == 655) {
                     return GrGLRenderer::kIntelCoffeeLake;
                 }
+                // 710/730/750/770 are all 12th gen UHD Graphics, but it's hard to distinguish
+                // among RKL, TGL and ADL. We might temporarily use 'kIntelTigerLake' to cover all.
+                if (intelNumber >= 710 && intelNumber <= 770) {
+                    return GrGLRenderer::kIntelTigerLake;
+                }
                 if (intelNumber >= 910 && intelNumber <= 950) {
                     return GrGLRenderer::kIntelIceLake;
                 }
@@ -752,6 +776,7 @@ bool GrGLFormatIsCompressed(GrGLFormat format) {
         case GrGLFormat::kR16F:
         case GrGLFormat::kLUMINANCE16F:
         case GrGLFormat::kRGB8:
+        case GrGLFormat::kRGBX8:
         case GrGLFormat::kRG8:
         case GrGLFormat::kRGB10_A2:
         case GrGLFormat::kRGBA4:
diff --git a/third_party/skia/src/gpu/gl/GrGLUtil.h b/third_party/skia/src/gpu/gl/GrGLUtil.h
index 01bcbc4182c5d..9907b3fec530b 100644
--- a/third_party/skia/src/gpu/gl/GrGLUtil.h
+++ b/third_party/skia/src/gpu/gl/GrGLUtil.h
@@ -51,6 +51,7 @@ static constexpr uint32_t GrGLFormatChannels(GrGLFormat format) {
         case GrGLFormat::kRGBA16F:               return kRGBA_SkColorChannelFlags;
         case GrGLFormat::kR16F:                  return kRed_SkColorChannelFlag;
         case GrGLFormat::kRGB8:                  return kRGB_SkColorChannelFlags;
+        case GrGLFormat::kRGBX8:                 return kRGB_SkColorChannelFlags;
         case GrGLFormat::kRG8:                   return kRG_SkColorChannelFlags;
         case GrGLFormat::kRGB10_A2:              return kRGBA_SkColorChannelFlags;
         case GrGLFormat::kRGBA4:                 return kRGBA_SkColorChannelFlags;
@@ -95,6 +96,8 @@ static constexpr GrColorFormatDesc GrGLFormatDesc(GrGLFormat format) {
             return GrColorFormatDesc::MakeR(16, GrColorTypeEncoding::kFloat);
         case GrGLFormat::kRGB8:
             return GrColorFormatDesc::MakeRGB(8, GrColorTypeEncoding::kUnorm);
+        case GrGLFormat::kRGBX8:
+            return GrColorFormatDesc::MakeRGB(8, GrColorTypeEncoding::kUnorm);
         case GrGLFormat::kRG8:
             return GrColorFormatDesc::MakeRG(8, GrColorTypeEncoding::kUnorm);
         case GrGLFormat::kRGB10_A2:
@@ -186,6 +189,11 @@ enum class GrGLRenderer {
     // 11th gen
     kIntelIceLake,
 
+    // 12th gen
+    kIntelRocketLake,
+    kIntelTigerLake,
+    kIntelAlderLake,
+
     kGalliumLLVM,
 
     kVirgl,
@@ -384,6 +392,7 @@ static constexpr GrGLFormat GrGLFormatFromGLEnum(GrGLenum glFormat) {
         case GR_GL_LUMINANCE16F:         return GrGLFormat::kLUMINANCE16F;
         case GR_GL_R16F:                 return GrGLFormat::kR16F;
         case GR_GL_RGB8:                 return GrGLFormat::kRGB8;
+        case GR_GL_RGBX8:                return GrGLFormat::kRGBX8;
         case GR_GL_RG8:                  return GrGLFormat::kRG8;
         case GR_GL_RGB10_A2:             return GrGLFormat::kRGB10_A2;
         case GR_GL_RGBA4:                return GrGLFormat::kRGBA4;
@@ -419,6 +428,7 @@ static constexpr GrGLenum GrGLFormatToEnum(GrGLFormat format) {
         case GrGLFormat::kLUMINANCE16F:         return GR_GL_LUMINANCE16F;
         case GrGLFormat::kR16F:                 return GR_GL_R16F;
         case GrGLFormat::kRGB8:                 return GR_GL_RGB8;
+        case GrGLFormat::kRGBX8:                return GR_GL_RGBX8;
         case GrGLFormat::kRG8:                  return GR_GL_RG8;
         case GrGLFormat::kRGB10_A2:             return GR_GL_RGB10_A2;
         case GrGLFormat::kRGBA4:                return GR_GL_RGBA4;
@@ -453,6 +463,7 @@ static constexpr size_t GrGLFormatBytesPerBlock(GrGLFormat format) {
         case GrGLFormat::kR16F:                 return 2;
         // We assume the GPU stores this format 4 byte aligned
         case GrGLFormat::kRGB8:                 return 4;
+        case GrGLFormat::kRGBX8:                return 4;
         case GrGLFormat::kRG8:                  return 2;
         case GrGLFormat::kRGB10_A2:             return 4;
         case GrGLFormat::kRGBA4:                return 2;
@@ -496,6 +507,7 @@ static constexpr int GrGLFormatStencilBits(GrGLFormat format) {
         case GrGLFormat::kR16F:
         case GrGLFormat::kLUMINANCE16F:
         case GrGLFormat::kRGB8:
+        case GrGLFormat::kRGBX8:
         case GrGLFormat::kRG8:
         case GrGLFormat::kRGB10_A2:
         case GrGLFormat::kRGBA4:
@@ -529,6 +541,7 @@ static constexpr bool GrGLFormatIsPackedDepthStencil(GrGLFormat format) {
         case GrGLFormat::kR16F:
         case GrGLFormat::kLUMINANCE16F:
         case GrGLFormat::kRGB8:
+        case GrGLFormat::kRGBX8:
         case GrGLFormat::kRG8:
         case GrGLFormat::kRGB10_A2:
         case GrGLFormat::kRGBA4:
@@ -564,6 +577,7 @@ static constexpr bool GrGLFormatIsSRGB(GrGLFormat format) {
     case GrGLFormat::kR16F:
     case GrGLFormat::kLUMINANCE16F:
     case GrGLFormat::kRGB8:
+    case GrGLFormat::kRGBX8:
     case GrGLFormat::kRG8:
     case GrGLFormat::kRGB10_A2:
     case GrGLFormat::kRGBA4:
diff --git a/third_party/skia/src/gpu/gl/GrGLVertexArray.cpp b/third_party/skia/src/gpu/gl/GrGLVertexArray.cpp
index 4a40608e7bc62..bbe74251e00b0 100644
--- a/third_party/skia/src/gpu/gl/GrGLVertexArray.cpp
+++ b/third_party/skia/src/gpu/gl/GrGLVertexArray.cpp
@@ -80,7 +80,7 @@ void GrGLAttribArrayState::set(GrGLGpu* gpu,
                                int index,
                                const GrBuffer* vertexBuffer,
                                GrVertexAttribType cpuType,
-                               GrSLType gpuType,
+                               SkSLType gpuType,
                                GrGLsizei stride,
                                size_t offsetInBytes,
                                int divisor) {
@@ -113,7 +113,7 @@ void GrGLAttribArrayState::set(GrGLGpu* gpu,
         // GrGLGpu will avoid redundant binds.
         gpu->bindBuffer(GrGpuBufferType::kVertex, vertexBuffer);
         const AttribLayout& layout = attrib_layout(cpuType);
-        if (GrSLTypeIsFloatType(gpuType)) {
+        if (SkSLTypeIsFloatType(gpuType)) {
             GR_GL_CALL(gpu->glInterface(), VertexAttribPointer(index,
                                                                layout.fCount,
                                                                layout.fType,
diff --git a/third_party/skia/src/gpu/gl/GrGLVertexArray.h b/third_party/skia/src/gpu/gl/GrGLVertexArray.h
index 7c95eac50edb1..febc679310e08 100644
--- a/third_party/skia/src/gpu/gl/GrGLVertexArray.h
+++ b/third_party/skia/src/gpu/gl/GrGLVertexArray.h
@@ -41,7 +41,7 @@ class GrGLAttribArrayState {
              int attribIndex,
              const GrBuffer* vertexBuffer,
              GrVertexAttribType cpuType,
-             GrSLType gpuType,
+             SkSLType gpuType,
              GrGLsizei stride,
              size_t offsetInBytes,
              int divisor = 0);
@@ -81,7 +81,7 @@ class GrGLAttribArrayState {
         GrGpuResource::UniqueID   fVertexBufferUniqueID;
         bool                      fUsingCpuBuffer;
         GrVertexAttribType        fCPUType;
-        GrSLType                  fGPUType;
+        SkSLType                  fGPUType;
         GrGLsizei                 fStride;
         const GrGLvoid*           fOffset;
         int                       fDivisor;
diff --git a/third_party/skia/src/gpu/gl/builders/BUILD.bazel b/third_party/skia/src/gpu/gl/builders/BUILD.bazel
index 077c5dcee8b0f..82deeecde4053 100644
--- a/third_party/skia/src/gpu/gl/builders/BUILD.bazel
+++ b/third_party/skia/src/gpu/gl/builders/BUILD.bazel
@@ -36,12 +36,12 @@ generated_cc_atom(
         "//src/gpu:GrPersistentCacheUtils_hdr",
         "//src/gpu:GrProgramDesc_hdr",
         "//src/gpu:GrShaderCaps_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu:GrSwizzle_hdr",
         "//src/gpu:GrXferProcessor_hdr",
         "//src/gpu/gl:GrGLGpu_hdr",
         "//src/gpu/gl:GrGLProgram_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
 
@@ -66,10 +66,10 @@ generated_cc_atom(
         ":GrGLShaderStringBuilder_hdr",
         "//src/core:SkAutoMalloc_hdr",
         "//src/core:SkTraceEvent_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu/gl:GrGLGpu_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/sksl/codegen:SkSLGLSLCodeGenerator_hdr",
         "//src/sksl/ir:SkSLProgram_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
diff --git a/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index f599743d97445..7b16a41375511 100644
--- a/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -20,12 +20,12 @@
 #include "src/gpu/GrPersistentCacheUtils.h"
 #include "src/gpu/GrProgramDesc.h"
 #include "src/gpu/GrShaderCaps.h"
-#include "src/gpu/GrShaderUtils.h"
-#include "src/gpu/GrSwizzle.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/gl/GrGLProgram.h"
 #include "src/gpu/gl/builders/GrGLProgramBuilder.h"
+#include "src/utils/SkShaderUtils.h"
 
 #include <memory>
 #include "src/gpu/gl/builders/GrGLShaderStringBuilder.h"
@@ -96,7 +96,7 @@ SkSL::Compiler* GrGLProgramBuilder::shaderCompiler() const {
     return fGpu->shaderCompiler();
 }
 
-bool GrGLProgramBuilder::compileAndAttachShaders(const SkSL::String& glsl,
+bool GrGLProgramBuilder::compileAndAttachShaders(const std::string& glsl,
                                                  GrGLuint programId,
                                                  GrGLenum type,
                                                  SkTDArray<GrGLuint>* shaderIds,
@@ -123,25 +123,23 @@ void GrGLProgramBuilder::computeCountsAndStrides(GrGLuint programID,
     fInstanceAttributeCnt = geomProc.numInstanceAttributes();
     fAttributes = std::make_unique<GrGLProgram::Attribute[]>(
             fVertexAttributeCnt + fInstanceAttributeCnt);
-    auto addAttr = [&](int i, const auto& a, size_t* stride) {
+    auto addAttr = [&](int i, const auto& a) {
         fAttributes[i].fCPUType = a.cpuType();
         fAttributes[i].fGPUType = a.gpuType();
-        fAttributes[i].fOffset = *stride;
-        *stride += a.sizeAlign4();
+        fAttributes[i].fOffset = *a.offset();
         fAttributes[i].fLocation = i;
         if (bindAttribLocations) {
             GL_CALL(BindAttribLocation(programID, i, a.name()));
         }
     };
-    fVertexStride = 0;
+    fVertexStride = geomProc.vertexStride();
     int i = 0;
-    for (const auto& attr : geomProc.vertexAttributes()) {
-        addAttr(i++, attr, &fVertexStride);
+    for (auto attr : geomProc.vertexAttributes()) {
+        addAttr(i++, attr);
     }
-    SkASSERT(fVertexStride == geomProc.vertexStride());
-    fInstanceStride = 0;
-    for (const auto& attr : geomProc.instanceAttributes()) {
-        addAttr(i++, attr, &fInstanceStride);
+    fInstanceStride = geomProc.instanceStride();
+    for (auto attr : geomProc.instanceAttributes()) {
+        addAttr(i++, attr);
     }
     SkASSERT(fInstanceStride == geomProc.instanceStride());
 }
@@ -157,7 +155,7 @@ static constexpr SkFourByteTag kGLSL_Tag = SkSetFourByteTag('G', 'L', 'S', 'L');
 static constexpr SkFourByteTag kGLPB_Tag = SkSetFourByteTag('G', 'L', 'P', 'B');
 
 void GrGLProgramBuilder::storeShaderInCache(const SkSL::Program::Inputs& inputs, GrGLuint programID,
-                                            const SkSL::String shaders[], bool isSkSL,
+                                            const std::string shaders[], bool isSkSL,
                                             SkSL::Program::Settings* settings) {
     if (!this->gpu()->getContext()->priv().getPersistentCache()) {
         return;
@@ -192,10 +190,10 @@ void GrGLProgramBuilder::storeShaderInCache(const SkSL::Program::Inputs& inputs,
         meta.fSettings = settings;
         meta.fHasCustomColorOutput = fFS.hasCustomColorOutput();
         meta.fHasSecondaryColorOutput = fFS.hasSecondaryOutput();
-        for (const auto& attr : this->geometryProcessor().vertexAttributes()) {
+        for (auto attr : this->geometryProcessor().vertexAttributes()) {
             meta.fAttributeNames.emplace_back(attr.name());
         }
-        for (const auto& attr : this->geometryProcessor().instanceAttributes()) {
+        for (auto attr : this->geometryProcessor().instanceAttributes()) {
             meta.fAttributeNames.emplace_back(attr.name());
         }
 
@@ -243,12 +241,12 @@ sk_sp<GrGLProgram> GrGLProgramBuilder::finalize(const GrGLPrecompiledProgram* pr
 
     bool cached = fCached.get() != nullptr;
     bool usedProgramBinaries = false;
-    SkSL::String glsl[kGrShaderTypeCount];
-    SkSL::String* sksl[kGrShaderTypeCount] = {
+    std::string glsl[kGrShaderTypeCount];
+    std::string* sksl[kGrShaderTypeCount] = {
         &fVS.fCompilerString,
         &fFS.fCompilerString,
     };
-    SkSL::String cached_sksl[kGrShaderTypeCount];
+    std::string cached_sksl[kGrShaderTypeCount];
     if (precompiledProgram) {
         // This is very similar to when we get program binaries. We even set that flag, as it's
         // used to prevent other compile work later, and to force re-querying uniform locations.
@@ -275,20 +273,17 @@ sk_sp<GrGLProgram> GrGLProgramBuilder::finalize(const GrGLPrecompiledProgram* pr
                 if (!reader.isValid()) {
                     break;
                 }
-                this->gpu()->clearErrorsAndCheckForOOM();
-                GR_GL_CALL_NOERRCHECK(this->gpu()->glInterface(),
-                                      ProgramBinary(programID, binaryFormat,
-                                                    const_cast<void*>(binary), length));
-                if (this->gpu()->getErrorAndCheckForOOM() == GR_GL_NO_ERROR) {
-                    if (checkLinked) {
-                        cached = this->checkLinkStatus(programID, errorHandler, nullptr, nullptr);
-                    }
-                    if (cached) {
-                        this->addInputVars(inputs);
-                        this->computeCountsAndStrides(programID, geomProc, false);
-                    }
-                } else {
+                if (length <= 0 || !fGpu->glCaps().programBinaryFormatIsValid(binaryFormat)) {
                     cached = false;
+                    break;
+                }
+                GL_CALL(ProgramBinary(programID, binaryFormat, const_cast<void*>(binary), length));
+                if (checkLinked) {
+                    cached = this->checkLinkStatus(programID, errorHandler, nullptr, nullptr);
+                }
+                if (cached) {
+                    this->addInputVars(inputs);
+                    this->computeCountsAndStrides(programID, geomProc, false);
                 }
                 usedProgramBinaries = cached;
                 break;
@@ -441,7 +436,7 @@ sk_sp<GrGLProgram> GrGLProgramBuilder::finalize(const GrGLPrecompiledProgram* pr
         if (fGpu->getContext()->priv().options().fShaderCacheStrategy ==
                 GrContextOptions::ShaderCacheStrategy::kSkSL) {
             for (int i = 0; i < kGrShaderTypeCount; ++i) {
-                glsl[i] = GrShaderUtils::PrettyPrint(*sksl[i]);
+                glsl[i] = SkShaderUtils::PrettyPrint(*sksl[i]);
             }
             isSkSL = true;
         }
@@ -466,18 +461,22 @@ void GrGLProgramBuilder::bindProgramResourceLocations(GrGLuint programID) {
 
 bool GrGLProgramBuilder::checkLinkStatus(GrGLuint programID,
                                          GrContextOptions::ShaderErrorHandler* errorHandler,
-                                         SkSL::String* sksl[], const SkSL::String glsl[]) {
+                                         std::string* sksl[], const std::string glsl[]) {
     GrGLint linked = GR_GL_INIT_ZERO;
     GL_CALL(GetProgramiv(programID, GR_GL_LINK_STATUS, &linked));
     if (!linked) {
-        SkSL::String allShaders;
+        std::string allShaders;
         if (sksl) {
-            allShaders.appendf("// Vertex SKSL\n%s\n", sksl[kVertex_GrShaderType]->c_str());
-            allShaders.appendf("// Fragment SKSL\n%s\n", sksl[kFragment_GrShaderType]->c_str());
+            SkSL::String::appendf(&allShaders, "// Vertex SKSL\n%s\n"
+                                               "// Fragment SKSL\n%s\n",
+                                               sksl[kVertex_GrShaderType]->c_str(),
+                                               sksl[kFragment_GrShaderType]->c_str());
         }
         if (glsl) {
-            allShaders.appendf("// Vertex GLSL\n%s\n", glsl[kVertex_GrShaderType].c_str());
-            allShaders.appendf("// Fragment GLSL\n%s\n", glsl[kFragment_GrShaderType].c_str());
+            SkSL::String::appendf(&allShaders, "// Vertex GLSL\n%s\n"
+                                               "// Fragment GLSL\n%s\n",
+                                               glsl[kVertex_GrShaderType].c_str(),
+                                               glsl[kFragment_GrShaderType].c_str());
         }
         GrGLint infoLen = GR_GL_INIT_ZERO;
         GL_CALL(GetProgramiv(programID, GR_GL_INFO_LOG_LENGTH, &infoLen));
@@ -535,7 +534,7 @@ bool GrGLProgramBuilder::PrecompileProgram(GrDirectContext* dContext,
     GrPersistentCacheUtils::ShaderMetadata meta;
     meta.fSettings = &settings;
 
-    SkSL::String shaders[kGrShaderTypeCount];
+    std::string shaders[kGrShaderTypeCount];
     SkSL::Program::Inputs inputs;
     if (!GrPersistentCacheUtils::UnpackCachedShaders(&reader, shaders, &inputs, 1, &meta)) {
         return false;
@@ -549,8 +548,8 @@ bool GrGLProgramBuilder::PrecompileProgram(GrDirectContext* dContext,
 
     SkTDArray<GrGLuint> shadersToDelete;
 
-    auto compileShader = [&](SkSL::ProgramKind kind, const SkSL::String& sksl, GrGLenum type) {
-        SkSL::String glsl;
+    auto compileShader = [&](SkSL::ProgramKind kind, const std::string& sksl, GrGLenum type) {
+        std::string glsl;
         auto program = GrSkSLtoGLSL(glGpu, kind, sksl, settings, &glsl, errorHandler);
         if (!program) {
             return false;
diff --git a/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.h b/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
index 4ae2f356ed186..81bd71c342a32 100644
--- a/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
+++ b/third_party/skia/src/gpu/gl/builders/GrGLProgramBuilder.h
@@ -61,7 +61,7 @@ class GrGLProgramBuilder : public GrGLSLProgramBuilder {
     GrGLProgramBuilder(GrGLGpu*, const GrProgramDesc&, const GrProgramInfo&);
 
     void addInputVars(const SkSL::Program::Inputs& inputs);
-    bool compileAndAttachShaders(const SkSL::String& glsl,
+    bool compileAndAttachShaders(const std::string& glsl,
                                  GrGLuint programId,
                                  GrGLenum type,
                                  SkTDArray<GrGLuint>* shaderIds,
@@ -71,12 +71,12 @@ class GrGLProgramBuilder : public GrGLSLProgramBuilder {
                                  const GrGeometryProcessor&,
                                  bool bindAttribLocations);
     void storeShaderInCache(const SkSL::Program::Inputs& inputs, GrGLuint programID,
-                            const SkSL::String shaders[], bool isSkSL,
+                            const std::string shaders[], bool isSkSL,
                             SkSL::Program::Settings* settings);
     sk_sp<GrGLProgram> finalize(const GrGLPrecompiledProgram*);
     void bindProgramResourceLocations(GrGLuint programID);
     bool checkLinkStatus(GrGLuint programID, GrContextOptions::ShaderErrorHandler* errorHandler,
-                         SkSL::String* sksl[], const SkSL::String glsl[]);
+                         std::string* sksl[], const std::string glsl[]);
     void resolveProgramResourceLocations(GrGLuint programID, bool force);
 
     // Subclasses create different programs
diff --git a/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
index fc8a400afeed3..515cc3085f1a7 100644
--- a/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
+++ b/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp
@@ -7,12 +7,12 @@
 
 #include "src/core/SkAutoMalloc.h"
 #include "src/core/SkTraceEvent.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/gl/GrGLGpu.h"
 #include "src/gpu/gl/builders/GrGLShaderStringBuilder.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/codegen/SkSLGLSLCodeGenerator.h"
 #include "src/sksl/ir/SkSLProgram.h"
+#include "src/utils/SkShaderUtils.h"
 
 // Print the source code for all shaders generated.
 static const bool gPrintSKSL = false;
@@ -20,16 +20,16 @@ static const bool gPrintGLSL = false;
 
 std::unique_ptr<SkSL::Program> GrSkSLtoGLSL(const GrGLGpu* gpu,
                                             SkSL::ProgramKind programKind,
-                                            const SkSL::String& sksl,
+                                            const std::string& sksl,
                                             const SkSL::Program::Settings& settings,
-                                            SkSL::String* glsl,
+                                            std::string* glsl,
                                             GrContextOptions::ShaderErrorHandler* errorHandler) {
     SkSL::Compiler* compiler = gpu->shaderCompiler();
     std::unique_ptr<SkSL::Program> program;
 #ifdef SK_DEBUG
-    SkSL::String src = GrShaderUtils::PrettyPrint(sksl);
+    std::string src = SkShaderUtils::PrettyPrint(sksl);
 #else
-    const SkSL::String& src = sksl;
+    const std::string& src = sksl;
 #endif
     program = compiler->convertProgram(programKind, src, settings);
     if (!program || !compiler->toGLSL(*program, glsl)) {
@@ -38,14 +38,14 @@ std::unique_ptr<SkSL::Program> GrSkSLtoGLSL(const GrGLGpu* gpu,
     }
 
     if (gPrintSKSL || gPrintGLSL) {
-        GrShaderUtils::PrintShaderBanner(programKind);
+        SkShaderUtils::PrintShaderBanner(programKind);
         if (gPrintSKSL) {
             SkDebugf("SKSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(sksl));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(sksl));
         }
         if (gPrintGLSL) {
             SkDebugf("GLSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(*glsl));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(*glsl));
         }
     }
 
@@ -55,7 +55,7 @@ std::unique_ptr<SkSL::Program> GrSkSLtoGLSL(const GrGLGpu* gpu,
 GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx,
                                     GrGLuint programId,
                                     GrGLenum type,
-                                    const SkSL::String& glsl,
+                                    const std::string& glsl,
                                     GrThreadSafePipelineBuilder::Stats* stats,
                                     GrContextOptions::ShaderErrorHandler* errorHandler) {
     TRACE_EVENT0_ALWAYS("skia.shaders", "driver_compile_shader");
diff --git a/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h b/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
index 37412ebcc23ab..275236b897dcb 100644
--- a/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
+++ b/third_party/skia/src/gpu/gl/builders/GrGLShaderStringBuilder.h
@@ -16,15 +16,15 @@
 
 std::unique_ptr<SkSL::Program> GrSkSLtoGLSL(const GrGLGpu* gpu,
                                             SkSL::ProgramKind programKind,
-                                            const SkSL::String& sksl,
+                                            const std::string& sksl,
                                             const SkSL::Program::Settings& settings,
-                                            SkSL::String* glsl,
+                                            std::string* glsl,
                                             GrContextOptions::ShaderErrorHandler* errorHandler);
 
 GrGLuint GrGLCompileAndAttachShader(const GrGLContext& glCtx,
                                     GrGLuint programId,
                                     GrGLenum type,
-                                    const SkSL::String& glsl,
+                                    const std::string& glsl,
                                     GrThreadSafePipelineBuilder::Stats*,
                                     GrContextOptions::ShaderErrorHandler* errorHandler);
 
diff --git a/third_party/skia/src/gpu/glsl/BUILD.bazel b/third_party/skia/src/gpu/glsl/BUILD.bazel
index 4e41a6e660d4c..5b294682971c1 100644
--- a/third_party/skia/src/gpu/glsl/BUILD.bazel
+++ b/third_party/skia/src/gpu/glsl/BUILD.bazel
@@ -223,7 +223,7 @@ generated_cc_atom(
     hdrs = ["GrGLSL.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkSLTypeShared_hdr",
         "//src/sksl:SkSLGLSL_hdr",
     ],
 )
diff --git a/third_party/skia/src/gpu/glsl/GrGLSL.cpp b/third_party/skia/src/gpu/glsl/GrGLSL.cpp
index 760d93e04eee9..71603f8fb2f72 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSL.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSL.cpp
@@ -7,49 +7,49 @@
 
 #include "src/gpu/glsl/GrGLSL.h"
 
-const char* GrGLSLTypeString(GrSLType t) {
+const char* GrGLSLTypeString(SkSLType t) {
     switch (t) {
-        case kVoid_GrSLType:                   return "void";
-        case kBool_GrSLType:                   return "bool";
-        case kBool2_GrSLType:                  return "bool2";
-        case kBool3_GrSLType:                  return "bool3";
-        case kBool4_GrSLType:                  return "bool4";
-        case kShort_GrSLType:                  return "short";
-        case kShort2_GrSLType:                 return "short2";
-        case kShort3_GrSLType:                 return "short3";
-        case kShort4_GrSLType:                 return "short4";
-        case kUShort_GrSLType:                 return "ushort";
-        case kUShort2_GrSLType:                return "ushort2";
-        case kUShort3_GrSLType:                return "ushort3";
-        case kUShort4_GrSLType:                return "ushort4";
-        case kFloat_GrSLType:                  return "float";
-        case kFloat2_GrSLType:                 return "float2";
-        case kFloat3_GrSLType:                 return "float3";
-        case kFloat4_GrSLType:                 return "float4";
-        case kFloat2x2_GrSLType:               return "float2x2";
-        case kFloat3x3_GrSLType:               return "float3x3";
-        case kFloat4x4_GrSLType:               return "float4x4";
-        case kHalf_GrSLType:                   return "half";
-        case kHalf2_GrSLType:                  return "half2";
-        case kHalf3_GrSLType:                  return "half3";
-        case kHalf4_GrSLType:                  return "half4";
-        case kHalf2x2_GrSLType:                return "half2x2";
-        case kHalf3x3_GrSLType:                return "half3x3";
-        case kHalf4x4_GrSLType:                return "half4x4";
-        case kInt_GrSLType:                    return "int";
-        case kInt2_GrSLType:                   return "int2";
-        case kInt3_GrSLType:                   return "int3";
-        case kInt4_GrSLType:                   return "int4";
-        case kUInt_GrSLType:                   return "uint";
-        case kUInt2_GrSLType:                  return "uint2";
-        case kUInt3_GrSLType:                  return "uint3";
-        case kUInt4_GrSLType:                  return "uint4";
-        case kTexture2DSampler_GrSLType:       return "sampler2D";
-        case kTextureExternalSampler_GrSLType: return "samplerExternalOES";
-        case kTexture2DRectSampler_GrSLType:   return "sampler2DRect";
-        case kTexture2D_GrSLType:              return "texture2D";
-        case kSampler_GrSLType:                return "sampler";
-        case kInput_GrSLType:                  return "subpassInput";
+        case SkSLType::kVoid:                   return "void";
+        case SkSLType::kBool:                   return "bool";
+        case SkSLType::kBool2:                  return "bool2";
+        case SkSLType::kBool3:                  return "bool3";
+        case SkSLType::kBool4:                  return "bool4";
+        case SkSLType::kShort:                  return "short";
+        case SkSLType::kShort2:                 return "short2";
+        case SkSLType::kShort3:                 return "short3";
+        case SkSLType::kShort4:                 return "short4";
+        case SkSLType::kUShort:                 return "ushort";
+        case SkSLType::kUShort2:                return "ushort2";
+        case SkSLType::kUShort3:                return "ushort3";
+        case SkSLType::kUShort4:                return "ushort4";
+        case SkSLType::kFloat:                  return "float";
+        case SkSLType::kFloat2:                 return "float2";
+        case SkSLType::kFloat3:                 return "float3";
+        case SkSLType::kFloat4:                 return "float4";
+        case SkSLType::kFloat2x2:               return "float2x2";
+        case SkSLType::kFloat3x3:               return "float3x3";
+        case SkSLType::kFloat4x4:               return "float4x4";
+        case SkSLType::kHalf:                   return "half";
+        case SkSLType::kHalf2:                  return "half2";
+        case SkSLType::kHalf3:                  return "half3";
+        case SkSLType::kHalf4:                  return "half4";
+        case SkSLType::kHalf2x2:                return "half2x2";
+        case SkSLType::kHalf3x3:                return "half3x3";
+        case SkSLType::kHalf4x4:                return "half4x4";
+        case SkSLType::kInt:                    return "int";
+        case SkSLType::kInt2:                   return "int2";
+        case SkSLType::kInt3:                   return "int3";
+        case SkSLType::kInt4:                   return "int4";
+        case SkSLType::kUInt:                   return "uint";
+        case SkSLType::kUInt2:                  return "uint2";
+        case SkSLType::kUInt3:                  return "uint3";
+        case SkSLType::kUInt4:                  return "uint4";
+        case SkSLType::kTexture2DSampler:       return "sampler2D";
+        case SkSLType::kTextureExternalSampler: return "samplerExternalOES";
+        case SkSLType::kTexture2DRectSampler:   return "sampler2DRect";
+        case SkSLType::kTexture2D:              return "texture2D";
+        case SkSLType::kSampler:                return "sampler";
+        case SkSLType::kInput:                  return "subpassInput";
     }
     SK_ABORT("Unknown shader var type.");
 }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSL.h b/third_party/skia/src/gpu/glsl/GrGLSL.h
index 269e9029a49de..7c86701846993 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSL.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSL.h
@@ -8,9 +8,9 @@
 #ifndef GrGLSL_DEFINED
 #define GrGLSL_DEFINED
 
-#include "include/private/GrTypesPriv.h"
+#include "src/core/SkSLTypeShared.h"
 #include "src/sksl/SkSLGLSL.h"
 
-const char* GrGLSLTypeString(GrSLType);
+const char* GrGLSLTypeString(SkSLType);
 
 #endif
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h b/third_party/skia/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h
index ff152c168e31a..05996059bc2e8 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h
@@ -28,16 +28,16 @@ class GrGLSLColorSpaceXformHelper : public SkNoncopyable {
         if (colorSpaceXform) {
             fFlags = colorSpaceXform->fSteps.flags;
             if (this->applySrcTF()) {
-                fSrcTFVar = uniformHandler->addUniformArray(nullptr, visibility, kHalf_GrSLType,
+                fSrcTFVar = uniformHandler->addUniformArray(nullptr, visibility, SkSLType::kHalf,
                                                             "SrcTF", kNumTransferFnCoeffs);
                 fSrcTFKind = classify_transfer_fn(colorSpaceXform->fSteps.srcTF);
             }
             if (this->applyGamutXform()) {
-                fGamutXformVar = uniformHandler->addUniform(nullptr, visibility, kHalf3x3_GrSLType,
+                fGamutXformVar = uniformHandler->addUniform(nullptr, visibility, SkSLType::kHalf3x3,
                                                             "ColorXform");
             }
             if (this->applyDstTF()) {
-                fDstTFVar = uniformHandler->addUniformArray(nullptr, visibility, kHalf_GrSLType,
+                fDstTFVar = uniformHandler->addUniformArray(nullptr, visibility, SkSLType::kHalf,
                                                             "DstTF", kNumTransferFnCoeffs);
                 fDstTFKind = classify_transfer_fn(colorSpaceXform->fSteps.dstTFInv);
             }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/third_party/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
index 7102603de538f..c9caf90f805d8 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp
@@ -50,7 +50,7 @@ void GrGLSLFragmentShaderBuilder::enableAdvancedBlendEquationIfNeeded(GrBlendEqu
 
 void GrGLSLFragmentShaderBuilder::enableCustomOutput() {
     if (!fCustomColorOutput) {
-        fCustomColorOutput = &fOutputs.emplace_back(DeclaredColorOutputName(), kHalf4_GrSLType,
+        fCustomColorOutput = &fOutputs.emplace_back(DeclaredColorOutputName(), SkSLType::kHalf4,
                                                     GrShaderVar::TypeModifier::Out);
         fProgramBuilder->finalizeFragmentOutputColor(fOutputs.back());
     }
@@ -69,7 +69,7 @@ void GrGLSLFragmentShaderBuilder::enableSecondaryOutput() {
     // output. The condition also co-incides with the condition in which GLSL ES 2.0
     // requires the built-in gl_SecondaryFragColorEXT, whereas 3.0 requires a custom output.
     if (caps.mustDeclareFragmentShaderOutput()) {
-        fOutputs.emplace_back(DeclaredSecondaryColorOutputName(), kHalf4_GrSLType,
+        fOutputs.emplace_back(DeclaredSecondaryColorOutputName(), SkSLType::kHalf4,
                               GrShaderVar::TypeModifier::Out);
         fProgramBuilder->finalizeFragmentSecondaryColor(fOutputs.back());
     }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
index 39ff2b4f267e0..4972070fc7a3c 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.cpp
@@ -85,7 +85,7 @@ bool GrGLSLProgramBuilder::emitAndInstallPrimProc(SkString* outputColor, SkStrin
         rtAdjustVisibility = kVertex_GrShaderFlag;
     }
     fUniformHandles.fRTAdjustmentUni = this->uniformHandler()->addUniform(
-            nullptr, rtAdjustVisibility, kFloat4_GrSLType, SkSL::Compiler::RTADJUST_NAME);
+            nullptr, rtAdjustVisibility, SkSLType::kFloat4, SkSL::Compiler::RTADJUST_NAME);
 
     fFS.codeAppendf("// Stage %d, %s\n", fStageIndex, geomProc.name());
     fVS.codeAppendf("// Primitive Processor %s\n", geomProc.name());
@@ -162,7 +162,7 @@ SkString GrGLSLProgramBuilder::emitRootFragProc(const GrFragmentProcessor& fp,
 
             GrSamplerState samplerState = te->samplerState();
             const GrBackendFormat& format = te->view().proxy()->backendFormat();
-            GrSwizzle swizzle = te->view().swizzle();
+            skgpu::Swizzle swizzle = te->view().swizzle();
             SamplerHandle handle = this->emitSampler(format, samplerState, swizzle, name.c_str());
             if (!handle.isValid()) {
                 ok = false;
@@ -240,15 +240,15 @@ void GrGLSLProgramBuilder::writeFPFunction(const GrFragmentProcessor& fp,
     GrShaderVar params[3];
     int numParams = 0;
 
-    params[numParams++] = GrShaderVar(inputColor, kHalf4_GrSLType);
+    params[numParams++] = GrShaderVar(inputColor, SkSLType::kHalf4);
 
     if (fp.isBlendFunction()) {
         // Blend functions take a dest color as input.
-        params[numParams++] = GrShaderVar(kDstColor, kHalf4_GrSLType);
+        params[numParams++] = GrShaderVar(kDstColor, SkSLType::kHalf4);
     }
 
     if (this->fragmentProcessorHasCoordsParam(&fp)) {
-        params[numParams++] = GrShaderVar(sampleCoords, kFloat2_GrSLType);
+        params[numParams++] = GrShaderVar(sampleCoords, SkSLType::kFloat2);
     } else {
         // Either doesn't use coords at all or sampled through a chain of passthrough/matrix
         // samples usages. In the latter case the coords are emitted in the vertex shader as a
@@ -257,14 +257,14 @@ void GrGLSLProgramBuilder::writeFPFunction(const GrFragmentProcessor& fp,
         GrShaderVar varying = fFPCoordsMap[&fp].coordsVarying;
 
         switch (varying.getType()) {
-            case kVoid_GrSLType:
+            case SkSLType::kVoid:
                 SkASSERT(!fp.usesSampleCoordsDirectly());
                 break;
-            case kFloat2_GrSLType:
+            case SkSLType::kFloat2:
                 // Just point the local coords to the varying
                 sampleCoords = varying.getName().c_str();
                 break;
-            case kFloat3_GrSLType:
+            case SkSLType::kFloat3:
                 // Must perform the perspective divide in the frag shader based on the
                 // varying, and since we won't actually have a function parameter for local
                 // coords, add it as a local variable.
@@ -297,7 +297,7 @@ void GrGLSLProgramBuilder::writeFPFunction(const GrFragmentProcessor& fp,
     impl.emitCode(args);
     impl.setFunctionName(fFS.getMangledFunctionName(args.fFp.name()));
 
-    fFS.emitFunction(kHalf4_GrSLType,
+    fFS.emitFunction(SkSLType::kHalf4,
                      impl.functionName(),
                      SkMakeSpan(params, numParams),
                      fFS.code().c_str());
@@ -312,7 +312,7 @@ bool GrGLSLProgramBuilder::emitAndInstallDstTexture() {
         // Set up a sampler handle for the destination texture.
         GrTextureProxy* dstTextureProxy = dstView.asTextureProxy();
         SkASSERT(dstTextureProxy);
-        const GrSwizzle& swizzle = dstView.swizzle();
+        const skgpu::Swizzle& swizzle = dstView.swizzle();
         fDstTextureSamplerHandle = this->emitSampler(dstTextureProxy->backendFormat(),
                                                     GrSamplerState(), swizzle, "DstTextureSampler");
         if (!fDstTextureSamplerHandle.isValid()) {
@@ -327,7 +327,7 @@ bool GrGLSLProgramBuilder::emitAndInstallDstTexture() {
         fUniformHandles.fDstTextureCoordsUni = this->uniformHandler()->addUniform(
                 /*owner=*/nullptr,
                 kFragment_GrShaderFlag,
-                kHalf4_GrSLType,
+                SkSLType::kHalf4,
                 "DstTextureCoords",
                 &dstTextureCoordsName);
         fFS.codeAppend("// Read color from copy of the destination\n");
@@ -344,7 +344,7 @@ bool GrGLSLProgramBuilder::emitAndInstallDstTexture() {
         fFS.codeAppend(";\n");
     } else if (this->pipeline().usesDstInputAttachment()) {
         // Set up an input attachment for the destination texture.
-        const GrSwizzle& swizzle = dstView.swizzle();
+        const skgpu::Swizzle& swizzle = dstView.swizzle();
         fDstTextureSamplerHandle = this->emitInputSampler(swizzle, "DstTextureInput");
         if (!fDstTextureSamplerHandle.isValid()) {
             return false;
@@ -410,15 +410,15 @@ bool GrGLSLProgramBuilder::emitAndInstallXferProc(const SkString& colorIn,
 }
 
 GrGLSLProgramBuilder::SamplerHandle GrGLSLProgramBuilder::emitSampler(
-        const GrBackendFormat& backendFormat, GrSamplerState state, const GrSwizzle& swizzle,
+        const GrBackendFormat& backendFormat, GrSamplerState state, const skgpu::Swizzle& swizzle,
         const char* name) {
     ++fNumFragmentSamplers;
     return this->uniformHandler()->addSampler(backendFormat, state, swizzle, name,
                                               this->shaderCaps());
 }
 
-GrGLSLProgramBuilder::SamplerHandle GrGLSLProgramBuilder::emitInputSampler(const GrSwizzle& swizzle,
-                                                                           const char* name) {
+GrGLSLProgramBuilder::SamplerHandle GrGLSLProgramBuilder::emitInputSampler(
+        const skgpu::Swizzle& swizzle, const char* name) {
     return this->uniformHandler()->addInputSampler(swizzle, name);
 }
 
@@ -489,7 +489,7 @@ void GrGLSLProgramBuilder::addRTFlipUniform(const char* name) {
     fUniformHandles.fRTFlipUni =
             uniformHandler->internalAddUniformArray(nullptr,
                                                     kFragment_GrShaderFlag,
-                                                    kFloat2_GrSLType,
+                                                    SkSLType::kFloat2,
                                                     name,
                                                     false,
                                                     0,
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.h b/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
index 31ba814aba2f2..193a71d9be40f 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLProgramBuilder.h
@@ -55,7 +55,7 @@ class GrGLSLProgramBuilder {
         return this->uniformHandler()->samplerVariable(handle);
     }
 
-    GrSwizzle samplerSwizzle(SamplerHandle handle) const {
+    skgpu::Swizzle samplerSwizzle(SamplerHandle handle) const {
         return this->uniformHandler()->samplerSwizzle(handle);
     }
 
@@ -63,7 +63,7 @@ class GrGLSLProgramBuilder {
         return this->uniformHandler()->inputSamplerVariable(handle);
     }
 
-    GrSwizzle inputSamplerSwizzle(SamplerHandle handle) const {
+    skgpu::Swizzle inputSamplerSwizzle(SamplerHandle handle) const {
         return this->uniformHandler()->inputSamplerSwizzle(handle);
     }
 
@@ -151,9 +151,9 @@ class GrGLSLProgramBuilder {
     /** Adds the SkSL function that implements an FP assuming its children are already written. */
     void writeFPFunction(const GrFragmentProcessor& fp, GrFragmentProcessor::ProgramImpl& impl);
     bool emitAndInstallXferProc(const SkString& colorIn, const SkString& coverageIn);
-    SamplerHandle emitSampler(const GrBackendFormat&, GrSamplerState, const GrSwizzle&,
+    SamplerHandle emitSampler(const GrBackendFormat&, GrSamplerState, const skgpu::Swizzle&,
                               const char* name);
-    SamplerHandle emitInputSampler(const GrSwizzle& swizzle, const char* name);
+    SamplerHandle emitInputSampler(const skgpu::Swizzle& swizzle, const char* name);
     bool checkSamplerCounts();
 
 #ifdef SK_DEBUG
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
index a1443263e1532..f78c0630aa448 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.cpp
@@ -10,7 +10,7 @@
 #include "include/sksl/DSL.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrShaderVar.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/glsl/GrGLSLBlend.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
@@ -48,7 +48,7 @@ SkString GrGLSLShaderBuilder::getMangledFunctionName(const char* baseName) {
     return fProgramBuilder->nameVariable(/*prefix=*/'\0', baseName);
 }
 
-void GrGLSLShaderBuilder::appendFunctionDecl(GrSLType returnType,
+void GrGLSLShaderBuilder::appendFunctionDecl(SkSLType returnType,
                                              const char* mangledName,
                                              SkSpan<const GrShaderVar> args) {
     this->functions().appendf("%s %s(", GrGLSLTypeString(returnType), mangledName);
@@ -62,7 +62,7 @@ void GrGLSLShaderBuilder::appendFunctionDecl(GrSLType returnType,
     this->functions().append(")");
 }
 
-void GrGLSLShaderBuilder::emitFunction(GrSLType returnType,
+void GrGLSLShaderBuilder::emitFunction(SkSLType returnType,
                                        const char* mangledName,
                                        SkSpan<const GrShaderVar> args,
                                        const char* body) {
@@ -78,7 +78,7 @@ void GrGLSLShaderBuilder::emitFunction(const char* declaration, const char* body
                               "}\n\n", declaration, body);
 }
 
-void GrGLSLShaderBuilder::emitFunctionPrototype(GrSLType returnType,
+void GrGLSLShaderBuilder::emitFunctionPrototype(SkSLType returnType,
                                                 const char* mangledName,
                                                 SkSpan<const GrShaderVar> args) {
     this->appendFunctionDecl(returnType, mangledName, args);
@@ -98,8 +98,8 @@ void GrGLSLShaderBuilder::codeAppend(std::unique_ptr<SkSL::Statement> stmt) {
     }
 }
 
-static inline void append_texture_swizzle(SkString* out, GrSwizzle swizzle) {
-    if (swizzle != GrSwizzle::RGBA()) {
+static inline void append_texture_swizzle(SkString* out, skgpu::Swizzle swizzle) {
+    if (swizzle != skgpu::Swizzle::RGBA()) {
         out->appendf(".%s", swizzle.asString().c_str());
     }
 }
@@ -170,7 +170,7 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out,
 
     auto emitTFFunc = [=](const char* name, GrGLSLProgramDataManager::UniformHandle uniform,
                           TFKind kind) {
-        const GrShaderVar gTFArgs[] = { GrShaderVar("x", kHalf_GrSLType) };
+        const GrShaderVar gTFArgs[] = { GrShaderVar("x", SkSLType::kHalf) };
         const char* coeffs = uniformHandler->getUniformCStr(uniform);
         SkString body;
         // Temporaries to make evaluation line readable. We always use the sRGBish names, so the
@@ -203,7 +203,7 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out,
         }
         body.append("return s * x;");
         SkString funcName = this->getMangledFunctionName(name);
-        this->emitFunction(kHalf_GrSLType, funcName.c_str(), {gTFArgs, SK_ARRAY_COUNT(gTFArgs)},
+        this->emitFunction(SkSLType::kHalf, funcName.c_str(), {gTFArgs, SK_ARRAY_COUNT(gTFArgs)},
                            body.c_str());
         return funcName;
     };
@@ -222,13 +222,13 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out,
 
     SkString gamutXformFuncName;
     if (colorXformHelper->applyGamutXform()) {
-        const GrShaderVar gGamutXformArgs[] = { GrShaderVar("color", kHalf4_GrSLType) };
+        const GrShaderVar gGamutXformArgs[] = { GrShaderVar("color", SkSLType::kHalf4) };
         const char* xform = uniformHandler->getUniformCStr(colorXformHelper->gamutXformUniform());
         SkString body;
         body.appendf("color.rgb = (%s * color.rgb);", xform);
         body.append("return color;");
         gamutXformFuncName = this->getMangledFunctionName("gamut_xform");
-        this->emitFunction(kHalf4_GrSLType, gamutXformFuncName.c_str(),
+        this->emitFunction(SkSLType::kHalf4, gamutXformFuncName.c_str(),
                            {gGamutXformArgs, SK_ARRAY_COUNT(gGamutXformArgs)}, body.c_str());
     }
 
@@ -241,7 +241,7 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out,
         bool useFloat = fProgramBuilder->shaderCaps()->colorSpaceMathNeedsFloat();
 
         const GrShaderVar gColorXformArgs[] = {
-                GrShaderVar("color", useFloat ? kFloat4_GrSLType : kHalf4_GrSLType)};
+                GrShaderVar("color", useFloat ? SkSLType::kFloat4 : SkSLType::kHalf4)};
         SkString body;
         if (colorXformHelper->applyUnpremul()) {
             body.append("color = unpremul(color);");
@@ -264,7 +264,7 @@ void GrGLSLShaderBuilder::appendColorGamutXform(SkString* out,
         }
         body.append("return half4(color);");
         SkString colorXformFuncName = this->getMangledFunctionName("color_xform");
-        this->emitFunction(kHalf4_GrSLType, colorXformFuncName.c_str(),
+        this->emitFunction(SkSLType::kHalf4, colorXformFuncName.c_str(),
                            {gColorXformArgs, SK_ARRAY_COUNT(gColorXformArgs)}, body.c_str());
         out->appendf("%s(%s)", colorXformFuncName.c_str(), srcColor);
     }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h b/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
index 3713289b9caaf..ad5bcb72378b1 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLShaderBuilder.h
@@ -82,13 +82,14 @@ class GrGLSLShaderBuilder {
         this->definitions().appendf("const float %s = %f;\n", name, value);
     }
 
-    void defineConstantf(const char* type, const char* name, const char* fmt, ...) {
-       this->definitions().appendf("const %s %s = ", type, name);
-       va_list args;
-       va_start(args, fmt);
-       this->definitions().appendVAList(fmt, args);
-       va_end(args);
-       this->definitions().append(";\n");
+    void defineConstantf(const char* type, const char* name, const char* fmt, ...)
+            SK_PRINTF_LIKE(4, 5) {
+        this->definitions().appendf("const %s %s = ", type, name);
+        va_list args;
+        va_start(args, fmt);
+        this->definitions().appendVAList(fmt, args);
+        va_end(args);
+        this->definitions().append(";\n");
     }
 
     void definitionAppend(const char* str) { this->definitions().append(str); }
@@ -137,14 +138,14 @@ class GrGLSLShaderBuilder {
     SkString getMangledFunctionName(const char* baseName);
 
     /** Emits a prototype for a helper function outside of main() in the fragment shader. */
-    void emitFunctionPrototype(GrSLType returnType,
+    void emitFunctionPrototype(SkSLType returnType,
                                const char* mangledName,
                                SkSpan<const GrShaderVar> args);
 
     void emitFunctionPrototype(const char* declaration);
 
     /** Emits a helper function outside of main() in the fragment shader. */
-    void emitFunction(GrSLType returnType,
+    void emitFunction(SkSLType returnType,
                       const char* mangledName,
                       SkSpan<const GrShaderVar> args,
                       const char* body);
@@ -182,7 +183,7 @@ class GrGLSLShaderBuilder {
     typedef SkTBlockList<GrShaderVar> VarArray;
     void appendDecls(const VarArray& vars, SkString* out) const;
 
-    void appendFunctionDecl(GrSLType returnType,
+    void appendFunctionDecl(SkSLType returnType,
                             const char* mangledName,
                             SkSpan<const GrShaderVar> args);
 
@@ -262,7 +263,7 @@ class GrGLSLShaderBuilder {
     };
 
     GrGLSLProgramBuilder* fProgramBuilder;
-    SkSL::String fCompilerString;
+    std::string fCompilerString;
     SkSTArray<kPrealloc, SkString> fShaderStrings;
     SkString fCode;
     SkString fFunctions;
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h b/third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
index 5ee0b7847ac8d..92715c8376efc 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLUniformHandler.h
@@ -9,7 +9,7 @@
 #define GrGLSLUniformHandler_DEFINED
 
 #include "src/gpu/GrShaderVar.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 
 // variable names beginning with this prefix will not be mangled
@@ -52,20 +52,20 @@ class GrGLSLUniformHandler {
         to add an array of uniforms. */
     UniformHandle addUniform(const GrFragmentProcessor* owner,
                              uint32_t visibility,
-                             GrSLType type,
+                             SkSLType type,
                              const char* name,
                              const char** outName = nullptr) {
-        SkASSERT(!GrSLTypeIsCombinedSamplerType(type));
+        SkASSERT(!SkSLTypeIsCombinedSamplerType(type));
         return this->addUniformArray(owner, visibility, type, name, 0, outName);
     }
 
     UniformHandle addUniformArray(const GrFragmentProcessor* owner,
                                   uint32_t visibility,
-                                  GrSLType type,
+                                  SkSLType type,
                                   const char* name,
                                   int arrayCount,
                                   const char** outName = nullptr) {
-        SkASSERT(!GrSLTypeIsCombinedSamplerType(type));
+        SkASSERT(!SkSLTypeIsCombinedSamplerType(type));
         bool mangle = strncmp(name, GR_NO_MANGLE_PREFIX, strlen(GR_NO_MANGLE_PREFIX));
         return this->internalAddUniformArray(owner, visibility, type, name, mangle, arrayCount,
                                              outName);
@@ -99,28 +99,28 @@ class GrGLSLUniformHandler {
 
 private:
     virtual const char * samplerVariable(SamplerHandle) const = 0;
-    virtual GrSwizzle samplerSwizzle(SamplerHandle) const = 0;
+    virtual skgpu::Swizzle samplerSwizzle(SamplerHandle) const = 0;
 
     virtual const char* inputSamplerVariable(SamplerHandle) const {
         SkDEBUGFAIL("Trying to get input sampler from unsupported backend");
         return nullptr;
     }
-    virtual GrSwizzle inputSamplerSwizzle(SamplerHandle) const {
+    virtual skgpu::Swizzle inputSamplerSwizzle(SamplerHandle) const {
         SkDEBUGFAIL("Trying to get input sampler swizzle from unsupported backend");
         return {};
     }
 
-    virtual SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const GrSwizzle&,
+    virtual SamplerHandle addSampler(const GrBackendFormat&, GrSamplerState, const skgpu::Swizzle&,
                                      const char* name, const GrShaderCaps*) = 0;
 
-    virtual SamplerHandle addInputSampler(const GrSwizzle& swizzle, const char* name) {
+    virtual SamplerHandle addInputSampler(const skgpu::Swizzle& swizzle, const char* name) {
         SkDEBUGFAIL("Trying to add input sampler to unsupported backend");
         return {};
     }
 
     virtual UniformHandle internalAddUniformArray(const GrFragmentProcessor* owner,
                                                   uint32_t visibility,
-                                                  GrSLType type,
+                                                  SkSLType type,
                                                   const char* name,
                                                   bool mangleName,
                                                   int arrayCount,
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp b/third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
index 38a32a4de13f1..9132542da588e 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSLVarying.cpp
@@ -12,7 +12,7 @@
 void GrGLSLVaryingHandler::addPassThroughAttribute(const GrShaderVar& vsVar,
                                                    const char* output,
                                                    Interpolation interpolation) {
-    SkASSERT(vsVar.getType() != kVoid_GrSLType);
+    SkASSERT(vsVar.getType() != SkSLType::kVoid);
     GrGLSLVarying v(vsVar.getType());
     this->addVarying(vsVar.c_str(), &v, interpolation);
     fProgramBuilder->fVS.codeAppendf("%s = %s;", v.vsOut(), vsVar.c_str());
@@ -38,11 +38,11 @@ static bool use_flat_interpolation(GrGLSLVaryingHandler::Interpolation interpola
 
 void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying,
                                       Interpolation interpolation) {
-    SkASSERT(GrSLTypeIsFloatType(varying->type()) || Interpolation::kMustBeFlat == interpolation);
+    SkASSERT(SkSLTypeIsFloatType(varying->type()) || Interpolation::kMustBeFlat == interpolation);
     VaryingInfo& v = fVaryings.push_back();
 
     SkASSERT(varying);
-    SkASSERT(kVoid_GrSLType != varying->fType);
+    SkASSERT(SkSLType::kVoid != varying->fType);
     v.fType = varying->fType;
     v.fIsFlat = use_flat_interpolation(interpolation, *fProgramBuilder->shaderCaps());
     v.fVsOut = fProgramBuilder->nameVariable('v', name);
@@ -58,10 +58,10 @@ void GrGLSLVaryingHandler::addVarying(const char* name, GrGLSLVarying* varying,
 }
 
 void GrGLSLVaryingHandler::emitAttributes(const GrGeometryProcessor& gp) {
-    for (const auto& attr : gp.vertexAttributes()) {
+    for (auto attr : gp.vertexAttributes()) {
         this->addAttribute(attr.asShaderVar());
     }
-    for (const auto& attr : gp.instanceAttributes()) {
+    for (auto attr : gp.instanceAttributes()) {
         this->addAttribute(attr.asShaderVar());
     }
 }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLVarying.h b/third_party/skia/src/gpu/glsl/GrGLSLVarying.h
index 48902d41ca31f..1a89bce9812b7 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLVarying.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLVarying.h
@@ -17,14 +17,14 @@ class GrGeometryProcessor;
 class GrGLSLProgramBuilder;
 
 #ifdef SK_DEBUG
-static bool is_matrix(GrSLType type) {
+static bool is_matrix(SkSLType type) {
     switch (type) {
-        case kFloat2x2_GrSLType:
-        case kFloat3x3_GrSLType:
-        case kFloat4x4_GrSLType:
-        case kHalf2x2_GrSLType:
-        case kHalf3x3_GrSLType:
-        case kHalf4x4_GrSLType:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf2x2:
+        case SkSLType::kHalf3x3:
+        case SkSLType::kHalf4x4:
             return true;
         default:
             return false;
@@ -41,14 +41,14 @@ class GrGLSLVarying {
     };
 
     GrGLSLVarying() = default;
-    GrGLSLVarying(GrSLType type, Scope scope = Scope::kVertToFrag)
+    GrGLSLVarying(SkSLType type, Scope scope = Scope::kVertToFrag)
         : fType(type)
         , fScope(scope) {
         // Metal doesn't support varying matrices, so we disallow them everywhere for consistency
         SkASSERT(!is_matrix(type));
     }
 
-    void reset(GrSLType type, Scope scope = Scope::kVertToFrag) {
+    void reset(SkSLType type, Scope scope = Scope::kVertToFrag) {
         // Metal doesn't support varying matrices, so we disallow them everywhere for consistency
         SkASSERT(!is_matrix(type));
         *this = GrGLSLVarying();
@@ -56,7 +56,7 @@ class GrGLSLVarying {
         fScope = scope;
     }
 
-    GrSLType type() const { return fType; }
+    SkSLType type() const { return fType; }
     Scope scope() const { return fScope; }
     bool isInVertexShader() const { return Scope::kGeoToFrag != fScope; }
     bool isInFragmentShader() const { return Scope::kVertToGeo != fScope; }
@@ -75,7 +75,7 @@ class GrGLSLVarying {
     }
 
 private:
-    GrSLType fType = kVoid_GrSLType;
+    SkSLType fType = SkSLType::kVoid;
     Scope fScope = Scope::kVertToFrag;
     const char* fVsOut = nullptr;
     const char* fFsIn = nullptr;
@@ -144,7 +144,7 @@ class GrGLSLVaryingHandler {
 
 protected:
     struct VaryingInfo {
-        GrSLType         fType;
+        SkSLType         fType;
         bool             fIsFlat;
         SkString         fVsOut;
         GrShaderFlags    fVisibility;
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp b/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp
index 781e1fa930563..07aa6c071229c 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp
+++ b/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp
@@ -12,21 +12,21 @@
 #include "src/gpu/glsl/GrGLSLVarying.h"
 
 void GrGLSLVertexGeoBuilder::emitNormalizedSkPosition(SkString* out, const char* devPos,
-                                                      GrSLType devPosType) {
+                                                      SkSLType devPosType) {
     if (this->getProgramBuilder()->snapVerticesToPixelCenters()) {
-        if (kFloat3_GrSLType == devPosType) {
+        if (SkSLType::kFloat3 == devPosType) {
             const char* p = devPos;
             out->appendf("{float2 _posTmp = %s.xy / %s.z;", p, p);
         } else {
-            SkASSERT(kFloat2_GrSLType == devPosType);
+            SkASSERT(SkSLType::kFloat2 == devPosType);
             out->appendf("{float2 _posTmp = %s;", devPos);
         }
         out->appendf("_posTmp = floor(_posTmp) + float2(0.5);"
                      "sk_Position = _posTmp.xy01;}");
-    } else if (kFloat3_GrSLType == devPosType) {
+    } else if (SkSLType::kFloat3 == devPosType) {
         out->appendf("sk_Position = %s.xy0z;", devPos);
     } else {
-        SkASSERT(kFloat2_GrSLType == devPosType);
+        SkASSERT(SkSLType::kFloat2 == devPosType);
         out->appendf("sk_Position = %s.xy01;", devPos);
     }
 }
diff --git a/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.h b/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.h
index e2c3119c5e8d7..0ecc2b5706ff0 100644
--- a/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.h
+++ b/third_party/skia/src/gpu/glsl/GrGLSLVertexGeoBuilder.h
@@ -29,13 +29,12 @@ class GrGLSLVertexGeoBuilder : public GrGLSLShaderBuilder {
 protected:
     GrGLSLVertexGeoBuilder(GrGLSLProgramBuilder* program) : INHERITED(program) {}
 
-    void emitNormalizedSkPosition(const char* devPos,
-                                  GrSLType devPosType = GrSLType::kFloat2_GrSLType) {
+    void emitNormalizedSkPosition(const char* devPos, SkSLType devPosType = SkSLType::kFloat2) {
         this->emitNormalizedSkPosition(&this->code(), devPos, devPosType);
     }
 
     void emitNormalizedSkPosition(SkString* out, const char* devPos,
-                                  GrSLType devPosType = GrSLType::kFloat2_GrSLType);
+                                  SkSLType devPosType = SkSLType::kFloat2);
 
     friend class GrGeometryProcessor::ProgramImpl;
 
diff --git a/third_party/skia/src/gpu/mock/GrMockCaps.h b/third_party/skia/src/gpu/mock/GrMockCaps.h
index 5875b4d3f0632..27d7ce0a69a55 100644
--- a/third_party/skia/src/gpu/mock/GrMockCaps.h
+++ b/third_party/skia/src/gpu/mock/GrMockCaps.h
@@ -130,9 +130,9 @@ class GrMockCaps : public GrCaps {
         return {};
     }
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat& format, GrColorType ct) const override {
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat& format, GrColorType ct) const override {
         SkASSERT(this->areColorTypeAndFormatCompatible(ct, format));
-        return GrSwizzle("rgba");
+        return skgpu::Swizzle("rgba");
     }
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
@@ -178,9 +178,9 @@ class GrMockCaps : public GrCaps {
         return SupportedRead{srcColorType, 1};
     }
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat& format, GrColorType ct) const override {
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat& format, GrColorType ct) const override {
         SkASSERT(this->areColorTypeAndFormatCompatible(ct, format));
-        return GrSwizzle("rgba");
+        return skgpu::Swizzle("rgba");
     }
 
     static const int kMaxSampleCnt = 16;
diff --git a/third_party/skia/src/gpu/mock/GrMockTexture.h b/third_party/skia/src/gpu/mock/GrMockTexture.h
index 7972941c5806d..b6b2e68eb7ad8 100644
--- a/third_party/skia/src/gpu/mock/GrMockTexture.h
+++ b/third_party/skia/src/gpu/mock/GrMockTexture.h
@@ -212,7 +212,9 @@ class GrMockTextureRenderTarget : public GrMockTexture, public GrMockRenderTarge
     }
 
     // This avoids an inherits via dominance warning on MSVC.
-    void computeScratchKey(GrScratchKey* key) const override { GrTexture::computeScratchKey(key); }
+    void computeScratchKey(skgpu::ScratchKey* key) const override {
+        GrTexture::computeScratchKey(key);
+    }
 };
 
 #endif
diff --git a/third_party/skia/src/gpu/mtl/GrMtlCaps.h b/third_party/skia/src/gpu/mtl/GrMtlCaps.h
index cde4b6c1692f8..37e988cfb24bd 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlCaps.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlCaps.h
@@ -76,7 +76,7 @@ class GrMtlCaps : public GrCaps {
         return fColorTypeToFormatTable[idx];
     }
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
 
@@ -93,12 +93,6 @@ class GrMtlCaps : public GrCaps {
     // if true, MTLStoreActionStoreAndMultiplesampleResolve is available
     bool storeAndMultisampleResolveSupport() const { return fStoreAndMultisampleResolveSupport; }
 
-    // If true when doing MSAA draws, we will prefer to discard the MSAA attachment on load
-    // and stores. The use of this feature for specific draws depends on the render target having a
-    // resolve attachment, and if we need to load previous data the resolve attachment must
-    // be readable in a shader. Otherwise we will just write out and store the MSAA attachment
-    // like normal.
-    bool preferDiscardableMSAAAttachment() const { return fPreferDiscardableMSAAAttachment; }
     bool renderTargetSupportsDiscardableMSAA(const GrMtlRenderTarget*) const;
 
 #if GR_TEST_UTILS
@@ -127,7 +121,7 @@ class GrMtlCaps : public GrCaps {
     SupportedRead onSupportedReadPixelsColorType(GrColorType, const GrBackendFormat&,
                                                  GrColorType) const override;
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     // ColorTypeInfo for a specific format
     struct ColorTypeInfo {
@@ -140,8 +134,8 @@ class GrMtlCaps : public GrCaps {
         };
         uint32_t fFlags = 0;
 
-        GrSwizzle fReadSwizzle;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fReadSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
     };
 
     struct FormatInfo {
@@ -200,7 +194,6 @@ class GrMtlCaps : public GrCaps {
     MTLPixelFormat fPreferredStencilFormat;
 
     bool fStoreAndMultisampleResolveSupport : 1;
-    bool fPreferDiscardableMSAAAttachment : 1;
 
     using INHERITED = GrCaps;
 };
diff --git a/third_party/skia/src/gpu/mtl/GrMtlCaps.mm b/third_party/skia/src/gpu/mtl/GrMtlCaps.mm
index 72ab5cf0032cd..0b6f0aee9fab7 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlCaps.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlCaps.mm
@@ -19,6 +19,7 @@
 #include "src/gpu/GrRenderTargetProxy.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrSurfaceProxy.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/mtl/GrMtlRenderTarget.h"
 #include "src/gpu/mtl/GrMtlTexture.h"
 #include "src/gpu/mtl/GrMtlUtil.h"
@@ -624,23 +625,29 @@ static bool format_is_srgb(MTLPixelFormat format) {
     {
         info = &fFormatTable[GetFormatIndex(MTLPixelFormatR8Unorm)];
         info->fFlags = FormatInfo::kAllFlags;
-        info->fColorTypeInfoCount = 2;
+        info->fColorTypeInfoCount = 3;
         info->fColorTypeInfos.reset(new ColorTypeInfo[info->fColorTypeInfoCount]());
         int ctIdx = 0;
         // Format: R8Unorm, Surface: kAlpha_8
+        {
+            auto& ctInfo = info->fColorTypeInfos[ctIdx++];
+            ctInfo.fColorType = GrColorType::kR_8;
+            ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
+        }
+        // Format: R8Unorm, Surface: kAlpha_8
         {
             auto& ctInfo = info->fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kAlpha_8;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle("000r");
-            ctInfo.fWriteSwizzle = GrSwizzle("a000");
+            ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+            ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
         }
         // Format: R8Unorm, Surface: kGray_8
         {
             auto& ctInfo = info->fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kGray_8;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle("rrr1");
+            ctInfo.fReadSwizzle = skgpu::Swizzle("rrr1");
         }
     }
 
@@ -709,7 +716,7 @@ static bool format_is_srgb(MTLPixelFormat format) {
             auto& ctInfo = info->fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kRGB_888x;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle::RGB1();
+            ctInfo.fReadSwizzle = skgpu::Swizzle::RGB1();
         }
     }
 
@@ -810,8 +817,8 @@ static bool format_is_srgb(MTLPixelFormat format) {
             auto& ctInfo = info->fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kAlpha_F16;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle("000r");
-            ctInfo.fWriteSwizzle = GrSwizzle("a000");
+            ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+            ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
         }
     }
 
@@ -852,8 +859,8 @@ static bool format_is_srgb(MTLPixelFormat format) {
             auto& ctInfo = info->fColorTypeInfos[ctIdx++];
             ctInfo.fColorType = GrColorType::kAlpha_16;
             ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-            ctInfo.fReadSwizzle = GrSwizzle("000r");
-            ctInfo.fWriteSwizzle = GrSwizzle("a000");
+            ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+            ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
         }
     }
 
@@ -1045,7 +1052,8 @@ static bool format_is_srgb(MTLPixelFormat format) {
     SK_ABORT("Invalid compression type");
 }
 
-GrSwizzle GrMtlCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrMtlCaps::onGetReadSwizzle(const GrBackendFormat& format,
+                                           GrColorType colorType) const {
     MTLPixelFormat mtlFormat = GrBackendFormatAsMTLPixelFormat(format);
     SkASSERT(mtlFormat != MTLPixelFormatInvalid);
     const auto& info = this->getFormatInfo(mtlFormat);
@@ -1060,7 +1068,8 @@ static bool format_is_srgb(MTLPixelFormat format) {
     return {};
 }
 
-GrSwizzle GrMtlCaps::getWriteSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrMtlCaps::getWriteSwizzle(const GrBackendFormat& format,
+                                          GrColorType colorType) const {
     MTLPixelFormat mtlFormat = GrBackendFormatAsMTLPixelFormat(format);
     SkASSERT(mtlFormat != MTLPixelFormatInvalid);
     const auto& info = this->getFormatInfo(mtlFormat);
@@ -1148,7 +1157,7 @@ static bool format_is_srgb(MTLPixelFormat format) {
     GrProgramDesc desc;
     GrProgramDesc::Build(&desc, programInfo, *this);
 
-    GrProcessorKeyBuilder b(desc.key());
+    skgpu::KeyBuilder b(desc.key());
 
     // If ordering here is changed, update getStencilPixelFormat() below
     b.add32(programInfo.backendFormat().asMtlFormat());
diff --git a/third_party/skia/src/gpu/mtl/GrMtlPipelineState.h b/third_party/skia/src/gpu/mtl/GrMtlPipelineState.h
index 4cd8ed4d6342c..05c2322c083c6 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlPipelineState.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlPipelineState.h
@@ -56,7 +56,7 @@ class GrMtlPipelineState {
     void bindTextures(GrMtlRenderCommandEncoder* renderCmdEncoder);
 
     void setDrawState(GrMtlRenderCommandEncoder*,
-                      const GrSwizzle& writeSwizzle,
+                      const skgpu::Swizzle& writeSwizzle,
                       const GrXferProcessor&);
 
     static void SetDynamicScissorRectState(GrMtlRenderCommandEncoder* renderCmdEncoder,
@@ -88,7 +88,9 @@ class GrMtlPipelineState {
 
     void bindUniforms(GrMtlRenderCommandEncoder*);
 
-    void setBlendConstants(GrMtlRenderCommandEncoder*, const GrSwizzle&, const GrXferProcessor&);
+    void setBlendConstants(GrMtlRenderCommandEncoder*,
+                           const skgpu::Swizzle&,
+                           const GrXferProcessor&);
 
     void setDepthStencilState(GrMtlRenderCommandEncoder* renderCmdEncoder);
 
diff --git a/third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm b/third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm
index f3ee0cfc11557..ec38719b45fd0 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlPipelineState.mm
@@ -115,7 +115,7 @@
 }
 
 void GrMtlPipelineState::setDrawState(GrMtlRenderCommandEncoder* renderCmdEncoder,
-                                      const GrSwizzle& writeSwizzle,
+                                      const skgpu::Swizzle& writeSwizzle,
                                       const GrXferProcessor& xferProcessor) {
     this->bindUniforms(renderCmdEncoder);
     this->setBlendConstants(renderCmdEncoder, writeSwizzle, xferProcessor);
@@ -158,7 +158,7 @@
 }
 
 void GrMtlPipelineState::setBlendConstants(GrMtlRenderCommandEncoder* renderCmdEncoder,
-                                           const GrSwizzle& swizzle,
+                                           const skgpu::Swizzle& swizzle,
                                            const GrXferProcessor& xferProcessor) {
     if (!renderCmdEncoder) {
         return;
diff --git a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h
index b5e04536117bc..435433879e477 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.h
@@ -61,10 +61,10 @@ class GrMtlPipelineStateBuilder : public GrGLSLProgramBuilder {
 
     void finalizeFragmentSecondaryColor(GrShaderVar& outputColor) override;
 
-    id<MTLLibrary> compileMtlShaderLibrary(const SkSL::String& shader,
+    id<MTLLibrary> compileMtlShaderLibrary(const std::string& shader,
                                            SkSL::Program::Inputs inputs,
                                            GrContextOptions::ShaderErrorHandler* errorHandler);
-    void storeShadersInCache(const SkSL::String shaders[], const SkSL::Program::Inputs inputs[],
+    void storeShadersInCache(const std::string shaders[], const SkSL::Program::Inputs inputs[],
                              SkSL::Program::Settings*, sk_sp<SkData>, bool isSkSL);
 
     GrGLSLUniformHandler* uniformHandler() override { return &fUniformHandler; }
diff --git a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
index 14588f82f1581..53490452dbfcc 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
@@ -15,7 +15,7 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrPersistentCacheUtils.h"
 #include "src/gpu/GrRenderTarget.h"
-#include "src/gpu/GrShaderUtils.h"
+#include "src/utils/SkShaderUtils.h"
 
 #include "src/gpu/mtl/GrMtlGpu.h"
 #include "src/gpu/mtl/GrMtlPipelineState.h"
@@ -69,7 +69,7 @@
 static constexpr SkFourByteTag kMSL_Tag = SkSetFourByteTag('M', 'S', 'L', ' ');
 static constexpr SkFourByteTag kSKSL_Tag = SkSetFourByteTag('S', 'K', 'S', 'L');
 
-void GrMtlPipelineStateBuilder::storeShadersInCache(const SkSL::String shaders[],
+void GrMtlPipelineStateBuilder::storeShadersInCache(const std::string shaders[],
                                                     const SkSL::Program::Inputs inputs[],
                                                     SkSL::Program::Settings* settings,
                                                     sk_sp<SkData> pipelineData,
@@ -88,7 +88,7 @@
 }
 
 id<MTLLibrary> GrMtlPipelineStateBuilder::compileMtlShaderLibrary(
-        const SkSL::String& shader, SkSL::Program::Inputs inputs,
+        const std::string& shader, SkSL::Program::Inputs inputs,
         GrContextOptions::ShaderErrorHandler* errorHandler) {
     id<MTLLibrary> shaderLibrary = GrCompileMtlShaderLibrary(fGpu, shader, errorHandler);
     if (shaderLibrary != nil && inputs.fUseFlipRTUniform) {
@@ -199,33 +199,30 @@ static inline MTLVertexFormat attribute_type_to_mtlformat(GrVertexAttribType typ
     if (writer) {
         writer->writeInt(vertexAttributeCount);
     }
-    size_t vertexAttributeOffset = 0;
-    for (const auto& attribute : geomProc.vertexAttributes()) {
+    for (auto attribute : geomProc.vertexAttributes()) {
         MTLVertexAttributeDescriptor* mtlAttribute = vertexDescriptor.attributes[attributeIndex];
         MTLVertexFormat format = attribute_type_to_mtlformat(attribute.cpuType());
         SkASSERT(MTLVertexFormatInvalid != format);
         mtlAttribute.format = format;
-        mtlAttribute.offset = vertexAttributeOffset;
+        mtlAttribute.offset = *attribute.offset();
         mtlAttribute.bufferIndex = vertexBinding;
         if (writer) {
             writer->writeInt(format);
-            writer->writeUInt(vertexAttributeOffset);
+            writer->writeUInt(*attribute.offset());
             writer->writeUInt(vertexBinding);
         }
 
-        vertexAttributeOffset += attribute.sizeAlign4();
         attributeIndex++;
     }
-    SkASSERT(vertexAttributeOffset == geomProc.vertexStride());
 
     if (vertexAttributeCount) {
         MTLVertexBufferLayoutDescriptor* vertexBufferLayout =
                 vertexDescriptor.layouts[vertexBinding];
         vertexBufferLayout.stepFunction = MTLVertexStepFunctionPerVertex;
         vertexBufferLayout.stepRate = 1;
-        vertexBufferLayout.stride = vertexAttributeOffset;
+        vertexBufferLayout.stride = geomProc.vertexStride();
         if (writer) {
-            writer->writeUInt(vertexAttributeOffset);
+            writer->writeUInt(geomProc.vertexStride());
         }
     }
 
@@ -233,33 +230,30 @@ static inline MTLVertexFormat attribute_type_to_mtlformat(GrVertexAttribType typ
     if (writer) {
         writer->writeInt(instanceAttributeCount);
     }
-    size_t instanceAttributeOffset = 0;
-    for (const auto& attribute : geomProc.instanceAttributes()) {
+    for (auto attribute : geomProc.instanceAttributes()) {
         MTLVertexAttributeDescriptor* mtlAttribute = vertexDescriptor.attributes[attributeIndex];
         MTLVertexFormat format = attribute_type_to_mtlformat(attribute.cpuType());
         SkASSERT(MTLVertexFormatInvalid != format);
         mtlAttribute.format = format;
-        mtlAttribute.offset = instanceAttributeOffset;
+        mtlAttribute.offset = *attribute.offset();
         mtlAttribute.bufferIndex = instanceBinding;
         if (writer) {
             writer->writeInt(format);
-            writer->writeUInt(instanceAttributeOffset);
+            writer->writeUInt(*attribute.offset());
             writer->writeUInt(instanceBinding);
         }
 
-        instanceAttributeOffset += attribute.sizeAlign4();
         attributeIndex++;
     }
-    SkASSERT(instanceAttributeOffset == geomProc.instanceStride());
 
     if (instanceAttributeCount) {
         MTLVertexBufferLayoutDescriptor* instanceBufferLayout =
                 vertexDescriptor.layouts[instanceBinding];
         instanceBufferLayout.stepFunction = MTLVertexStepFunctionPerInstance;
         instanceBufferLayout.stepRate = 1;
-        instanceBufferLayout.stride = instanceAttributeOffset;
+        instanceBufferLayout.stride = geomProc.instanceStride();
         if (writer) {
-            writer->writeUInt(instanceAttributeOffset);
+            writer->writeUInt(geomProc.instanceStride());
         }
     }
     return vertexDescriptor;
@@ -560,7 +554,7 @@ static uint32_t buffer_size(uint32_t offset, uint32_t maxAlignment) {
         }
 
         auto errorHandler = fGpu->getContext()->priv().getShaderErrorHandler();
-        SkSL::String msl[kGrShaderTypeCount];
+        std::string msl[kGrShaderTypeCount];
         SkSL::Program::Inputs inputs[kGrShaderTypeCount];
 
         // Unpack any stored shaders from the persistent cache
@@ -573,7 +567,7 @@ static uint32_t buffer_size(uint32_t offset, uint32_t maxAlignment) {
                 }
 
                 case kSKSL_Tag: {
-                    SkSL::String cached_sksl[kGrShaderTypeCount];
+                    std::string cached_sksl[kGrShaderTypeCount];
                     if (GrPersistentCacheUtils::UnpackCachedShaders(&reader, cached_sksl, inputs,
                                                                     kGrShaderTypeCount)) {
                         bool success = GrSkSLToMSL(fGpu,
@@ -632,9 +626,9 @@ static uint32_t buffer_size(uint32_t offset, uint32_t maxAlignment) {
                 sk_sp<SkData> pipelineData = writer->snapshotAsData();
                 if (fGpu->getContext()->priv().options().fShaderCacheStrategy ==
                         GrContextOptions::ShaderCacheStrategy::kSkSL) {
-                    SkSL::String sksl[kGrShaderTypeCount];
-                    sksl[kVertex_GrShaderType] = GrShaderUtils::PrettyPrint(fVS.fCompilerString);
-                    sksl[kFragment_GrShaderType] = GrShaderUtils::PrettyPrint(fFS.fCompilerString);
+                    std::string sksl[kGrShaderTypeCount];
+                    sksl[kVertex_GrShaderType] = SkShaderUtils::PrettyPrint(fVS.fCompilerString);
+                    sksl[kFragment_GrShaderType] = SkShaderUtils::PrettyPrint(fFS.fCompilerString);
                     this->storeShadersInCache(sksl, inputs, &settings,
                                               std::move(pipelineData), true);
                 } else {
@@ -749,7 +743,7 @@ static uint32_t buffer_size(uint32_t offset, uint32_t maxAlignment) {
     GrPersistentCacheUtils::ShaderMetadata meta;
     meta.fSettings = &settings;
 
-    SkSL::String shaders[kGrShaderTypeCount];
+    std::string shaders[kGrShaderTypeCount];
     SkSL::Program::Inputs inputs[kGrShaderTypeCount];
     if (!GrPersistentCacheUtils::UnpackCachedShaders(&reader, shaders, inputs, kGrShaderTypeCount,
                                                      &meta)) {
@@ -773,7 +767,7 @@ static uint32_t buffer_size(uint32_t offset, uint32_t maxAlignment) {
         }
 
         case kSKSL_Tag: {
-            SkSL::String msl[kGrShaderTypeCount];
+            std::string msl[kGrShaderTypeCount];
             if (!GrSkSLToMSL(gpu,
                            shaders[kVertex_GrShaderType],
                            SkSL::ProgramKind::kVertex,
diff --git a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateDataManager.mm b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateDataManager.mm
index fdaaff9ed629f..d33c3c65c4610 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlPipelineStateDataManager.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlPipelineStateDataManager.mm
@@ -42,7 +42,7 @@
                                            int arrayCount,
                                            const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt_GrSLType || uni.fType == kShort_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt || uni.fType == SkSLType::kShort);
     SkASSERT(arrayCount > 0);
     SkASSERT(arrayCount <= uni.fArrayCount ||
              (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -55,7 +55,7 @@
                                            int arrayCount,
                                            const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat_GrSLType || uni.fType == kHalf_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat || uni.fType == SkSLType::kHalf);
     SkASSERT(arrayCount > 0);
     SkASSERT(arrayCount <= uni.fArrayCount ||
              (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -68,7 +68,7 @@
                                            int arrayCount,
                                            const int32_t v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kInt2_GrSLType || uni.fType == kShort2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kInt2 || uni.fType == SkSLType::kShort2);
     SkASSERT(arrayCount > 0);
     SkASSERT(arrayCount <= uni.fArrayCount ||
              (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -81,7 +81,7 @@
                                            int arrayCount,
                                            const float v[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat2_GrSLType || uni.fType == kHalf2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat2 || uni.fType == SkSLType::kHalf2);
     SkASSERT(arrayCount > 0);
     SkASSERT(arrayCount <= uni.fArrayCount ||
              (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -98,7 +98,7 @@
                                                  int arrayCount,
                                                  const float m[]) const {
     const Uniform& uni = fUniforms[u.toIndex()];
-    SkASSERT(uni.fType == kFloat2x2_GrSLType || uni.fType == kHalf2x2_GrSLType);
+    SkASSERT(uni.fType == SkSLType::kFloat2x2 || uni.fType == SkSLType::kHalf2x2);
     SkASSERT(arrayCount > 0);
     SkASSERT(arrayCount <= uni.fArrayCount ||
              (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
diff --git a/third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h b/third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h
index 9a9e74f385d10..e1d683d877a5c 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlRenderCommandEncoder.h
@@ -252,7 +252,7 @@ class GrMtlRenderCommandEncoder {
     __weak id<MTLBuffer> fCurrentFragmentBuffer[GrMtlUniformHandler::kUniformBindingCount];
     NSUInteger fCurrentFragmentOffset[2 + GrMtlUniformHandler::kUniformBindingCount];
     __weak id<MTLTexture> fCurrentTexture[GrSamplerState::kNumUniqueSamplers];
-    GrMtlSampler* fCurrentSampler[GrSamplerState::kNumUniqueSamplers] = { 0 };
+    GrMtlSampler* fCurrentSampler[GrSamplerState::kNumUniqueSamplers] = {};
     MTLScissorRect fCurrentScissorRect = { 0, 0, 0, 0 };
     MTLTriangleFillMode fCurrentTriangleFillMode = (MTLTriangleFillMode)-1;
 };
diff --git a/third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm b/third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
index 046f68620a661..90a4f5e57fa7e 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlResourceProvider.mm
@@ -72,7 +72,7 @@
     if (!fMSAALoadLibrary) {
         TRACE_EVENT0("skia", TRACE_FUNC);
 
-        SkSL::String shaderText;
+        std::string shaderText;
         shaderText.append(
                 "#include <metal_stdlib>\n"
                 "#include <simd/simd.h>\n"
diff --git a/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h b/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h
index 88e2b08c61d19..007f432f5614d 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.h
@@ -28,7 +28,7 @@ class GrMtlUniformHandler : public GrGLSLUniformHandler {
     };
     static constexpr int kUniformBindingCount = kLastUniformBinding + 1;
 
-    // fUBOffset is only valid if the GrSLType of the fVariable is not a sampler
+    // fUBOffset is only valid if the SkSLType of the fVariable is not a sampler
     struct MtlUniformInfo : public UniformInfo {
         uint32_t fUBOffset;
     };
@@ -64,7 +64,7 @@ class GrMtlUniformHandler : public GrGLSLUniformHandler {
 
     UniformHandle internalAddUniformArray(const GrFragmentProcessor* owner,
                                           uint32_t visibility,
-                                          GrSLType type,
+                                          SkSLType type,
                                           const char* name,
                                           bool mangleName,
                                           int arrayCount,
@@ -72,7 +72,7 @@ class GrMtlUniformHandler : public GrGLSLUniformHandler {
 
     SamplerHandle addSampler(const GrBackendFormat&,
                              GrSamplerState,
-                             const GrSwizzle&,
+                             const skgpu::Swizzle&,
                              const char* name,
                              const GrShaderCaps*) override;
 
@@ -80,7 +80,7 @@ class GrMtlUniformHandler : public GrGLSLUniformHandler {
     const char* samplerVariable(SamplerHandle handle) const override {
         return fSamplers.item(handle.toIndex()).fVariable.c_str();
     }
-    GrSwizzle samplerSwizzle(SamplerHandle handle) const override {
+    skgpu::Swizzle samplerSwizzle(SamplerHandle handle) const override {
         return fSamplerSwizzles[handle.toIndex()];
     }
     uint32_t samplerVisibility(SamplerHandle handle) const {
@@ -95,7 +95,7 @@ class GrMtlUniformHandler : public GrGLSLUniformHandler {
 
     UniformInfoArray    fUniforms;
     UniformInfoArray    fSamplers;
-    SkTArray<GrSwizzle> fSamplerSwizzles;
+    SkTArray<skgpu::Swizzle> fSamplerSwizzles;
 
     uint32_t            fCurrentUBOOffset;
     uint32_t            fCurrentUBOMaxAlignment;
diff --git a/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.mm b/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.mm
index 8bd108a678149..b3ce55494815f 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlUniformHandler.mm
@@ -9,6 +9,7 @@
 
 #include "include/private/GrMtlTypesPriv.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/GrUtil.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 
 #if !__has_feature(objc_arc)
@@ -20,132 +21,132 @@
 // To determine whether a current offset is aligned, we can just 'and' the lowest bits with the
 // alignment mask. A value of 0 means aligned, any other value is how many bytes past alignment we
 // are. This works since all alignments are powers of 2. The mask is always (alignment - 1).
-static uint32_t grsltype_to_alignment_mask(GrSLType type) {
+static uint32_t sksltype_to_alignment_mask(SkSLType type) {
     switch(type) {
-        case kInt_GrSLType:
-        case kUInt_GrSLType:
-        case kFloat_GrSLType:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
+        case SkSLType::kFloat:
             return 0x3;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
-        case kFloat2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kFloat2:
             return 0x7;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kFloat3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
-        case kFloat4_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kFloat3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kFloat4:
             return 0xF;
 
-        case kFloat2x2_GrSLType:
+        case SkSLType::kFloat2x2:
             return 0x7;
-        case kFloat3x3_GrSLType:
+        case SkSLType::kFloat3x3:
             return 0xF;
-        case kFloat4x4_GrSLType:
+        case SkSLType::kFloat4x4:
             return 0xF;
 
-        case kShort_GrSLType:
-        case kUShort_GrSLType:
-        case kHalf_GrSLType:
+        case SkSLType::kShort:
+        case SkSLType::kUShort:
+        case SkSLType::kHalf:
             return 0x1;
-        case kShort2_GrSLType:
-        case kUShort2_GrSLType:
-        case kHalf2_GrSLType:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
+        case SkSLType::kHalf2:
             return 0x3;
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
-        case kHalf3_GrSLType:
-        case kHalf4_GrSLType:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
             return 0x7;
 
-        case kHalf2x2_GrSLType:
+        case SkSLType::kHalf2x2:
             return 0x3;
-        case kHalf3x3_GrSLType:
+        case SkSLType::kHalf3x3:
             return 0x7;
-        case kHalf4x4_GrSLType:
+        case SkSLType::kHalf4x4:
             return 0x7;
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
 }
 
-/** Returns the size in bytes taken up in Metal buffers for GrSLTypes. */
-static inline uint32_t grsltype_to_mtl_size(GrSLType type) {
+/** Returns the size in bytes taken up in Metal buffers for SkSLTypes. */
+static inline uint32_t sksltype_to_mtl_size(SkSLType type) {
     switch(type) {
-        case kInt_GrSLType:
-        case kUInt_GrSLType:
-        case kFloat_GrSLType:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
+        case SkSLType::kFloat:
             return 4;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
-        case kFloat2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kFloat2:
             return 8;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kFloat3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
-        case kFloat4_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kFloat3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kFloat4:
             return 16;
 
-        case kFloat2x2_GrSLType:
+        case SkSLType::kFloat2x2:
             return 16;
-        case kFloat3x3_GrSLType:
+        case SkSLType::kFloat3x3:
             return 48;
-        case kFloat4x4_GrSLType:
+        case SkSLType::kFloat4x4:
             return 64;
 
-        case kShort_GrSLType:
-        case kUShort_GrSLType:
-        case kHalf_GrSLType:
+        case SkSLType::kShort:
+        case SkSLType::kUShort:
+        case SkSLType::kHalf:
             return 2;
-        case kShort2_GrSLType:
-        case kUShort2_GrSLType:
-        case kHalf2_GrSLType:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
+        case SkSLType::kHalf2:
             return 4;
-        case kShort3_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
-        case kHalf3_GrSLType:
-        case kHalf4_GrSLType:
+        case SkSLType::kShort3:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
+        case SkSLType::kHalf3:
+        case SkSLType::kHalf4:
             return 8;
 
-        case kHalf2x2_GrSLType:
+        case SkSLType::kHalf2x2:
             return 8;
-        case kHalf3x3_GrSLType:
+        case SkSLType::kHalf3x3:
             return 24;
-        case kHalf4x4_GrSLType:
+        case SkSLType::kHalf4x4:
             return 32;
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
@@ -156,9 +157,9 @@ static inline uint32_t grsltype_to_mtl_size(GrSLType type) {
 // the new uniform, and currentOffset is updated to be the offset to the end of the new uniform.
 static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
                                        uint32_t* maxAlignment,
-                                       GrSLType type,
+                                       SkSLType type,
                                        int arrayCount) {
-    uint32_t alignmentMask = grsltype_to_alignment_mask(type);
+    uint32_t alignmentMask = sksltype_to_alignment_mask(type);
     if (alignmentMask > *maxAlignment) {
         *maxAlignment = alignmentMask;
     }
@@ -169,9 +170,9 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
     uint32_t uniformOffset = *currentOffset + offsetDiff;
     SkASSERT(sizeof(float) == 4);
     if (arrayCount) {
-        *currentOffset = uniformOffset + grsltype_to_mtl_size(type) * arrayCount;
+        *currentOffset = uniformOffset + sksltype_to_mtl_size(type) * arrayCount;
     } else {
-        *currentOffset = uniformOffset + grsltype_to_mtl_size(type);
+        *currentOffset = uniformOffset + sksltype_to_mtl_size(type);
     }
     return uniformOffset;
 }
@@ -179,13 +180,13 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
 GrGLSLUniformHandler::UniformHandle GrMtlUniformHandler::internalAddUniformArray(
                                                                    const GrFragmentProcessor* owner,
                                                                    uint32_t visibility,
-                                                                   GrSLType type,
+                                                                   SkSLType type,
                                                                    const char* name,
                                                                    bool mangleName,
                                                                    int arrayCount,
                                                                    const char** outName) {
     SkASSERT(name && strlen(name));
-    SkASSERT(GrSLTypeCanBeUniformValue(type));
+    SkASSERT(SkSLTypeCanBeUniformValue(type));
 
     // TODO this is a bit hacky, lets think of a better way.  Basically we need to be able to use
     // the uniform view matrix name in the GP, and the GP is immutable so it has to tell the PB
@@ -229,7 +230,7 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
 }
 
 GrGLSLUniformHandler::SamplerHandle GrMtlUniformHandler::addSampler(
-        const GrBackendFormat& backendFormat, GrSamplerState, const GrSwizzle& swizzle,
+        const GrBackendFormat& backendFormat, GrSamplerState, const skgpu::Swizzle& swizzle,
         const char* name, const GrShaderCaps* caps) {
     int binding = fSamplers.count();
 
@@ -245,7 +246,7 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
 
     MtlUniformInfo tempInfo;
     tempInfo.fVariable = GrShaderVar{std::move(mangleName),
-                                     GrSLCombinedSamplerTypeForTextureType(type),
+                                     SkSLCombinedSamplerTypeForTextureType(type),
                                      GrShaderVar::TypeModifier::Uniform,
                                      GrShaderVar::kNonArray,
                                      std::move(layoutQualifier),
@@ -265,7 +266,7 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
 
 void GrMtlUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString* out) const {
     for (const UniformInfo& sampler : fSamplers.items()) {
-        SkASSERT(sampler.fVariable.getType() == kTexture2DSampler_GrSLType);
+        SkASSERT(sampler.fVariable.getType() == SkSLType::kTexture2DSampler);
         if (visibility == sampler.fVisibility) {
             sampler.fVariable.appendDecl(fProgramBuilder->shaderCaps(), out);
             out->append(";\n");
@@ -287,7 +288,7 @@ static uint32_t get_ubo_aligned_offset(uint32_t* currentOffset,
     SkString uniformsString;
     for (const UniformInfo& localUniform : fUniforms.items()) {
         if (visibility & localUniform.fVisibility) {
-            if (GrSLTypeCanBeUniformValue(localUniform.fVariable.getType())) {
+            if (SkSLTypeCanBeUniformValue(localUniform.fVariable.getType())) {
                 localUniform.fVariable.appendDecl(fProgramBuilder->shaderCaps(), &uniformsString);
                 uniformsString.append(";\n");
             }
diff --git a/third_party/skia/src/gpu/mtl/GrMtlUtil.h b/third_party/skia/src/gpu/mtl/GrMtlUtil.h
index b708f48ad71ba..21b97a4af460e 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlUtil.h
+++ b/third_party/skia/src/gpu/mtl/GrMtlUtil.h
@@ -69,10 +69,10 @@ MTLTextureDescriptor* GrGetMTLTextureDescriptor(id<MTLTexture> mtlTexture);
  * Produces MSL code generated by SkSLC
  */
 bool GrSkSLToMSL(const GrMtlGpu* gpu,
-                 const SkSL::String& sksl,
+                 const std::string& sksl,
                  SkSL::ProgramKind kind,
                  const SkSL::Program::Settings& settings,
-                 SkSL::String* msl,
+                 std::string* msl,
                  SkSL::Program::Inputs* outInputs,
                  GrContextOptions::ShaderErrorHandler* errorHandler);
 
@@ -80,7 +80,7 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
  * Returns a compiled MTLLibrary created from MSL code
  */
 id<MTLLibrary> GrCompileMtlShaderLibrary(const GrMtlGpu* gpu,
-                                         const SkSL::String& msl,
+                                         const std::string& msl,
                                          GrContextOptions::ShaderErrorHandler* errorHandler);
 
 /**
@@ -88,7 +88,7 @@ id<MTLLibrary> GrCompileMtlShaderLibrary(const GrMtlGpu* gpu,
  * will be cached in the Apple shader cache.
  */
 void GrPrecompileMtlShaderLibrary(const GrMtlGpu* gpu,
-                                  const SkSL::String& msl);
+                                  const std::string& msl);
 
 /**
  * Replacement for newLibraryWithSource:options:error that has a timeout.
diff --git a/third_party/skia/src/gpu/mtl/GrMtlUtil.mm b/third_party/skia/src/gpu/mtl/GrMtlUtil.mm
index 30f863f06ed6d..56e6cc592574e 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlUtil.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlUtil.mm
@@ -11,12 +11,12 @@
 #include "include/private/GrTypesPriv.h"
 #include "include/private/SkMutex.h"
 #include "src/core/SkTraceEvent.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/GrSurface.h"
 #include "src/gpu/mtl/GrMtlGpu.h"
 #include "src/gpu/mtl/GrMtlRenderTarget.h"
 #include "src/gpu/mtl/GrMtlTexture.h"
 #include "src/sksl/SkSLCompiler.h"
+#include "src/utils/SkShaderUtils.h"
 
 #import <Metal/Metal.h>
 #ifdef SK_BUILD_FOR_IOS
@@ -58,16 +58,16 @@
 static const bool gPrintMSL = false;
 
 bool GrSkSLToMSL(const GrMtlGpu* gpu,
-                 const SkSL::String& sksl,
+                 const std::string& sksl,
                  SkSL::ProgramKind programKind,
                  const SkSL::Program::Settings& settings,
-                 SkSL::String* msl,
+                 std::string* msl,
                  SkSL::Program::Inputs* outInputs,
                  GrContextOptions::ShaderErrorHandler* errorHandler) {
 #ifdef SK_DEBUG
-    SkSL::String src = GrShaderUtils::PrettyPrint(sksl);
+    std::string src = SkShaderUtils::PrettyPrint(sksl);
 #else
-    const SkSL::String& src = sksl;
+    const std::string& src = sksl;
 #endif
     SkSL::Compiler* compiler = gpu->shaderCompiler();
     std::unique_ptr<SkSL::Program> program =
@@ -80,14 +80,14 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
     }
 
     if (gPrintSKSL || gPrintMSL) {
-        GrShaderUtils::PrintShaderBanner(programKind);
+        SkShaderUtils::PrintShaderBanner(programKind);
         if (gPrintSKSL) {
             SkDebugf("SKSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(sksl));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(sksl));
         }
         if (gPrintMSL) {
             SkDebugf("MSL:\n");
-            GrShaderUtils::PrintLineByLine(GrShaderUtils::PrettyPrint(*msl));
+            SkShaderUtils::PrintLineByLine(SkShaderUtils::PrettyPrint(*msl));
         }
     }
 
@@ -96,7 +96,7 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
 }
 
 id<MTLLibrary> GrCompileMtlShaderLibrary(const GrMtlGpu* gpu,
-                                         const SkSL::String& msl,
+                                         const std::string& msl,
                                          GrContextOptions::ShaderErrorHandler* errorHandler) {
     TRACE_EVENT0("skia.shaders", "driver_compile_shader");
     auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
@@ -135,7 +135,7 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
 }
 
 void GrPrecompileMtlShaderLibrary(const GrMtlGpu* gpu,
-                                  const SkSL::String& msl) {
+                                  const std::string& msl) {
     auto nsSource = [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(msl.c_str())
                                                    length:msl.size()
                                                  encoding:NSUTF8StringEncoding
diff --git a/third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.mm b/third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.mm
index c26214aa8f34a..3d19c0b8b8f99 100644
--- a/third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.mm
+++ b/third_party/skia/src/gpu/mtl/GrMtlVaryingHandler.mm
@@ -21,8 +21,8 @@ static void finalize_helper(GrMtlVaryingHandler::VarArray& vars) {
     SkDEBUGCODE(int componentCount = 0);
     for (GrShaderVar& var : vars.items()) {
         // Metal only allows scalars (including bool and char) and vectors as varyings
-        SkASSERT(GrSLTypeVecLength(var.getType()) != -1);
-        SkDEBUGCODE(componentCount += GrSLTypeVecLength(var.getType()));
+        SkASSERT(SkSLTypeVecLength(var.getType()) != -1);
+        SkDEBUGCODE(componentCount += SkSLTypeVecLength(var.getType()));
 
         SkString location;
         location.appendf("location = %d", locationIndex);
diff --git a/third_party/skia/src/gpu/ops/AAConvexPathRenderer.cpp b/third_party/skia/src/gpu/ops/AAConvexPathRenderer.cpp
index aaead128926c1..f8e788aa534c5 100644
--- a/third_party/skia/src/gpu/ops/AAConvexPathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/AAConvexPathRenderer.cpp
@@ -20,6 +20,7 @@
 #include "src/gpu/GrGeometryProcessor.h"
 #include "src/gpu/GrProcessor.h"
 #include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/geometry/GrPathUtils.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -70,6 +71,9 @@ bool center_of_mass(const SegmentArray& segments, SkPoint* c) {
     SkScalar area = 0;
     SkPoint center = {0, 0};
     int count = segments.count();
+    if (count <= 0) {
+        return false;
+    }
     SkPoint p0 = {0, 0};
     if (count > 2) {
         // We translate the polygon so that the first point is at the origin.
@@ -559,7 +563,7 @@ class QuadEdgeEffect : public GrGeometryProcessor {
 
     const char* name() const override { return "QuadEdge"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, KeyBuilder* b) const override {
         b->addBool(fUsesLocalCoords, "usesLocalCoords");
         b->addBits(ProgramImpl::kMatrixKeyBits,
                    ProgramImpl::ComputeMatrixKey(caps, fLocalMatrix),
@@ -573,11 +577,11 @@ class QuadEdgeEffect : public GrGeometryProcessor {
             : INHERITED(kQuadEdgeEffect_ClassID)
             , fLocalMatrix(localMatrix)
             , fUsesLocalCoords(usesLocalCoords) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         fInColor = MakeColorAttribute("inColor", wideColor);
         // GL on iOS 14 needs more precision for the quadedge attributes
-        fInQuadEdge = {"inQuadEdge", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
-        this->setVertexAttributes(&fInPosition, 3);
+        fInQuadEdge = {"inQuadEdge", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
     }
 
     Attribute fInPosition;
@@ -616,7 +620,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> QuadEdgeEffect::makeProgramImp
 
             // GL on iOS 14 needs more precision for the quadedge attributes
             // We might as well enable it everywhere
-            GrGLSLVarying v(kFloat4_GrSLType);
+            GrGLSLVarying v(SkSLType::kFloat4);
             varyingHandler->addVarying("QuadEdge", &v);
             vertBuilder->codeAppendf("%s = %s;", v.vsOut(), qe.fInQuadEdge.name());
 
@@ -802,10 +806,10 @@ class AAConvexPathOp final : public GrMeshDrawOp {
             sk_sp<const GrBuffer> vertexBuffer;
             int firstVertex;
 
-            VertexWriter verts{target->makeVertexSpace(kVertexStride,
-                                                       vertexCount,
-                                                       &vertexBuffer,
-                                                       &firstVertex)};
+            VertexWriter verts = target->makeVertexWriter(kVertexStride,
+                                                          vertexCount,
+                                                          &vertexBuffer,
+                                                          &firstVertex);
 
             if (!verts) {
                 SkDebugf("Could not allocate vertices\n");
diff --git a/third_party/skia/src/gpu/ops/AAHairLinePathRenderer.cpp b/third_party/skia/src/gpu/ops/AAHairLinePathRenderer.cpp
index 527c98959e0f0..a6bcf70ea787f 100644
--- a/third_party/skia/src/gpu/ops/AAHairLinePathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/AAHairLinePathRenderer.cpp
@@ -75,10 +75,10 @@ static const uint16_t kQuadIdxBufPattern[] = {
 static const int kIdxsPerQuad = SK_ARRAY_COUNT(kQuadIdxBufPattern);
 static const int kQuadNumVertices = 5;
 static const int kQuadsNumInIdxBuffer = 256;
-GR_DECLARE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
 
 sk_sp<const GrBuffer> get_quads_index_buffer(GrResourceProvider* resourceProvider) {
-    GR_DEFINE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gQuadsIndexBufferKey);
     return resourceProvider->findOrCreatePatternedIndexBuffer(
         kQuadIdxBufPattern, kIdxsPerQuad, kQuadsNumInIdxBuffer, kQuadNumVertices,
         gQuadsIndexBufferKey);
@@ -109,10 +109,10 @@ static const int kIdxsPerLineSeg = SK_ARRAY_COUNT(kLineSegIdxBufPattern);
 static const int kLineSegNumVertices = 6;
 static const int kLineSegsNumInIdxBuffer = 256;
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
 
 sk_sp<const GrBuffer> get_lines_index_buffer(GrResourceProvider* resourceProvider) {
-    GR_DEFINE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gLinesIndexBufferKey);
     return resourceProvider->findOrCreatePatternedIndexBuffer(
         kLineSegIdxBufPattern, kIdxsPerLineSeg,  kLineSegsNumInIdxBuffer, kLineSegNumVertices,
         gLinesIndexBufferKey);
diff --git a/third_party/skia/src/gpu/ops/AtlasInstancedHelper.cpp b/third_party/skia/src/gpu/ops/AtlasInstancedHelper.cpp
index 787eb2bb4645d..23e417e095d37 100644
--- a/third_party/skia/src/gpu/ops/AtlasInstancedHelper.cpp
+++ b/third_party/skia/src/gpu/ops/AtlasInstancedHelper.cpp
@@ -8,17 +8,22 @@
 #include "src/gpu/ops/AtlasInstancedHelper.h"
 
 #include "src/gpu/BufferWriter.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
 
 namespace skgpu::v1 {
 
+void AtlasInstancedHelper::getKeyBits(KeyBuilder* b) const {
+    b->addBits(kNumShaderFlags, (int)fShaderFlags, "atlasFlags");
+}
+
 void AtlasInstancedHelper::appendInstanceAttribs(
         SkTArray<GrGeometryProcessor::Attribute>* instanceAttribs) const {
-    instanceAttribs->emplace_back("locations", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+    instanceAttribs->emplace_back("locations", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
     if (fShaderFlags & ShaderFlags::kCheckBounds) {
-        instanceAttribs->emplace_back("sizeInAtlas", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
+        instanceAttribs->emplace_back("sizeInAtlas", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
     }
 }
 
@@ -42,12 +47,12 @@ void AtlasInstancedHelper::injectShaderCode(
         const GrGeometryProcessor::ProgramImpl::EmitArgs& args,
         const GrShaderVar& devCoord,
         GrGLSLUniformHandler::UniformHandle* atlasAdjustUniformHandle) const {
-    GrGLSLVarying atlasCoord(kFloat2_GrSLType);
+    GrGLSLVarying atlasCoord(SkSLType::kFloat2);
     args.fVaryingHandler->addVarying("atlasCoord", &atlasCoord);
 
     const char* atlasAdjustName;
     *atlasAdjustUniformHandle = args.fUniformHandler->addUniform(
-            nullptr, kVertex_GrShaderFlag, kFloat2_GrSLType, "atlas_adjust", &atlasAdjustName);
+            nullptr, kVertex_GrShaderFlag, SkSLType::kFloat2, "atlas_adjust", &atlasAdjustName);
 
     args.fVertBuilder->codeAppendf(R"(
     // A negative x coordinate in the atlas indicates that the path is transposed.
@@ -63,7 +68,7 @@ void AtlasInstancedHelper::injectShaderCode(
     %s = atlasCoord * %s;)", devCoord.c_str(), atlasCoord.vsOut(), atlasAdjustName);
 
     if (fShaderFlags & ShaderFlags::kCheckBounds) {
-        GrGLSLVarying atlasBounds(kFloat4_GrSLType);
+        GrGLSLVarying atlasBounds(SkSLType::kFloat4);
         args.fVaryingHandler->addVarying("atlasbounds", &atlasBounds,
                                          GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
         args.fVertBuilder->codeAppendf(R"(
diff --git a/third_party/skia/src/gpu/ops/AtlasInstancedHelper.h b/third_party/skia/src/gpu/ops/AtlasInstancedHelper.h
index 1dede75657eb9..eb166f1d0cd33 100644
--- a/third_party/skia/src/gpu/ops/AtlasInstancedHelper.h
+++ b/third_party/skia/src/gpu/ops/AtlasInstancedHelper.h
@@ -38,7 +38,7 @@ class AtlasInstancedHelper {
     }
 
     GrSurfaceProxy* proxy() const { return fAtlasProxy.get(); }
-    const GrSwizzle& atlasSwizzle() const { return fAtlasSwizzle; }
+    const skgpu::Swizzle& atlasSwizzle() const { return fAtlasSwizzle; }
 
     // Returns whether the two helpers can be batched together in a single draw.
     bool isCompatible(const AtlasInstancedHelper& helper) {
@@ -49,9 +49,7 @@ class AtlasInstancedHelper {
     }
 
     // Adds bits to the shader key that uniquely identify this specific helper's shader code.
-    void getKeyBits(GrProcessorKeyBuilder* b) const {
-        b->addBits(kNumShaderFlags, (int)fShaderFlags, "atlasFlags");
-    }
+    void getKeyBits(KeyBuilder* b) const;
 
     // Appends the instanced input attribs to the back of the array that we will need in order to
     // locate our path in the atlas.
@@ -91,7 +89,7 @@ class AtlasInstancedHelper {
 
 private:
     const sk_sp<GrSurfaceProxy> fAtlasProxy;
-    const GrSwizzle fAtlasSwizzle;
+    const skgpu::Swizzle fAtlasSwizzle;
     const ShaderFlags fShaderFlags;
 };
 
diff --git a/third_party/skia/src/gpu/ops/AtlasTextOp.cpp b/third_party/skia/src/gpu/ops/AtlasTextOp.cpp
index dee0954a7d6d9..7f411e6ca68ac 100644
--- a/third_party/skia/src/gpu/ops/AtlasTextOp.cpp
+++ b/third_party/skia/src/gpu/ops/AtlasTextOp.cpp
@@ -32,6 +32,9 @@
 
 namespace skgpu::v1 {
 
+inline static constexpr int kVerticesPerGlyph = 4;
+inline static constexpr int kIndicesPerGlyph = 6;
+
 // If we have thread local, then cache memory for a single AtlasTextOp.
 #if !defined(STARBOARD)
 static thread_local void* gCache = nullptr;
@@ -513,14 +516,14 @@ GrOp::Owner AtlasTextOp::CreateOpTestingOnly(SurfaceDrawContext* sdc,
             rContext->priv().getSDFTControl(sdc->surfaceProps().isUseDeviceIndependentFonts());
 
     SkGlyphRunListPainter* painter = sdc->glyphRunPainter();
-    sk_sp<GrTextBlob> blob = GrTextBlob::Make(glyphRunList, skPaint, drawMatrix, control, painter);
+    sk_sp<GrTextBlob> blob = GrTextBlob::Make(
+            glyphRunList, skPaint, drawMatrix, false, control, painter);
 
-    if (blob->subRunList().isEmpty()) {
+    const GrAtlasSubRun* subRun = blob->testingOnlyFirstSubRun();
+    if (!subRun) {
         return nullptr;
     }
 
-    GrAtlasSubRun* subRun = blob->subRunList().front().testingOnly_atlasSubRun();
-    SkASSERT(subRun);
     GrOp::Owner op;
     std::tie(std::ignore, op) = subRun->makeAtlasTextOp(
             nullptr, mtxProvider, glyphRunList.origin(), skPaint, sdc, nullptr);
diff --git a/third_party/skia/src/gpu/ops/AtlasTextOp.h b/third_party/skia/src/gpu/ops/AtlasTextOp.h
index fe3652db98188..a684125855ba1 100644
--- a/third_party/skia/src/gpu/ops/AtlasTextOp.h
+++ b/third_party/skia/src/gpu/ops/AtlasTextOp.h
@@ -32,9 +32,6 @@ class AtlasTextOp final : public GrMeshDrawOp {
     void operator delete(void* b) noexcept;
     static void ClearCache();
 
-    static const int kVerticesPerGlyph = GrAtlasSubRun::kVerticesPerGlyph;
-    static const int kIndicesPerGlyph = 6;
-
     struct Geometry {
         Geometry(const GrAtlasSubRun& subRun,
                  const SkMatrix& drawMatrix,
diff --git a/third_party/skia/src/gpu/ops/BUILD.bazel b/third_party/skia/src/gpu/ops/BUILD.bazel
index 614948184e5a7..b484907f57646 100644
--- a/third_party/skia/src/gpu/ops/BUILD.bazel
+++ b/third_party/skia/src/gpu/ops/BUILD.bazel
@@ -28,6 +28,7 @@ generated_cc_atom(
         "//src/gpu:GrGeometryProcessor_hdr",
         "//src/gpu:GrProcessor_hdr",
         "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/geometry:GrPathUtils_hdr",
         "//src/gpu/geometry:GrStyledShape_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -134,6 +135,7 @@ generated_cc_atom(
     deps = [
         ":AtlasInstancedHelper_hdr",
         "//src/gpu:BufferWriter_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVarying_hdr",
         "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
@@ -327,6 +329,7 @@ generated_cc_atom(
         "//src/gpu:GrProgramInfo_hdr",
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrStyle_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/geometry:GrQuad_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -432,42 +435,7 @@ generated_cc_atom(
         "//src/gpu:GrOpsRenderPass_hdr",
         "//src/gpu:GrProgramInfo_hdr",
         "//src/gpu:GrResourceProvider_hdr",
-        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
-        "//src/gpu/glsl:GrGLSLVarying_hdr",
-        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "DrawVerticesOp_hdr",
-    hdrs = ["DrawVerticesOp.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":GrOp_hdr",
-        "//include/core:SkRefCnt_hdr",
-        "//include/private:GrTypesPriv_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "DrawVerticesOp_src",
-    srcs = ["DrawVerticesOp.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":DrawVerticesOp_hdr",
-        ":GrSimpleMeshDrawOpHelper_hdr",
-        "//include/core:SkM44_hdr",
-        "//src/core:SkArenaAlloc_hdr",
-        "//src/core:SkDevice_hdr",
-        "//src/core:SkMatrixPriv_hdr",
-        "//src/core:SkVerticesPriv_hdr",
-        "//src/gpu:BufferWriter_hdr",
-        "//src/gpu:GrDrawOpTest_hdr",
-        "//src/gpu:GrGeometryProcessor_hdr",
-        "//src/gpu:GrOpFlushState_hdr",
-        "//src/gpu:GrProgramInfo_hdr",
-        "//src/gpu:SkGr_hdr",
-        "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVarying_hdr",
         "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
@@ -537,6 +505,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrResourceProvider_hdr",
         "//src/gpu:GrVx_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/geometry:GrShape_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVarying_hdr",
@@ -673,6 +642,7 @@ generated_cc_atom(
         "//src/gpu:GrResourceProvider_hdr",
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrStyle_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLProgramDataManager_hdr",
         "//src/gpu/glsl:GrGLSLUniformHandler_hdr",
@@ -765,6 +735,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrResourceProviderPriv_hdr",
         "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -941,6 +912,7 @@ generated_cc_atom(
         "//include/private:SkVx_hdr",
         "//src/gpu:GrMeshDrawTarget_hdr",
         "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/geometry:GrQuadUtils_hdr",
         "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr",
@@ -1152,7 +1124,6 @@ generated_cc_atom(
         ":GrSimpleMeshDrawOpHelper_hdr",
         ":StrokeRectOp_hdr",
         "//include/core:SkStrokeRec_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//include/utils:SkRandom_hdr",
         "//src/core:SkMatrixPriv_hdr",
         "//src/gpu:BufferWriter_hdr",
@@ -1163,6 +1134,7 @@ generated_cc_atom(
         "//src/gpu:GrOpFlushState_hdr",
         "//src/gpu:GrProgramInfo_hdr",
         "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:ResourceKey_hdr",
         "//src/gpu/geometry:GrQuad_hdr",
     ],
 )
@@ -1326,3 +1298,41 @@ generated_cc_atom(
         "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "DrawCustomMeshOp_hdr",
+    hdrs = ["DrawCustomMeshOp.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GrOp_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkCustomMesh_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:GrTypesPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawCustomMeshOp_src",
+    srcs = ["DrawCustomMeshOp.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DrawCustomMeshOp_hdr",
+        ":GrSimpleMeshDrawOpHelper_hdr",
+        "//include/core:SkCustomMesh_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+        "//src/core:SkCustomMeshPriv_hdr",
+        "//src/core:SkVerticesPriv_hdr",
+        "//src/gpu:BufferWriter_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr",
+        "//src/sksl/ir:SkSLProgram_hdr",
+    ],
+)
diff --git a/third_party/skia/src/gpu/ops/DashOp.cpp b/third_party/skia/src/gpu/ops/DashOp.cpp
index b3367114e4721..efc8895e035c2 100644
--- a/third_party/skia/src/gpu/ops/DashOp.cpp
+++ b/third_party/skia/src/gpu/ops/DashOp.cpp
@@ -21,6 +21,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrStyle.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/geometry/GrQuad.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -718,7 +719,7 @@ class DashingCircleEffect : public GrGeometryProcessor {
 
     const char* name() const override { return "DashingCircleEffect"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, KeyBuilder*) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -774,12 +775,12 @@ void DashingCircleEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
     varyingHandler->emitAttributes(dce);
 
     // XY are dashPos, Z is dashInterval
-    GrGLSLVarying dashParams(kHalf3_GrSLType);
+    GrGLSLVarying dashParams(SkSLType::kHalf3);
     varyingHandler->addVarying("DashParam", &dashParams);
     vertBuilder->codeAppendf("%s = %s;", dashParams.vsOut(), dce.fInDashParams.name());
 
     // x refers to circle radius - 0.5, y refers to cicle's center x coord
-    GrGLSLVarying circleParams(kHalf2_GrSLType);
+    GrGLSLVarying circleParams(SkSLType::kHalf2);
     varyingHandler->addVarying("CircleParams", &circleParams);
     vertBuilder->codeAppendf("%s = %s;", circleParams.vsOut(), dce.fInCircleParams.name());
 
@@ -842,7 +843,7 @@ GrGeometryProcessor* DashingCircleEffect::Make(SkArenaAlloc* arena,
     });
 }
 
-void DashingCircleEffect::addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void DashingCircleEffect::addToKey(const GrShaderCaps& caps, KeyBuilder* b) const {
     uint32_t key = 0;
     key |= fUsesLocalCoords ? 0x1 : 0x0;
     key |= static_cast<uint32_t>(fAAMode) << 1;
@@ -864,10 +865,10 @@ DashingCircleEffect::DashingCircleEffect(const SkPMColor4f& color,
         , fLocalMatrix(localMatrix)
         , fUsesLocalCoords(usesLocalCoords)
         , fAAMode(aaMode) {
-    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-    fInDashParams = {"inDashParams", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
-    fInCircleParams = {"inCircleParams", kFloat2_GrVertexAttribType, kHalf2_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+    fInDashParams = {"inDashParams", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
+    fInCircleParams = {"inCircleParams", kFloat2_GrVertexAttribType, SkSLType::kHalf2};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 }
 
 GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingCircleEffect);
@@ -910,7 +911,7 @@ class DashingLineEffect : public GrGeometryProcessor {
 
     bool usesLocalCoords() const { return fUsesLocalCoords; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, KeyBuilder*) const override;
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override;
 
@@ -963,13 +964,13 @@ void DashingLineEffect::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) {
     varyingHandler->emitAttributes(de);
 
     // XY refers to dashPos, Z is the dash interval length
-    GrGLSLVarying inDashParams(kFloat3_GrSLType);
+    GrGLSLVarying inDashParams(SkSLType::kFloat3);
     varyingHandler->addVarying("DashParams", &inDashParams);
     vertBuilder->codeAppendf("%s = %s;", inDashParams.vsOut(), de.fInDashParams.name());
 
     // The rect uniform's xyzw refer to (left + 0.5, top + 0.5, right - 0.5, bottom - 0.5),
     // respectively.
-    GrGLSLVarying inRectParams(kFloat4_GrSLType);
+    GrGLSLVarying inRectParams(SkSLType::kFloat4);
     varyingHandler->addVarying("RectParams", &inRectParams);
     vertBuilder->codeAppendf("%s = %s;", inRectParams.vsOut(), de.fInRect.name());
 
@@ -1056,7 +1057,7 @@ GrGeometryProcessor* DashingLineEffect::Make(SkArenaAlloc* arena,
     });
 }
 
-void DashingLineEffect::addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void DashingLineEffect::addToKey(const GrShaderCaps& caps, KeyBuilder* b) const {
     uint32_t key = 0;
     key |= fUsesLocalCoords ? 0x1 : 0x0;
     key |= static_cast<int>(fAAMode) << 1;
@@ -1078,10 +1079,10 @@ DashingLineEffect::DashingLineEffect(const SkPMColor4f& color,
         , fLocalMatrix(localMatrix)
         , fUsesLocalCoords(usesLocalCoords)
         , fAAMode(aaMode) {
-    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-    fInDashParams = {"inDashParams", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
-    fInRect = {"inRect", kFloat4_GrVertexAttribType, kHalf4_GrSLType};
-    this->setVertexAttributes(&fInPosition, 3);
+    fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+    fInDashParams = {"inDashParams", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
+    fInRect = {"inRect", kFloat4_GrVertexAttribType, SkSLType::kHalf4};
+    this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
 }
 
 GR_DEFINE_GEOMETRY_PROCESSOR_TEST(DashingLineEffect);
diff --git a/third_party/skia/src/gpu/ops/DrawAtlasPathOp.cpp b/third_party/skia/src/gpu/ops/DrawAtlasPathOp.cpp
index 35c41040f227f..f362a8a44f8fe 100644
--- a/third_party/skia/src/gpu/ops/DrawAtlasPathOp.cpp
+++ b/third_party/skia/src/gpu/ops/DrawAtlasPathOp.cpp
@@ -13,6 +13,7 @@
 #include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
@@ -32,19 +33,19 @@ class DrawAtlasPathShader : public GrGeometryProcessor {
                            fAtlasHelper->atlasSwizzle()) {
         if (!shaderCaps.vertexIDSupport()) {
             constexpr static Attribute kUnitCoordAttrib(
-                    "unitCoord", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
-            this->setVertexAttributes(&kUnitCoordAttrib, 1);
+                    "unitCoord", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
+            this->setVertexAttributesWithImplicitOffsets(&kUnitCoordAttrib, 1);
         }
-        fAttribs.emplace_back("fillBounds", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+        fAttribs.emplace_back("fillBounds", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
         if (fUsesLocalCoords) {
-            fAttribs.emplace_back("affineMatrix", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-            fAttribs.emplace_back("translate", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
+            fAttribs.emplace_back("affineMatrix", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+            fAttribs.emplace_back("translate", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
         }
         SkASSERT(fAttribs.count() == this->colorAttribIdx());
-        fAttribs.emplace_back("color", kFloat4_GrVertexAttribType, kHalf4_GrSLType);
+        fAttribs.emplace_back("color", kFloat4_GrVertexAttribType, SkSLType::kHalf4);
         fAtlasHelper->appendInstanceAttribs(&fAttribs);
         SkASSERT(fAttribs.count() <= kMaxInstanceAttribs);
-        this->setInstanceAttributes(fAttribs.data(), fAttribs.count());
+        this->setInstanceAttributesWithImplicitOffsets(fAttribs.data(), fAttribs.count());
         this->setTextureSamplerCnt(1);
     }
 
@@ -53,7 +54,7 @@ class DrawAtlasPathShader : public GrGeometryProcessor {
 
     int colorAttribIdx() const { return fUsesLocalCoords ? 3 : 1; }
     const char* name() const override { return "DrawAtlasPathShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override {
         b->addBits(1, fUsesLocalCoords, "localCoords");
         fAtlasHelper->getKeyBits(b);
     }
@@ -90,13 +91,13 @@ class DrawAtlasPathShader::Impl : public ProgramImpl {
 
         args.fVertBuilder->codeAppendf(R"(
         float2 devCoord = mix(fillBounds.xy, fillBounds.zw, unitCoord);)");
-        gpArgs->fPositionVar.set(kFloat2_GrSLType, "devCoord");
+        gpArgs->fPositionVar.set(SkSLType::kFloat2, "devCoord");
 
         if (shader.fUsesLocalCoords) {
             args.fVertBuilder->codeAppendf(R"(
             float2x2 M = float2x2(affineMatrix);
             float2 localCoord = inverse(M) * (devCoord - translate);)");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localCoord");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localCoord");
         }
 
         args.fFragBuilder->codeAppendf("half4 %s = half4(1);", args.fOutputCoverage);
@@ -180,7 +181,7 @@ void DrawAtlasPathOp::onPrePrepare(GrRecordingContext* rContext,
     rContext->priv().recordProgramInfo(fProgram);
 }
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
 
 void DrawAtlasPathOp::onPrepare(GrOpFlushState* flushState) {
     if (!fProgram) {
@@ -191,7 +192,7 @@ void DrawAtlasPathOp::onPrepare(GrOpFlushState* flushState) {
         SkASSERT(fProgram);
     }
 
-    if (VertexWriter instanceWriter = flushState->makeVertexSpace(
+    if (VertexWriter instanceWriter = flushState->makeVertexWriter(
                 fProgram->geomProc().instanceStride(), fInstanceCount, &fInstanceBuffer,
                 &fBaseInstance)) {
         for (const Instance* i = fHeadInstance; i; i = i->fNext) {
@@ -206,7 +207,7 @@ void DrawAtlasPathOp::onPrepare(GrOpFlushState* flushState) {
     if (!flushState->caps().shaderCaps()->vertexIDSupport()) {
         constexpr static SkPoint kUnitQuad[4] = {{0,0}, {0,1}, {1,0}, {1,1}};
 
-        GR_DEFINE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
 
         fVertexBufferIfNoIDSupport = flushState->resourceProvider()->findOrMakeStaticBuffer(
                 GrGpuBufferType::kVertex, sizeof(kUnitQuad), kUnitQuad, gUnitQuadBufferKey);
diff --git a/third_party/skia/src/gpu/ops/DrawCustomMeshOp.cpp b/third_party/skia/src/gpu/ops/DrawCustomMeshOp.cpp
new file mode 100644
index 0000000000000..80e64c0a3d3a9
--- /dev/null
+++ b/third_party/skia/src/gpu/ops/DrawCustomMeshOp.cpp
@@ -0,0 +1,865 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/gpu/ops/DrawCustomMeshOp.h"
+
+#include "include/core/SkCustomMesh.h"
+#include "src/core/SkArenaAlloc.h"
+#include "src/core/SkCustomMeshPriv.h"
+#include "src/core/SkVerticesPriv.h"
+#include "src/gpu/BufferWriter.h"
+#include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/KeyBuilder.h"
+#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLVarying.h"
+#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
+#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
+#include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h"
+#include "src/sksl/ir/SkSLProgram.h"
+
+namespace {
+
+GrPrimitiveType primitive_type(SkCustomMesh::Mode mode) {
+    switch (mode) {
+        case SkCustomMesh::Mode::kTriangles:     return GrPrimitiveType::kTriangles;
+        case SkCustomMesh::Mode::kTriangleStrip: return GrPrimitiveType::kTriangleStrip;
+    }
+    SkUNREACHABLE;
+}
+
+class CustomMeshGP : public GrGeometryProcessor {
+public:
+    static GrGeometryProcessor* Make(SkArenaAlloc* arena,
+                                     sk_sp<SkCustomMeshSpecification> spec,
+                                     sk_sp<GrColorSpaceXform> colorSpaceXform,
+                                     const SkMatrix& viewMatrix,
+                                     const std::optional<SkPMColor4f>& color,
+                                     bool needsLocalCoords) {
+        return arena->make([&](void* ptr) {
+            return new (ptr) CustomMeshGP(std::move(spec),
+                                          std::move(colorSpaceXform),
+                                          viewMatrix,
+                                          std::move(color),
+                                          needsLocalCoords);
+        });
+    }
+
+    const char* name() const override { return "CustomMeshGP"; }
+
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
+        b->add32(SkCustomMeshSpecificationPriv::Hash(*fSpec), "custom mesh spec hash");
+        b->add32(ProgramImpl::ComputeMatrixKey(caps, fViewMatrix), "view matrix key");
+        if (SkCustomMeshSpecificationPriv::GetColorType(*fSpec) !=
+            SkCustomMeshSpecificationPriv::ColorType::kNone) {
+            b->add32(GrColorSpaceXform::XformKey(fColorSpaceXform.get()), "colorspace xform key");
+        }
+    }
+
+    std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override {
+        return std::make_unique<Impl>();
+    }
+
+private:
+    class Impl : public ProgramImpl {
+    public:
+        void setData(const GrGLSLProgramDataManager& pdman,
+                     const GrShaderCaps& shaderCaps,
+                     const GrGeometryProcessor& geomProc) override {
+            const auto& cmgp = geomProc.cast<CustomMeshGP>();
+            SetTransform(pdman, shaderCaps, fViewMatrixUniform, cmgp.fViewMatrix, &fViewMatrix);
+            fColorSpaceHelper.setData(pdman, cmgp.fColorSpaceXform.get());
+            if (fColorUniform.isValid()) {
+                pdman.set4fv(fColorUniform, 1, cmgp.fColor.vec());
+            }
+        }
+
+    private:
+        class MeshCallbacks : public SkSL::PipelineStage::Callbacks {
+        public:
+            MeshCallbacks(Impl* self,
+                          GrGLSLShaderBuilder* builder,
+                          const char* mainName,
+                          const SkSL::Context& context)
+                    : fSelf(self), fBuilder(builder), fMainName(mainName), fContext(context) {}
+
+            std::string declareUniform(const SkSL::VarDeclaration* decl) override {
+                SK_ABORT("uniforms not allowed");
+            }
+
+            std::string getMangledName(const char* name) override {
+                return std::string(fBuilder->getMangledFunctionName(name).c_str());
+            }
+
+            std::string getMainName() override { return fMainName; }
+
+            void defineFunction(const char* decl, const char* body, bool isMain) override {
+                fBuilder->emitFunction(decl, body);
+            }
+
+            void declareFunction(const char* decl) override {
+                fBuilder->emitFunctionPrototype(decl);
+            }
+
+            void defineStruct(const char* definition) override {
+                fBuilder->definitionAppend(definition);
+            }
+
+            void declareGlobal(const char* declaration) override {
+                fBuilder->definitionAppend(declaration);
+            }
+
+            std::string sampleShader(int index, std::string coords) override {
+                SK_ABORT("No children allowed.");
+            }
+
+            std::string sampleColorFilter(int index, std::string color) override {
+                SK_ABORT("No children allowed.");
+            }
+
+            std::string sampleBlender(int index, std::string src, std::string dst) override {
+                SK_ABORT("No children allowed.");
+            }
+
+            std::string toLinearSrgb(std::string color) override {
+                SK_ABORT("Color transform intrinsics not allowed.");
+            }
+
+            std::string fromLinearSrgb(std::string Color) override {
+                SK_ABORT("Color transform intrinsics not allowed.");
+            }
+
+            Impl*                 fSelf;
+            GrGLSLShaderBuilder*  fBuilder;
+            const char*           fMainName;
+            const SkSL::Context&  fContext;
+        };
+
+        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
+            const CustomMeshGP& cmgp = args.fGeomProc.cast<CustomMeshGP>();
+            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
+            GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
+            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
+            GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
+
+            ////// VS
+
+            // emit attributes
+            varyingHandler->emitAttributes(cmgp);
+
+            // Define the user's vert function.
+            SkString userVertName = vertBuilder->getMangledFunctionName("custom_mesh_vs");
+            const SkSL::Program* customVS = SkCustomMeshSpecificationPriv::VS(*cmgp.fSpec);
+            MeshCallbacks vsCallbacks(this, vertBuilder, userVertName.c_str(), *customVS->fContext);
+            SkSL::PipelineStage::ConvertProgram(*customVS,
+                                                /*sampleCoords=*/"",
+                                                /*inputColor=*/"",
+                                                /*destColor=*/"",
+                                                &vsCallbacks);
+
+            // Copy the individual attributes into a struct
+            vertBuilder->codeAppendf("%s attributes;",
+                                     vsCallbacks.getMangledName("Attributes").c_str());
+            size_t i = 0;
+            SkASSERT(cmgp.vertexAttributes().count() == (int)cmgp.fSpec->attributes().size());
+            for (auto attr : cmgp.vertexAttributes()) {
+                vertBuilder->codeAppendf("attributes.%s = %s;",
+                                         cmgp.fSpec->attributes()[i++].name.c_str(),
+                                         attr.name());
+            }
+
+            // Call the user's vert function.
+            vertBuilder->codeAppendf("%s varyings;",
+                                     vsCallbacks.getMangledName("Varyings").c_str());
+            vertBuilder->codeAppendf("float2 pos = %s(attributes, varyings);",
+                                     userVertName.c_str());
+
+            // Unpack the varyings from the struct into individual varyings.
+            std::vector<GrGLSLVarying> varyings;
+            varyings.reserve(SkCustomMeshSpecificationPriv::Varyings(*cmgp.fSpec).size());
+            for (const auto& v : SkCustomMeshSpecificationPriv::Varyings(*cmgp.fSpec)) {
+                varyings.emplace_back(SkCustomMeshSpecificationPriv::VaryingTypeAsSLType(v.type));
+                varyingHandler->addVarying(v.name.c_str(), &varyings.back());
+                vertBuilder->codeAppendf("%s = varyings.%s;",
+                                         varyings.back().vsOut(),
+                                         v.name.c_str());
+            }
+
+            // Setup position
+            WriteOutputPosition(vertBuilder,
+                                uniformHandler,
+                                *args.fShaderCaps,
+                                gpArgs,
+                                "pos",
+                                cmgp.fViewMatrix,
+                                &fViewMatrixUniform);
+
+            ////// FS
+
+            fragBuilder->codeAppendf("half4 %s;", args.fOutputColor);
+            fragBuilder->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
+
+            // Define the user's frag function.
+            SkString userFragName = fragBuilder->getMangledFunctionName("custom_mesh_fs");
+            const SkSL::Program* customFS = SkCustomMeshSpecificationPriv::FS(*cmgp.fSpec);
+            MeshCallbacks fsCallbacks(this, fragBuilder, userFragName.c_str(), *customFS->fContext);
+            SkSL::PipelineStage::ConvertProgram(*customFS,
+                                                /*sampleCoords=*/"",
+                                                /*inputColor=*/"",
+                                                /*destColor=*/"",
+                                                &fsCallbacks);
+
+            // Pack the varyings into a struct to call the user's frag code.
+            fragBuilder->codeAppendf("%s varyings;",
+                                     fsCallbacks.getMangledName("Varyings").c_str());
+            i = 0;
+            for (const auto& varying : SkCustomMeshSpecificationPriv::Varyings(*cmgp.fSpec)) {
+                fragBuilder->codeAppendf("varyings.%s = %s;",
+                                         varying.name.c_str(),
+                                         varyings[i++].vsOut());
+            }
+            SkCustomMeshSpecificationPriv::ColorType meshColorType =
+                    SkCustomMeshSpecificationPriv::GetColorType(*cmgp.fSpec);
+            const char* uniformColorName = nullptr;
+            if (cmgp.fColor != SK_PMColor4fILLEGAL) {
+                fColorUniform = uniformHandler->addUniform(nullptr,
+                                                           kFragment_GrShaderFlag,
+                                                           SkSLType::kHalf4,
+                                                           "color",
+                                                           &uniformColorName);
+            }
+            SkString localCoordAssignment;
+            if (SkCustomMeshSpecificationPriv::HasLocalCoords(*cmgp.fSpec) &&
+                cmgp.fNeedsLocalCoords) {
+                localCoordAssignment = "float2 local =";
+            }
+            if (meshColorType == SkCustomMeshSpecificationPriv::ColorType::kNone) {
+                fragBuilder->codeAppendf("%s %s(varyings);",
+                                         localCoordAssignment.c_str(),
+                                         userFragName.c_str());
+                SkASSERT(uniformColorName);
+                fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, uniformColorName);
+            } else {
+                fColorSpaceHelper.emitCode(uniformHandler,
+                                           cmgp.fColorSpaceXform.get(),
+                                           kFragment_GrShaderFlag);
+                if (meshColorType == SkCustomMeshSpecificationPriv::ColorType::kFloat4) {
+                    fragBuilder->codeAppendf("float4 color;");
+                } else {
+                    SkASSERT(meshColorType == SkCustomMeshSpecificationPriv::ColorType::kHalf4);
+                    fragBuilder->codeAppendf("half4 color;");
+                }
+
+                fragBuilder->codeAppendf("%s %s(varyings, color);",
+                                         localCoordAssignment.c_str(),
+                                         userFragName.c_str());
+                // We ignore the user's color if analysis told us to emit a specific color. The user
+                // color might be float4 and we expect a half4 in the colorspace helper.
+                const char* color = uniformColorName ? uniformColorName : "half4(color)";
+                SkString xformedColor;
+                fragBuilder->appendColorGamutXform(&xformedColor, color, &fColorSpaceHelper);
+                fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, xformedColor.c_str());
+            }
+            if (cmgp.fNeedsLocalCoords) {
+                if (SkCustomMeshSpecificationPriv::HasLocalCoords(*cmgp.fSpec)) {
+                    gpArgs->fLocalCoordVar = GrShaderVar("local", SkSLType::kFloat2);
+                    gpArgs->fLocalCoordShader = kFragment_GrShaderType;
+                } else {
+                    gpArgs->fLocalCoordVar = GrShaderVar("pos", SkSLType::kFloat2);
+                    gpArgs->fLocalCoordShader = kVertex_GrShaderType;
+                }
+            }
+        }
+
+    private:
+        SkMatrix fViewMatrix = SkMatrix::InvalidMatrix();
+
+        UniformHandle fViewMatrixUniform;
+        UniformHandle fColorUniform;
+
+        GrGLSLColorSpaceXformHelper fColorSpaceHelper;
+    };
+
+    CustomMeshGP(sk_sp<SkCustomMeshSpecification>    spec,
+                 sk_sp<GrColorSpaceXform>            colorSpaceXform,
+                 const SkMatrix&                     viewMatrix,
+                 const std::optional<SkPMColor4f>& color,
+                 bool                                needsLocalCoords)
+            : INHERITED(kVerticesGP_ClassID)
+            , fSpec(std::move(spec))
+            , fViewMatrix(viewMatrix)
+            , fColorSpaceXform(std::move(colorSpaceXform))
+            , fNeedsLocalCoords(needsLocalCoords) {
+        fColor = color.value_or(SK_PMColor4fILLEGAL);
+        for (const auto& srcAttr : fSpec->attributes()) {
+            fAttributes.emplace_back(
+                    srcAttr.name.c_str(),
+                    SkCustomMeshSpecificationPriv::AttrTypeAsVertexAttribType(srcAttr.type),
+                    SkCustomMeshSpecificationPriv::AttrTypeAsSLType(srcAttr.type),
+                    srcAttr.offset);
+        }
+        this->setVertexAttributes(fAttributes.data(), fAttributes.size(), fSpec->stride());
+    }
+
+    sk_sp<SkCustomMeshSpecification> fSpec;
+    std::vector<Attribute>           fAttributes;
+    SkMatrix                         fViewMatrix;
+    SkPMColor4f                      fColor;
+    sk_sp<GrColorSpaceXform>         fColorSpaceXform;
+    bool                             fNeedsLocalCoords;
+
+    using INHERITED = GrGeometryProcessor;
+};
+
+class CustomMeshOp final : public GrMeshDrawOp {
+private:
+    using Helper = GrSimpleMeshDrawOpHelper;
+
+public:
+    DEFINE_OP_CLASS_ID
+
+    CustomMeshOp(GrProcessorSet*,
+                 const SkPMColor4f&,
+                 SkCustomMesh,
+                 GrAAType,
+                 sk_sp<GrColorSpaceXform>,
+                 const SkMatrixProvider&);
+
+    CustomMeshOp(GrProcessorSet*,
+                 const SkPMColor4f&,
+                 sk_sp<SkVertices>,
+                 const GrPrimitiveType*,
+                 GrAAType,
+                 sk_sp<GrColorSpaceXform>,
+                 const SkMatrixProvider&);
+
+    const char* name() const override { return "CustomMeshOp"; }
+
+    void visitProxies(const GrVisitProxyFunc& func) const override {
+        if (fProgramInfo) {
+            fProgramInfo->visitFPProxies(func);
+        } else {
+            fHelper.visitProxies(func);
+        }
+    }
+
+    FixedFunctionFlags fixedFunctionFlags() const override;
+
+    GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrClampType) override;
+
+private:
+    GrProgramInfo* programInfo() override { return fProgramInfo; }
+
+    void onCreateProgramInfo(const GrCaps*,
+                             SkArenaAlloc*,
+                             const GrSurfaceProxyView& writeView,
+                             bool usesMSAASurface,
+                             GrAppliedClip&&,
+                             const GrDstProxyView&,
+                             GrXferBarrierFlags renderPassXferBarriers,
+                             GrLoadOp colorLoadOp) override;
+
+    void onPrepareDraws(GrMeshDrawTarget*) override;
+    void onExecute(GrOpFlushState*, const SkRect& chainBounds) override;
+#if GR_TEST_UTILS
+    SkString onDumpInfo() const override;
+#endif
+
+    GrGeometryProcessor* makeGP(SkArenaAlloc*);
+
+    CombineResult onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps&) override;
+
+    /**
+     * Built either from a SkCustomMesh or a SkVertices. In the former case the data is owned
+     * by Mesh and in the latter it is not. Meshes made from SkVertices can contain a SkMatrix
+     * to enable CPU-based transformation but Meshes made from SkCustomMesh cannot.
+     */
+    class Mesh {
+    public:
+        Mesh() = delete;
+        Mesh(const SkCustomMesh& cm);
+        Mesh(sk_sp<SkVertices>, const SkMatrix& viewMatrix);
+        Mesh(const Mesh&) = delete;
+        Mesh(Mesh&& m);
+
+        Mesh& operator=(const Mesh&) = delete;
+        Mesh& operator=(Mesh&&) = delete; // not used by SkSTArray but could be implemented.
+
+        ~Mesh();
+
+        bool isFromVertices() const { return SkToBool(fVertices); }
+
+        void writeVertices(skgpu::VertexWriter& writer,
+                           const SkCustomMeshSpecification& spec,
+                           bool transform) const;
+
+        int vertexCount() const {
+            return this->isFromVertices() ? fVertices->priv().vertexCount() : fCMData.vcount;
+        }
+
+        const uint16_t* indices() const {
+            return this->isFromVertices() ? fVertices->priv().indices() : fCMData.indices;
+        }
+
+        int indexCount() const {
+            return this->isFromVertices() ? fVertices->priv().indexCount() : fCMData.icount;
+        }
+
+    private:
+        struct CMData {
+            const char*     vb;
+            const uint16_t* indices;
+            int             vcount;
+            int             icount;
+        };
+
+        sk_sp<SkVertices> fVertices;
+
+        union {
+            SkMatrix fViewMatrix;
+            CMData   fCMData;
+        };
+    };
+
+    Helper                           fHelper;
+    sk_sp<SkCustomMeshSpecification> fSpecification;
+    bool                             fIgnoreSpecColor = false;
+    GrPrimitiveType                  fPrimitiveType;
+    SkSTArray<1, Mesh>               fMeshes;
+    sk_sp<GrColorSpaceXform>         fColorSpaceXform;
+    SkPMColor4f                      fColor; // Used if no color from spec or analysis overrides.
+    SkMatrix                         fViewMatrix;
+    int                              fVertexCount;
+    int                              fIndexCount;
+    GrSimpleMesh*                    fMesh = nullptr;
+    GrProgramInfo*                   fProgramInfo = nullptr;
+
+    using INHERITED = GrMeshDrawOp;
+};
+
+CustomMeshOp::Mesh::Mesh(const SkCustomMesh& cm) {
+    fCMData.vb       = SkCopyCustomMeshVB(cm).release();
+    fCMData.indices  = SkCopyCustomMeshIB(cm).release();
+    fCMData.vcount   = cm.vcount;
+    fCMData.icount   = cm.icount;
+}
+
+CustomMeshOp::Mesh::Mesh(sk_sp<SkVertices> vertices, const SkMatrix& viewMatrix)
+        : fVertices(std::move(vertices)), fViewMatrix(viewMatrix) {
+    SkASSERT(fVertices);
+}
+
+CustomMeshOp::Mesh::Mesh(Mesh&& m) {
+    fVertices = std::move(m.fVertices);
+    if (fVertices) {
+        fViewMatrix = m.fViewMatrix;
+    } else {
+        fCMData = m.fCMData;
+    }
+    m.fCMData.vb      = nullptr;
+    m.fCMData.indices = nullptr;
+}
+
+CustomMeshOp::Mesh::~Mesh() {
+    if (!this->isFromVertices()) {
+        delete[] fCMData.indices;
+        delete[] fCMData.vb;
+    }
+}
+
+void CustomMeshOp::Mesh::writeVertices(skgpu::VertexWriter& writer,
+                                       const SkCustomMeshSpecification& spec,
+                                       bool transform) const {
+    SkASSERT(!transform || this->isFromVertices());
+    if (this->isFromVertices()) {
+        int vertexCount = fVertices->priv().vertexCount();
+        for (int i = 0; i < vertexCount; ++i) {
+            SkPoint pos = fVertices->priv().positions()[i];
+            if (transform) {
+                SkASSERT(!fViewMatrix.hasPerspective());
+                fViewMatrix.mapPoints(&pos, 1);
+            }
+            writer << pos;
+            if (SkCustomMeshSpecificationPriv::HasColors(spec)) {
+                SkASSERT(fVertices->priv().hasColors());
+                writer << fVertices->priv().colors()[i];
+            }
+            if (SkCustomMeshSpecificationPriv::HasLocalCoords(spec)) {
+                SkASSERT(fVertices->priv().hasTexCoords());
+                writer << fVertices->priv().texCoords()[i];
+            }
+        }
+    } else {
+        writer << skgpu::VertexWriter::Array(fCMData.vb, spec.stride()*fCMData.vcount);
+    }
+}
+
+CustomMeshOp::CustomMeshOp(GrProcessorSet*          processorSet,
+                           const SkPMColor4f&       color,
+                           SkCustomMesh             cm,
+                           GrAAType                 aaType,
+                           sk_sp<GrColorSpaceXform> colorSpaceXform,
+                           const SkMatrixProvider&  matrixProvider)
+        : INHERITED(ClassID())
+        , fHelper(processorSet, aaType)
+        , fPrimitiveType(primitive_type(cm.mode))
+        , fColorSpaceXform(std::move(colorSpaceXform))
+        , fColor(color)
+        , fViewMatrix(matrixProvider.localToDevice()) {
+    fMeshes.emplace_back(cm);
+
+    fSpecification = std::move(cm.spec);
+
+    fVertexCount = fMeshes.back().vertexCount();
+    fIndexCount  = fMeshes.back().indexCount();
+
+    this->setTransformedBounds(cm.bounds, fViewMatrix, HasAABloat::kNo, IsHairline::kNo);
+}
+
+static sk_sp<SkCustomMeshSpecification> make_vertices_spec(bool hasColors, bool hasTex) {
+    using Attribute = SkCustomMeshSpecification::Attribute;
+    using Varying   = SkCustomMeshSpecification::Varying;
+    std::vector<Attribute> attributes;
+    attributes.reserve(3);
+    attributes.push_back({Attribute::Type::kFloat2, 0, SkString{"pos"}});
+    size_t size = 8;
+
+    std::vector<Varying> varyings;
+    attributes.reserve(2);
+
+    SkString vs("float2 main(Attributes a, out Varyings v) {\n");
+    SkString fs(hasTex ? "float2 " : "void ");
+
+    if (hasColors) {
+        attributes.push_back({Attribute::Type::kUByte4_unorm, size, SkString{"color"}});
+        varyings.push_back({Varying::Type::kHalf4, SkString{"color"}});
+        vs += "v.color = a.color;\n";
+        // Using float4 for the output color to work around skbug.com/12761
+        fs += "main(Varyings v, out float4 color) {\n"
+              "color = float4(v.color.bgr*v.color.a, v.color.a);\n";
+        size += 4;
+    } else {
+        fs += "main(Varyings v) {\n";
+    }
+
+    if (hasTex) {
+        attributes.push_back({Attribute::Type::kFloat2, size, SkString{"tex"}});
+        varyings.push_back({Varying::Type::kFloat2, SkString{"tex"}});
+        vs += "v.tex = a.tex;\n";
+        fs += "return v.tex;\n";
+        size += 8;
+    }
+    vs += "return a.pos;\n}";
+    fs += "}";
+    auto [spec, error] = SkCustomMeshSpecification::Make(
+            SkMakeSpan(attributes),
+            size,
+            SkMakeSpan(varyings),
+            vs,
+            fs);
+    SkASSERT(spec);
+    return spec;
+}
+
+CustomMeshOp::CustomMeshOp(GrProcessorSet*          processorSet,
+                           const SkPMColor4f&       color,
+                           sk_sp<SkVertices>        vertices,
+                           const GrPrimitiveType*   overridePrimitiveType,
+                           GrAAType                 aaType,
+                           sk_sp<GrColorSpaceXform> colorSpaceXform,
+                           const SkMatrixProvider&  matrixProvider)
+        : INHERITED(ClassID())
+        , fHelper(processorSet, aaType)
+        , fColorSpaceXform(std::move(colorSpaceXform))
+        , fColor(color)
+        , fViewMatrix(matrixProvider.localToDevice()) {
+    int attrs = (vertices->priv().hasColors()    ? 0b01 : 0b00) |
+                (vertices->priv().hasTexCoords() ? 0b10 : 0b00);
+    switch (attrs) {
+        case 0b00: {
+            static const auto kSpec = make_vertices_spec(false, false);
+            fSpecification = kSpec;
+            break;
+        }
+        case 0b01: {
+            static const auto kSpec = make_vertices_spec(true, false);
+            fSpecification = kSpec;
+            break;
+        }
+        case 0b10: {
+            static const auto kSpec = make_vertices_spec(false, true);
+            fSpecification = kSpec;
+            break;
+        }
+        case 0b11: {
+            static const auto kSpec = make_vertices_spec(true, true);
+            fSpecification = kSpec;
+            break;
+        }
+    }
+    SkASSERT(fSpecification);
+
+    if (overridePrimitiveType) {
+        fPrimitiveType = *overridePrimitiveType;
+    } else {
+        switch (vertices->priv().mode()) {
+            case SkVertices::kTriangles_VertexMode:
+                fPrimitiveType = GrPrimitiveType::kTriangles;
+                break;
+            case SkVertices::kTriangleStrip_VertexMode:
+                fPrimitiveType = GrPrimitiveType::kTriangleStrip;
+                break;
+            case SkVertices::kTriangleFan_VertexMode:
+                SkUNREACHABLE;
+        }
+    }
+
+    IsHairline isHairline = IsHairline::kNo;
+    if (GrIsPrimTypeLines(fPrimitiveType) || fPrimitiveType == GrPrimitiveType::kPoints) {
+        isHairline = IsHairline::kYes;
+    }
+    this->setTransformedBounds(vertices->bounds(), fViewMatrix, HasAABloat::kNo, isHairline);
+
+    fMeshes.emplace_back(std::move(vertices), fViewMatrix);
+
+    fVertexCount = fMeshes.back().vertexCount();
+    fIndexCount  = fMeshes.back().indexCount();
+}
+
+#if GR_TEST_UTILS
+SkString CustomMeshOp::onDumpInfo() const { return {}; }
+#endif
+
+GrDrawOp::FixedFunctionFlags CustomMeshOp::fixedFunctionFlags() const {
+    return fHelper.fixedFunctionFlags();
+}
+
+GrProcessorSet::Analysis CustomMeshOp::finalize(const GrCaps& caps,
+                                                const GrAppliedClip* clip,
+                                                GrClampType clampType) {
+    GrProcessorAnalysisColor gpColor;
+    gpColor.setToUnknown();
+    auto result = fHelper.finalizeProcessors(caps,
+                                             clip,
+                                             clampType,
+                                             GrProcessorAnalysisCoverage::kNone,
+                                             &gpColor);
+    if (gpColor.isConstant(&fColor)) {
+        fIgnoreSpecColor = true;
+    }
+    return result;
+}
+
+GrGeometryProcessor* CustomMeshOp::makeGP(SkArenaAlloc* arena) {
+    std::optional<SkPMColor4f> color;
+    if (fIgnoreSpecColor || !SkCustomMeshSpecificationPriv::HasColors(*fSpecification)) {
+        color.emplace(fColor);
+    }
+    // Check if we're pre-transforming the vertices on the CPU.
+    const SkMatrix& vm = fViewMatrix == SkMatrix::InvalidMatrix() ? SkMatrix::I() : fViewMatrix;
+    return CustomMeshGP::Make(arena,
+                              fSpecification,
+                              fColorSpaceXform,
+                              vm,
+                              color,
+                              fHelper.usesLocalCoords());
+}
+
+void CustomMeshOp::onCreateProgramInfo(const GrCaps* caps,
+                                       SkArenaAlloc* arena,
+                                       const GrSurfaceProxyView& writeView,
+                                       bool usesMSAASurface,
+                                       GrAppliedClip&& appliedClip,
+                                       const GrDstProxyView& dstProxyView,
+                                       GrXferBarrierFlags renderPassXferBarriers,
+                                       GrLoadOp colorLoadOp) {
+    fProgramInfo = fHelper.createProgramInfo(caps,
+                                             arena,
+                                             writeView,
+                                             usesMSAASurface,
+                                             std::move(appliedClip),
+                                             dstProxyView,
+                                             this->makeGP(arena),
+                                             fPrimitiveType,
+                                             renderPassXferBarriers,
+                                             colorLoadOp);
+}
+
+void CustomMeshOp::onPrepareDraws(GrMeshDrawTarget* target) {
+    size_t vertexStride = fSpecification->stride();
+    sk_sp<const GrBuffer> vertexBuffer;
+    int firstVertex = 0;
+    skgpu::VertexWriter verts = target->makeVertexWriter(vertexStride,
+                                                         fVertexCount,
+                                                         &vertexBuffer,
+                                                         &firstVertex);
+    if (!verts) {
+        SkDebugf("Could not allocate vertices.\n");
+        return;
+    }
+
+    bool transform = fViewMatrix == SkMatrix::InvalidMatrix();
+    for (const auto& m : fMeshes) {
+        m.writeVertices(verts, *fSpecification, transform);
+    }
+
+    sk_sp<const GrBuffer> indexBuffer;
+    int firstIndex = 0;
+    uint16_t* indices = nullptr;
+    if (fIndexCount) {
+        indices = target->makeIndexSpace(fIndexCount, &indexBuffer, &firstIndex);
+        if (!indices) {
+            SkDebugf("Could not allocate indices.\n");
+            return;
+        }
+        // We can just copy the first mesh's indices. Subsequent meshes need their indices adjusted.
+        std::copy_n(fMeshes[0].indices(), fMeshes[0].indexCount(), indices);
+        int voffset = fMeshes[0].vertexCount();
+        int ioffset = fMeshes[0].indexCount();
+        for (size_t m = 1; m < fMeshes.size(); ++m) {
+            for (int i = 0; i < fMeshes[m].indexCount(); ++i) {
+                indices[ioffset++] = fMeshes[m].indices()[i] + voffset;
+            }
+            voffset += fMeshes[m].vertexCount();
+        }
+        SkASSERT(voffset == fVertexCount);
+        SkASSERT(ioffset == fIndexCount);
+    }
+
+    SkASSERT(!fMesh);
+    fMesh = target->allocMesh();
+
+    if (indices) {
+        fMesh->setIndexed(std::move(indexBuffer),
+                          fIndexCount,
+                          firstIndex,
+                          /*minIndexValue=*/0,
+                          fVertexCount,
+                          GrPrimitiveRestart::kNo,
+                          std::move(vertexBuffer),
+                          firstVertex);
+    } else {
+        fMesh->set(std::move(vertexBuffer), fVertexCount, firstVertex);
+    }
+}
+
+void CustomMeshOp::onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) {
+    if (!fProgramInfo) {
+        this->createProgramInfo(flushState);
+    }
+
+    if (!fProgramInfo || !fMesh) {
+        return;
+    }
+
+    flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
+    flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
+    flushState->drawMesh(*fMesh);
+}
+
+GrOp::CombineResult CustomMeshOp::onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps& caps) {
+    auto that = t->cast<CustomMeshOp>();
+
+    // Check for a combinable primitive type.
+    if (!(fPrimitiveType == GrPrimitiveType::kTriangles ||
+          fPrimitiveType == GrPrimitiveType::kLines     ||
+          fPrimitiveType == GrPrimitiveType::kPoints)) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (fPrimitiveType != that->fPrimitiveType) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (SkToBool(fIndexCount) != SkToBool(that->fIndexCount)) {
+        return CombineResult::kCannotCombine;
+    }
+    if (SkToBool(fIndexCount) && fVertexCount + that->fVertexCount > SkToInt(UINT16_MAX)) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (SkCustomMeshSpecificationPriv::Hash(*this->fSpecification) !=
+        SkCustomMeshSpecificationPriv::Hash(*that->fSpecification)) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (!SkCustomMeshSpecificationPriv::HasColors(*fSpecification) && fColor != that->fColor) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (!fHelper.isCompatible(that->fHelper, caps, this->bounds(), that->bounds())) {
+        return CombineResult::kCannotCombine;
+    }
+
+    if (fViewMatrix != that->fViewMatrix) {
+        if (!fMeshes[0].isFromVertices() || !that->fMeshes[0].isFromVertices()) {
+            // We don't know how to CPU transform actual custom meshes on CPU.
+            return CombineResult::kCannotCombine;
+        }
+        // If we use local coords and the local coords come from positions then we can't pre-
+        // transform the positions on the CPU.
+        if (fHelper.usesLocalCoords() &&
+            !SkCustomMeshSpecificationPriv::HasLocalCoords(*fSpecification)) {
+            return CombineResult::kCannotCombine;
+        }
+        // We only support two-component position attributes. This means we would not get
+        // perspective-correct interpolation of attributes if we transform on the CPU.
+        if ((this->fViewMatrix.isFinite() && this->fViewMatrix.hasPerspective()) ||
+            (that->fViewMatrix.isFinite() && that->fViewMatrix.hasPerspective())) {
+            return CombineResult::kCannotCombine;
+        }
+        // This is how we record that we must CPU-transform the vertices.
+        fViewMatrix = SkMatrix::InvalidMatrix();
+    }
+
+    // NOTE: The source color space is part of the spec, and the destination gamut is determined by
+    // the render target context. A mis-match should be impossible.
+    SkASSERT(GrColorSpaceXform::Equals(fColorSpaceXform.get(), that->fColorSpaceXform.get()));
+
+    fMeshes.move_back_n(that->fMeshes.count(), that->fMeshes.begin());
+    fVertexCount += that->fVertexCount;
+    fIndexCount  += that->fIndexCount;
+    return CombineResult::kMerged;
+}
+
+}  // anonymous namespace
+
+namespace skgpu::v1::DrawCustomMeshOp {
+
+GrOp::Owner Make(GrRecordingContext* context,
+                 GrPaint&& paint,
+                 SkCustomMesh cm,
+                 const SkMatrixProvider& matrixProvider,
+                 GrAAType aaType,
+                 sk_sp<GrColorSpaceXform> colorSpaceXform) {
+    return GrSimpleMeshDrawOpHelper::FactoryHelper<CustomMeshOp>(context,
+                                                                 std::move(paint),
+                                                                 std::move(cm),
+                                                                 aaType,
+                                                                 std::move(colorSpaceXform),
+                                                                 matrixProvider);
+}
+
+GrOp::Owner Make(GrRecordingContext* context,
+                 GrPaint&& paint,
+                 sk_sp<SkVertices> vertices,
+                 const GrPrimitiveType* overridePrimitiveType,
+                 const SkMatrixProvider& matrixProvider,
+                 GrAAType aaType,
+                 sk_sp<GrColorSpaceXform> colorSpaceXform) {
+    return GrSimpleMeshDrawOpHelper::FactoryHelper<CustomMeshOp>(context,
+                                                                 std::move(paint),
+                                                                 std::move(vertices),
+                                                                 overridePrimitiveType,
+                                                                 aaType,
+                                                                 std::move(colorSpaceXform),
+                                                                 matrixProvider);
+}
+
+}  // namespace skgpu::v1::DrawCustomMeshOp
diff --git a/third_party/skia/src/gpu/ops/DrawCustomMeshOp.h b/third_party/skia/src/gpu/ops/DrawCustomMeshOp.h
new file mode 100644
index 0000000000000..1e10ecf624bbe
--- /dev/null
+++ b/third_party/skia/src/gpu/ops/DrawCustomMeshOp.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef DrawCustomMeshOp_DEFINED
+#define DrawCustomMeshOp_DEFINED
+
+#include "include/core/SkCanvas.h"
+#include "include/core/SkCustomMesh.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/gpu/ops/GrOp.h"
+
+class GrColorSpaceXform;
+class GrPaint;
+class GrRecordingContext;
+class SkMatrixProvider;
+
+namespace skgpu::v1::DrawCustomMeshOp {
+GrOp::Owner Make(GrRecordingContext*,
+                 GrPaint&&,
+                 SkCustomMesh,
+                 const SkMatrixProvider&,
+                 GrAAType,
+                 sk_sp<GrColorSpaceXform>);
+
+GrOp::Owner Make(GrRecordingContext*,
+                 GrPaint&&,
+                 sk_sp<SkVertices>,
+                 const GrPrimitiveType* overridePrimitiveType,
+                 const SkMatrixProvider&,
+                 GrAAType,
+                 sk_sp<GrColorSpaceXform>);
+}  // namespace skgpu::v1::DrawCustomMeshOp
+
+#endif  // DrawCustomMeshOp_DEFINED
diff --git a/third_party/skia/src/gpu/ops/DrawVerticesOp.cpp b/third_party/skia/src/gpu/ops/DrawVerticesOp.cpp
deleted file mode 100644
index 3955a1db67cb4..0000000000000
--- a/third_party/skia/src/gpu/ops/DrawVerticesOp.cpp
+++ /dev/null
@@ -1,737 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "src/gpu/ops/DrawVerticesOp.h"
-
-#include "include/core/SkM44.h"
-#include "src/core/SkArenaAlloc.h"
-#include "src/core/SkDevice.h"
-#include "src/core/SkMatrixPriv.h"
-#include "src/core/SkVerticesPriv.h"
-#include "src/gpu/BufferWriter.h"
-#include "src/gpu/GrGeometryProcessor.h"
-#include "src/gpu/GrOpFlushState.h"
-#include "src/gpu/GrProgramInfo.h"
-#include "src/gpu/SkGr.h"
-#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
-#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
-#include "src/gpu/glsl/GrGLSLVarying.h"
-#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
-#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
-
-namespace skgpu::v1::DrawVerticesOp {
-
-namespace {
-
-enum class ColorArrayType {
-    kUnused,
-    kPremulGrColor,
-    kSkColor,
-};
-
-enum class LocalCoordsType {
-    kUnused,
-    kUsePosition,
-    kExplicit,
-};
-
-class VerticesGP : public GrGeometryProcessor {
-public:
-    static GrGeometryProcessor* Make(SkArenaAlloc* arena,
-                                     LocalCoordsType localCoordsType,
-                                     ColorArrayType colorArrayType,
-                                     const SkPMColor4f& color,
-                                     sk_sp<GrColorSpaceXform> colorSpaceXform,
-                                     const SkMatrix& viewMatrix) {
-        return arena->make([&](void* ptr) {
-            return new (ptr) VerticesGP(localCoordsType, colorArrayType, color,
-                                        std::move(colorSpaceXform), viewMatrix);
-        });
-    }
-
-    const char* name() const override { return "VerticesGP"; }
-
-    const Attribute& positionAttr() const { return fAttributes[kPositionIndex]; }
-    const Attribute& colorAttr() const { return fAttributes[kColorIndex]; }
-    const Attribute& localCoordsAttr() const { return fAttributes[kLocalCoordsIndex]; }
-
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
-        uint32_t key = 0;
-        key |= (fColorArrayType == ColorArrayType::kSkColor) ? 0x1 : 0;
-        key |= ProgramImpl::ComputeMatrixKey(caps, fViewMatrix) << 20;
-        b->add32(key);
-        b->add32(GrColorSpaceXform::XformKey(fColorSpaceXform.get()));
-    }
-
-    std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const override {
-        return std::make_unique<Impl>();
-    }
-
-private:
-    class Impl : public ProgramImpl {
-    public:
-        void setData(const GrGLSLProgramDataManager& pdman,
-                     const GrShaderCaps& shaderCaps,
-                     const GrGeometryProcessor& geomProc) override {
-            const VerticesGP& vgp = geomProc.cast<VerticesGP>();
-
-            SetTransform(pdman, shaderCaps, fViewMatrixUniform, vgp.fViewMatrix, &fViewMatrix);
-
-            if (!vgp.colorAttr().isInitialized() && vgp.fColor != fColor) {
-                pdman.set4fv(fColorUniform, 1, vgp.fColor.vec());
-                fColor = vgp.fColor;
-            }
-
-            fColorSpaceHelper.setData(pdman, vgp.fColorSpaceXform.get());
-        }
-
-    private:
-        void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
-            const VerticesGP& gp = args.fGeomProc.cast<VerticesGP>();
-            GrGLSLVertexBuilder* vertBuilder = args.fVertBuilder;
-            GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
-            GrGLSLVaryingHandler* varyingHandler = args.fVaryingHandler;
-            GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
-
-            // emit attributes
-            varyingHandler->emitAttributes(gp);
-
-            fColorSpaceHelper.emitCode(uniformHandler, gp.fColorSpaceXform.get(),
-                                       kVertex_GrShaderFlag);
-
-            // Setup pass through color
-            fragBuilder->codeAppendf("half4 %s;", args.fOutputColor);
-            if (gp.colorAttr().isInitialized()) {
-                GrGLSLVarying varying(kHalf4_GrSLType);
-                varyingHandler->addVarying("color", &varying);
-                vertBuilder->codeAppendf("half4 color = %s;", gp.colorAttr().name());
-
-                // For SkColor, do a red/blue swap, possible color space conversion, and premul
-                if (gp.fColorArrayType == ColorArrayType::kSkColor) {
-                    vertBuilder->codeAppend("color = color.bgra;");
-
-                    SkString xformedColor;
-                    vertBuilder->appendColorGamutXform(&xformedColor, "color", &fColorSpaceHelper);
-                    vertBuilder->codeAppendf("color = %s;", xformedColor.c_str());
-
-                    vertBuilder->codeAppend("color = half4(color.rgb * color.a, color.a);");
-                }
-
-                vertBuilder->codeAppendf("%s = color;\n", varying.vsOut());
-                fragBuilder->codeAppendf("%s = %s;", args.fOutputColor, varying.fsIn());
-            } else {
-                this->setupUniformColor(fragBuilder, uniformHandler, args.fOutputColor,
-                                        &fColorUniform);
-            }
-
-            // Setup position
-            WriteOutputPosition(vertBuilder,
-                                uniformHandler,
-                                *args.fShaderCaps,
-                                gpArgs,
-                                gp.positionAttr().name(),
-                                gp.fViewMatrix,
-                                &fViewMatrixUniform);
-
-            // emit transforms using either explicit local coords or positions
-            const auto& coordsAttr = gp.localCoordsAttr().isInitialized() ? gp.localCoordsAttr()
-                                                                          : gp.positionAttr();
-            gpArgs->fLocalCoordVar = coordsAttr.asShaderVar();
-
-            fragBuilder->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
-        }
-
-    private:
-        SkMatrix fViewMatrix = SkMatrix::InvalidMatrix();
-        SkPMColor4f fColor   = SK_PMColor4fILLEGAL;
-
-        UniformHandle fViewMatrixUniform;
-        UniformHandle fColorUniform;
-
-        GrGLSLColorSpaceXformHelper fColorSpaceHelper;
-    };
-
-    VerticesGP(LocalCoordsType localCoordsType,
-               ColorArrayType colorArrayType,
-               const SkPMColor4f& color,
-               sk_sp<GrColorSpaceXform> colorSpaceXform,
-               const SkMatrix& viewMatrix)
-            : INHERITED(kVerticesGP_ClassID)
-            , fColorArrayType(colorArrayType)
-            , fColor(color)
-            , fViewMatrix(viewMatrix)
-            , fColorSpaceXform(std::move(colorSpaceXform)) {
-        constexpr Attribute missingAttr;
-        fAttributes.push_back({"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType});
-        fAttributes.push_back(fColorArrayType != ColorArrayType::kUnused
-                                      ? MakeColorAttribute("inColor", false)
-                                      : missingAttr);
-        fAttributes.push_back(localCoordsType == LocalCoordsType::kExplicit
-                        ? Attribute{"inLocalCoord", kFloat2_GrVertexAttribType, kFloat2_GrSLType}
-                        : missingAttr);
-
-        this->setVertexAttributes(fAttributes.data(), fAttributes.size());
-    }
-
-    enum {
-        kPositionIndex    = 0,
-        kColorIndex       = 1,
-        kLocalCoordsIndex = 2,
-    };
-
-    std::vector<Attribute> fAttributes;
-    ColorArrayType fColorArrayType;
-    SkPMColor4f fColor;
-    SkMatrix fViewMatrix;
-    sk_sp<GrColorSpaceXform> fColorSpaceXform;
-
-    using INHERITED = GrGeometryProcessor;
-};
-
-class DrawVerticesOpImpl final : public GrMeshDrawOp {
-private:
-    using Helper = GrSimpleMeshDrawOpHelper;
-
-public:
-    DEFINE_OP_CLASS_ID
-
-    DrawVerticesOpImpl(GrProcessorSet*,
-                       const SkPMColor4f&,
-                       sk_sp<SkVertices>,
-                       GrPrimitiveType,
-                       GrAAType,
-                       sk_sp<GrColorSpaceXform>,
-                       const SkMatrixProvider&);
-
-    const char* name() const override { return "DrawVerticesOp"; }
-
-    void visitProxies(const GrVisitProxyFunc& func) const override {
-        if (fProgramInfo) {
-            fProgramInfo->visitFPProxies(func);
-        } else {
-            fHelper.visitProxies(func);
-        }
-    }
-
-    FixedFunctionFlags fixedFunctionFlags() const override;
-
-    GrProcessorSet::Analysis finalize(const GrCaps&, const GrAppliedClip*, GrClampType) override;
-
-private:
-    GrProgramInfo* programInfo() override { return fProgramInfo; }
-
-    void onCreateProgramInfo(const GrCaps*,
-                             SkArenaAlloc*,
-                             const GrSurfaceProxyView& writeView,
-                             bool usesMSAASurface,
-                             GrAppliedClip&&,
-                             const GrDstProxyView&,
-                             GrXferBarrierFlags renderPassXferBarriers,
-                             GrLoadOp colorLoadOp) override;
-
-    void onPrepareDraws(GrMeshDrawTarget*) override;
-    void onExecute(GrOpFlushState*, const SkRect& chainBounds) override;
-#if GR_TEST_UTILS
-    SkString onDumpInfo() const override;
-#endif
-
-    GrGeometryProcessor* makeGP(SkArenaAlloc*);
-
-    GrPrimitiveType primitiveType() const { return fPrimitiveType; }
-    bool combinablePrimitive() const {
-        return GrPrimitiveType::kTriangles == fPrimitiveType ||
-               GrPrimitiveType::kLines == fPrimitiveType ||
-               GrPrimitiveType::kPoints == fPrimitiveType;
-    }
-
-    CombineResult onCombineIfPossible(GrOp* t, SkArenaAlloc*, const GrCaps&) override;
-
-    struct Mesh {
-        SkPMColor4f fColor;  // Used if this->hasPerVertexColors() is false.
-        sk_sp<SkVertices> fVertices;
-        SkMatrix fViewMatrix;
-        bool fIgnoreColors;
-
-        bool hasPerVertexColors() const {
-            return fVertices->priv().hasColors() && !fIgnoreColors;
-        }
-    };
-
-    bool isIndexed() const {
-        // Consistency enforced in onCombineIfPossible.
-        return fMeshes[0].fVertices->priv().hasIndices();
-    }
-
-    bool requiresPerVertexColors() const {
-        return fColorArrayType != ColorArrayType::kUnused;
-    }
-
-    bool requiresPerVertexLocalCoords() const {
-        return fLocalCoordsType == LocalCoordsType::kExplicit;
-    }
-
-    size_t vertexStride() const {
-        return sizeof(SkPoint) +
-               (this->requiresPerVertexColors() ? sizeof(uint32_t) : 0) +
-               (this->requiresPerVertexLocalCoords() ? sizeof(SkPoint) : 0);
-    }
-
-    Helper fHelper;
-    SkSTArray<1, Mesh, true> fMeshes;
-    // GrPrimitiveType is more expressive than fVertices.mode() so it is used instead and we ignore
-    // the SkVertices mode (though fPrimitiveType may have been inferred from it).
-    GrPrimitiveType fPrimitiveType;
-    int fVertexCount;
-    int fIndexCount;
-    bool fMultipleViewMatrices;
-    LocalCoordsType fLocalCoordsType;
-    ColorArrayType fColorArrayType;
-    sk_sp<GrColorSpaceXform> fColorSpaceXform;
-
-    GrSimpleMesh*  fMesh = nullptr;
-    GrProgramInfo* fProgramInfo = nullptr;
-
-    using INHERITED = GrMeshDrawOp;
-};
-
-DrawVerticesOpImpl::DrawVerticesOpImpl(GrProcessorSet* processorSet,
-                                       const SkPMColor4f& color,
-                                       sk_sp<SkVertices> vertices,
-                                       GrPrimitiveType primitiveType,
-                                       GrAAType aaType,
-                                       sk_sp<GrColorSpaceXform> colorSpaceXform,
-                                       const SkMatrixProvider& matrixProvider)
-        : INHERITED(ClassID())
-        , fHelper(processorSet, aaType)
-        , fPrimitiveType(primitiveType)
-        , fMultipleViewMatrices(false)
-        , fColorSpaceXform(std::move(colorSpaceXform)) {
-    SkASSERT(vertices);
-
-    SkVerticesPriv info(vertices->priv());
-
-    fVertexCount = info.vertexCount();
-    fIndexCount = info.indexCount();
-    fColorArrayType = info.hasColors() ? ColorArrayType::kSkColor
-                                       : ColorArrayType::kUnused;
-    fLocalCoordsType = info.hasTexCoords() ? LocalCoordsType::kExplicit
-                                           : LocalCoordsType::kUsePosition;
-
-    Mesh& mesh = fMeshes.push_back();
-    mesh.fColor = color;
-    mesh.fViewMatrix = matrixProvider.localToDevice();
-    mesh.fVertices = std::move(vertices);
-    mesh.fIgnoreColors = false;
-
-    IsHairline zeroArea;
-    if (GrIsPrimTypeLines(primitiveType) || GrPrimitiveType::kPoints == primitiveType) {
-        zeroArea = IsHairline::kYes;
-    } else {
-        zeroArea = IsHairline::kNo;
-    }
-
-    this->setTransformedBounds(mesh.fVertices->bounds(),
-                                mesh.fViewMatrix,
-                                HasAABloat::kNo,
-                                zeroArea);
-}
-
-#if GR_TEST_UTILS
-SkString DrawVerticesOpImpl::onDumpInfo() const {
-    return SkStringPrintf("PrimType: %d, MeshCount %d, VCount: %d, ICount: %d\n%s",
-                          (int)fPrimitiveType, fMeshes.count(), fVertexCount, fIndexCount,
-                          fHelper.dumpInfo().c_str());
-}
-#endif
-
-GrDrawOp::FixedFunctionFlags DrawVerticesOpImpl::fixedFunctionFlags() const {
-    return fHelper.fixedFunctionFlags();
-}
-
-GrProcessorSet::Analysis DrawVerticesOpImpl::finalize(const GrCaps& caps,
-                                                      const GrAppliedClip* clip,
-                                                      GrClampType clampType) {
-    GrProcessorAnalysisColor gpColor;
-    if (this->requiresPerVertexColors()) {
-        gpColor.setToUnknown();
-    } else {
-        gpColor.setToConstant(fMeshes.front().fColor);
-    }
-    auto result = fHelper.finalizeProcessors(caps, clip, clampType,
-                                             GrProcessorAnalysisCoverage::kNone, &gpColor);
-    if (gpColor.isConstant(&fMeshes.front().fColor)) {
-        fMeshes.front().fIgnoreColors = true;
-        fColorArrayType = ColorArrayType::kUnused;
-    }
-    if (!fHelper.usesLocalCoords()) {
-        fLocalCoordsType = LocalCoordsType::kUnused;
-    }
-    return result;
-}
-
-GrGeometryProcessor* DrawVerticesOpImpl::makeGP(SkArenaAlloc* arena) {
-    const SkMatrix& vm = fMultipleViewMatrices ? SkMatrix::I() : fMeshes[0].fViewMatrix;
-
-    sk_sp<GrColorSpaceXform> csxform =
-            (fColorArrayType == ColorArrayType::kSkColor) ? fColorSpaceXform : nullptr;
-
-    auto gp = VerticesGP::Make(arena, fLocalCoordsType, fColorArrayType, fMeshes[0].fColor,
-                               std::move(csxform), vm);
-    SkASSERT(this->vertexStride() == gp->vertexStride());
-    return gp;
-}
-
-void DrawVerticesOpImpl::onCreateProgramInfo(const GrCaps* caps,
-                                             SkArenaAlloc* arena,
-                                             const GrSurfaceProxyView& writeView,
-                                             bool usesMSAASurface,
-                                             GrAppliedClip&& appliedClip,
-                                             const GrDstProxyView& dstProxyView,
-                                             GrXferBarrierFlags renderPassXferBarriers,
-                                             GrLoadOp colorLoadOp) {
-    GrGeometryProcessor* gp = this->makeGP(arena);
-    fProgramInfo = fHelper.createProgramInfo(caps, arena, writeView, usesMSAASurface,
-                                             std::move(appliedClip), dstProxyView, gp,
-                                             this->primitiveType(), renderPassXferBarriers,
-                                             colorLoadOp);
-}
-
-void DrawVerticesOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
-    // Allocate buffers.
-    size_t vertexStride = this->vertexStride();
-    sk_sp<const GrBuffer> vertexBuffer;
-    int firstVertex = 0;
-    VertexWriter verts{
-            target->makeVertexSpace(vertexStride, fVertexCount, &vertexBuffer, &firstVertex)};
-    if (!verts) {
-        SkDebugf("Could not allocate vertices\n");
-        return;
-    }
-
-    sk_sp<const GrBuffer> indexBuffer;
-    int firstIndex = 0;
-    uint16_t* indices = nullptr;
-    if (this->isIndexed()) {
-        indices = target->makeIndexSpace(fIndexCount, &indexBuffer, &firstIndex);
-        if (!indices) {
-            SkDebugf("Could not allocate indices\n");
-            return;
-        }
-    }
-
-    // Copy data into the buffers.
-    bool hasColorAttribute = this->requiresPerVertexColors();
-    bool hasLocalCoordsAttribute = this->requiresPerVertexLocalCoords();
-    int vertexOffset = 0;
-
-    for (const auto& mesh : fMeshes) {
-        SkVerticesPriv info(mesh.fVertices->priv());
-
-        // Copy data into the index buffer.
-        if (indices) {
-            int indexCount = info.indexCount();
-            for (int i = 0; i < indexCount; ++i) {
-                *indices++ = info.indices()[i] + vertexOffset;
-            }
-        }
-
-        // Copy data into the vertex buffer.
-        int vertexCount = info.vertexCount();
-        const SkPoint* positions = info.positions();
-        const SkColor* colors = info.colors();
-        const SkPoint* localCoords = info.texCoords() ? info.texCoords() : positions;
-
-        // TODO4F: Preserve float colors
-        GrColor meshColor = mesh.fColor.toBytes_RGBA();
-
-        SkPoint* posBase = (SkPoint*)verts.ptr();
-
-        for (int i = 0; i < vertexCount; ++i) {
-            verts << positions[i];
-            if (hasColorAttribute) {
-                verts << (mesh.hasPerVertexColors() ? colors[i] : meshColor);
-            }
-            if (hasLocalCoordsAttribute) {
-                verts << localCoords[i];
-            }
-        }
-
-        if (fMultipleViewMatrices) {
-            SkASSERT(!mesh.fViewMatrix.hasPerspective());
-            SkMatrixPriv::MapPointsWithStride(mesh.fViewMatrix, posBase, vertexStride,
-                                              positions, sizeof(SkPoint), vertexCount);
-        }
-
-        vertexOffset += vertexCount;
-    }
-
-    SkASSERT(!fMesh);
-    fMesh = target->allocMesh();
-    if (this->isIndexed()) {
-        fMesh->setIndexed(std::move(indexBuffer), fIndexCount, firstIndex, 0, fVertexCount - 1,
-                         GrPrimitiveRestart::kNo, std::move(vertexBuffer), firstVertex);
-    } else {
-        fMesh->set(std::move(vertexBuffer), fVertexCount, firstVertex);
-    }
-}
-
-void DrawVerticesOpImpl::onExecute(GrOpFlushState* flushState, const SkRect& chainBounds) {
-    if (!fProgramInfo) {
-        this->createProgramInfo(flushState);
-    }
-
-    if (!fProgramInfo || !fMesh) {
-        return;
-    }
-
-    flushState->bindPipelineAndScissorClip(*fProgramInfo, chainBounds);
-    flushState->bindTextures(fProgramInfo->geomProc(), nullptr, fProgramInfo->pipeline());
-    flushState->drawMesh(*fMesh);
-}
-
-GrOp::CombineResult DrawVerticesOpImpl::onCombineIfPossible(GrOp* t,
-                                                            SkArenaAlloc*,
-                                                            const GrCaps& caps) {
-    auto that = t->cast<DrawVerticesOpImpl>();
-
-    if (!fHelper.isCompatible(that->fHelper, caps, this->bounds(), that->bounds())) {
-        return CombineResult::kCannotCombine;
-    }
-
-    if (!this->combinablePrimitive() || this->primitiveType() != that->primitiveType()) {
-        return CombineResult::kCannotCombine;
-    }
-
-    if (this->isIndexed() != that->isIndexed()) {
-        return CombineResult::kCannotCombine;
-    }
-
-    if (fVertexCount + that->fVertexCount > SkTo<int>(UINT16_MAX)) {
-        return CombineResult::kCannotCombine;
-    }
-
-    // We can't mix draws that use SkColor vertex colors with those that don't. We can mix uniform
-    // color draws with GrColor draws (by expanding the uniform color into vertex color).
-    if ((fColorArrayType == ColorArrayType::kSkColor) !=
-        (that->fColorArrayType == ColorArrayType::kSkColor)) {
-        return CombineResult::kCannotCombine;
-    }
-
-    // If we're acquiring a mesh with a different view matrix, or an op that needed multiple view
-    // matrices, we need multiple view matrices.
-    bool needMultipleViewMatrices =
-            fMultipleViewMatrices || that->fMultipleViewMatrices ||
-            !SkMatrixPriv::CheapEqual(this->fMeshes[0].fViewMatrix, that->fMeshes[0].fViewMatrix);
-
-    // ... but we can't enable multiple view matrices if any of them have perspective, or our other
-    // varyings won't be interpolated correctly.
-    if (needMultipleViewMatrices && (this->fMeshes[0].fViewMatrix.hasPerspective() ||
-                                     that->fMeshes[0].fViewMatrix.hasPerspective())) {
-        return CombineResult::kCannotCombine;
-    } else {
-        fMultipleViewMatrices = needMultipleViewMatrices;
-    }
-
-    // If the other op already required per-vertex colors, the combined mesh does.
-    if (that->fColorArrayType == ColorArrayType::kPremulGrColor) {
-        fColorArrayType = ColorArrayType::kPremulGrColor;
-    }
-
-    // If we combine meshes with different (uniform) colors, switch to per-vertex colors.
-    if (fColorArrayType == ColorArrayType::kUnused) {
-        SkASSERT(that->fColorArrayType == ColorArrayType::kUnused);
-        if (this->fMeshes[0].fColor != that->fMeshes[0].fColor) {
-            fColorArrayType = ColorArrayType::kPremulGrColor;
-        }
-    }
-
-    // NOTE: For SkColor vertex colors, the source color space is always sRGB, and the destination
-    // gamut is determined by the render target context. A mis-match should be impossible.
-    SkASSERT(GrColorSpaceXform::Equals(fColorSpaceXform.get(), that->fColorSpaceXform.get()));
-
-    // If the other op already required explicit local coords the combined mesh does.
-    if (that->fLocalCoordsType == LocalCoordsType::kExplicit) {
-        fLocalCoordsType = LocalCoordsType::kExplicit;
-    }
-
-    // If we were planning to use positions for local coords but now have multiple view matrices,
-    // switch to explicit local coords.
-    if (fLocalCoordsType == LocalCoordsType::kUsePosition && fMultipleViewMatrices) {
-        fLocalCoordsType = LocalCoordsType::kExplicit;
-    }
-
-    fMeshes.push_back_n(that->fMeshes.count(), that->fMeshes.begin());
-    fVertexCount += that->fVertexCount;
-    fIndexCount += that->fIndexCount;
-
-    return CombineResult::kMerged;
-}
-
-static GrPrimitiveType SkVertexModeToGrPrimitiveType(SkVertices::VertexMode mode) {
-    switch (mode) {
-        case SkVertices::kTriangles_VertexMode:
-            return GrPrimitiveType::kTriangles;
-        case SkVertices::kTriangleStrip_VertexMode:
-            return GrPrimitiveType::kTriangleStrip;
-        case SkVertices::kTriangleFan_VertexMode:
-            break;
-    }
-    SK_ABORT("Invalid mode");
-}
-
-} // anonymous namespace
-
-GrOp::Owner Make(GrRecordingContext* context,
-                 GrPaint&& paint,
-                 sk_sp<SkVertices> vertices,
-                 const SkMatrixProvider& matrixProvider,
-                 GrAAType aaType,
-                 sk_sp<GrColorSpaceXform> colorSpaceXform,
-                 GrPrimitiveType* overridePrimType) {
-    SkASSERT(vertices);
-    GrPrimitiveType primType = overridePrimType
-                                       ? *overridePrimType
-                                       : SkVertexModeToGrPrimitiveType(vertices->priv().mode());
-    return GrSimpleMeshDrawOpHelper::FactoryHelper<DrawVerticesOpImpl>(context,
-                                                                       std::move(paint),
-                                                                       std::move(vertices),
-                                                                       primType,
-                                                                       aaType,
-                                                                       std::move(colorSpaceXform),
-                                                                       matrixProvider);
-}
-
-} // namespace skgpu::v1::DrawVerticesOp
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-#if GR_TEST_UTILS
-
-#include "src/gpu/GrDrawOpTest.h"
-
-static uint32_t seed_vertices(GrPrimitiveType type) {
-    switch (type) {
-        case GrPrimitiveType::kTriangles:
-        case GrPrimitiveType::kTriangleStrip:
-            return 3;
-        case GrPrimitiveType::kPoints:
-            return 1;
-        case GrPrimitiveType::kLines:
-        case GrPrimitiveType::kLineStrip:
-            return 2;
-        case GrPrimitiveType::kPatches:
-        case GrPrimitiveType::kPath:
-            SkASSERT(0);
-            return 0;
-    }
-    SK_ABORT("Incomplete switch\n");
-}
-
-static uint32_t primitive_vertices(GrPrimitiveType type) {
-    switch (type) {
-        case GrPrimitiveType::kTriangles:
-            return 3;
-        case GrPrimitiveType::kLines:
-            return 2;
-        case GrPrimitiveType::kTriangleStrip:
-        case GrPrimitiveType::kPoints:
-        case GrPrimitiveType::kLineStrip:
-            return 1;
-        case GrPrimitiveType::kPatches:
-        case GrPrimitiveType::kPath:
-            SkASSERT(0);
-            return 0;
-    }
-    SK_ABORT("Incomplete switch\n");
-}
-
-static SkPoint random_point(SkRandom* random, SkScalar min, SkScalar max) {
-    SkPoint p;
-    p.fX = random->nextRangeScalar(min, max);
-    p.fY = random->nextRangeScalar(min, max);
-    return p;
-}
-
-static void randomize_params(size_t count, size_t maxVertex, SkScalar min, SkScalar max,
-                             SkRandom* random, SkTArray<SkPoint>* positions,
-                             SkTArray<SkPoint>* texCoords, bool hasTexCoords,
-                             SkTArray<uint32_t>* colors, bool hasColors,
-                             SkTArray<uint16_t>* indices, bool hasIndices) {
-    for (uint32_t v = 0; v < count; v++) {
-        positions->push_back(random_point(random, min, max));
-        if (hasTexCoords) {
-            texCoords->push_back(random_point(random, min, max));
-        }
-        if (hasColors) {
-            colors->push_back(GrTest::RandomColor(random));
-        }
-        if (hasIndices) {
-            SkASSERT(maxVertex <= UINT16_MAX);
-            indices->push_back(random->nextULessThan((uint16_t)maxVertex));
-        }
-    }
-}
-
-GR_DRAW_OP_TEST_DEFINE(DrawVerticesOp) {
-    GrPrimitiveType types[] = {
-        GrPrimitiveType::kTriangles,
-        GrPrimitiveType::kTriangleStrip,
-        GrPrimitiveType::kPoints,
-        GrPrimitiveType::kLines,
-        GrPrimitiveType::kLineStrip
-    };
-    auto type = types[random->nextULessThan(SK_ARRAY_COUNT(types))];
-
-    uint32_t primitiveCount = random->nextRangeU(1, 100);
-
-    // TODO make 'sensible' indexbuffers
-    SkTArray<SkPoint> positions;
-    SkTArray<SkPoint> texCoords;
-    SkTArray<uint32_t> colors;
-    SkTArray<uint16_t> indices;
-
-    bool hasTexCoords = random->nextBool();
-    bool hasIndices = random->nextBool();
-    bool hasColors = random->nextBool();
-
-    uint32_t vertexCount = seed_vertices(type) + (primitiveCount - 1) * primitive_vertices(type);
-
-    static const SkScalar kMinVertExtent = -100.f;
-    static const SkScalar kMaxVertExtent = 100.f;
-    randomize_params(seed_vertices(type), vertexCount, kMinVertExtent, kMaxVertExtent, random,
-                     &positions, &texCoords, hasTexCoords, &colors, hasColors, &indices,
-                     hasIndices);
-
-    for (uint32_t i = 1; i < primitiveCount; i++) {
-        randomize_params(primitive_vertices(type), vertexCount, kMinVertExtent, kMaxVertExtent,
-                         random, &positions, &texCoords, hasTexCoords, &colors, hasColors, &indices,
-                         hasIndices);
-    }
-
-    SkMatrixProvider matrixProvider(GrTest::TestMatrix(random));
-
-    sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(random);
-
-    static constexpr SkVertices::VertexMode kIgnoredMode = SkVertices::kTriangles_VertexMode;
-    sk_sp<SkVertices> vertices = SkVertices::MakeCopy(kIgnoredMode, vertexCount, positions.begin(),
-                                                      texCoords.begin(), colors.begin(),
-                                                      hasIndices ? indices.count() : 0,
-                                                      indices.begin());
-    GrAAType aaType = GrAAType::kNone;
-    if (numSamples > 1 && random->nextBool()) {
-        aaType = GrAAType::kMSAA;
-    }
-    return skgpu::v1::DrawVerticesOp::Make(context,
-                                           std::move(paint),
-                                           std::move(vertices),
-                                           matrixProvider,
-                                           aaType,
-                                           std::move(colorSpaceXform),
-                                           &type);
-}
-
-#endif
diff --git a/third_party/skia/src/gpu/ops/DrawVerticesOp.h b/third_party/skia/src/gpu/ops/DrawVerticesOp.h
deleted file mode 100644
index 400be1db89c3f..0000000000000
--- a/third_party/skia/src/gpu/ops/DrawVerticesOp.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef DrawVerticesOp_DEFINED
-#define DrawVerticesOp_DEFINED
-
-#include "include/core/SkRefCnt.h"
-#include "include/private/GrTypesPriv.h"
-#include "src/gpu/ops/GrOp.h"
-
-class GrColorSpaceXform;
-class GrPaint;
-class GrRecordingContext;
-class SkMatrixProvider;
-class SkVertices;
-
-namespace skgpu::v1::DrawVerticesOp {
-
-/**
- * Draw a SkVertices. The GrPaint param's color is used if the vertices lack per-vertex color.
- * If the vertices lack local coords then the vertex positions are used as local coords. The
- * primitive type drawn is derived from the SkVertices object, unless overridePrimType is
- * specified. If an SkRuntimeEffect is provided, it may expect some number of input varyings,
- * which should match the number of extra per-vertex values in the SkVertices.
- */
-GrOp::Owner Make(GrRecordingContext*,
-                 GrPaint&&,
-                 sk_sp<SkVertices>,
-                 const SkMatrixProvider&,
-                 GrAAType,
-                 sk_sp<GrColorSpaceXform>,
-                 GrPrimitiveType* overridePrimType);
-
-}  // namespace skgpu::v1::DrawVerticesOp
-
-#endif // DrawVerticesOp_DEFINED
diff --git a/third_party/skia/src/gpu/ops/FillRRectOp.cpp b/third_party/skia/src/gpu/ops/FillRRectOp.cpp
index 275ec2b84d49f..b9e0d7f526cfc 100644
--- a/third_party/skia/src/gpu/ops/FillRRectOp.cpp
+++ b/third_party/skia/src/gpu/ops/FillRRectOp.cpp
@@ -19,6 +19,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrVx.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/geometry/GrShape.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
@@ -37,12 +38,27 @@ class FillRRectOpImpl final : public GrMeshDrawOp {
 public:
     DEFINE_OP_CLASS_ID
 
+    struct LocalCoords {
+        enum class Type : bool { kRect, kMatrix };
+        LocalCoords(const SkRect& localRect)
+                : fType(Type::kRect)
+                , fRect(localRect) {}
+        LocalCoords(const SkMatrix& localMatrix)
+                : fType(Type::kMatrix)
+                , fMatrix(localMatrix) {}
+        Type fType;
+        union {
+            SkRect fRect;
+            SkMatrix fMatrix;
+        };
+    };
+
     static GrOp::Owner Make(GrRecordingContext*,
                             SkArenaAlloc*,
                             GrPaint&&,
                             const SkMatrix& viewMatrix,
                             const SkRRect&,
-                            const SkRect& localRect,
+                            const LocalCoords&,
                             GrAA);
 
     const char* name() const override { return "FillRRectOp"; }
@@ -93,7 +109,7 @@ class FillRRectOpImpl final : public GrMeshDrawOp {
                     SkArenaAlloc*,
                     const SkMatrix& viewMatrix,
                     const SkRRect&,
-                    const SkRect& localRect,
+                    const LocalCoords&,
                     ProcessorFlags);
 
     GrProgramInfo* programInfo() override { return fProgramInfo; }
@@ -112,12 +128,15 @@ class FillRRectOpImpl final : public GrMeshDrawOp {
     ProcessorFlags fProcessorFlags;
 
     struct Instance {
-        Instance(const SkMatrix& viewMatrix, const SkRRect& rrect, const SkRect& localRect,
+        Instance(const SkMatrix& viewMatrix,
+                 const SkRRect& rrect,
+                 const LocalCoords& localCoords,
                  const SkPMColor4f& color)
-                : fViewMatrix(viewMatrix), fRRect(rrect), fLocalRect(localRect), fColor(color) {}
+                : fViewMatrix(viewMatrix), fRRect(rrect), fLocalCoords(localCoords), fColor(color) {
+        }
         SkMatrix fViewMatrix;
         SkRRect fRRect;
-        SkRect fLocalRect;
+        LocalCoords fLocalCoords;
         SkPMColor4f fColor;
         Instance* fNext = nullptr;
     };
@@ -149,7 +168,7 @@ GrOp::Owner FillRRectOpImpl::Make(GrRecordingContext* ctx,
                                   GrPaint&& paint,
                                   const SkMatrix& viewMatrix,
                                   const SkRRect& rrect,
-                                  const SkRect& localRect,
+                                  const LocalCoords& localCoords,
                                   GrAA aa) {
     const GrCaps* caps = ctx->priv().caps();
 
@@ -180,7 +199,7 @@ GrOp::Owner FillRRectOpImpl::Make(GrRecordingContext* ctx,
     }
 
     return Helper::FactoryHelper<FillRRectOpImpl>(ctx, std::move(paint), arena, viewMatrix, rrect,
-                                                  localRect, flags);
+                                                  localCoords, flags);
 }
 
 FillRRectOpImpl::FillRRectOpImpl(GrProcessorSet* processorSet,
@@ -188,7 +207,7 @@ FillRRectOpImpl::FillRRectOpImpl(GrProcessorSet* processorSet,
                                  SkArenaAlloc* arena,
                                  const SkMatrix& viewMatrix,
                                  const SkRRect& rrect,
-                                 const SkRect& localRect,
+                                 const LocalCoords& localCoords,
                                  ProcessorFlags processorFlags)
         : GrMeshDrawOp(ClassID())
         , fHelper(processorSet,
@@ -198,7 +217,7 @@ FillRRectOpImpl::FillRRectOpImpl(GrProcessorSet* processorSet,
         , fProcessorFlags(processorFlags & ~(ProcessorFlags::kHasLocalCoords |
                                              ProcessorFlags::kWideColor |
                                              ProcessorFlags::kMSAAEnabled))
-        , fHeadInstance(arena->make<Instance>(viewMatrix, rrect, localRect, paintColor))
+        , fHeadInstance(arena->make<Instance>(viewMatrix, rrect, localCoords, paintColor))
         , fTailInstance(&fHeadInstance->fNext) {
     // FillRRectOp::Make fails if there is perspective.
     SkASSERT(!viewMatrix.hasPerspective());
@@ -282,13 +301,16 @@ GrDrawOp::ClipResult FillRRectOpImpl::clipToShape(skgpu::v1::SurfaceDrawContext*
             return ClipResult::kFail;
         }
 
-        // Update the local rect.
-        auto rect = skvx::bit_pun<grvx::float4>(fHeadInstance->fRRect.rect());
-        auto local = skvx::bit_pun<grvx::float4>(fHeadInstance->fLocalRect);
-        auto isect = skvx::bit_pun<grvx::float4>(isectRRect.rect());
-        auto rectToLocalSize = (local - skvx::shuffle<2,3,0,1>(local)) /
-                               (rect - skvx::shuffle<2,3,0,1>(rect));
-        fHeadInstance->fLocalRect = skvx::bit_pun<SkRect>((isect - rect) * rectToLocalSize + local);
+        if (fHeadInstance->fLocalCoords.fType == LocalCoords::Type::kRect) {
+            // Update the local rect.
+            auto rect = skvx::bit_pun<grvx::float4>(fHeadInstance->fRRect.rect());
+            auto local = skvx::bit_pun<grvx::float4>(fHeadInstance->fLocalCoords.fRect);
+            auto isect = skvx::bit_pun<grvx::float4>(isectRRect.rect());
+            auto rectToLocalSize = (local - skvx::shuffle<2,3,0,1>(local)) /
+                                   (rect - skvx::shuffle<2,3,0,1>(rect));
+            fHeadInstance->fLocalCoords.fRect =
+                    skvx::bit_pun<SkRect>((isect - rect) * rectToLocalSize + local);
+        }
 
         // Update the round rect.
         fHeadInstance->fRRect = isectRRect;
@@ -341,7 +363,7 @@ class FillRRectOpImpl::Processor final : public GrGeometryProcessor {
 
     const char* name() const override { return "FillRRectOp::Processor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, KeyBuilder* b) const override {
         b->addBits(kNumProcessorFlags, (uint32_t)fFlags,  "flags");
     }
 
@@ -353,27 +375,35 @@ class FillRRectOpImpl::Processor final : public GrGeometryProcessor {
     Processor(GrAAType aaType, ProcessorFlags flags)
             : GrGeometryProcessor(kGrFillRRectOp_Processor_ClassID)
             , fFlags(flags) {
-        this->setVertexAttributes(kVertexAttribs, SK_ARRAY_COUNT(kVertexAttribs));
+        this->setVertexAttributesWithImplicitOffsets(kVertexAttribs,
+                                                     SK_ARRAY_COUNT(kVertexAttribs));
 
-        fInstanceAttribs.emplace_back("skew", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fInstanceAttribs.emplace_back("translate", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
-        fInstanceAttribs.emplace_back("radii_x", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fInstanceAttribs.emplace_back("radii_y", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fColorAttrib = &fInstanceAttribs.push_back(
-                MakeColorAttribute("color", (fFlags & ProcessorFlags::kWideColor)));
+        fInstanceAttribs.emplace_back("radii_x", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fInstanceAttribs.emplace_back("radii_y", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fInstanceAttribs.emplace_back("skew", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
         if (fFlags & ProcessorFlags::kHasLocalCoords) {
+            fInstanceAttribs.emplace_back("translate_and_localrotate",
+                                          kFloat4_GrVertexAttribType,
+                                          SkSLType::kFloat4);
             fInstanceAttribs.emplace_back(
-                    "local_rect", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+                    "localrect", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        } else {
+            fInstanceAttribs.emplace_back("translate_and_localrotate",
+                                          kFloat2_GrVertexAttribType,
+                                          SkSLType::kFloat2);
         }
+        fColorAttrib = &fInstanceAttribs.push_back(
+                MakeColorAttribute("color", (fFlags & ProcessorFlags::kWideColor)));
         SkASSERT(fInstanceAttribs.count() <= kMaxInstanceAttribs);
-        this->setInstanceAttributes(fInstanceAttribs.begin(), fInstanceAttribs.count());
+        this->setInstanceAttributesWithImplicitOffsets(fInstanceAttribs.begin(),
+                                                       fInstanceAttribs.count());
     }
 
     inline static constexpr Attribute kVertexAttribs[] = {
-            {"radii_selector", kFloat4_GrVertexAttribType, kFloat4_GrSLType},
-            {"corner_and_radius_outsets", kFloat4_GrVertexAttribType, kFloat4_GrSLType},
+            {"radii_selector", kFloat4_GrVertexAttribType, SkSLType::kFloat4},
+            {"corner_and_radius_outsets", kFloat4_GrVertexAttribType, SkSLType::kFloat4},
             // Coverage only.
-            {"aa_bloat_and_coverage", kFloat4_GrVertexAttribType, kFloat4_GrSLType}};
+            {"aa_bloat_and_coverage", kFloat4_GrVertexAttribType, SkSLType::kFloat4}};
 
     const ProcessorFlags fFlags;
 
@@ -467,7 +497,7 @@ static constexpr CoverageVertex kVertexData[] = {
         {{{0,0,0,1}},  {{-1,+1}},  {{0,-kOctoOffset}},  {{-1,+1}},  0,  0},
         {{{0,0,0,1}},  {{-1,+1}},  {{+kOctoOffset,0}},  {{-1,+1}},  0,  0}};
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gVertexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gVertexBufferKey);
 
 static constexpr uint16_t kIndexData[] = {
         // Inset octagon (solid coverage).
@@ -508,7 +538,7 @@ static constexpr uint16_t kIndexData[] = {
         39, 36, 38,
         36, 38, 37};
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gIndexBufferKey);
 
 void FillRRectOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
     if (!fProgramInfo) {
@@ -517,9 +547,9 @@ void FillRRectOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
 
     size_t instanceStride = fProgramInfo->geomProc().instanceStride();
 
-    if (VertexWriter instanceWrter = target->makeVertexSpace(instanceStride, fInstanceCount,
-                                                             &fInstanceBuffer, &fBaseInstance)) {
-        SkDEBUGCODE(auto end = instanceWrter.makeOffset(instanceStride * fInstanceCount));
+    if (VertexWriter instanceWriter = target->makeVertexWriter(instanceStride, fInstanceCount,
+                                                               &fInstanceBuffer, &fBaseInstance)) {
+        SkDEBUGCODE(auto end = instanceWriter.mark(instanceStride * fInstanceCount));
         for (Instance* i = fHeadInstance; i; i = i->fNext) {
             auto [l, t, r, b] = i->fRRect.rect();
 
@@ -536,23 +566,38 @@ void FillRRectOpImpl::onPrepareDraws(GrMeshDrawTarget* target) {
             radiiX *= 2 / (r - l);
             radiiY *= 2 / (b - t);
 
-            instanceWrter << m.getScaleX() << m.getSkewX() << m.getSkewY() << m.getScaleY()
-                          << m.getTranslateX() << m.getTranslateY()
-                          << radiiX << radiiY
-                          << VertexColor(i->fColor, fProcessorFlags & ProcessorFlags::kWideColor)
-                          << VertexWriter::If(fProcessorFlags & ProcessorFlags::kHasLocalCoords,
-                                              i->fLocalRect);
+            instanceWriter << radiiX << radiiY
+                           << m.getScaleX() << m.getSkewX() << m.getSkewY() << m.getScaleY()
+                           << m.getTranslateX() << m.getTranslateY();
+
+            if (fProcessorFlags & ProcessorFlags::kHasLocalCoords) {
+                if (i->fLocalCoords.fType == LocalCoords::Type::kRect) {
+                    instanceWriter << 0.f << 0.f  // localrotate
+                                   << i->fLocalCoords.fRect;  // localrect
+                } else {
+                    SkASSERT(i->fLocalCoords.fType == LocalCoords::Type::kMatrix);
+                    const SkRect& bounds = i->fRRect.rect();
+                    const SkMatrix& localMatrix = i->fLocalCoords.fMatrix;
+                    SkVector u = localMatrix.mapVector(bounds.right() - bounds.left(), 0);
+                    SkVector v = localMatrix.mapVector(0, bounds.bottom() - bounds.top());
+                    SkPoint l0 = localMatrix.mapPoint({bounds.left(), bounds.top()});
+                    instanceWriter << v.x() << u.y()  // localrotate
+                                   << l0 << (l0.x() + u.x()) << (l0.y() + v.y());  // localrect
+                }
+            }
+
+            instanceWriter << VertexColor(i->fColor, fProcessorFlags & ProcessorFlags::kWideColor);
         }
-        SkASSERT(instanceWrter == end);
+        SkASSERT(instanceWriter.mark() == end);
     }
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gIndexBufferKey);
 
     fIndexBuffer = target->resourceProvider()->findOrMakeStaticBuffer(GrGpuBufferType::kIndex,
                                                                       sizeof(kIndexData),
                                                                       kIndexData, gIndexBufferKey);
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gVertexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gVertexBufferKey);
 
     fVertexBuffer = target->resourceProvider()->findOrMakeStaticBuffer(GrGpuBufferType::kVertex,
                                                                       sizeof(kVertexData),
@@ -686,21 +731,24 @@ class FillRRectOpImpl::Processor::Impl : public ProgramImpl {
         v->codeAppend(    "}");
         v->codeAppend("}");
 
-        // Write positions
-        GrShaderVar localCoord("", kFloat2_GrSLType);
-        if (proc.fFlags & ProcessorFlags::kHasLocalCoords) {
-            v->codeAppend("float2 localcoord = (local_rect.xy * (1 - vertexpos) + "
-                                               "local_rect.zw * (1 + vertexpos)) * .5;");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localcoord");
-        }
-
         // Transform to device space.
         v->codeAppend("float2x2 skewmatrix = float2x2(skew.xy, skew.zw);");
-        v->codeAppend("float2 devcoord = vertexpos * skewmatrix + translate;");
-        gpArgs->fPositionVar.set(kFloat2_GrSLType, "devcoord");
+        v->codeAppend("float2 devcoord = vertexpos * skewmatrix + translate_and_localrotate.xy;");
+        gpArgs->fPositionVar.set(SkSLType::kFloat2, "devcoord");
+
+        // Output local coordinates.
+        if (proc.fFlags & ProcessorFlags::kHasLocalCoords) {
+            // Do math in a way that preserves exact local coord boundaries when there is no local
+            // rotate and vertexpos is on an exact shape boundary.
+            v->codeAppend("float2 T = vertexpos * .5 + .5;");
+            v->codeAppend("float2 localcoord = localrect.xy * (1 - T) + "
+                                               "localrect.zw * T + "
+                                               "translate_and_localrotate.zw * T.yx;");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localcoord");
+        }
 
         // Setup interpolants for coverage.
-        GrGLSLVarying arcCoord(useHWDerivatives ? kFloat2_GrSLType : kFloat4_GrSLType);
+        GrGLSLVarying arcCoord(useHWDerivatives ? SkSLType::kFloat2 : SkSLType::kFloat4);
         varyings->addVarying("arccoord", &arcCoord);
         v->codeAppend("if (0 != is_linear_coverage) {");
                            // We are a non-corner piece: Set x=0 to indicate built-in coverage, and
@@ -860,6 +908,16 @@ GrOp::Owner Make(GrRecordingContext* ctx,
     return FillRRectOpImpl::Make(ctx, arena, std::move(paint), viewMatrix, rrect, localRect, aa);
 }
 
+GrOp::Owner Make(GrRecordingContext* ctx,
+                 SkArenaAlloc* arena,
+                 GrPaint&& paint,
+                 const SkMatrix& viewMatrix,
+                 const SkRRect& rrect,
+                 const SkMatrix& localMatrix,
+                 GrAA aa) {
+    return FillRRectOpImpl::Make(ctx, arena, std::move(paint), viewMatrix, rrect, localMatrix, aa);
+}
+
 } // namespace skgpu::v1::FillRRectOp
 
 #if GR_TEST_UTILS
diff --git a/third_party/skia/src/gpu/ops/FillRRectOp.h b/third_party/skia/src/gpu/ops/FillRRectOp.h
index 478cb6c855493..0443b0f55d09d 100644
--- a/third_party/skia/src/gpu/ops/FillRRectOp.h
+++ b/third_party/skia/src/gpu/ops/FillRRectOp.h
@@ -27,6 +27,14 @@ namespace skgpu::v1::FillRRectOp {
                      const SkRect& localRect,
                      GrAA);
 
+    GrOp::Owner Make(GrRecordingContext*,
+                     SkArenaAlloc*,
+                     GrPaint&&,
+                     const SkMatrix& viewMatrix,
+                     const SkRRect&,
+                     const SkMatrix& localMatrix,
+                     GrAA);
+
 }  // namespace skgpu::v1::FillRRectOp
 
 #endif // FillRRectOp_DEFINED
diff --git a/third_party/skia/src/gpu/ops/GrOvalOpFactory.cpp b/third_party/skia/src/gpu/ops/GrOvalOpFactory.cpp
index 2362ebb99c090..163005628faad 100644
--- a/third_party/skia/src/gpu/ops/GrOvalOpFactory.cpp
+++ b/third_party/skia/src/gpu/ops/GrOvalOpFactory.cpp
@@ -20,6 +20,7 @@
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrStyle.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLProgramDataManager.h"
 #include "src/gpu/glsl/GrGLSLUniformHandler.h"
@@ -78,7 +79,7 @@ class CircleGeometryProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "CircleGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         b->addBool(fStroke,                             "stroked"        );
         b->addBool(fInClipPlane.isInitialized(),        "clipPlane"      );
         b->addBool(fInIsectPlane.isInitialized(),       "isectPlane"     );
@@ -99,26 +100,26 @@ class CircleGeometryProcessor : public GrGeometryProcessor {
             : INHERITED(kCircleGeometryProcessor_ClassID)
             , fLocalMatrix(localMatrix)
             , fStroke(stroke) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         fInColor = MakeColorAttribute("inColor", wideColor);
-        fInCircleEdge = {"inCircleEdge", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+        fInCircleEdge = {"inCircleEdge", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
 
         if (clipPlane) {
-            fInClipPlane = {"inClipPlane", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
+            fInClipPlane = {"inClipPlane", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
         }
         if (isectPlane) {
-            fInIsectPlane = {"inIsectPlane", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
+            fInIsectPlane = {"inIsectPlane", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
         }
         if (unionPlane) {
-            fInUnionPlane = {"inUnionPlane", kFloat3_GrVertexAttribType, kHalf3_GrSLType};
+            fInUnionPlane = {"inUnionPlane", kFloat3_GrVertexAttribType, SkSLType::kHalf3};
         }
         if (roundCaps) {
             SkASSERT(stroke);
             SkASSERT(clipPlane);
             fInRoundCapCenters =
-                    {"inRoundCapCenters", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+                    {"inRoundCapCenters", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
         }
-        this->setVertexAttributes(&fInPosition, 7);
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 7);
     }
 
     class Impl : public ProgramImpl {
@@ -161,7 +162,7 @@ class CircleGeometryProcessor : public GrGeometryProcessor {
                 varyingHandler->addPassThroughAttribute(cgp.fInUnionPlane.asShaderVar(),
                                                         "unionPlane");
             }
-            GrGLSLVarying capRadius(kFloat_GrSLType);
+            GrGLSLVarying capRadius(SkSLType::kFloat);
             if (cgp.fInRoundCapCenters.isInitialized()) {
                 fragBuilder->codeAppend("float4 roundCapCenters;");
                 varyingHandler->addPassThroughAttribute(cgp.fInRoundCapCenters.asShaderVar(),
@@ -280,7 +281,7 @@ class ButtCapDashedCircleGeometryProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "ButtCapDashedCircleGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         b->addBits(ProgramImpl::kMatrixKeyBits,
                    ProgramImpl::ComputeMatrixKey(caps, fLocalMatrix),
                    "localMatrixType");
@@ -294,11 +295,11 @@ class ButtCapDashedCircleGeometryProcessor : public GrGeometryProcessor {
     ButtCapDashedCircleGeometryProcessor(bool wideColor, const SkMatrix& localMatrix)
             : INHERITED(kButtCapStrokedCircleGeometryProcessor_ClassID)
             , fLocalMatrix(localMatrix) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         fInColor = MakeColorAttribute("inColor", wideColor);
-        fInCircleEdge = {"inCircleEdge", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
-        fInDashParams = {"inDashParams", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
-        this->setVertexAttributes(&fInPosition, 4);
+        fInCircleEdge = {"inCircleEdge", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
+        fInDashParams = {"inDashParams", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 4);
     }
 
     class Impl : public ProgramImpl {
@@ -333,10 +334,10 @@ class ButtCapDashedCircleGeometryProcessor : public GrGeometryProcessor {
                     bcscgp.fInDashParams.asShaderVar(),
                     "dashParams",
                     GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
-            GrGLSLVarying wrapDashes(kHalf4_GrSLType);
+            GrGLSLVarying wrapDashes(SkSLType::kHalf4);
             varyingHandler->addVarying("wrapDashes", &wrapDashes,
                                        GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
-            GrGLSLVarying lastIntervalLength(kHalf_GrSLType);
+            GrGLSLVarying lastIntervalLength(SkSLType::kHalf);
             varyingHandler->addVarying("lastIntervalLength", &lastIntervalLength,
                                        GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
             vertBuilder->codeAppendf("float4 dashParams = %s;", bcscgp.fInDashParams.name());
@@ -417,11 +418,11 @@ class ButtCapDashedCircleGeometryProcessor : public GrGeometryProcessor {
                             &fLocalMatrixUniform);
 
             GrShaderVar fnArgs[] = {
-                    GrShaderVar("angleToEdge", kFloat_GrSLType),
-                    GrShaderVar("diameter", kFloat_GrSLType),
+                    GrShaderVar("angleToEdge", SkSLType::kFloat),
+                    GrShaderVar("diameter", SkSLType::kFloat),
             };
             SkString fnName = fragBuilder->getMangledFunctionName("coverage_from_dash_edge");
-            fragBuilder->emitFunction(kFloat_GrSLType, fnName.c_str(),
+            fragBuilder->emitFunction(SkSLType::kFloat, fnName.c_str(),
                                       {fnArgs, SK_ARRAY_COUNT(fnArgs)}, R"(
                     float linearDist;
                     angleToEdge = clamp(angleToEdge, -3.1415, 3.1415);
@@ -536,7 +537,7 @@ class EllipseGeometryProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "EllipseGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         b->addBool(fStroke, "stroked");
         b->addBits(ProgramImpl::kMatrixKeyBits,
                    ProgramImpl::ComputeMatrixKey(caps, fLocalMatrix),
@@ -554,15 +555,15 @@ class EllipseGeometryProcessor : public GrGeometryProcessor {
             , fLocalMatrix(localMatrix)
             , fStroke(stroke)
             , fUseScale(useScale) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         fInColor = MakeColorAttribute("inColor", wideColor);
         if (useScale) {
-            fInEllipseOffset = {"inEllipseOffset", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+            fInEllipseOffset = {"inEllipseOffset", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
         } else {
-            fInEllipseOffset = {"inEllipseOffset", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+            fInEllipseOffset = {"inEllipseOffset", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         }
-        fInEllipseRadii = {"inEllipseRadii", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
-        this->setVertexAttributes(&fInPosition, 4);
+        fInEllipseRadii = {"inEllipseRadii", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 4);
     }
 
     class Impl : public ProgramImpl {
@@ -584,13 +585,13 @@ class EllipseGeometryProcessor : public GrGeometryProcessor {
             // emit attributes
             varyingHandler->emitAttributes(egp);
 
-            GrSLType offsetType = egp.fUseScale ? kFloat3_GrSLType : kFloat2_GrSLType;
+            SkSLType offsetType = egp.fUseScale ? SkSLType::kFloat3 : SkSLType::kFloat2;
             GrGLSLVarying ellipseOffsets(offsetType);
             varyingHandler->addVarying("EllipseOffsets", &ellipseOffsets);
             vertBuilder->codeAppendf("%s = %s;", ellipseOffsets.vsOut(),
                                      egp.fInEllipseOffset.name());
 
-            GrGLSLVarying ellipseRadii(kFloat4_GrSLType);
+            GrGLSLVarying ellipseRadii(SkSLType::kFloat4);
             varyingHandler->addVarying("EllipseRadii", &ellipseRadii);
             vertBuilder->codeAppendf("%s = %s;", ellipseRadii.vsOut(), egp.fInEllipseRadii.name());
 
@@ -733,7 +734,7 @@ class DIEllipseGeometryProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "DIEllipseGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         b->addBits(2, static_cast<uint32_t>(fStyle), "style");
         b->addBits(ProgramImpl::kMatrixKeyBits,
                    ProgramImpl::ComputeMatrixKey(caps, fViewMatrix),
@@ -751,17 +752,17 @@ class DIEllipseGeometryProcessor : public GrGeometryProcessor {
             , fViewMatrix(viewMatrix)
             , fUseScale(useScale)
             , fStyle(style) {
-        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+        fInPosition = {"inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         fInColor = MakeColorAttribute("inColor", wideColor);
         if (useScale) {
             fInEllipseOffsets0 = {"inEllipseOffsets0", kFloat3_GrVertexAttribType,
-                                  kFloat3_GrSLType};
+                                  SkSLType::kFloat3};
         } else {
             fInEllipseOffsets0 = {"inEllipseOffsets0", kFloat2_GrVertexAttribType,
-                                  kFloat2_GrSLType};
+                                  SkSLType::kFloat2};
         }
-        fInEllipseOffsets1 = {"inEllipseOffsets1", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-        this->setVertexAttributes(&fInPosition, 4);
+        fInEllipseOffsets1 = {"inEllipseOffsets1", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 4);
     }
 
     class Impl : public ProgramImpl {
@@ -784,12 +785,12 @@ class DIEllipseGeometryProcessor : public GrGeometryProcessor {
             // emit attributes
             varyingHandler->emitAttributes(diegp);
 
-            GrSLType offsetType = (diegp.fUseScale) ? kFloat3_GrSLType : kFloat2_GrSLType;
+            SkSLType offsetType = (diegp.fUseScale) ? SkSLType::kFloat3 : SkSLType::kFloat2;
             GrGLSLVarying offsets0(offsetType);
             varyingHandler->addVarying("EllipseOffsets0", &offsets0);
             vertBuilder->codeAppendf("%s = %s;", offsets0.vsOut(), diegp.fInEllipseOffsets0.name());
 
-            GrGLSLVarying offsets1(kFloat2_GrSLType);
+            GrGLSLVarying offsets1(SkSLType::kFloat2);
             varyingHandler->addVarying("EllipseOffsets1", &offsets1);
             vertBuilder->codeAppendf("%s = %s;", offsets1.vsOut(), diegp.fInEllipseOffsets1.name());
 
@@ -1280,8 +1281,8 @@ class CircleOp final : public GrMeshDrawOp {
 
         sk_sp<const GrBuffer> vertexBuffer;
         int firstVertex;
-        VertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
-                                                      fVertCount, &vertexBuffer, &firstVertex)};
+        VertexWriter vertices = target->makeVertexWriter(fProgramInfo->geomProc().vertexStride(),
+                                                         fVertCount, &vertexBuffer, &firstVertex);
         if (!vertices) {
             SkDebugf("Could not allocate vertices\n");
             return;
@@ -1652,8 +1653,8 @@ class ButtCapDashedCircleOp final : public GrMeshDrawOp {
 
         sk_sp<const GrBuffer> vertexBuffer;
         int firstVertex;
-        VertexWriter vertices{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
-                                                      fVertCount, &vertexBuffer, &firstVertex)};
+        VertexWriter vertices = target->makeVertexWriter(fProgramInfo->geomProc().vertexStride(),
+                                                         fVertCount, &vertexBuffer, &firstVertex);
         if (!vertices) {
             SkDebugf("Could not allocate vertices\n");
             return;
@@ -2683,8 +2684,8 @@ class CircularRRectOp : public GrMeshDrawOp {
         sk_sp<const GrBuffer> vertexBuffer;
         int firstVertex;
 
-        VertexWriter verts{target->makeVertexSpace(fProgramInfo->geomProc().vertexStride(),
-                                                     fVertCount, &vertexBuffer, &firstVertex)};
+        VertexWriter verts = target->makeVertexWriter(fProgramInfo->geomProc().vertexStride(),
+                                                      fVertCount, &vertexBuffer, &firstVertex);
         if (!verts) {
             SkDebugf("Could not allocate vertices\n");
             return;
@@ -2845,12 +2846,12 @@ class CircularRRectOp : public GrMeshDrawOp {
 
 static const int kNumRRectsInIndexBuffer = 256;
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
-GR_DECLARE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
 static sk_sp<const GrBuffer> get_rrect_index_buffer(RRectType type,
                                                     GrResourceProvider* resourceProvider) {
-    GR_DEFINE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
-    GR_DEFINE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gStrokeRRectOnlyIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gRRectOnlyIndexBufferKey);
     switch (type) {
         case kFill_RRectType:
             return resourceProvider->findOrCreatePatternedIndexBuffer(
diff --git a/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
index 538f3056f0a30..94c82e7ba2497 100644
--- a/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
+++ b/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp
@@ -107,7 +107,7 @@ GrProcessorSet::Analysis GrSimpleMeshDrawOpHelper::finalizeProcessors(
 const GrPipeline* GrSimpleMeshDrawOpHelper::CreatePipeline(
                                                 const GrCaps* caps,
                                                 SkArenaAlloc* arena,
-                                                GrSwizzle writeViewSwizzle,
+                                                skgpu::Swizzle writeViewSwizzle,
                                                 GrAppliedClip&& appliedClip,
                                                 const GrDstProxyView& dstProxyView,
                                                 GrProcessorSet&& processorSet,
@@ -150,7 +150,7 @@ const GrPipeline* GrSimpleMeshDrawOpHelper::createPipeline(GrOpFlushState* flush
 const GrPipeline* GrSimpleMeshDrawOpHelper::createPipeline(
         const GrCaps* caps,
         SkArenaAlloc* arena,
-        GrSwizzle writeViewSwizzle,
+        skgpu::Swizzle writeViewSwizzle,
         GrAppliedClip&& appliedClip,
         const GrDstProxyView& dstProxyView) {
     return GrSimpleMeshDrawOpHelper::CreatePipeline(caps,
diff --git a/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index c5545dad50ca3..a5aeb88819076 100644
--- a/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/third_party/skia/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -113,7 +113,7 @@ class GrSimpleMeshDrawOpHelper {
     static const GrPipeline* CreatePipeline(
                                 const GrCaps*,
                                 SkArenaAlloc*,
-                                GrSwizzle writeViewSwizzle,
+                                skgpu::Swizzle writeViewSwizzle,
                                 GrAppliedClip&&,
                                 const GrDstProxyView&,
                                 GrProcessorSet&&,
@@ -127,7 +127,7 @@ class GrSimpleMeshDrawOpHelper {
 
     const GrPipeline* createPipeline(const GrCaps*,
                                      SkArenaAlloc*,
-                                     GrSwizzle writeViewSwizzle,
+                                     skgpu::Swizzle writeViewSwizzle,
                                      GrAppliedClip&&,
                                      const GrDstProxyView&);
 
diff --git a/third_party/skia/src/gpu/ops/LatticeOp.cpp b/third_party/skia/src/gpu/ops/LatticeOp.cpp
index 81d4fdabc87ed..55e2b238bd059 100644
--- a/third_party/skia/src/gpu/ops/LatticeOp.cpp
+++ b/third_party/skia/src/gpu/ops/LatticeOp.cpp
@@ -18,6 +18,7 @@
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
 #include "src/gpu/GrResourceProviderPriv.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -43,7 +44,7 @@ class LatticeGP : public GrGeometryProcessor {
 
     const char* name() const override { return "LatticeGP"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps&, KeyBuilder* b) const override {
         b->add32(GrColorSpaceXform::XformKey(fColorSpaceXform.get()));
     }
 
@@ -107,11 +108,11 @@ class LatticeGP : public GrGeometryProcessor {
         fSampler.reset(GrSamplerState(GrSamplerState::WrapMode::kClamp, filter),
                        view.proxy()->backendFormat(), view.swizzle());
         this->setTextureSamplerCnt(1);
-        fInPosition = {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-        fInTextureCoords = {"textureCoords", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-        fInTextureDomain = {"textureDomain", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+        fInPosition = {"position", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+        fInTextureCoords = {"textureCoords", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+        fInTextureDomain = {"textureDomain", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
         fInColor = MakeColorAttribute("color", wideColor);
-        this->setVertexAttributes(&fInPosition, 4);
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 4);
     }
 
     const TextureSampler& onTextureSampler(int) const override { return fSampler; }
diff --git a/third_party/skia/src/gpu/ops/OpsTask.cpp b/third_party/skia/src/gpu/ops/OpsTask.cpp
index 9c787e559e865..c691ceff06465 100644
--- a/third_party/skia/src/gpu/ops/OpsTask.cpp
+++ b/third_party/skia/src/gpu/ops/OpsTask.cpp
@@ -543,12 +543,7 @@ bool OpsTask::onExecute(GrOpFlushState* flushState) {
     SkASSERT(proxy);
     SK_AT_SCOPE_EXIT(proxy->clearArenas());
 
-    // TODO: remove the check for discard here once reduced op splitting is turned on. Currently we
-    // can end up with OpsTasks that only have a discard load op and no ops. For vulkan validation
-    // we need to keep that discard and not drop it. Once we have reduce op list splitting enabled
-    // we shouldn't end up with OpsTasks with only discard.
-    if (this->isColorNoOp() ||
-        (fClippedContentBounds.isEmpty() && fColorLoadOp != GrLoadOp::kDiscard)) {
+    if (this->isColorNoOp() || fClippedContentBounds.isEmpty()) {
         return false;
     }
 
diff --git a/third_party/skia/src/gpu/ops/OpsTask.h b/third_party/skia/src/gpu/ops/OpsTask.h
index 9a5972e9a3941..e37d58f6cae1c 100644
--- a/third_party/skia/src/gpu/ops/OpsTask.h
+++ b/third_party/skia/src/gpu/ops/OpsTask.h
@@ -259,7 +259,7 @@ class OpsTask : public GrRenderTask {
     GrAuditTrail* fAuditTrail;
 
     bool fUsesMSAASurface;
-    GrSwizzle fTargetSwizzle;
+    skgpu::Swizzle fTargetSwizzle;
     GrSurfaceOrigin fTargetOrigin;
 
     GrLoadOp fColorLoadOp = GrLoadOp::kLoad;
diff --git a/third_party/skia/src/gpu/ops/PathInnerTriangulateOp.cpp b/third_party/skia/src/gpu/ops/PathInnerTriangulateOp.cpp
index 00953f0a4cc46..1090074ac61f5 100644
--- a/third_party/skia/src/gpu/ops/PathInnerTriangulateOp.cpp
+++ b/third_party/skia/src/gpu/ops/PathInnerTriangulateOp.cpp
@@ -28,21 +28,22 @@ class HullShader : public GrPathTessellationShader {
             : GrPathTessellationShader(kTessellate_HullShader_ClassID,
                                        GrPrimitiveType::kTriangleStrip, 0, viewMatrix, color,
                                        skgpu::PatchAttribs::kNone) {
-        fInstanceAttribs.emplace_back("p01", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fInstanceAttribs.emplace_back("p23", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+        fInstanceAttribs.emplace_back("p01", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fInstanceAttribs.emplace_back("p23", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
         if (!shaderCaps.infinitySupport()) {
             // A conic curve is written out with p3=[w,Infinity], but GPUs that don't support
             // infinity can't detect this. On these platforms we also write out an extra float with
             // each patch that explicitly tells the shader what type of curve it is.
-            fInstanceAttribs.emplace_back("curveType", kFloat_GrVertexAttribType, kFloat_GrSLType);
+            fInstanceAttribs.emplace_back("curveType", kFloat_GrVertexAttribType, SkSLType::kFloat);
         }
-        this->setInstanceAttributes(fInstanceAttribs.data(), fInstanceAttribs.count());
+        this->setInstanceAttributesWithImplicitOffsets(fInstanceAttribs.data(),
+                                                       fInstanceAttribs.count());
         SkASSERT(fInstanceAttribs.count() <= kMaxInstanceAttribCount);
 
         if (!shaderCaps.vertexIDSupport()) {
             constexpr static Attribute kVertexIdxAttrib("vertexidx", kFloat_GrVertexAttribType,
-                                                        kFloat_GrSLType);
-            this->setVertexAttributes(&kVertexIdxAttrib, 1);
+                                                        SkSLType::kFloat);
+            this->setVertexAttributesWithImplicitOffsets(&kVertexIdxAttrib, 1);
         }
     }
 
@@ -50,7 +51,7 @@ class HullShader : public GrPathTessellationShader {
 
 private:
     const char* name() const final { return "tessellate_HullShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, KeyBuilder*) const final {}
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 
     constexpr static int kMaxInstanceAttribCount = 3;
@@ -106,9 +107,9 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> HullShader::makeProgramImpl(
             float2 v3 = p3 - p0;
 
             // Reorder the points so v2 bisects v1 and v3.
-            if (sign(cross(v2, v1)) == sign(cross(v2, v3))) {
+            if (sign(cross_length_2d(v2, v1)) == sign(cross_length_2d(v2, v3))) {
                 float2 tmp = p2;
-                if (sign(cross(v1, v2)) != sign(cross(v1, v3))) {
+                if (sign(cross_length_2d(v1, v2)) != sign(cross_length_2d(v1, v3))) {
                     p2 = p1;  // swap(p2, p1)
                     p1 = tmp;
                 } else {
@@ -141,7 +142,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> HullShader::makeProgramImpl(
                 v->codeAppendf(R"(
                 next = p%i - p%i;)", (i + 1) % 4, i);
                 v->codeAppendf(R"(
-                dir = sign(cross(prev, next));
+                dir = sign(cross_length_2d(prev, next));
                 if (vertexidx == %i) {
                     vertexdir = dir;
                     localcoord = p%i;
@@ -157,8 +158,8 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> HullShader::makeProgramImpl(
             }
 
             float2 vertexpos = AFFINE_MATRIX * localcoord + TRANSLATE;)");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localcoord");
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertexpos");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localcoord");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertexpos");
         }
     };
     return std::make_unique<Impl>();
@@ -397,7 +398,7 @@ void PathInnerTriangulateOp::onPrePrepare(GrRecordingContext* context,
     }
 }
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gHullVertexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gHullVertexBufferKey);
 
 void PathInnerTriangulateOp::onPrepare(GrOpFlushState* flushState) {
     const GrCaps& caps = flushState->caps();
@@ -422,7 +423,9 @@ void PathInnerTriangulateOp::onPrepare(GrOpFlushState* flushState) {
                                  fTessellator->patchPreallocCount(fPath.countVerbs());
         SkASSERT(patchPreallocCount);  // Otherwise fTessellator should be null.
 
-        PatchWriter patchWriter(flushState, fTessellator, patchPreallocCount);
+        auto tessShader = &fStencilCurvesProgram->geomProc().cast<GrPathTessellationShader>();
+        int maxSegments = tessShader->maxTessellationSegments(*caps.shaderCaps());
+        PatchWriter patchWriter(flushState, fTessellator, maxSegments, patchPreallocCount);
 
         // Write out breadcrumb triangles. This must be called after polysToTriangles() in order for
         // fFanBreadcrumbs to be complete.
@@ -440,14 +443,12 @@ void PathInnerTriangulateOp::onPrepare(GrOpFlushState* flushState) {
                 // introduce T-junctions.
                 continue;
             }
-            PatchWriter::TrianglePatch(patchWriter) << p0 << p1 << p2;
+            patchWriter.writeTriangle(p0, p1, p2);
         }
         SkASSERT(breadcrumbCount == fFanBreadcrumbs.count());
 
         // Write out the curves.
-        auto tessShader = &fStencilCurvesProgram->geomProc().cast<GrPathTessellationShader>();
         fTessellator->writePatches(patchWriter,
-                                   tessShader->maxTessellationSegments(*caps.shaderCaps()),
                                    tessShader->viewMatrix(),
                                    {SkMatrix::I(), fPath, SK_PMColor4fTRANSPARENT});
 
@@ -459,7 +460,7 @@ void PathInnerTriangulateOp::onPrepare(GrOpFlushState* flushState) {
     if (!caps.shaderCaps()->vertexIDSupport()) {
         constexpr static float kStripOrderIDs[4] = {0, 1, 3, 2};
 
-        GR_DEFINE_STATIC_UNIQUE_KEY(gHullVertexBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gHullVertexBufferKey);
 
         fHullVertexBufferIfNoIDSupport = flushState->resourceProvider()->findOrMakeStaticBuffer(
                 GrGpuBufferType::kVertex, sizeof(kStripOrderIDs), kStripOrderIDs,
diff --git a/third_party/skia/src/gpu/ops/PathStencilCoverOp.cpp b/third_party/skia/src/gpu/ops/PathStencilCoverOp.cpp
index 0772f32ad686d..489df995992fd 100644
--- a/third_party/skia/src/gpu/ops/PathStencilCoverOp.cpp
+++ b/third_party/skia/src/gpu/ops/PathStencilCoverOp.cpp
@@ -35,20 +35,21 @@ class BoundingBoxShader : public GrGeometryProcessor {
             , fColor(color) {
         if (!shaderCaps.vertexIDSupport()) {
             constexpr static Attribute kUnitCoordAttrib("unitCoord", kFloat2_GrVertexAttribType,
-                                                        kFloat2_GrSLType);
-            this->setVertexAttributes(&kUnitCoordAttrib, 1);
+                                                        SkSLType::kFloat2);
+            this->setVertexAttributesWithImplicitOffsets(&kUnitCoordAttrib, 1);
         }
         constexpr static Attribute kInstanceAttribs[] = {
-            {"matrix2d", kFloat4_GrVertexAttribType, kFloat4_GrSLType},
-            {"translate", kFloat2_GrVertexAttribType, kFloat2_GrSLType},
-            {"pathBounds", kFloat4_GrVertexAttribType, kFloat4_GrSLType}
+            {"matrix2d", kFloat4_GrVertexAttribType, SkSLType::kFloat4},
+            {"translate", kFloat2_GrVertexAttribType, SkSLType::kFloat2},
+            {"pathBounds", kFloat4_GrVertexAttribType, SkSLType::kFloat4}
         };
-        this->setInstanceAttributes(kInstanceAttribs, SK_ARRAY_COUNT(kInstanceAttribs));
+        this->setInstanceAttributesWithImplicitOffsets(kInstanceAttribs,
+                                                       SK_ARRAY_COUNT(kInstanceAttribs));
     }
 
 private:
     const char* name() const final { return "tessellate_BoundingBoxShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 
     const SkPMColor4f fColor;
@@ -84,13 +85,13 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> BoundingBoxShader::makeProgram
             // Find the vertex position.
             float2 localcoord = mix(pathBounds.xy - bloat, pathBounds.zw + bloat, unitCoord);
             float2 vertexpos = float2x2(matrix2d) * localcoord + translate;)");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localcoord");
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertexpos");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localcoord");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertexpos");
 
             // Fragment shader.
             const char* color;
             fColorUniform = args.fUniformHandler->addUniform(nullptr, kFragment_GrShaderFlag,
-                                                             kHalf4_GrSLType, "color", &color);
+                                                             SkSLType::kHalf4, "color", &color);
             args.fFragBuilder->codeAppendf("half4 %s = %s;", args.fOutputColor, color);
             args.fFragBuilder->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
         }
@@ -220,7 +221,7 @@ void PathStencilCoverOp::onPrePrepare(GrRecordingContext* context,
     }
 }
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
 
 void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
     if (!fTessellator) {
@@ -243,7 +244,8 @@ void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
         // edge count of n are fanned by strictly fewer triangles.
         int maxTrianglesInFans = std::max(maxCombinedFanEdges - 2, 0);
         int fanTriangleCount = 0;
-        if (VertexWriter triangleVertexWriter = vertexAlloc.lock<SkPoint>(maxTrianglesInFans * 3)) {
+        if (VertexWriter triangleVertexWriter =
+                    vertexAlloc.lockWriter(sizeof(SkPoint), maxTrianglesInFans * 3)) {
             for (auto [pathMatrix, path, color] : *fPathDrawList) {
                 AffineMatrix m(pathMatrix);
                 for (PathMiddleOutFanIter it(path); !it.done();) {
@@ -253,10 +255,12 @@ void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
                     }
                 }
             }
+
+
+            SkASSERT(fanTriangleCount <= maxTrianglesInFans);
+            fFanVertexCount = fanTriangleCount * 3;
+            vertexAlloc.unlock(fFanVertexCount);
         }
-        SkASSERT(fanTriangleCount <= maxTrianglesInFans);
-        fFanVertexCount = fanTriangleCount * 3;
-        vertexAlloc.unlock(fFanVertexCount);
     }
 
     auto tessShader = &fStencilPathProgram->geomProc().cast<GrPathTessellationShader>();
@@ -269,13 +273,13 @@ void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
 
     if (fCoverBBoxProgram) {
         size_t instanceStride = fCoverBBoxProgram->geomProc().instanceStride();
-        VertexWriter vertexWriter = flushState->makeVertexSpace(instanceStride,
-                                                                fPathCount,
-                                                                &fBBoxBuffer,
-                                                                &fBBoxBaseInstance);
+        VertexWriter vertexWriter = flushState->makeVertexWriter(instanceStride,
+                                                                 fPathCount,
+                                                                 &fBBoxBuffer,
+                                                                 &fBBoxBaseInstance);
         SkDEBUGCODE(int pathCount = 0;)
         for (auto [pathMatrix, path, color] : *fPathDrawList) {
-            SkDEBUGCODE(auto end = vertexWriter.makeOffset(instanceStride));
+            SkDEBUGCODE(auto end = vertexWriter.mark(instanceStride));
             vertexWriter << pathMatrix.getScaleX()
                          << pathMatrix.getSkewY()
                          << pathMatrix.getSkewX()
@@ -297,7 +301,7 @@ void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
             } else {
                 vertexWriter << path.getBounds();
             }
-            SkASSERT(vertexWriter == end);
+            SkASSERT(vertexWriter.mark() == end);
             SkDEBUGCODE(++pathCount;)
         }
         SkASSERT(pathCount == fPathCount);
@@ -306,7 +310,7 @@ void PathStencilCoverOp::onPrepare(GrOpFlushState* flushState) {
     if (!flushState->caps().shaderCaps()->vertexIDSupport()) {
         constexpr static SkPoint kUnitQuad[4] = {{0,0}, {0,1}, {1,0}, {1,1}};
 
-        GR_DEFINE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gUnitQuadBufferKey);
 
         fBBoxVertexBufferIfNoIDSupport = flushState->resourceProvider()->findOrMakeStaticBuffer(
                 GrGpuBufferType::kVertex, sizeof(kUnitQuad), kUnitQuad, gUnitQuadBufferKey);
diff --git a/third_party/skia/src/gpu/ops/QuadPerEdgeAA.cpp b/third_party/skia/src/gpu/ops/QuadPerEdgeAA.cpp
index f73bd5d1873b4..d29798331b789 100644
--- a/third_party/skia/src/gpu/ops/QuadPerEdgeAA.cpp
+++ b/third_party/skia/src/gpu/ops/QuadPerEdgeAA.cpp
@@ -10,6 +10,7 @@
 #include "include/private/SkVx.h"
 #include "src/gpu/GrMeshDrawTarget.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/geometry/GrQuadUtils.h"
 #include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h"
@@ -612,7 +613,7 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
                                      const GrShaderCaps& caps,
                                      const GrBackendFormat& backendFormat,
                                      GrSamplerState samplerState,
-                                     const GrSwizzle& swizzle,
+                                     const skgpu::Swizzle& swizzle,
                                      sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                      Saturate saturate) {
         return arena->make([&](void* ptr) {
@@ -624,7 +625,7 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "QuadPerEdgeAAGeometryProcessor"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps&, KeyBuilder* b) const override {
         // texturing, device-dimensions are single bit flags
         b->addBool(fTexSubset.isInitialized(),    "subset");
         b->addBool(fSampler.isInitialized(),      "textured");
@@ -686,8 +687,8 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
                                                        gp.fPosition.name());
                     }
                     gpArgs->fPositionVar = {"position",
-                                            gp.fNeedsPerspective ? kFloat3_GrSLType
-                                                                 : kFloat2_GrSLType,
+                                            gp.fNeedsPerspective ? SkSLType::kFloat3
+                                                                 : SkSLType::kFloat2,
                                             GrShaderVar::TypeModifier::None};
                 } else {
                     // No coverage to eliminate
@@ -764,7 +765,7 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
 
                 // And lastly, output the coverage calculation code
                 if (gp.fCoverageMode == CoverageMode::kWithPosition) {
-                    GrGLSLVarying coverage(kFloat_GrSLType);
+                    GrGLSLVarying coverage(SkSLType::kFloat);
                     args.fVaryingHandler->addVarying("coverage", &coverage);
                     if (gp.fNeedsPerspective) {
                         // Multiply by "W" in the vertex shader, then by 1/w (sk_FragCoord.w) in
@@ -841,7 +842,7 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
                                    const GrShaderCaps& caps,
                                    const GrBackendFormat& backendFormat,
                                    GrSamplerState samplerState,
-                                   const GrSwizzle& swizzle,
+                                   const skgpu::Swizzle& swizzle,
                                    sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                    Saturate saturate)
             : INHERITED(kQuadPerEdgeAAGeometryProcessor_ClassID)
@@ -860,30 +861,30 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
 
         if (fCoverageMode == CoverageMode::kWithPosition) {
             if (fNeedsPerspective) {
-                fPosition = {"positionWithCoverage", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+                fPosition = {"positionWithCoverage", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
             } else {
-                fPosition = {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-                fCoverage = {"coverage", kFloat_GrVertexAttribType, kFloat_GrSLType};
+                fPosition = {"position", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+                fCoverage = {"coverage", kFloat_GrVertexAttribType, SkSLType::kFloat};
             }
         } else {
             if (fNeedsPerspective) {
-                fPosition = {"position", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+                fPosition = {"position", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
             } else {
-                fPosition = {"position", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+                fPosition = {"position", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
             }
         }
 
         // Need a geometry subset when the quads are AA and not rectilinear, since their AA
         // outsetting can go beyond a half pixel.
         if (spec.requiresGeometrySubset()) {
-            fGeomSubset = {"geomSubset", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+            fGeomSubset = {"geomSubset", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
         }
 
         int localDim = spec.localDimensionality();
         if (localDim == 3) {
-            fLocalCoord = {"localCoord", kFloat3_GrVertexAttribType, kFloat3_GrSLType};
+            fLocalCoord = {"localCoord", kFloat3_GrVertexAttribType, SkSLType::kFloat3};
         } else if (localDim == 2) {
-            fLocalCoord = {"localCoord", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+            fLocalCoord = {"localCoord", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
         } // else localDim == 0 and attribute remains uninitialized
 
         if (spec.hasVertexColors()) {
@@ -891,10 +892,10 @@ class QuadPerEdgeAAGeometryProcessor : public GrGeometryProcessor {
         }
 
         if (spec.hasSubset()) {
-            fTexSubset = {"texSubset", kFloat4_GrVertexAttribType, kFloat4_GrSLType};
+            fTexSubset = {"texSubset", kFloat4_GrVertexAttribType, SkSLType::kFloat4};
         }
 
-        this->setVertexAttributes(&fPosition, 6);
+        this->setVertexAttributesWithImplicitOffsets(&fPosition, 6);
     }
 
     const TextureSampler& onTextureSampler(int) const override { return fSampler; }
@@ -930,7 +931,7 @@ GrGeometryProcessor* MakeTexturedProcessor(SkArenaAlloc* arena,
                                            const GrShaderCaps& caps,
                                            const GrBackendFormat& backendFormat,
                                            GrSamplerState samplerState,
-                                           const GrSwizzle& swizzle,
+                                           const skgpu::Swizzle& swizzle,
                                            sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                            Saturate saturate) {
     return QuadPerEdgeAAGeometryProcessor::Make(arena, spec, caps, backendFormat, samplerState,
diff --git a/third_party/skia/src/gpu/ops/QuadPerEdgeAA.h b/third_party/skia/src/gpu/ops/QuadPerEdgeAA.h
index dbf58de6f1506..65d4287734a5b 100644
--- a/third_party/skia/src/gpu/ops/QuadPerEdgeAA.h
+++ b/third_party/skia/src/gpu/ops/QuadPerEdgeAA.h
@@ -146,7 +146,7 @@ namespace skgpu::v1::QuadPerEdgeAA {
         void append(GrQuad* deviceQuad, GrQuad* localQuad,
                     const SkPMColor4f& color, const SkRect& uvSubset, GrQuadAAFlags aaFlags);
 
-        SkDEBUGCODE(char* vertices() const { return (char*) fVertexWriter.ptr(); })
+        SkDEBUGCODE(skgpu::BufferWriter::Mark vertexMark() const { return fVertexWriter.mark(); })
 
     private:
         // VertexSpec defines many unique ways to write vertex attributes, which can be handled
@@ -172,7 +172,7 @@ namespace skgpu::v1::QuadPerEdgeAA {
                                                const GrShaderCaps&,
                                                const GrBackendFormat&,
                                                GrSamplerState,
-                                               const GrSwizzle&,
+                                               const skgpu::Swizzle&,
                                                sk_sp<GrColorSpaceXform> textureColorSpaceXform,
                                                Saturate);
 
diff --git a/third_party/skia/src/gpu/ops/ShadowRRectOp.cpp b/third_party/skia/src/gpu/ops/ShadowRRectOp.cpp
index fbaf2f3172d10..f0ce9c0bd0f8d 100644
--- a/third_party/skia/src/gpu/ops/ShadowRRectOp.cpp
+++ b/third_party/skia/src/gpu/ops/ShadowRRectOp.cpp
@@ -666,9 +666,9 @@ class ShadowCircularRRectOp final : public GrMeshDrawOp {
 namespace skgpu::v1::ShadowRRectOp {
 
 static GrSurfaceProxyView create_falloff_texture(GrRecordingContext* rContext) {
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey key;
-    GrUniqueKey::Builder builder(&key, kDomain, 0, "Shadow Gaussian Falloff");
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey key;
+    skgpu::UniqueKey::Builder builder(&key, kDomain, 0, "Shadow Gaussian Falloff");
     builder.finish();
 
     auto threadSafeCache = rContext->priv().threadSafeCache();
diff --git a/third_party/skia/src/gpu/ops/SmallPathRenderer.cpp b/third_party/skia/src/gpu/ops/SmallPathRenderer.cpp
index 4d1da82d652b6..43d5feab3f3a7 100644
--- a/third_party/skia/src/gpu/ops/SmallPathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/SmallPathRenderer.cpp
@@ -211,9 +211,9 @@ class SmallPathOp final : public GrMeshDrawOp {
         if (instanceCount > SK_MaxS32 / GrResourceProvider::NumVertsPerNonAAQuad()) {
             return;
         }
-        VertexWriter vertices{target->makeVertexSpace(
+        VertexWriter vertices = target->makeVertexWriter(
             kVertexStride, GrResourceProvider::NumVertsPerNonAAQuad() * instanceCount,
-            &flushInfo.fVertexBuffer, &flushInfo.fVertexOffset)};
+            &flushInfo.fVertexBuffer, &flushInfo.fVertexOffset);
 
         flushInfo.fIndexBuffer = target->resourceProvider()->refNonAAQuadIndexBuffer();
         if (!vertices || !flushInfo.fIndexBuffer) {
diff --git a/third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp b/third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp
index b2270c78328b6..9db3387ce980f 100644
--- a/third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/SoftwarePathRenderer.cpp
@@ -90,7 +90,7 @@ GrSurfaceProxyView make_deferred_mask_texture_view(GrRecordingContext* rContext,
     const GrBackendFormat format = caps->getDefaultBackendFormat(GrColorType::kAlpha_8,
                                                                  GrRenderable::kNo);
 
-    GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
+    skgpu::Swizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
 
     auto proxy =
             proxyProvider->createProxy(format, dimensions, GrRenderable::kNo, 1, GrMipmapped::kNo,
@@ -208,7 +208,7 @@ void SoftwarePathRenderer::DrawToTargetWithShapeMask(
         return;
     }
 
-    view.concatSwizzle(GrSwizzle("aaaa"));
+    view.concatSwizzle(skgpu::Swizzle("aaaa"));
 
     SkRect dstRect = SkRect::Make(deviceSpaceRectToDraw);
 
@@ -278,15 +278,15 @@ bool SoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
         }
     }
 
-    GrUniqueKey maskKey;
+    skgpu::UniqueKey maskKey;
     if (useCache) {
         // We require the upper left 2x2 of the matrix to match exactly for a cache hit.
         SkScalar sx = args.fViewMatrix->get(SkMatrix::kMScaleX);
         SkScalar sy = args.fViewMatrix->get(SkMatrix::kMScaleY);
         SkScalar kx = args.fViewMatrix->get(SkMatrix::kMSkewX);
         SkScalar ky = args.fViewMatrix->get(SkMatrix::kMSkewY);
-        static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-        GrUniqueKey::Builder builder(&maskKey, kDomain, 7 + args.fShape->unstyledKeySize(),
+        static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+        skgpu::UniqueKey::Builder builder(&maskKey, kDomain, 7 + args.fShape->unstyledKeySize(),
                                      "SW Path Mask");
         builder[0] = boundsForMask->width();
         builder[1] = boundsForMask->height();
@@ -322,7 +322,7 @@ bool SoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
     if (useCache) {
         sk_sp<GrTextureProxy> proxy = fProxyProvider->findOrCreateProxyByUniqueKey(maskKey);
         if (proxy) {
-            GrSwizzle swizzle = args.fSurfaceDrawContext->caps()->getReadSwizzle(
+            skgpu::Swizzle swizzle = args.fSurfaceDrawContext->caps()->getReadSwizzle(
                     proxy->backendFormat(), GrColorType::kAlpha_8);
             view = {std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle};
             args.fContext->priv().stats()->incNumPathMasksCacheHits();
diff --git a/third_party/skia/src/gpu/ops/StrokeRectOp.cpp b/third_party/skia/src/gpu/ops/StrokeRectOp.cpp
index 5fd4d40cfcd69..c6c700368d39e 100644
--- a/third_party/skia/src/gpu/ops/StrokeRectOp.cpp
+++ b/third_party/skia/src/gpu/ops/StrokeRectOp.cpp
@@ -8,7 +8,6 @@
 #include "src/gpu/ops/StrokeRectOp.h"
 
 #include "include/core/SkStrokeRec.h"
-#include "include/private/GrResourceKey.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkMatrixPriv.h"
 #include "src/gpu/BufferWriter.h"
@@ -19,6 +18,7 @@
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/ResourceKey.h"
 #include "src/gpu/geometry/GrQuad.h"
 #include "src/gpu/ops/FillRectOp.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"
@@ -277,8 +277,8 @@ class NonAAStrokeRectOp final : public GrMeshDrawOp {
 // AA Stroking
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
-GR_DECLARE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
 
 bool stroke_dev_half_size_supported(SkVector devHalfStrokeSize) {
     // Since the horizontal and vertical strokes share internal corners, the coverage value at that
@@ -695,7 +695,7 @@ sk_sp<const GrGpuBuffer> AAStrokeRectOp::GetIndexBuffer(GrResourceProvider* reso
         };
         // clang-format on
         static_assert(SK_ARRAY_COUNT(gMiterIndices) == kMiterIndexCnt);
-        GR_DEFINE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gMiterIndexBufferKey);
         return resourceProvider->findOrCreatePatternedIndexBuffer(
                 gMiterIndices, kMiterIndexCnt, kNumMiterRectsInIndexBuffer, kMiterVertexCnt,
                 gMiterIndexBufferKey);
@@ -760,7 +760,7 @@ sk_sp<const GrGpuBuffer> AAStrokeRectOp::GetIndexBuffer(GrResourceProvider* reso
         // clang-format on
         static_assert(SK_ARRAY_COUNT(gBevelIndices) == kBevelIndexCnt);
 
-        GR_DEFINE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gBevelIndexBufferKey);
         return resourceProvider->findOrCreatePatternedIndexBuffer(
                 gBevelIndices, kBevelIndexCnt, kNumBevelRectsInIndexBuffer, kBevelVertexCnt,
                 gBevelIndexBufferKey);
diff --git a/third_party/skia/src/gpu/ops/TessellationPathRenderer.cpp b/third_party/skia/src/gpu/ops/TessellationPathRenderer.cpp
index b84d3a649bba2..a6adca5f079dd 100644
--- a/third_party/skia/src/gpu/ops/TessellationPathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/TessellationPathRenderer.cpp
@@ -30,6 +30,7 @@ GrOp::Owner make_non_convex_fill_op(GrRecordingContext* rContext,
                                     skgpu::v1::FillPathFlags fillPathFlags,
                                     GrAAType aaType,
                                     const SkRect& drawBounds,
+                                    const SkIRect& clipBounds,
                                     const SkMatrix& viewMatrix,
                                     const SkPath& path,
                                     GrPaint&& paint) {
@@ -40,19 +41,22 @@ GrOp::Owner make_non_convex_fill_op(GrRecordingContext* rContext,
         // on the CPU. This is our fastest approach. It allows us to stencil only the curves,
         // and then fill the inner fan directly to the final render target, thus drawing the
         // majority of pixels in a single render pass.
-        float gpuFragmentWork = drawBounds.height() * drawBounds.width();
-        float cpuTessellationWork = numVerbs * SkNextLog2(numVerbs);  // N log N.
-        constexpr static float kCpuWeight = 512;
-        constexpr static float kMinNumPixelsToTriangulate = 256 * 256;
-        if (cpuTessellationWork * kCpuWeight + kMinNumPixelsToTriangulate < gpuFragmentWork) {
-            return GrOp::Make<skgpu::v1::PathInnerTriangulateOp>(rContext,
-                                                                 viewMatrix,
-                                                                 path,
-                                                                 std::move(paint),
-                                                                 aaType,
-                                                                 fillPathFlags,
-                                                                 drawBounds);
-        }
+        SkRect clippedDrawBounds = SkRect::Make(clipBounds);
+        if (clippedDrawBounds.intersect(drawBounds)) {
+            float gpuFragmentWork = clippedDrawBounds.height() * clippedDrawBounds.width();
+            float cpuTessellationWork = numVerbs * SkNextLog2(numVerbs);  // N log N.
+            constexpr static float kCpuWeight = 512;
+            constexpr static float kMinNumPixelsToTriangulate = 256 * 256;
+            if (cpuTessellationWork * kCpuWeight + kMinNumPixelsToTriangulate < gpuFragmentWork) {
+                return GrOp::Make<skgpu::v1::PathInnerTriangulateOp>(rContext,
+                                                                     viewMatrix,
+                                                                     path,
+                                                                     std::move(paint),
+                                                                     aaType,
+                                                                     fillPathFlags,
+                                                                     drawBounds);
+            }
+        } // we should be clipped out when the GrClip is analyzed, so just return the default op
     }
     return GrOp::Make<skgpu::v1::PathStencilCoverOp>(rContext,
                                                      arena,
@@ -196,6 +200,7 @@ bool TessellationPathRenderer::onDrawPath(const DrawPathArgs& args) {
                                       FillPathFlags::kNone,
                                       args.fAAType,
                                       drawBounds,
+                                      *args.fClipConservativeBounds,
                                       *args.fViewMatrix,
                                       path,
                                       std::move(args.fPaint));
@@ -254,6 +259,7 @@ void TessellationPathRenderer::onStencilPath(const StencilPathArgs& args) {
                                       FillPathFlags::kStencilOnly,
                                       aaType,
                                       pathDevBounds,
+                                      *args.fClipConservativeBounds,
                                       *args.fViewMatrix,
                                       path,
                                       GrPaint());
diff --git a/third_party/skia/src/gpu/ops/TextureOp.cpp b/third_party/skia/src/gpu/ops/TextureOp.cpp
index 2e95cf7961789..9c767e85381e3 100644
--- a/third_party/skia/src/gpu/ops/TextureOp.cpp
+++ b/third_party/skia/src/gpu/ops/TextureOp.cpp
@@ -348,7 +348,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
     // performance (since texture ops are one of the most commonly used in an app).
     struct Metadata {
         // AAType must be filled after initialization; ColorType is determined in finalize()
-        Metadata(const GrSwizzle& swizzle,
+        Metadata(const skgpu::Swizzle& swizzle,
                  GrSamplerState::Filter filter,
                  GrSamplerState::MipmapMode mm,
                  Subset subset,
@@ -363,7 +363,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
             , fSubset(static_cast<uint16_t>(subset))
             , fSaturate(static_cast<uint16_t>(saturate)) {}
 
-        GrSwizzle fSwizzle; // sizeof(GrSwizzle) == uint16_t
+        skgpu::Swizzle fSwizzle; // sizeof(skgpu::Swizzle) == uint16_t
         uint16_t  fProxyCount;
         // This will be >= fProxyCount, since a proxy may be drawn multiple times
         uint16_t  fTotalQuadCount;
@@ -720,7 +720,8 @@ class TextureOpImpl final : public GrMeshDrawOp {
 
         SkDEBUGCODE(int totQuadsSeen = 0;)
         SkDEBUGCODE(int totVerticesSeen = 0;)
-        SkDEBUGCODE(const size_t vertexSize = desc->fVertexSpec.vertexSize());
+        SkDEBUGCODE(const size_t vertexSize = desc->fVertexSpec.vertexSize();)
+        SkDEBUGCODE(auto startMark{vertexData};)
 
         skgpu::v1::QuadPerEdgeAA::Tessellator tessellator(desc->fVertexSpec, vertexData);
         for (const auto& op : ChainRange<TextureOpImpl>(texOp)) {
@@ -738,7 +739,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
                 }
 
                 SkASSERT((totVerticesSeen + meshVertexCnt) * vertexSize
-                         == (size_t)(tessellator.vertices() - vertexData));
+                         == (size_t)(tessellator.vertexMark() - startMark));
 
                 SkDEBUGCODE(totQuadsSeen += quadCnt;)
                 SkDEBUGCODE(totVerticesSeen += meshVertexCnt);
@@ -750,7 +751,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
             SkASSERT(!iter.next());
         }
 
-        SkASSERT(desc->totalSizeInBytes() == (size_t)(tessellator.vertices() - vertexData));
+        SkASSERT(desc->totalSizeInBytes() == (size_t)(tessellator.vertexMark() - startMark));
         SkASSERT(totQuadsSeen == desc->fNumTotalQuads);
         SkASSERT(totVerticesSeen == desc->totalNumVertices());
     }
@@ -758,7 +759,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
 #ifdef SK_DEBUG
     static int validate_op(GrTextureType textureType,
                            GrAAType aaType,
-                           GrSwizzle swizzle,
+                           skgpu::Swizzle swizzle,
                            const TextureOpImpl* op) {
         SkASSERT(op->fMetadata.fSwizzle == swizzle);
 
@@ -778,7 +779,7 @@ class TextureOpImpl final : public GrMeshDrawOp {
         // NOTE: Since this is debug-only code, we use the virtual asTextureProxy()
         auto textureType = fViewCountPairs[0].fProxy->asTextureProxy()->textureType();
         GrAAType aaType = fMetadata.aaType();
-        GrSwizzle swizzle = fMetadata.fSwizzle;
+        skgpu::Swizzle swizzle = fMetadata.fSwizzle;
 
         int quadCount = validate_op(textureType, aaType, swizzle, this);
 
diff --git a/third_party/skia/src/gpu/ops/TriangulatingPathRenderer.cpp b/third_party/skia/src/gpu/ops/TriangulatingPathRenderer.cpp
index 0f2fd0aa7c1ab..efeb9b292a779 100644
--- a/third_party/skia/src/gpu/ops/TriangulatingPathRenderer.cpp
+++ b/third_party/skia/src/gpu/ops/TriangulatingPathRenderer.cpp
@@ -83,13 +83,15 @@ bool is_newer_better(SkData* incumbent, SkData* challenger) {
 // When the SkPathRef genID changes, invalidate a corresponding GrResource described by key.
 class UniqueKeyInvalidator : public SkIDChangeListener {
 public:
-    UniqueKeyInvalidator(const GrUniqueKey& key, uint32_t contextUniqueID)
+    UniqueKeyInvalidator(const skgpu::UniqueKey& key, uint32_t contextUniqueID)
             : fMsg(key, contextUniqueID, /* inThreadSafeCache */ true) {}
 
 private:
-    GrUniqueKeyInvalidatedMessage fMsg;
+    skgpu::UniqueKeyInvalidatedMessage fMsg;
 
-    void changed() override { SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(fMsg); }
+    void changed() override {
+        SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Post(fMsg);
+    }
 };
 
 class StaticVertexAllocator : public GrEagerVertexAllocator {
@@ -230,17 +232,17 @@ class TriangulatingPathOp final : public GrMeshDrawOp {
         return path;
     }
 
-    static void CreateKey(GrUniqueKey* key,
+    static void CreateKey(skgpu::UniqueKey* key,
                           const GrStyledShape& shape,
                           const SkIRect& devClipBounds) {
-        static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+        static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
 
         bool inverseFill = shape.inverseFilled();
 
         static constexpr int kClipBoundsCnt = sizeof(devClipBounds) / sizeof(uint32_t);
         int shapeKeyDataCnt = shape.unstyledKeySize();
         SkASSERT(shapeKeyDataCnt >= 0);
-        GrUniqueKey::Builder builder(key, kDomain, shapeKeyDataCnt + kClipBoundsCnt, "Path");
+        skgpu::UniqueKey::Builder builder(key, kDomain, shapeKeyDataCnt + kClipBoundsCnt, "Path");
         shape.writeUnstyledKey(&builder[0]);
         // For inverse fills, the tessellation is dependent on clip bounds.
         if (inverseFill) {
@@ -280,7 +282,7 @@ class TriangulatingPathOp final : public GrMeshDrawOp {
         GrResourceProvider* rp = target->resourceProvider();
         auto threadSafeCache = target->threadSafeCache();
 
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         CreateKey(&key, fShape, fDevClipBounds);
 
         SkScalar tol = GrPathUtils::scaleToleranceToSrc(GrPathUtils::kDefaultTolerance,
@@ -439,7 +441,7 @@ class TriangulatingPathOp final : public GrMeshDrawOp {
 
         auto threadSafeViewCache = rContext->priv().threadSafeCache();
 
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         CreateKey(&key, fShape, fDevClipBounds);
 
         SkScalar tol = GrPathUtils::scaleToleranceToSrc(GrPathUtils::kDefaultTolerance,
diff --git a/third_party/skia/src/gpu/tessellate/BUILD.bazel b/third_party/skia/src/gpu/tessellate/BUILD.bazel
index 37a9434beee1b..ad918e4f06e3b 100644
--- a/third_party/skia/src/gpu/tessellate/BUILD.bazel
+++ b/third_party/skia/src/gpu/tessellate/BUILD.bazel
@@ -38,8 +38,8 @@ generated_cc_atom(
     hdrs = ["PatchWriter.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":MiddleOutPolygonTriangulator_hdr",
         ":Tessellation_hdr",
+        ":WangsFormula_hdr",
         "//include/private:SkColorData_hdr",
         "//src/gpu:GrVertexChunkArray_hdr",
     ],
@@ -50,6 +50,7 @@ generated_cc_atom(
     srcs = ["PatchWriter.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":MiddleOutPolygonTriangulator_hdr",
         ":PatchWriter_hdr",
         ":PathTessellator_hdr",
         ":StrokeTessellator_hdr",
@@ -114,6 +115,7 @@ generated_cc_atom(
         ":PathCurveTessellator_hdr",
         ":PathWedgeTessellator_hdr",
         ":WangsFormula_hdr",
+        "//src/core:SkPathPriv_hdr",
         "//src/gpu:GrMeshDrawTarget_hdr",
         "//src/gpu:GrOpFlushState_hdr",
         "//src/gpu:GrResourceProvider_hdr",
diff --git a/third_party/skia/src/gpu/tessellate/CullTest.h b/third_party/skia/src/gpu/tessellate/CullTest.h
index 655fe3b430141..d0d306e55f46e 100644
--- a/third_party/skia/src/gpu/tessellate/CullTest.h
+++ b/third_party/skia/src/gpu/tessellate/CullTest.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef tessellate_CullTest_DEFINED
-#define tessellate_CullTest_DEFINED
+#ifndef skgpu_tessellate_CullTest_DEFINED
+#define skgpu_tessellate_CullTest_DEFINED
 
 #include "include/core/SkMatrix.h"
 #include "src/gpu/tessellate/Tessellation.h"
@@ -104,4 +104,4 @@ class CullTest {
 
 }  // namespace skgpu
 
-#endif  // tessellate_CullTest_DEFINED
+#endif  // skgpu_tessellate_CullTest_DEFINED
diff --git a/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h b/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h
index f82c6002adb9c..5e0de66c793aa 100644
--- a/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h
+++ b/third_party/skia/src/gpu/tessellate/MiddleOutPolygonTriangulator.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef tessellate_MiddleOutPolygonTriangulator_DEFINED
-#define tessellate_MiddleOutPolygonTriangulator_DEFINED
+#ifndef skgpu_tessellate_MiddleOutPolygonTriangulator_DEFINED
+#define skgpu_tessellate_MiddleOutPolygonTriangulator_DEFINED
 
 #include "include/core/SkPath.h"
 #include "include/core/SkPoint.h"
@@ -239,4 +239,4 @@ class PathMiddleOutFanIter {
 
 }  // namespace skgpu
 
-#endif  // tessellate_MiddleOutPolygonTriangulator_DEFINED
+#endif  // skgpu_tessellate_MiddleOutPolygonTriangulator_DEFINED
diff --git a/third_party/skia/src/gpu/tessellate/PatchWriter.cpp b/third_party/skia/src/gpu/tessellate/PatchWriter.cpp
index 9e4741fe1ec3b..3c06ca7191aa3 100644
--- a/third_party/skia/src/gpu/tessellate/PatchWriter.cpp
+++ b/third_party/skia/src/gpu/tessellate/PatchWriter.cpp
@@ -7,6 +7,8 @@
 
 #include "src/gpu/tessellate/PatchWriter.h"
 
+#include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h"
+
 #if SK_GPU_V1
 #include "src/gpu/tessellate/PathTessellator.h"
 #include "src/gpu/tessellate/StrokeTessellator.h"
@@ -16,31 +18,42 @@ namespace skgpu {
 
 SK_ALWAYS_INLINE SkPoint to_skpoint(float2 p) { return skvx::bit_pun<SkPoint>(p); }
 
+void write_triangle_stack(PatchWriter* writer,
+                          MiddleOutPolygonTriangulator::PoppedTriangleStack&& stack) {
+    for (auto [p0, p1, p2] : stack) {
+        writer->writeTriangle(p0, p1, p2);
+    }
+}
+
 #if SK_GPU_V1
 PatchWriter::PatchWriter(GrMeshDrawTarget* target,
                          PathTessellator* tessellator,
+                         int maxTessellationSegments,
                          int initialPatchAllocCount)
         : PatchWriter(target,
                       &tessellator->fVertexChunkArray,
                       tessellator->fAttribs,
+                      maxTessellationSegments,
                       sizeof(SkPoint) * 4 + PatchAttribsStride(tessellator->fAttribs),
                       initialPatchAllocCount) {
 }
 
 PatchWriter::PatchWriter(GrMeshDrawTarget* target,
                          StrokeTessellator* tessellator,
+                         int maxTessellationSegments,
                          int initialPatchAllocCount)
         : PatchWriter(target,
                       &tessellator->fVertexChunkArray,
                       tessellator->fAttribs,
-                      sizeof(SkPoint) * 5 + PatchAttribsStride(tessellator->fAttribs),
+                      maxTessellationSegments,
+                      sizeof(SkPoint) * 4 + PatchAttribsStride(tessellator->fAttribs),
                       initialPatchAllocCount) {
 }
 #endif
 
 void PatchWriter::chopAndWriteQuads(float2 p0, float2 p1, float2 p2, int numPatches) {
-    // If we aren't fanning, we need to fill the space between chops with triangles.
-    bool needsInnerTriangles = !(fAttribs & PatchAttribs::kFanPoint);
+    // If we aren't fanning or stroking, we need to fill the space between chops with triangles.
+    const bool needsInnerTriangles = this->writesCurvesOnly();
     MiddleOutPolygonTriangulator innerTriangulator(numPatches, to_skpoint(p0));
     for (; numPatches >= 3; numPatches -= 2) {
         // Chop into 3 quads.
@@ -51,13 +64,13 @@ void PatchWriter::chopAndWriteQuads(float2 p0, float2 p1, float2 p2, int numPatc
         // p1 & p2 of the cubic representation of the middle quad.
         float4 middle = mix(ab, bc, mix(T, T.zwxy(), 2/3.f));
 
-        CubicPatch(*this) << QuadToCubic{p0, ab.lo, abc.lo};  // Write the 1st quad.
+        this->writeQuadPatch(p0, ab.lo, abc.lo);  // Write the 1st quad.
         if (needsInnerTriangles) {
-            TrianglePatch(*this) << p0 << abc.lo << abc.hi;
+            this->writeTriangle(p0, abc.lo, abc.hi);
         }
-        CubicPatch(*this) << abc.lo << middle << abc.hi;  // Write the 2nd quad.
+        this->writeCubicPatch(abc.lo, middle, abc.hi);  // Write the 2nd quad (as a cubic already)
         if (needsInnerTriangles) {
-            *this << innerTriangulator.pushVertex(to_skpoint(abc.hi));
+            write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(abc.hi)));
         }
         std::tie(p0, p1) = {abc.hi, bc.hi};  // Save the 3rd quad.
     }
@@ -67,24 +80,24 @@ void PatchWriter::chopAndWriteQuads(float2 p0, float2 p1, float2 p2, int numPatc
         float2 bc = (p1 + p2) * .5f;
         float2 abc = (ab + bc) * .5f;
 
-        CubicPatch(*this) << QuadToCubic{p0, ab, abc};  // Write the 1st quad.
+        this->writeQuadPatch(p0, ab, abc);  // Write the 1st quad.
         if (needsInnerTriangles) {
-            TrianglePatch(*this) << p0 << abc << p2;
+            this->writeTriangle(p0, abc, p2);
         }
-        CubicPatch(*this) << QuadToCubic{abc, bc, p2};  // Write the 2nd quad.
+        this->writeQuadPatch(abc, bc, p2);  // Write the 2nd quad.
     } else {
         SkASSERT(numPatches == 1);
-        CubicPatch(*this) << QuadToCubic{p0, p1, p2};  // Write the single quad.
+        this->writeQuadPatch(p0, p1, p2);  // Write the single remaining quad.
     }
     if (needsInnerTriangles) {
-        *this << innerTriangulator.pushVertex(to_skpoint(p2));
-        *this << innerTriangulator.close();
+        write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(p2)));
+        write_triangle_stack(this, innerTriangulator.close());
     }
 }
 
 void PatchWriter::chopAndWriteConics(float2 p0, float2 p1, float2 p2, float w, int numPatches) {
-    // If we aren't fanning, we need to fill the space between chops with triangles.
-    bool needsInnerTriangles = !(fAttribs & PatchAttribs::kFanPoint);
+    // If we aren't fanning or stroking, we need to fill the space between chops with triangles.
+    const bool needsInnerTriangles = this->writesCurvesOnly();
     MiddleOutPolygonTriangulator innerTriangulator(numPatches, to_skpoint(p0));
     // Load the conic in 3d homogeneous (unprojected) space.
     float4 h0 = float4(p0,1,1);
@@ -99,30 +112,30 @@ void PatchWriter::chopAndWriteConics(float2 p0, float2 p1, float2 p2, float w, i
 
         // Project and write the 1st conic.
         float2 midpoint = abc.xy() / abc.w();
-        ConicPatch(*this) << (h0.xy() / h0.w())
-                          << (ab.xy() / ab.w())
-                          << midpoint
-                          << (ab.w() / sqrtf(h0.w() * abc.w()));
+        this->writeConicPatch(h0.xy() / h0.w(),
+                              ab.xy() / ab.w(),
+                              midpoint,
+                              ab.w() / sqrtf(h0.w() * abc.w()));
         if (needsInnerTriangles) {
-            *this << innerTriangulator.pushVertex(to_skpoint(midpoint));
+            write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(midpoint)));
         }
         std::tie(h0, h1) = {abc, bc};  // Save the 2nd conic (in homogeneous space).
     }
     // Project and write the remaining conic.
     SkASSERT(numPatches == 1);
-    ConicPatch(*this) << (h0.xy() / h0.w())
-                      << (h1.xy() / h1.w())
-                      << h2.xy()  // h2.w == 1
-                      << (h1.w() / sqrtf(h0.w()));
+    this->writeConicPatch(h0.xy() / h0.w(),
+                          h1.xy() / h1.w(),
+                          h2.xy(), // h2.w == 1
+                          h1.w() / sqrtf(h0.w()));
     if (needsInnerTriangles) {
-        *this << innerTriangulator.pushVertex(to_skpoint(h2.xy()));
-        *this << innerTriangulator.close();
+        write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(h2.xy())));
+        write_triangle_stack(this, innerTriangulator.close());
     }
 }
 
 void PatchWriter::chopAndWriteCubics(float2 p0, float2 p1, float2 p2, float2 p3, int numPatches) {
-    // If we aren't fanning, we need to fill the space between chops with triangles.
-    bool needsInnerTriangles = !(fAttribs & PatchAttribs::kFanPoint);
+    // If we aren't fanning or stroking, we need to fill the space between chops with triangles.
+    const bool needsInnerTriangles = this->writesCurvesOnly();
     MiddleOutPolygonTriangulator innerTriangulator(numPatches, to_skpoint(p0));
     for (; numPatches >= 3; numPatches -= 2) {
         // Chop into 3 cubics.
@@ -135,13 +148,13 @@ void PatchWriter::chopAndWriteCubics(float2 p0, float2 p1, float2 p2, float2 p3,
         float4 abcd = mix(abc, bcd, T);
         float4 middle = mix(abc, bcd, T.zwxy());  // p1 & p2 of the middle cubic.
 
-        CubicPatch(*this) << p0 << ab.lo << abc.lo << abcd.lo;  // Write the 1st cubic.
+        this->writeCubicPatch(p0, ab.lo, abc.lo, abcd.lo);  // Write the 1st cubic.
         if (needsInnerTriangles) {
-            TrianglePatch(*this) << p0 << abcd.lo << abcd.hi;
+            this->writeTriangle(p0, abcd.lo, abcd.hi);
         }
-        CubicPatch(*this) << abcd.lo << middle << abcd.hi;  // Write the 2nd cubic.
+        this->writeCubicPatch(abcd.lo, middle, abcd.hi);  // Write the 2nd cubic.
         if (needsInnerTriangles) {
-            *this << innerTriangulator.pushVertex(to_skpoint(abcd.hi));
+            write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(abcd.hi)));
         }
         std::tie(p0, p1, p2) = {abcd.hi, bcd.hi, cd.hi};  // Save the 3rd cubic.
     }
@@ -154,18 +167,18 @@ void PatchWriter::chopAndWriteCubics(float2 p0, float2 p1, float2 p2, float2 p3,
         float2 bcd = (bc + cd) * .5f;
         float2 abcd = (abc + bcd) * .5f;
 
-        CubicPatch(*this) << p0 << ab << abc << abcd;  // Write the 1st cubic.
+        this->writeCubicPatch(p0, ab, abc, abcd);  // Write the 1st cubic.
         if (needsInnerTriangles) {
-            TrianglePatch(*this) << p0 << abcd << p3;
+            this->writeTriangle(p0, abcd, p3);
         }
-        CubicPatch(*this) << abcd << bcd << cd << p3;  // Write the 2nd cubic.
+        this->writeCubicPatch(abcd, bcd, cd, p3);  // Write the 2nd cubic.
     } else {
         SkASSERT(numPatches == 1);
-        CubicPatch(*this) << p0 << p1 << p2 << p3;  // Write the single cubic.
+        this->writeCubicPatch(p0, p1, p2, p3);  // Write the single remaining cubic.
     }
     if (needsInnerTriangles) {
-        *this << innerTriangulator.pushVertex(to_skpoint(p3));
-        *this << innerTriangulator.close();
+        write_triangle_stack(this, innerTriangulator.pushVertex(to_skpoint(p3)));
+        write_triangle_stack(this, innerTriangulator.close());
     }
 }
 
diff --git a/third_party/skia/src/gpu/tessellate/PatchWriter.h b/third_party/skia/src/gpu/tessellate/PatchWriter.h
index 52e2c88cdeff1..da0241bec7445 100644
--- a/third_party/skia/src/gpu/tessellate/PatchWriter.h
+++ b/third_party/skia/src/gpu/tessellate/PatchWriter.h
@@ -10,8 +10,10 @@
 
 #include "include/private/SkColorData.h"
 #include "src/gpu/GrVertexChunkArray.h"
-#include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h"
 #include "src/gpu/tessellate/Tessellation.h"
+#include "src/gpu/tessellate/WangsFormula.h"
+
+#define AI SK_ALWAYS_INLINE
 
 namespace skgpu {
 
@@ -22,190 +24,368 @@ class StrokeTessellator;
 
 // Writes out tessellation patches, formatted with their specific attribs, to a GPU buffer.
 class PatchWriter {
+    using VectorXform = wangs_formula::VectorXform;
 public:
     PatchWriter(GrMeshDrawTarget* target,
                 GrVertexChunkArray* vertexChunkArray,
                 PatchAttribs attribs,
+                int maxTessellationSegments,
                 size_t patchStride,
                 int initialAllocCount)
             : fAttribs(attribs)
+            , fMaxSegments_pow2(pow2(maxTessellationSegments))
+            , fMaxSegments_pow4(pow2(fMaxSegments_pow2))
             , fChunker(target, vertexChunkArray, patchStride, initialAllocCount) {
+        // For fans or strokes, the minimum required segment count is 1 (making either a triangle
+        // with the fan point, or a stroked line). Otherwise, we need 2 segments to represent
+        // triangles purely from the tessellated vertices.
+        fCurrMinSegments_pow4 = (attribs & PatchAttribs::kFanPoint ||
+                                 attribs & PatchAttribs::kJoinControlPoint) ? 1.f : 16.f; // 2^4
     }
 
 #if SK_GPU_V1
     // Create PatchWriters that write directly to the GrVertexChunkArrays stored on the provided
     // tessellators.
-    PatchWriter(GrMeshDrawTarget*, PathTessellator*, int initialPatchAllocCount);
-    PatchWriter(GrMeshDrawTarget*, StrokeTessellator*, int initialPatchAllocCount);
+    PatchWriter(GrMeshDrawTarget*, PathTessellator*,
+                int maxTessellationSegments, int initialPatchAllocCount);
+    PatchWriter(GrMeshDrawTarget*, StrokeTessellator*,
+                int maxTessellationSegments, int initialPatchAllocCount);
 #endif
 
+    ~PatchWriter() {
+        // finishStrokeContour() should have been called before this was deleted (or never used).
+        SkASSERT(!fHasDeferredPatch && !fHasJoinControlPoint);
+    }
+
     PatchAttribs attribs() const { return fAttribs; }
 
+    // Fast log2 of minimum required # of segments per tracked Wang's formula calculations.
+    int requiredResolveLevel() const {
+        return wangs_formula::nextlog16(fCurrMinSegments_pow4); // log16(n^4) == log2(n)
+    }
+    // Fast minimum required # of segments from tracked Wang's formula calculations.
+    int requiredFixedSegments() const {
+        return SkScalarCeilToInt(wangs_formula::root4(fCurrMinSegments_pow4));
+    }
+
+    // Updates the stroke's join control point that will be written out with each patch. This is
+    // automatically adjusted when appending various geometries (e.g. Conic/Cubic), but sometimes
+    // must be set explicitly.
+    //
+    // PatchAttribs::kJoinControlPoint must be enabled.
+    void updateJoinControlPointAttrib(SkPoint lastControlPoint) {
+        SkASSERT(fAttribs & PatchAttribs::kJoinControlPoint && lastControlPoint.isFinite());
+        fJoinControlPointAttrib = lastControlPoint;
+        fHasJoinControlPoint = true;
+    }
+    // Completes a closed contour of a stroke by rewriting a deferred patch with now-available
+    // join control point information. Automatically resets the join control point attribute.
+    //
+    // PatchAttribs::kJoinControlPoint must be enabled.
+    void writeDeferredStrokePatch() {
+        SkASSERT(fAttribs & PatchAttribs::kJoinControlPoint);
+        if (fHasDeferredPatch) {
+            SkASSERT(fHasJoinControlPoint);
+            // Overwrite join control point with updated value, which is the first attribute
+            // after the 4 control points.
+            memcpy(SkTAddOffset<void>(fDeferredPatchStorage, 4 * sizeof(SkPoint)),
+                   &fJoinControlPointAttrib, sizeof(SkPoint));
+            if (VertexWriter vw = fChunker.appendVertex()) {
+                vw << VertexWriter::Array<char>(fDeferredPatchStorage, fChunker.stride());
+            }
+        }
+
+        fHasDeferredPatch = false;
+        fHasJoinControlPoint = false;
+    }
+    // TODO: These are only used by StrokeHardwareTessellator and ideally its patch writing logic
+    // should be simplified like StrokeFixedCountTessellator's, and then this can go away.
+    void resetJoinControlPointAttrib() {
+        SkASSERT(fAttribs & PatchAttribs::kJoinControlPoint);
+        // Should have already been written or caller should manually defer
+        SkASSERT(!fHasDeferredPatch);
+        fHasJoinControlPoint = false;
+    }
+    SkPoint joinControlPoint() const { return fJoinControlPointAttrib; }
+    bool hasJoinControlPoint() const { return fHasJoinControlPoint; }
+
     // Updates the fan point that will be written out with each patch (i.e., the point that wedges
     // fan around).
-    // PathPatchAttrib::kFanPoint must be enabled.
+    // PatchAttribs::kFanPoint must be enabled.
     void updateFanPointAttrib(SkPoint fanPoint) {
         SkASSERT(fAttribs & PatchAttribs::kFanPoint);
         fFanPointAttrib = fanPoint;
     }
 
     // Updates the stroke params that are written out with each patch.
-    // PathPatchAttrib::kStrokeParams must be enabled.
+    // PatchAttribs::kStrokeParams must be enabled.
     void updateStrokeParamsAttrib(StrokeParams strokeParams) {
         SkASSERT(fAttribs & PatchAttribs::kStrokeParams);
         fStrokeParamsAttrib = strokeParams;
     }
 
     // Updates the color that will be written out with each patch.
-    // PathPatchAttrib::kColor must be enabled.
+    // PatchAttribs::kColor must be enabled.
     void updateColorAttrib(const SkPMColor4f& color) {
         SkASSERT(fAttribs & PatchAttribs::kColor);
         fColorAttrib.set(color, fAttribs & PatchAttribs::kWideColorIfEnabled);
     }
 
-    // RAII. Appends a patch during construction and writes the attribs during destruction.
-    //
-    //    Patch(patchWriter, explicitCurveType) << p0 << p1 << ...;
-    //
-    struct Patch {
-        Patch(PatchWriter& w, float explicitCurveType)
-                : fPatchWriter(w)
-                , fVertexWriter(w.appendPatch())
-                , fExplicitCurveType(explicitCurveType) {}
-        ~Patch() {
-            fPatchWriter.emitPatchAttribs(std::move(fVertexWriter), fExplicitCurveType);
-        }
-        operator VertexWriter&() { return fVertexWriter; }
-        PatchWriter& fPatchWriter;
-        VertexWriter fVertexWriter;
-        const float fExplicitCurveType;
-    };
-
-    // RAII. Appends a patch during construction and writes the remaining data for a cubic during
-    // destruction. The caller outputs p0,p1,p2,p3 (8 floats):
-    //
-    //    CubicPatch(patchWriter) << p0 << p1 << p2 << p3;
-    //
-    struct CubicPatch : public Patch {
-        CubicPatch(PatchWriter& w) : Patch(w, kCubicCurveType) {}
-    };
+    /**
+     * writeX functions for supported patch geometry types. Every geometric type is converted to an
+     * equivalent cubic or conic, so this will always write at minimum 8 floats for the four control
+     * points (cubic) or three control points and {w, inf} (conics). The PatchWriter additionally
+     * writes the current values of all attributes enabled in its PatchAttribs flags.
+     */
 
-    // RAII. Appends a patch during construction and writes the remaining data for a conic during
-    // destruction. The caller outputs p0,p1,p2,w (7 floats):
-    //
-    //     ConicPatch(patchWriter) << p0 << p1 << p2 << w;
-    //
-    struct ConicPatch : public Patch {
-        ConicPatch(PatchWriter& w) : Patch(w, kConicCurveType) {}
-        ~ConicPatch() {
-            fVertexWriter << VertexWriter::kIEEE_32_infinity;  // p3.y=Inf indicates a conic.
+    // Writes four control points manually prepared.
+    // TODO: Only used by StrokeHardwareTessellator
+    AI void writeHwPatch(const SkPoint p[4]) {
+        float4 p0p1 = float4::Load(p);
+        float4 p2p3 = float4::Load(p + 2);
+        this->writePatch(p0p1.lo, p0p1.hi, p2p3.lo, p2p3.hi, /*unused*/0.f);
+    }
+
+    // Write a cubic curve with its four control points.
+    AI void writeCubic(float2 p0, float2 p1, float2 p2, float2 p3,
+                       const VectorXform& shaderXform,
+                       float precision = kTessellationPrecision) {
+        float n4 = wangs_formula::cubic_pow4(precision, p0, p1, p2, p3, shaderXform);
+        if (this->writesCurvesOnly()) {
+            if (n4 <= 1.f) {
+                // This cubic only needs one segment (e.g. a line) but we're not filling space with
+                // fans or stroking, so nothing actually needs to be drawn.
+                return;
+            }
+        }
+        if (this->updateRequiredSegments(n4)) {
+            this->writeCubicPatch(p0, p1, p2, p3);
+        } else {
+            int numPatches = SkScalarCeilToInt(wangs_formula::root4(
+                    std::min(n4, pow4(kMaxTessellationSegmentsPerCurve)) / fMaxSegments_pow4));
+            this->chopAndWriteCubics(p0, p1, p2, p3, numPatches);
         }
-    };
+    }
+    AI void writeCubic(const SkPoint pts[4],
+                       const VectorXform& shaderXform,
+                       float precision = kTessellationPrecision) {
+        float4 p0p1 = float4::Load(pts);
+        float4 p2p3 = float4::Load(pts + 2);
+        this->writeCubic(p0p1.lo, p0p1.hi, p2p3.lo, p2p3.hi, shaderXform, precision);
+    }
 
-    // RAII. Appends a patch during construction and writes the remaining data for a triangle during
-    // destruction. The caller outputs p0,p1,p2 (6 floats):
-    //
-    //     TrianglePatch(patchWriter) << p0 << p1 << p2;
-    //
-    struct TrianglePatch : public Patch {
-        TrianglePatch(PatchWriter& w) : Patch(w, kTriangularConicCurveType) {}
-        ~TrianglePatch() {
-            // Mark this patch as a triangle by setting it to a conic with w=Inf.
-            fVertexWriter << VertexWriter::Repeat<2>(VertexWriter::kIEEE_32_infinity);
+    // Write a conic curve with three control points and 'w', with the last coord of the last
+    // control point signaling a conic by being set to infinity.
+    AI void writeConic(float2 p0, float2 p1, float2 p2, float w,
+                       const VectorXform& shaderXform,
+                       float precision = kTessellationPrecision) {
+        float n2 = wangs_formula::conic_pow2(precision, p0, p1, p2, w, shaderXform);
+        if (this->writesCurvesOnly()) {
+            if (n2 <= 1.f) {
+                // This conic only needs one segment (e.g. a line) but we're not filling space with
+                // fans or stroking, so nothing actually needs to be drawn.
+                return;
+            }
+        }
+        if (this->updateRequiredSegments(n2*n2)) {
+            this->writeConicPatch(p0, p1, p2, w);
+        } else {
+            int numPatches = SkScalarCeilToInt(sqrtf(
+                    std::min(n2, pow2(kMaxTessellationSegmentsPerCurve)) / fMaxSegments_pow2));
+            this->chopAndWriteConics(p0, p1, p2, w, numPatches);
         }
-    };
+    }
+    AI void writeConic(const SkPoint pts[3], float w,
+                       const VectorXform& shaderXform,
+                       float precision = kTessellationPrecision) {
+        this->writeConic(skvx::bit_pun<float2>(pts[0]),
+                         skvx::bit_pun<float2>(pts[1]),
+                         skvx::bit_pun<float2>(pts[2]),
+                         w, shaderXform, precision);
+    }
 
-    // Chops the given quadratic into 'numPatches' equal segments (in the parametric sense) and
-    // writes them to the GPU buffer.
-    //
-    // Fills space between chops with triangles if PathPatchAttrib::kFanPoint is not enabled.
-    void chopAndWriteQuads(float2 p0, float2 p1, float2 p2, int numPatches);
+    // Write a quadratic curve that automatically converts its three control points into an
+    // equivalent cubic.
+    AI void writeQuadratic(float2 p0, float2 p1, float2 p2,
+                           const VectorXform& shaderXform,
+                           float precision = kTessellationPrecision) {
+        float n4 = wangs_formula::quadratic_pow4(precision, p0, p1, p2, shaderXform);
+        if (this->writesCurvesOnly()) {
+            if (n4 <= 1.f) {
+                // This quad only needs one segment (e.g. a line) but we're not filling space with
+                // fans or stroking, so nothing actually needs to be drawn.
+                return;
+            }
+        }
+        if (this->updateRequiredSegments(n4)) {
+            this->writeQuadPatch(p0, p1, p2);
+        } else {
+            int numPatches = SkScalarCeilToInt(wangs_formula::root4(
+                    std::min(n4, pow4(kMaxTessellationSegmentsPerCurve)) / fMaxSegments_pow4));
+            this->chopAndWriteQuads(p0, p1, p2, numPatches);
+        }
+    }
+    AI void writeQuadratic(const SkPoint pts[3],
+                           const VectorXform& shaderXform,
+                           float precision = kTessellationPrecision) {
+        this->writeQuadratic(skvx::bit_pun<float2>(pts[0]),
+                             skvx::bit_pun<float2>(pts[1]),
+                             skvx::bit_pun<float2>(pts[2]),
+                             shaderXform, precision);
+    }
 
-    // Chops the given conic into 'numPatches' equal segments (in the parametric sense) and
-    // writes them to the GPU buffer.
-    //
-    // Fills space between chops with triangles if PathPatchAttrib::kFanPoint is not enabled.
-    void chopAndWriteConics(float2 p0, float2 p1, float2 p2, float w, int numPatches);
+    // Write a line that is automatically converted into an equivalent cubic.
+    AI void writeLine(float4 p0p1) {
+        // No chopping needed, and should have been reset to 1 segment if using writeLine
+        SkASSERT(fCurrMinSegments_pow4 >= 1.f);
+        this->writeCubicPatch(p0p1.lo, (p0p1.zwxy() - p0p1) * (1/3.f) + p0p1, p0p1.hi);
+    }
+    AI void writeLine(float2 p0, float2 p1) { this->writeLine({p0, p1}); }
+    AI void writeLine(SkPoint p0, SkPoint p1) {
+        this->writeLine(skvx::bit_pun<float2>(p0), skvx::bit_pun<float2>(p1));
+    }
 
-    // Chops the given cubic into 'numPatches' equal segments (in the parametric sense) and
-    // writes them to the GPU buffer.
-    //
-    // Fills space between chops with triangles if PathPatchAttrib::kFanPoint is not enabled.
-    void chopAndWriteCubics(float2 p0, float2 p1, float2 p2, float2 p3, int numPatches);
+    // Write a triangle by setting it to a conic with w=Inf, and using a distinct
+    // explicit curve type for when inf isn't supported in shaders.
+    AI void writeTriangle(float2 p0, float2 p1, float2 p2) {
+        // No chopping needed, and should have been reset to 2 segments if using writeTriangle.
+        SkASSERT(fCurrMinSegments_pow4 >= (2*2*2*2));
+        this->writePatch(p0, p1, p2, {SK_FloatInfinity, SK_FloatInfinity},
+                         kTriangularConicCurveType);
+    }
+    AI void writeTriangle(SkPoint p0, SkPoint p1, SkPoint p2) {
+        this->writeTriangle(skvx::bit_pun<float2>(p0),
+                            skvx::bit_pun<float2>(p1),
+                            skvx::bit_pun<float2>(p2));
+    }
 
-private:
-    VertexWriter appendPatch() {
-        VertexWriter vertexWriter = fChunker.appendVertex();
-        if (!vertexWriter) {
-            // Failed to allocate GPU storage for the patch. Write to a throwaway location so the
-            // callsites don't have to do null checks.
-            if (!fFallbackPatchStorage) {
-                fFallbackPatchStorage.reset(fChunker.stride());
-            }
-            vertexWriter = fFallbackPatchStorage.data();
+    // Writes a circle used for round caps and joins in stroking, encoded as a cubic with
+    // identical control points and an empty join.
+    AI void writeCircle(SkPoint p) {
+        // This does not use writePatch() because it uses its own location as the join attribute
+        // value instead of fJoinControlPointAttrib and never defers.
+        SkASSERT(fAttribs & PatchAttribs::kJoinControlPoint);
+        if (VertexWriter vw = fChunker.appendVertex()) {
+            vw << VertexWriter::Repeat<4>(p); // p0,p1,p2,p3 = p -> 4 copies
+            this->emitPatchAttribs(std::move(vw), p, kCubicCurveType);
         }
-        return vertexWriter;
     }
 
+private:
     template <typename T>
     static VertexWriter::Conditional<T> If(bool c, const T& v) { return VertexWriter::If(c,v); }
 
-    void emitPatchAttribs(VertexWriter vertexWriter, float explicitCurveType) {
-        vertexWriter << If((fAttribs & PatchAttribs::kFanPoint), fFanPointAttrib)
+    AI void emitPatchAttribs(VertexWriter vertexWriter,
+                             SkPoint joinControlPoint,
+                             float explicitCurveType) {
+        vertexWriter << If((fAttribs & PatchAttribs::kJoinControlPoint), joinControlPoint)
+                     << If((fAttribs & PatchAttribs::kFanPoint), fFanPointAttrib)
                      << If((fAttribs & PatchAttribs::kStrokeParams), fStrokeParamsAttrib)
                      << If((fAttribs & PatchAttribs::kColor), fColorAttrib)
                      << If((fAttribs & PatchAttribs::kExplicitCurveType), explicitCurveType);
     }
 
+    AI void writePatch(float2 p0, float2 p1, float2 p2, float2 p3, float explicitCurveType) {
+        const bool defer = (fAttribs & PatchAttribs::kJoinControlPoint) &&
+                           !fHasJoinControlPoint;
+
+        SkASSERT(!defer || !fHasDeferredPatch);
+        SkASSERT(fChunker.stride() <= kMaxStride);
+        VertexWriter vw = defer ? VertexWriter{fDeferredPatchStorage, fChunker.stride()}
+                                : fChunker.appendVertex();
+        fHasDeferredPatch |= defer;
+
+        if (vw) {
+            vw << p0 << p1 << p2 << p3;
+            // NOTE: fJoinControlPointAttrib will contain NaN if we're writing to a deferred
+            // patch. If that's the case, correct data will overwrite it when the contour is
+            // closed (this is fine since a deferred patch writes to CPU memory instead of
+            // directly to the GPU buffer).
+            this->emitPatchAttribs(std::move(vw), fJoinControlPointAttrib, explicitCurveType);
+            // Automatically update join control point for next patch.
+            if (fAttribs & PatchAttribs::kJoinControlPoint) {
+                fHasJoinControlPoint = true;
+                if (explicitCurveType == kCubicCurveType && any(p3 != p2)) {
+                    // p2 is control point defining the tangent vector into the next patch.
+                    p2.store(&fJoinControlPointAttrib);
+                } else if (any(p2 != p1)) {
+                    // p1 is the control point defining the tangent vector.
+                    p1.store(&fJoinControlPointAttrib);
+                } else {
+                    // p0 is the control point defining the tangent vector.
+                    p0.store(&fJoinControlPointAttrib);
+                }
+            }
+        }
+    }
+    // Helpers that normalize curves to a generic patch, but does no other work.
+    AI void writeCubicPatch(float2 p0, float2 p1, float2 p2, float2 p3) {
+        this->writePatch(p0, p1, p2, p3, kCubicCurveType);
+    }
+    AI void writeCubicPatch(float2 p0, float4 p1p2, float2 p3) {
+        this->writeCubicPatch(p0, p1p2.lo, p1p2.hi, p3);
+    }
+    AI void writeQuadPatch(float2 p0, float2 p1, float2 p2) {
+        this->writeCubicPatch(p0, mix(float4(p0, p2), p1.xyxy(), 2/3.f), p2);
+    }
+    AI void writeConicPatch(float2 p0, float2 p1, float2 p2, float w) {
+        this->writePatch(p0, p1, p2, {w, SK_FloatInfinity}, kConicCurveType);
+    }
+
+    // Helpers that chop the curve type into 'numPatches' parametrically uniform curves. It is
+    // assumed that 'numPatches' is calculated such that the resulting curves require the maximum
+    // number of segments to draw appropriately (since the original presumably needed even more).
+    void chopAndWriteQuads(float2 p0, float2 p1, float2 p2, int numPatches);
+    void chopAndWriteConics(float2 p0, float2 p1, float2 p2, float w, int numPatches);
+    void chopAndWriteCubics(float2 p0, float2 p1, float2 p2, float2 p3, int numPatches);
+
+    // Returns true if curve can be written w/o needing to chop
+    bool updateRequiredSegments(float n4) {
+        if (n4 <= fMaxSegments_pow4) {
+            fCurrMinSegments_pow4 = std::max(n4, fCurrMinSegments_pow4);
+            return true;
+        } else {
+            fCurrMinSegments_pow4 = fMaxSegments_pow4;
+            return false;
+        }
+    }
+
+    // True if the patch writer only draws curves (presumably for filling), e.g. does not add a
+    // wedge fan point to help fill space, or a join control point for stroking.
+    bool writesCurvesOnly() const {
+        return !(fAttribs & (PatchAttribs::kJoinControlPoint | PatchAttribs::kFanPoint));
+    }
+
     const PatchAttribs fAttribs;
+
+    const float fMaxSegments_pow2;
+    const float fMaxSegments_pow4;
+    float fCurrMinSegments_pow4;
+
+    GrVertexChunkBuilder fChunker;
+
+    SkPoint fJoinControlPointAttrib;
     SkPoint fFanPointAttrib;
     StrokeParams fStrokeParamsAttrib;
     VertexColor fColorAttrib;
 
-    GrVertexChunkBuilder fChunker;
+    static constexpr size_t kMaxStride =
+            4 * sizeof(SkPoint) + // control points
+                sizeof(SkPoint) + // join control point or fan attrib point (not used at same time)
+                sizeof(StrokeParams) + // stroke params
+            4 * sizeof(uint32_t); // wide vertex color
 
-    // For when fChunker fails to allocate a patch in GPU memory.
-    SkAutoTMalloc<char> fFallbackPatchStorage;
-};
-
-// Converts a line to a cubic when being output via '<<' to a VertexWriter.
-struct LineToCubic {
-    float4 fP0P1;
-};
+    // Only used if kJoinControlPointAttrib is set in fAttribs, in which case it holds data for
+    // a single patch waiting for the incoming join control point to be computed.
+    // Contents are valid (sans join control point) if fHasDeferredPatch is true.
+    char fDeferredPatchStorage[kMaxStride];
+    bool fHasDeferredPatch = false;
 
-SK_MAYBE_UNUSED SK_ALWAYS_INLINE VertexWriter& operator<<(VertexWriter& vertexWriter,
-                                                          const LineToCubic& line) {
-    float4 p0p1 = line.fP0P1;
-    float4 v = p0p1.zwxy() - p0p1;
-    return vertexWriter << p0p1.lo << (v * (1/3.f) + p0p1) << p0p1.hi;
-}
-
-// Converts a quadratic to a cubic when being output via '<<' to a VertexWriter.
-struct QuadToCubic {
-    QuadToCubic(float2 p0, float2 p1, float2 p2) : fP0(p0), fP1(p1), fP2(p2) {}
-    QuadToCubic(const SkPoint p[3])
-            : QuadToCubic(float2::Load(p), float2::Load(p+1), float2::Load(p+2)) {}
-    float2 fP0, fP1, fP2;
+    bool fHasJoinControlPoint = false;
 };
 
-SK_MAYBE_UNUSED SK_ALWAYS_INLINE VertexWriter& operator<<(VertexWriter& vertexWriter,
-                                                          const QuadToCubic& quadratic) {
-    auto [p0, p1, p2] = quadratic;
-    return vertexWriter << p0 << mix(float4(p0,p2), p1.xyxy(), 2/3.f) << p2;
-}
-
-SK_MAYBE_UNUSED SK_ALWAYS_INLINE VertexWriter& operator<<(VertexWriter&& vertexWriter,
-                                                          const QuadToCubic& quadratic) {
-    return vertexWriter << quadratic;
-}
-
-SK_MAYBE_UNUSED SK_ALWAYS_INLINE void operator<<(
-        PatchWriter& w, MiddleOutPolygonTriangulator::PoppedTriangleStack&& stack) {
-    for (auto [p0, p1, p2] : stack) {
-        PatchWriter::TrianglePatch(w) << p0 << p1 << p2;
-    }
-}
-
 }  // namespace skgpu
 
+#undef AI
+
 #endif  // tessellate_PatchWriter_DEFINED
diff --git a/third_party/skia/src/gpu/tessellate/PathCurveTessellator.cpp b/third_party/skia/src/gpu/tessellate/PathCurveTessellator.cpp
index 4feea876153c7..c730f1a3c932e 100644
--- a/third_party/skia/src/gpu/tessellate/PathCurveTessellator.cpp
+++ b/third_party/skia/src/gpu/tessellate/PathCurveTessellator.cpp
@@ -20,10 +20,6 @@
 
 namespace skgpu {
 
-using CubicPatch = PatchWriter::CubicPatch;
-using ConicPatch = PatchWriter::ConicPatch;
-using TrianglePatch = PatchWriter::TrianglePatch;
-
 int PathCurveTessellator::patchPreallocCount(int totalCombinedPathVerbCnt) const {
     // Over-allocate enough curves for 1 in 4 to chop.
     int approxNumChops = (totalCombinedPathVerbCnt + 3) / 4;
@@ -33,19 +29,11 @@ int PathCurveTessellator::patchPreallocCount(int totalCombinedPathVerbCnt) const
 }
 
 void PathCurveTessellator::writePatches(PatchWriter& patchWriter,
-                                        int maxTessellationSegments,
                                         const SkMatrix& shaderMatrix,
                                         const PathDrawList& pathDrawList) {
-    float maxSegments_pow2 = pow2(maxTessellationSegments);
-    float maxSegments_pow4 = pow2(maxSegments_pow2);
-
-    // If using fixed count, this is the number of segments we need to emit per instance. Always
-    // emit at least 2 segments so we can support triangles.
-    float numFixedSegments_pow4 = 2*2*2*2;
-
+    wangs_formula::VectorXform shaderXform(shaderMatrix);
     for (auto [pathMatrix, path, color] : pathDrawList) {
         AffineMatrix m(pathMatrix);
-        wangs_formula::VectorXform totalXform(SkMatrix::Concat(shaderMatrix, pathMatrix));
         if (fAttribs & PatchAttribs::kColor) {
             patchWriter.updateColorAttrib(color);
         }
@@ -54,75 +42,24 @@ void PathCurveTessellator::writePatches(PatchWriter& patchWriter,
                 case SkPathVerb::kQuad: {
                     auto [p0, p1] = m.map2Points(pts);
                     auto p2 = m.map1Point(pts+2);
-                    float n4 = wangs_formula::quadratic_pow4(kTessellationPrecision,
-                                                             pts,
-                                                             totalXform);
-                    if (n4 <= 1) {
-                        break;  // This quad only needs 1 segment, which is empty.
-                    }
-                    if (n4 <= maxSegments_pow4) {
-                        // This quad already fits in "maxTessellationSegments".
-                        CubicPatch(patchWriter) << QuadToCubic{p0, p1, p2};
-                    } else {
-                        // The path should have been pre-chopped if needed, so all curves fit in
-                        // kMaxTessellationSegmentsPerCurve.
-                        n4 = std::min(n4, pow4(kMaxTessellationSegmentsPerCurve));
-                        // Chop until each quad tessellation requires "maxSegments" or fewer.
-                        int numPatches =
-                                SkScalarCeilToInt(wangs_formula::root4(n4/maxSegments_pow4));
-                        patchWriter.chopAndWriteQuads(p0, p1, p2, numPatches);
-                    }
-                    numFixedSegments_pow4 = std::max(n4, numFixedSegments_pow4);
+
+                    patchWriter.writeQuadratic(p0, p1, p2, shaderXform);
                     break;
                 }
 
                 case SkPathVerb::kConic: {
                     auto [p0, p1] = m.map2Points(pts);
                     auto p2 = m.map1Point(pts+2);
-                    float n2 = wangs_formula::conic_pow2(kTessellationPrecision,
-                                                         pts,
-                                                         *w,
-                                                         totalXform);
-                    if (n2 <= 1) {
-                        break;  // This conic only needs 1 segment, which is empty.
-                    }
-                    if (n2 <= maxSegments_pow2) {
-                        // This conic already fits in "maxTessellationSegments".
-                        ConicPatch(patchWriter) << p0 << p1 << p2 << *w;
-                    } else {
-                        // The path should have been pre-chopped if needed, so all curves fit in
-                        // kMaxTessellationSegmentsPerCurve.
-                        n2 = std::min(n2, pow2(kMaxTessellationSegmentsPerCurve));
-                        // Chop until each conic tessellation requires "maxSegments" or fewer.
-                        int numPatches = SkScalarCeilToInt(sqrtf(n2/maxSegments_pow2));
-                        patchWriter.chopAndWriteConics(p0, p1, p2, *w, numPatches);
-                    }
-                    numFixedSegments_pow4 = std::max(n2*n2, numFixedSegments_pow4);
+
+                    patchWriter.writeConic(p0, p1, p2, *w, shaderXform);
                     break;
                 }
 
                 case SkPathVerb::kCubic: {
                     auto [p0, p1] = m.map2Points(pts);
                     auto [p2, p3] = m.map2Points(pts+2);
-                    float n4 = wangs_formula::cubic_pow4(kTessellationPrecision,
-                                                         pts,
-                                                         totalXform);
-                    if (n4 <= 1) {
-                        break;  // This cubic only needs 1 segment, which is empty.
-                    }
-                    if (n4 <= maxSegments_pow4) {
-                        // This cubic already fits in "maxTessellationSegments".
-                        CubicPatch(patchWriter) << p0 << p1 << p2 << p3;
-                    } else {
-                        // The path should have been pre-chopped if needed, so all curves fit in
-                        // kMaxTessellationSegmentsPerCurve.
-                        n4 = std::min(n4, pow4(kMaxTessellationSegmentsPerCurve));
-                        // Chop until each cubic tessellation requires "maxSegments" or fewer.
-                        int numPatches =
-                                SkScalarCeilToInt(wangs_formula::root4(n4/maxSegments_pow4));
-                        patchWriter.chopAndWriteCubics(p0, p1, p2, p3, numPatches);
-                    }
-                    numFixedSegments_pow4 = std::max(n4, numFixedSegments_pow4);
+
+                    patchWriter.writeCubic(p0, p1, p2, p3, shaderXform);
                     break;
                 }
 
@@ -131,10 +68,9 @@ void PathCurveTessellator::writePatches(PatchWriter& patchWriter,
         }
     }
 
-    // log16(n^4) == log2(n).
     // We already chopped curves to make sure none needed a higher resolveLevel than
     // kMaxFixedResolveLevel.
-    fFixedResolveLevel = SkTPin(wangs_formula::nextlog16(numFixedSegments_pow4),
+    fFixedResolveLevel = SkTPin(patchWriter.requiredResolveLevel(),
                                 fFixedResolveLevel,
                                 int(kMaxFixedResolveLevel));
 }
@@ -144,7 +80,7 @@ void PathCurveTessellator::WriteFixedVertexBuffer(VertexWriter vertexWriter, siz
     SkASSERT(bufferSize % sizeof(SkPoint) == 0);
     int vertexCount = bufferSize / sizeof(SkPoint);
     SkASSERT(vertexCount > 3);
-    SkDEBUGCODE(VertexWriter end = vertexWriter.makeOffset(vertexCount * sizeof(SkPoint));)
+    SkDEBUGCODE(auto end = vertexWriter.mark(vertexCount * sizeof(SkPoint));)
 
     // Lay out the vertices in "middle-out" order:
     //
@@ -170,7 +106,7 @@ void PathCurveTessellator::WriteFixedVertexBuffer(VertexWriter vertexWriter, siz
         }
     }
 
-    SkASSERT(vertexWriter == end);
+    SkASSERT(vertexWriter.mark() == end);
 }
 
 void PathCurveTessellator::WriteFixedIndexBufferBaseIndex(VertexWriter vertexWriter,
@@ -219,20 +155,20 @@ void PathCurveTessellator::WriteFixedIndexBufferBaseIndex(VertexWriter vertexWri
 
 #if SK_GPU_V1
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
-GR_DECLARE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
 
 void PathCurveTessellator::prepareFixedCountBuffers(GrMeshDrawTarget* target) {
     GrResourceProvider* rp = target->resourceProvider();
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
 
     fFixedVertexBuffer = rp->findOrMakeStaticBuffer(GrGpuBufferType::kVertex,
                                                     FixedVertexBufferSize(kMaxFixedResolveLevel),
                                                     gFixedVertexBufferKey,
                                                     WriteFixedVertexBuffer);
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
 
     fFixedIndexBuffer = rp->findOrMakeStaticBuffer(GrGpuBufferType::kIndex,
                                                    FixedIndexBufferSize(kMaxFixedResolveLevel),
diff --git a/third_party/skia/src/gpu/tessellate/PathCurveTessellator.h b/third_party/skia/src/gpu/tessellate/PathCurveTessellator.h
index efea68b84cf16..1d81b5bf7c710 100644
--- a/third_party/skia/src/gpu/tessellate/PathCurveTessellator.h
+++ b/third_party/skia/src/gpu/tessellate/PathCurveTessellator.h
@@ -31,7 +31,6 @@ class PathCurveTessellator final : public PathTessellator {
     int patchPreallocCount(int totalCombinedPathVerbCnt) const final;
 
     void writePatches(PatchWriter& patchWriter,
-                      int maxTessellationSegments,
                       const SkMatrix& shaderMatrix,
                       const PathDrawList& pathDrawList) final;
 
diff --git a/third_party/skia/src/gpu/tessellate/PathTessellator.h b/third_party/skia/src/gpu/tessellate/PathTessellator.h
index bcde3afb5e393..bb698e4ec332f 100644
--- a/third_party/skia/src/gpu/tessellate/PathTessellator.h
+++ b/third_party/skia/src/gpu/tessellate/PathTessellator.h
@@ -73,7 +73,6 @@ class PathTessellator {
     // Each path's fPathMatrix in the list is applied on the CPU while the geometry is being written
     // out. This is a tool for batching, and is applied in addition to the shader's on-GPU matrix.
     virtual void writePatches(PatchWriter&,
-                              int maxTessellationSegments,
                               const SkMatrix& shaderMatrix,
                               const PathDrawList&) = 0;
 
@@ -89,8 +88,8 @@ class PathTessellator {
                  int totalCombinedPathVerbCnt,
                  bool willUseTessellationShaders) {
         if (int patchPreallocCount = this->patchPreallocCount(totalCombinedPathVerbCnt)) {
-            PatchWriter patchWriter(target, this, patchPreallocCount);
-            this->writePatches(patchWriter, maxTessellationSegments, shaderMatrix, pathDrawList);
+            PatchWriter patchWriter(target, this, maxTessellationSegments, patchPreallocCount);
+            this->writePatches(patchWriter, shaderMatrix, pathDrawList);
         }
         if (!willUseTessellationShaders) {
             this->prepareFixedCountBuffers(target);
diff --git a/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.cpp b/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.cpp
index 96d96799b7e73..4e02ba7f2ef3f 100644
--- a/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.cpp
+++ b/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.cpp
@@ -7,6 +7,7 @@
 
 #include "src/gpu/tessellate/PathWedgeTessellator.h"
 
+#include "src/core/SkPathPriv.h"
 #include "src/gpu/tessellate/AffineMatrix.h"
 #include "src/gpu/tessellate/PatchWriter.h"
 #include "src/gpu/tessellate/PathCurveTessellator.h"
@@ -20,9 +21,6 @@
 
 namespace skgpu {
 
-using CubicPatch = PatchWriter::CubicPatch;
-using ConicPatch = PatchWriter::ConicPatch;
-
 namespace {
 
 // Parses out each contour in a path and tracks the midpoint. Example usage:
@@ -133,19 +131,11 @@ int PathWedgeTessellator::patchPreallocCount(int totalCombinedPathVerbCnt) const
 }
 
 void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
-                                        int maxTessellationSegments,
                                         const SkMatrix& shaderMatrix,
                                         const PathDrawList& pathDrawList) {
-    float maxSegments_pow2 = pow2(maxTessellationSegments);
-    float maxSegments_pow4 = pow2(maxSegments_pow2);
-
-    // If using fixed count, this is the number of segments we need to emit per instance. Always
-    // emit at least 1 segment.
-    float numFixedSegments_pow4 = 1;
-
+    wangs_formula::VectorXform shaderXform(shaderMatrix);
     for (auto [pathMatrix, path, color] : pathDrawList) {
         AffineMatrix m(pathMatrix);
-        wangs_formula::VectorXform totalXform(SkMatrix::Concat(shaderMatrix, pathMatrix));
         if (fAttribs & PatchAttribs::kColor) {
             patchWriter.updateColorAttrib(color);
         }
@@ -162,7 +152,9 @@ void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
                     }
 
                     case SkPathVerb::kLine: {
-                        CubicPatch(patchWriter) << LineToCubic{m.map2Points(pts)};
+                        // Explicitly convert the line to an equivalent cubic w/ four distinct
+                        // control points because it fans better and avoids double-hitting pixels.
+                        patchWriter.writeLine(m.map2Points(pts));
                         lastPoint = pts[1];
                         break;
                     }
@@ -170,22 +162,8 @@ void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
                     case SkPathVerb::kQuad: {
                         auto [p0, p1] = m.map2Points(pts);
                         auto p2 = m.map1Point(pts+2);
-                        float n4 = wangs_formula::quadratic_pow4(kTessellationPrecision,
-                                                                 pts,
-                                                                 totalXform);
-                        if (n4 <= maxSegments_pow4) {
-                            // This quad already fits in "maxTessellationSegments".
-                            CubicPatch(patchWriter) << QuadToCubic{p0, p1, p2};
-                        } else {
-                            // The path should have been pre-chopped if needed, so all curves fit in
-                            // kMaxTessellationSegmentsPerCurve.
-                            n4 = std::min(n4, pow4(kMaxTessellationSegmentsPerCurve));
-                            // Chop until each quad tessellation requires "maxSegments" or fewer.
-                            int numPatches =
-                                    SkScalarCeilToInt(wangs_formula::root4(n4/maxSegments_pow4));
-                            patchWriter.chopAndWriteQuads(p0, p1, p2, numPatches);
-                        }
-                        numFixedSegments_pow4 = std::max(n4, numFixedSegments_pow4);
+
+                        patchWriter.writeQuadratic(p0, p1, p2, shaderXform);
                         lastPoint = pts[2];
                         break;
                     }
@@ -193,22 +171,8 @@ void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
                     case SkPathVerb::kConic: {
                         auto [p0, p1] = m.map2Points(pts);
                         auto p2 = m.map1Point(pts+2);
-                        float n2 = wangs_formula::conic_pow2(kTessellationPrecision,
-                                                             pts,
-                                                             *w,
-                                                             totalXform);
-                        if (n2 <= maxSegments_pow2) {
-                            // This conic already fits in "maxTessellationSegments".
-                            ConicPatch(patchWriter) << p0 << p1 << p2 << *w;
-                        } else {
-                            // The path should have been pre-chopped if needed, so all curves fit in
-                            // kMaxTessellationSegmentsPerCurve.
-                            n2 = std::min(n2, pow2(kMaxTessellationSegmentsPerCurve));
-                            // Chop until each conic tessellation requires "maxSegments" or fewer.
-                            int numPatches = SkScalarCeilToInt(sqrtf(n2/maxSegments_pow2));
-                            patchWriter.chopAndWriteConics(p0, p1, p2, *w, numPatches);
-                        }
-                        numFixedSegments_pow4 = std::max(n2*n2, numFixedSegments_pow4);
+
+                        patchWriter.writeConic(p0, p1, p2, *w, shaderXform);
                         lastPoint = pts[2];
                         break;
                     }
@@ -216,22 +180,8 @@ void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
                     case SkPathVerb::kCubic: {
                         auto [p0, p1] = m.map2Points(pts);
                         auto [p2, p3] = m.map2Points(pts+2);
-                        float n4 = wangs_formula::cubic_pow4(kTessellationPrecision,
-                                                             pts,
-                                                             totalXform);
-                        if (n4 <= maxSegments_pow4) {
-                            // This cubic already fits in "maxTessellationSegments".
-                            CubicPatch(patchWriter) << p0 << p1 << p2 << p3;
-                        } else {
-                            // The path should have been pre-chopped if needed, so all curves fit in
-                            // kMaxTessellationSegmentsPerCurve.
-                            n4 = std::min(n4, pow4(kMaxTessellationSegmentsPerCurve));
-                            // Chop until each cubic tessellation requires "maxSegments" or fewer.
-                            int numPatches =
-                                    SkScalarCeilToInt(wangs_formula::root4(n4/maxSegments_pow4));
-                            patchWriter.chopAndWriteCubics(p0, p1, p2, p3, numPatches);
-                        }
-                        numFixedSegments_pow4 = std::max(n4, numFixedSegments_pow4);
+
+                        patchWriter.writeCubic(p0, p1, p2, p3, shaderXform);
                         lastPoint = pts[3];
                         break;
                     }
@@ -243,15 +193,14 @@ void PathWedgeTessellator::writePatches(PatchWriter& patchWriter,
             }
             if (lastPoint != startPoint) {
                 SkPoint pts[2] = {lastPoint, startPoint};
-                CubicPatch(patchWriter) << LineToCubic{m.map2Points(pts)};
+                patchWriter.writeLine(m.map2Points(pts));
             }
         }
     }
 
-    // log16(n^4) == log2(n).
     // We already chopped curves to make sure none needed a higher resolveLevel than
     // kMaxFixedResolveLevel.
-    fFixedResolveLevel = SkTPin(wangs_formula::nextlog16(numFixedSegments_pow4),
+    fFixedResolveLevel = SkTPin(patchWriter.requiredResolveLevel(),
                                 fFixedResolveLevel,
                                 int(kMaxFixedResolveLevel));
 }
@@ -281,20 +230,20 @@ void PathWedgeTessellator::WriteFixedIndexBuffer(VertexWriter vertexWriter, size
 
 #if SK_GPU_V1
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
-GR_DECLARE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
 
 void PathWedgeTessellator::prepareFixedCountBuffers(GrMeshDrawTarget* target) {
     GrResourceProvider* rp = target->resourceProvider();
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gFixedVertexBufferKey);
 
     fFixedVertexBuffer = rp->findOrMakeStaticBuffer(GrGpuBufferType::kVertex,
                                                     FixedVertexBufferSize(kMaxFixedResolveLevel),
                                                     gFixedVertexBufferKey,
                                                     WriteFixedVertexBuffer);
 
-    GR_DEFINE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gFixedIndexBufferKey);
 
     fFixedIndexBuffer = rp->findOrMakeStaticBuffer(GrGpuBufferType::kIndex,
                                                    FixedIndexBufferSize(kMaxFixedResolveLevel),
diff --git a/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.h b/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.h
index 07d76d22befb4..1c5a584ea6265 100644
--- a/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.h
+++ b/third_party/skia/src/gpu/tessellate/PathWedgeTessellator.h
@@ -34,7 +34,6 @@ class PathWedgeTessellator final : public PathTessellator {
     int patchPreallocCount(int totalCombinedPathVerbCnt) const final;
 
     void writePatches(PatchWriter&,
-                      int maxTessellationSegments,
                       const SkMatrix& shaderMatrix,
                       const PathDrawList&) final;
 
diff --git a/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.cpp b/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.cpp
index 93860589d0658..5d42071c1247e 100644
--- a/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.cpp
+++ b/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.cpp
@@ -22,155 +22,55 @@ namespace skgpu {
 
 namespace {
 
-constexpr static float kMaxParametricSegments_pow4 =
-        StrokeFixedCountTessellator::kMaxParametricSegments_pow4;
-
 // Writes out strokes to the given instance chunk array, chopping if necessary so that all instances
 // require 32 parametric segments or less. (We don't consider radial segments here. The tessellator
 // will just add enough additional segments to handle a worst-case 180 degree stroke.)
 class InstanceWriter {
+    using VectorXform = wangs_formula::VectorXform;
 public:
     InstanceWriter(PatchWriter& patchWriter, float matrixMaxScale)
             : fPatchWriter(patchWriter)
             , fParametricPrecision(StrokeTolerances::CalcParametricPrecision(matrixMaxScale)) {
+        SkASSERT(fPatchWriter.attribs() & PatchAttribs::kJoinControlPoint);
     }
 
     float parametricPrecision() const { return fParametricPrecision; }
 
-    // maxParametricSegments^4, or the number of parametric segments, raised to the 4th power,
-    // that are required by the single instance we've written that requires the most segments.
-    float maxParametricSegments_pow4() const { return fMaxParametricSegments_pow4; }
-
     SK_ALWAYS_INLINE void lineTo(SkPoint start, SkPoint end) {
-        SkPoint cubic[] = {start, start, end, end};
-        SkPoint endControlPoint = start;
-        this->writeStroke(cubic, endControlPoint, kCubicCurveType);
+        fPatchWriter.writeLine(start, end);
     }
 
     SK_ALWAYS_INLINE void quadraticTo(const SkPoint p[3]) {
-        float numParametricSegments_pow4 = wangs_formula::quadratic_pow4(fParametricPrecision, p);
-        if (numParametricSegments_pow4 > kMaxParametricSegments_pow4) {
-            this->chopQuadraticTo(p);
-            return;
-        }
-        SkPoint cubic[4];
-        VertexWriter(cubic) << QuadToCubic(p);
-        SkPoint endControlPoint = cubic[2];
-        this->writeStroke(cubic, endControlPoint, kCubicCurveType);
-        fMaxParametricSegments_pow4 = std::max(numParametricSegments_pow4,
-                                               fMaxParametricSegments_pow4);
+        fPatchWriter.writeQuadratic(p, VectorXform(), fParametricPrecision);
     }
 
     SK_ALWAYS_INLINE void conicTo(const SkPoint p[3], float w) {
-        float n = wangs_formula::conic_pow2(fParametricPrecision, p, w);
-        float numParametricSegments_pow4 = n*n;
-        if (numParametricSegments_pow4 > kMaxParametricSegments_pow4) {
-            this->chopConicTo({p, w});
-            return;
-        }
-        SkPoint conic[4] = {p[0], p[1], p[2], {w, std::numeric_limits<float>::infinity()}};
-        SkPoint endControlPoint = conic[1];
-        this->writeStroke(conic, endControlPoint, kConicCurveType);
-        fMaxParametricSegments_pow4 = std::max(numParametricSegments_pow4,
-                                               fMaxParametricSegments_pow4);
+        fPatchWriter.writeConic(p, w, VectorXform(), fParametricPrecision);
     }
 
     SK_ALWAYS_INLINE void cubicConvex180To(const SkPoint p[4]) {
-        float numParametricSegments_pow4 = wangs_formula::cubic_pow4(fParametricPrecision, p);
-        if (numParametricSegments_pow4 > kMaxParametricSegments_pow4) {
-            this->chopCubicConvex180To(p);
-            return;
-        }
-        SkPoint endControlPoint = (p[3] != p[2]) ? p[2] : (p[2] != p[1]) ? p[1] : p[0];
-        this->writeStroke(p, endControlPoint, kCubicCurveType);
-        fMaxParametricSegments_pow4 = std::max(numParametricSegments_pow4,
-                                               fMaxParametricSegments_pow4);
+        fPatchWriter.writeCubic(p, VectorXform(), fParametricPrecision);
     }
 
     // Called when we encounter the verb "kMoveWithinContour". Moves invalidate the previous control
     // point. The stroke iterator tells us the new value to use for the previous control point.
     void setLastControlPoint(SkPoint newLastControlPoint) {
-        fLastControlPoint = newLastControlPoint;
-        fHasLastControlPoint = true;
+        fPatchWriter.updateJoinControlPointAttrib(newLastControlPoint);
     }
 
     // Draws a circle whose diameter is equal to the stroke width. We emit circles at cusp points
     // round caps, and empty strokes that are specified to be drawn as circles.
     void writeCircle(SkPoint location) {
-        // The shader interprets an empty stroke + empty join as a special case that denotes a
-        // circle, or 180-degree point stroke.
-        PatchWriter::CubicPatch(fPatchWriter) << VertexWriter::Repeat<5>(location);
+        fPatchWriter.writeCircle(location);
     }
 
     void finishContour() {
-        if (fHasDeferredFirstStroke) {
-            // We deferred the first stroke because we didn't know the previous control point to use
-            // for its join. We write it out now.
-            SkASSERT(fHasLastControlPoint);
-            this->writeStroke(fDeferredFirstStroke, SkPoint(),
-                              fDeferredCurveTypeIfUnsupportedInfinity);
-            fHasDeferredFirstStroke = false;
-        }
-        fHasLastControlPoint = false;
+        fPatchWriter.writeDeferredStrokePatch();
     }
 
 private:
-    void chopQuadraticTo(const SkPoint p[3]) {
-        SkPoint chops[5];
-        SkChopQuadAtHalf(p, chops);
-        this->quadraticTo(chops);
-        this->quadraticTo(chops + 2);
-    }
-
-    void chopConicTo(const SkConic& conic) {
-        SkConic chops[2];
-        if (!conic.chopAt(.5f, chops)) {
-            return;
-        }
-        this->conicTo(chops[0].fPts, chops[0].fW);
-        this->conicTo(chops[1].fPts, chops[1].fW);
-    }
-
-    void chopCubicConvex180To(const SkPoint p[4]) {
-        SkPoint chops[7];
-        SkChopCubicAtHalf(p, chops);
-        this->cubicConvex180To(chops);
-        this->cubicConvex180To(chops + 3);
-    }
-
-    SK_ALWAYS_INLINE void writeStroke(const SkPoint p[4], SkPoint endControlPoint,
-                                      float curveTypeIfUnsupportedInfinity) {
-        if (fHasLastControlPoint) {
-            PatchWriter::Patch(fPatchWriter, curveTypeIfUnsupportedInfinity)
-                    << VertexWriter::Array(p, 4) << fLastControlPoint;
-        } else {
-            // We don't know the previous control point yet to use for the join. Defer writing out
-            // this stroke until the end.
-            memcpy(fDeferredFirstStroke, p, sizeof(fDeferredFirstStroke));
-            fDeferredCurveTypeIfUnsupportedInfinity = curveTypeIfUnsupportedInfinity;
-            fHasDeferredFirstStroke = true;
-            fHasLastControlPoint = true;
-        }
-        fLastControlPoint = endControlPoint;
-    }
-
-    void discardStroke(const SkPoint p[], int numPts) {
-        // Set fLastControlPoint to the next stroke's p0 (which will be equal to the final point of
-        // this stroke). This has the effect of disabling the next stroke's join.
-        fLastControlPoint = p[numPts - 1];
-        fHasLastControlPoint = true;
-    }
-
     PatchWriter& fPatchWriter;
     const float fParametricPrecision;
-    float fMaxParametricSegments_pow4 = 1;
-
-    // We can't write out the first stroke until we know the previous control point for its join.
-    SkPoint fDeferredFirstStroke[4];
-    float fDeferredCurveTypeIfUnsupportedInfinity;
-    SkPoint fLastControlPoint;  // Used to configure the joins in the instance data.
-    bool fHasDeferredFirstStroke = false;
-    bool fHasLastControlPoint = false;
 };
 
 // Returns the worst-case number of edges we will need in order to draw a join of the given type.
@@ -238,10 +138,10 @@ int StrokeFixedCountTessellator::writePatches(PatchWriter& patchWriter,
         }
         StrokeIterator strokeIter(pathStroke->fPath, &pathStroke->fStroke, &shaderMatrix);
         while (strokeIter.next()) {
+            using Verb = StrokeIterator::Verb;
             const SkPoint* p = strokeIter.pts();
+            int numChops;
             switch (strokeIter.verb()) {
-                using Verb = StrokeIterator::Verb;
-                int numChops;
                 case Verb::kContourFinished:
                     instanceWriter.finishContour();
                     break;
@@ -323,9 +223,8 @@ int StrokeFixedCountTessellator::writePatches(PatchWriter& patchWriter,
     int maxRadialSegmentsInStroke =
             std::max(SkScalarCeilToInt(maxRadialSegmentsPerRadian * SK_ScalarPI), 1);
 
-    int maxParametricSegmentsInStroke = SkScalarCeilToInt(sqrtf(sqrtf(
-            instanceWriter.maxParametricSegments_pow4())));
-    SkASSERT(maxParametricSegmentsInStroke >= 1);  // maxParametricSegments_pow4 is always >= 1.
+    int maxParametricSegmentsInStroke = patchWriter.requiredFixedSegments();
+    SkASSERT(maxParametricSegmentsInStroke >= 1);
 
     // Now calculate the maximum number of edges we will need in the stroke portion of the instance.
     // The first and last edges in a stroke are shared by both the parametric and radial sets of
@@ -362,14 +261,18 @@ void StrokeFixedCountTessellator::InitializeVertexIDFallbackBuffer(VertexWriter
 
 #if SK_GPU_V1
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gVertexIDFallbackBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gVertexIDFallbackBufferKey);
 
 int StrokeFixedCountTessellator::prepare(GrMeshDrawTarget* target,
                                          const SkMatrix& shaderMatrix,
                                          std::array<float,2> matrixMinMaxScales,
                                          PathStrokeList* pathStrokeList,
                                          int totalCombinedStrokeVerbCnt) {
-    PatchWriter patchWriter(target, this, this->patchPreallocCount(totalCombinedStrokeVerbCnt));
+    // NOTE: For now InstanceWriter manually chops curves that exceed kMaxParametricSegments_pow4,
+    // so passing in kMaxParametricSegments to PatchWriter avoids its auto-chopping while still
+    // correctly accumulating the min required segment count.
+    PatchWriter patchWriter(target, this, kMaxParametricSegments,
+                            this->patchPreallocCount(totalCombinedStrokeVerbCnt));
 
     fFixedEdgeCount = this->writePatches(patchWriter,
                                          shaderMatrix,
@@ -387,7 +290,7 @@ int StrokeFixedCountTessellator::prepare(GrMeshDrawTarget* target,
         constexpr static int kMaxVerticesInFallbackBuffer = 2048;
         fFixedEdgeCount = std::min(fFixedEdgeCount, kMaxVerticesInFallbackBuffer/2);
 
-        GR_DEFINE_STATIC_UNIQUE_KEY(gVertexIDFallbackBufferKey);
+        SKGPU_DEFINE_STATIC_UNIQUE_KEY(gVertexIDFallbackBufferKey);
 
         fVertexBufferIfNoIDSupport = target->resourceProvider()->findOrMakeStaticBuffer(
                 GrGpuBufferType::kVertex,
diff --git a/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.h b/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.h
index 1e40646db0623..b30d13a0a887d 100644
--- a/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.h
+++ b/third_party/skia/src/gpu/tessellate/StrokeFixedCountTessellator.h
@@ -20,7 +20,7 @@ namespace skgpu {
 // instance are emitted as degenerate triangles.
 class StrokeFixedCountTessellator final : public StrokeTessellator {
 public:
-    constexpr static float kMaxParametricSegments_pow4 = 32*32*32*32;  // 32^4
+    constexpr static int kMaxParametricSegments = 32;
     constexpr static int8_t kMaxParametricSegments_log2 = 5;  // log2(32)
 
     StrokeFixedCountTessellator(PatchAttribs attribs) : StrokeTessellator(attribs) {}
diff --git a/third_party/skia/src/gpu/tessellate/StrokeHardwareTessellator.cpp b/third_party/skia/src/gpu/tessellate/StrokeHardwareTessellator.cpp
index 84e9f0877edda..4d257e378793d 100644
--- a/third_party/skia/src/gpu/tessellate/StrokeHardwareTessellator.cpp
+++ b/third_party/skia/src/gpu/tessellate/StrokeHardwareTessellator.cpp
@@ -45,6 +45,16 @@ float2 pow4(float2 x) {
     return xx*xx;
 }
 
+void quad_to_cubic(const SkPoint p[3], SkPoint patch[4]) {
+    // Matches arithmetic in PatchWriter::writeQuadratic's conversion to a cubic.
+    float4 p0p2{skvx::bit_pun<float2>(p[0]), skvx::bit_pun<float2>(p[2])};
+    float4 mid = mix(p0p2, skvx::bit_pun<float2>(p[1]).xyxy(), 2/3.f);
+
+    patch[0] = p[0];
+    mid.store(patch + 1); // also writes patch[2]
+    patch[3] = p[2];
+}
+
 class HwPatchWriter {
 public:
     enum class JoinType {
@@ -60,6 +70,8 @@ class HwPatchWriter {
             // each chop has the potential to introduce an extra segment.
             , fMaxTessellationSegments(std::max(maxTessellationSegments - 2, 1))
             , fParametricPrecision(StrokeTolerances::CalcParametricPrecision(matrixMaxScale)) {
+        SkASSERT(fPatchWriter.attribs() & PatchAttribs::kJoinControlPoint);
+        SkASSERT(!fPatchWriter.hasJoinControlPoint());
     }
 
     // This is the precision value, adjusted for the view matrix, to use with Wang's formulas when
@@ -132,7 +144,7 @@ class HwPatchWriter {
 
     void moveTo(SkPoint pt) {
         fCurrContourStartPoint = pt;
-        fHasLastControlPoint = false;
+        fPatchWriter.resetJoinControlPointAttrib();
     }
 
     // Writes out the given line, possibly chopping its previous join until the segments fit in
@@ -197,28 +209,29 @@ class HwPatchWriter {
                                        SkPoint endControlPoint) {
         SkASSERT(fStrokeJoinType != JoinType::kBowtie);
 
-        if (!fHasLastControlPoint) {
+        if (!fPatchWriter.hasJoinControlPoint()) {
             // The first stroke doesn't have a previous join (yet). If the current contour ends up
             // closing itself, we will add that join as its own patch. TODO: Consider deferring the
             // first stroke until we know whether the contour will close. This will allow us to use
             // the closing join as the first patch's previous join.
-            fHasLastControlPoint = true;
             fCurrContourFirstControlPoint = (p[1] != p[0]) ? p[1] : p[2];
-            fLastControlPoint = p[0];  // Disables the join section of this patch.
+            // Disables the join section of this patch.
+            fPatchWriter.updateJoinControlPointAttrib(p[0]);
         } else if (!prevJoinFitsInPatch) {
             // There aren't enough guaranteed segments to fold the previous join into this patch.
             // Emit the join in its own separate patch.
             this->internalJoinTo(fStrokeJoinType, p[0], (p[1] != p[0]) ? p[1] : p[2]);
-            fLastControlPoint = p[0];  // Disables the join section of this patch.
+            // Disables the join section of this patch.
+            fPatchWriter.updateJoinControlPointAttrib(p[0]);
         }
 
-        HwPatch(fPatchWriter) << fLastControlPoint << VertexWriter::Array(p, 4);
-        fLastControlPoint = endControlPoint;
+        fPatchWriter.writeHwPatch(p);
+        fPatchWriter.updateJoinControlPointAttrib(endControlPoint);
     }
 
     void writeClose(SkPoint contourEndpoint, const SkMatrix& viewMatrix,
                     const SkStrokeRec& stroke) {
-        if (!fHasLastControlPoint) {
+        if (!fPatchWriter.hasJoinControlPoint()) {
             // Draw caps instead of closing if the subpath is zero length:
             //
             //   "Any zero length subpath ...  shall be stroked if the 'stroke-linecap' property has
@@ -234,12 +247,11 @@ class HwPatchWriter {
         // contourEndpoint == fCurrContourStartPoint.)
         this->writeLineTo(contourEndpoint, fCurrContourStartPoint);
         this->internalJoinTo(fStrokeJoinType, fCurrContourStartPoint, fCurrContourFirstControlPoint);
-
-        fHasLastControlPoint = false;
+        fPatchWriter.resetJoinControlPointAttrib();
     }
 
     void writeCaps(SkPoint contourEndpoint, const SkMatrix& viewMatrix, const SkStrokeRec& stroke) {
-        if (!fHasLastControlPoint) {
+        if (!fPatchWriter.hasJoinControlPoint()) {
             // We don't have any control points to orient the caps. In this case, square and round
             // caps are specified to be drawn as an axis-aligned square or circle respectively.
             // Assign default control points that achieve this.
@@ -269,9 +281,8 @@ class HwPatchWriter {
                 outset = {d, -c};
             }
             fCurrContourFirstControlPoint = fCurrContourStartPoint - outset;
-            fLastControlPoint = fCurrContourStartPoint + outset;
-            fHasLastControlPoint = true;
             contourEndpoint = fCurrContourStartPoint;
+            fPatchWriter.updateJoinControlPointAttrib(fCurrContourStartPoint + outset);
         }
 
         switch (stroke.getCap()) {
@@ -282,7 +293,8 @@ class HwPatchWriter {
                 // If our join type isn't round we can alternatively use a bowtie.
                 JoinType roundCapJoinType = (stroke.getJoin() == SkPaint::kRound_Join)
                         ? JoinType::kRound : JoinType::kBowtie;
-                this->internalJoinTo(roundCapJoinType, contourEndpoint, fLastControlPoint);
+                this->internalJoinTo(roundCapJoinType, contourEndpoint,
+                                     fPatchWriter.joinControlPoint());
                 this->internalMoveTo(fCurrContourStartPoint, fCurrContourFirstControlPoint);
                 this->internalJoinTo(roundCapJoinType, fCurrContourStartPoint,
                                      fCurrContourFirstControlPoint);
@@ -291,7 +303,7 @@ class HwPatchWriter {
             case SkPaint::kSquare_Cap: {
                 // A square cap is the same as appending lineTos.
                 auto strokeJoinType = JoinType(stroke.getJoin());
-                SkVector lastTangent = contourEndpoint - fLastControlPoint;
+                SkVector lastTangent = contourEndpoint - fPatchWriter.joinControlPoint();
                 if (!stroke.isHairlineStyle()) {
                     // Extend the cap by 1/2 stroke width.
                     lastTangent *= (.5f * stroke.getWidth()) / lastTangent.length();
@@ -317,20 +329,14 @@ class HwPatchWriter {
             }
         }
 
-        fHasLastControlPoint = false;
+        fPatchWriter.resetJoinControlPointAttrib();
     }
 
 private:
-    struct HwPatch : public PatchWriter::Patch {
-        HwPatch(PatchWriter& w) : Patch(w, 0/*explicitCurveType unused*/) {
-            SkASSERT(!(w.attribs() & PatchAttribs::kExplicitCurveType));
-        }
-    };
-
     void internalMoveTo(SkPoint pt, SkPoint lastControlPoint) {
         fCurrContourStartPoint = pt;
-        fCurrContourFirstControlPoint = fLastControlPoint = lastControlPoint;
-        fHasLastControlPoint = true;
+        fCurrContourFirstControlPoint = lastControlPoint;
+        fPatchWriter.updateJoinControlPointAttrib(lastControlPoint);
     }
 
     // Recursively chops the given conic and its previous join until the segments fit in
@@ -348,7 +354,7 @@ class HwPatchWriter {
         // Convert to a patch.
         SkPoint asPatch[4];
         if (w == 1) {
-            VertexWriter(asPatch) << QuadToCubic(p);
+            quad_to_cubic(p, asPatch);
         } else {
             memcpy(asPatch, p, sizeof(SkPoint) * 3);
             asPatch[3] = {w, std::numeric_limits<float>::infinity()};
@@ -470,14 +476,14 @@ class HwPatchWriter {
     void internalPatchTo(JoinType prevJoinType, bool prevJoinFitsInPatch, const SkPoint p[4],
                          SkPoint endPt) {
         if (prevJoinType == JoinType::kBowtie) {
-            SkASSERT(fHasLastControlPoint);
+            SkASSERT(fPatchWriter.hasJoinControlPoint());
             // Bowtie joins are only used on internal chops, and internal chops almost always have
             // continuous tangent angles (i.e., the ending tangent of the first chop and the
             // beginning tangent of the second both point in the same direction). The tangents will
             // only ever not point in the same direction if we chopped at a cusp point, so that's
             // the only time we actually need a bowtie.
             SkPoint nextControlPoint = (p[1] == p[0]) ? p[2] : p[1];
-            SkVector a = p[0] - fLastControlPoint;
+            SkVector a = p[0] - fPatchWriter.joinControlPoint();
             SkVector b = nextControlPoint - p[0];
             float ab_cosTheta = a.dot(b);
             float ab_pow2 = a.dot(a) * b.dot(b);
@@ -500,7 +506,8 @@ class HwPatchWriter {
             if (!SkScalarNearlyEqual(ab_pow2, ab_cosTheta * fabsf(ab_cosTheta),
                                      ab_pow2 * SK_ScalarNearlyZero)) {
                 this->internalJoinTo(JoinType::kBowtie, p[0], nextControlPoint);
-                fLastControlPoint = p[0];  // Disables the join section of this patch.
+                // Disables the join section of this patch.
+                fPatchWriter.updateJoinControlPointAttrib(p[0]);
                 prevJoinFitsInPatch = true;
             }
         }
@@ -511,14 +518,14 @@ class HwPatchWriter {
     // Recursively chops the given join until the segments fit in tessellation patches.
     void internalJoinTo(JoinType joinType, SkPoint junctionPoint, SkPoint nextControlPoint,
                         int maxDepth = -1) {
-        if (!fHasLastControlPoint) {
+        if (!fPatchWriter.hasJoinControlPoint()) {
             // The first stroke doesn't have a previous join.
             return;
         }
 
         if (!fSoloRoundJoinAlwaysFitsInPatch && maxDepth != 0 &&
             (joinType == JoinType::kRound || joinType == JoinType::kBowtie)) {
-            SkVector tan0 = junctionPoint - fLastControlPoint;
+            SkVector tan0 = junctionPoint - fPatchWriter.joinControlPoint();
             SkVector tan1 = nextControlPoint - junctionPoint;
             float rotation = SkMeasureAngleBetweenVectors(tan0, tan1);
             float numRadialSegments = rotation * fNumRadialSegmentsPerRadian;
@@ -548,7 +555,7 @@ class HwPatchWriter {
                 } while (c0 - junctionPoint != -(c1 - junctionPoint) && --maxAttempts);
                 // First join half.
                 this->internalJoinTo(joinType, junctionPoint, c0, maxDepth - 1);
-                fLastControlPoint = c1;
+                fPatchWriter.updateJoinControlPointAttrib(c1);
                 // Second join half.
                 this->internalJoinTo(joinType, junctionPoint, nextControlPoint, maxDepth - 1);
                 return;
@@ -556,39 +563,30 @@ class HwPatchWriter {
         }
 
         // We should never write out joins before the first curve.
-        SkASSERT(fHasLastControlPoint);
+        SkASSERT(fPatchWriter.hasJoinControlPoint());
 
         {
-            HwPatch patch(fPatchWriter);
-            patch << fLastControlPoint << junctionPoint;
+            SkPoint asPatch[4];
+            asPatch[0] = junctionPoint;
             if (joinType == JoinType::kBowtie) {
                 // {prevControlPoint, [p0, p0, p0, p3]} is a reserved patch pattern that means this
                 // patch is a bowtie. The bowtie is anchored on p0 and its tangent angles go from
                 // (p0 - prevControlPoint) to (p3 - p0).
-                patch << junctionPoint << junctionPoint;
+                asPatch[1] = junctionPoint;
+                asPatch[2] = junctionPoint;
             } else {
                 // {prevControlPoint, [p0, p3, p3, p3]} is a reserved patch pattern that means this
                 // patch is a join only (no curve sections in the patch). The join is anchored on p0
                 // and its tangent angles go from (p0 - prevControlPoint) to (p3 - p0).
-                patch << nextControlPoint << nextControlPoint;
+                asPatch[1] = nextControlPoint;
+                asPatch[2] = nextControlPoint;
             }
-            patch << (nextControlPoint);
-        }
+            asPatch[3] = nextControlPoint;
 
-        fLastControlPoint = nextControlPoint;
-    }
-
-    void discardStroke(const SkPoint p[], int numPoints) {
-        if (!fHasLastControlPoint) {
-            // This disables the first join, if any. (The first join gets added as a standalone
-            // patch during close(), but setting fCurrContourFirstControlPoint to p[0] causes us to
-            // skip that join if we attempt to add it later.)
-            fCurrContourFirstControlPoint = p[0];
-            fHasLastControlPoint = true;
+            fPatchWriter.writeHwPatch(asPatch);
         }
-        // Set fLastControlPoint to the next stroke's p0 (which will be equal to the final point of
-        // this stroke). This has the effect of disabling the next stroke's join.
-        fLastControlPoint = p[numPoints - 1];
+
+        fPatchWriter.updateJoinControlPointAttrib(nextControlPoint);
     }
 
     PatchWriter& fPatchWriter;
@@ -622,10 +620,8 @@ class HwPatchWriter {
 
     // Variables related to the specific contour that we are currently iterating during
     // prepareBuffers().
-    bool fHasLastControlPoint = false;
     SkPoint fCurrContourStartPoint;
     SkPoint fCurrContourFirstControlPoint;
-    SkPoint fLastControlPoint;
 };
 
 SK_ALWAYS_INLINE bool cubic_has_cusp(const SkPoint p[4]) {
@@ -767,7 +763,7 @@ int StrokeHardwareTessellator::writePatches(PatchWriter& patchWriter,
                     // Write it out directly.
                     prevJoinFitsInPatch = hwPatchWriter.stroke180FitsInPatch_withJoin(
                             numParametricSegments_pow4);
-                    VertexWriter(scratchPts) << QuadToCubic(p);
+                    quad_to_cubic(p, scratchPts);
                     patchPts = scratchPts;
                     endControlPoint = patchPts[2];
                     break;
@@ -858,7 +854,8 @@ int StrokeHardwareTessellator::prepare(GrMeshDrawTarget* target,
                                        std::array<float,2> matrixMinMaxScales,
                                        PathStrokeList* pathStrokeList,
                                        int totalCombinedStrokeVerbCnt) {
-    PatchWriter patchWriter(target, this, this->patchPreallocCount(totalCombinedStrokeVerbCnt));
+    PatchWriter patchWriter(target, this, 0.f, /* unused max segment tracking */
+                            this->patchPreallocCount(totalCombinedStrokeVerbCnt));
     return this->writePatches(patchWriter, shaderMatrix, matrixMinMaxScales, pathStrokeList);
 }
 
diff --git a/third_party/skia/src/gpu/tessellate/StrokeTessellator.h b/third_party/skia/src/gpu/tessellate/StrokeTessellator.h
index 685513ea49490..403b9ce91953a 100644
--- a/third_party/skia/src/gpu/tessellate/StrokeTessellator.h
+++ b/third_party/skia/src/gpu/tessellate/StrokeTessellator.h
@@ -36,7 +36,7 @@ class StrokeTessellator {
         PathStrokeList* fNext = nullptr;
     };
 
-    StrokeTessellator(PatchAttribs attribs) : fAttribs(attribs) {}
+    StrokeTessellator(PatchAttribs attribs) : fAttribs(attribs | PatchAttribs::kJoinControlPoint) {}
 
     // Gives an approximate initial buffer size for this class to write patches into. Ideally the
     // whole stroke will fit into this initial buffer, but if it requires a lot of chopping, the
diff --git a/third_party/skia/src/gpu/tessellate/Tessellation.h b/third_party/skia/src/gpu/tessellate/Tessellation.h
index eb745254af30d..942d113291e7a 100644
--- a/third_party/skia/src/gpu/tessellate/Tessellation.h
+++ b/third_party/skia/src/gpu/tessellate/Tessellation.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef tessellate_Tessellation_DEFINED
-#define tessellate_Tessellation_DEFINED
+#ifndef skgpu_tessellate_Tessellation_DEFINED
+#define skgpu_tessellate_Tessellation_DEFINED
 
 #include "include/core/SkStrokeRec.h"
 #include "include/gpu/GrTypes.h"
@@ -72,13 +72,14 @@ SK_MAYBE_UNUSED constexpr static float kTessellationPrecision = 4;
 enum class PatchAttribs {
     // Attribs.
     kNone = 0,
-    kFanPoint = 1 << 0,  // [float2] Used by wedges. This is the center point the wedges fan around.
-    kStrokeParams = 1 << 1,  // [float2] Used when strokes have different widths or join types.
-    kColor = 1 << 2,  // [ubyte4 or float4] Used when patches have different colors.
-    kExplicitCurveType = 1 << 3,  // [float] Used when GPU can't infer curve type based on infinity.
+    kJoinControlPoint = 1 << 0, // [float2] Used by strokes. This defines tangent direction.
+    kFanPoint = 1 << 1,  // [float2] Used by wedges. This is the center point the wedges fan around.
+    kStrokeParams = 1 << 2,  // [float2] Used when strokes have different widths or join types.
+    kColor = 1 << 3,  // [ubyte4 or float4] Used when patches have different colors.
+    kExplicitCurveType = 1 << 4,  // [float] Used when GPU can't infer curve type based on infinity.
 
     // Extra flags.
-    kWideColorIfEnabled = 1 << 4,  // If kColor is set, specifies it to be float4 wide color.
+    kWideColorIfEnabled = 1 << 5,  // If kColor is set, specifies it to be float4 wide color.
 };
 
 GR_MAKE_BITFIELD_CLASS_OPS(PatchAttribs)
@@ -125,7 +126,8 @@ constexpr static float kTriangularConicCurveType SK_MAYBE_UNUSED = 2;  // Conic
 // Returns the packed size in bytes of the attribs portion of tessellation patches (or instances) in
 // GPU buffers.
 constexpr size_t PatchAttribsStride(PatchAttribs attribs) {
-    return (attribs & PatchAttribs::kFanPoint ? sizeof(float) * 2 : 0) +
+    return (attribs & PatchAttribs::kJoinControlPoint ? sizeof(float) * 2 : 0) +
+           (attribs & PatchAttribs::kFanPoint ? sizeof(float) * 2 : 0) +
            (attribs & PatchAttribs::kStrokeParams ? sizeof(float) * 2 : 0) +
            (attribs & PatchAttribs::kColor
                     ? (attribs & PatchAttribs::kWideColorIfEnabled ? sizeof(float)
diff --git a/third_party/skia/src/gpu/tessellate/WangsFormula.h b/third_party/skia/src/gpu/tessellate/WangsFormula.h
index 4957a91bafd18..0e90b4266bd91 100644
--- a/third_party/skia/src/gpu/tessellate/WangsFormula.h
+++ b/third_party/skia/src/gpu/tessellate/WangsFormula.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef tessellate_WangsFormula_DEFINED
-#define tessellate_WangsFormula_DEFINED
+#ifndef skgpu_tessellate_WangsFormula_DEFINED
+#define skgpu_tessellate_WangsFormula_DEFINED
 
 #include "include/core/SkMatrix.h"
 #include "include/core/SkPoint.h"
@@ -116,16 +116,22 @@ class VectorXform {
 
 // Returns Wang's formula, raised to the 4th power, specialized for a quadratic curve.
 AI float quadratic_pow4(float precision,
-                        const SkPoint pts[],
+                        float2 p0, float2 p1, float2 p2,
                         const VectorXform& vectorXform = VectorXform()) {
-    float2 p0 = skvx::bit_pun<float2>(pts[0]);
-    float2 p1 = skvx::bit_pun<float2>(pts[1]);
-    float2 p2 = skvx::bit_pun<float2>(pts[2]);
     float2 v = -2*p1 + p0 + p2;
     v = vectorXform(v);
     float2 vv = v*v;
     return (vv[0] + vv[1]) * length_term_pow2<2>(precision);
 }
+AI float quadratic_pow4(float precision,
+                        const SkPoint pts[],
+                        const VectorXform& vectorXform = VectorXform()) {
+    return quadratic_pow4(precision,
+                          skvx::bit_pun<float2>(pts[0]),
+                          skvx::bit_pun<float2>(pts[1]),
+                          skvx::bit_pun<float2>(pts[2]),
+                          vectorXform);
+}
 
 // Returns Wang's formula specialized for a quadratic curve.
 AI float quadratic(float precision,
@@ -145,16 +151,26 @@ AI int quadratic_log2(float precision,
 
 // Returns Wang's formula, raised to the 4th power, specialized for a cubic curve.
 AI float cubic_pow4(float precision,
-                    const SkPoint pts[],
+                    float2 p0, float2 p1, float2 p2, float2 p3,
                     const VectorXform& vectorXform = VectorXform()) {
-    float4 p01 = float4::Load(pts);
-    float4 p12 = float4::Load(pts + 1);
-    float4 p23 = float4::Load(pts + 2);
+    float4 p01{p0, p1};
+    float4 p12{p1, p2};
+    float4 p23{p2, p3};
     float4 v = -2*p12 + p01 + p23;
     v = vectorXform(v);
     float4 vv = v*v;
     return std::max(vv[0] + vv[1], vv[2] + vv[3]) * length_term_pow2<3>(precision);
 }
+AI float cubic_pow4(float precision,
+                    const SkPoint pts[],
+                    const VectorXform& vectorXform = VectorXform()) {
+    return cubic_pow4(precision,
+                      skvx::bit_pun<float2>(pts[0]),
+                      skvx::bit_pun<float2>(pts[1]),
+                      skvx::bit_pun<float2>(pts[2]),
+                      skvx::bit_pun<float2>(pts[3]),
+                      vectorXform);
+}
 
 // Returns Wang's formula specialized for a cubic curve.
 AI float cubic(float precision,
@@ -201,12 +217,12 @@ AI int worst_case_cubic_log2(float precision, float devWidth, float devHeight) {
 //   J. Zheng, T. Sederberg. "Estimating Tessellation Parameter Intervals for
 //   Rational Curves and Surfaces." ACM Transactions on Graphics 19(1). 2000.
 AI float conic_pow2(float precision,
-                    const SkPoint pts[],
+                    float2 p0, float2 p1, float2 p2,
                     float w,
                     const VectorXform& vectorXform = VectorXform()) {
-    float2 p0 = vectorXform(skvx::bit_pun<float2>(pts[0]));
-    float2 p1 = vectorXform(skvx::bit_pun<float2>(pts[1]));
-    float2 p2 = vectorXform(skvx::bit_pun<float2>(pts[2]));
+    p0 = vectorXform(p0);
+    p1 = vectorXform(p1);
+    p2 = vectorXform(p2);
 
     // Compute center of bounding box in projected space
     const float2 C = 0.5f * (skvx::min(skvx::min(p0, p1), p2) + skvx::max(skvx::max(p0, p1), p2));
@@ -235,6 +251,17 @@ AI float conic_pow2(float precision,
     // If not, the number of segments is (tmax - tmin) / sqrt(denom / numer).
     return numer / denom;
 }
+AI float conic_pow2(float precision,
+                    const SkPoint pts[],
+                    float w,
+                    const VectorXform& vectorXform = VectorXform()) {
+    return conic_pow2(precision,
+                      skvx::bit_pun<float2>(pts[0]),
+                      skvx::bit_pun<float2>(pts[1]),
+                      skvx::bit_pun<float2>(pts[2]),
+                      w,
+                      vectorXform);
+}
 
 // Returns the value of Wang's formula specialized for a conic curve.
 AI float conic(float tolerance,
@@ -316,4 +343,4 @@ SK_MAYBE_UNUSED inline static SkString as_sksl() {
 
 #undef AI
 
-#endif  // tessellate_WangsFormula_DEFINED
+#endif  // skgpu_tessellate_WangsFormula_DEFINED
diff --git a/third_party/skia/src/gpu/tessellate/shaders/BUILD.bazel b/third_party/skia/src/gpu/tessellate/shaders/BUILD.bazel
index 02be7e68a9a73..429e7e202b8b7 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/BUILD.bazel
+++ b/third_party/skia/src/gpu/tessellate/shaders/BUILD.bazel
@@ -19,6 +19,7 @@ generated_cc_atom(
     deps = [
         ":GrPathTessellationShader_hdr",
         "//src/core:SkMathPriv_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
         "//src/gpu/tessellate:PathTessellator_hdr",
         "//src/gpu/tessellate:Tessellation_hdr",
@@ -94,6 +95,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrStrokeTessellationShader_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVarying_hdr",
         "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp
index 439cf439e1238..5abae997d1c13 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp
@@ -24,15 +24,15 @@ class SimpleTriangleShader : public GrPathTessellationShader {
                                        GrPrimitiveType::kTriangles, 0, viewMatrix, color,
                                        PatchAttribs::kNone) {
         constexpr static Attribute kInputPointAttrib{"inputPoint", kFloat2_GrVertexAttribType,
-                                                     kFloat2_GrSLType};
-        this->setVertexAttributes(&kInputPointAttrib, 1);
+                                                     SkSLType::kFloat2};
+        this->setVertexAttributesWithImplicitOffsets(&kInputPointAttrib, 1);
     }
 
     int maxTessellationSegments(const GrShaderCaps&) const override { SkUNREACHABLE; }
 
 private:
     const char* name() const final { return "tessellate_SimpleTriangleShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 };
 
@@ -47,8 +47,8 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> SimpleTriangleShader::makeProg
             v->codeAppend(R"(
             float2 localcoord = inputPoint;
             float2 vertexpos = AFFINE_MATRIX * localcoord + TRANSLATE;)");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localcoord");
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertexpos");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localcoord");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertexpos");
         }
     };
     return std::make_unique<Impl>();
@@ -120,10 +120,10 @@ void GrPathTessellationShader::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs
     // Vertex shader.
     const char* affineMatrix, *translate;
     fAffineMatrixUniform = args.fUniformHandler->addUniform(nullptr, kVertex_GrShaderFlag,
-                                                            kFloat4_GrSLType, "affineMatrix",
+                                                            SkSLType::kFloat4, "affineMatrix",
                                                             &affineMatrix);
     fTranslateUniform = args.fUniformHandler->addUniform(nullptr, kVertex_GrShaderFlag,
-                                                         kFloat2_GrSLType, "translate", &translate);
+                                                         SkSLType::kFloat2, "translate", &translate);
     args.fVertBuilder->codeAppendf("float2x2 AFFINE_MATRIX = float2x2(%s);", affineMatrix);
     args.fVertBuilder->codeAppendf("float2 TRANSLATE = %s;", translate);
     this->emitVertexCode(*args.fShaderCaps,
@@ -136,7 +136,7 @@ void GrPathTessellationShader::Impl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs
     if (!(shader.fAttribs & PatchAttribs::kColor)) {
         const char* color;
         fColorUniform = args.fUniformHandler->addUniform(nullptr, kFragment_GrShaderFlag,
-                                                         kHalf4_GrSLType, "color", &color);
+                                                         SkSLType::kHalf4, "color", &color);
         args.fFragBuilder->codeAppendf("half4 %s = %s;", args.fOutputColor, color);
     } else {
         args.fFragBuilder->codeAppendf("half4 %s = %s;",
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp
index b312f5dd76319..0c3f91457473e 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp
@@ -38,8 +38,8 @@ class HardwareWedgeShader : public GrPathTessellationShader {
             : GrPathTessellationShader(kTessellate_HardwareWedgeShader_ClassID,
                                        GrPrimitiveType::kPatches, 5, viewMatrix, color, attribs) {
         constexpr static Attribute kInputPointAttrib{"inputPoint", kFloat2_GrVertexAttribType,
-                                                     kFloat2_GrSLType};
-        this->setVertexAttributes(&kInputPointAttrib, 1);
+                                                     SkSLType::kFloat2};
+        this->setVertexAttributesWithImplicitOffsets(&kInputPointAttrib, 1);
         SkASSERT(this->vertexStride() * 5 ==
                  sizeof(SkPoint) * 4 + skgpu::PatchAttribsStride(fAttribs));
     }
@@ -50,7 +50,7 @@ class HardwareWedgeShader : public GrPathTessellationShader {
 
 private:
     const char* name() const final { return "tessellate_HardwareWedgeShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 };
 
@@ -62,7 +62,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> HardwareWedgeShader::makeProgr
                             GrGLSLVertexBuilder* v,
                             GrGLSLVaryingHandler*,
                             GrGPArgs*) override {
-            v->declareGlobal(GrShaderVar("vsPt", kFloat2_GrSLType, GrShaderVar::TypeModifier::Out));
+            v->declareGlobal(GrShaderVar("vsPt", SkSLType::kFloat2, GrShaderVar::TypeModifier::Out));
             v->codeAppend(R"(
             // If y is infinity then x is a conic weight. Don't transform.
             vsPt = (isinf(inputPoint.y)) ? inputPoint : AFFINE_MATRIX * inputPoint + TRANSLATE;)");
@@ -179,8 +179,8 @@ class HardwareCurveShader : public GrPathTessellationShader {
                                        GrPrimitiveType::kPatches, 4, viewMatrix, color,
                                        attribs) {
         constexpr static Attribute kInputPointAttrib{"inputPoint", kFloat2_GrVertexAttribType,
-                                                     kFloat2_GrSLType};
-        this->setVertexAttributes(&kInputPointAttrib, 1);
+                                                     SkSLType::kFloat2};
+        this->setVertexAttributesWithImplicitOffsets(&kInputPointAttrib, 1);
         SkASSERT(this->vertexStride() * 4 ==
                  sizeof(SkPoint) * 4 + skgpu::PatchAttribsStride(fAttribs));
     }
@@ -194,7 +194,7 @@ class HardwareCurveShader : public GrPathTessellationShader {
 
 private:
     const char* name() const final { return "tessellate_HardwareCurveShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 };
 
@@ -206,7 +206,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> HardwareCurveShader::makeProgr
                             GrGLSLVertexBuilder* v,
                             GrGLSLVaryingHandler*,
                             GrGPArgs*) override {
-            v->declareGlobal(GrShaderVar("P", kFloat2_GrSLType, GrShaderVar::TypeModifier::Out));
+            v->declareGlobal(GrShaderVar("P", SkSLType::kFloat2, GrShaderVar::TypeModifier::Out));
             v->codeAppend(R"(
             // If y is infinity then x is a conic weight. Don't transform.
             P = (isinf(inputPoint.y)) ? inputPoint : AFFINE_MATRIX * inputPoint + TRANSLATE;)");
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
index f3654ebfc13df..003e716e4f8da 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/tessellate/shaders/GrPathTessellationShader.h"
 
 #include "src/core/SkMathPriv.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
 #include "src/gpu/tessellate/PathTessellator.h"
 #include "src/gpu/tessellate/Tessellation.h"
@@ -36,34 +37,35 @@ class MiddleOutShader : public GrPathTessellationShader {
                     const SkPMColor4f& color, PatchAttribs attribs)
             : GrPathTessellationShader(kTessellate_MiddleOutShader_ClassID,
                                        GrPrimitiveType::kTriangles, 0, viewMatrix, color, attribs) {
-        fInstanceAttribs.emplace_back("p01", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fInstanceAttribs.emplace_back("p23", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+        fInstanceAttribs.emplace_back("p01", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fInstanceAttribs.emplace_back("p23", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
         if (fAttribs & PatchAttribs::kFanPoint) {
             fInstanceAttribs.emplace_back("fanPointAttrib",
                                           kFloat2_GrVertexAttribType,
-                                          kFloat2_GrSLType);
+                                          SkSLType::kFloat2);
         }
         if (fAttribs & PatchAttribs::kColor) {
             fInstanceAttribs.emplace_back("colorAttrib",
                                           (fAttribs & PatchAttribs::kWideColorIfEnabled)
                                                   ? kFloat4_GrVertexAttribType
                                                   : kUByte4_norm_GrVertexAttribType,
-                                          kHalf4_GrSLType);
+                                          SkSLType::kHalf4);
         }
         if (fAttribs & PatchAttribs::kExplicitCurveType) {
             // A conic curve is written out with p3=[w,Infinity], but GPUs that don't support
             // infinity can't detect this. On these platforms we also write out an extra float with
             // each patch that explicitly tells the shader what type of curve it is.
-            fInstanceAttribs.emplace_back("curveType", kFloat_GrVertexAttribType, kFloat_GrSLType);
+            fInstanceAttribs.emplace_back("curveType", kFloat_GrVertexAttribType, SkSLType::kFloat);
         }
-        this->setInstanceAttributes(fInstanceAttribs.data(), fInstanceAttribs.count());
+        this->setInstanceAttributesWithImplicitOffsets(fInstanceAttribs.data(),
+                                                       fInstanceAttribs.count());
         SkASSERT(fInstanceAttribs.count() <= kMaxInstanceAttribCount);
         SkASSERT(this->instanceStride() ==
                  sizeof(SkPoint) * 4 + skgpu::PatchAttribsStride(fAttribs));
 
         constexpr static Attribute kVertexAttrib("resolveLevel_and_idx", kFloat2_GrVertexAttribType,
-                                                 kFloat2_GrSLType);
-        this->setVertexAttributes(&kVertexAttrib, 1);
+                                                 SkSLType::kFloat2);
+        this->setVertexAttributesWithImplicitOffsets(&kVertexAttrib, 1);
     }
 
     int maxTessellationSegments(const GrShaderCaps&) const override {
@@ -72,7 +74,7 @@ class MiddleOutShader : public GrPathTessellationShader {
 
 private:
     const char* name() const final { return "tessellate_MiddleOutShader"; }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const final {
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const final {
         // When color is in a uniform, it's always wide so we need to ignore kWideColorIfEnabled.
         // When color is in an attrib, its wideness is accounted for as part of the attrib key in
         // GrGeometryProcessor::getAttributeKey().
@@ -195,10 +197,10 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> MiddleOutShader::makeProgramIm
                 }
             }
             float2 vertexpos = AFFINE_MATRIX * localcoord + TRANSLATE;)");
-            gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localcoord");
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertexpos");
+            gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localcoord");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertexpos");
             if (middleOutShader.fAttribs & PatchAttribs::kColor) {
-                GrGLSLVarying colorVarying(GrSLType::kHalf4_GrSLType);
+                GrGLSLVarying colorVarying(SkSLType::kHalf4);
                 varyingHandler->addVarying("color",
                                            &colorVarying,
                                            GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp
index baf705576c9d7..1538a9f1b99ff 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp
@@ -7,6 +7,7 @@
 
 #include "src/gpu/tessellate/shaders/GrStrokeTessellationShader.h"
 
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
@@ -25,7 +26,7 @@ GrStrokeTessellationShader::GrStrokeTessellationShader(const GrShaderCaps& shade
                                        : GrPrimitiveType::kTriangleStrip,
                                (mode == Mode::kHardwareTessellation) ? 1 : 0, viewMatrix, color)
         , fMode(mode)
-        , fPatchAttribs(attribs)
+        , fPatchAttribs(attribs | PatchAttribs::kJoinControlPoint)
         , fStroke(stroke)
         , fMaxParametricSegments_log2(maxParametricSegments_log2) {
     // We should use explicit curve type when, and only when, there isn't infinity support.
@@ -36,8 +37,6 @@ GrStrokeTessellationShader::GrStrokeTessellationShader(const GrShaderCaps& shade
         SkASSERT(!(attribs & PatchAttribs::kExplicitCurveType));
     }
     if (fMode == Mode::kHardwareTessellation) {
-        // A join calculates its starting angle using prevCtrlPtAttr.
-        fAttribs.emplace_back("prevCtrlPtAttr", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
         // pts 0..3 define the stroke as a cubic bezier. If p3.y is infinity, then it's a conic
         // with w=p3.x.
         //
@@ -49,16 +48,18 @@ GrStrokeTessellationShader::GrStrokeTessellationShader(const GrShaderCaps& shade
         // pts=[p0, p0, p0, p3] is a reserved pattern that means this patch is a "bowtie", or
         // double-sided round join, anchored on p0 and rotating from (p0 - prevCtrlPtAttr) to
         // (p3 - p0).
-        fAttribs.emplace_back("pts01Attr", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fAttribs.emplace_back("pts23Attr", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+        fAttribs.emplace_back("pts01Attr", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fAttribs.emplace_back("pts23Attr", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        // A join calculates its starting angle using prevCtrlPtAttr.
+        fAttribs.emplace_back("prevCtrlPtAttr", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
     } else {
         // pts 0..3 define the stroke as a cubic bezier. If p3.y is infinity, then it's a conic
         // with w=p3.x.
         //
         // An empty stroke (p0==p1==p2==p3) is a special case that denotes a circle, or
         // 180-degree point stroke.
-        fAttribs.emplace_back("pts01Attr", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
-        fAttribs.emplace_back("pts23Attr", kFloat4_GrVertexAttribType, kFloat4_GrSLType);
+        fAttribs.emplace_back("pts01Attr", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
+        fAttribs.emplace_back("pts23Attr", kFloat4_GrVertexAttribType, SkSLType::kFloat4);
         if (fMode == Mode::kLog2Indirect) {
             // argsAttr.xy contains the lastControlPoint for setting up the join.
             //
@@ -66,40 +67,40 @@ GrStrokeTessellationShader::GrStrokeTessellationShader(const GrShaderCaps& shade
             // triangle strip being rendered (i.e., it should be vertexCount/2). If
             // numTotalEdges is negative and the join type is "kRound", it also instructs the
             // shader to only allocate one segment the preceding round join.
-            fAttribs.emplace_back("argsAttr", kFloat3_GrVertexAttribType, kFloat3_GrSLType);
+            fAttribs.emplace_back("argsAttr", kFloat3_GrVertexAttribType, SkSLType::kFloat3);
         } else {
             SkASSERT(fMode == Mode::kFixedCount);
             // argsAttr contains the lastControlPoint for setting up the join.
-            fAttribs.emplace_back("argsAttr", kFloat2_GrVertexAttribType, kFloat2_GrSLType);
+            fAttribs.emplace_back("argsAttr", kFloat2_GrVertexAttribType, SkSLType::kFloat2);
         }
     }
     if (fPatchAttribs & PatchAttribs::kStrokeParams) {
         fAttribs.emplace_back("dynamicStrokeAttr", kFloat2_GrVertexAttribType,
-                              kFloat2_GrSLType);
+                              SkSLType::kFloat2);
     }
     if (fPatchAttribs & PatchAttribs::kColor) {
         fAttribs.emplace_back("dynamicColorAttr",
                               (fPatchAttribs & PatchAttribs::kWideColorIfEnabled)
                                       ? kFloat4_GrVertexAttribType
                                       : kUByte4_norm_GrVertexAttribType,
-                              kHalf4_GrSLType);
+                              SkSLType::kHalf4);
     }
     if (fPatchAttribs & PatchAttribs::kExplicitCurveType) {
         // A conic curve is written out with p3=[w,Infinity], but GPUs that don't support
         // infinity can't detect this. On these platforms we write out an extra float with each
         // patch that explicitly tells the shader what type of curve it is.
-        fAttribs.emplace_back("curveTypeAttr", kFloat_GrVertexAttribType, kFloat_GrSLType);
+        fAttribs.emplace_back("curveTypeAttr", kFloat_GrVertexAttribType, SkSLType::kFloat);
     }
     if (fMode == Mode::kHardwareTessellation) {
-        this->setVertexAttributes(fAttribs.data(), fAttribs.count());
-        SkASSERT(this->vertexStride() == sizeof(SkPoint) * 5 + PatchAttribsStride(fPatchAttribs));
+        this->setVertexAttributesWithImplicitOffsets(fAttribs.data(), fAttribs.count());
+        SkASSERT(this->vertexStride() == sizeof(SkPoint) * 4 + PatchAttribsStride(fPatchAttribs));
     } else {
-        this->setInstanceAttributes(fAttribs.data(), fAttribs.count());
-        SkASSERT(this->instanceStride() == sizeof(SkPoint) * 5 + PatchAttribsStride(fPatchAttribs));
+        this->setInstanceAttributesWithImplicitOffsets(fAttribs.data(), fAttribs.count());
+        SkASSERT(this->instanceStride() == sizeof(SkPoint) * 4 + PatchAttribsStride(fPatchAttribs));
         if (!shaderCaps.vertexIDSupport()) {
             constexpr static Attribute kVertexAttrib("edgeID", kFloat_GrVertexAttribType,
-                                                     kFloat_GrSLType);
-            this->setVertexAttributes(&kVertexAttrib, 1);
+                                                     SkSLType::kFloat);
+            this->setVertexAttributesWithImplicitOffsets(&kVertexAttrib, 1);
         }
     }
     SkASSERT(fAttribs.count() <= kMaxAttribCount);
@@ -324,15 +325,15 @@ void GrStrokeTessellationShader::Impl::emitTessellationCode(
         // Normal case. Do the transform after tessellation.
         code->append(R"(
         float2 devCoord = AFFINE_MATRIX * strokeCoord + TRANSLATE;)");
-        gpArgs->fPositionVar.set(kFloat2_GrSLType, "devCoord");
-        gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "strokeCoord");
+        gpArgs->fPositionVar.set(SkSLType::kFloat2, "devCoord");
+        gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "strokeCoord");
     } else {
         // Hairline case. The scale and skew already happened before tessellation.
         code->append(R"(
         float2 devCoord = strokeCoord + TRANSLATE;
         float2 localCoord = inverse(AFFINE_MATRIX) * strokeCoord;)");
-        gpArgs->fPositionVar.set(kFloat2_GrSLType, "devCoord");
-        gpArgs->fLocalCoordVar.set(kFloat2_GrSLType, "localCoord");
+        gpArgs->fPositionVar.set(SkSLType::kFloat2, "devCoord");
+        gpArgs->fLocalCoordVar.set(SkSLType::kFloat2, "localCoord");
     }
 }
 
@@ -342,7 +343,7 @@ void GrStrokeTessellationShader::Impl::emitFragmentCode(const GrStrokeTessellati
         // The fragment shader just outputs a uniform color.
         const char* colorUniformName;
         fColorUniform = args.fUniformHandler->addUniform(nullptr, kFragment_GrShaderFlag,
-                                                         kHalf4_GrSLType, "color",
+                                                         SkSLType::kHalf4, "color",
                                                          &colorUniformName);
         args.fFragBuilder->codeAppendf("half4 %s = %s;", args.fOutputColor, colorUniformName);
     } else {
@@ -398,7 +399,7 @@ void GrStrokeTessellationShader::Impl::setData(const GrGLSLProgramDataManager& p
     }
 }
 
-void GrStrokeTessellationShader::addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const {
+void GrStrokeTessellationShader::addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const {
     bool keyNeedsJoin = (fMode != Mode::kHardwareTessellation) &&
                         !(fPatchAttribs & PatchAttribs::kStrokeParams);
     SkASSERT((int)fMode >> 2 == 0);
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h
index 3b8811996703c..9e637a375064f 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h
@@ -64,7 +64,7 @@ class GrStrokeTessellationShader : public GrTessellationShader {
         }
         SkUNREACHABLE;
     }
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override;
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override;
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 
     const Mode fMode;
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp
index 4b558ec07c802..5f093f1e00c1f 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp
@@ -32,25 +32,25 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
                        args.fShaderCaps->maxTessellationSegments());  // 1/128 of a segment.
 
     // [numSegmentsInJoin, innerJoinRadiusMultiplier, prevJoinTangent.xy]
-    v->declareGlobal(GrShaderVar("vsJoinArgs0", kFloat4_GrSLType, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsJoinArgs0", SkSLType::kFloat4, TypeModifier::Out));
 
     // [radsPerJoinSegment, joinOutsetClamp.xy]
-    v->declareGlobal(GrShaderVar("vsJoinArgs1", kFloat3_GrSLType, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsJoinArgs1", SkSLType::kFloat3, TypeModifier::Out));
 
     // Curve args.
-    v->declareGlobal(GrShaderVar("vsPts01", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsPts23", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsPts45", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsPts67", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsPts89", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsTans01", kFloat4_GrSLType, TypeModifier::Out));
-    v->declareGlobal(GrShaderVar("vsTans23", kFloat4_GrSLType, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsPts01", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsPts23", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsPts45", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsPts67", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsPts89", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsTans01", SkSLType::kFloat4, TypeModifier::Out));
+    v->declareGlobal(GrShaderVar("vsTans23", SkSLType::kFloat4, TypeModifier::Out));
     if (shader.hasDynamicStroke()) {
         // [NUM_RADIAL_SEGMENTS_PER_RADIAN, STROKE_RADIUS]
-        v->declareGlobal(GrShaderVar("vsStrokeArgs", kFloat2_GrSLType, TypeModifier::Out));
+        v->declareGlobal(GrShaderVar("vsStrokeArgs", SkSLType::kFloat2, TypeModifier::Out));
     }
     if (shader.hasDynamicColor()) {
-        v->declareGlobal(GrShaderVar("vsColor", kHalf4_GrSLType, TypeModifier::Out));
+        v->declareGlobal(GrShaderVar("vsColor", SkSLType::kHalf4, TypeModifier::Out));
     }
 
     v->insertFunction(kCosineBetweenVectorsFn);
@@ -67,7 +67,7 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
                                                          kVertex_GrShaderFlag |
                                                          kTessControl_GrShaderFlag |
                                                          kTessEvaluation_GrShaderFlag,
-                                                         kFloat4_GrSLType, "tessArgs",
+                                                         SkSLType::kFloat4, "tessArgs",
                                                          &tessArgsName);
         v->codeAppendf(R"(
         float NUM_RADIAL_SEGMENTS_PER_RADIAN = %s.y;
@@ -78,7 +78,7 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
                                                          kVertex_GrShaderFlag |
                                                          kTessControl_GrShaderFlag |
                                                          kTessEvaluation_GrShaderFlag,
-                                                         kFloat_GrSLType, "parametricPrecision",
+                                                         SkSLType::kFloat, "parametricPrecision",
                                                          &parametricPrecisionName);
         v->codeAppendf(R"(
         float STROKE_RADIUS = dynamicStrokeAttr.x;
@@ -87,7 +87,7 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
     }
 
     fTranslateUniform = uniHandler->addUniform(nullptr, kTessEvaluation_GrShaderFlag,
-                                               kFloat2_GrSLType, "translate", nullptr);
+                                               SkSLType::kFloat2, "translate", nullptr);
     // View matrix uniforms.
     const char* affineMatrixName;
     // Hairlines apply the affine matrix in their vertex shader, prior to tessellation.
@@ -96,8 +96,9 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
     if (shader.stroke().isHairlineStyle()) {
         affineMatrixVisibility |= kVertex_GrShaderFlag;
     }
-    fAffineMatrixUniform = uniHandler->addUniform(nullptr, affineMatrixVisibility, kFloat4_GrSLType,
-                                                  "affineMatrix", &affineMatrixName);
+    fAffineMatrixUniform = uniHandler->addUniform(nullptr, affineMatrixVisibility,
+                                                  SkSLType::kFloat4, "affineMatrix",
+                                                  &affineMatrixName);
     if (affineMatrixVisibility & kVertex_GrShaderFlag) {
         v->codeAppendf("float2x2 AFFINE_MATRIX = float2x2(%s);\n", affineMatrixName);
     }
@@ -150,7 +151,7 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
     // Calculate the number of segments to chop the join into.
     float cosTheta = cosine_between_vectors(prevJoinTangent, tan0);
     float joinRotation = (cosTheta == 1) ? 0 : acos(cosTheta);
-    if (cross(prevJoinTangent, tan0) < 0) {
+    if (cross_length_2d(prevJoinTangent, tan0) < 0) {
         joinRotation = -joinRotation;
     }
     float joinRadialSegments = abs(joinRotation) * NUM_RADIAL_SEGMENTS_PER_RADIAN;
@@ -202,9 +203,9 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
     // We formulate this as a quadratic equation:  F' x F'' == aT^2 + bT + c == 0.
     // See: https://www.microsoft.com/en-us/research/wp-content/uploads/2005/01/p1000-loop.pdf
     // NOTE: We only need the roots, so a uniform scale factor does not affect the solution.
-    float a = cross(A, B);
-    float b = cross(A, C);
-    float c = cross(B, C);
+    float a = cross_length_2d(A, B);
+    float b = cross_length_2d(A, C);
+    float c = cross_length_2d(B, C);
     float b_over_2 = b*.5;
     float discr_over_4 = b_over_2*b_over_2 - a*c;
 
@@ -307,7 +308,7 @@ void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPAr
         // Color gets passed in from the tess evaluation shader.
         fDynamicColorName = "dynamicColor";
         SkString flatness(args.fShaderCaps->preferFlatInterpolation() ? "flat" : "");
-        args.fFragBuilder->declareGlobal(GrShaderVar(fDynamicColorName, kHalf4_GrSLType,
+        args.fFragBuilder->declareGlobal(GrShaderVar(fDynamicColorName, SkSLType::kHalf4,
                                                      TypeModifier::In, 0, SkString(), flatness));
     }
     this->emitFragmentCode(shader, args);
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp
index 167df8f34dc28..5b3f8a0c12af9 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp
@@ -35,7 +35,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
         // [PARAMETRIC_PRECISION, NUM_RADIAL_SEGMENTS_PER_RADIAN, JOIN_TYPE, STROKE_RADIUS]
         const char* tessArgsName;
         fTessControlArgsUniform = args.fUniformHandler->addUniform(
-                nullptr, kVertex_GrShaderFlag, kFloat4_GrSLType, "tessControlArgs",
+                nullptr, kVertex_GrShaderFlag, SkSLType::kFloat4, "tessControlArgs",
                 &tessArgsName);
         args.fVertBuilder->codeAppendf(R"(
         float PARAMETRIC_PRECISION = %s.x;
@@ -45,7 +45,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
     } else {
         const char* parametricPrecisionName;
         fTessControlArgsUniform = args.fUniformHandler->addUniform(
-                nullptr, kVertex_GrShaderFlag, kFloat_GrSLType, "parametricPrecision",
+                nullptr, kVertex_GrShaderFlag, SkSLType::kFloat, "parametricPrecision",
                 &parametricPrecisionName);
         args.fVertBuilder->codeAppendf(R"(
         float PARAMETRIC_PRECISION = %s;
@@ -57,7 +57,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
 
     if (shader.hasDynamicColor()) {
         // Create a varying for color to get passed in through.
-        GrGLSLVarying dynamicColor{kHalf4_GrSLType};
+        GrGLSLVarying dynamicColor{SkSLType::kHalf4};
         args.fVaryingHandler->addVarying("dynamicColor", &dynamicColor);
         args.fVertBuilder->codeAppendf("%s = dynamicColorAttr;", dynamicColor.vsOut());
         fDynamicColorName = dynamicColor.fsIn();
@@ -70,7 +70,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
         SkASSERT(shader.mode() == GrStrokeTessellationShader::Mode::kFixedCount);
         const char* edgeCountName;
         fEdgeCountUniform = args.fUniformHandler->addUniform(
-                nullptr, kVertex_GrShaderFlag, kFloat_GrSLType, "edgeCount", &edgeCountName);
+                nullptr, kVertex_GrShaderFlag, SkSLType::kFloat, "edgeCount", &edgeCountName);
         args.fVertBuilder->codeAppendf(R"(
         float NUM_TOTAL_EDGES = %s;)", edgeCountName);
     }
@@ -78,10 +78,10 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
     // View matrix uniforms.
     const char* translateName, *affineMatrixName;
     fAffineMatrixUniform = args.fUniformHandler->addUniform(nullptr, kVertex_GrShaderFlag,
-                                                            kFloat4_GrSLType, "affineMatrix",
+                                                            SkSLType::kFloat4, "affineMatrix",
                                                             &affineMatrixName);
     fTranslateUniform = args.fUniformHandler->addUniform(nullptr, kVertex_GrShaderFlag,
-                                                         kFloat2_GrSLType, "translate",
+                                                         SkSLType::kFloat2, "translate",
                                                          &translateName);
     args.fVertBuilder->codeAppendf("float2x2 AFFINE_MATRIX = float2x2(%s);\n", affineMatrixName);
     args.fVertBuilder->codeAppendf("float2 TRANSLATE = %s;\n", translateName);
@@ -124,10 +124,6 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
     } else {
         numParametricSegments = wangs_formula_conic(PARAMETRIC_PRECISION, p0, p1, p2, w);
     }
-    if (p0 == p1 && p2 == p3) {
-        // This is how we describe lines, but Wang's formula does not return 1 in this case.
-        numParametricSegments = 1;
-    }
 
     // Find the starting and ending tangents.
     float2 tan0 = ((p0 == p1) ? (p1 == p2) ? p3 : p2 : p1) - p0;
@@ -189,7 +185,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
     // Find which direction the curve turns.
     // NOTE: Since the curve is not allowed to inflect, we can just check F'(.5) x F''(.5).
     // NOTE: F'(.5) x F''(.5) has the same sign as (P2 - P0) x (P3 - P1)
-    float turn = cross(p2 - p0, p3 - p1);
+    float turn = cross_length_2d(p2 - p0, p3 - p1);
     float combinedEdgeID = abs(edgeID) - numEdgesInJoin;
     if (combinedEdgeID < 0) {
         tan1 = tan0;
@@ -199,7 +195,7 @@ void GrStrokeTessellationShader::InstancedImpl::onEmitCode(EmitArgs& args, GrGPA
         if (lastControlPoint != p0) {
             tan0 = p0 - lastControlPoint;
         }
-        turn = cross(tan0, tan1);
+        turn = cross_length_2d(tan0, tan1);
     }
 
     // Calculate the curve's starting angle and rotation.
diff --git a/third_party/skia/src/gpu/tessellate/shaders/GrTessellationShader.h b/third_party/skia/src/gpu/tessellate/shaders/GrTessellationShader.h
index d3a17df916bb7..f5c43da62fcfb 100644
--- a/third_party/skia/src/gpu/tessellate/shaders/GrTessellationShader.h
+++ b/third_party/skia/src/gpu/tessellate/shaders/GrTessellationShader.h
@@ -43,7 +43,7 @@ class GrTessellationShader : public GrGeometryProcessor {
         *writer << VertexWriter::Array(pts, 3) << w << VertexWriter::kIEEE_32_infinity;
     }
     static void WriteConicPatch(const SkPoint pts[3], float w, SkPoint patch[4]) {
-        skgpu::VertexWriter writer(patch);
+        skgpu::VertexWriter writer(patch, 4*sizeof(SkPoint));
         WriteConicPatch(pts, w, &writer);
     }
 
diff --git a/third_party/skia/src/gpu/text/BUILD.bazel b/third_party/skia/src/gpu/text/BUILD.bazel
index 2515db105ad56..aa7346a79072e 100644
--- a/third_party/skia/src/gpu/text/BUILD.bazel
+++ b/third_party/skia/src/gpu/text/BUILD.bazel
@@ -132,28 +132,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "GrTextBlobCache_hdr",
-    hdrs = ["GrTextBlobCache.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":GrTextBlob_hdr",
-        "//include/core:SkRefCnt_hdr",
-        "//include/private:SkSpinlock_hdr",
-        "//include/private:SkTArray_hdr",
-        "//include/private:SkTHash_hdr",
-        "//src/core:SkMessageBus_hdr",
-        "//src/core:SkTextBlobPriv_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "GrTextBlobCache_src",
-    srcs = ["GrTextBlobCache.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [":GrTextBlobCache_hdr"],
-)
-
 generated_cc_atom(
     name = "GrTextBlob_hdr",
     hdrs = ["GrTextBlob.h"],
@@ -161,6 +139,7 @@ generated_cc_atom(
     deps = [
         "//include/core:SkPoint3_hdr",
         "//include/core:SkRefCnt_hdr",
+        "//include/private/chromium:GrSlug_hdr",
         "//src/core:SkGlyphRunPainter_hdr",
         "//src/core:SkIPoint16_hdr",
         "//src/core:SkMaskFilterBase_hdr",
@@ -181,12 +160,14 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":GrAtlasManager_hdr",
+        ":GrGlyphVector_hdr",
         ":GrStrikeCache_hdr",
         ":GrTextBlob_hdr",
         "//include/core:SkColorFilter_hdr",
         "//include/gpu:GrRecordingContext_hdr",
         "//include/private:SkTemplates_hdr",
         "//include/private/chromium:GrSlug_hdr",
+        "//src/core:SkFontPriv_hdr",
         "//src/core:SkMaskFilterBase_hdr",
         "//src/core:SkMatrixProvider_hdr",
         "//src/core:SkPaintPriv_hdr",
@@ -206,3 +187,57 @@ generated_cc_atom(
         "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "GrTextBlobRedrawCoordinator_hdr",
+    hdrs = ["GrTextBlobRedrawCoordinator.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GrTextBlob_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:SkSpinlock_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTHash_hdr",
+        "//src/core:SkMessageBus_hdr",
+        "//src/core:SkTextBlobPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrTextBlobRedrawCoordinator_src",
+    srcs = ["GrTextBlobRedrawCoordinator.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GrTextBlobRedrawCoordinator_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrGlyphVector_hdr",
+    hdrs = ["GrGlyphVector.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GrStrikeCache_hdr",
+        "//include/core:SkSpan_hdr",
+        "//src/core:SkGlyphBuffer_hdr",
+        "//src/core:SkGlyph_hdr",
+        "//src/gpu:GrGlyph_hdr",
+        "//src/gpu:GrMeshDrawTarget_hdr",
+        "//src/gpu:GrSubRunAllocator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrGlyphVector_src",
+    srcs = ["GrGlyphVector.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":GrAtlasManager_hdr",
+        ":GrGlyphVector_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkStrikeCache_hdr",
+        "//src/core:SkStrikeSpec_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+    ],
+)
diff --git a/third_party/skia/src/gpu/text/GrGlyphVector.cpp b/third_party/skia/src/gpu/text/GrGlyphVector.cpp
new file mode 100644
index 0000000000000..d95e317ce851c
--- /dev/null
+++ b/third_party/skia/src/gpu/text/GrGlyphVector.cpp
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/gpu/text/GrGlyphVector.h"
+
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkStrikeCache.h"
+#include "src/core/SkStrikeSpec.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/gpu/text/GrAtlasManager.h"
+
+GrGlyphVector::GrGlyphVector(sk_sp<SkStrike>&& strike, SkSpan<Variant> glyphs)
+        : fStrike{std::move(strike)}
+        , fGlyphs{glyphs} {
+    SkASSERT(fStrike != nullptr);
+    SkASSERT(fGlyphs.size() > 0);
+}
+
+GrGlyphVector GrGlyphVector::Make(
+        sk_sp<SkStrike>&& strike, SkSpan<SkGlyphVariant> glyphs, GrSubRunAllocator* alloc) {
+    SkASSERT(strike != nullptr);
+    SkASSERT(glyphs.size() > 0);
+    Variant* variants = alloc->makePODArray<Variant>(glyphs.size());
+    for (auto [i, gv] : SkMakeEnumerate(glyphs)) {
+        variants[i] = gv.glyph()->getPackedID();
+    }
+
+    return GrGlyphVector{std::move(strike), SkMakeSpan(variants, glyphs.size())};
+}
+
+std::optional<GrGlyphVector> GrGlyphVector::MakeFromBuffer(SkReadBuffer& buffer,
+                                                           GrSubRunAllocator* alloc) {
+    auto descriptor = SkAutoDescriptor::MakeFromBuffer(buffer);
+    if (!descriptor.has_value()) { return {}; }
+
+    sk_sp<SkStrike> strike = SkStrikeCache::GlobalStrikeCache()->findStrike(*descriptor->getDesc());
+
+    int32_t glyphCount = buffer.read32();
+    // Since the glyph count can never be zero. There was a buffer reading problem.
+    if (glyphCount == 0) { return {}; }
+
+    // Make sure we can do the multiply in the check below and not overflow an int.
+    if ((int)(INT_MAX / sizeof(uint32_t)) < glyphCount) { return {}; }
+
+    // Check for enough bytes to populate the packedGlyphID array. If not enought something has
+    // gone wrong.
+    if (glyphCount * sizeof(uint32_t) > buffer.available()) { return {}; }
+
+    Variant* variants = alloc->makePODArray<Variant>(glyphCount);
+    for (int i = 0; i < glyphCount; i++) {
+        variants[i].packedGlyphID = SkPackedGlyphID(buffer.readUInt());
+    }
+    return {GrGlyphVector{std::move(strike), SkMakeSpan(variants, glyphCount)}};
+}
+
+void GrGlyphVector::flatten(SkWriteBuffer& buffer) {
+    // There should never be a glyph vector with zero glyphs.
+    SkASSERT(fGlyphs.size() != 0);
+    if (!fStrike) { SK_ABORT("Can't flatten with already drawn."); }
+
+    fStrike->getDescriptor().flatten(buffer);
+
+    // Write out the span of packedGlyphIDs.
+    buffer.write32(SkTo<int32_t>(fGlyphs.size()));
+    for (auto variant : fGlyphs) {
+        buffer.writeUInt(variant.packedGlyphID.value());
+    }
+}
+
+SkSpan<const GrGlyph*> GrGlyphVector::glyphs() const {
+    return SkMakeSpan(reinterpret_cast<const GrGlyph**>(fGlyphs.data()), fGlyphs.size());
+}
+
+// packedGlyphIDToGrGlyph must be run in single-threaded mode.
+// If fStrike != nullptr then the conversion to GrGlyph* has not happened.
+void GrGlyphVector::packedGlyphIDToGrGlyph(GrStrikeCache* cache) {
+    if (fStrike != nullptr) {
+        fGrStrike = cache->findOrCreateStrike(fStrike->strikeSpec());
+
+        for (auto& variant : fGlyphs) {
+            variant.grGlyph = fGrStrike->getGlyph(variant.packedGlyphID);
+        }
+
+        // Drop the ref on the strike that was taken in the SkGlyphRunPainter process* methods.
+        fStrike = nullptr;
+    }
+}
+
+std::tuple<bool, int> GrGlyphVector::regenerateAtlas(int begin, int end,
+                                                     GrMaskFormat maskFormat,
+                                                     int srcPadding,
+                                                     GrMeshDrawTarget* target,
+                                                     bool bilerpPadding) {
+    GrAtlasManager* atlasManager = target->atlasManager();
+    GrDeferredUploadTarget* uploadTarget = target->deferredUploadTarget();
+
+    uint64_t currentAtlasGen = atlasManager->atlasGeneration(maskFormat);
+
+    this->packedGlyphIDToGrGlyph(target->strikeCache());
+
+    if (fAtlasGeneration != currentAtlasGen) {
+        // Calculate the texture coordinates for the vertexes during first use (fAtlasGeneration
+        // is set to kInvalidAtlasGeneration) or the atlas has changed in subsequent calls..
+        fBulkUseToken.reset();
+
+        SkBulkGlyphMetricsAndImages metricsAndImages{fGrStrike->strikeSpec()};
+
+        // Update the atlas information in the GrStrike.
+        auto tokenTracker = uploadTarget->tokenTracker();
+        auto glyphs = fGlyphs.subspan(begin, end - begin);
+        int glyphsPlacedInAtlas = 0;
+        bool success = true;
+        for (const Variant& variant : glyphs) {
+            GrGlyph* grGlyph = variant.grGlyph;
+            SkASSERT(grGlyph != nullptr);
+
+            if (!atlasManager->hasGlyph(maskFormat, grGlyph)) {
+                const SkGlyph& skGlyph = *metricsAndImages.glyph(grGlyph->fPackedID);
+                auto code = atlasManager->addGlyphToAtlas(
+                        skGlyph, grGlyph, srcPadding, target->resourceProvider(),
+                        uploadTarget, bilerpPadding);
+                if (code != GrDrawOpAtlas::ErrorCode::kSucceeded) {
+                    success = code != GrDrawOpAtlas::ErrorCode::kError;
+                    break;
+                }
+            }
+            atlasManager->addGlyphToBulkAndSetUseToken(
+                    &fBulkUseToken, maskFormat, grGlyph,
+                    tokenTracker->nextDrawToken());
+            glyphsPlacedInAtlas++;
+        }
+
+        // Update atlas generation if there are no more glyphs to put in the atlas.
+        if (success && begin + glyphsPlacedInAtlas == SkCount(fGlyphs)) {
+            // Need to get the freshest value of the atlas' generation because
+            // updateTextureCoordinates may have changed it.
+            fAtlasGeneration = atlasManager->atlasGeneration(maskFormat);
+        }
+
+        return {success, glyphsPlacedInAtlas};
+    } else {
+        // The atlas hasn't changed, so our texture coordinates are still valid.
+        if (end == SkCount(fGlyphs)) {
+            // The atlas hasn't changed and the texture coordinates are all still valid. Update
+            // all the plots used to the new use token.
+            atlasManager->setUseTokenBulk(fBulkUseToken,
+                                          uploadTarget->tokenTracker()->nextDrawToken(),
+                                          maskFormat);
+        }
+        return {true, end - begin};
+    }
+}
+
diff --git a/third_party/skia/src/gpu/text/GrGlyphVector.h b/third_party/skia/src/gpu/text/GrGlyphVector.h
new file mode 100644
index 0000000000000..ac335028165e8
--- /dev/null
+++ b/third_party/skia/src/gpu/text/GrGlyphVector.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef GrGlyphVector_DEFINED
+#define GrGlyphVector_DEFINED
+
+#include "include/core/SkSpan.h"
+#include "src/core/SkGlyph.h"
+#include "src/core/SkGlyphBuffer.h"
+#include "src/gpu/GrGlyph.h"
+#include "src/gpu/GrMeshDrawTarget.h"
+#include "src/gpu/GrSubRunAllocator.h"
+#include "src/gpu/text/GrStrikeCache.h"
+
+// -- GlyphVector ----------------------------------------------------------------------------------
+// GlyphVector provides a way to delay the lookup of GrGlyphs until the code is running on the
+// GPU in single threaded mode. The GlyphVector is created in a multi-threaded environment, but
+// the GrStrikeCache is only single threaded (and must be single threaded because of the atlas).
+class GrGlyphVector {
+public:
+    union Variant {
+        // Initially, filled with packed id, but changed to GrGlyph* in the onPrepare stage.
+        SkPackedGlyphID packedGlyphID;
+        GrGlyph* grGlyph;
+        // Add ctors to help SkArenaAlloc create arrays.
+        Variant() : grGlyph{nullptr} {}
+        Variant(SkPackedGlyphID id) : packedGlyphID{id} {}
+    };
+
+    GrGlyphVector(sk_sp<SkStrike>&& strike, SkSpan<Variant> glyphs);
+
+    static GrGlyphVector Make(
+            sk_sp<SkStrike>&& strike, SkSpan<SkGlyphVariant> glyphs, GrSubRunAllocator* alloc);
+    SkSpan<const GrGlyph*> glyphs() const;
+
+    static std::optional<GrGlyphVector> MakeFromBuffer(SkReadBuffer& buffer,
+                                                       GrSubRunAllocator* alloc);
+    void flatten(SkWriteBuffer& buffer);
+
+    // This doesn't need to include sizeof(GrGlyphVector) because this is embedded in each of
+    // the sub runs.
+    int unflattenSize() const { return GlyphVectorSize(fGlyphs.size()); }
+
+    void packedGlyphIDToGrGlyph(GrStrikeCache* cache);
+
+    std::tuple<bool, int> regenerateAtlas(
+            int begin, int end,
+            GrMaskFormat maskFormat,
+            int srcPadding,
+            GrMeshDrawTarget *,
+            bool bilerpPadding = false);
+
+    static size_t GlyphVectorSize(size_t count) {
+        return sizeof(Variant) * count;
+    }
+
+private:
+    friend class TestingPeer;
+    sk_sp<SkStrike> fStrike;
+    SkSpan<Variant> fGlyphs;
+    sk_sp<GrTextStrike> fGrStrike{nullptr};
+    uint64_t fAtlasGeneration{GrDrawOpAtlas::kInvalidAtlasGeneration};
+    GrDrawOpAtlas::BulkUseTokenUpdater fBulkUseToken;
+};
+#endif  // GrGlyphVector_DEFINED
diff --git a/third_party/skia/src/gpu/text/GrSDFTControl.cpp b/third_party/skia/src/gpu/text/GrSDFTControl.cpp
index 8572be7560939..8eb695aca9b61 100644
--- a/third_party/skia/src/gpu/text/GrSDFTControl.cpp
+++ b/third_party/skia/src/gpu/text/GrSDFTControl.cpp
@@ -20,19 +20,16 @@
 // DF sizes and thresholds for usage of the small and medium sizes. For example, above
 // kSmallDFFontLimit we will use the medium size. The large size is used up until the size at
 // which we switch over to drawing as paths as controlled by Control.
-static const int kSmallDFFontSize = 32;
 static const int kSmallDFFontLimit = 32;
-static const int kMediumDFFontSize = 72;
 static const int kMediumDFFontLimit = 72;
-static const int kLargeDFFontSize = 162;
-#ifdef SK_BUILD_FOR_MAC
 static const int kLargeDFFontLimit = 162;
-static const int kExtraLargeDFFontSize = 256;
+#ifdef SK_BUILD_FOR_MAC
+static const int kExtraLargeDFFontLimit = 256;
 #endif
 
 SkScalar GrSDFTControl::MinSDFTRange(bool useSDFTForSmallText, SkScalar min) {
     if (!useSDFTForSmallText) {
-        return kLargeDFFontSize;
+        return kLargeDFFontLimit;
     }
     return min;
 }
@@ -45,33 +42,17 @@ GrSDFTControl::GrSDFTControl(
     SkASSERT_RELEASE(0 < min && min <= max);
 }
 
-auto GrSDFTControl::drawingType(
-        const SkFont& font, const SkPaint& paint, const SkMatrix& viewMatrix) const -> DrawingType {
-
-    // Use paths as the first choice for hairlines and perspective.
-    if ((paint.getStyle() == SkPaint::kStroke_Style && paint.getStrokeWidth() == 0)
-            || viewMatrix.hasPerspective()) {
-        return kPath;
-    }
-
-    SkScalar maxScale = viewMatrix.getMaxScale();
-    SkScalar scaledTextSize = maxScale * font.getSize();
-
-    // If we can't use SDFT, then make a simple choice between direct or path.
-    if (!fAbleToUseSDFT || paint.getMaskFilter() || paint.getStyle() != SkPaint::kFill_Style) {
-        constexpr int kAboveIsPath = SkStrikeCommon::kSkSideTooBigForAtlas;
-        return scaledTextSize < kAboveIsPath ? kDirect : kPath;
-    }
-
-    // Hinted text looks far better at small resolutions
-    // Scaling up beyond 2x yields undesirable artifacts
-    if (scaledTextSize < fMinDistanceFieldFontSize) {
-        return kDirect;
-    } else if (fMaxDistanceFieldFontSize < scaledTextSize) {
-        return kPath;
-    }
+bool GrSDFTControl::isDirect(SkScalar approximateDeviceTextSize, const SkPaint& paint) const {
+    return !isSDFT(approximateDeviceTextSize, paint) &&
+            approximateDeviceTextSize < SkStrikeCommon::kSkSideTooBigForAtlas;
+}
 
-    return kSDFT;
+bool GrSDFTControl::isSDFT(SkScalar approximateDeviceTextSize, const SkPaint& paint) const {
+    return fAbleToUseSDFT &&
+           paint.getMaskFilter() == nullptr &&
+           paint.getStyle() == SkPaint::kFill_Style &&
+           fMinDistanceFieldFontSize <= approximateDeviceTextSize &&
+           approximateDeviceTextSize <= fMaxDistanceFieldFontSize;
 }
 
 SkScalar scaled_text_size(const SkScalar textSize, const SkMatrix& viewMatrix) {
@@ -94,74 +75,50 @@ SkScalar scaled_text_size(const SkScalar textSize, const SkMatrix& viewMatrix) {
     return scaledTextSize;
 }
 
-SkFont GrSDFTControl::getSDFFont(const SkFont& font,
-                                 const SkMatrix& viewMatrix,
-                                 SkScalar* textRatio) const {
+std::tuple<SkFont, SkScalar, GrSDFTMatrixRange>
+GrSDFTControl::getSDFFont(const SkFont& font, const SkMatrix& viewMatrix) const {
     SkScalar textSize = font.getSize();
     SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
 
     SkFont dfFont{font};
 
+    SkScalar dfMaskScaleFloor;
+    SkScalar dfMaskScaleCeil;
     if (scaledTextSize <= kSmallDFFontLimit) {
-        *textRatio = textSize / kSmallDFFontSize;
-        dfFont.setSize(SkIntToScalar(kSmallDFFontSize));
+        dfMaskScaleFloor = fMinDistanceFieldFontSize;
+        dfMaskScaleCeil = kSmallDFFontLimit;
     } else if (scaledTextSize <= kMediumDFFontLimit) {
-        *textRatio = textSize / kMediumDFFontSize;
-        dfFont.setSize(SkIntToScalar(kMediumDFFontSize));
+        dfMaskScaleFloor = kSmallDFFontLimit;
+        dfMaskScaleCeil = kMediumDFFontLimit;
 #ifdef SK_BUILD_FOR_MAC
     } else if (scaledTextSize <= kLargeDFFontLimit) {
-        *textRatio = textSize / kLargeDFFontSize;
-        dfFont.setSize(SkIntToScalar(kLargeDFFontSize));
+        dfMaskScaleFloor = kMediumDFFontLimit;
+        dfMaskScaleCeil = kLargeDFFontLimit;
     } else {
-        *textRatio = textSize / kExtraLargeDFFontSize;
-        dfFont.setSize(SkIntToScalar(kExtraLargeDFFontSize));
+        dfMaskScaleFloor = kLargeDFFontLimit;
+        dfMaskScaleCeil = kExtraLargeDFFontLimit;
     }
 #else
     } else {
-        *textRatio = textSize / kLargeDFFontSize;
-        dfFont.setSize(SkIntToScalar(kLargeDFFontSize));
+        dfMaskScaleFloor = kMediumDFFontLimit;
+        dfMaskScaleCeil = kLargeDFFontLimit;
     }
 #endif
 
+    dfFont.setSize(SkIntToScalar(dfMaskScaleCeil));
     dfFont.setEdging(SkFont::Edging::kAntiAlias);
     dfFont.setForceAutoHinting(false);
     dfFont.setHinting(SkFontHinting::kNormal);
 
     // The sub-pixel position will always happen when transforming to the screen.
     dfFont.setSubpixel(false);
-    return dfFont;
-}
 
-std::pair<SkScalar, SkScalar> GrSDFTControl::computeSDFMinMaxScale(
-        SkScalar textSize, const SkMatrix& viewMatrix) const {
-
-    SkScalar scaledTextSize = scaled_text_size(textSize, viewMatrix);
-
-    // We have three sizes of distance field text, and within each size 'bucket' there is a floor
-    // and ceiling.  A scale outside of this range would require regenerating the distance fields
-    SkScalar dfMaskScaleFloor;
-    SkScalar dfMaskScaleCeil;
-    if (scaledTextSize <= kSmallDFFontLimit) {
-        dfMaskScaleFloor = fMinDistanceFieldFontSize;
-        dfMaskScaleCeil = kSmallDFFontLimit;
-    } else if (scaledTextSize <= kMediumDFFontLimit) {
-        dfMaskScaleFloor = kSmallDFFontLimit;
-        dfMaskScaleCeil = kMediumDFFontLimit;
-    } else {
-        dfMaskScaleFloor = kMediumDFFontLimit;
-        dfMaskScaleCeil = fMaxDistanceFieldFontSize;
-    }
-
-    // Because there can be multiple runs in the blob, we want the overall maxMinScale, and
-    // minMaxScale to make regeneration decisions.  Specifically, we want the maximum minimum scale
-    // we can tolerate before we'd drop to a lower mip size, and the minimum maximum scale we can
-    // tolerate before we'd have to move to a large mip size.  When we actually test these values
-    // we look at the delta in scale between the new viewmatrix and the old viewmatrix, and test
-    // against these values to decide if we can reuse or not(ie, will a given scale change our mip
-    // level)
-    SkASSERT(dfMaskScaleFloor <= scaledTextSize && scaledTextSize <= dfMaskScaleCeil);
-
-    return std::make_pair(dfMaskScaleFloor / scaledTextSize, dfMaskScaleCeil / scaledTextSize);
+    SkScalar minMatrixScale = dfMaskScaleFloor / textSize,
+             maxMatrixScale = dfMaskScaleCeil  / textSize;
+    return {dfFont, textSize / dfMaskScaleCeil, {minMatrixScale, maxMatrixScale}};
 }
 
-
+bool GrSDFTMatrixRange::matrixInRange(const SkMatrix& matrix) const {
+    SkScalar maxScale = matrix.getMaxScale();
+    return fMatrixMin < maxScale && maxScale <= fMatrixMax;
+}
diff --git a/third_party/skia/src/gpu/text/GrSDFTControl.h b/third_party/skia/src/gpu/text/GrSDFTControl.h
index 59ffc7b039bb8..a36042377ba7a 100644
--- a/third_party/skia/src/gpu/text/GrSDFTControl.h
+++ b/third_party/skia/src/gpu/text/GrSDFTControl.h
@@ -11,27 +11,35 @@
 #include "include/core/SkFont.h"
 #include "include/core/SkScalar.h"
 
+#include <tuple>
+
 class SkMatrix;
 class SkSurfaceProps;
 
+// Two numbers fMatrixMin and fMatrixMax such that if viewMatrix.getMaxScale() is between them then
+// this SDFT size can be reused.
+class GrSDFTMatrixRange {
+public:
+    GrSDFTMatrixRange(SkScalar min, SkScalar max) : fMatrixMin{min}, fMatrixMax{max} {}
+    bool matrixInRange(const SkMatrix& matrix) const;
+
+private:
+    const SkScalar fMatrixMin,
+                   fMatrixMax;
+};
+
 class GrSDFTControl {
 public:
     GrSDFTControl(bool ableToUseSDFT, bool useSDFTForSmallText, SkScalar min, SkScalar max);
 
-    enum DrawingType : uint8_t {
-        kDirect = 1,
-        kSDFT = 2,
-        kPath = 4
-    };
+    // Produce a font, a scale factor from the nominal size to the source space size, and matrix
+    // range where this font can be reused.
+    std::tuple<SkFont, SkScalar, GrSDFTMatrixRange>
+    getSDFFont(const SkFont& font, const SkMatrix& viewMatrix) const;
 
-    DrawingType drawingType(
-            const SkFont& font, const SkPaint& paint, const SkMatrix& viewMatrix) const;
+    bool isDirect(SkScalar approximateDeviceTextSize, const SkPaint& paint) const;
+    bool isSDFT(SkScalar approximateDeviceTextSize, const SkPaint& paint) const;
 
-    SkFont getSDFFont(const SkFont& font,
-                      const SkMatrix& viewMatrix,
-                      SkScalar* textRatio) const;
-    std::pair<SkScalar, SkScalar> computeSDFMinMaxScale(
-            SkScalar textSize, const SkMatrix& viewMatrix) const;
 private:
     static SkScalar MinSDFTRange(bool useSDFTForSmallText, SkScalar min);
 
diff --git a/third_party/skia/src/gpu/text/GrSlug.cpp b/third_party/skia/src/gpu/text/GrSlug.cpp
index f69f633a5e46d..0bf4eb9ef0e9f 100644
--- a/third_party/skia/src/gpu/text/GrSlug.cpp
+++ b/third_party/skia/src/gpu/text/GrSlug.cpp
@@ -9,11 +9,19 @@
 
 #include "include/core/SkCanvas.h"
 
+GrTextReferenceFrame::~GrTextReferenceFrame() = default;
+
 GrSlug::~GrSlug() = default;
 sk_sp<GrSlug> GrSlug::ConvertBlob(
         SkCanvas* canvas, const SkTextBlob& blob, SkPoint origin, const SkPaint& paint) {
     return canvas->convertBlobToSlug(blob, origin, paint);
 }
+
+sk_sp<GrSlug> SkMakeSlugFromBuffer(SkReadBuffer& buffer, const SkStrikeClient* client);
+sk_sp<GrSlug> GrSlug::MakeFromBuffer(SkReadBuffer& buffer, const SkStrikeClient* client) {
+    return SkMakeSlugFromBuffer(buffer, client);
+}
+
 void GrSlug::draw(SkCanvas* canvas) {
     canvas->drawSlug(this);
 }
diff --git a/third_party/skia/src/gpu/text/GrTextBlob.cpp b/third_party/skia/src/gpu/text/GrTextBlob.cpp
index d5afd71192d12..013f521209a5e 100644
--- a/third_party/skia/src/gpu/text/GrTextBlob.cpp
+++ b/third_party/skia/src/gpu/text/GrTextBlob.cpp
@@ -9,9 +9,12 @@
 #include "include/gpu/GrRecordingContext.h"
 #include "include/private/SkTemplates.h"
 #include "include/private/chromium/GrSlug.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
+#include "src/core/SkFontPriv.h"
 #include "src/core/SkMaskFilterBase.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/core/SkPaintPriv.h"
+#include "src/core/SkReadBuffer.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkStrikeSpec.h"
 #include "src/gpu/GrClip.h"
@@ -23,6 +26,7 @@
 #include "src/gpu/effects/GrDistanceFieldGeoProc.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/text/GrAtlasManager.h"
+#include "src/gpu/text/GrGlyphVector.h"
 #include "src/gpu/text/GrStrikeCache.h"
 #include "src/gpu/text/GrTextBlob.h"
 
@@ -31,19 +35,238 @@
 #include "src/gpu/v1/Device_v1.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 
-// Defining SK_EXPERIMENTAL_ADD_ATLAS_PADDING will cause all glyphs in the atlas to have a one
-// pixel border to support bi-lerping on demand.
-// #define SK_EXPERIMENTAL_ADD_ATLAS_PADDING
+using AtlasTextOp = skgpu::v1::AtlasTextOp;
 
+// -- GPU Text -------------------------------------------------------------------------------------
+// There are three broad types of SubRun implementations for drawing text using the GPU.
+// GrTextBlob (runs with no postfix) - these runs support drawing for GrTextBlobs.
+// GrSlug (Slug postfix) - these runs support drawing of GrSlugs.
+// (NoCache postfix) - These runs support Canvas direct drawing like drawText, etc.
+//
 // Naming conventions
 //  * drawMatrix - the CTM from the canvas.
 //  * drawOrigin - the x, y location of the drawTextBlob call.
 //  * positionMatrix - this is the combination of the drawMatrix and the drawOrigin:
 //        positionMatrix = drawMatrix * TranslationMatrix(drawOrigin.x, drawOrigin.y);
+//
+// Note:
+//   In order to use GrSlugs, you need to set the fSupportBilerpFromGlyphAtlas on GrContextOptions.
+
+enum GrSubRun::SubRunType : int {
+    kBad = 0,  // Make this 0 to line up with errors from readInt.
+    kDirectMask,
+    kSDFT,
+    kTransformMask,
+    kPath,
+    kDrawable,
+    kSubRunTypeCount,
+};
 
-using AtlasTextOp = skgpu::v1::AtlasTextOp;
+// -- GrBlobSubRun ---------------------------------------------------------------------------------
+class GrBlobSubRun {
+public:
+    virtual ~GrBlobSubRun() = default;
+    // Given an already cached subRun, can this subRun handle this combination paint, matrix, and
+    // position.
+    virtual bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const = 0;
+
+    // Return the underlying atlas SubRun if it exists. Otherwise, return nullptr.
+    // * Don't use this API. It is only to support testing.
+    virtual const GrAtlasSubRun* testingOnly_atlasSubRun() const = 0;
+};
+
+// -- GrSubRun -------------------------------------------------------------------------------------
+GrSubRun::~GrSubRun() = default;
+const GrBlobSubRun* GrSubRun::blobCast() const {
+    SK_ABORT("This is not a subclass of GrBlobSubRun.");
+}
 
 namespace {
+// -- TransformedMaskVertexFiller ------------------------------------------------------------------
+class TransformedMaskVertexFiller {
+public:
+    TransformedMaskVertexFiller(GrMaskFormat maskFormat,
+                                int dstPadding,
+                                SkScalar strikeToSourceScale);
+
+    struct PositionAndExtent {
+        const SkPoint pos;
+        // The rectangle of the glyphs in strike space. But, for kDirectMask this also implies a
+        // device space rect.
+        GrIRect16 rect;
+    };
+
+    size_t vertexStride(const SkMatrix& matrix) const {
+        if (fMaskType != kARGB_GrMaskFormat) {
+            // For formats kA565_GrMaskFormat and kA8_GrMaskFormat where A8 include SDFT.
+            return matrix.hasPerspective() ? sizeof(Mask3DVertex) : sizeof(Mask2DVertex);
+        } else {
+            // For format kARGB_GrMaskFormat
+            return matrix.hasPerspective() ? sizeof(ARGB3DVertex) : sizeof(ARGB2DVertex);
+        }
+    }
+
+    void fillVertexData(SkSpan<const GrGlyph*> glyphs,
+                        SkSpan<const PositionAndExtent> positioning,
+                        GrColor color,
+                        const SkMatrix& positionMatrix,
+                        SkIRect clip,
+                        void* vertexBuffer) const;
+
+    AtlasTextOp::MaskType opMaskType() const;
+    GrMaskFormat grMaskType() const {return fMaskType;}
+
+private:
+    struct AtlasPt {
+        uint16_t u;
+        uint16_t v;
+    };
+
+    // Normal text mask, SDFT, or color.
+    struct Mask2DVertex {
+        SkPoint devicePos;
+        GrColor color;
+        AtlasPt atlasPos;
+    };
+
+    struct ARGB2DVertex {
+        ARGB2DVertex(SkPoint d, GrColor, AtlasPt a) : devicePos{d}, atlasPos{a} {}
+
+        SkPoint devicePos;
+        AtlasPt atlasPos;
+    };
+
+    // Perspective SDFT or SDFT forced to 3D or perspective color.
+    struct Mask3DVertex {
+        SkPoint3 devicePos;
+        GrColor color;
+        AtlasPt atlasPos;
+    };
+
+    struct ARGB3DVertex {
+        ARGB3DVertex(SkPoint3 d, GrColor, AtlasPt a) : devicePos{d}, atlasPos{a} {}
+
+        SkPoint3 devicePos;
+        AtlasPt atlasPos;
+    };
+
+    std::array<SkScalar, 4> sourceRect(PositionAndExtent positionAndExtent) const;
+
+    template<typename Quad, typename VertexData>
+    void fill2D(SkZip<Quad, const GrGlyph*, const VertexData> quadData,
+                GrColor color,
+                const SkMatrix& matrix) const;
+
+    template<typename Quad, typename VertexData>
+    void fill3D(SkZip<Quad, const GrGlyph*, const VertexData> quadData,
+                GrColor color,
+                const SkMatrix& matrix) const;
+
+    const GrMaskFormat fMaskType;
+    const SkPoint fPaddingInset;
+    const SkScalar fStrikeToSourceScale;
+};
+
+TransformedMaskVertexFiller::TransformedMaskVertexFiller(GrMaskFormat maskFormat,
+                                                         int dstPadding,
+                                                         SkScalar strikeToSourceScale)
+        : fMaskType{maskFormat}
+        , fPaddingInset{SkPoint::Make(dstPadding, dstPadding)}
+        , fStrikeToSourceScale{strikeToSourceScale} {}
+
+void TransformedMaskVertexFiller::fillVertexData(SkSpan<const GrGlyph*> glyphs,
+                                                 SkSpan<const PositionAndExtent> positioning,
+                                                 GrColor color,
+                                                 const SkMatrix& positionMatrix,
+                                                 SkIRect clip,
+                                                 void* vertexBuffer) const {
+    auto quadData = [&](auto dst) {
+        return SkMakeZip(dst, glyphs, positioning);
+    };
+
+    if (!positionMatrix.hasPerspective()) {
+        if (fMaskType == GrMaskFormat::kARGB_GrMaskFormat) {
+            using Quad = ARGB2DVertex[4];
+            SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(positionMatrix));
+            this->fill2D(quadData((Quad*) vertexBuffer), color, positionMatrix);
+        } else {
+            using Quad = Mask2DVertex[4];
+            SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(positionMatrix));
+            this->fill2D(quadData((Quad*) vertexBuffer), color, positionMatrix);
+        }
+    } else {
+        if (fMaskType == GrMaskFormat::kARGB_GrMaskFormat) {
+            using Quad = ARGB3DVertex[4];
+            SkASSERT(sizeof(ARGB3DVertex) == this->vertexStride(positionMatrix));
+            this->fill3D(quadData((Quad*) vertexBuffer), color, positionMatrix);
+        } else {
+            using Quad = Mask3DVertex[4];
+            SkASSERT(sizeof(Mask3DVertex) == this->vertexStride(positionMatrix));
+            this->fill3D(quadData((Quad*) vertexBuffer), color, positionMatrix);
+        }
+    }
+}
+
+std::array<SkScalar, 4>
+TransformedMaskVertexFiller::sourceRect(PositionAndExtent positionAndExtent) const {
+    auto[pos, rect] = positionAndExtent;
+    auto[l, t, r, b] = rect;
+    SkPoint LT = (SkPoint::Make(l, t) + fPaddingInset) * fStrikeToSourceScale + pos,
+            RB = (SkPoint::Make(r, b) - fPaddingInset) * fStrikeToSourceScale + pos;
+    return {LT.x(), LT.y(), RB.x(), RB.y()};
+}
+
+template<typename Quad, typename VertexData>
+void TransformedMaskVertexFiller::fill2D(SkZip<Quad, const GrGlyph*, const VertexData> quadData,
+                                         GrColor color,
+                                         const SkMatrix& positionMatrix) const {
+    for (auto[quad, glyph, positionAndExtent] : quadData) {
+        auto [l, t, r, b] = this->sourceRect(positionAndExtent);
+        SkPoint lt = positionMatrix.mapXY(l, t),
+                lb = positionMatrix.mapXY(l, b),
+                rt = positionMatrix.mapXY(r, t),
+                rb = positionMatrix.mapXY(r, b);
+        auto[al, at, ar, ab] = glyph->fAtlasLocator.getUVs();
+        quad[0] = {lt, color, {al, at}};  // L,T
+        quad[1] = {lb, color, {al, ab}};  // L,B
+        quad[2] = {rt, color, {ar, at}};  // R,T
+        quad[3] = {rb, color, {ar, ab}};  // R,B
+    }
+}
+
+template<typename Quad, typename VertexData>
+void TransformedMaskVertexFiller::fill3D(SkZip<Quad, const GrGlyph*, const VertexData> quadData,
+                                         GrColor color,
+                                         const SkMatrix& positionMatrix) const {
+    auto mapXYZ = [&](SkScalar x, SkScalar y) {
+        SkPoint pt{x, y};
+        SkPoint3 result;
+        positionMatrix.mapHomogeneousPoints(&result, &pt, 1);
+        return result;
+    };
+    for (auto[quad, glyph, positionAndExtent] : quadData) {
+        auto [l, t, r, b] = this->sourceRect(positionAndExtent);
+        SkPoint3 lt = mapXYZ(l, t),
+                 lb = mapXYZ(l, b),
+                 rt = mapXYZ(r, t),
+                 rb = mapXYZ(r, b);
+        auto[al, at, ar, ab] = glyph->fAtlasLocator.getUVs();
+        quad[0] = {lt, color, {al, at}};  // L,T
+        quad[1] = {lb, color, {al, ab}};  // L,B
+        quad[2] = {rt, color, {ar, at}};  // R,T
+        quad[3] = {rb, color, {ar, ab}};  // R,B
+    }
+}
+
+AtlasTextOp::MaskType TransformedMaskVertexFiller::opMaskType() const {
+    switch (fMaskType) {
+        case kA8_GrMaskFormat:   return AtlasTextOp::MaskType::kGrayscaleCoverage;
+        case kA565_GrMaskFormat: return AtlasTextOp::MaskType::kLCDCoverage;
+        case kARGB_GrMaskFormat: return AtlasTextOp::MaskType::kColorBitmap;
+    }
+    SkUNREACHABLE;
+}
+
 struct AtlasPt {
     uint16_t u;
     uint16_t v;
@@ -131,36 +354,6 @@ void fill_transformed_vertices_2D(SkZip<Quad, const GrGlyph*, const VertexData>
     }
 }
 
-template<typename Quad, typename VertexData>
-void fill_transformed_vertices_3D(SkZip<Quad, const GrGlyph*, const VertexData> quadData,
-                                  SkScalar dstPadding,
-                                  SkScalar strikeToSource,
-                                  GrColor color,
-                                  const SkMatrix& positionMatrix) {
-    SkPoint inset = {dstPadding, dstPadding};
-    auto mapXYZ = [&](SkScalar x, SkScalar y) {
-        SkPoint pt{x, y};
-        SkPoint3 result;
-        positionMatrix.mapHomogeneousPoints(&result, &pt, 1);
-        return result;
-    };
-    for (auto[quad, glyph, vertexData] : quadData) {
-        auto[pos, rect] = vertexData;
-        auto [l, t, r, b] = rect;
-        SkPoint sLT = (SkPoint::Make(l, t) + inset) * strikeToSource + pos,
-                sRB = (SkPoint::Make(r, b) - inset) * strikeToSource + pos;
-        SkPoint3 lt = mapXYZ(sLT.x(), sLT.y()),
-                 lb = mapXYZ(sLT.x(), sRB.y()),
-                 rt = mapXYZ(sRB.x(), sLT.y()),
-                 rb = mapXYZ(sRB.x(), sRB.y());
-        auto[al, at, ar, ab] = glyph->fAtlasLocator.getUVs();
-        quad[0] = {lt, color, {al, at}};  // L,T
-        quad[1] = {lb, color, {al, ab}};  // L,B
-        quad[2] = {rt, color, {ar, at}};  // R,T
-        quad[3] = {rb, color, {ar, ab}};  // R,B
-    }
-}
-
 // Check for integer translate with the same 2x2 matrix.
 // Returns the translation, and true if the change from initial matrix to the position matrix
 // support using direct glyph masks.
@@ -179,61 +372,80 @@ std::tuple<bool, SkVector> can_use_direct(
             translation};
 }
 
-// -- PathGlyph ------------------------------------------------------------------------------------
-// The encoding of a specific path at a specific source location.
-struct PathGlyph {
-    PathGlyph(const SkPath& path, SkPoint origin)
-        : fPath(path)
-        , fOrigin(origin) {}
-    SkPath fPath;
-    SkPoint fOrigin;
-};
-
-// -- PathSubRun -----------------------------------------------------------------------------------
-class PathSubRun final : public GrSubRun {
+// -- PathOpSubmitter ------------------------------------------------------------------------------
+// Shared code for submitting GPU ops for drawing glyphs as paths.
+class PathOpSubmitter {
+    struct PathAndPosition;
 public:
-    PathSubRun(bool isAntiAliased,
-               SkScalar strikeToSourceScale,
-               SkSpan<PathGlyph> paths,
-               std::unique_ptr<PathGlyph[], GrSubRunAllocator::ArrayDestroyer> pathData);
-
-    void draw(const GrClip*,
-              const SkMatrixProvider& viewMatrix,
-              SkPoint drawOrigin,
-              const SkPaint& paint,
-              skgpu::v1::SurfaceDrawContext*) const override;
+    PathOpSubmitter(bool isAntiAliased,
+                    SkScalar strikeToSourceScale,
+                    SkSpan<PathAndPosition> paths,
+                    std::unique_ptr<PathAndPosition[], GrSubRunAllocator::ArrayDestroyer> pathData);
 
-    bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override;
+    PathOpSubmitter(PathOpSubmitter&& that);
 
-    GrAtlasSubRun* testingOnly_atlasSubRun() override;
+    static PathOpSubmitter Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                bool isAntiAliased,
+                                SkScalar strikeToSourceScale,
+                                GrSubRunAllocator* alloc);
 
-    static GrSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                              bool isAntiAliased,
-                              SkScalar strikeToSourceScale,
-                              GrSubRunAllocator* alloc);
+    void submitOps(SkCanvas*,
+                   const GrClip* clip,
+                   const SkMatrixProvider& viewMatrix,
+                   SkPoint drawOrigin,
+                   const SkPaint& paint,
+                   skgpu::v1::SurfaceDrawContext* sdc) const;
 
 private:
+    struct PathAndPosition {
+        SkPath fPath;
+        SkPoint fPosition;
+    };
     const bool fIsAntiAliased;
     const SkScalar fStrikeToSourceScale;
-    const SkSpan<const PathGlyph> fPaths;
-    const std::unique_ptr<PathGlyph[], GrSubRunAllocator::ArrayDestroyer> fPathData;
+    const SkSpan<const PathAndPosition> fPaths;
+    std::unique_ptr<PathAndPosition[], GrSubRunAllocator::ArrayDestroyer> fPathData;
 };
 
-PathSubRun::PathSubRun(bool isAntiAliased,
-                       SkScalar strikeToSourceScale,
-                       SkSpan<PathGlyph> paths,
-                       std::unique_ptr<PathGlyph[], GrSubRunAllocator::ArrayDestroyer> pathData)
-    : fIsAntiAliased{isAntiAliased}
-    , fStrikeToSourceScale{strikeToSourceScale}
-    , fPaths{paths}
-    , fPathData{std::move(pathData)} { }
-
-void PathSubRun::draw(const GrClip* clip,
-                      const SkMatrixProvider& viewMatrix,
-                      SkPoint drawOrigin,
-                      const SkPaint& paint,
-                      skgpu::v1::SurfaceDrawContext* sdc) const {
+PathOpSubmitter::PathOpSubmitter(
+        bool isAntiAliased,
+        SkScalar strikeToSourceScale,
+        SkSpan<PathAndPosition> paths,
+        std::unique_ptr<PathAndPosition[], GrSubRunAllocator::ArrayDestroyer> pathData)
+            : fIsAntiAliased{isAntiAliased}
+            , fStrikeToSourceScale{strikeToSourceScale}
+            , fPaths{paths}
+            , fPathData{std::move(pathData)} {
     SkASSERT(!fPaths.empty());
+}
+
+PathOpSubmitter::PathOpSubmitter(PathOpSubmitter&& that)
+    : fIsAntiAliased{that.fIsAntiAliased}
+    , fStrikeToSourceScale{that.fStrikeToSourceScale}
+    , fPaths{that.fPaths}
+    , fPathData{std::move(that.fPathData)} {}
+
+PathOpSubmitter PathOpSubmitter::Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                      bool isAntiAliased,
+                                      SkScalar strikeToSourceScale,
+                                      GrSubRunAllocator* alloc) {
+    auto pathData = alloc->makeUniqueArray<PathAndPosition>(
+            accepted.size(),
+            [&](int i){
+                auto [variant, pos] = accepted[i];
+                return PathAndPosition{*variant.path(), pos};
+            });
+    SkSpan<PathAndPosition> paths{pathData.get(), accepted.size()};
+
+    return PathOpSubmitter{isAntiAliased, strikeToSourceScale, paths, std::move(pathData)};
+}
+
+void PathOpSubmitter::submitOps(SkCanvas* canvas,
+                                const GrClip* clip,
+                                const SkMatrixProvider& viewMatrix,
+                                SkPoint drawOrigin,
+                                const SkPaint& paint,
+                                skgpu::v1::SurfaceDrawContext* sdc) const {
     SkPaint runPaint{paint};
     runPaint.setAntiAlias(fIsAntiAliased);
     // If there are shaders, blurs or styles, the path must be scaled into source
@@ -252,21 +464,21 @@ void PathSubRun::draw(const GrClip* clip,
     if (!needsExactCTM) {
         for (const auto& pathPos : fPaths) {
             const SkPath& path = pathPos.fPath;
-            const SkPoint pos = pathPos.fOrigin;  // Transform the glyph to source space.
+            const SkPoint pos = pathPos.fPosition;
+            // Transform the glyph to source space.
             SkMatrix pathMatrix = strikeToSource;
             pathMatrix.postTranslate(pos.x(), pos.y());
-            SkPreConcatMatrixProvider strikeToDevice(viewMatrix, pathMatrix);
 
-            GrStyledShape shape(path, paint);
-            GrBlurUtils::drawShapeWithMaskFilter(
-                    sdc->recordingContext(), sdc, clip, runPaint, strikeToDevice, shape);
+            SkAutoCanvasRestore acr(canvas, true);
+            canvas->concat(pathMatrix);
+            canvas->drawPath(path, runPaint);
         }
     } else {
         // Transform the path to device because the deviceMatrix must be unchanged to
         // draw effect, filter or shader paths.
         for (const auto& pathPos : fPaths) {
             const SkPath& path = pathPos.fPath;
-            const SkPoint pos = pathPos.fOrigin;
+            const SkPoint pos = pathPos.fPosition;
             // Transform the glyph to source space.
             SkMatrix pathMatrix = strikeToSource;
             pathMatrix.postTranslate(pos.x(), pos.y());
@@ -274,199 +486,232 @@ void PathSubRun::draw(const GrClip* clip,
             SkPath deviceOutline;
             path.transform(pathMatrix, &deviceOutline);
             deviceOutline.setIsVolatile(true);
-            GrStyledShape shape(deviceOutline, paint);
-            GrBlurUtils::drawShapeWithMaskFilter(sdc->recordingContext(), sdc, clip, runPaint,
-                                                 viewMatrix, shape);
+            canvas->drawPath(deviceOutline, runPaint);
         }
     }
 }
 
-bool PathSubRun::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const {
-    return true;
-}
-
-GrSubRunOwner PathSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                               bool isAntiAliased,
-                               SkScalar strikeToSourceScale,
-                               GrSubRunAllocator* alloc) {
-    auto pathData = alloc->makeUniqueArray<PathGlyph>(
-            drawables.size(),
-            [&](int i){
-                auto [variant, pos] = drawables[i];
-                return PathGlyph{*variant.path(), pos};
-            });
-    SkSpan<PathGlyph> paths{pathData.get(), drawables.size()};
-
-    return alloc->makeUnique<PathSubRun>(
-            isAntiAliased, strikeToSourceScale, paths, std::move(pathData));
-}
-
-GrAtlasSubRun* PathSubRun::testingOnly_atlasSubRun() {
-    return nullptr;
-};
-
-// -- GlyphVector ----------------------------------------------------------------------------------
-// GlyphVector provides a way to delay the lookup of GrGlyphs until the code is running on the
-// GPU in single threaded mode. The GlyphVector is created in a multi-threaded environment, but
-// the GrStrikeCache is only single threaded (and must be single threaded because of the atlas).
-class GlyphVector {
+// -- PathSubRun -----------------------------------------------------------------------------------
+class PathSubRun final : public GrSubRun, public GrBlobSubRun {
 public:
-    union Variant {
-        // Initially, filled with packed id, but changed to GrGlyph* in the onPrepare stage.
-        SkPackedGlyphID packedGlyphID;
-        GrGlyph* grGlyph;
-        // Add ctors to help SkArenaAlloc create arrays.
-        Variant() : grGlyph{nullptr} {}
-        Variant(SkPackedGlyphID id) : packedGlyphID{id} {}
-    };
+    PathSubRun(PathOpSubmitter&& pathDrawing) : fPathDrawing(std::move(pathDrawing)) {}
 
-    GlyphVector(sk_sp<SkStrike>&& strike, SkSpan<Variant> glyphs);
+    static GrSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                              bool isAntiAliased,
+                              SkScalar strikeToSourceScale,
+                              GrSubRunAllocator* alloc) {
+        return alloc->makeUnique<PathSubRun>(
+                PathOpSubmitter::Make(accepted, isAntiAliased, strikeToSourceScale, alloc));
+    }
 
-    static GlyphVector Make(
-            sk_sp<SkStrike>&& strike, SkSpan<SkGlyphVariant> glyphs, GrSubRunAllocator* alloc);
-    SkSpan<const GrGlyph*> glyphs() const;
+    void draw(SkCanvas* canvas,
+              const GrClip* clip,
+              const SkMatrixProvider& viewMatrix,
+              SkPoint drawOrigin,
+              const SkPaint& paint,
+              skgpu::v1::SurfaceDrawContext* sdc) const override {
+        fPathDrawing.submitOps(canvas, clip, viewMatrix, drawOrigin, paint, sdc);
+    }
 
-    void packedGlyphIDToGrGlyph(GrStrikeCache* cache);
+    const GrBlobSubRun* blobCast() const override { return this; }
+    int unflattenSize() const override { return 0; }
 
-    std::tuple<bool, int> regenerateAtlas(
-            int begin, int end,
-            GrMaskFormat maskFormat,
-            int srcPadding,
-            GrMeshDrawTarget *,
-            bool bilerpPadding = false);
+    bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override {
+        return true;
+    }
+    const GrAtlasSubRun* testingOnly_atlasSubRun() const override { return nullptr; }
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client) {
+        return nullptr;
+    }
 
-    static size_t GlyphVectorSize(size_t count) {
-        return sizeof(Variant) * count;
+protected:
+    SubRunType subRunType() const override { return kPath; }
+    void doFlatten(SkWriteBuffer& buffer) const override {
+        SK_ABORT("Not implemented.");
     }
 
 private:
-    sk_sp<SkStrike> fStrike;
-    SkSpan<Variant> fGlyphs;
-    sk_sp<GrTextStrike> fGrStrike{nullptr};
-    uint64_t fAtlasGeneration{GrDrawOpAtlas::kInvalidAtlasGeneration};
-    GrDrawOpAtlas::BulkUseTokenUpdater fBulkUseToken;
+    PathOpSubmitter fPathDrawing;
 };
 
-GlyphVector::GlyphVector(sk_sp<SkStrike>&& strike, SkSpan<Variant> glyphs)
-        : fStrike{std::move(strike)}
-        , fGlyphs{glyphs} {
-    SkASSERT(fStrike != nullptr);
-}
+// -- DrawableOpSubmitter --------------------------------------------------------------------------
+// Shared code for submitting GPU ops for drawing glyphs as drawables.
+class DrawableOpSubmitter {
+    struct DrawableAndPosition;
+public:
+    DrawableOpSubmitter(bool isAntiAliased,
+                        SkScalar strikeToSourceScale,
+                        SkSpan<DrawableAndPosition> drawables,
+                        std::unique_ptr<DrawableAndPosition[],
+                                        GrSubRunAllocator::ArrayDestroyer> drawableData);
+
+    DrawableOpSubmitter(DrawableOpSubmitter&& that);
+
+    static DrawableOpSubmitter Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                    bool isAntiAliased,
+                                    SkScalar strikeToSourceScale,
+                                    GrSubRunAllocator* alloc);
+
+    void submitOps(SkCanvas*,
+                   const GrClip* clip,
+                   const SkMatrixProvider& viewMatrix,
+                   SkPoint drawOrigin,
+                   const SkPaint& paint,
+                   skgpu::v1::SurfaceDrawContext* sdc) const;
 
-GlyphVector GlyphVector::Make(
-        sk_sp<SkStrike>&& strike, SkSpan<SkGlyphVariant> glyphs, GrSubRunAllocator* alloc) {
-    Variant* variants = alloc->makePODArray<Variant>(glyphs.size());
-    for (auto [i, gv] : SkMakeEnumerate(glyphs)) {
-        variants[i] = gv.glyph()->getPackedID();
-    }
+private:
+    struct DrawableAndPosition {
+        sk_sp<SkDrawable> fDrawable;
+        SkPoint fPosition;
+    };
+    const bool fIsAntiAliased;
+    const SkScalar fStrikeToSourceScale;
+    const SkSpan<const DrawableAndPosition> fDrawables;
+    std::unique_ptr<DrawableAndPosition[], GrSubRunAllocator::ArrayDestroyer> fDrawableData;
+};
 
-    return GlyphVector{std::move(strike), SkMakeSpan(variants, glyphs.size())};
-}
+DrawableOpSubmitter::DrawableOpSubmitter(
+        bool isAntiAliased,
+        SkScalar strikeToSourceScale,
+        SkSpan<DrawableAndPosition> drawables,
+        std::unique_ptr<DrawableAndPosition[], GrSubRunAllocator::ArrayDestroyer> drawableData)
+            : fIsAntiAliased{isAntiAliased}
+            , fStrikeToSourceScale{strikeToSourceScale}
+            , fDrawables{drawables}
+            , fDrawableData{std::move(drawableData)} {
+    SkASSERT(!fDrawables.empty());
+}
+
+DrawableOpSubmitter::DrawableOpSubmitter(DrawableOpSubmitter&& that)
+    : fIsAntiAliased{that.fIsAntiAliased}
+    , fStrikeToSourceScale{that.fStrikeToSourceScale}
+    , fDrawables{that.fDrawables}
+    , fDrawableData{std::move(that.fDrawableData)} {}
+
+DrawableOpSubmitter DrawableOpSubmitter::Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                              bool isAntiAliased,
+                                              SkScalar strikeToSourceScale,
+                                              GrSubRunAllocator* alloc) {
+    auto drawableData = alloc->makeUniqueArray<DrawableAndPosition>(
+            accepted.size(),
+            [&](int i){
+                auto [variant, pos] = accepted[i];
+                return DrawableAndPosition{sk_ref_sp(variant.drawable()), pos};
+            });
+    SkSpan<DrawableAndPosition> drawables{drawableData.get(), accepted.size()};
 
-SkSpan<const GrGlyph*> GlyphVector::glyphs() const {
-    return SkMakeSpan(reinterpret_cast<const GrGlyph**>(fGlyphs.data()), fGlyphs.size());
+    return DrawableOpSubmitter{isAntiAliased, strikeToSourceScale,
+                               drawables, std::move(drawableData)};
 }
 
-// packedGlyphIDToGrGlyph must be run in single-threaded mode.
-// If fStrike != nullptr then the conversion to GrGlyph* has not happened.
-void GlyphVector::packedGlyphIDToGrGlyph(GrStrikeCache* cache) {
-    if (fStrike != nullptr) {
-        fGrStrike = cache->findOrCreateStrike(fStrike->strikeSpec());
+void DrawableOpSubmitter::submitOps(SkCanvas* canvas,
+                                    const GrClip* clip,
+                                    const SkMatrixProvider& viewMatrix,
+                                    SkPoint drawOrigin,
+                                    const SkPaint& paint,
+                                    skgpu::v1::SurfaceDrawContext* sdc) const {
+    // Calculate the matrix that maps the path glyphs from their size in the strike to
+    // the graphics source space.
+    SkMatrix strikeToSource = SkMatrix::Scale(fStrikeToSourceScale, fStrikeToSourceScale);
+    strikeToSource.postTranslate(drawOrigin.x(), drawOrigin.y());
 
-        for (auto& variant : fGlyphs) {
-            variant.grGlyph = fGrStrike->getGlyph(variant.packedGlyphID);
-        }
+    // Transform the path to device because the deviceMatrix must be unchanged to
+    // draw effect, filter or shader paths.
+    for (const auto& pathPos : fDrawables) {
+        const sk_sp<SkDrawable>& drawable = pathPos.fDrawable;
+        const SkPoint pos = pathPos.fPosition;
+        // Transform the glyph to source space.
+        SkMatrix pathMatrix = strikeToSource;
+        pathMatrix.postTranslate(pos.x(), pos.y());
 
-        // Drop the ref on the strike that was taken in the SkGlyphRunPainter process* methods.
-        fStrike = nullptr;
+        SkAutoCanvasRestore acr(canvas, false);
+        SkRect drawableBounds = drawable->getBounds();
+        pathMatrix.mapRect(&drawableBounds);
+        canvas->saveLayer(&drawableBounds, &paint);
+        drawable->draw(canvas, &pathMatrix);
     }
 }
 
-std::tuple<bool, int> GlyphVector::regenerateAtlas(int begin, int end,
-                                                   GrMaskFormat maskFormat,
-                                                   int srcPadding,
-                                                   GrMeshDrawTarget* target,
-                                                   bool bilerpPadding) {
-    GrAtlasManager* atlasManager = target->atlasManager();
-    GrDeferredUploadTarget* uploadTarget = target->deferredUploadTarget();
+template <typename SubRun>
+GrSubRunOwner make_drawable_sub_run(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+                                   bool isAntiAliased,
+                                   SkScalar strikeToSourceScale,
+                                   GrSubRunAllocator* alloc) {
+    return alloc->makeUnique<SubRun>(
+            DrawableOpSubmitter::Make(drawables, isAntiAliased, strikeToSourceScale, alloc));
+}
 
-    uint64_t currentAtlasGen = atlasManager->atlasGeneration(maskFormat);
+// -- DrawableSubRunSlug ---------------------------------------------------------------------------
+class DrawableSubRunSlug : public GrSubRun {
+public:
+    DrawableSubRunSlug(DrawableOpSubmitter&& drawingDrawing)
+            : fDrawingDrawing(std::move(drawingDrawing)) {}
 
-    this->packedGlyphIDToGrGlyph(target->strikeCache());
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client) {
+        return nullptr;
+    }
 
-    if (fAtlasGeneration != currentAtlasGen) {
-        // Calculate the texture coordinates for the vertexes during first use (fAtlasGeneration
-        // is set to kInvalidAtlasGeneration) or the atlas has changed in subsequent calls..
-        fBulkUseToken.reset();
+    void draw(SkCanvas* canvas,
+              const GrClip* clip,
+              const SkMatrixProvider& viewMatrix,
+              SkPoint drawOrigin,
+              const SkPaint& paint,
+              skgpu::v1::SurfaceDrawContext* sdc) const override {
+        fDrawingDrawing.submitOps(canvas, clip, viewMatrix, drawOrigin, paint, sdc);
+    }
 
-        SkBulkGlyphMetricsAndImages metricsAndImages{fGrStrike->strikeSpec()};
+    int unflattenSize() const override { return 0; }
 
-        // Update the atlas information in the GrStrike.
-        auto tokenTracker = uploadTarget->tokenTracker();
-        auto glyphs = fGlyphs.subspan(begin, end - begin);
-        int glyphsPlacedInAtlas = 0;
-        bool success = true;
-        for (const Variant& variant : glyphs) {
-            GrGlyph* grGlyph = variant.grGlyph;
-            SkASSERT(grGlyph != nullptr);
+protected:
+    SubRunType subRunType() const override { return kDrawable; }
+    void doFlatten(SkWriteBuffer& buffer) const override {
+        SK_ABORT("Not implemented.");
+    }
 
-            if (!atlasManager->hasGlyph(maskFormat, grGlyph)) {
-                const SkGlyph& skGlyph = *metricsAndImages.glyph(grGlyph->fPackedID);
-                auto code = atlasManager->addGlyphToAtlas(
-                        skGlyph, grGlyph, srcPadding, target->resourceProvider(),
-                        uploadTarget, bilerpPadding);
-                if (code != GrDrawOpAtlas::ErrorCode::kSucceeded) {
-                    success = code != GrDrawOpAtlas::ErrorCode::kError;
-                    break;
-                }
-            }
-            atlasManager->addGlyphToBulkAndSetUseToken(
-                    &fBulkUseToken, maskFormat, grGlyph,
-                    tokenTracker->nextDrawToken());
-            glyphsPlacedInAtlas++;
-        }
+private:
+    DrawableOpSubmitter fDrawingDrawing;
+};
 
-        // Update atlas generation if there are no more glyphs to put in the atlas.
-        if (success && begin + glyphsPlacedInAtlas == SkCount(fGlyphs)) {
-            // Need to get the freshest value of the atlas' generation because
-            // updateTextureCoordinates may have changed it.
-            fAtlasGeneration = atlasManager->atlasGeneration(maskFormat);
-        }
+// -- DrawableSubRun -------------------------------------------------------------------------------
+class DrawableSubRun final : public DrawableSubRunSlug, public GrBlobSubRun {
+public:
+    using DrawableSubRunSlug::DrawableSubRunSlug;
+    const GrBlobSubRun* blobCast() const override { return this; }
+    int unflattenSize() const override { return 0; }
 
-        return {success, glyphsPlacedInAtlas};
-    } else {
-        // The atlas hasn't changed, so our texture coordinates are still valid.
-        if (end == SkCount(fGlyphs)) {
-            // The atlas hasn't changed and the texture coordinates are all still valid. Update
-            // all the plots used to the new use token.
-            atlasManager->setUseTokenBulk(fBulkUseToken,
-                                          uploadTarget->tokenTracker()->nextDrawToken(),
-                                          maskFormat);
-        }
-        return {true, end - begin};
+    bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override {
+        return true;
     }
-}
+    const GrAtlasSubRun* testingOnly_atlasSubRun() const override { return nullptr; }
+};
 
 // -- DirectMaskSubRun -----------------------------------------------------------------------------
-class DirectMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
+class DirectMaskSubRun final : public GrSubRun, public GrBlobSubRun, public GrAtlasSubRun {
 public:
     using DevicePosition = skvx::Vec<2, int16_t>;
 
-    DirectMaskSubRun(GrMaskFormat format,
-                     GrTextBlob* blob,
+    DirectMaskSubRun(const GrTextReferenceFrame* referenceFrame,
+                     GrMaskFormat format,
                      const SkGlyphRect& deviceBounds,
                      SkSpan<const DevicePosition> devicePositions,
-                     GlyphVector&& glyphs,
-                     bool glyphsOutOfBounds);
+                     GrGlyphVector&& glyphs,
+                     bool glyphsOutOfBounds,
+                     bool supportBilerpAtlas);
 
-    static GrSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrSubRunOwner Make(const GrTextBlob* blob,
+                              const SkZip<SkGlyphVariant, SkPoint>& accepted,
                               sk_sp<SkStrike>&& strike,
-                              SkScalar,
                               GrMaskFormat format,
-                              GrTextBlob* blob,
                               GrSubRunAllocator* alloc);
 
-    void draw(const GrClip*,
+    void draw(SkCanvas*,
+              const GrClip*,
               const SkMatrixProvider& viewMatrix,
               SkPoint drawOrigin,
               const SkPaint& paint,
@@ -480,15 +725,18 @@ class DirectMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext* sdc,
                     GrAtlasSubRunOwner) const override;
 
+    const GrBlobSubRun* blobCast() const override { return this; }
+    int unflattenSize() const override { return 0; }
+
     bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override;
 
-    GrAtlasSubRun* testingOnly_atlasSubRun() override;
+    const GrAtlasSubRun* testingOnly_atlasSubRun() const override;
 
     size_t vertexStride(const SkMatrix& drawMatrix) const override;
 
     int glyphCount() const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int>
     regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
@@ -497,44 +745,53 @@ class DirectMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
                         GrColor color,
                         const SkMatrix& drawMatrix, SkPoint drawOrigin,
                         SkIRect clip) const override;
+
+protected:
+    SubRunType subRunType() const override { return kDirectMask; }
+    void doFlatten(SkWriteBuffer& buffer) const override {
+        SK_ABORT("Not implemented.");
+    }
+
 private:
     // The rectangle that surrounds all the glyph bounding boxes in device space.
     SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
 
+    const GrTextReferenceFrame* const fTextReferenceFrame;
     const GrMaskFormat fMaskFormat;
-    GrTextBlob* const fBlob;
 
     // The union of all the glyph bounds in device space.
     const SkGlyphRect fGlyphDeviceBounds;
     const SkSpan<const DevicePosition> fLeftTopDevicePos;
     const bool fSomeGlyphsExcluded;
+    const bool fSupportBilerpAtlas;
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 };
 
-DirectMaskSubRun::DirectMaskSubRun(GrMaskFormat format,
-                                   GrTextBlob* blob,
+DirectMaskSubRun::DirectMaskSubRun(const GrTextReferenceFrame* referenceFrame,
+                                   GrMaskFormat format,
                                    const SkGlyphRect& deviceBounds,
                                    SkSpan<const DevicePosition> devicePositions,
-                                   GlyphVector&& glyphs,
-                                   bool glyphsOutOfBounds)
-        : fMaskFormat{format}
-        , fBlob{blob}
+                                   GrGlyphVector&& glyphs,
+                                   bool glyphsOutOfBounds,
+                                   bool supportBilerpAtlas)
+        : fTextReferenceFrame{referenceFrame}
+        , fMaskFormat{format}
         , fGlyphDeviceBounds{deviceBounds}
         , fLeftTopDevicePos{devicePositions}
         , fSomeGlyphsExcluded{glyphsOutOfBounds}
+        , fSupportBilerpAtlas{supportBilerpAtlas}
         , fGlyphs{std::move(glyphs)} {}
 
-GrSubRunOwner DirectMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+GrSubRunOwner DirectMaskSubRun::Make(const GrTextBlob* blob,
+                                     const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                      sk_sp<SkStrike>&& strike,
-                                     SkScalar,
                                      GrMaskFormat format,
-                                     GrTextBlob* blob,
                                      GrSubRunAllocator* alloc) {
-    DevicePosition* glyphLeftTop = alloc->makePODArray<DevicePosition>(drawables.size());
-    GlyphVector::Variant* glyphIDs = alloc->makePODArray<GlyphVector::Variant>(drawables.size());
+    auto glyphLeftTop = alloc->makePODArray<DevicePosition>(accepted.size());
+    auto glyphIDs = alloc->makePODArray<GrGlyphVector::Variant>(accepted.size());
 
     // Because this is the direct case, the maximum width or height is the size that fits in the
     // atlas. This boundary is checked below to ensure that the call to SkGlyphRect below will
@@ -543,7 +800,7 @@ GrSubRunOwner DirectMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawa
             std::numeric_limits<int16_t>::max() - SkStrikeCommon::kSkSideTooBigForAtlas;
     SkGlyphRect runBounds = skglyph::empty_rect();
     size_t goodPosCount = 0;
-    for (auto [variant, pos] : drawables) {
+    for (auto [variant, pos] : accepted) {
         auto [x, y] = pos;
         // Ensure that the .offset() call below does not overflow. And, at this point none of the
         // rectangles are empty because they were culled before the run was created. Basically,
@@ -566,15 +823,18 @@ GrSubRunOwner DirectMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawa
 
     // If some glyphs were excluded by the bounds, then this subrun can't be generally be used
     // for other draws. Mark the subrun as not general.
-    bool glyphsExcluded = goodPosCount != drawables.size();
+    bool glyphsExcluded = goodPosCount != accepted.size();
     SkSpan<const DevicePosition> leftTop{glyphLeftTop, goodPosCount};
     return alloc->makeUnique<DirectMaskSubRun>(
-            format, blob, runBounds, leftTop,
-            GlyphVector{std::move(strike), {glyphIDs, goodPosCount}}, glyphsExcluded);
+            blob, format, runBounds, leftTop,
+            GrGlyphVector{std::move(strike), {glyphIDs, goodPosCount}},
+            glyphsExcluded,
+            blob->supportBilerpAtlas());
 }
 
 bool DirectMaskSubRun::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const {
-    auto [reuse, translation] = can_use_direct(fBlob->initialPositionMatrix(), positionMatrix);
+    auto [reuse, translation] =
+            can_use_direct(fTextReferenceFrame->initialPositionMatrix(), positionMatrix);
 
     // If glyphs were excluded because of position bounds, then this subrun can only be reused if
     // there is no change in position.
@@ -597,7 +857,8 @@ int DirectMaskSubRun::glyphCount() const {
     return SkCount(fGlyphs.glyphs());
 }
 
-void DirectMaskSubRun::draw(const GrClip* clip,
+void DirectMaskSubRun::draw(SkCanvas*,
+                            const GrClip* clip,
                             const SkMatrixProvider& viewMatrix,
                             SkPoint drawOrigin,
                             const SkPaint& paint,
@@ -679,7 +940,7 @@ DirectMaskSubRun::makeAtlasTextOp(const GrClip* clip,
             clip = nullptr;
             break;
         case kGPUClipped:
-            // Use the the GPU clip; clipRect is ignored.
+            // Use the GPU clip; clipRect is ignored.
             break;
     }
 
@@ -693,7 +954,7 @@ DirectMaskSubRun::makeAtlasTextOp(const GrClip* clip,
                                                        drawMatrix,
                                                        drawOrigin,
                                                        clipRect,
-                                                       sk_ref_sp<GrTextBlob>(fBlob),
+                                                       sk_ref_sp(fTextReferenceFrame),
                                                        drawingColor,
                                                        sdc->arenaAlloc());
 
@@ -709,17 +970,15 @@ DirectMaskSubRun::makeAtlasTextOp(const GrClip* clip,
     return {clip, std::move(op)};
 }
 
-void DirectMaskSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void DirectMaskSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int>
 DirectMaskSubRun::regenerateAtlas(int begin, int end, GrMeshDrawTarget* target) const {
-    #if defined(SK_EXPERIMENTAL_ADD_ATLAS_PADDING)
-        return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
-    #else
-        return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 0, target, false);
-    #endif
+    int srcPadding = fSupportBilerpAtlas ? 1 : 0;
+    return fGlyphs.regenerateAtlas(
+            begin, end, fMaskFormat, srcPadding, target, fSupportBilerpAtlas);
 }
 
 // The 99% case. No clip. Non-color only.
@@ -802,26 +1061,27 @@ void DirectMaskSubRun::fillVertexData(void* vertexDst, int offset, int count,
                          fLeftTopDevicePos.subspan(offset, count));
     };
 
-    SkPoint originOffset = positionMatrix.mapOrigin() - fBlob->initialPositionMatrix().mapOrigin();
+    SkPoint originOffset =
+            positionMatrix.mapOrigin() - fTextReferenceFrame->initialPositionMatrix().mapOrigin();
 
     if (clip.isEmpty()) {
         if (fMaskFormat != kARGB_GrMaskFormat) {
             using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+            SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(positionMatrix));
             direct_2D(quadData((Quad*)vertexDst), color, originOffset);
         } else {
             using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+            SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(positionMatrix));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset);
         }
     } else {
         if (fMaskFormat != kARGB_GrMaskFormat) {
             using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+            SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(positionMatrix));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset, &clip);
         } else {
             using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+            SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(positionMatrix));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset, &clip);
         }
     }
@@ -831,7 +1091,8 @@ SkRect DirectMaskSubRun::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrig
     SkIRect outBounds = fGlyphDeviceBounds.iRect();
 
     // Calculate the offset from the initial device origin to the current device origin.
-    SkVector offset = drawMatrix.mapPoint(drawOrigin) - fBlob->initialPositionMatrix().mapOrigin();
+    SkVector offset = drawMatrix.mapPoint(drawOrigin) -
+                      fTextReferenceFrame->initialPositionMatrix().mapOrigin();
 
     // The offset should be integer, but make sure.
     SkIVector iOffset = {SkScalarRoundToInt(offset.x()), SkScalarRoundToInt(offset.y())};
@@ -839,35 +1100,38 @@ SkRect DirectMaskSubRun::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrig
     return SkRect::Make(outBounds.makeOffset(iOffset));
 }
 
-GrAtlasSubRun* DirectMaskSubRun::testingOnly_atlasSubRun() {
+const GrAtlasSubRun* DirectMaskSubRun::testingOnly_atlasSubRun() const {
     return this;
 }
 
 // -- TransformedMaskSubRun ------------------------------------------------------------------------
-class TransformedMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
+class TransformedMaskSubRun final : public GrSubRun, public GrBlobSubRun, public GrAtlasSubRun {
 public:
-    struct VertexData {
-        const SkPoint pos;
-        // The rectangle of the glyphs in strike space. But, for kDirectMask this also implies a
-        // device space rect.
-        GrIRect16 rect;
-    };
+    using VertexData = TransformedMaskVertexFiller::PositionAndExtent;
 
-    TransformedMaskSubRun(GrMaskFormat format,
-                          GrTextBlob* blob,
+    TransformedMaskSubRun(const GrTextReferenceFrame* referenceFrame,
+                          GrMaskFormat format,
                           SkScalar strikeToSourceScale,
                           const SkRect& bounds,
                           SkSpan<const VertexData> vertexData,
-                          GlyphVector&& glyphs);
+                          GrGlyphVector&& glyphs);
 
-    static GrSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrSubRunOwner Make(const GrTextReferenceFrame* referenceFrame,
+                              const SkZip<SkGlyphVariant, SkPoint>& accepted,
                               sk_sp<SkStrike>&& strike,
                               SkScalar strikeToSourceScale,
                               GrMaskFormat format,
-                              GrTextBlob* blob,
                               GrSubRunAllocator* alloc);
 
-    void draw(const GrClip*,
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client) {
+        return nullptr;
+    }
+
+    void draw(SkCanvas*,
+              const GrClip*,
               const SkMatrixProvider& viewMatrix,
               SkPoint drawOrigin,
               const SkPaint& paint,
@@ -881,11 +1145,14 @@ class TransformedMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
+    const GrBlobSubRun* blobCast() const override { return this; }
+    int unflattenSize() const override { return 0; }
+
     bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override;
 
-    GrAtlasSubRun* testingOnly_atlasSubRun() override;
+    const GrAtlasSubRun* testingOnly_atlasSubRun() const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
 
@@ -898,15 +1165,19 @@ class TransformedMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
     size_t vertexStride(const SkMatrix& drawMatrix) const override;
     int glyphCount() const override;
 
+protected:
+    SubRunType subRunType() const override { return kTransformMask; }
+    void doFlatten(SkWriteBuffer& buffer) const override {
+        SK_ABORT("Not implemented.");
+    }
+
 private:
     // The rectangle that surrounds all the glyph bounding boxes in device space.
     SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
 
-    const GrMaskFormat fMaskFormat;
-    GrTextBlob* fBlob;
+    const TransformedMaskVertexFiller fVertexFiller;
 
-    // The scale factor between the strike size, and the source size.
-    const SkScalar fStrikeToSourceScale;
+    const GrTextReferenceFrame* const fReferenceFrame;
 
     // The bounds in source space. The bounds are the joined rectangles of all the glyphs.
     const SkRect fVertexBounds;
@@ -914,35 +1185,34 @@ class TransformedMaskSubRun final : public GrSubRun, public GrAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 };
 
-TransformedMaskSubRun::TransformedMaskSubRun(GrMaskFormat format,
-                                             GrTextBlob* blob,
+TransformedMaskSubRun::TransformedMaskSubRun(const GrTextReferenceFrame* referenceFrame,
+                                             GrMaskFormat format,
                                              SkScalar strikeToSourceScale,
                                              const SkRect& bounds,
                                              SkSpan<const VertexData> vertexData,
-                                             GlyphVector&& glyphs)
-        : fMaskFormat{format}
-        , fBlob{blob}
-        , fStrikeToSourceScale{strikeToSourceScale}
+                                             GrGlyphVector&& glyphs)
+        : fVertexFiller{format, 0, strikeToSourceScale}
+        , fReferenceFrame{referenceFrame}
         , fVertexBounds{bounds}
         , fVertexData{vertexData}
         , fGlyphs{std::move(glyphs)} { }
 
-GrSubRunOwner TransformedMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+GrSubRunOwner TransformedMaskSubRun::Make(const GrTextReferenceFrame* referenceFrame,
+                                          const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                           sk_sp<SkStrike>&& strike,
                                           SkScalar strikeToSourceScale,
                                           GrMaskFormat format,
-                                          GrTextBlob* blob,
                                           GrSubRunAllocator* alloc) {
     SkRect bounds = SkRectPriv::MakeLargestInverted();
 
     SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(
-            drawables,
+            accepted,
             [&](auto e) {
                 auto [variant, pos] = e;
-                SkGlyph* skGlyph = variant;
+                const SkGlyph* skGlyph = variant;
                 int16_t l = skGlyph->left(),
                         t = skGlyph->top(),
                         r = l + skGlyph->width(),
@@ -955,11 +1225,12 @@ GrSubRunOwner TransformedMaskSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>&
             });
 
     return alloc->makeUnique<TransformedMaskSubRun>(
-            format, blob, strikeToSourceScale, bounds, vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc));
+            referenceFrame, format, strikeToSourceScale, bounds, vertexData,
+            GrGlyphVector::Make(std::move(strike), accepted.get<0>(), alloc));
 }
 
-void TransformedMaskSubRun::draw(const GrClip* clip,
+void TransformedMaskSubRun::draw(SkCanvas*,
+                                 const GrClip* clip,
                                  const SkMatrixProvider& viewMatrix,
                                  SkPoint drawOrigin,
                                  const SkPaint& paint,
@@ -983,19 +1254,20 @@ TransformedMaskSubRun::makeAtlasTextOp(const GrClip* clip,
     const SkMatrix& drawMatrix = viewMatrix.localToDevice();
 
     GrPaint grPaint;
-    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, fMaskFormat, &grPaint);
+    SkPMColor4f drawingColor = calculate_colors(
+            sdc, paint, viewMatrix, fVertexFiller.grMaskType(), &grPaint);
 
     auto geometry = AtlasTextOp::Geometry::MakeForBlob(*this,
                                                        drawMatrix,
                                                        drawOrigin,
                                                        SkIRect::MakeEmpty(),
-                                                       sk_ref_sp<GrTextBlob>(fBlob),
+                                                       sk_ref_sp(fReferenceFrame),
                                                        drawingColor,
                                                        sdc->arenaAlloc());
 
     GrRecordingContext* const rContext = sdc->recordingContext();
     GrOp::Owner op = GrOp::Make<AtlasTextOp>(rContext,
-                                             op_mask_type(fMaskFormat),
+                                             fVertexFiller.opMaskType(),
                                              true,
                                              this->glyphCount(),
                                              this->deviceRect(drawMatrix, drawOrigin),
@@ -1007,19 +1279,19 @@ TransformedMaskSubRun::makeAtlasTextOp(const GrClip* clip,
 // If we are not scaling the cache entry to be larger, than a cache with smaller glyphs may be
 // better.
 bool TransformedMaskSubRun::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const {
-    if (fBlob->initialPositionMatrix().getMaxScale() < 1) {
+    if (fReferenceFrame->initialPositionMatrix().getMaxScale() < 1) {
         return false;
     }
     return true;
 }
 
-void TransformedMaskSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void TransformedMaskSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int> TransformedMaskSubRun::regenerateAtlas(int begin, int end,
                                                              GrMeshDrawTarget* target) const {
-    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
+    return fGlyphs.regenerateAtlas(begin, end, fVertexFiller.grMaskType(), 1, target, true);
 }
 
 void TransformedMaskSubRun::fillVertexData(void* vertexDst, int offset, int count,
@@ -1027,69 +1299,17 @@ void TransformedMaskSubRun::fillVertexData(void* vertexDst, int offset, int coun
                                            const SkMatrix& drawMatrix, SkPoint drawOrigin,
                                            SkIRect clip) const {
     const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
-    constexpr SkScalar kDstPadding = 0.f;
+    fVertexFiller.fillVertexData(fGlyphs.glyphs().subspan(offset, count),
+                                 fVertexData.subspan(offset, count),
+                                 color,
+                                 positionMatrix,
+                                 clip,
+                                 vertexDst);
+}
 
-    auto quadData = [&](auto dst) {
-        return SkMakeZip(dst,
-                         fGlyphs.glyphs().subspan(offset, count),
-                         fVertexData.subspan(offset, count));
-    };
-
-    if (!positionMatrix.hasPerspective()) {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        }
-    } else {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        }
-    }
-}
-
-size_t TransformedMaskSubRun::vertexStride(const SkMatrix& drawMatrix) const {
-    switch (fMaskFormat) {
-        case kA8_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(Mask3DVertex) : sizeof(Mask2DVertex);
-        case kARGB_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(ARGB3DVertex) : sizeof(ARGB2DVertex);
-        default:
-            SkASSERT(!drawMatrix.hasPerspective());
-            return sizeof(Mask2DVertex);
-    }
-    SkUNREACHABLE;
-}
+size_t TransformedMaskSubRun::vertexStride(const SkMatrix& drawMatrix) const {
+    return fVertexFiller.vertexStride(drawMatrix);
+}
 
 int TransformedMaskSubRun::glyphCount() const {
     return SkCount(fVertexData);
@@ -1101,36 +1321,41 @@ SkRect TransformedMaskSubRun::deviceRect(const SkMatrix& drawMatrix, SkPoint dra
     return drawMatrix.mapRect(outBounds);
 }
 
-GrAtlasSubRun* TransformedMaskSubRun::testingOnly_atlasSubRun() {
+const GrAtlasSubRun* TransformedMaskSubRun::testingOnly_atlasSubRun() const {
     return this;
 }
 
 // -- SDFTSubRun -----------------------------------------------------------------------------------
-class SDFTSubRun final : public GrSubRun, public GrAtlasSubRun {
+class SDFTSubRun final : public GrSubRun, public GrBlobSubRun, public GrAtlasSubRun {
 public:
-    struct VertexData {
-        const SkPoint pos;
-        // The rectangle of the glyphs in strike space.
-        GrIRect16 rect;
-    };
+    using VertexData = TransformedMaskVertexFiller::PositionAndExtent;
 
-    SDFTSubRun(GrMaskFormat format,
-               GrTextBlob* blob,
+    SDFTSubRun(const GrTextReferenceFrame* referenceFrame,
                SkScalar strikeToSource,
                SkRect vertexBounds,
                SkSpan<const VertexData> vertexData,
-               GlyphVector&& glyphs,
+               GrGlyphVector&& glyphs,
                bool useLCDText,
-               bool antiAliased);
+               bool antiAliased,
+               const GrSDFTMatrixRange& matrixRange);
 
-    static GrSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrSubRunOwner Make(const GrTextReferenceFrame* referenceFrame,
+                              const SkZip<SkGlyphVariant, SkPoint>& accepted,
                               const SkFont& runFont,
                               sk_sp<SkStrike>&& strike,
                               SkScalar strikeToSourceScale,
-                              GrTextBlob* blob,
+                              const GrSDFTMatrixRange& matrixRange,
                               GrSubRunAllocator* alloc);
 
-    void draw(const GrClip*,
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client) {
+        return nullptr;
+    }
+
+    void draw(SkCanvas*,
+              const GrClip*,
               const SkMatrixProvider& viewMatrix,
               SkPoint drawOrigin,
               const SkPaint&,
@@ -1144,11 +1369,14 @@ class SDFTSubRun final : public GrSubRun, public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
+    const GrBlobSubRun* blobCast() const override { return this; }
+    int unflattenSize() const override { return 0; }
+
     bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const override;
 
-    GrAtlasSubRun* testingOnly_atlasSubRun() override;
+    const GrAtlasSubRun* testingOnly_atlasSubRun() const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
 
@@ -1161,15 +1389,19 @@ class SDFTSubRun final : public GrSubRun, public GrAtlasSubRun {
     size_t vertexStride(const SkMatrix& drawMatrix) const override;
     int glyphCount() const override;
 
+protected:
+    SubRunType subRunType() const override { return kSDFT; }
+    void doFlatten(SkWriteBuffer& buffer) const override {
+        SK_ABORT("Not implemented.");
+    }
+
 private:
     // The rectangle that surrounds all the glyph bounding boxes in device space.
     SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
 
-    const GrMaskFormat fMaskFormat;
-    GrTextBlob* fBlob;
+    const GrTextReferenceFrame* const fReferenceFrame;
 
-    // The scale factor between the strike size, and the source size.
-    const SkScalar fStrikeToSourceScale;
+    const TransformedMaskVertexFiller fVertexFiller;
 
     // The bounds in source space. The bounds are the joined rectangles of all the glyphs.
     const SkRect fVertexBounds;
@@ -1177,28 +1409,29 @@ class SDFTSubRun final : public GrSubRun, public GrAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 
     const bool fUseLCDText;
     const bool fAntiAliased;
+    const GrSDFTMatrixRange fMatrixRange;
 };
 
-SDFTSubRun::SDFTSubRun(GrMaskFormat format,
-                       GrTextBlob* textBlob,
+SDFTSubRun::SDFTSubRun(const GrTextReferenceFrame* referenceFrame,
                        SkScalar strikeToSource,
                        SkRect vertexBounds,
                        SkSpan<const VertexData> vertexData,
-                       GlyphVector&& glyphs,
+                       GrGlyphVector&& glyphs,
                        bool useLCDText,
-                       bool antiAliased)
-        : fMaskFormat{format}
-        , fBlob{textBlob}
-        , fStrikeToSourceScale{strikeToSource}
+                       bool antiAliased,
+                       const GrSDFTMatrixRange& matrixRange)
+        : fReferenceFrame{referenceFrame}
+        , fVertexFiller{kA8_GrMaskFormat, SK_DistanceFieldInset, strikeToSource}
         , fVertexBounds{vertexBounds}
         , fVertexData{vertexData}
         , fGlyphs{std::move(glyphs)}
         , fUseLCDText{useLCDText}
-        , fAntiAliased{antiAliased} {}
+        , fAntiAliased{antiAliased}
+        , fMatrixRange{matrixRange} {}
 
 bool has_some_antialiasing(const SkFont& font ) {
     SkFont::Edging edging = font.getEdging();
@@ -1206,16 +1439,17 @@ bool has_some_antialiasing(const SkFont& font ) {
            || edging == SkFont::Edging::kSubpixelAntiAlias;
 }
 
-GrSubRunOwner SDFTSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+GrSubRunOwner SDFTSubRun::Make(const GrTextReferenceFrame* referenceFrame,
+                               const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                const SkFont& runFont,
                                sk_sp<SkStrike>&& strike,
                                SkScalar strikeToSourceScale,
-                               GrTextBlob* blob,
+                               const GrSDFTMatrixRange& matrixRange,
                                GrSubRunAllocator* alloc) {
     SkRect bounds = SkRectPriv::MakeLargestInverted();
     auto mapper = [&](const auto& d) {
         auto& [variant, pos] = d;
-        SkGlyph* skGlyph = variant;
+        const SkGlyph* skGlyph = variant;
         int16_t l = skGlyph->left(),
                 t = skGlyph->top(),
                 r = l + skGlyph->width(),
@@ -1227,20 +1461,21 @@ GrSubRunOwner SDFTSubRun::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
         return VertexData{pos, {l, t, r, b}};
     };
 
-    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(drawables, mapper);
+    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(accepted, mapper);
 
     return alloc->makeUnique<SDFTSubRun>(
-            kA8_GrMaskFormat,
-            blob,
+            referenceFrame,
             strikeToSourceScale,
             bounds,
             vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc),
+            GrGlyphVector::Make(std::move(strike), accepted.get<0>(), alloc),
             runFont.getEdging() == SkFont::Edging::kSubpixelAntiAlias,
-            has_some_antialiasing(runFont));
+            has_some_antialiasing(runFont),
+            matrixRange);
 }
 
-void SDFTSubRun::draw(const GrClip* clip,
+void SDFTSubRun::draw(SkCanvas*,
+                      const GrClip* clip,
                       const SkMatrixProvider& viewMatrix,
                       SkPoint drawOrigin,
                       const SkPaint& paint,
@@ -1293,7 +1528,7 @@ SDFTSubRun::makeAtlasTextOp(const GrClip* clip,
     const SkMatrix& drawMatrix = viewMatrix.localToDevice();
 
     GrPaint grPaint;
-    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, fMaskFormat, &grPaint);
+    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, kA8_GrMaskFormat, &grPaint);
 
     auto [maskType, DFGPFlags, useGammaCorrectDistanceTable] =
         calculate_sdf_parameters(*sdc, drawMatrix, fUseLCDText, fAntiAliased);
@@ -1302,7 +1537,7 @@ SDFTSubRun::makeAtlasTextOp(const GrClip* clip,
                                                        drawMatrix,
                                                        drawOrigin,
                                                        SkIRect::MakeEmpty(),
-                                                       sk_ref_sp<GrTextBlob>(fBlob),
+                                                       sk_ref_sp(fReferenceFrame),
                                                        drawingColor,
                                                        sdc->arenaAlloc());
 
@@ -1322,28 +1557,16 @@ SDFTSubRun::makeAtlasTextOp(const GrClip* clip,
 }
 
 bool SDFTSubRun::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const {
-    const SkMatrix& initialPositionMatrix = fBlob->initialPositionMatrix();
-
-    // A scale outside of [blob.fMaxMinScale, blob.fMinMaxScale] would result in a different
-    // distance field being generated, so we have to regenerate in those cases
-    SkScalar newMaxScale = positionMatrix.getMaxScale();
-    SkScalar oldMaxScale = initialPositionMatrix.getMaxScale();
-    SkScalar scaleAdjust = newMaxScale / oldMaxScale;
-    auto [maxMinScale, minMaxScale] = fBlob->scaleBounds();
-    if (scaleAdjust < maxMinScale || scaleAdjust > minMaxScale) {
-        return false;
-    }
-    return true;
+    return fMatrixRange.matrixInRange(positionMatrix);
 }
 
-void SDFTSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void SDFTSubRun::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int> SDFTSubRun::regenerateAtlas(
         int begin, int end, GrMeshDrawTarget *target) const {
-
-    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, SK_DistanceFieldInset, target);
+    return fGlyphs.regenerateAtlas(begin, end, kA8_GrMaskFormat, SK_DistanceFieldInset, target);
 }
 
 size_t SDFTSubRun::vertexStride(const SkMatrix& drawMatrix) const {
@@ -1357,16 +1580,12 @@ void SDFTSubRun::fillVertexData(
         SkIRect clip) const {
     const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
 
-    using Quad = Mask2DVertex[4];
-    SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-    fill_transformed_vertices_2D(
-            SkMakeZip((Quad*)vertexDst,
-                      fGlyphs.glyphs().subspan(offset, count),
-                      fVertexData.subspan(offset, count)),
-            SK_DistanceFieldInset,
-            fStrikeToSourceScale,
-            color,
-            positionMatrix);
+    fVertexFiller.fillVertexData(fGlyphs.glyphs().subspan(offset, count),
+                                 fVertexData.subspan(offset, count),
+                                 color,
+                                 positionMatrix,
+                                 clip,
+                                 vertexDst);
 }
 
 int SDFTSubRun::glyphCount() const {
@@ -1379,9 +1598,36 @@ SkRect SDFTSubRun::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) co
     return drawMatrix.mapRect(outBounds);
 }
 
-GrAtlasSubRun* SDFTSubRun::testingOnly_atlasSubRun() {
+const GrAtlasSubRun* SDFTSubRun::testingOnly_atlasSubRun() const {
     return this;
 }
+
+template<typename AddSingleMaskFormat>
+void add_multi_mask_format(
+        AddSingleMaskFormat addSingleMaskFormat,
+        const SkZip<SkGlyphVariant, SkPoint>& accepted,
+        sk_sp<SkStrike>&& strike) {
+    if (accepted.empty()) { return; }
+
+    auto glyphSpan = accepted.get<0>();
+    const SkGlyph* glyph = glyphSpan[0];
+    GrMaskFormat format = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
+    size_t startIndex = 0;
+    for (size_t i = 1; i < accepted.size(); i++) {
+        glyph = glyphSpan[i];
+        GrMaskFormat nextFormat = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
+        if (format != nextFormat) {
+            auto glyphsWithSameFormat = accepted.subspan(startIndex, i - startIndex);
+            // Take a ref on the strike. This should rarely happen.
+            addSingleMaskFormat(glyphsWithSameFormat, format, sk_sp<SkStrike>(strike));
+            format = nextFormat;
+            startIndex = i;
+        }
+    }
+    auto glyphsWithSameFormat = accepted.last(accepted.size() - startIndex);
+    addSingleMaskFormat(glyphsWithSameFormat, format, std::move(strike));
+}
+
 }  // namespace
 
 // -- GrTextBlob::Key ------------------------------------------------------------------------------
@@ -1457,13 +1703,15 @@ auto GrTextBlob::Key::Make(const SkGlyphRunList& glyphRunList,
         key.fCanonicalColor = canonicalColor;
         key.fScalerContextFlags = scalerContextFlags;
 
-        // Calculate the set of drawing types.
-        key.fSetOfDrawingTypes = 0;
+        // Do any runs use direct drawing types?.
+        key.fHasSomeDirectSubRuns = false;
         for (auto& run : glyphRunList) {
-            key.fSetOfDrawingTypes |= control.drawingType(run.font(), paint, drawMatrix);
+            SkScalar approximateDeviceTextSize =
+                    SkFontPriv::ApproximateTransformedTextSize(run.font(), drawMatrix);
+            key.fHasSomeDirectSubRuns |= control.isDirect(approximateDeviceTextSize, paint);
         }
 
-        if (key.fSetOfDrawingTypes & GrSDFTControl::kDirect) {
+        if (key.fHasSomeDirectSubRuns) {
             // Store the fractional offset of the position. We know that the matrix can't be
             // perspective at this point.
             SkPoint mappedOrigin = drawMatrix.mapOrigin();
@@ -1506,11 +1754,11 @@ bool GrTextBlob::Key::operator==(const GrTextBlob::Key& that) const {
         return false;
     }
 
-    if (fSetOfDrawingTypes != that.fSetOfDrawingTypes) {
+    if (fHasSomeDirectSubRuns != that.fHasSomeDirectSubRuns) {
         return false;
     }
 
-    if (fSetOfDrawingTypes & GrSDFTControl::kDirect) {
+    if (fHasSomeDirectSubRuns) {
         auto [compatible, _] = can_use_direct(fPositionMatrix, that.fPositionMatrix);
         return compatible;
     }
@@ -1528,6 +1776,7 @@ GrTextBlob::~GrTextBlob() = default;
 sk_sp<GrTextBlob> GrTextBlob::Make(const SkGlyphRunList& glyphRunList,
                                    const SkPaint& paint,
                                    const SkMatrix& positionMatrix,
+                                   bool supportBilerpAtlas,
                                    const GrSDFTControl& control,
                                    SkGlyphRunListPainter* painter) {
     // The difference in alignment from the per-glyph data to the SubRun;
@@ -1539,7 +1788,7 @@ sk_sp<GrTextBlob> GrTextBlob::Make(const SkGlyphRunList& glyphRunList,
     // The neededForSubRun is optimized for DirectMaskSubRun which is by far the most common case.
     size_t bytesNeededForSubRun = GrBagOfBytes::PlatformMinimumSizeWithOverhead(
             totalGlyphCount * sizeof(DirectMaskSubRun::DevicePosition)
-            + GlyphVector::GlyphVectorSize(totalGlyphCount)
+            + GrGlyphVector::GlyphVectorSize(totalGlyphCount)
             + glyphRunList.runCount() * (sizeof(DirectMaskSubRun) + vertexDataToSubRunPadding),
             alignof(GrTextBlob));
 
@@ -1548,16 +1797,17 @@ sk_sp<GrTextBlob> GrTextBlob::Make(const SkGlyphRunList& glyphRunList,
     void* allocation = ::operator new (allocationSize);
 
     SkColor initialLuminance = SkPaintPriv::ComputeLuminanceColor(paint);
-    sk_sp<GrTextBlob> blob{new (allocation)
-                            GrTextBlob(bytesNeededForSubRun, positionMatrix, initialLuminance)};
+    sk_sp<GrTextBlob> blob{
+        new (allocation) GrTextBlob(
+                bytesNeededForSubRun, supportBilerpAtlas, positionMatrix, initialLuminance)};
 
     const uint64_t uniqueID = glyphRunList.uniqueID();
     for (auto& glyphRun : glyphRunList) {
-        painter->processGlyphRun(glyphRun,
+        painter->processGlyphRun(blob.get(),
+                                 glyphRun,
                                  positionMatrix,
                                  paint,
                                  control,
-                                 blob.get(),
                                  "GrTextBlob",
                                  uniqueID);
     }
@@ -1590,7 +1840,7 @@ bool GrTextBlob::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix)
     }
 
     for (const GrSubRun& subRun : fSubRunList) {
-        if (!subRun.canReuse(paint, positionMatrix)) {
+        if (!subRun.blobCast()->canReuse(paint, positionMatrix)) {
             return false;
         }
     }
@@ -1601,86 +1851,90 @@ bool GrTextBlob::canReuse(const SkPaint& paint, const SkMatrix& positionMatrix)
 const GrTextBlob::Key& GrTextBlob::key() const { return fKey; }
 size_t GrTextBlob::size() const { return fSize; }
 
-template<typename AddSingleMaskFormat>
-void GrTextBlob::addMultiMaskFormat(
-        AddSingleMaskFormat addSingle,
-        const SkZip<SkGlyphVariant, SkPoint>& drawables,
-        sk_sp<SkStrike>&& strike,
-        SkScalar strikeToSourceScale) {
-    if (drawables.empty()) { return; }
-
-    auto addSameFormat = [&](const SkZip<SkGlyphVariant, SkPoint>& drawable,
-                             GrMaskFormat format,
-                             sk_sp<SkStrike>&& runStrike) {
-        GrSubRunOwner subRun = addSingle(
-                drawable, std::move(runStrike), strikeToSourceScale, format, this, &fAlloc);
-        if (subRun != nullptr) {
-            fSubRunList.append(std::move(subRun));
-        } else {
-            fSomeGlyphsExcluded = true;
-        }
-    };
+void GrTextBlob::draw(SkCanvas* canvas,
+                      const GrClip* clip,
+                      const SkMatrixProvider& viewMatrix,
+                      SkPoint drawOrigin,
+                      const SkPaint& paint,
+                      skgpu::v1::SurfaceDrawContext* sdc) {
+    for (const GrSubRun& subRun : fSubRunList) {
+        subRun.draw(canvas, clip, viewMatrix, drawOrigin, paint, sdc);
+    }
+}
 
-    auto glyphSpan = drawables.get<0>();
-    SkGlyph* glyph = glyphSpan[0];
-    GrMaskFormat format = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-    size_t startIndex = 0;
-    for (size_t i = 1; i < drawables.size(); i++) {
-        glyph = glyphSpan[i];
-        GrMaskFormat nextFormat = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-        if (format != nextFormat) {
-            auto sameFormat = drawables.subspan(startIndex, i - startIndex);
-            // Take a ref on the strike. This should rarely happen.
-            addSameFormat(sameFormat, format, sk_sp<SkStrike>(strike));
-            format = nextFormat;
-            startIndex = i;
-        }
+const GrAtlasSubRun* GrTextBlob::testingOnlyFirstSubRun() const {
+    if (fSubRunList.isEmpty()) {
+        return nullptr;
     }
-    auto sameFormat = drawables.last(drawables.size() - startIndex);
-    addSameFormat(sameFormat, format, std::move(strike));
+
+    return fSubRunList.front().blobCast()->testingOnly_atlasSubRun();
 }
 
 GrTextBlob::GrTextBlob(int allocSize,
+                       bool supportBilerpAtlas,
                        const SkMatrix& positionMatrix,
                        SkColor initialLuminance)
         : fAlloc{SkTAddOffset<char>(this, sizeof(GrTextBlob)), allocSize, allocSize/2}
         , fSize{allocSize}
+        , fSupportBilerpAtlas{supportBilerpAtlas}
         , fInitialPositionMatrix{positionMatrix}
         , fInitialLuminance{initialLuminance} { }
 
-void GrTextBlob::processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                    sk_sp<SkStrike>&& strike) {
+void GrTextBlob::processDeviceMasks(
+        const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike) {
     SkASSERT(strike != nullptr);
-    this->addMultiMaskFormat(DirectMaskSubRun::Make, drawables, std::move(strike), 1);
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        GrSubRunOwner subRun = DirectMaskSubRun::Make(
+                this, accepted, std::move(runStrike), format, &fAlloc);
+        if (subRun != nullptr) {
+            fSubRunList.append(std::move(subRun));
+        } else {
+            fSomeGlyphsExcluded = true;
+        }
+    };
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 
-void GrTextBlob::processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrTextBlob::processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                     const SkFont& runFont,
                                     SkScalar strikeToSourceScale) {
-    fSubRunList.append(PathSubRun::Make(drawables,
-                                        has_some_antialiasing(runFont),
-                                        strikeToSourceScale,
-                                        &fAlloc));
+    fSubRunList.append(PathSubRun::Make(
+            accepted, has_some_antialiasing(runFont), strikeToSourceScale, &fAlloc));
+}
+
+void GrTextBlob::processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        const SkFont& runFont,
+                                        SkScalar strikeToSourceScale) {
+    fSubRunList.append(make_drawable_sub_run<DrawableSubRun>(
+            accepted, has_some_antialiasing(runFont), strikeToSourceScale, &fAlloc));
 }
 
-void GrTextBlob::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrTextBlob::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    sk_sp<SkStrike>&& strike,
                                    SkScalar strikeToSourceScale,
                                    const SkFont& runFont,
-                                   SkScalar minScale,
-                                   SkScalar maxScale) {
-
-    fMaxMinScale = std::max(minScale, fMaxMinScale);
-    fMinMaxScale = std::min(maxScale, fMinMaxScale);
-    fSubRunList.append(
-        SDFTSubRun::Make(drawables, runFont, std::move(strike), strikeToSourceScale,this, &fAlloc));
+                                   const GrSDFTMatrixRange& matrixRange) {
+    fSubRunList.append(SDFTSubRun::Make(
+            this, accepted, runFont, std::move(strike), strikeToSourceScale, matrixRange, &fAlloc));
 }
 
-void GrTextBlob::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrTextBlob::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                     sk_sp<SkStrike>&& strike,
                                     SkScalar strikeToSourceScale) {
-    this->addMultiMaskFormat(
-            TransformedMaskSubRun::Make, drawables, std::move(strike), strikeToSourceScale);
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        GrSubRunOwner subRun = TransformedMaskSubRun::Make(
+                this, accepted, std::move(runStrike), strikeToSourceScale, format, &fAlloc);
+        if (subRun != nullptr) {
+            fSubRunList.append(std::move(subRun));
+        } else {
+            fSomeGlyphsExcluded = true;
+        }
+    };
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 
 // ----------------------------- Begin no cache implementation -------------------------------------
@@ -1691,13 +1945,15 @@ class DirectMaskSubRunNoCache final : public GrAtlasSubRun {
     using DevicePosition = skvx::Vec<2, int16_t>;
 
     DirectMaskSubRunNoCache(GrMaskFormat format,
+                            bool supportBilerpAtlas,
                             const SkRect& bounds,
                             SkSpan<const DevicePosition> devicePositions,
-                            GlyphVector&& glyphs);
+                            GrGlyphVector&& glyphs);
 
-    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    sk_sp<SkStrike>&& strike,
                                    GrMaskFormat format,
+                                   bool supportBilerpAtlas,
                                    GrSubRunAllocator* alloc);
 
     size_t vertexStride(const SkMatrix& drawMatrix) const override;
@@ -1712,7 +1968,7 @@ class DirectMaskSubRunNoCache final : public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int>
     regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
@@ -1725,6 +1981,9 @@ class DirectMaskSubRunNoCache final : public GrAtlasSubRun {
 private:
     const GrMaskFormat fMaskFormat;
 
+    // Support bilerping from the atlas.
+    const bool fSupportBilerpAtlas;
+
     // The vertex bounds in device space. The bounds are the joined rectangles of all the glyphs.
     const SkRect fGlyphDeviceBounds;
     const SkSpan<const DevicePosition> fLeftTopDevicePos;
@@ -1734,27 +1993,27 @@ class DirectMaskSubRunNoCache final : public GrAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 };
 
 DirectMaskSubRunNoCache::DirectMaskSubRunNoCache(GrMaskFormat format,
+                                                 bool supportBilerpAtlas,
                                                  const SkRect& deviceBounds,
                                                  SkSpan<const DevicePosition> devicePositions,
-                                                 GlyphVector&& glyphs)
+                                                 GrGlyphVector&& glyphs)
         : fMaskFormat{format}
+        , fSupportBilerpAtlas{supportBilerpAtlas}
         , fGlyphDeviceBounds{deviceBounds}
         , fLeftTopDevicePos{devicePositions}
         , fGlyphs{std::move(glyphs)} { }
 
-GrAtlasSubRunOwner DirectMaskSubRunNoCache::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+GrAtlasSubRunOwner DirectMaskSubRunNoCache::Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                                  sk_sp<SkStrike>&& strike,
                                                  GrMaskFormat format,
+                                                 bool supportBilerpAtlas,
                                                  GrSubRunAllocator* alloc) {
-    DevicePosition* glyphLeftTop = alloc->makePODArray<DevicePosition>(drawables.size());
-
-    GlyphVector::Variant* glyphIDs = static_cast<GlyphVector::Variant*>(
-            alloc->alignedBytes(drawables.size() * sizeof(GlyphVector::Variant),
-                                alignof(GlyphVector::Variant)));
+    auto glyphLeftTop = alloc->makePODArray<DevicePosition>(accepted.size());
+    auto glyphIDs = alloc->makePODArray<GrGlyphVector::Variant>(accepted.size());
 
     // Because this is the direct case, the maximum width or height is the size that fits in the
     // atlas. This boundary is checked below to ensure that the call to SkGlyphRect below will
@@ -1763,12 +2022,12 @@ GrAtlasSubRunOwner DirectMaskSubRunNoCache::Make(const SkZip<SkGlyphVariant, SkP
             std::numeric_limits<int16_t>::max() - SkStrikeCommon::kSkSideTooBigForAtlas;
     SkGlyphRect runBounds = skglyph::empty_rect();
     size_t goodPosCount = 0;
-    for (auto [variant, pos] : drawables) {
+    for (auto [variant, pos] : accepted) {
         auto [x, y] = pos;
         // Ensure that the .offset() call below does not overflow. And, at this point none of the
         // rectangles are empty because they were culled before the run was created. Basically,
         // cull all the glyphs that can't appear on the screen.
-        if (-kMaxPos < x && x < kMaxPos && -kMaxPos  < y && y < kMaxPos) {
+        if (-kMaxPos < x && x < kMaxPos && -kMaxPos < y && y < kMaxPos) {
             const SkGlyph* const skGlyph = variant;
             const SkGlyphRect deviceBounds =
                     skGlyph->glyphRect().offset(SkScalarRoundToInt(x), SkScalarRoundToInt(y));
@@ -1786,8 +2045,8 @@ GrAtlasSubRunOwner DirectMaskSubRunNoCache::Make(const SkZip<SkGlyphVariant, SkP
 
     SkSpan<const DevicePosition> leftTop{glyphLeftTop, goodPosCount};
     return alloc->makeUnique<DirectMaskSubRunNoCache>(
-            format, runBounds.rect(), leftTop,
-            GlyphVector{std::move(strike), {glyphIDs, goodPosCount}});
+            format, supportBilerpAtlas, runBounds.rect(), leftTop,
+            GrGlyphVector{std::move(strike), {glyphIDs, goodPosCount}});
 }
 
 size_t DirectMaskSubRunNoCache::vertexStride(const SkMatrix&) const {
@@ -1862,17 +2121,17 @@ DirectMaskSubRunNoCache::makeAtlasTextOp(const GrClip* clip,
     return {clip, std::move(op)};
 }
 
-void DirectMaskSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void DirectMaskSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int>
 DirectMaskSubRunNoCache::regenerateAtlas(int begin, int end, GrMeshDrawTarget* target) const {
-    #if defined(SK_EXPERIMENTAL_ADD_ATLAS_PADDING)
+    if (fSupportBilerpAtlas) {
         return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
-    #else
+    } else {
         return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 0, target, false);
-    #endif
+    }
 }
 
 // The 99% case. No clip. Non-color only.
@@ -1909,21 +2168,21 @@ void DirectMaskSubRunNoCache::fillVertexData(void* vertexDst, int offset, int co
     if (clip.isEmpty()) {
         if (fMaskFormat != kARGB_GrMaskFormat) {
             using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+            SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(SkMatrix::I()));
             direct_2D2(quadData((Quad*)vertexDst), color);
         } else {
             using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+            SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(SkMatrix::I()));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, {0,0});
         }
     } else {
         if (fMaskFormat != kARGB_GrMaskFormat) {
             using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+            SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(SkMatrix::I()));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, {0,0}, &clip);
         } else {
             using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+            SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(SkMatrix::I()));
             generalized_direct_2D(quadData((Quad*)vertexDst), color, {0,0}, &clip);
         }
     }
@@ -1932,20 +2191,15 @@ void DirectMaskSubRunNoCache::fillVertexData(void* vertexDst, int offset, int co
 // -- TransformedMaskSubRunNoCache -----------------------------------------------------------------
 class TransformedMaskSubRunNoCache final : public GrAtlasSubRun {
 public:
-    struct VertexData {
-        const SkPoint pos;
-        // The rectangle of the glyphs in strike space. But, for kDirectMask this also implies a
-        // device space rect.
-        GrIRect16 rect;
-    };
+    using VertexData = TransformedMaskVertexFiller::PositionAndExtent;
 
     TransformedMaskSubRunNoCache(GrMaskFormat format,
                                  SkScalar strikeToSourceScale,
                                  const SkRect& bounds,
                                  SkSpan<const VertexData> vertexData,
-                                 GlyphVector&& glyphs);
+                                 GrGlyphVector&& glyphs);
 
-    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    sk_sp<SkStrike>&& strike,
                                    SkScalar strikeToSourceScale,
                                    GrMaskFormat format,
@@ -1959,7 +2213,7 @@ class TransformedMaskSubRunNoCache final : public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
 
@@ -1976,10 +2230,7 @@ class TransformedMaskSubRunNoCache final : public GrAtlasSubRun {
     // The rectangle that surrounds all the glyph bounding boxes in device space.
     SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
 
-    const GrMaskFormat fMaskFormat;
-
-    // The scale factor between the strike size, and the source size.
-    const SkScalar fStrikeToSourceScale;
+    const TransformedMaskVertexFiller fVertexFiller;
 
     // The bounds in source space. The bounds are the joined rectangles of all the glyphs.
     const SkRect fVertexBounds;
@@ -1990,30 +2241,29 @@ class TransformedMaskSubRunNoCache final : public GrAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 };
 
 TransformedMaskSubRunNoCache::TransformedMaskSubRunNoCache(GrMaskFormat format,
                                                            SkScalar strikeToSourceScale,
                                                            const SkRect& bounds,
                                                            SkSpan<const VertexData> vertexData,
-                                                           GlyphVector&& glyphs)
-        : fMaskFormat{format}
-        , fStrikeToSourceScale{strikeToSourceScale}
+                                                           GrGlyphVector&& glyphs)
+        : fVertexFiller{format, 0, strikeToSourceScale}
         , fVertexBounds{bounds}
         , fVertexData{vertexData}
         , fGlyphs{std::move(glyphs)} {}
 
 GrAtlasSubRunOwner TransformedMaskSubRunNoCache::Make(
-        const SkZip<SkGlyphVariant, SkPoint>& drawables,
+        const SkZip<SkGlyphVariant, SkPoint>& accepted,
         sk_sp<SkStrike>&& strike,
         SkScalar strikeToSourceScale,
         GrMaskFormat format,
         GrSubRunAllocator* alloc) {
     SkRect bounds = SkRectPriv::MakeLargestInverted();
-    auto initializer = [&](auto drawable) {
-        auto [variant, pos] = drawable;
-        SkGlyph* skGlyph = variant;
+    auto initializer = [&](auto acceptedGlyph) {
+        auto [variant, pos] = acceptedGlyph;
+        const SkGlyph* skGlyph = variant;
         int16_t l = skGlyph->left(),
                 t = skGlyph->top(),
                 r = l + skGlyph->width(),
@@ -2025,11 +2275,11 @@ GrAtlasSubRunOwner TransformedMaskSubRunNoCache::Make(
         return VertexData{pos, {l, t, r, b}};
     };
 
-    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(drawables, initializer);
+    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(accepted, initializer);
 
     return alloc->makeUnique<TransformedMaskSubRunNoCache>(
             format, strikeToSourceScale, bounds, vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc));
+            GrGlyphVector::Make(std::move(strike), accepted.get<0>(), alloc));
 }
 
 std::tuple<const GrClip*, GrOp::Owner>
@@ -2044,7 +2294,8 @@ TransformedMaskSubRunNoCache::makeAtlasTextOp(const GrClip* clip,
     const SkMatrix& drawMatrix = viewMatrix.localToDevice();
 
     GrPaint grPaint;
-    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, fMaskFormat, &grPaint);
+    SkPMColor4f drawingColor = calculate_colors(
+            sdc, paint, viewMatrix, fVertexFiller.grMaskType(), &grPaint);
 
     // We can clip geometrically using clipRect and ignore clip if we're not using SDFs or
     // transformed glyphs, and we have an axis-aligned rectangular non-AA clip.
@@ -2060,7 +2311,7 @@ TransformedMaskSubRunNoCache::makeAtlasTextOp(const GrClip* clip,
 
     GrRecordingContext* rContext = sdc->recordingContext();
     GrOp::Owner op = GrOp::Make<AtlasTextOp>(rContext,
-                                             op_mask_type(fMaskFormat),
+                                             fVertexFiller.opMaskType(),
                                              true,
                                              this->glyphCount(),
                                              this->deviceRect(drawMatrix, drawOrigin),
@@ -2069,13 +2320,13 @@ TransformedMaskSubRunNoCache::makeAtlasTextOp(const GrClip* clip,
     return {clip, std::move(op)};
 }
 
-void TransformedMaskSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void TransformedMaskSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int> TransformedMaskSubRunNoCache::regenerateAtlas(
         int begin, int end, GrMeshDrawTarget* target) const {
-    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
+    return fGlyphs.regenerateAtlas(begin, end, fVertexFiller.grMaskType(), 1, target, true);
 }
 
 void TransformedMaskSubRunNoCache::fillVertexData(
@@ -2083,69 +2334,17 @@ void TransformedMaskSubRunNoCache::fillVertexData(
         GrColor color,
         const SkMatrix& drawMatrix, SkPoint drawOrigin,
         SkIRect clip) const {
-    constexpr SkScalar kDstPadding = 0.f;
     const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
-
-    auto quadData = [&](auto dst) {
-        return SkMakeZip(dst,
-                         fGlyphs.glyphs().subspan(offset, count),
-                         fVertexData.subspan(offset, count));
-    };
-
-    if (!positionMatrix.hasPerspective()) {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        }
-    } else {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        }
-    }
+    fVertexFiller.fillVertexData(fGlyphs.glyphs().subspan(offset, count),
+                                 fVertexData.subspan(offset, count),
+                                 color,
+                                 positionMatrix,
+                                 clip,
+                                 vertexDst);
 }
 
 size_t TransformedMaskSubRunNoCache::vertexStride(const SkMatrix& drawMatrix) const {
-    switch (fMaskFormat) {
-        case kA8_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(Mask3DVertex) : sizeof(Mask2DVertex);
-        case kARGB_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(ARGB3DVertex) : sizeof(ARGB2DVertex);
-        default:
-            SkASSERT(!drawMatrix.hasPerspective());
-            return sizeof(Mask2DVertex);
-    }
-    SkUNREACHABLE;
+    return fVertexFiller.vertexStride(drawMatrix);
 }
 
 int TransformedMaskSubRunNoCache::glyphCount() const {
@@ -2172,11 +2371,11 @@ class SDFTSubRunNoCache final : public GrAtlasSubRun {
                       SkScalar strikeToSourceScale,
                       SkRect vertexBounds,
                       SkSpan<const VertexData> vertexData,
-                      GlyphVector&& glyphs,
+                      GrGlyphVector&& glyphs,
                       bool useLCDText,
                       bool antiAliased);
 
-    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    static GrAtlasSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    const SkFont& runFont,
                                    sk_sp<SkStrike>&& strike,
                                    SkScalar strikeToSourceScale,
@@ -2190,7 +2389,7 @@ class SDFTSubRunNoCache final : public GrAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
 
@@ -2221,7 +2420,7 @@ class SDFTSubRunNoCache final : public GrAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 
     const bool fUseLCDText;
     const bool fAntiAliased;
@@ -2231,7 +2430,7 @@ SDFTSubRunNoCache::SDFTSubRunNoCache(GrMaskFormat format,
                                      SkScalar strikeToSourceScale,
                                      SkRect vertexBounds,
                                      SkSpan<const VertexData> vertexData,
-                                     GlyphVector&& glyphs,
+                                     GrGlyphVector&& glyphs,
                                      bool useLCDText,
                                      bool antiAliased)
         : fMaskFormat{format}
@@ -2244,16 +2443,16 @@ SDFTSubRunNoCache::SDFTSubRunNoCache(GrMaskFormat format,
 
 
 GrAtlasSubRunOwner SDFTSubRunNoCache::Make(
-        const SkZip<SkGlyphVariant, SkPoint>& drawables,
+        const SkZip<SkGlyphVariant, SkPoint>& accepted,
         const SkFont& runFont,
         sk_sp<SkStrike>&& strike,
         SkScalar strikeToSourceScale,
         GrSubRunAllocator* alloc) {
 
     SkRect bounds = SkRectPriv::MakeLargestInverted();
-    auto initializer = [&](auto drawable) {
-        auto [variant, pos] = drawable;
-        SkGlyph* skGlyph = variant;
+    auto initializer = [&](auto acceptedGlyph) {
+        auto [variant, pos] = acceptedGlyph;
+        const SkGlyph* skGlyph = variant;
         int16_t l = skGlyph->left(),
                 t = skGlyph->top(),
                 r = l + skGlyph->width(),
@@ -2265,14 +2464,14 @@ GrAtlasSubRunOwner SDFTSubRunNoCache::Make(
         return VertexData{pos, {l, t, r, b}};
     };
 
-    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(drawables, initializer);
+    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(accepted, initializer);
 
     return alloc->makeUnique<SDFTSubRunNoCache>(
             kA8_GrMaskFormat,
             strikeToSourceScale,
             bounds,
             vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc),
+            GrGlyphVector::Make(std::move(strike), accepted.get<0>(), alloc),
             runFont.getEdging() == SkFont::Edging::kSubpixelAntiAlias,
             has_some_antialiasing(runFont));
 }
@@ -2319,7 +2518,7 @@ SDFTSubRunNoCache::makeAtlasTextOp(const GrClip* clip,
     return {clip, std::move(op)};
 }
 
-void SDFTSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void SDFTSubRunNoCache::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
@@ -2342,7 +2541,7 @@ void SDFTSubRunNoCache::fillVertexData(
 
     const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
 
-    SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+    SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(positionMatrix));
     fill_transformed_vertices_2D(
             SkMakeZip((Quad*)vertexDst,
                       fGlyphs.glyphs().subspan(offset, count),
@@ -2364,13 +2563,15 @@ SkRect SDFTSubRunNoCache::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOri
 }
 }  // namespace
 
-GrSubRunNoCachePainter::GrSubRunNoCachePainter(skgpu::v1::SurfaceDrawContext* sdc,
+GrSubRunNoCachePainter::GrSubRunNoCachePainter(SkCanvas* canvas,
+                                               skgpu::v1::SurfaceDrawContext* sdc,
                                                GrSubRunAllocator* alloc,
                                                const GrClip* clip,
                                                const SkMatrixProvider& viewMatrix,
                                                const SkGlyphRunList& glyphRunList,
                                                const SkPaint& paint)
-            : fSDC{sdc}
+            : fCanvas{canvas}
+            , fSDC{sdc}
             , fAlloc{alloc}
             , fClip{clip}
             , fViewMatrix{viewMatrix}
@@ -2378,121 +2579,65 @@ GrSubRunNoCachePainter::GrSubRunNoCachePainter(skgpu::v1::SurfaceDrawContext* sd
             , fPaint {paint} {}
 
 void GrSubRunNoCachePainter::processDeviceMasks(
-        const SkZip<SkGlyphVariant, SkPoint>& drawables, sk_sp<SkStrike>&& strike) {
-    if (drawables.empty()) { return; }
+        const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike) {
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        const bool padAtlas =
+                fSDC->recordingContext()->priv().options().fSupportBilerpFromGlyphAtlas;
+        this->draw(DirectMaskSubRunNoCache::Make(
+                accepted, std::move(runStrike), format, padAtlas, fAlloc));
+    };
 
-    auto glyphSpan = drawables.get<0>();
-    SkGlyph* glyph = glyphSpan[0];
-    GrMaskFormat format = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-    size_t startIndex = 0;
-    for (size_t i = 1; i < drawables.size(); i++) {
-        glyph = glyphSpan[i];
-        GrMaskFormat nextFormat = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-        if (format != nextFormat) {
-            auto sameFormat = drawables.subspan(startIndex, i - startIndex);
-            // Take an extra ref on the strike. This should rarely happen.
-            this->draw(
-                DirectMaskSubRunNoCache::Make(sameFormat, sk_sp<SkStrike>(strike), format, fAlloc));
-            format = nextFormat;
-            startIndex = i;
-        }
-    }
-    auto sameFormat = drawables.last(drawables.size() - startIndex);
-    this->draw(DirectMaskSubRunNoCache::Make(sameFormat, std::move(strike), format, fAlloc));
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 
-void GrSubRunNoCachePainter::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrSubRunNoCachePainter::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                                 sk_sp<SkStrike>&& strike,
                                                 SkScalar strikeToSourceScale) {
-    if (drawables.empty()) {
-        return;
-    }
-
-    auto glyphSpan = drawables.get<0>();
-    SkGlyph* glyph = glyphSpan[0];
-    GrMaskFormat format = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-    size_t startIndex = 0;
-    for (size_t i = 1; i < drawables.size(); i++) {
-        glyph = glyphSpan[i];
-        GrMaskFormat nextFormat = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-        if (format != nextFormat) {
-            auto sameFormat = drawables.subspan(startIndex, i - startIndex);
-            this->draw(
-                // Add an extra ref to the strike. This should rarely happen.
-                TransformedMaskSubRunNoCache::Make(
-                    sameFormat, sk_sp<SkStrike>(strike), strikeToSourceScale, format, fAlloc));
-            format = nextFormat;
-            startIndex = i;
-        }
-    }
-    auto sameFormat = drawables.last(drawables.size() - startIndex);
-    this->draw(
-            TransformedMaskSubRunNoCache::Make(
-                    sameFormat, std::move(strike), strikeToSourceScale, format, fAlloc));
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        this->draw(TransformedMaskSubRunNoCache::Make(
+                accepted, std::move(runStrike), strikeToSourceScale, format, fAlloc));
+    };
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 
-void GrSubRunNoCachePainter::processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrSubRunNoCachePainter::processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                                 const SkFont& runFont,
                                                 SkScalar strikeToSourceScale) {
-    SkASSERT(!drawables.empty());
-    SkPoint drawOrigin = fGlyphRunList.origin();
-    const SkPaint& drawPaint = fPaint;
-    SkPaint runPaint{drawPaint};
-    runPaint.setAntiAlias(has_some_antialiasing(runFont));
-    // If there are shaders, blurs or styles, the path must be scaled into source
-    // space independently of the CTM. This allows the CTM to be correct for the
-    // different effects.
-    GrStyle style(runPaint);
-
-    bool needsExactCTM = runPaint.getShader()
-                         || style.applies()
-                         || runPaint.getMaskFilter();
+    PathOpSubmitter pathDrawing =
+            PathOpSubmitter::Make(accepted,
+                                  has_some_antialiasing(runFont),
+                                  strikeToSourceScale,
+                                  fAlloc);
 
-    // Calculate the matrix that maps the path glyphs from their size in the strike to
-    // the graphics source space.
-    SkMatrix strikeToSource = SkMatrix::Scale(strikeToSourceScale, strikeToSourceScale);
-    strikeToSource.postTranslate(drawOrigin.x(), drawOrigin.y());
-    if (!needsExactCTM) {
-        for (auto [variant, pos] : drawables) {
-            const SkPath& path = *variant.path();
-            SkMatrix pathMatrix = strikeToSource;
-            pathMatrix.postTranslate(pos.x(), pos.y());
-            SkPreConcatMatrixProvider strikeToDevice(fViewMatrix, pathMatrix);
+    pathDrawing.submitOps(fCanvas, fClip, fViewMatrix, fGlyphRunList.origin(), fPaint, fSDC);
+}
 
-            GrStyledShape shape(path, drawPaint);
-            GrBlurUtils::drawShapeWithMaskFilter(
-                    fSDC->recordingContext(), fSDC, fClip, runPaint,
-                    strikeToDevice, shape);
-        }
-    } else {
-        // Transform the path to device space because the deviceMatrix must be unchanged to
-        // draw effect, filter or shader paths.
-        for (auto [variant, pos] : drawables) {
-            const SkPath& path = *variant.path();
-            // Transform the glyph to source space.
-            SkMatrix pathMatrix = strikeToSource;
-            pathMatrix.postTranslate(pos.x(), pos.y());
+void GrSubRunNoCachePainter::processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                                    const SkFont& runFont,
+                                                    SkScalar strikeToSourceScale) {
+    DrawableOpSubmitter drawableDrawing =
+            DrawableOpSubmitter::Make(accepted,
+                                      has_some_antialiasing(runFont),
+                                      strikeToSourceScale,
+                                      fAlloc);
 
-            SkPath sourceSpacePath;
-            path.transform(pathMatrix, &sourceSpacePath);
-            sourceSpacePath.setIsVolatile(true);
-            GrStyledShape shape(sourceSpacePath, drawPaint);
-            GrBlurUtils::drawShapeWithMaskFilter(
-                    fSDC->recordingContext(), fSDC, fClip, runPaint, fViewMatrix, shape);
-        }
-    }
+    drawableDrawing.submitOps(fCanvas, fClip, fViewMatrix, fGlyphRunList.origin(), fPaint, fSDC);
 }
 
-void GrSubRunNoCachePainter::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void GrSubRunNoCachePainter::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                                sk_sp<SkStrike>&& strike,
                                                SkScalar strikeToSourceScale,
                                                const SkFont& runFont,
-                                               SkScalar minScale, SkScalar maxScale) {
-    if (drawables.empty()) {
+                                               const GrSDFTMatrixRange&) {
+    if (accepted.empty()) {
         return;
     }
     this->draw(SDFTSubRunNoCache::Make(
-            drawables, runFont, std::move(strike), strikeToSourceScale, fAlloc));
+            accepted, runFont, std::move(strike), strikeToSourceScale, fAlloc));
 }
 
 void GrSubRunNoCachePainter::draw(GrAtlasSubRunOwner subRun) {
@@ -2508,60 +2653,9 @@ void GrSubRunNoCachePainter::draw(GrAtlasSubRunOwner subRun) {
 }
 
 namespace {
-// ----------------------------- Begin slug implementation -----------------------------------------
-class SlugSubRun;
-using SlugSubRunOwner = std::unique_ptr<SlugSubRun, GrSubRunAllocator::Destroyer>;
-class SlugSubRun : public GrDrawableSubRun {
-private:
-    friend struct SlugSubRunList;
-    SlugSubRunOwner fNext;
-};
-
-class SlugAtlasSubRun : public SlugSubRun, public GrAtlasSubRun { };
-
-struct SlugSubRunList {
-    class Iterator {
-    public:
-        using value_type = SlugSubRun;
-        using difference_type = ptrdiff_t;
-        using pointer = value_type*;
-        using reference = value_type&;
-        using iterator_category = std::input_iterator_tag;
-        Iterator(SlugSubRun* subRun) : fPtr{subRun} { }
-        Iterator& operator++() { fPtr = fPtr->fNext.get(); return *this; }
-        Iterator operator++(int) { Iterator tmp(*this); operator++(); return tmp; }
-        bool operator==(const Iterator& rhs) const { return fPtr == rhs.fPtr; }
-        bool operator!=(const Iterator& rhs) const { return fPtr != rhs.fPtr; }
-        reference operator*() { return *fPtr; }
-
-    private:
-        SlugSubRun* fPtr;
-    };
-
-    void append(SlugSubRunOwner subRun) {
-        SlugSubRunOwner* newTail = &subRun->fNext;
-        *fTail = std::move(subRun);
-        fTail = newTail;
-    }
-    bool isEmpty() const { return fHead == nullptr; }
-    Iterator begin() { return Iterator{ fHead.get()}; }
-    Iterator end() { return Iterator{nullptr}; }
-    Iterator begin() const { return Iterator{ fHead.get()}; }
-    Iterator end() const { return Iterator{nullptr}; }
-    SlugSubRun& front() const {return *fHead; }
-
-    SlugSubRunOwner fHead{nullptr};
-    SlugSubRunOwner* fTail{&fHead};
-};
-
 // -- Slug -----------------------------------------------------------------------------------------
 class Slug final : public GrSlug, public SkGlyphRunPainterInterface {
 public:
-    static sk_sp<Slug> Make(const SkMatrixProvider& viewMatrix,
-                            const SkGlyphRunList& glyphRunList,
-                            const SkPaint& paint,
-                            const GrSDFTControl& control,
-                            SkGlyphRunListPainter* painter);
     Slug(SkRect sourceBounds,
          const SkPaint& paint,
          const SkMatrix& positionMatrix,
@@ -2569,28 +2663,41 @@ class Slug final : public GrSlug, public SkGlyphRunPainterInterface {
          int allocSize);
     ~Slug() override = default;
 
-    void surfaceDraw(const GrClip* clip,
+    static sk_sp<Slug> Make(const SkMatrixProvider& viewMatrix,
+                            const SkGlyphRunList& glyphRunList,
+                            const SkPaint& paint,
+                            const GrSDFTControl& control,
+                            SkGlyphRunListPainter* painter);
+    static sk_sp<GrSlug> MakeFromBuffer(SkReadBuffer& buffer,
+                                        const SkStrikeClient* client);
+
+    void surfaceDraw(SkCanvas*,
+                     const GrClip* clip,
                      const SkMatrixProvider& viewMatrix,
                      skgpu::v1::SurfaceDrawContext* sdc);
 
+    void flatten(SkWriteBuffer& buffer) const override;
     SkRect sourceBounds() const override { return fSourceBounds; }
     const SkPaint& paint() const override { return fPaint; }
 
     // SkGlyphRunPainterInterface
     void processDeviceMasks(
-            const SkZip<SkGlyphVariant, SkPoint>& drawables, sk_sp<SkStrike>&& strike) override;
+            const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike) override;
     void processSourceMasks(
-            const SkZip<SkGlyphVariant, SkPoint>& drawables, sk_sp<SkStrike>&& strike,
+            const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike,
             SkScalar strikeToSourceScale) override;
     void processSourcePaths(
+            const SkZip<SkGlyphVariant, SkPoint>& accepted, const SkFont& runFont,
+            SkScalar strikeToSourceScale) override;
+    void processSourceDrawables(
             const SkZip<SkGlyphVariant, SkPoint>& drawables, const SkFont& runFont,
             SkScalar strikeToSourceScale) override;
     void processSourceSDFT(
-            const SkZip<SkGlyphVariant, SkPoint>& drawables, sk_sp<SkStrike>&& strike,
-            SkScalar strikeToSourceScale, const SkFont& runFont, SkScalar minScale,
-            SkScalar maxScale) override;
+            const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike,
+            SkScalar strikeToSourceScale, const SkFont& runFont,
+            const GrSDFTMatrixRange& matrixRange) override;
 
-    const SkMatrix& initialPositionMatrix() const { return fInitialPositionMatrix; }
+    const SkMatrix& initialPositionMatrix() const override { return fInitialPositionMatrix; }
     SkPoint origin() const { return fOrigin; }
 
     // Change memory management to handle the data after Slug, but in the same allocation
@@ -2599,20 +2706,25 @@ class Slug final : public GrSlug, public SkGlyphRunPainterInterface {
     void* operator new(size_t) { SK_ABORT("All slugs are created by placement new."); }
     void* operator new(size_t, void* p) { return p; }
 
-private:
-    template<typename AddSingleMaskFormat>
-    void addMultiMaskFormat(
-            AddSingleMaskFormat addSingle,
-            const SkZip<SkGlyphVariant, SkPoint>& drawables,
-            sk_sp<SkStrike>&& strike,
-            SkScalar strikeToSourceScale);
+    std::tuple<int, int> subRunCountAndUnflattenSizeHint() const {
+        int unflattenSizeHint = 0;
+        int subRunCount = 0;
+        for (auto& subrun : fSubRuns) {
+            subRunCount += 1;
+            unflattenSizeHint += subrun.unflattenSize();
+        }
+        return {subRunCount, unflattenSizeHint};
+    }
 
+private:
+    // The allocator must come first because it needs to be destroyed last. Other fields of this
+    // structure may have pointers into it.
+    GrSubRunAllocator fAlloc;
     const SkRect fSourceBounds;
     const SkPaint fPaint;
     const SkMatrix fInitialPositionMatrix;
     const SkPoint fOrigin;
-    GrSubRunAllocator fAlloc;
-    SlugSubRunList fSubRuns;
+    GrSubRunList fSubRuns;
 };
 
 Slug::Slug(SkRect sourceBounds,
@@ -2620,75 +2732,86 @@ Slug::Slug(SkRect sourceBounds,
            const SkMatrix& positionMatrix,
            SkPoint origin,
            int allocSize)
-           : fSourceBounds{sourceBounds}
+           : fAlloc {SkTAddOffset<char>(this, sizeof(Slug)), allocSize, allocSize/2}
+           , fSourceBounds{sourceBounds}
            , fPaint{paint}
            , fInitialPositionMatrix{positionMatrix}
-           , fOrigin{origin}
-           , fAlloc {SkTAddOffset<char>(this, sizeof(Slug)), allocSize, allocSize/2} { }
+           , fOrigin{origin} { }
 
-template<typename AddSingleMaskFormat>
-void Slug::addMultiMaskFormat(
-        AddSingleMaskFormat addSingle,
-        const SkZip<SkGlyphVariant, SkPoint>& drawables,
-        sk_sp<SkStrike>&& strike,
-        SkScalar strikeToSourceScale) {
-    if (drawables.empty()) { return; }
-
-    auto addSameFormat = [&](const SkZip<SkGlyphVariant, SkPoint>& drawable,
-                             GrMaskFormat format,
-                             sk_sp<SkStrike>&& runStrike) {
-        SlugSubRunOwner subRun = addSingle(
-                this, drawable, std::move(runStrike), strikeToSourceScale, format, &fAlloc);
-        if (subRun != nullptr) {
-            fSubRuns.append(std::move(subRun));
-        }
-    };
+void Slug::surfaceDraw(SkCanvas* canvas, const GrClip* clip, const SkMatrixProvider& viewMatrix,
+                       skgpu::v1::SurfaceDrawContext* sdc) {
+    for (const GrSubRun& subRun : fSubRuns) {
+        subRun.draw(canvas, clip, viewMatrix, fOrigin, fPaint, sdc);
+    }
+}
 
-    auto glyphSpan = drawables.get<0>();
-    SkGlyph* glyph = glyphSpan[0];
-    GrMaskFormat format = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-    size_t startIndex = 0;
-    for (size_t i = 1; i < drawables.size(); i++) {
-        glyph = glyphSpan[i];
-        GrMaskFormat nextFormat = GrGlyph::FormatFromSkGlyph(glyph->maskFormat());
-        if (format != nextFormat) {
-            auto sameFormat = drawables.subspan(startIndex, i - startIndex);
-            // Take a ref on the strike. This should rarely happen.
-            addSameFormat(sameFormat, format, sk_sp<SkStrike>(strike));
-            format = nextFormat;
-            startIndex = i;
-        }
+void Slug::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeRect(fSourceBounds);
+    SkPaintPriv::Flatten(fPaint, buffer);
+    buffer.writeMatrix(fInitialPositionMatrix);
+    buffer.writePoint(fOrigin);
+    auto [subRunCount, subRunsUnflattenSizeHint] = this->subRunCountAndUnflattenSizeHint();
+    buffer.writeInt(subRunCount);
+    buffer.writeInt(subRunsUnflattenSizeHint);
+    for (auto& subRun : fSubRuns) {
+        subRun.flatten(buffer);
     }
-    auto sameFormat = drawables.last(drawables.size() - startIndex);
-    addSameFormat(sameFormat, format, std::move(strike));
 }
 
-void Slug::surfaceDraw(const GrClip* clip, const SkMatrixProvider& viewMatrix,
-                       skgpu::v1::SurfaceDrawContext* sdc) {
-    for (const SlugSubRun& subRun : fSubRuns) {
-        subRun.draw(clip, viewMatrix, fOrigin, fPaint, sdc);
+sk_sp<GrSlug> Slug::MakeFromBuffer(SkReadBuffer& buffer, const SkStrikeClient* client) {
+    SkRect sourceBounds = buffer.readRect();
+    if (!buffer.validate(!sourceBounds.isEmpty())) { return nullptr; }
+
+    SkPaint paint = buffer.readPaint();
+    SkMatrix positionMatrix;
+    buffer.readMatrix(&positionMatrix);
+    SkPoint origin = buffer.readPoint();
+    int subRunCount = buffer.readInt();
+    if (!buffer.validate(subRunCount != 0)) { return nullptr; }
+    int subRunsUnflattenSizeHint = buffer.readInt();
+
+    sk_sp<Slug> slug{new (::operator new (sizeof(Slug) + subRunsUnflattenSizeHint))
+                             Slug(sourceBounds,
+                                  paint,
+                                  positionMatrix,
+                                  origin,
+                                  subRunsUnflattenSizeHint)};
+    for (int i = 0; i < subRunCount; ++i) {
+        auto subRun = GrSubRun::MakeFromBuffer(slug.get(), buffer, &slug->fAlloc, client);
+        if (!buffer.validate(subRun != nullptr)) { return nullptr; }
+        slug->fSubRuns.append(std::move(subRun));
     }
+
+    // Something went wrong while reading.
+    if (!buffer.isValid()) { return nullptr;}
+
+    return std::move(slug);
 }
 
 // -- DirectMaskSubRunSlug -------------------------------------------------------------------------
-class DirectMaskSubRunSlug final : public SlugAtlasSubRun {
+class DirectMaskSubRunSlug final : public GrSubRun, public GrAtlasSubRun {
 public:
     using DevicePosition = skvx::Vec<2, int16_t>;
 
-    DirectMaskSubRunSlug(Slug* slug,
+    DirectMaskSubRunSlug(const GrTextReferenceFrame* referenceFrame,
                          GrMaskFormat format,
                          SkGlyphRect deviceBounds,
                          SkSpan<const DevicePosition> devicePositions,
-                         GlyphVector&& glyphs);
+                         GrGlyphVector&& glyphs);
 
-    static SlugSubRunOwner Make(Slug* slug,
-                                const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                sk_sp<SkStrike>&& strike,
-                                SkScalar strikeToSourceScale,
-                                GrMaskFormat format,
-                                GrSubRunAllocator* alloc);
+    static GrSubRunOwner Make(const GrTextReferenceFrame* referenceFrame,
+                              const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                              sk_sp<SkStrike>&& strike,
+                              GrMaskFormat format,
+                              GrSubRunAllocator* alloc);
 
-    void draw(const GrClip* clip,
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client);
+
+    void draw(SkCanvas*,
+              const GrClip* clip,
               const SkMatrixProvider& viewMatrix,
               SkPoint drawOrigin,
               const SkPaint& paint,
@@ -2700,6 +2823,8 @@ class DirectMaskSubRunSlug final : public SlugAtlasSubRun {
         }
     }
 
+    int unflattenSize() const override;
+
     size_t vertexStride(const SkMatrix& drawMatrix) const override;
 
     int glyphCount() const override;
@@ -2712,7 +2837,7 @@ class DirectMaskSubRunSlug final : public SlugAtlasSubRun {
                     skgpu::v1::SurfaceDrawContext*,
                     GrAtlasSubRunOwner) const override;
 
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
+    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const override;
 
     std::tuple<bool, int>
     regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
@@ -2722,13 +2847,17 @@ class DirectMaskSubRunSlug final : public SlugAtlasSubRun {
                         const SkMatrix& drawMatrix, SkPoint drawOrigin,
                         SkIRect clip) const override;
 
+protected:
+    SubRunType subRunType() const override { return kDirectMask; }
+    void doFlatten(SkWriteBuffer& buffer) const override;
+
 private:
     // Return true if the positionMatrix represents an integer translation. Return the device
     // bounding box of all the glyphs. If the bounding box is empty, then something went singular
     // and this operation should be dropped.
     std::tuple<bool, SkRect> deviceRectAndCheckTransform(const SkMatrix& positionMatrix) const;
 
-    Slug* const fSlug;
+    const GrTextReferenceFrame* const fReferenceFrame;
     const GrMaskFormat fMaskFormat;
 
     // The vertex bounds in device space. The bounds are the joined rectangles of all the glyphs.
@@ -2737,31 +2866,27 @@ class DirectMaskSubRunSlug final : public SlugAtlasSubRun {
 
     // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
     // be single threaded.
-    mutable GlyphVector fGlyphs;
+    mutable GrGlyphVector fGlyphs;
 };
 
-DirectMaskSubRunSlug::DirectMaskSubRunSlug(Slug* slug,
+DirectMaskSubRunSlug::DirectMaskSubRunSlug(const GrTextReferenceFrame* referenceFrame,
                                            GrMaskFormat format,
                                            SkGlyphRect deviceBounds,
                                            SkSpan<const DevicePosition> devicePositions,
-                                           GlyphVector&& glyphs)
-        : fSlug{slug}
+                                           GrGlyphVector&& glyphs)
+        : fReferenceFrame{referenceFrame}
         , fMaskFormat{format}
         , fGlyphDeviceBounds{deviceBounds}
         , fLeftTopDevicePos{devicePositions}
         , fGlyphs{std::move(glyphs)} { }
 
-SlugSubRunOwner DirectMaskSubRunSlug::Make(Slug* slug,
-                                           const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                           sk_sp<SkStrike>&& strike,
-                                           SkScalar strikeToSourceScale,
-                                           GrMaskFormat format,
-                                           GrSubRunAllocator* alloc) {
-    DevicePosition* glyphLeftTop = alloc->makePODArray<DevicePosition>(drawables.size());
-
-    GlyphVector::Variant* glyphIDs = static_cast<GlyphVector::Variant*>(
-            alloc->alignedBytes(drawables.size() * sizeof(GlyphVector::Variant),
-                                alignof(GlyphVector::Variant)));
+GrSubRunOwner DirectMaskSubRunSlug::Make(const GrTextReferenceFrame* referenceFrame,
+                                         const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                         sk_sp<SkStrike>&& strike,
+                                         GrMaskFormat format,
+                                         GrSubRunAllocator* alloc) {
+    auto glyphLeftTop = alloc->makePODArray<DevicePosition>(accepted.size());
+    auto glyphIDs = alloc->makePODArray<GrGlyphVector::Variant>(accepted.size());
 
     // Because this is the direct case, the maximum width or height is the size that fits in the
     // atlas. This boundary is checked below to ensure that the call to SkGlyphRect below will
@@ -2770,7 +2895,7 @@ SlugSubRunOwner DirectMaskSubRunSlug::Make(Slug* slug,
             std::numeric_limits<int16_t>::max() - SkStrikeCommon::kSkSideTooBigForAtlas;
     SkGlyphRect runBounds = skglyph::empty_rect();
     size_t goodPosCount = 0;
-    for (auto [variant, pos] : drawables) {
+    for (auto [variant, pos] : accepted) {
         auto [x, y] = pos;
         // Ensure that the .offset() call below does not overflow. And, at this point none of the
         // rectangles are empty because they were culled before the run was created. Basically,
@@ -2793,13 +2918,67 @@ SlugSubRunOwner DirectMaskSubRunSlug::Make(Slug* slug,
 
     SkSpan<const DevicePosition> leftTop{glyphLeftTop, goodPosCount};
     return alloc->makeUnique<DirectMaskSubRunSlug>(
-            slug, format, runBounds, leftTop,
-            GlyphVector{std::move(strike), {glyphIDs, goodPosCount}});
+            referenceFrame, format, runBounds, leftTop,
+            GrGlyphVector{std::move(strike), {glyphIDs, goodPosCount}});
 }
 
-size_t DirectMaskSubRunSlug::vertexStride(const SkMatrix& positionMatrix) const {
-    if (!positionMatrix.hasPerspective()) {
-        if (fMaskFormat != kARGB_GrMaskFormat) {
+template <typename T>
+static bool pun_read(SkReadBuffer& buffer, T* dst) {
+    return buffer.readPad32(dst, sizeof(T));
+}
+
+GrSubRunOwner DirectMaskSubRunSlug::MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                                   SkReadBuffer& buffer,
+                                                   GrSubRunAllocator* alloc,
+                                                   const SkStrikeClient*) {
+
+    GrMaskFormat format = (GrMaskFormat)buffer.readInt();
+    SkGlyphRect runBounds;
+    pun_read(buffer, &runBounds);
+
+    int glyphCount = buffer.readInt();
+    SkASSERT(0 < glyphCount);
+    if (glyphCount <= 0) { return nullptr; }
+    DevicePosition* positionsData = alloc->makePODArray<DevicePosition>(glyphCount);
+    for (int i = 0; i < glyphCount; ++i) {
+        pun_read(buffer, &positionsData[i]);
+    }
+    SkSpan<DevicePosition> positions(positionsData, glyphCount);
+
+    auto glyphVector = GrGlyphVector::MakeFromBuffer(buffer, alloc);
+    SkASSERT(glyphVector.has_value());
+    if (!glyphVector) { return nullptr; }
+    SkASSERT(SkTo<int>(glyphVector->glyphs().size()) == glyphCount);
+    if (SkTo<int>(glyphVector->glyphs().size()) != glyphCount) { return nullptr; }
+    return alloc->makeUnique<DirectMaskSubRunSlug>(
+            referenceFrame, format, runBounds, positions, std::move(glyphVector.value()));
+}
+
+template <typename T>
+static void pun_write(SkWriteBuffer& buffer, const T& src) {
+    buffer.writePad32(&src, sizeof(T));
+}
+
+void DirectMaskSubRunSlug::doFlatten(SkWriteBuffer& buffer) const {
+    buffer.writeInt(fMaskFormat);
+    pun_write(buffer, fGlyphDeviceBounds);
+    int glyphCount = SkTo<int>(fLeftTopDevicePos.size());
+    buffer.writeInt(glyphCount);
+    for (auto pos : fLeftTopDevicePos) {
+        pun_write(buffer, pos);
+    }
+    fGlyphs.flatten(buffer);
+}
+
+int DirectMaskSubRunSlug::unflattenSize() const {
+    return sizeof(DirectMaskSubRunSlug) +
+           fGlyphs.unflattenSize() +
+           sizeof(DevicePosition) * fGlyphs.glyphs().size();
+}
+
+size_t DirectMaskSubRunSlug::vertexStride(const SkMatrix& positionMatrix) const {
+    if (!positionMatrix.hasPerspective()) {
+        if (fMaskFormat != kARGB_GrMaskFormat) {
             return sizeof(Mask2DVertex);
         } else {
             return sizeof(ARGB2DVertex);
@@ -2867,7 +3046,7 @@ DirectMaskSubRunSlug::makeAtlasTextOp(const GrClip* clip,
                                                        drawMatrix,
                                                        drawOrigin,
                                                        geometricClipRect,
-                                                       sk_ref_sp<GrSlug>(fSlug),
+                                                       sk_ref_sp(fReferenceFrame),
                                                        drawingColor,
                                                        sdc->arenaAlloc());
 
@@ -2882,17 +3061,13 @@ DirectMaskSubRunSlug::makeAtlasTextOp(const GrClip* clip,
     return {clip, std::move(op)};
 }
 
-void DirectMaskSubRunSlug::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
+void DirectMaskSubRunSlug::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) const {
     fGlyphs.packedGlyphIDToGrGlyph(cache);
 }
 
 std::tuple<bool, int>
 DirectMaskSubRunSlug::regenerateAtlas(int begin, int end, GrMeshDrawTarget* target) const {
-    #if defined(SK_EXPERIMENTAL_ADD_ATLAS_PADDING)
-        return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
-    #else
-        return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 0, target, false);
-    #endif
+    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
 }
 
 // The 99% case. No clip. Non-color only.
@@ -2975,50 +3150,50 @@ void DirectMaskSubRunSlug::fillVertexData(void* vertexDst, int offset, int count
 
     const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
     auto [noTransformNeeded, originOffset] =
-            can_use_direct(fSlug->initialPositionMatrix(), positionMatrix);
+            can_use_direct(fReferenceFrame->initialPositionMatrix(), positionMatrix);
 
     if (noTransformNeeded) {
         if (clip.isEmpty()) {
             if (fMaskFormat != kARGB_GrMaskFormat) {
                 using Quad = Mask2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+                SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(SkMatrix::I()));
                 direct_2D3(quadData((Quad*)vertexDst), color, originOffset);
             } else {
                 using Quad = ARGB2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+                SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(SkMatrix::I()));
                 generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset);
             }
         } else {
             if (fMaskFormat != kARGB_GrMaskFormat) {
                 using Quad = Mask2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+                SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(SkMatrix::I()));
                 generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset, &clip);
             } else {
                 using Quad = ARGB2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(SkMatrix::I()) * kVerticesPerGlyph);
+                SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(SkMatrix::I()));
                 generalized_direct_2D(quadData((Quad*)vertexDst), color, originOffset, &clip);
             }
         }
-    } else if (SkMatrix inverse; fSlug->initialPositionMatrix().invert(&inverse)) {
+    } else if (SkMatrix inverse; fReferenceFrame->initialPositionMatrix().invert(&inverse)) {
         SkMatrix viewDifference = SkMatrix::Concat(positionMatrix, inverse);
         if (!viewDifference.hasPerspective()) {
             if (fMaskFormat != kARGB_GrMaskFormat) {
                 using Quad = Mask2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+                SkASSERT(sizeof(Mask2DVertex) == this->vertexStride(positionMatrix));
                 transformed_direct_2D(quadData((Quad*)vertexDst), color, viewDifference);
             } else {
                 using Quad = ARGB2DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+                SkASSERT(sizeof(ARGB2DVertex) == this->vertexStride(positionMatrix));
                 transformed_direct_2D(quadData((Quad*)vertexDst), color, viewDifference);
             }
         } else {
             if (fMaskFormat != kARGB_GrMaskFormat) {
                 using Quad = Mask3DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+                SkASSERT(sizeof(Mask3DVertex) == this->vertexStride(positionMatrix));
                 transformed_direct_3D(quadData((Quad*)vertexDst), color, viewDifference);
             } else {
                 using Quad = ARGB3DVertex[4];
-                SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
+                SkASSERT(sizeof(ARGB3DVertex) == this->vertexStride(positionMatrix));
                 transformed_direct_3D(quadData((Quad*)vertexDst), color, viewDifference);
             }
         }
@@ -3028,7 +3203,8 @@ void DirectMaskSubRunSlug::fillVertexData(void* vertexDst, int offset, int count
 // true if only need to translate by integer amount, device rect.
 std::tuple<bool, SkRect>
 DirectMaskSubRunSlug::deviceRectAndCheckTransform(const SkMatrix& positionMatrix) const {
-    SkPoint offset = positionMatrix.mapOrigin() - fSlug->initialPositionMatrix().mapOrigin();
+    SkPoint offset =
+            positionMatrix.mapOrigin() - fReferenceFrame->initialPositionMatrix().mapOrigin();
     if (positionMatrix.isTranslate() && SkScalarIsInt(offset.x()) && SkScalarIsInt(offset.y())) {
         // Handle the integer offset case.
         // The offset should be integer, but make sure.
@@ -3036,7 +3212,7 @@ DirectMaskSubRunSlug::deviceRectAndCheckTransform(const SkMatrix& positionMatrix
 
         SkIRect outBounds = fGlyphDeviceBounds.iRect();
         return {true, SkRect::Make(outBounds.makeOffset(iOffset))};
-    } else if (SkMatrix inverse; fSlug->initialPositionMatrix().invert(&inverse)) {
+    } else if (SkMatrix inverse; fReferenceFrame->initialPositionMatrix().invert(&inverse)) {
         SkMatrix viewDifference = SkMatrix::Concat(positionMatrix, inverse);
         return {false, viewDifference.mapRect(fGlyphDeviceBounds.rect())};
     }
@@ -3046,8 +3222,18 @@ DirectMaskSubRunSlug::deviceRectAndCheckTransform(const SkMatrix& positionMatrix
 }
 
 void Slug::processDeviceMasks(
-        const SkZip<SkGlyphVariant, SkPoint>& drawables, sk_sp<SkStrike>&& strike) {
-    this->addMultiMaskFormat(DirectMaskSubRunSlug::Make, drawables, std::move(strike), 1);
+        const SkZip<SkGlyphVariant, SkPoint>& accepted, sk_sp<SkStrike>&& strike) {
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        GrSubRunOwner subRun = DirectMaskSubRunSlug::Make(
+                this, accepted, std::move(runStrike), format, &fAlloc);
+        if (subRun != nullptr) {
+            fSubRuns.append(std::move(subRun));
+        }
+    };
+
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 
 sk_sp<Slug> Slug::Make(const SkMatrixProvider& viewMatrix,
@@ -3064,18 +3250,16 @@ sk_sp<Slug> Slug::Make(const SkMatrixProvider& viewMatrix,
     // common case.
     size_t bytesNeededForSubRun = GrBagOfBytes::PlatformMinimumSizeWithOverhead(
             totalGlyphCount * sizeof(DirectMaskSubRunSlug::DevicePosition)
-            + GlyphVector::GlyphVectorSize(totalGlyphCount)
+            + GrGlyphVector::GlyphVectorSize(totalGlyphCount)
             + glyphRunList.runCount() * (sizeof(DirectMaskSubRunSlug) + vertexDataToSubRunPadding),
             alignof(Slug));
 
     size_t allocationSize = sizeof(GrTextBlob) + bytesNeededForSubRun;
 
-    void* allocation = ::operator new (allocationSize);
-
     const SkMatrix positionMatrix =
             position_matrix(viewMatrix.localToDevice(), glyphRunList.origin());
 
-    sk_sp<Slug> slug{new (allocation)
+    sk_sp<Slug> slug{new (::operator new (allocationSize))
                              Slug(glyphRunList.sourceBounds(),
                                   paint,
                                   positionMatrix,
@@ -3084,634 +3268,81 @@ sk_sp<Slug> Slug::Make(const SkMatrixProvider& viewMatrix,
 
     const uint64_t uniqueID = glyphRunList.uniqueID();
     for (auto& glyphRun : glyphRunList) {
-        painter->processGlyphRun(glyphRun,
+        painter->processGlyphRun(slug.get(),
+                                 glyphRun,
                                  positionMatrix,
                                  paint,
                                  control,
-                                 slug.get(),
-                                 "Slug",
+                                 "Make Slug",
                                  uniqueID);
     }
 
-    return slug;
-}
-
-// -- PathSubRunSlug -------------------------------------------------------------------------------
-class PathSubRunSlug final : public SlugSubRun {
-public:
-    PathSubRunSlug(bool isAntiAliased,
-                   SkScalar strikeToSourceScale,
-                   SkSpan<PathGlyph> paths,
-                   std::unique_ptr<PathGlyph[], GrSubRunAllocator::ArrayDestroyer> pathData);
-
-    void draw(const GrClip* clip,
-              const SkMatrixProvider& viewMatrix,
-              SkPoint drawOrigin,
-              const SkPaint& paint,
-              skgpu::v1::SurfaceDrawContext* sdc) const override;
-
-    static SlugSubRunOwner Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                bool isAntiAliased,
-                                SkScalar strikeToSourceScale,
-                                GrSubRunAllocator* alloc);
+    // There is nothing to draw here. This is particularly a problem with RSX form blobs where a
+    // single space becomes a run with no glyphs.
+    if (slug->fSubRuns.isEmpty()) { return nullptr; }
 
-private:
-
-    const bool fIsAntiAliased;
-    const SkScalar fStrikeToSourceScale;
-    const SkSpan<const PathGlyph> fPaths;
-    const std::unique_ptr<PathGlyph[], GrSubRunAllocator::ArrayDestroyer> fPathData;
-};
-
-PathSubRunSlug::PathSubRunSlug(bool isAntiAliased,
-                               SkScalar strikeToSourceScale,
-                               SkSpan<PathGlyph> paths,
-                               std::unique_ptr<PathGlyph[],
-                               GrSubRunAllocator::ArrayDestroyer> pathData)
-        : fIsAntiAliased{isAntiAliased}
-        , fStrikeToSourceScale{strikeToSourceScale}
-        , fPaths{paths}
-        , fPathData{std::move(pathData)} {}
-
-void PathSubRunSlug::draw(const GrClip* clip,
-                          const SkMatrixProvider& viewMatrix,
-                          SkPoint drawOrigin,
-                          const SkPaint& paint,
-                          skgpu::v1::SurfaceDrawContext* sdc) const {
-    SkASSERT(!fPaths.empty());
-    SkPaint runPaint{paint};
-    runPaint.setAntiAlias(fIsAntiAliased);
-    // If there are shaders, blurs or styles, the path must be scaled into source
-    // space independently of the CTM. This allows the CTM to be correct for the
-    // different effects.
-    GrStyle style(runPaint);
-
-    bool needsExactCTM = runPaint.getShader()
-                         || style.applies()
-                         || runPaint.getMaskFilter();
-
-    // Calculate the matrix that maps the path glyphs from their size in the strike to
-    // the graphics source space.
-    SkMatrix strikeToSource = SkMatrix::Scale(fStrikeToSourceScale, fStrikeToSourceScale);
-    strikeToSource.postTranslate(drawOrigin.x(), drawOrigin.y());
-    if (!needsExactCTM) {
-        for (const auto& pathPos : fPaths) {
-            const SkPath& path = pathPos.fPath;
-            const SkPoint pos = pathPos.fOrigin;  // Transform the glyph to source space.
-            SkMatrix pathMatrix = strikeToSource;
-            pathMatrix.postTranslate(pos.x(), pos.y());
-            SkPreConcatMatrixProvider strikeToDevice(viewMatrix, pathMatrix);
-
-            GrStyledShape shape(path, paint);
-            GrBlurUtils::drawShapeWithMaskFilter(
-                    sdc->recordingContext(), sdc, clip, runPaint, strikeToDevice, shape);
-        }
-    } else {
-        // Transform the path to device because the deviceMatrix must be unchanged to
-        // draw effect, filter or shader paths.
-        for (const auto& pathPos : fPaths) {
-            const SkPath& path = pathPos.fPath;
-            const SkPoint pos = pathPos.fOrigin;
-            // Transform the glyph to source space.
-            SkMatrix pathMatrix = strikeToSource;
-            pathMatrix.postTranslate(pos.x(), pos.y());
-
-            SkPath deviceOutline;
-            path.transform(pathMatrix, &deviceOutline);
-            deviceOutline.setIsVolatile(true);
-            GrStyledShape shape(deviceOutline, paint);
-            GrBlurUtils::drawShapeWithMaskFilter(sdc->recordingContext(), sdc, clip, runPaint,
-                                                 viewMatrix, shape);
-        }
-    }
-}
-
-SlugSubRunOwner PathSubRunSlug::Make(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                     bool isAntiAliased,
-                                     SkScalar strikeToSourceScale,
-                                     GrSubRunAllocator* alloc) {
-    auto pathData = alloc->makeUniqueArray<PathGlyph>(
-            drawables.size(),
-            [&](int i){
-                auto [variant, pos] = drawables[i];
-                return PathGlyph{*variant.path(), pos};
-            });
-    SkSpan<PathGlyph> paths{pathData.get(), drawables.size()};
-
-    return alloc->makeUnique<PathSubRunSlug>(
-            isAntiAliased, strikeToSourceScale, paths, std::move(pathData));
+    return slug;
 }
 
 void Slug::processSourcePaths(const SkZip<SkGlyphVariant,
-                              SkPoint>& drawables,
+                              SkPoint>& accepted,
                               const SkFont& runFont,
                               SkScalar strikeToSourceScale) {
-    fSubRuns.append(PathSubRunSlug::Make(drawables,
-                                         has_some_antialiasing(runFont),
-                                         strikeToSourceScale,
-                                         &fAlloc));
+    fSubRuns.append(PathSubRun::Make(
+            accepted, has_some_antialiasing(runFont), strikeToSourceScale, &fAlloc));
 }
 
-// -- SDFTSubRunSlug -------------------------------------------------------------------------------
-class SDFTSubRunSlug final : public SlugAtlasSubRun {
-public:
-    struct VertexData {
-        const SkPoint pos;
-        // The rectangle of the glyphs in strike space.
-        GrIRect16 rect;
-    };
-
-    SDFTSubRunSlug(Slug* slug,
-                   GrMaskFormat format,
-                   SkScalar strikeToSource,
-                   SkRect vertexBounds,
-                   SkSpan<const VertexData> vertexData,
-                   GlyphVector&& glyphs,
-                   bool useLCDText,
-                   bool antiAliased);
-
-    static SlugSubRunOwner Make(Slug* slug,
-                                const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                const SkFont& runFont,
-                                sk_sp<SkStrike>&& strike,
-                                SkScalar strikeToSourceScale,
-                                GrSubRunAllocator* alloc);
-
-    void draw(const GrClip* clip,
-              const SkMatrixProvider& viewMatrix,
-              SkPoint drawOrigin,
-              const SkPaint& paint,
-              skgpu::v1::SurfaceDrawContext* sdc) const override;
-
-    std::tuple<const GrClip*, GrOp::Owner>
-    makeAtlasTextOp(const GrClip* clip,
-                    const SkMatrixProvider& viewMatrix,
-                    SkPoint drawOrigin,
-                    const SkPaint& paint,
-                    skgpu::v1::SurfaceDrawContext* sdc,
-                    GrAtlasSubRunOwner subRunOwner) const override;
-
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
-
-    std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
-
-    void fillVertexData(void* vertexDst, int offset, int count,
-                        GrColor color,
-                        const SkMatrix& drawMatrix, SkPoint drawOrigin,
-                        SkIRect clip) const override;
-
-    size_t vertexStride(const SkMatrix& drawMatrix) const override;
-    int glyphCount() const override;
-
-private:
-    Slug* const fSlug;
-
-    // The rectangle that surrounds all the glyph bounding boxes in device space.
-    SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
-
-    const GrMaskFormat fMaskFormat;
-
-    // The scale factor between the strike size, and the source size.
-    const SkScalar fStrikeToSourceScale;
-
-    // The bounds in source space. The bounds are the joined rectangles of all the glyphs.
-    const SkRect fVertexBounds;
-    const SkSpan<const VertexData> fVertexData;
-
-    // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
-    // be single threaded.
-    mutable GlyphVector fGlyphs;
-
-    const bool fUseLCDText;
-    const bool fAntiAliased;
-};
-
-SDFTSubRunSlug::SDFTSubRunSlug(Slug* slug,
-                               GrMaskFormat format,
-                               SkScalar strikeToSource,
-                               SkRect vertexBounds,
-                               SkSpan<const VertexData> vertexData,
-                               GlyphVector&& glyphs,
-                               bool useLCDText,
-                               bool antiAliased)
-        : fSlug{slug}
-        , fMaskFormat{format}
-        , fStrikeToSourceScale{strikeToSource}
-        , fVertexBounds{vertexBounds}
-        , fVertexData{vertexData}
-        , fGlyphs{std::move(glyphs)}
-        , fUseLCDText{useLCDText}
-        , fAntiAliased{antiAliased} {}
-
-SlugSubRunOwner SDFTSubRunSlug::Make(Slug* slug,
-                                     const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                     const SkFont& runFont,
-                                     sk_sp<SkStrike>&& strike,
-                                     SkScalar strikeToSourceScale,
-                                     GrSubRunAllocator* alloc) {
-    SkRect bounds = SkRectPriv::MakeLargestInverted();
-    auto mapper = [&](const auto& d) {
-        auto& [variant, pos] = d;
-        SkGlyph* skGlyph = variant;
-        int16_t l = skGlyph->left(),
-                t = skGlyph->top(),
-                r = l + skGlyph->width(),
-                b = t + skGlyph->height();
-        SkPoint lt = SkPoint::Make(l, t) * strikeToSourceScale + pos,
-                rb = SkPoint::Make(r, b) * strikeToSourceScale + pos;
-
-        bounds.joinPossiblyEmptyRect(SkRect::MakeLTRB(lt.x(), lt.y(), rb.x(), rb.y()));
-        return VertexData{pos, {l, t, r, b}};
-    };
-
-    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(drawables, mapper);
-
-    return alloc->makeUnique<SDFTSubRunSlug>(
-            slug,
-            kA8_GrMaskFormat,
-            strikeToSourceScale,
-            bounds,
-            vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc),
-            runFont.getEdging() == SkFont::Edging::kSubpixelAntiAlias,
-            has_some_antialiasing(runFont));
+void Slug::processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                  const SkFont& runFont,
+                                  SkScalar strikeToSourceScale) {
+    fSubRuns.append(make_drawable_sub_run<DrawableSubRunSlug>(
+            accepted, has_some_antialiasing(runFont), strikeToSourceScale, &fAlloc));
 }
 
-void SDFTSubRunSlug::draw(const GrClip* clip,
-                      const SkMatrixProvider& viewMatrix,
-                      SkPoint drawOrigin,
-                      const SkPaint& paint,
-                      skgpu::v1::SurfaceDrawContext* sdc) const {
-    auto[drawingClip, op] = this->makeAtlasTextOp(
-            clip, viewMatrix, drawOrigin, paint, sdc, nullptr);
-    if (op != nullptr) {
-        sdc->addDrawOp(drawingClip, std::move(op));
-    }
-}
-
-std::tuple<const GrClip*, GrOp::Owner >
-SDFTSubRunSlug::makeAtlasTextOp(const GrClip* clip,
-                                const SkMatrixProvider& viewMatrix,
-                                SkPoint drawOrigin,
-                                const SkPaint& paint,
-                                skgpu::v1::SurfaceDrawContext* sdc,
-                                GrAtlasSubRunOwner subRunOwner) const {
-    SkASSERT(this->glyphCount() != 0);
-    SkASSERT(!viewMatrix.localToDevice().hasPerspective());
-
-    const SkMatrix& drawMatrix = viewMatrix.localToDevice();
-
-    GrPaint grPaint;
-    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, fMaskFormat, &grPaint);
-
-    auto [maskType, DFGPFlags, useGammaCorrectDistanceTable] =
-    calculate_sdf_parameters(*sdc, drawMatrix, fUseLCDText, fAntiAliased);
-
-    auto geometry = AtlasTextOp::Geometry::MakeForBlob(*this,
-                                                       drawMatrix,
-                                                       drawOrigin,
-                                                       SkIRect::MakeEmpty(),
-                                                       sk_ref_sp<Slug>(fSlug),
-                                                       drawingColor,
-                                                       sdc->arenaAlloc());
-
-    GrRecordingContext* const rContext = sdc->recordingContext();
-    GrOp::Owner op = GrOp::Make<AtlasTextOp>(rContext,
-                                             maskType,
-                                             true,
-                                             this->glyphCount(),
-                                             this->deviceRect(drawMatrix, drawOrigin),
-                                             SkPaintPriv::ComputeLuminanceColor(paint),
-                                             useGammaCorrectDistanceTable,
-                                             DFGPFlags,
-                                             geometry,
-                                             std::move(grPaint));
-
-    return {clip, std::move(op)};
-}
-
-void SDFTSubRunSlug::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
-    fGlyphs.packedGlyphIDToGrGlyph(cache);
-}
-
-std::tuple<bool, int> SDFTSubRunSlug::regenerateAtlas(
-        int begin, int end, GrMeshDrawTarget *target) const {
-
-    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, SK_DistanceFieldInset, target);
-}
-
-size_t SDFTSubRunSlug::vertexStride(const SkMatrix& drawMatrix) const {
-    return sizeof(Mask2DVertex);
-}
-
-void SDFTSubRunSlug::fillVertexData(void* vertexDst, int offset, int count,
-                                    GrColor color,
-                                    const SkMatrix& drawMatrix, SkPoint drawOrigin,
-                                    SkIRect clip) const {
-    using Quad = Mask2DVertex[4];
-
-    const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
-
-    SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-    fill_transformed_vertices_2D(
-            SkMakeZip((Quad*)vertexDst,
-                      fGlyphs.glyphs().subspan(offset, count),
-                      fVertexData.subspan(offset, count)),
-            SK_DistanceFieldInset,
-            fStrikeToSourceScale,
-            color,
-            positionMatrix);
-}
-
-int SDFTSubRunSlug::glyphCount() const {
-    return SkCount(fVertexData);
-}
-
-SkRect SDFTSubRunSlug::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const {
-    SkRect outBounds = fVertexBounds;
-    outBounds.offset(drawOrigin);
-    return drawMatrix.mapRect(outBounds);
-}
-void Slug::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+void Slug::processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                                    sk_sp<SkStrike>&& strike,
                                    SkScalar strikeToSourceScale,
                                    const SkFont& runFont,
-                                   SkScalar minScale,
-                                   SkScalar maxScale) {
-
-    fSubRuns.append(SDFTSubRunSlug::Make(
-            this, drawables, runFont, std::move(strike), strikeToSourceScale, &fAlloc));
-}
-
-class TransformedMaskSubRunSlug final : public SlugAtlasSubRun {
-public:
-    struct VertexData {
-        const SkPoint pos;
-        // The rectangle of the glyphs in strike space. But, for kDirectMask this also implies a
-        // device space rect.
-        GrIRect16 rect;
-    };
-
-    TransformedMaskSubRunSlug(Slug* slug,
-                              GrMaskFormat format,
-                              SkScalar strikeToSourceScale,
-                              const SkRect& bounds,
-                              SkSpan<const VertexData> vertexData,
-                              GlyphVector&& glyphs);
-
-    static SlugSubRunOwner Make(Slug* slug,
-                                const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                sk_sp<SkStrike>&& strike,
-                                SkScalar strikeToSourceScale,
-                                GrMaskFormat format,
-                                GrSubRunAllocator* alloc);
-
-    void draw(const GrClip*,
-              const SkMatrixProvider& viewMatrix,
-              SkPoint drawOrigin,
-              const SkPaint&,
-              skgpu::v1::SurfaceDrawContext*) const override;
-
-    std::tuple<const GrClip*, GrOp::Owner>
-    makeAtlasTextOp(const GrClip* clip,
-                    const SkMatrixProvider& viewMatrix,
-                    SkPoint drawOrigin,
-                    const SkPaint& paint,
-                    skgpu::v1::SurfaceDrawContext* sdc,
-                    GrAtlasSubRunOwner subRunOwner) const override;
-
-    void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) override;
-
-    std::tuple<bool, int> regenerateAtlas(int begin, int end, GrMeshDrawTarget*) const override;
-
-    void fillVertexData(void* vertexDst, int offset, int count,
-                        GrColor color,
-                        const SkMatrix& drawMatrix, SkPoint drawOrigin,
-                        SkIRect clip) const override;
-
-    size_t vertexStride(const SkMatrix& drawMatrix) const override;
-    int glyphCount() const override;
-
-private:
-    Slug* const fSlug;
-    // The rectangle that surrounds all the glyph bounding boxes in device space.
-    SkRect deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const;
-
-    const GrMaskFormat fMaskFormat;
-
-    // The scale factor between the strike size, and the source size.
-    const SkScalar fStrikeToSourceScale;
-
-    // The bounds in source space. The bounds are the joined rectangles of all the glyphs.
-    const SkRect fVertexBounds;
-    const SkSpan<const VertexData> fVertexData;
-
-    // The regenerateAtlas method mutates fGlyphs. It should be called from onPrepare which must
-    // be single threaded.
-    mutable GlyphVector fGlyphs;
-};
-
-TransformedMaskSubRunSlug::TransformedMaskSubRunSlug(
-        Slug* slug,
-        GrMaskFormat format,
-        SkScalar strikeToSourceScale,
-        const SkRect& bounds,
-        SkSpan<const VertexData> vertexData,
-        GlyphVector&& glyphs)
-            : fSlug{slug}
-            , fMaskFormat{format}
-            , fStrikeToSourceScale{strikeToSourceScale}
-            , fVertexBounds{bounds}
-            , fVertexData{vertexData}
-            , fGlyphs{std::move(glyphs)} { }
-
-SlugSubRunOwner TransformedMaskSubRunSlug::Make(Slug* slug,
-                                                const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                                                sk_sp<SkStrike>&& strike,
-                                                SkScalar strikeToSourceScale,
-                                                GrMaskFormat format,
-                                                GrSubRunAllocator* alloc) {
-    SkRect bounds = SkRectPriv::MakeLargestInverted();
-
-    SkSpan<VertexData> vertexData = alloc->makePODArray<VertexData>(
-            drawables,
-            [&](auto e) {
-                auto [variant, pos] = e;
-                SkGlyph* skGlyph = variant;
-                int16_t l = skGlyph->left(),
-                        t = skGlyph->top(),
-                        r = l + skGlyph->width(),
-                        b = t + skGlyph->height();
-                SkPoint lt = SkPoint::Make(l, t) * strikeToSourceScale + pos,
-                        rb = SkPoint::Make(r, b) * strikeToSourceScale + pos;
-
-                bounds.joinPossiblyEmptyRect(SkRect::MakeLTRB(lt.x(), lt.y(), rb.x(), rb.y()));
-                return VertexData{pos, {l, t, r, b}};
-            });
-
-    return alloc->makeUnique<TransformedMaskSubRunSlug>(
-            slug, format, strikeToSourceScale, bounds, vertexData,
-            GlyphVector::Make(std::move(strike), drawables.get<0>(), alloc));
-}
-
-void TransformedMaskSubRunSlug::draw(const GrClip* clip,
-                                     const SkMatrixProvider& viewMatrix,
-                                     SkPoint drawOrigin,
-                                     const SkPaint& paint,
-                                     skgpu::v1::SurfaceDrawContext* sdc) const {
-    auto[drawingClip, op] = this->makeAtlasTextOp(
-            clip, viewMatrix, drawOrigin, paint, sdc, nullptr);
-    if (op != nullptr) {
-        sdc->addDrawOp(drawingClip, std::move(op));
-    }
-}
-
-std::tuple<const GrClip*, GrOp::Owner>
-TransformedMaskSubRunSlug::makeAtlasTextOp(const GrClip* clip,
-                                           const SkMatrixProvider& viewMatrix,
-                                           SkPoint drawOrigin,
-                                           const SkPaint& paint,
-                                           skgpu::v1::SurfaceDrawContext* sdc,
-                                           GrAtlasSubRunOwner) const {
-    SkASSERT(this->glyphCount() != 0);
-
-    const SkMatrix& drawMatrix = viewMatrix.localToDevice();
-
-    GrPaint grPaint;
-    SkPMColor4f drawingColor = calculate_colors(sdc, paint, viewMatrix, fMaskFormat, &grPaint);
-
-    auto geometry = AtlasTextOp::Geometry::MakeForBlob(*this,
-                                                       drawMatrix,
-                                                       drawOrigin,
-                                                       SkIRect::MakeEmpty(),
-                                                       sk_ref_sp<Slug>(fSlug),
-                                                       drawingColor,
-                                                       sdc->arenaAlloc());
-
-    GrRecordingContext* const rContext = sdc->recordingContext();
-    GrOp::Owner op = GrOp::Make<AtlasTextOp>(rContext,
-                                             op_mask_type(fMaskFormat),
-                                             true,
-                                             this->glyphCount(),
-                                             this->deviceRect(drawMatrix, drawOrigin),
-                                             geometry,
-                                             std::move(grPaint));
-    return {clip, std::move(op)};
-}
-
-void TransformedMaskSubRunSlug::testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache *cache) {
-    fGlyphs.packedGlyphIDToGrGlyph(cache);
+                                   const GrSDFTMatrixRange& matrixRange) {
+    fSubRuns.append(SDFTSubRun::Make(
+        this, accepted, runFont, std::move(strike), strikeToSourceScale, matrixRange, &fAlloc));
 }
 
-std::tuple<bool, int> TransformedMaskSubRunSlug::regenerateAtlas(int begin, int end,
-                                                             GrMeshDrawTarget* target) const {
-    return fGlyphs.regenerateAtlas(begin, end, fMaskFormat, 1, target, true);
-}
-
-void TransformedMaskSubRunSlug::fillVertexData(void* vertexDst, int offset, int count,
-                                               GrColor color,
-                                               const SkMatrix& drawMatrix, SkPoint drawOrigin,
-                                               SkIRect clip) const {
-    constexpr SkScalar kDstPadding = 0.f;
-
-    const SkMatrix positionMatrix = position_matrix(drawMatrix, drawOrigin);
-
-    auto quadData = [&](auto dst) {
-        return SkMakeZip(dst,
-                         fGlyphs.glyphs().subspan(offset, count),
-                         fVertexData.subspan(offset, count));
-    };
+void Slug::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                              sk_sp<SkStrike>&& strike,
+                              SkScalar strikeToSourceScale) {
 
-    if (!positionMatrix.hasPerspective()) {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask2DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_2D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        }
-    } else {
-        if (fMaskFormat == GrMaskFormat::kARGB_GrMaskFormat) {
-            using Quad = ARGB3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
-        } else {
-            using Quad = Mask3DVertex[4];
-            SkASSERT(sizeof(Quad) == this->vertexStride(positionMatrix) * kVerticesPerGlyph);
-            fill_transformed_vertices_3D(
-                    quadData((Quad*) vertexDst),
-                    kDstPadding,
-                    fStrikeToSourceScale,
-                    color,
-                    positionMatrix);
+    auto addGlyphsWithSameFormat = [&] (const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                        GrMaskFormat format,
+                                        sk_sp<SkStrike>&& runStrike) {
+        GrSubRunOwner subRun = TransformedMaskSubRun::Make(
+                this, accepted, std::move(runStrike), strikeToSourceScale, format, &fAlloc);
+        if (subRun != nullptr) {
+            fSubRuns.append(std::move(subRun));
         }
-    }
-}
-
-size_t TransformedMaskSubRunSlug::vertexStride(const SkMatrix& drawMatrix) const {
-    switch (fMaskFormat) {
-        case kA8_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(Mask3DVertex) : sizeof(Mask2DVertex);
-        case kARGB_GrMaskFormat:
-            return drawMatrix.hasPerspective() ? sizeof(ARGB3DVertex) : sizeof(ARGB2DVertex);
-        default:
-            SkASSERT(!drawMatrix.hasPerspective());
-            return sizeof(Mask2DVertex);
-    }
-    SkUNREACHABLE;
-}
-
-int TransformedMaskSubRunSlug::glyphCount() const {
-    return SkCount(fVertexData);
-}
-
-SkRect TransformedMaskSubRunSlug::deviceRect(const SkMatrix& drawMatrix, SkPoint drawOrigin) const {
-    SkRect outBounds = fVertexBounds;
-    outBounds.offset(drawOrigin);
-    return drawMatrix.mapRect(outBounds);
-}
+    };
 
-void Slug::processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
-                              sk_sp<SkStrike>&& strike,
-                              SkScalar strikeToSourceScale) {
-    this->addMultiMaskFormat(
-            TransformedMaskSubRunSlug::Make, drawables, std::move(strike), strikeToSourceScale);
+    add_multi_mask_format(addGlyphsWithSameFormat, accepted, std::move(strike));
 }
 }  // namespace
 
-namespace skgpu {
-namespace v1 {
+namespace skgpu::v1 {
 sk_sp<GrSlug>
-Device::convertGlyphRunListToSlug(const SkGlyphRunList& glyphRunList, const SkPaint& paint) const {
+Device::convertGlyphRunListToSlug(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
     return fSurfaceDrawContext->convertGlyphRunListToSlug(
             this->asMatrixProvider(), glyphRunList, paint);
 }
 
-void Device::drawSlug(GrSlug* slug) {
-    fSurfaceDrawContext->drawSlug(this->clip(), this->asMatrixProvider(), slug);
+void Device::drawSlug(SkCanvas* canvas, GrSlug* slug) {
+    fSurfaceDrawContext->drawSlug(canvas, this->clip(), this->asMatrixProvider(), slug);
 }
 
 sk_sp<GrSlug>
 SurfaceDrawContext::convertGlyphRunListToSlug(const SkMatrixProvider& viewMatrix,
                                               const SkGlyphRunList& glyphRunList,
                                               const SkPaint& paint) {
+    SkASSERT(fContext->priv().options().fSupportBilerpFromGlyphAtlas);
+
     GrSDFTControl control =
             this->recordingContext()->priv().getSDFTControl(
                     this->surfaceProps().isUseDeviceIndependentFonts());
@@ -3719,15 +3350,58 @@ SurfaceDrawContext::convertGlyphRunListToSlug(const SkMatrixProvider& viewMatrix
     return Slug::Make(viewMatrix, glyphRunList, paint, control, &fGlyphPainter);
 }
 
-void SurfaceDrawContext::drawSlug(const GrClip* clip,
+void SurfaceDrawContext::drawSlug(SkCanvas* canvas,
+                                  const GrClip* clip,
                                   const SkMatrixProvider& viewMatrix,
                                   GrSlug* slugPtr) {
     Slug* slug = static_cast<Slug*>(slugPtr);
 
-    slug->surfaceDraw(clip, viewMatrix, this);
+    slug->surfaceDraw(canvas, clip, viewMatrix, this);
 }
-}  // namespace v1
-}  // namespace skgpu
-
 
+sk_sp<GrSlug> MakeSlug(const SkMatrixProvider& drawMatrix,
+                       const SkGlyphRunList& glyphRunList,
+                       const SkPaint& paint,
+                       const GrSDFTControl& control,
+                       SkGlyphRunListPainter* painter) {
+    return Slug::Make(drawMatrix, glyphRunList, paint, control, painter);
+}
+}  // namespace skgpu::v1
+
+// -- GrSubRun -------------------------------------------------------------------------------------
+void GrSubRun::flatten(SkWriteBuffer& buffer) const {
+    buffer.writeInt(this->subRunType());
+    this->doFlatten(buffer);
+}
+
+GrSubRunOwner GrSubRun::MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                       SkReadBuffer& buffer,
+                                       GrSubRunAllocator* alloc,
+                                       const SkStrikeClient* client) {
+    using Maker = GrSubRunOwner (*)(const GrTextReferenceFrame*,
+                                    SkReadBuffer&,
+                                    GrSubRunAllocator*,
+                                    const SkStrikeClient*);
+
+    /* The makers will be populated in the next CL. */
+    static Maker makers[kSubRunTypeCount] = {
+            nullptr,                                             // 0 index is bad.
+            DirectMaskSubRunSlug::MakeFromBuffer,
+            SDFTSubRun::MakeFromBuffer,
+            TransformedMaskSubRun::MakeFromBuffer,
+            PathSubRun::MakeFromBuffer,
+            DrawableSubRunSlug::MakeFromBuffer,
+    };
+    int subRunTypeInt = buffer.readInt();
+    SkASSERT(kBad < subRunTypeInt && subRunTypeInt < kSubRunTypeCount);
+    if (!buffer.validate(kBad < subRunTypeInt && subRunTypeInt < kSubRunTypeCount)) {
+        return nullptr;
+    }
+    auto maker = makers[subRunTypeInt];
+    if (!buffer.validate(maker != nullptr)) { return nullptr; }
+    return maker(referenceFrame, buffer, alloc, client);
+}
 
+sk_sp<GrSlug> SkMakeSlugFromBuffer(SkReadBuffer& buffer, const SkStrikeClient* client) {
+    return Slug::MakeFromBuffer(buffer, client);
+}
diff --git a/third_party/skia/src/gpu/text/GrTextBlob.h b/third_party/skia/src/gpu/text/GrTextBlob.h
index 1d34d5452392a..371c908f8fd1d 100644
--- a/third_party/skia/src/gpu/text/GrTextBlob.h
+++ b/third_party/skia/src/gpu/text/GrTextBlob.h
@@ -13,6 +13,7 @@
 
 #include "include/core/SkPoint3.h"
 #include "include/core/SkRefCnt.h"
+#include "include/private/chromium/GrSlug.h"
 #include "src/core/SkGlyphRunPainter.h"
 #include "src/core/SkIPoint16.h"
 #include "src/core/SkMaskFilterBase.h"
@@ -33,41 +34,31 @@ class GrStrikeCache;
 class GrSubRun;
 
 class SkMatrixProvider;
+class SkStrikeClient;
 class SkSurfaceProps;
 class SkTextBlob;
 class SkTextBlobRunIterator;
 
-namespace skgpu { namespace v1 { class SurfaceDrawContext; }}
-
-// -- SubRun Discussion ----------------------------------------------------------------------------
-// There are two distinct types of SubRun, those that the GrTextBlob hold in the GrTextBlobCache,
-// and those that are not cached at all. The type of SubRun that is not cached has NoCache
-// appended to their name such as DirectMaskSubRunNoCache. The type of SubRun that is cached
-// provides two interfaces the GrSubRun interface which used by the text blob caching system, and
-// the GrAtlasSubRun which allows drawing by the AtlasTextOp system. The *NoCache SubRuns only
-// provide the GrAtlasSubRun interface.
+namespace skgpu::v1 { class SurfaceDrawContext; }
 
 // -- GrAtlasSubRun --------------------------------------------------------------------------------
 // GrAtlasSubRun is the API that AtlasTextOp uses to generate vertex data for drawing.
 //     There are three different ways GrAtlasSubRun is specialized.
-//      * DirectMaskSubRun - this is by far the most common type of SubRun. The mask pixels are
+//      * DirectMaskSubRun* - this is by far the most common type of SubRun. The mask pixels are
 //        in 1:1 correspondence with the pixels on the device. The destination rectangles in this
 //        SubRun are in device space. This SubRun handles color glyphs.
-//      * TransformedMaskSubRun - handles glyph where the image in the atlas needs to be
+//      * TransformedMaskSubRun* - handles glyph where the image in the atlas needs to be
 //        transformed to the screen. It is usually used for large color glyph which can't be
 //        drawn with paths or scaled distance fields, but will be used to draw bitmap glyphs to
 //        the screen, if the matrix does not map 1:1 to the screen. The destination rectangles
 //        are in source space.
-//      * SDFTSubRun - scaled distance field text handles largish single color glyphs that still
+//      * SDFTSubRun* - scaled distance field text handles largish single color glyphs that still
 //        can fit in the atlas; the sizes between direct SubRun, and path SubRun. The destination
 //        rectangles are in source space.
-
 class GrAtlasSubRun;
 using GrAtlasSubRunOwner = std::unique_ptr<GrAtlasSubRun, GrSubRunAllocator::Destroyer>;
 class GrAtlasSubRun  {
 public:
-    inline static constexpr int kVerticesPerGlyph = 4;
-
     virtual ~GrAtlasSubRun() = default;
 
     virtual size_t vertexStride(const SkMatrix& drawMatrix) const = 0;
@@ -89,7 +80,7 @@ class GrAtlasSubRun  {
             SkPoint drawOrigin,
             SkIRect clip) const = 0;
 
-    virtual void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache* cache) = 0;
+    virtual void testingOnly_packedGlyphIDToGrGlyph(GrStrikeCache* cache) const = 0;
 
     // This call is not thread safe. It should only be called from GrDrawOp::onPrepare which
     // is single threaded.
@@ -97,42 +88,47 @@ class GrAtlasSubRun  {
             int begin, int end, GrMeshDrawTarget* target) const = 0;
 };
 
-class GrDrawableSubRun {
+// -- GrSubRun -------------------------------------------------------------------------------------
+// GrSubRun defines the most basic functionality of a SubRun; the ability to draw, and the
+// ability to be in a list.
+class GrSubRun;
+using GrSubRunOwner = std::unique_ptr<GrSubRun, GrSubRunAllocator::Destroyer>;
+class GrBlobSubRun;
+class GrSubRun {
 public:
-    virtual ~GrDrawableSubRun() = default;
-
-    // Produce GPU ops for this subRun.
-    virtual void draw(const GrClip*,
+    virtual ~GrSubRun();
+    // Produce GPU ops for this subRun or just draw them.
+    virtual void draw(SkCanvas*,
+                      const GrClip*,
                       const SkMatrixProvider& viewMatrix,
                       SkPoint drawOrigin,
                       const SkPaint&,
                       skgpu::v1::SurfaceDrawContext*) const = 0;
-};
 
-// -- GrSubRun -------------------------------------------------------------------------------------
-// GrSubRun provides an interface used by GrTextBlob to manage the caching system.
-// There are several types of SubRun, which can be broken into five classes:
-//   * PathSubRun - handle very large single color glyphs using paths to render the glyph.
-//   * DirectMaskSubRun - handle the majority of the glyphs where the cache entry's pixels are in
-//     1:1 correspondence to the device pixels.
-//   * TransformedMaskSubRun - handle large bitmap/argb glyphs that need to be scaled to the screen.
-//   * SDFTSubRun - use signed distance fields to draw largish glyphs to the screen.
-class GrSubRun;
-using GrSubRunOwner = std::unique_ptr<GrSubRun, GrSubRunAllocator::Destroyer>;
-class GrSubRun : public GrDrawableSubRun {
-public:
-    // Given an already cached subRun, can this subRun handle this combination paint, matrix, and
-    // position.
-    virtual bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const = 0;
+    virtual const GrBlobSubRun* blobCast() const;
+    void flatten(SkWriteBuffer& buffer) const;
+    static GrSubRunOwner MakeFromBuffer(const GrTextReferenceFrame* referenceFrame,
+                                        SkReadBuffer& buffer,
+                                        GrSubRunAllocator* alloc,
+                                        const SkStrikeClient* client);
+
+    // Size hint for unflattening this run. If this is accurate, it will help with the allocation
+    // of the slug. If it's off then there may be more allocations needed to unflatten.
+    virtual int unflattenSize() const = 0;
 
-    // Return the underlying atlas SubRun if it exists. Otherwise, return nullptr.
-    // * Don't use this API. It is only to support testing.
-    virtual GrAtlasSubRun* testingOnly_atlasSubRun() = 0;
+protected:
+    enum SubRunType : int;
+    virtual SubRunType subRunType() const = 0;
+    virtual void doFlatten(SkWriteBuffer& buffer) const = 0;
 
+private:
+    friend class GrSubRunList;
     GrSubRunOwner fNext;
 };
 
-struct GrSubRunList {
+// -- GrSubRunList ---------------------------------------------------------------------------------
+class GrSubRunList {
+public:
     class Iterator {
     public:
         using value_type = GrSubRun;
@@ -163,10 +159,12 @@ struct GrSubRunList {
     Iterator end() const { return Iterator{nullptr}; }
     GrSubRun& front() const {return *fHead; }
 
+private:
     GrSubRunOwner fHead{nullptr};
     GrSubRunOwner* fTail{&fHead};
 };
 
+// -- GrTextBlob -----------------------------------------------------------------------------------
 // A GrTextBlob contains a fully processed SkTextBlob, suitable for nearly immediate drawing
 // on the GPU.  These are initially created with valid positions and colors, but with invalid
 // texture coordinates.
@@ -183,9 +181,8 @@ struct GrSubRunList {
 //                    with.
 //
 //
-class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
+class GrTextBlob final : public GrTextReferenceFrame, public SkGlyphRunPainterInterface {
 public:
-
     // Key is not used as part of a hash map, so the hash is never taken. It's only used in a
     // list search using operator =().
     struct Key {
@@ -208,7 +205,7 @@ class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
         uint32_t fScalerContextFlags;
         SkMatrix fPositionMatrix;
         // Below here fields are of size 1 byte.
-        uint8_t fSetOfDrawingTypes;
+        bool fHasSomeDirectSubRuns;
         bool fHasBlur;
         SkPaint::Style fStyle;
         SkPaint::Join fJoin;
@@ -222,6 +219,7 @@ class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
     static sk_sp<GrTextBlob> Make(const SkGlyphRunList& glyphRunList,
                                   const SkPaint& paint,
                                   const SkMatrix& positionMatrix,
+                                  bool supportBilerpAtlas,
                                   const GrSDFTControl& control,
                                   SkGlyphRunListPainter* painter);
 
@@ -237,39 +235,43 @@ class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
 
     void addKey(const Key& key);
     bool hasPerspective() const;
-    const SkMatrix& initialPositionMatrix() const { return fInitialPositionMatrix; }
+    const SkMatrix& initialPositionMatrix() const override { return fInitialPositionMatrix; }
+    bool supportBilerpAtlas() const { return fSupportBilerpAtlas; }
 
-    std::tuple<SkScalar, SkScalar> scaleBounds() const { return {fMaxMinScale, fMinMaxScale}; }
     bool canReuse(const SkPaint& paint, const SkMatrix& positionMatrix) const;
 
     const Key& key() const;
     size_t size() const;
 
-    const GrSubRunList& subRunList() const { return fSubRunList; }
+    void draw(SkCanvas*,
+              const GrClip* clip,
+              const SkMatrixProvider& viewMatrix,
+              SkPoint drawOrigin,
+              const SkPaint& paint,
+              skgpu::v1::SurfaceDrawContext* sdc);
+    const GrAtlasSubRun* testingOnlyFirstSubRun() const;
 
 private:
-    GrTextBlob(int allocSize, const SkMatrix& positionMatrix, SkColor initialLuminance);
-
-    template<typename AddSingleMaskFormat>
-    void addMultiMaskFormat(
-            AddSingleMaskFormat addSingle,
-            const SkZip<SkGlyphVariant, SkPoint>& drawables,
-            sk_sp<SkStrike>&& strike,
-            SkScalar strikeToSourceScale);
+    GrTextBlob(int allocSize,
+               bool supportBilerpAtlas,
+               const SkMatrix& positionMatrix,
+               SkColor initialLuminance);
 
     // Methods to satisfy SkGlyphRunPainterInterface
-    void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             sk_sp<SkStrike>&& strike) override;
-    void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             const SkFont& runFont,
                             SkScalar strikeToSourceScale) override;
-    void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                const SkFont& runFont,
+                                SkScalar strikeToSourceScale) override;
+    void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                            sk_sp<SkStrike>&& strike,
                            SkScalar strikeToSourceScale,
                            const SkFont& runFont,
-                           SkScalar minScale,
-                           SkScalar maxScale) override;
-    void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+                           const GrSDFTMatrixRange& matrixRange) override;
+    void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             sk_sp<SkStrike>&& strike,
                             SkScalar strikeToSourceScale) override;
 
@@ -283,6 +285,9 @@ class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
     // Overall size of this struct plus vertices and glyphs at the end.
     const int fSize;
 
+    // Support using bilerp for directly mapped sub runs.
+    const bool fSupportBilerpAtlas;
+
     // The initial view matrix combined with the initial origin. Used to determine if a cached
     // subRun can be used in this draw situation.
     const SkMatrix fInitialPositionMatrix;
@@ -291,42 +296,41 @@ class GrTextBlob final : public SkRefCnt, public SkGlyphRunPainterInterface {
 
     Key fKey;
 
-    // We can reuse distance field text, but only if the new view matrix would not result in
-    // a mip change.  Because there can be multiple runs in a blob, we track the overall
-    // maximum minimum scale, and minimum maximum scale, we can support before we need to regen
-    SkScalar fMaxMinScale{-SK_ScalarMax};
-    SkScalar fMinMaxScale{SK_ScalarMax};
-
     bool fSomeGlyphsExcluded{false};
 };
 
 class GrSubRunNoCachePainter : public SkGlyphRunPainterInterface {
 public:
-    GrSubRunNoCachePainter(skgpu::v1::SurfaceDrawContext*,
+    GrSubRunNoCachePainter(SkCanvas*,
+                           skgpu::v1::SurfaceDrawContext*,
                            GrSubRunAllocator*,
                            const GrClip*,
                            const SkMatrixProvider& viewMatrix,
                            const SkGlyphRunList&,
                            const SkPaint&);
-    void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processDeviceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             sk_sp<SkStrike>&& strike) override;
-    void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processSourceMasks(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             sk_sp<SkStrike>&& strike,
                             SkScalar strikeToSourceScale) override;
-    void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processSourcePaths(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                             const SkFont& runFont,
                             SkScalar strikeToSourceScale) override;
-    void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& drawables,
+    void processSourceDrawables(const SkZip<SkGlyphVariant, SkPoint>& accepted,
+                                const SkFont& runFont,
+                                SkScalar strikeToSourceScale) override;
+    void processSourceSDFT(const SkZip<SkGlyphVariant, SkPoint>& accepted,
                            sk_sp<SkStrike>&& strike,
                            SkScalar strikeToSourceScale,
                            const SkFont& runFont,
-                           SkScalar minScale, SkScalar maxScale) override;
+                           const GrSDFTMatrixRange& matrixRange) override;
 
 private:
 
     // Draw passes ownership of the sub run to the op.
     void draw(GrAtlasSubRunOwner subRun);
 
+    SkCanvas* fCanvas;
     skgpu::v1::SurfaceDrawContext* const fSDC;
     GrSubRunAllocator* const fAlloc;
     const GrClip* const fClip;
@@ -335,4 +339,11 @@ class GrSubRunNoCachePainter : public SkGlyphRunPainterInterface {
     const SkPaint& fPaint;
 };
 
+namespace skgpu::v1 {
+sk_sp<GrSlug> MakeSlug(const SkMatrixProvider& drawMatrix,
+                       const SkGlyphRunList& glyphRunList,
+                       const SkPaint& paint,
+                       const GrSDFTControl& control,
+                       SkGlyphRunListPainter* painter);
+}  // namespace skgpu::v1
 #endif  // GrTextBlob_DEFINED
diff --git a/third_party/skia/src/gpu/text/GrTextBlobCache.cpp b/third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.cpp
similarity index 53%
rename from third_party/skia/src/gpu/text/GrTextBlobCache.cpp
rename to third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.cpp
index e7cca260b9c29..eae40014151e7 100644
--- a/third_party/skia/src/gpu/text/GrTextBlobCache.cpp
+++ b/third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.cpp
@@ -5,22 +5,71 @@
  * found in the LICENSE file.
  */
 
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 
-DECLARE_SKMESSAGEBUS_MESSAGE(GrTextBlobCache::PurgeBlobMessage, uint32_t, true)
+#include "src/gpu/v1/SurfaceDrawContext_v1.h"
+
+DECLARE_SKMESSAGEBUS_MESSAGE(GrTextBlobRedrawCoordinator::PurgeBlobMessage, uint32_t, true)
 
 // This function is captured by the above macro using implementations from SkMessageBus.h
 static inline bool SkShouldPostMessageToBus(
-        const GrTextBlobCache::PurgeBlobMessage& msg, uint32_t msgBusUniqueID) {
+        const GrTextBlobRedrawCoordinator::PurgeBlobMessage& msg, uint32_t msgBusUniqueID) {
     return msg.fContextID == msgBusUniqueID;
 }
 
-GrTextBlobCache::GrTextBlobCache(uint32_t messageBusID)
+GrTextBlobRedrawCoordinator::GrTextBlobRedrawCoordinator(uint32_t messageBusID)
         : fSizeBudget(kDefaultBudget)
         , fMessageBusID(messageBusID)
         , fPurgeBlobInbox(messageBusID) { }
 
-sk_sp<GrTextBlob> GrTextBlobCache::addOrReturnExisting(
+void GrTextBlobRedrawCoordinator::drawGlyphRunList(SkCanvas* canvas,
+                                                   const GrClip* clip,
+                                                   const SkMatrixProvider& viewMatrix,
+                                                   const SkGlyphRunList& glyphRunList,
+                                                   const SkPaint& paint,
+                                                   skgpu::v1::SurfaceDrawContext* sdc) {
+
+    SkMatrix positionMatrix{viewMatrix.localToDevice()};
+    positionMatrix.preTranslate(glyphRunList.origin().x(), glyphRunList.origin().y());
+
+    GrSDFTControl control =
+            sdc->recordingContext()->priv().getSDFTControl(
+                    sdc->surfaceProps().isUseDeviceIndependentFonts());
+
+    auto [canCache, key] = GrTextBlob::Key::Make(glyphRunList,
+                                                 paint,
+                                                 sdc->surfaceProps(),
+                                                 sdc->colorInfo(),
+                                                 positionMatrix,
+                                                 control);
+    sk_sp<GrTextBlob> blob;
+    if (canCache) {
+        blob = this->find(key);
+    }
+
+    if (blob == nullptr || !blob->canReuse(paint, positionMatrix)) {
+        if (blob != nullptr) {
+            // We have to remake the blob because changes may invalidate our masks.
+            this->remove(blob.get());
+        }
+
+        const bool padAtlas =
+                sdc->recordingContext()->priv().options().fSupportBilerpFromGlyphAtlas;
+        blob = GrTextBlob::Make(
+                glyphRunList, paint, positionMatrix, padAtlas, control, sdc->glyphRunPainter());
+
+        if (canCache) {
+            blob->addKey(key);
+            // The blob may already have been created on a different thread. Use the first one
+            // that was there.
+            blob = this->addOrReturnExisting(glyphRunList, blob);
+        }
+    }
+
+    blob->draw(canvas, clip, viewMatrix, glyphRunList.origin(), paint, sdc);
+}
+
+sk_sp<GrTextBlob> GrTextBlobRedrawCoordinator::addOrReturnExisting(
         const SkGlyphRunList& glyphRunList, sk_sp<GrTextBlob> blob) {
     SkAutoSpinlock lock{fSpinLock};
     blob = this->internalAdd(std::move(blob));
@@ -28,7 +77,7 @@ sk_sp<GrTextBlob> GrTextBlobCache::addOrReturnExisting(
     return blob;
 }
 
-sk_sp<GrTextBlob> GrTextBlobCache::find(const GrTextBlob::Key& key) {
+sk_sp<GrTextBlob> GrTextBlobRedrawCoordinator::find(const GrTextBlob::Key& key) {
     SkAutoSpinlock lock{fSpinLock};
     const BlobIDCacheEntry* idEntry = fBlobIDCache.find(key.fUniqueID);
     if (idEntry == nullptr) {
@@ -44,12 +93,12 @@ sk_sp<GrTextBlob> GrTextBlobCache::find(const GrTextBlob::Key& key) {
     return blob;
 }
 
-void GrTextBlobCache::remove(GrTextBlob* blob) {
+void GrTextBlobRedrawCoordinator::remove(GrTextBlob* blob) {
     SkAutoSpinlock lock{fSpinLock};
     this->internalRemove(blob);
 }
 
-void GrTextBlobCache::internalRemove(GrTextBlob* blob) {
+void GrTextBlobRedrawCoordinator::internalRemove(GrTextBlob* blob) {
     auto  id      = blob->key().fUniqueID;
     auto* idEntry = fBlobIDCache.find(id);
 
@@ -66,24 +115,24 @@ void GrTextBlobCache::internalRemove(GrTextBlob* blob) {
     }
 }
 
-void GrTextBlobCache::freeAll() {
+void GrTextBlobRedrawCoordinator::freeAll() {
     SkAutoSpinlock lock{fSpinLock};
     fBlobIDCache.reset();
     fBlobList.reset();
     fCurrentSize = 0;
 }
 
-void GrTextBlobCache::PostPurgeBlobMessage(uint32_t blobID, uint32_t cacheID) {
+void GrTextBlobRedrawCoordinator::PostPurgeBlobMessage(uint32_t blobID, uint32_t cacheID) {
     SkASSERT(blobID != SK_InvalidGenID);
     SkMessageBus<PurgeBlobMessage, uint32_t>::Post(PurgeBlobMessage(blobID, cacheID));
 }
 
-void GrTextBlobCache::purgeStaleBlobs() {
+void GrTextBlobRedrawCoordinator::purgeStaleBlobs() {
     SkAutoSpinlock lock{fSpinLock};
     this->internalPurgeStaleBlobs();
 }
 
-void GrTextBlobCache::internalPurgeStaleBlobs() {
+void GrTextBlobRedrawCoordinator::internalPurgeStaleBlobs() {
     SkTArray<PurgeBlobMessage> msgs;
     fPurgeBlobInbox.poll(&msgs);
 
@@ -105,17 +154,17 @@ void GrTextBlobCache::internalPurgeStaleBlobs() {
     }
 }
 
-size_t GrTextBlobCache::usedBytes() const {
+size_t GrTextBlobRedrawCoordinator::usedBytes() const {
     SkAutoSpinlock lock{fSpinLock};
     return fCurrentSize;
 }
 
-bool GrTextBlobCache::isOverBudget() const {
+bool GrTextBlobRedrawCoordinator::isOverBudget() const {
     SkAutoSpinlock lock{fSpinLock};
     return fCurrentSize > fSizeBudget;
 }
 
-void GrTextBlobCache::internalCheckPurge(GrTextBlob* blob) {
+void GrTextBlobRedrawCoordinator::internalCheckPurge(GrTextBlob* blob) {
     // First, purge all stale blob IDs.
     this->internalPurgeStaleBlobs();
 
@@ -139,7 +188,7 @@ void GrTextBlobCache::internalCheckPurge(GrTextBlob* blob) {
     }
 }
 
-sk_sp<GrTextBlob> GrTextBlobCache::internalAdd(sk_sp<GrTextBlob> blob) {
+sk_sp<GrTextBlob> GrTextBlobRedrawCoordinator::internalAdd(sk_sp<GrTextBlob> blob) {
     auto  id      = blob->key().fUniqueID;
     auto* idEntry = fBlobIDCache.find(id);
     if (!idEntry) {
@@ -158,15 +207,16 @@ sk_sp<GrTextBlob> GrTextBlobCache::internalAdd(sk_sp<GrTextBlob> blob) {
     return blob;
 }
 
-GrTextBlobCache::BlobIDCacheEntry::BlobIDCacheEntry() : fID(SK_InvalidGenID) {}
+GrTextBlobRedrawCoordinator::BlobIDCacheEntry::BlobIDCacheEntry() : fID(SK_InvalidGenID) {}
 
-GrTextBlobCache::BlobIDCacheEntry::BlobIDCacheEntry(uint32_t id) : fID(id) {}
+GrTextBlobRedrawCoordinator::BlobIDCacheEntry::BlobIDCacheEntry(uint32_t id) : fID(id) {}
 
-uint32_t GrTextBlobCache::BlobIDCacheEntry::GetKey(const GrTextBlobCache::BlobIDCacheEntry& entry) {
+uint32_t GrTextBlobRedrawCoordinator::BlobIDCacheEntry::GetKey(
+        const GrTextBlobRedrawCoordinator::BlobIDCacheEntry& entry) {
     return entry.fID;
 }
 
-void GrTextBlobCache::BlobIDCacheEntry::addBlob(sk_sp<GrTextBlob> blob) {
+void GrTextBlobRedrawCoordinator::BlobIDCacheEntry::addBlob(sk_sp<GrTextBlob> blob) {
     SkASSERT(blob);
     SkASSERT(blob->key().fUniqueID == fID);
     SkASSERT(!this->find(blob->key()));
@@ -174,7 +224,7 @@ void GrTextBlobCache::BlobIDCacheEntry::addBlob(sk_sp<GrTextBlob> blob) {
     fBlobs.emplace_back(std::move(blob));
 }
 
-void GrTextBlobCache::BlobIDCacheEntry::removeBlob(GrTextBlob* blob) {
+void GrTextBlobRedrawCoordinator::BlobIDCacheEntry::removeBlob(GrTextBlob* blob) {
     SkASSERT(blob);
     SkASSERT(blob->key().fUniqueID == fID);
 
@@ -184,12 +234,13 @@ void GrTextBlobCache::BlobIDCacheEntry::removeBlob(GrTextBlob* blob) {
     fBlobs.removeShuffle(index);
 }
 
-sk_sp<GrTextBlob> GrTextBlobCache::BlobIDCacheEntry::find(const GrTextBlob::Key& key) const {
+sk_sp<GrTextBlob>
+GrTextBlobRedrawCoordinator::BlobIDCacheEntry::find(const GrTextBlob::Key& key) const {
     auto index = this->findBlobIndex(key);
     return index < 0 ? nullptr : fBlobs[index];
 }
 
-int GrTextBlobCache::BlobIDCacheEntry::findBlobIndex(const GrTextBlob::Key& key) const {
+int GrTextBlobRedrawCoordinator::BlobIDCacheEntry::findBlobIndex(const GrTextBlob::Key& key) const {
     for (int i = 0; i < fBlobs.count(); ++i) {
         if (fBlobs[i]->key() == key) {
             return i;
diff --git a/third_party/skia/src/gpu/text/GrTextBlobCache.h b/third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.h
similarity index 72%
rename from third_party/skia/src/gpu/text/GrTextBlobCache.h
rename to third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.h
index 8c7f466665229..bf6a3fedc2db1 100644
--- a/third_party/skia/src/gpu/text/GrTextBlobCache.h
+++ b/third_party/skia/src/gpu/text/GrTextBlobRedrawCoordinator.h
@@ -5,8 +5,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrTextBlobCache_DEFINED
-#define GrTextBlobCache_DEFINED
+#ifndef GrTextBlobRedrawCoordinator_DEFINED
+#define GrTextBlobRedrawCoordinator_DEFINED
 
 #include "include/core/SkRefCnt.h"
 #include "include/private/SkSpinlock.h"
@@ -18,17 +18,23 @@
 
 #include <functional>
 
-class GrTextBlobCache {
+// GrTextBlobRedrawCoordinator reuses data from previous drawing operations using multiple criteria
+// to pick the best data for the draw. In addition, it provides a central service for managing
+// resource usage through a messageBus.
+// The draw data is stored in a three-tiered system. The first tier is keyed by the SkTextBlob's
+// uniqueID. The second tier uses the GrTextBlob's key to get a general match for the draw. The
+// last tier queries each sub run using canReuse to determine if each sub run can handle the
+// drawing parameters.
+class GrTextBlobRedrawCoordinator {
 public:
-    GrTextBlobCache(uint32_t messageBusID);
+    GrTextBlobRedrawCoordinator(uint32_t messageBusID);
 
-    // If not already in the cache, then add it else, return the text blob from the cache.
-    sk_sp<GrTextBlob> addOrReturnExisting(
-            const SkGlyphRunList& glyphRunList, sk_sp<GrTextBlob> blob) SK_EXCLUDES(fSpinLock);
-
-    sk_sp<GrTextBlob> find(const GrTextBlob::Key& key) SK_EXCLUDES(fSpinLock);
-
-    void remove(GrTextBlob* blob) SK_EXCLUDES(fSpinLock);
+    void drawGlyphRunList(SkCanvas* canvas,
+                          const GrClip* clip,
+                          const SkMatrixProvider& viewMatrix,
+                          const SkGlyphRunList& glyphRunList,
+                          const SkPaint& paint,
+                          skgpu::v1::SurfaceDrawContext* sdc);
 
     void freeAll() SK_EXCLUDES(fSpinLock);
 
@@ -72,6 +78,14 @@ class GrTextBlobCache {
         SkSTArray<1, sk_sp<GrTextBlob>> fBlobs;
     };
 
+    // If not already in the cache, then add it else, return the text blob from the cache.
+    sk_sp<GrTextBlob> addOrReturnExisting(
+            const SkGlyphRunList& glyphRunList, sk_sp<GrTextBlob> blob) SK_EXCLUDES(fSpinLock);
+
+    sk_sp<GrTextBlob> find(const GrTextBlob::Key& key) SK_EXCLUDES(fSpinLock);
+
+    void remove(GrTextBlob* blob) SK_EXCLUDES(fSpinLock);
+
     void internalPurgeStaleBlobs() SK_REQUIRES(fSpinLock);
 
     sk_sp<GrTextBlob> internalAdd(sk_sp<GrTextBlob> blob) SK_REQUIRES(fSpinLock);
@@ -91,5 +105,4 @@ class GrTextBlobCache {
     const uint32_t fMessageBusID;
     SkMessageBus<PurgeBlobMessage, uint32_t>::Inbox fPurgeBlobInbox SK_GUARDED_BY(fSpinLock);
 };
-
-#endif
+#endif  // GrTextBlobRedrawCoordinator_DEFINED
diff --git a/third_party/skia/src/gpu/v1/BUILD.bazel b/third_party/skia/src/gpu/v1/BUILD.bazel
index 26b1277c23707..615edbf855695 100644
--- a/third_party/skia/src/gpu/v1/BUILD.bazel
+++ b/third_party/skia/src/gpu/v1/BUILD.bazel
@@ -8,10 +8,10 @@ generated_cc_atom(
         "//include/core:SkClipOp_hdr",
         "//include/core:SkMatrix_hdr",
         "//include/core:SkShader_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//src/core:SkTBlockList_hdr",
         "//src/gpu:GrClip_hdr",
         "//src/gpu:GrSurfaceProxyView_hdr",
+        "//src/gpu:ResourceKey_hdr",
         "//src/gpu/geometry:GrShape_hdr",
     ],
 )
@@ -98,6 +98,7 @@ generated_cc_atom(
         "//include/private/chromium:GrSlug_hdr",
         "//src/core:SkCanvasPriv_hdr",
         "//src/core:SkClipStack_hdr",
+        "//src/core:SkCustomMeshPriv_hdr",
         "//src/core:SkDraw_hdr",
         "//src/core:SkImageFilterCache_hdr",
         "//src/core:SkImageFilter_Base_hdr",
@@ -263,6 +264,7 @@ generated_cc_atom(
         "//include/utils:SkShadowUtils_hdr",
         "//src/core:SkAutoPixmapStorage_hdr",
         "//src/core:SkConvertPixels_hdr",
+        "//src/core:SkCustomMeshPriv_hdr",
         "//src/core:SkDrawProcs_hdr",
         "//src/core:SkDrawShadowInfo_hdr",
         "//src/core:SkGlyphRunPainter_hdr",
@@ -274,6 +276,7 @@ generated_cc_atom(
         "//src/gpu:GrAttachment_hdr",
         "//src/gpu:GrCaps_hdr",
         "//src/gpu:GrClip_hdr",
+        "//src/gpu:GrColorSpaceXform_hdr",
         "//src/gpu:GrColor_hdr",
         "//src/gpu:GrDataUtils_hdr",
         "//src/gpu:GrDirectContextPriv_hdr",
@@ -300,7 +303,7 @@ generated_cc_atom(
         "//src/gpu/geometry:GrStyledShape_hdr",
         "//src/gpu/ops:ClearOp_hdr",
         "//src/gpu/ops:DrawAtlasOp_hdr",
-        "//src/gpu/ops:DrawVerticesOp_hdr",
+        "//src/gpu/ops:DrawCustomMeshOp_hdr",
         "//src/gpu/ops:DrawableOp_hdr",
         "//src/gpu/ops:FillRRectOp_hdr",
         "//src/gpu/ops:FillRectOp_hdr",
@@ -313,7 +316,7 @@ generated_cc_atom(
         "//src/gpu/ops:StrokeRectOp_hdr",
         "//src/gpu/ops:TextureOp_hdr",
         "//src/gpu/text:GrSDFTControl_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
     ],
 )
 
@@ -364,6 +367,7 @@ generated_cc_atom(
         "//src/gpu:GrDstProxyView_hdr",
         "//src/gpu:GrImageContextPriv_hdr",
         "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrTextureResolveRenderTask_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
         "//src/gpu/geometry:GrRect_hdr",
         "//src/gpu/ops:ClearOp_hdr",
diff --git a/third_party/skia/src/gpu/v1/ClipStack.cpp b/third_party/skia/src/gpu/v1/ClipStack.cpp
index 8509e37a7f12b..1c6cd4fb82376 100644
--- a/third_party/skia/src/gpu/v1/ClipStack.cpp
+++ b/third_party/skia/src/gpu/v1/ClipStack.cpp
@@ -323,7 +323,8 @@ GrSurfaceProxyView render_sw_mask(GrRecordingContext* context,
         GrBackendFormat format = caps->getDefaultBackendFormat(GrColorType::kAlpha_8,
                                                                GrRenderable::kNo);
 
-        GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(format, GrColorType::kAlpha_8);
+        skgpu::Swizzle swizzle = context->priv().caps()->getReadSwizzle(format,
+                                                                        GrColorType::kAlpha_8);
         auto proxy = proxyProvider->createProxy(format, bounds.size(), GrRenderable::kNo, 1,
                                                 GrMipMapped::kNo, SkBackingFit::kApprox,
                                                 SkBudgeted::kYes, GrProtected::kNo);
@@ -742,12 +743,12 @@ ClipStack::ClipState ClipStack::RawElement::clipType() const {
 ClipStack::Mask::Mask(const SaveRecord& current, const SkIRect& drawBounds)
         : fBounds(drawBounds)
         , fGenID(current.genID()) {
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
+    static const UniqueKey::Domain kDomain = UniqueKey::GenerateDomain();
 
     // The gen ID should not be invalid, empty, or wide open, since those do not require masks
     SkASSERT(fGenID != kInvalidGenID && fGenID != kEmptyGenID && fGenID != kWideOpenGenID);
 
-    GrUniqueKey::Builder builder(&fKey, kDomain, 5, "clip_mask");
+    UniqueKey::Builder builder(&fKey, kDomain, 5, "clip_mask");
     builder[0] = fGenID;
     builder[1] = drawBounds.fLeft;
     builder[2] = drawBounds.fRight;
diff --git a/third_party/skia/src/gpu/v1/ClipStack.h b/third_party/skia/src/gpu/v1/ClipStack.h
index 94887f772cab9..abb9c1cf98d45 100644
--- a/third_party/skia/src/gpu/v1/ClipStack.h
+++ b/third_party/skia/src/gpu/v1/ClipStack.h
@@ -11,10 +11,10 @@
 #include "include/core/SkClipOp.h"
 #include "include/core/SkMatrix.h"
 #include "include/core/SkShader.h"
-#include "include/private/GrResourceKey.h"
 #include "src/core/SkTBlockList.h"
 #include "src/gpu/GrClip.h"
 #include "src/gpu/GrSurfaceProxyView.h"
+#include "src/gpu/ResourceKey.h"
 #include "src/gpu/geometry/GrShape.h"
 
 class GrAppliedClip;
@@ -80,8 +80,8 @@ class ClipStack final : public GrClip {
     SkIRect getConservativeBounds() const override;
 
 #if GR_TEST_UTILS
-    GrUniqueKey testingOnly_getLastSWMaskKey() const {
-        return fMasks.empty() ? GrUniqueKey() : fMasks.back().key();
+    UniqueKey testingOnly_getLastSWMaskKey() const {
+        return fMasks.empty() ? UniqueKey() : fMasks.back().key();
     }
 #endif
 
@@ -176,16 +176,16 @@ class ClipStack final : public GrClip {
             SkASSERT(!fKey.isValid());
         }
 
-        const GrUniqueKey& key() const { return fKey; }
-        const SkIRect&     bounds() const { return fBounds; }
-        uint32_t           genID() const { return fGenID; }
+        const UniqueKey& key() const { return fKey; }
+        const SkIRect&   bounds() const { return fBounds; }
+        uint32_t         genID() const { return fGenID; }
 
         bool appliesToDraw(const SaveRecord& current, const SkIRect& drawBounds) const;
         void invalidate(GrProxyProvider* proxyProvider);
 
         SkDEBUGCODE(const SaveRecord* owner() const { return fOwner; })
     private:
-        GrUniqueKey fKey;
+        UniqueKey fKey;
         // The gen ID of the save record and the query bounds uniquely define the set of elements
         // that would go into a mask. If the save record adds new elements, its gen ID would change.
         // If the draw had different bounds it would select a different set of masked elements.
diff --git a/third_party/skia/src/gpu/v1/Device.cpp b/third_party/skia/src/gpu/v1/Device.cpp
index 59747ad767980..a0a4728af14fd 100644
--- a/third_party/skia/src/gpu/v1/Device.cpp
+++ b/third_party/skia/src/gpu/v1/Device.cpp
@@ -21,6 +21,7 @@
 #include "include/private/chromium/GrSlug.h"
 #include "src/core/SkCanvasPriv.h"
 #include "src/core/SkClipStack.h"
+#include "src/core/SkCustomMeshPriv.h"
 #include "src/core/SkDraw.h"
 #include "src/core/SkImageFilterCache.h"
 #include "src/core/SkImageFilter_Base.h"
@@ -48,10 +49,7 @@
 #include "src/image/SkSurface_Gpu.h"
 #include "src/utils/SkUTF.h"
 
-// Define this for testing text blob draw using a slug.
-// #define SK_EXPERIMENTAL_SIMULATE_DRAWGLYPHRUNLIST_WITH_SLUG
-
-#define ASSERT_SINGLE_OWNER GR_ASSERT_SINGLE_OWNER(fContext->priv().singleOwner())
+#define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fContext->priv().singleOwner())
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -346,20 +344,47 @@ void Device::drawPoints(SkCanvas::PointMode mode,
 
     GrAA aa = fSurfaceDrawContext->chooseAA(paint);
 
-    if (paint.getPathEffect() && 2 == count && SkCanvas::kLines_PointMode == mode) {
-        GrStyle style(paint, SkPaint::kStroke_Style);
-        GrPaint grPaint;
-        if (!SkPaintToGrPaint(this->recordingContext(), fSurfaceDrawContext->colorInfo(), paint,
-                              this->asMatrixProvider(), &grPaint)) {
+    if (count == 2 && mode == SkCanvas::kLines_PointMode) {
+        if (paint.getPathEffect()) {
+            // Probably a dashed line. Draw as a path.
+            GrPaint grPaint;
+            if (SkPaintToGrPaint(this->recordingContext(),
+                                  fSurfaceDrawContext->colorInfo(),
+                                  paint,
+                                  this->asMatrixProvider(),
+                                  &grPaint)) {
+                SkPath path;
+                path.setIsVolatile(true);
+                path.moveTo(pts[0]);
+                path.lineTo(pts[1]);
+                fSurfaceDrawContext->drawPath(this->clip(),
+                                              std::move(grPaint),
+                                              aa,
+                                              this->localToDevice(),
+                                              path,
+                                              GrStyle(paint, SkPaint::kStroke_Style));
+            }
+            return;
+        }
+        if (!paint.getMaskFilter() &&
+            paint.getStrokeWidth() > 0 &&  // drawStrokedLine doesn't support hairlines.
+            paint.getStrokeCap() != SkPaint::kRound_Cap) { // drawStrokedLine doesn't do round caps.
+            // Simple stroked line. Bypass path rendering.
+            GrPaint grPaint;
+            if (SkPaintToGrPaint(this->recordingContext(),
+                                 fSurfaceDrawContext->colorInfo(),
+                                 paint,
+                                 this->asMatrixProvider(),
+                                 &grPaint)) {
+                fSurfaceDrawContext->drawStrokedLine(this->clip(),
+                                                     std::move(grPaint),
+                                                     aa,
+                                                     this->localToDevice(),
+                                                     pts,
+                                                     SkStrokeRec(paint, SkPaint::kStroke_Style));
+            }
             return;
         }
-        SkPath path;
-        path.setIsVolatile(true);
-        path.moveTo(pts[0]);
-        path.lineTo(pts[1]);
-        fSurfaceDrawContext->drawPath(this->clip(), std::move(grPaint), aa, this->localToDevice(),
-                                      path, style);
-        return;
     }
 
     SkScalar scales[2];
@@ -788,7 +813,7 @@ void Device::drawViewLattice(GrSurfaceProxyView view,
     if (info.isAlphaOnly()) {
         // If we were doing this with an FP graph we'd use a kDstIn blend between the texture and
         // the paint color.
-        view.concatSwizzle(GrSwizzle("aaaa"));
+        view.concatSwizzle(skgpu::Swizzle("aaaa"));
     }
     auto csxf = GrColorSpaceXform::Make(info, fSurfaceDrawContext->colorInfo());
 
@@ -847,6 +872,29 @@ void Device::drawVertices(const SkVertices* vertices,
                                       nullptr);
 }
 
+void Device::drawCustomMesh(SkCustomMesh customMesh,
+                            sk_sp<SkBlender> blender,
+                            const SkPaint& paint) {
+    ASSERT_SINGLE_OWNER
+    GR_CREATE_TRACE_MARKER_CONTEXT("skgpu::v1::Device", "drawCustomMesh", fContext.get());
+    SkASSERT(customMesh.vb);
+
+    GrPaint grPaint;
+    if (!init_vertices_paint(fContext.get(),
+                             fSurfaceDrawContext->colorInfo(),
+                             paint,
+                             this->asMatrixProvider(),
+                             std::move(blender),
+                             SkCustomMeshSpecificationPriv::HasColors(*customMesh.spec),
+                             &grPaint)) {
+        return;
+    }
+    fSurfaceDrawContext->drawCustomMesh(this->clip(),
+                                        std::move(grPaint),
+                                        this->asMatrixProvider(),
+                                        std::move(customMesh));
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 void Device::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
@@ -899,7 +947,9 @@ void Device::drawAtlas(const SkRSXform xform[],
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void Device::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
+void Device::onDrawGlyphRunList(SkCanvas* canvas,
+                                const SkGlyphRunList& glyphRunList,
+                                const SkPaint& paint) {
     ASSERT_SINGLE_OWNER
     GR_CREATE_TRACE_MARKER_CONTEXT("skgpu::v1::Device", "drawGlyphRunList", fContext.get());
     SkASSERT(!glyphRunList.hasRSXForm());
@@ -913,12 +963,12 @@ void Device::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPain
     #endif
 
     fSurfaceDrawContext->drawGlyphRunList(
-        this->clip(), this->asMatrixProvider(), glyphRunList, paint);
+        canvas, this->clip(), this->asMatrixProvider(), glyphRunList, paint);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void Device::drawDrawable(SkDrawable* drawable, const SkMatrix* matrix, SkCanvas* canvas) {
+void Device::drawDrawable(SkCanvas* canvas, SkDrawable* drawable, const SkMatrix* matrix) {
     ASSERT_SINGLE_OWNER
 
     GrBackendApi api = this->recordingContext()->backend();
@@ -934,7 +984,7 @@ void Device::drawDrawable(SkDrawable* drawable, const SkMatrix* matrix, SkCanvas
             return;
         }
     }
-    this->INHERITED::drawDrawable(drawable, matrix, canvas);
+    this->INHERITED::drawDrawable(canvas, drawable, matrix);
 }
 
 
@@ -1038,7 +1088,8 @@ SkBaseDevice* Device::onCreateDevice(const CreateInfo& cinfo, const SkPaint*) {
             fContext.get(), SkColorTypeToGrColorType(cinfo.fInfo.colorType()),
             fSurfaceDrawContext->colorInfo().refColorSpace(), fit, cinfo.fInfo.dimensions(), props,
             fSurfaceDrawContext->numSamples(), GrMipmapped::kNo,
-            fSurfaceDrawContext->asSurfaceProxy()->isProtected(), kBottomLeft_GrSurfaceOrigin,
+            fSurfaceDrawContext->asSurfaceProxy()->isProtected(),
+            fSurfaceDrawContext->origin(),
             SkBudgeted::kYes);
     if (!sdc) {
         return nullptr;
diff --git a/third_party/skia/src/gpu/v1/Device_drawTexture.cpp b/third_party/skia/src/gpu/v1/Device_drawTexture.cpp
index 0a19c4dca3bb0..837638e502a79 100644
--- a/third_party/skia/src/gpu/v1/Device_drawTexture.cpp
+++ b/third_party/skia/src/gpu/v1/Device_drawTexture.cpp
@@ -321,8 +321,8 @@ ImageDrawMode optimize_sample_area(const SkISize& image, const SkRect* origSrcRe
  */
 bool can_use_draw_texture(const SkPaint& paint, bool useCubicResampler, SkMipmapMode mm) {
     return (!paint.getColorFilter() && !paint.getShader() && !paint.getMaskFilter() &&
-            !paint.getImageFilter() && !paint.getBlender() && !useCubicResampler &&
-            mm == SkMipmapMode::kNone);
+            !paint.getImageFilter() && !paint.getBlender() && !paint.isDither() &&
+            !useCubicResampler && mm == SkMipmapMode::kNone);
 }
 
 SkPMColor4f texture_color(SkColor4f paintColor, float entryAlpha, GrColorType srcColorType,
@@ -351,7 +351,7 @@ void draw_texture(skgpu::v1::SurfaceDrawContext* sdc,
                   GrSurfaceProxyView view,
                   const GrColorInfo& srcColorInfo) {
     if (GrColorTypeIsAlphaOnly(srcColorInfo.colorType())) {
-        view.concatSwizzle(GrSwizzle("aaaa"));
+        view.concatSwizzle(skgpu::Swizzle("aaaa"));
     }
     const GrColorInfo& dstInfo = sdc->colorInfo();
     auto textureXform = GrColorSpaceXform::Make(srcColorInfo, sdc->colorInfo());
@@ -932,7 +932,8 @@ void Device::drawEdgeAAImageSet(const SkCanvas::ImageSetEntry set[], int count,
         if (!image->isYUVA()) {
             std::tie(view, std::ignore) = image->asView(this->recordingContext(), GrMipmapped::kNo);
             if (image->isAlphaOnly()) {
-                GrSwizzle swizzle = GrSwizzle::Concat(view.swizzle(), GrSwizzle("aaaa"));
+                skgpu::Swizzle swizzle = skgpu::Swizzle::Concat(view.swizzle(),
+                                                                skgpu::Swizzle("aaaa"));
                 view = {view.detachProxy(), view.origin(), swizzle};
             }
         }
diff --git a/third_party/skia/src/gpu/v1/Device_v1.h b/third_party/skia/src/gpu/v1/Device_v1.h
index 9758c4a66730d..ae56d777d114c 100644
--- a/third_party/skia/src/gpu/v1/Device_v1.h
+++ b/third_party/skia/src/gpu/v1/Device_v1.h
@@ -38,6 +38,10 @@ class Device final : public BaseDevice  {
         fSurfaceDrawContext->discard();
     }
 
+    void resolveMSAA() override {
+        fSurfaceDrawContext->resolveMSAA();
+    }
+
     bool replaceBackingProxy(SkSurface::ContentChangeMode,
                              sk_sp<GrRenderTargetProxy>,
                              GrColorType,
@@ -113,6 +117,7 @@ class Device final : public BaseDevice  {
     void drawPath(const SkPath& path, const SkPaint& paint, bool pathIsMutable) override;
 
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override;
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override;
     void drawShadow(const SkPath&, const SkDrawShadowRec&) override;
     void drawAtlas(const SkRSXform[], const SkRect[], const SkColor[], int count, sk_sp<SkBlender>,
                    const SkPaint&) override;
@@ -123,7 +128,7 @@ class Device final : public BaseDevice  {
     void drawImageLattice(const SkImage*, const SkCanvas::Lattice&,
                           const SkRect& dst, SkFilterMode, const SkPaint&) override;
 
-    void drawDrawable(SkDrawable*, const SkMatrix*, SkCanvas* canvas) override;
+    void drawDrawable(SkCanvas*, SkDrawable*, const SkMatrix*) override;
 
     void drawDevice(SkBaseDevice*, const SkSamplingOptions&, const SkPaint&) override;
     void drawSpecial(SkSpecialImage*, const SkMatrix& localToDevice, const SkSamplingOptions&,
@@ -150,13 +155,13 @@ class Device final : public BaseDevice  {
     void onSave() override { fClip.save(); }
     void onRestore() override { fClip.restore(); }
 
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override;
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override;
 
     sk_sp<GrSlug> convertGlyphRunListToSlug(
             const SkGlyphRunList& glyphRunList,
-            const SkPaint& paint) const override;
+            const SkPaint& paint) override;
 
-    void drawSlug(GrSlug* slug) override;
+    void drawSlug(SkCanvas*, GrSlug* slug) override;
 
     void onClipRect(const SkRect& rect, SkClipOp op, bool aa) override {
         SkASSERT(op == SkClipOp::kIntersect || op == SkClipOp::kDifference);
diff --git a/third_party/skia/src/gpu/v1/SurfaceDrawContext.cpp b/third_party/skia/src/gpu/v1/SurfaceDrawContext.cpp
index a6a1e509de5ff..5bf6a3bb9cd81 100644
--- a/third_party/skia/src/gpu/v1/SurfaceDrawContext.cpp
+++ b/third_party/skia/src/gpu/v1/SurfaceDrawContext.cpp
@@ -18,6 +18,7 @@
 #include "include/utils/SkShadowUtils.h"
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkConvertPixels.h"
+#include "src/core/SkCustomMeshPriv.h"
 #include "src/core/SkDrawProcs.h"
 #include "src/core/SkDrawShadowInfo.h"
 #include "src/core/SkGlyphRunPainter.h"
@@ -30,6 +31,7 @@
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrClip.h"
 #include "src/gpu/GrColor.h"
+#include "src/gpu/GrColorSpaceXform.h"
 #include "src/gpu/GrDataUtils.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrDrawingManager.h"
@@ -55,7 +57,7 @@
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/ClearOp.h"
 #include "src/gpu/ops/DrawAtlasOp.h"
-#include "src/gpu/ops/DrawVerticesOp.h"
+#include "src/gpu/ops/DrawCustomMeshOp.h"
 #include "src/gpu/ops/DrawableOp.h"
 #include "src/gpu/ops/FillRRectOp.h"
 #include "src/gpu/ops/FillRectOp.h"
@@ -68,11 +70,11 @@
 #include "src/gpu/ops/StrokeRectOp.h"
 #include "src/gpu/ops/TextureOp.h"
 #include "src/gpu/text/GrSDFTControl.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 #include "src/gpu/v1/PathRenderer.h"
 
 #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this->drawingManager()->getContext())
-#define ASSERT_SINGLE_OWNER        GR_ASSERT_SINGLE_OWNER(this->singleOwner())
+#define ASSERT_SINGLE_OWNER        SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
 #define RETURN_IF_ABANDONED        if (fContext->abandoned()) { return; }
 #define RETURN_FALSE_IF_ABANDONED  if (fContext->abandoned()) { return false; }
 
@@ -135,8 +137,8 @@ std::unique_ptr<SurfaceDrawContext> SurfaceDrawContext::Make(GrRecordingContext*
     }
 
     const GrBackendFormat& format = proxy->backendFormat();
-    GrSwizzle readSwizzle = rContext->priv().caps()->getReadSwizzle(format, colorType);
-    GrSwizzle writeSwizzle = rContext->priv().caps()->getWriteSwizzle(format, colorType);
+    skgpu::Swizzle readSwizzle = rContext->priv().caps()->getReadSwizzle(format, colorType);
+    skgpu::Swizzle writeSwizzle = rContext->priv().caps()->getWriteSwizzle(format, colorType);
 
     GrSurfaceProxyView readView (          proxy,  origin, readSwizzle);
     GrSurfaceProxyView writeView(std::move(proxy), origin, writeSwizzle);
@@ -159,8 +161,8 @@ std::unique_ptr<SurfaceDrawContext> SurfaceDrawContext::Make(
         int sampleCnt,
         GrMipmapped mipMapped,
         GrProtected isProtected,
-        GrSwizzle readSwizzle,
-        GrSwizzle writeSwizzle,
+        skgpu::Swizzle readSwizzle,
+        skgpu::Swizzle writeSwizzle,
         GrSurfaceOrigin origin,
         SkBudgeted budgeted,
         const SkSurfaceProps& surfaceProps) {
@@ -324,7 +326,8 @@ void SurfaceDrawContext::willReplaceOpsTask(OpsTask* prevTask, OpsTask* nextTask
 #endif
 }
 
-void SurfaceDrawContext::drawGlyphRunListNoCache(const GrClip* clip,
+void SurfaceDrawContext::drawGlyphRunListNoCache(SkCanvas* canvas,
+                                                 const GrClip* clip,
                                                  const SkMatrixProvider& viewMatrix,
                                                  const SkGlyphRunList& glyphRunList,
                                                  const SkPaint& paint) {
@@ -335,67 +338,21 @@ void SurfaceDrawContext::drawGlyphRunListNoCache(const GrClip* clip,
     drawMatrix.preTranslate(drawOrigin.x(), drawOrigin.y());
     GrSubRunAllocator* const alloc = this->subRunAlloc();
 
-    GrSubRunNoCachePainter painter{this, alloc, clip, viewMatrix, glyphRunList, paint};
+    GrSubRunNoCachePainter painter{canvas, this, alloc, clip, viewMatrix, glyphRunList, paint};
     for (auto& glyphRun : glyphRunList) {
         // Make and add the text ops.
-        fGlyphPainter.processGlyphRun(glyphRun,
+        fGlyphPainter.processGlyphRun(&painter,
+                                      glyphRun,
                                       drawMatrix,
                                       paint,
-                                      control,
-                                      &painter);
-    }
-}
-
-void SurfaceDrawContext::drawGlyphRunListWithCache(const GrClip* clip,
-                                                   const SkMatrixProvider& viewMatrix,
-                                                   const SkGlyphRunList& glyphRunList,
-                                                   const SkPaint& paint) {
-    SkMatrix positionMatrix{viewMatrix.localToDevice()};
-    positionMatrix.preTranslate(glyphRunList.origin().x(), glyphRunList.origin().y());
-
-    GrSDFTControl control =
-            this->recordingContext()->priv().getSDFTControl(
-                    this->surfaceProps().isUseDeviceIndependentFonts());
-
-    auto [canCache, key] = GrTextBlob::Key::Make(glyphRunList,
-                                                 paint,
-                                                 fSurfaceProps,
-                                                 this->colorInfo(),
-                                                 positionMatrix,
-                                                 control);
-
-    sk_sp<GrTextBlob> blob;
-    GrTextBlobCache* textBlobCache = fContext->priv().getTextBlobCache();
-    if (canCache) {
-        blob = textBlobCache->find(key);
-    }
-
-    if (blob == nullptr || !blob->canReuse(paint, positionMatrix)) {
-        if (blob != nullptr) {
-            // We have to remake the blob because changes may invalidate our masks.
-            // TODO we could probably get away with reuse most of the time if the pointer is unique,
-            //      but we'd have to clear the SubRun information
-            textBlobCache->remove(blob.get());
-        }
-
-        blob = GrTextBlob::Make(glyphRunList, paint, positionMatrix, control, &fGlyphPainter);
-
-        if (canCache) {
-            blob->addKey(key);
-            // The blob may already have been created on a different thread. Use the first one
-            // that was there.
-            blob = textBlobCache->addOrReturnExisting(glyphRunList, blob);
-        }
-    }
-
-    for (const GrSubRun& subRun : blob->subRunList()) {
-        subRun.draw(clip, viewMatrix, glyphRunList.origin(), paint, this);
+                                      control);
     }
 }
 
 // choose to use the GrTextBlob cache or not.
 bool gGrDrawTextNoCache = false;
-void SurfaceDrawContext::drawGlyphRunList(const GrClip* clip,
+void SurfaceDrawContext::drawGlyphRunList(SkCanvas* canvas,
+                                          const GrClip* clip,
                                           const SkMatrixProvider& viewMatrix,
                                           const SkGlyphRunList& glyphRunList,
                                           const SkPaint& paint) {
@@ -415,9 +372,10 @@ void SurfaceDrawContext::drawGlyphRunList(const GrClip* clip,
         // If the glyphRunList does not have an associated text blob, then it was created by one of
         // the direct draw APIs (drawGlyphs, etc.). There is no need to create a GrTextBlob just
         // build the sub run directly and place it in the op.
-        this->drawGlyphRunListNoCache(clip, viewMatrix, glyphRunList, paint);
+        this->drawGlyphRunListNoCache(canvas, clip, viewMatrix, glyphRunList, paint);
     } else {
-        this->drawGlyphRunListWithCache(clip, viewMatrix, glyphRunList, paint);
+        GrTextBlobRedrawCoordinator* textBlobCache = fContext->priv().getTextBlobCache();
+        textBlobCache->drawGlyphRunList(canvas, clip, viewMatrix, glyphRunList, paint, this);
     }
 }
 
@@ -988,13 +946,40 @@ void SurfaceDrawContext::drawVertices(const GrClip* clip,
 
     SkASSERT(vertices);
     GrAAType aaType = fCanUseDynamicMSAA ? GrAAType::kMSAA : this->chooseAAType(GrAA::kNo);
-    GrOp::Owner op = DrawVerticesOp::Make(fContext,
-                                          std::move(paint),
-                                          std::move(vertices),
-                                          matrixProvider,
-                                          aaType,
-                                          this->colorInfo().refColorSpaceXformFromSRGB(),
-                                          overridePrimType);
+    GrOp::Owner op = DrawCustomMeshOp::Make(fContext,
+                                            std::move(paint),
+                                            std::move(vertices),
+                                            overridePrimType,
+                                            matrixProvider,
+                                            aaType,
+                                            this->colorInfo().refColorSpaceXformFromSRGB());
+    this->addDrawOp(clip, std::move(op));
+}
+
+void SurfaceDrawContext::drawCustomMesh(const GrClip* clip,
+                                        GrPaint&& paint,
+                                        const SkMatrixProvider& matrixProvider,
+                                        SkCustomMesh cm) {
+    ASSERT_SINGLE_OWNER
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+    GR_CREATE_TRACE_MARKER_CONTEXT("SurfaceDrawContext", "drawVertices", fContext);
+
+    AutoCheckFlush acf(this->drawingManager());
+
+    SkASSERT(SkValidateCustomMesh(cm));
+
+    auto xform = GrColorSpaceXform::Make(SkCustomMeshSpecificationPriv::ColorSpace(*cm.spec),
+                                         SkCustomMeshSpecificationPriv::AlphaType(*cm.spec),
+                                         this->colorInfo().colorSpace(),
+                                         this->colorInfo().alphaType());
+    GrAAType aaType = fCanUseDynamicMSAA ? GrAAType::kMSAA : this->chooseAAType(GrAA::kNo);
+    GrOp::Owner op = DrawCustomMeshOp::Make(fContext,
+                                            std::move(paint),
+                                            std::move(cm),
+                                            matrixProvider,
+                                            aaType,
+                                            std::move(xform));
     this->addDrawOp(clip, std::move(op));
 }
 
@@ -1702,17 +1687,41 @@ void SurfaceDrawContext::drawStrokedLine(const GrClip* clip,
     parallel *= halfWidth;
 
     SkVector ortho = { parallel.fY, -parallel.fX };
-    if (SkPaint::kButt_Cap == stroke.getCap()) {
-        // No extra extension for butt caps
-        parallel = {0.f, 0.f};
+    SkPoint p0 = points[0], p1 = points[1];
+    if (stroke.getCap() == SkPaint::kSquare_Cap) {
+        // Extra extension for square caps
+        p0 -= parallel;
+        p1 += parallel;
+    }
+
+    // If we are using dmsaa or reduced shader mode then attempt to draw with FillRRectOp.
+    if (this->caps()->drawInstancedSupport() &&
+        (this->alwaysAntialias() ||
+         (fContext->priv().caps()->reducedShaderMode() && aa == GrAA::kYes))) {
+        SkMatrix localMatrix = SkMatrix::MakeAll(p1.fX - p0.fX, ortho.fX, p0.fX,
+                                                 p1.fY - p0.fY, ortho.fY, p0.fY,
+                                                 0, 0, 1);
+        if (auto op = FillRRectOp::Make(fContext,
+                                        this->arenaAlloc(),
+                                        std::move(paint),
+                                        SkMatrix::Concat(viewMatrix, localMatrix),
+                                        SkRRect::MakeRect({0,-1,1,1}),
+                                        localMatrix,
+                                        GrAA::kYes)) {
+            this->addDrawOp(clip, std::move(op));
+            return;
+        }
     }
+
     // Order is TL, TR, BR, BL where arbitrarily "down" is p0 to p1 and "right" is positive
-    SkPoint corners[4] = { points[0] - ortho - parallel,
-                           points[0] + ortho - parallel,
-                           points[1] + ortho + parallel,
-                           points[1] - ortho + parallel };
+    SkPoint corners[4] = { p0 - ortho,
+                           p0 + ortho,
+                           p1 + ortho,
+                           p1 - ortho };
 
     GrQuadAAFlags edgeAA = (aa == GrAA::kYes) ? GrQuadAAFlags::kAll : GrQuadAAFlags::kNone;
+
+    assert_alive(paint);
     this->fillQuadWithEdgeAA(clip, std::move(paint), aa, edgeAA, viewMatrix, corners, nullptr);
 }
 
diff --git a/third_party/skia/src/gpu/v1/SurfaceDrawContext_v1.h b/third_party/skia/src/gpu/v1/SurfaceDrawContext_v1.h
index 1c8042f73da41..671905f2aef8b 100644
--- a/third_party/skia/src/gpu/v1/SurfaceDrawContext_v1.h
+++ b/third_party/skia/src/gpu/v1/SurfaceDrawContext_v1.h
@@ -94,8 +94,8 @@ class SurfaceDrawContext final : public SurfaceFillContext {
                                                     int sampleCnt,
                                                     GrMipmapped,
                                                     GrProtected,
-                                                    GrSwizzle readSwizzle,
-                                                    GrSwizzle writeSwizzle,
+                                                    skgpu::Swizzle readSwizzle,
+                                                    skgpu::Swizzle writeSwizzle,
                                                     GrSurfaceOrigin,
                                                     SkBudgeted,
                                                     const SkSurfaceProps&);
@@ -376,6 +376,20 @@ class SurfaceDrawContext final : public SurfaceFillContext {
                       sk_sp<SkVertices> vertices,
                       GrPrimitiveType* overridePrimType = nullptr);
 
+    /**
+     * Draws vertices with a paint.
+     *
+     * @param   paint            describes how to color pixels.
+     * @param   viewMatrix       transformation matrix
+     * @param   vertices         specifies the mesh to draw.
+     * @param   overridePrimType primitive type to draw. If NULL, derive prim type from vertices.
+     * @param   effect           runtime effect that will handle custom vertex attributes.
+     */
+    void drawCustomMesh(const GrClip*,
+                        GrPaint&& paint,
+                        const SkMatrixProvider& matrixProvider,
+                        SkCustomMesh);
+
     /**
      * Draws textured sprites from an atlas with a paint. This currently does not support AA for the
      * sprite rectangle edges.
@@ -473,7 +487,8 @@ class SurfaceDrawContext final : public SurfaceFillContext {
      * @param viewMatrix      transformationMatrix
      * @param glyphRunList    text, text positions, and paint.
      */
-    void drawGlyphRunList(const GrClip*,
+    void drawGlyphRunList(SkCanvas*,
+                          const GrClip*,
                           const SkMatrixProvider& viewMatrix,
                           const SkGlyphRunList& glyphRunList,
                           const SkPaint& paint);
@@ -484,18 +499,8 @@ class SurfaceDrawContext final : public SurfaceFillContext {
      * @param viewMatrix      transformationMatrix
      * @param glyphRunList    text, text positions, and paint.
      */
-    void drawGlyphRunListWithCache(const GrClip*,
-                                   const SkMatrixProvider& viewMatrix,
-                                   const SkGlyphRunList& glyphRunList,
-                                   const SkPaint& paint);
-
-    /**
-     * Draw the text specified by the SkGlyphRunList.
-     *
-     * @param viewMatrix      transformationMatrix
-     * @param glyphRunList    text, text positions, and paint.
-     */
-    void drawGlyphRunListNoCache(const GrClip*,
+    void drawGlyphRunListNoCache(SkCanvas*,
+                                 const GrClip*,
                                  const SkMatrixProvider& viewMatrix,
                                  const SkGlyphRunList& glyphRunList,
                                  const SkPaint& paint);
@@ -510,7 +515,8 @@ class SurfaceDrawContext final : public SurfaceFillContext {
     /**
      * Draw a slug.
      */
-    void drawSlug(const GrClip* clip,
+    void drawSlug(SkCanvas*,
+                  const GrClip* clip,
                   const SkMatrixProvider& viewMatrix,
                   GrSlug* slugPtr);
 
@@ -639,6 +645,9 @@ class SurfaceDrawContext final : public SurfaceFillContext {
     void testingOnly_SetPreserveOpsOnFullClear() { fPreserveOpsOnFullClear_TestingOnly = true; }
 #endif
 
+    void drawStrokedLine(const GrClip*, GrPaint&&, GrAA, const SkMatrix&, const SkPoint[2],
+                         const SkStrokeRec&);
+
 private:
     enum class QuadOptimization;
 
@@ -686,9 +695,6 @@ class SurfaceDrawContext final : public SurfaceFillContext {
                           DrawQuad* quad,
                           const SkRect* subset = nullptr);
 
-    void drawStrokedLine(const GrClip*, GrPaint&&, GrAA, const SkMatrix&, const SkPoint[2],
-                         const SkStrokeRec&);
-
     // Tries to detect if the given shape is a simple, and draws it without path rendering if
     // we know how.
     bool drawSimpleShape(const GrClip*, GrPaint*, GrAA, const SkMatrix&, const GrStyledShape&);
diff --git a/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.cpp b/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.cpp
index 2fef76aa44da0..90b10641e54a6 100644
--- a/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.cpp
+++ b/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.cpp
@@ -11,13 +11,14 @@
 #include "src/gpu/GrDstProxyView.h"
 #include "src/gpu/GrImageContextPriv.h"
 #include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrTextureResolveRenderTask.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/geometry/GrRect.h"
 #include "src/gpu/ops/ClearOp.h"
 #include "src/gpu/ops/FillRectOp.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 
-#define ASSERT_SINGLE_OWNER        GR_ASSERT_SINGLE_OWNER(this->singleOwner())
+#define ASSERT_SINGLE_OWNER        SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner())
 #define RETURN_IF_ABANDONED        if (fContext->abandoned()) { return; }
 
 class AutoCheckFlush {
@@ -160,6 +161,19 @@ void SurfaceFillContext::discard() {
     this->getOpsTask()->discard();
 }
 
+void SurfaceFillContext::resolveMSAA() {
+    ASSERT_SINGLE_OWNER
+    RETURN_IF_ABANDONED
+    SkDEBUGCODE(this->validate();)
+    GR_CREATE_TRACE_MARKER_CONTEXT("v1::SurfaceFillContext", "resolveMSAA", fContext);
+
+    AutoCheckFlush acf(this->drawingManager());
+
+    this->drawingManager()->newTextureResolveRenderTask(this->asSurfaceProxyRef(),
+                                                        GrSurfaceProxy::ResolveFlags::kMSAA,
+                                                        *this->caps());
+}
+
 void SurfaceFillContext::internalClear(const SkIRect* scissor,
                                        std::array<float, 4> color,
                                        bool upgradePartialToFull) {
diff --git a/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.h b/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.h
index ce0485156777b..dcfc63653be60 100644
--- a/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.h
+++ b/third_party/skia/src/gpu/v1/SurfaceFillContext_v1.h
@@ -11,8 +11,8 @@
 #include "include/core/SkSize.h"
 #include "include/private/GrTypesPriv.h"
 #include "src/gpu/GrImageInfo.h"
-#include "src/gpu/GrSwizzle.h"
 #include "src/gpu/SurfaceFillContext.h"
+#include "src/gpu/Swizzle.h"
 #include "src/gpu/ops/OpsTask.h"
 
 #include <array>
@@ -38,6 +38,8 @@ class SurfaceFillContext : public skgpu::SurfaceFillContext {
 
     void discard() override;
 
+    void resolveMSAA() override;
+
     void fillRectWithFP(const SkIRect& dstRect, std::unique_ptr<GrFragmentProcessor> fp) override;
 
     bool blitTexture(GrSurfaceProxyView view,
diff --git a/third_party/skia/src/gpu/vk/BUILD.bazel b/third_party/skia/src/gpu/vk/BUILD.bazel
index 53720ef479a95..ffa7943679ce3 100644
--- a/third_party/skia/src/gpu/vk/BUILD.bazel
+++ b/third_party/skia/src/gpu/vk/BUILD.bazel
@@ -81,6 +81,7 @@ generated_cc_atom(
         "//src/gpu:GrShaderCaps_hdr",
         "//src/gpu:GrStencilSettings_hdr",
         "//src/gpu:GrUtil_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
     ],
 )
@@ -553,8 +554,8 @@ generated_cc_atom(
         "//src/gpu:GrDirectContextPriv_hdr",
         "//src/gpu:GrPersistentCacheUtils_hdr",
         "//src/gpu:GrShaderCaps_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu:GrStencilSettings_hdr",
+        "//src/utils:SkShaderUtils_hdr",
     ],
 )
 
@@ -700,6 +701,7 @@ generated_cc_atom(
         ":GrVkRenderTarget_hdr",
         ":GrVkUtil_hdr",
         "//src/gpu:GrProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
     ],
 )
 
@@ -979,6 +981,7 @@ generated_cc_atom(
         ":GrVkTexture_hdr",
         ":GrVkUniformHandler_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:GrUtil_hdr",
         "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
     ],
 )
diff --git a/third_party/skia/src/gpu/vk/GrVkAMDMemoryAllocator.cpp b/third_party/skia/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
index a74260444e859..0885aacc120a1 100644
--- a/third_party/skia/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkAMDMemoryAllocator.cpp
@@ -170,6 +170,7 @@ VkResult GrVkAMDMemoryAllocator::allocateBufferMemory(VkBuffer buffer, BufferUsa
         case BufferUsage::kTransfersFromCpuToGpu:
             info.requiredFlags =
                     VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT;
+            info.preferredFlags = 0;
             break;
         case BufferUsage::kTransfersFromGpuToCpu:
             info.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
diff --git a/third_party/skia/src/gpu/vk/GrVkCaps.cpp b/third_party/skia/src/gpu/vk/GrVkCaps.cpp
index 57b3a34f66c71..7ae1f2f49349b 100644
--- a/third_party/skia/src/gpu/vk/GrVkCaps.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkCaps.cpp
@@ -20,6 +20,7 @@
 #include "src/gpu/GrShaderCaps.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/GrUtil.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/vk/GrVkGpu.h"
 #include "src/gpu/vk/GrVkImage.h"
@@ -609,7 +610,8 @@ void GrVkCaps::initGrCaps(const GrVkInterface* vkInterface,
     // attribs timeout looping over that many. For now, we'll cap this at 64 max and can raise it if
     // we ever find that need.
     static const uint32_t kMaxVertexAttributes = 64;
-    fMaxVertexAttributes = std::min(properties.limits.maxVertexInputAttributes, kMaxVertexAttributes);
+    fMaxVertexAttributes = std::min(properties.limits.maxVertexInputAttributes,
+                                    kMaxVertexAttributes);
 
     // GrCaps::fSampleLocationsSupport refers to the ability to *query* the sample locations (not
     // program them). For now we just set this to true if the device uses standard locations, and
@@ -864,7 +866,7 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle::RGB1();
+                ctInfo.fReadSwizzle = skgpu::Swizzle::RGB1();
             }
         }
     }
@@ -875,9 +877,17 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
         auto& info = this->getFormatInfo(format);
         info.init(interface, physDev, properties, format);
         if (SkToBool(info.fOptimalFlags & FormatInfo::kTexturable_Flag)) {
-            info.fColorTypeInfoCount = 2;
+            info.fColorTypeInfoCount = 3;
             info.fColorTypeInfos = std::make_unique<ColorTypeInfo[]>(info.fColorTypeInfoCount);
             int ctIdx = 0;
+            // Format: VK_FORMAT_R8_UNORM, Surface: kR_8
+            {
+                constexpr GrColorType ct = GrColorType::kR_8;
+                auto& ctInfo = info.fColorTypeInfos[ctIdx++];
+                ctInfo.fColorType = ct;
+                ctInfo.fTransferColorType = ct;
+                ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
+            }
             // Format: VK_FORMAT_R8_UNORM, Surface: kAlpha_8
             {
                 constexpr GrColorType ct = GrColorType::kAlpha_8;
@@ -885,8 +895,8 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
             // Format: VK_FORMAT_R8_UNORM, Surface: kGray_8
             {
@@ -895,7 +905,7 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("rrr1");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("rrr1");
             }
         }
     }
@@ -980,8 +990,8 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
         }
     }
@@ -1078,8 +1088,8 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle::BGRA();
-                ctInfo.fWriteSwizzle = GrSwizzle::BGRA();
+                ctInfo.fReadSwizzle = skgpu::Swizzle::BGRA();
+                ctInfo.fWriteSwizzle = skgpu::Swizzle::BGRA();
             }
         }
     }
@@ -1138,8 +1148,8 @@ void GrVkCaps::initFormatTable(const GrVkInterface* interface, VkPhysicalDevice
                 ctInfo.fColorType = ct;
                 ctInfo.fTransferColorType = ct;
                 ctInfo.fFlags = ColorTypeInfo::kUploadData_Flag | ColorTypeInfo::kRenderable_Flag;
-                ctInfo.fReadSwizzle = GrSwizzle("000r");
-                ctInfo.fWriteSwizzle = GrSwizzle("a000");
+                ctInfo.fReadSwizzle = skgpu::Swizzle("000r");
+                ctInfo.fWriteSwizzle = skgpu::Swizzle("a000");
             }
         }
     }
@@ -1682,7 +1692,8 @@ GrBackendFormat GrVkCaps::getBackendFormatFromCompressionType(
     SkUNREACHABLE;
 }
 
-GrSwizzle GrVkCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrVkCaps::onGetReadSwizzle(const GrBackendFormat& format,
+                                          GrColorType colorType) const {
     VkFormat vkFormat;
     SkAssertResult(format.asVkFormat(&vkFormat));
     const auto* ycbcrInfo = format.getVkYcbcrConversionInfo();
@@ -1690,7 +1701,7 @@ GrSwizzle GrVkCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType
     if (ycbcrInfo->isValid() && ycbcrInfo->fExternalFormat != 0) {
         // We allow these to work with any color type and never swizzle. See
         // onAreColorTypeAndFormatCompatible.
-        return GrSwizzle{"rgba"};
+        return skgpu::Swizzle{"rgba"};
     }
 
     const auto& info = this->getFormatInfo(vkFormat);
@@ -1705,7 +1716,8 @@ GrSwizzle GrVkCaps::onGetReadSwizzle(const GrBackendFormat& format, GrColorType
     return {};
 }
 
-GrSwizzle GrVkCaps::getWriteSwizzle(const GrBackendFormat& format, GrColorType colorType) const {
+skgpu::Swizzle GrVkCaps::getWriteSwizzle(const GrBackendFormat& format,
+                                         GrColorType colorType) const {
     VkFormat vkFormat;
     SkAssertResult(format.asVkFormat(&vkFormat));
     const auto& info = this->getFormatInfo(vkFormat);
@@ -1785,7 +1797,7 @@ int GrVkCaps::getFragmentUniformSet() const {
     return GrVkUniformHandler::kUniformBufferDescSet;
 }
 
-void GrVkCaps::addExtraSamplerKey(GrProcessorKeyBuilder* b,
+void GrVkCaps::addExtraSamplerKey(skgpu::KeyBuilder* b,
                                   GrSamplerState samplerState,
                                   const GrBackendFormat& format) const {
     const GrVkYcbcrConversionInfo* ycbcrInfo = format.getVkYcbcrConversionInfo();
@@ -1823,7 +1835,7 @@ GrProgramDesc GrVkCaps::makeDesc(GrRenderTarget* rt,
     GrProgramDesc desc;
     GrProgramDesc::Build(&desc, programInfo, *this);
 
-    GrProcessorKeyBuilder b(desc.key());
+    skgpu::KeyBuilder b(desc.key());
 
     // This will become part of the sheared off key used to persistently cache
     // the SPIRV code. It needs to be added right after the base key so that,
diff --git a/third_party/skia/src/gpu/vk/GrVkCaps.h b/third_party/skia/src/gpu/vk/GrVkCaps.h
index 84ada6bc98841..fa2d0c87bbe86 100644
--- a/third_party/skia/src/gpu/vk/GrVkCaps.h
+++ b/third_party/skia/src/gpu/vk/GrVkCaps.h
@@ -234,14 +234,14 @@ class GrVkCaps : public GrCaps {
         return fColorTypeToFormatTable[idx];
     }
 
-    GrSwizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle getWriteSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     uint64_t computeFormatKey(const GrBackendFormat&) const override;
 
     int getFragmentUniformBinding() const;
     int getFragmentUniformSet() const;
 
-    void addExtraSamplerKey(GrProcessorKeyBuilder*,
+    void addExtraSamplerKey(skgpu::KeyBuilder*,
                             GrSamplerState,
                             const GrBackendFormat&) const override;
 
@@ -253,13 +253,6 @@ class GrVkCaps : public GrCaps {
 
     VkShaderStageFlags getPushConstantStageFlags() const;
 
-    // If true then when doing MSAA draws, we will prefer to discard the msaa attachment on load
-    // and stores. The use of this feature for specific draws depends on the render target having a
-    // resolve attachment, and if we need to load previous data the resolve attachment must be
-    // usable as an input attachment. Otherwise we will just write out and store the msaa attachment
-    // like normal.
-    // This flag is similar to enabling gl render to texture for msaa rendering.
-    bool preferDiscardableMSAAAttachment() const { return fPreferDiscardableMSAAAttachment; }
     bool mustLoadFullImageWithDiscardableMSAA() const {
         return fMustLoadFullImageWithDiscardableMSAA;
     }
@@ -285,6 +278,40 @@ class GrVkCaps : public GrCaps {
         kQualcomm_VkVendor = 20803,
     };
 
+    // Some common Intel GPU models, currently we cover ICL/RKL/TGL/ADL
+    // Referenced from the following Mesa source files:
+    // https://github.com/mesa3d/mesa/blob/master/include/pci_ids/i965_pci_ids.h
+    // https://github.com/mesa3d/mesa/blob/master/include/pci_ids/iris_pci_ids.h
+    struct VkIntelGPUInfo {
+        // IceLake
+        const std::array<uint32_t, 14> IceLake = {
+            {0x8A50, 0x8A51, 0x8A52, 0x8A53, 0x8A54, 0x8A56, 0x8A57,
+             0x8A58, 0x8A59, 0x8A5A, 0x8A5B, 0x8A5C, 0x8A5D, 0x8A71}};
+        // RocketLake
+        const std::array<uint32_t, 5> RocketLake = {
+            {0x4c8a, 0x4c8b, 0x4c8c, 0x4c90, 0x4c9a}};
+        // TigerLake
+        const std::array<uint32_t, 11> TigerLake = {
+            {0x9A40, 0x9A49, 0x9A59, 0x9A60, 0x9A68, 0x9A70,
+             0x9A78, 0x9AC0, 0x9AC9, 0x9AD9, 0x9AF8}};
+        // Alderlake
+        const std::array<uint32_t, 10> Alderlake = {
+            {0x4680, 0x4681, 0x4682, 0x4683, 0x4690,
+             0x4691, 0x4692, 0x4693, 0x4698, 0x4699}};
+    };
+
+    enum class VkIntelGPUType {
+        // 11th gen
+        kIntelIceLake,
+
+        // 12th gen
+        kIntelRocketLake,
+        kIntelTigerLake,
+        kIntelAlderLake,
+
+        kOther
+    };
+
     void init(const GrContextOptions& contextOptions, const GrVkInterface* vkInterface,
               VkPhysicalDevice device, const VkPhysicalDeviceFeatures2&,
               uint32_t physicalDeviceVersion, const GrVkExtensions&, GrProtected isProtected);
@@ -311,7 +338,7 @@ class GrVkCaps : public GrCaps {
     SupportedRead onSupportedReadPixelsColorType(GrColorType, const GrBackendFormat&,
                                                  GrColorType) const override;
 
-    GrSwizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
+    skgpu::Swizzle onGetReadSwizzle(const GrBackendFormat&, GrColorType) const override;
 
     GrDstSampleFlags onGetDstSampleFlagsForProxy(const GrRenderTargetProxy*) const override;
 
@@ -332,8 +359,8 @@ class GrVkCaps : public GrCaps {
         };
         uint32_t fFlags = 0;
 
-        GrSwizzle fReadSwizzle;
-        GrSwizzle fWriteSwizzle;
+        skgpu::Swizzle fReadSwizzle;
+        skgpu::Swizzle fWriteSwizzle;
     };
 
     struct FormatInfo {
@@ -418,7 +445,6 @@ class GrVkCaps : public GrCaps {
 
     uint32_t fMaxInputAttachmentDescriptors = 0;
 
-    bool fPreferDiscardableMSAAAttachment = false;
     bool fMustLoadFullImageWithDiscardableMSAA = false;
     bool fSupportsDiscardableMSAAForDMSAA = true;
     bool fSupportsMemorylessAttachments = false;
diff --git a/third_party/skia/src/gpu/vk/GrVkInterface.h b/third_party/skia/src/gpu/vk/GrVkInterface.h
index 6ca7bbc631d59..69b9c74a89189 100644
--- a/third_party/skia/src/gpu/vk/GrVkInterface.h
+++ b/third_party/skia/src/gpu/vk/GrVkInterface.h
@@ -28,7 +28,7 @@ struct GrVkInterface : public SkRefCnt {
     // simple wrapper class that exists only to initialize a pointer to NULL
     template <typename FNPTR_TYPE> class VkPtr {
     public:
-        VkPtr() : fPtr(NULL) {}
+        VkPtr() : fPtr(nullptr) {}
         VkPtr operator=(FNPTR_TYPE ptr) { fPtr = ptr; return *this; }
         operator FNPTR_TYPE() const { return fPtr; }
     private:
diff --git a/third_party/skia/src/gpu/vk/GrVkMSAALoadManager.cpp b/third_party/skia/src/gpu/vk/GrVkMSAALoadManager.cpp
index fdd3fca96b808..39a878e9e1f76 100644
--- a/third_party/skia/src/gpu/vk/GrVkMSAALoadManager.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkMSAALoadManager.cpp
@@ -31,7 +31,7 @@ GrVkMSAALoadManager::~GrVkMSAALoadManager() {}
 bool GrVkMSAALoadManager::createMSAALoadProgram(GrVkGpu* gpu) {
     TRACE_EVENT0("skia", TRACE_FUNC);
 
-    SkSL::String vertShaderText;
+    std::string vertShaderText;
     vertShaderText.append(
             "layout(set = 0, binding = 0) uniform vertexUniformBuffer {"
             "half4 uPosXform;"
@@ -44,7 +44,7 @@ bool GrVkMSAALoadManager::createMSAALoadProgram(GrVkGpu* gpu) {
             "sk_Position.zw = half2(0, 1);"
             "}");
 
-    SkSL::String fragShaderText;
+    std::string fragShaderText;
     fragShaderText.append(
             "layout(input_attachment_index = 0, set = 2, binding = 0) uniform subpassInput uInput;"
 
@@ -54,7 +54,7 @@ bool GrVkMSAALoadManager::createMSAALoadProgram(GrVkGpu* gpu) {
             "}");
 
     SkSL::Program::Settings settings;
-    SkSL::String spirv;
+    std::string spirv;
     SkSL::Program::Inputs inputs;
     if (!GrCompileVkShaderModule(gpu, vertShaderText, VK_SHADER_STAGE_VERTEX_BIT,
                                  &fVertShaderModule, &fShaderStageInfo[0], settings, &spirv,
diff --git a/third_party/skia/src/gpu/vk/GrVkOpsRenderPass.cpp b/third_party/skia/src/gpu/vk/GrVkOpsRenderPass.cpp
index c77e7563d722b..f867df419d5ce 100644
--- a/third_party/skia/src/gpu/vk/GrVkOpsRenderPass.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkOpsRenderPass.cpp
@@ -94,10 +94,16 @@ void GrVkOpsRenderPass::setAttachmentLayouts(LoadFromResolve loadFromResolve) {
         GrVkImage* resolveAttachment = fFramebuffer->resolveAttachment();
         SkASSERT(resolveAttachment);
         if (loadFromResolve == LoadFromResolve::kLoad) {
+            // We need input access to do the shader read and color read access to do the attachment
+            // load.
+            VkAccessFlags dstAccess =
+                    VK_ACCESS_INPUT_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_READ_BIT;
+            VkPipelineStageFlags dstStages = VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+                                             VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
             resolveAttachment->setImageLayout(fGpu,
                                               VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-                                              VK_ACCESS_INPUT_ATTACHMENT_READ_BIT,
-                                              VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
+                                              dstAccess,
+                                              dstStages,
                                               false);
         } else {
             resolveAttachment->setImageLayout(
diff --git a/third_party/skia/src/gpu/vk/GrVkPipeline.cpp b/third_party/skia/src/gpu/vk/GrVkPipeline.cpp
index 118e7515a57b9..8b61563d0a718 100644
--- a/third_party/skia/src/gpu/vk/GrVkPipeline.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkPipeline.cpp
@@ -100,39 +100,33 @@ static void setup_vertex_input_state(
 
     // setup attribute descriptions
     int attribIndex = 0;
-    size_t vertexAttributeOffset = 0;
-    for (const auto& attrib : vertexAttribs) {
+    for (auto attrib : vertexAttribs) {
         VkVertexInputAttributeDescription& vkAttrib = attributeDesc[attribIndex];
         vkAttrib.location = attribIndex++;  // for now assume location = attribIndex
         vkAttrib.binding = vertexBinding;
         vkAttrib.format = attrib_type_to_vkformat(attrib.cpuType());
-        vkAttrib.offset = vertexAttributeOffset;
-        vertexAttributeOffset += attrib.sizeAlign4();
+        vkAttrib.offset = *attrib.offset();
     }
-    SkASSERT(vertexAttributeOffset == vertexAttribs.stride());
 
-    size_t instanceAttributeOffset = 0;
-    for (const auto& attrib : instanceAttribs) {
+    for (auto attrib : instanceAttribs) {
         VkVertexInputAttributeDescription& vkAttrib = attributeDesc[attribIndex];
         vkAttrib.location = attribIndex++;  // for now assume location = attribIndex
         vkAttrib.binding = instanceBinding;
         vkAttrib.format = attrib_type_to_vkformat(attrib.cpuType());
-        vkAttrib.offset = instanceAttributeOffset;
-        instanceAttributeOffset += attrib.sizeAlign4();
+        vkAttrib.offset = *attrib.offset();
     }
-    SkASSERT(instanceAttributeOffset == instanceAttribs.stride());
 
     if (vaCount) {
         bindingDescs->push_back() = {
                 vertexBinding,
-                (uint32_t) vertexAttributeOffset,
+                (uint32_t) vertexAttribs.stride(),
                 VK_VERTEX_INPUT_RATE_VERTEX
         };
     }
     if (iaCount) {
         bindingDescs->push_back() = {
                 instanceBinding,
-                (uint32_t) instanceAttributeOffset,
+                (uint32_t) instanceAttribs.stride(),
                 VK_VERTEX_INPUT_RATE_INSTANCE
         };
     }
@@ -651,7 +645,7 @@ void GrVkPipeline::SetDynamicViewportState(GrVkGpu* gpu,
 
 void GrVkPipeline::SetDynamicBlendConstantState(GrVkGpu* gpu,
                                                 GrVkCommandBuffer* cmdBuffer,
-                                                const GrSwizzle& swizzle,
+                                                const skgpu::Swizzle& swizzle,
                                                 const GrXferProcessor& xferProcessor) {
     const GrXferProcessor::BlendInfo& blendInfo = xferProcessor.getBlendInfo();
     GrBlendCoeff srcCoeff = blendInfo.fSrcBlend;
diff --git a/third_party/skia/src/gpu/vk/GrVkPipeline.h b/third_party/skia/src/gpu/vk/GrVkPipeline.h
index c218c8915d584..18f9b6961195f 100644
--- a/third_party/skia/src/gpu/vk/GrVkPipeline.h
+++ b/third_party/skia/src/gpu/vk/GrVkPipeline.h
@@ -20,12 +20,15 @@ class GrPipeline;
 class GrProgramInfo;
 class GrRenderTarget;
 class GrStencilSettings;
-class GrSwizzle;
 class GrVkCommandBuffer;
 class GrVkGpu;
 class GrVkRenderPass;
 struct SkIRect;
 
+namespace skgpu {
+class Swizzle;
+}
+
 class GrVkPipeline : public GrVkManagedResource {
 public:
     static sk_sp<GrVkPipeline> Make(GrVkGpu*,
@@ -71,7 +74,7 @@ class GrVkPipeline : public GrVkManagedResource {
                                         SkISize colorAttachmentDimensions);
     static void SetDynamicBlendConstantState(GrVkGpu*,
                                              GrVkCommandBuffer*,
-                                             const GrSwizzle& writeSwizzle,
+                                             const skgpu::Swizzle& writeSwizzle,
                                              const GrXferProcessor&);
 
 #ifdef SK_TRACE_MANAGED_RESOURCES
diff --git a/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.cpp
index 51c8a47f4ce22..71db42d32bf5d 100644
--- a/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.cpp
@@ -14,13 +14,13 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrPersistentCacheUtils.h"
 #include "src/gpu/GrShaderCaps.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/gpu/GrStencilSettings.h"
 #include "src/gpu/vk/GrVkDescriptorSetManager.h"
 #include "src/gpu/vk/GrVkGpu.h"
 #include "src/gpu/vk/GrVkPipeline.h"
 #include "src/gpu/vk/GrVkRenderPass.h"
 #include "src/gpu/vk/GrVkRenderTarget.h"
+#include "src/utils/SkShaderUtils.h"
 
 GrVkPipelineState* GrVkPipelineStateBuilder::CreatePipelineState(
         GrVkGpu* gpu,
@@ -72,11 +72,11 @@ void GrVkPipelineStateBuilder::finalizeFragmentSecondaryColor(GrShaderVar& outpu
 }
 
 bool GrVkPipelineStateBuilder::createVkShaderModule(VkShaderStageFlagBits stage,
-                                                    const SkSL::String& sksl,
+                                                    const std::string& sksl,
                                                     VkShaderModule* shaderModule,
                                                     VkPipelineShaderStageCreateInfo* stageInfo,
                                                     const SkSL::Program::Settings& settings,
-                                                    SkSL::String* outSPIRV,
+                                                    std::string* outSPIRV,
                                                     SkSL::Program::Inputs* outInputs) {
     if (!GrCompileVkShaderModule(fGpu, sksl, stage, shaderModule,
                                  stageInfo, settings, outSPIRV, outInputs)) {
@@ -92,7 +92,7 @@ bool GrVkPipelineStateBuilder::installVkShaderModule(VkShaderStageFlagBits stage
                                                      const GrGLSLShaderBuilder& builder,
                                                      VkShaderModule* shaderModule,
                                                      VkPipelineShaderStageCreateInfo* stageInfo,
-                                                     SkSL::String spirv,
+                                                     std::string spirv,
                                                      SkSL::Program::Inputs inputs) {
     if (!GrInstallVkShaderModule(fGpu, spirv, stage, shaderModule, stageInfo)) {
         return false;
@@ -109,7 +109,7 @@ static constexpr SkFourByteTag kSKSL_Tag = SkSetFourByteTag('S', 'K', 'S', 'L');
 int GrVkPipelineStateBuilder::loadShadersFromCache(SkReadBuffer* cached,
                                                    VkShaderModule outShaderModules[],
                                                    VkPipelineShaderStageCreateInfo* outStageInfo) {
-    SkSL::String shaders[kGrShaderTypeCount];
+    std::string shaders[kGrShaderTypeCount];
     SkSL::Program::Inputs inputs[kGrShaderTypeCount];
 
     if (!GrPersistentCacheUtils::UnpackCachedShaders(cached, shaders, inputs, kGrShaderTypeCount)) {
@@ -142,7 +142,7 @@ int GrVkPipelineStateBuilder::loadShadersFromCache(SkReadBuffer* cached,
     return 2;
 }
 
-void GrVkPipelineStateBuilder::storeShadersInCache(const SkSL::String shaders[],
+void GrVkPipelineStateBuilder::storeShadersInCache(const std::string shaders[],
                                                    const SkSL::Program::Inputs inputs[],
                                                    bool isSkSL) {
     // Here we shear off the Vk-specific portion of the Desc in order to create the
@@ -224,14 +224,14 @@ GrVkPipelineState* GrVkPipelineStateBuilder::finalize(const GrProgramDesc& desc,
     // Proceed from sources if we didn't get a SPIRV cache (or the cache was invalid)
     if (!numShaderStages) {
         numShaderStages = 2; // We always have at least vertex and fragment stages.
-        SkSL::String shaders[kGrShaderTypeCount];
+        std::string shaders[kGrShaderTypeCount];
         SkSL::Program::Inputs inputs[kGrShaderTypeCount];
 
-        SkSL::String* sksl[kGrShaderTypeCount] = {
+        std::string* sksl[kGrShaderTypeCount] = {
             &fVS.fCompilerString,
             &fFS.fCompilerString,
         };
-        SkSL::String cached_sksl[kGrShaderTypeCount];
+        std::string cached_sksl[kGrShaderTypeCount];
         if (kSKSL_Tag == shaderType) {
             if (GrPersistentCacheUtils::UnpackCachedShaders(&reader, cached_sksl, inputs,
                                                             kGrShaderTypeCount)) {
@@ -272,7 +272,7 @@ GrVkPipelineState* GrVkPipelineStateBuilder::finalize(const GrProgramDesc& desc,
             if (fGpu->getContext()->priv().options().fShaderCacheStrategy ==
                     GrContextOptions::ShaderCacheStrategy::kSkSL) {
                 for (int i = 0; i < kGrShaderTypeCount; ++i) {
-                    shaders[i] = GrShaderUtils::PrettyPrint(*sksl[i]);
+                    shaders[i] = SkShaderUtils::PrettyPrint(*sksl[i]);
                 }
                 isSkSL = true;
             }
diff --git a/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.h b/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.h
index 94c80bb443827..cdcc1e526546f 100644
--- a/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.h
+++ b/third_party/skia/src/gpu/vk/GrVkPipelineStateBuilder.h
@@ -54,22 +54,22 @@ class GrVkPipelineStateBuilder : public GrGLSLProgramBuilder {
     int loadShadersFromCache(SkReadBuffer* cached, VkShaderModule outShaderModules[],
                              VkPipelineShaderStageCreateInfo* outStageInfo);
 
-    void storeShadersInCache(const SkSL::String shaders[], const SkSL::Program::Inputs inputs[],
+    void storeShadersInCache(const std::string shaders[], const SkSL::Program::Inputs inputs[],
                              bool isSkSL);
 
     bool createVkShaderModule(VkShaderStageFlagBits stage,
-                              const SkSL::String& sksl,
+                              const std::string& sksl,
                               VkShaderModule* shaderModule,
                               VkPipelineShaderStageCreateInfo* stageInfo,
                               const SkSL::Program::Settings& settings,
-                              SkSL::String* outSPIRV,
+                              std::string* outSPIRV,
                               SkSL::Program::Inputs* outInputs);
 
     bool installVkShaderModule(VkShaderStageFlagBits stage,
                                const GrGLSLShaderBuilder& builder,
                                VkShaderModule* shaderModule,
                                VkPipelineShaderStageCreateInfo* stageInfo,
-                               SkSL::String spirv,
+                               std::string spirv,
                                SkSL::Program::Inputs inputs);
 
     GrGLSLUniformHandler* uniformHandler() override { return &fUniformHandler; }
diff --git a/third_party/skia/src/gpu/vk/GrVkPipelineStateDataManager.cpp b/third_party/skia/src/gpu/vk/GrVkPipelineStateDataManager.cpp
index 2047498c94dc5..96e86f5248a16 100644
--- a/third_party/skia/src/gpu/vk/GrVkPipelineStateDataManager.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkPipelineStateDataManager.cpp
@@ -68,7 +68,7 @@ void GrVkPipelineStateDataManager::set1iv(UniformHandle u,
                                           const int32_t v[]) const {
     if (fUsePushConstants) {
         const Uniform& uni = fUniforms[u.toIndex()];
-        SkASSERT(uni.fType == kInt_GrSLType || uni.fType == kShort_GrSLType);
+        SkASSERT(uni.fType == SkSLType::kInt || uni.fType == SkSLType::kShort);
         SkASSERT(arrayCount > 0);
         SkASSERT(arrayCount <= uni.fArrayCount ||
                  (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -86,7 +86,7 @@ void GrVkPipelineStateDataManager::set1fv(UniformHandle u,
                                           const float v[]) const {
     if (fUsePushConstants) {
         const Uniform& uni = fUniforms[u.toIndex()];
-        SkASSERT(uni.fType == kFloat_GrSLType || uni.fType == kHalf_GrSLType);
+        SkASSERT(uni.fType == SkSLType::kFloat || uni.fType == SkSLType::kHalf);
         SkASSERT(arrayCount > 0);
         SkASSERT(arrayCount <= uni.fArrayCount ||
                  (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -104,7 +104,7 @@ void GrVkPipelineStateDataManager::set2iv(UniformHandle u,
                                           const int32_t v[]) const {
     if (fUsePushConstants) {
         const Uniform& uni = fUniforms[u.toIndex()];
-        SkASSERT(uni.fType == kInt2_GrSLType || uni.fType == kShort2_GrSLType);
+        SkASSERT(uni.fType == SkSLType::kInt2 || uni.fType == SkSLType::kShort2);
         SkASSERT(arrayCount > 0);
         SkASSERT(arrayCount <= uni.fArrayCount ||
                  (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -122,7 +122,7 @@ void GrVkPipelineStateDataManager::set2fv(UniformHandle u,
                                           const float v[]) const {
     if (fUsePushConstants) {
         const Uniform& uni = fUniforms[u.toIndex()];
-        SkASSERT(uni.fType == kFloat2_GrSLType || uni.fType == kHalf2_GrSLType);
+        SkASSERT(uni.fType == SkSLType::kFloat2 || uni.fType == SkSLType::kHalf2);
         SkASSERT(arrayCount > 0);
         SkASSERT(arrayCount <= uni.fArrayCount ||
                  (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
@@ -141,7 +141,7 @@ void GrVkPipelineStateDataManager::setMatrix2fv(UniformHandle u,
     if (fUsePushConstants) {
         // upload as std430
         const Uniform& uni = fUniforms[u.toIndex()];
-        SkASSERT(uni.fType == kFloat2x2_GrSLType || uni.fType == kHalf2x2_GrSLType);
+        SkASSERT(uni.fType == SkSLType::kFloat2x2 || uni.fType == SkSLType::kHalf2x2);
         SkASSERT(arrayCount > 0);
         SkASSERT(arrayCount <= uni.fArrayCount ||
                  (1 == arrayCount && GrShaderVar::kNonArray == uni.fArrayCount));
diff --git a/third_party/skia/src/gpu/vk/GrVkRenderPass.cpp b/third_party/skia/src/gpu/vk/GrVkRenderPass.cpp
index 870940af3bbdf..62e40d4ba0838 100644
--- a/third_party/skia/src/gpu/vk/GrVkRenderPass.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkRenderPass.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/vk/GrVkRenderPass.h"
 
 #include "src/gpu/GrProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/vk/GrVkFramebuffer.h"
 #include "src/gpu/vk/GrVkGpu.h"
 #include "src/gpu/vk/GrVkRenderTarget.h"
@@ -441,12 +442,12 @@ bool GrVkRenderPass::equalLoadStoreOps(const LoadStoreOps& colorOps,
     return true;
 }
 
-void GrVkRenderPass::genKey(GrProcessorKeyBuilder* b) const {
+void GrVkRenderPass::genKey(skgpu::KeyBuilder* b) const {
     GenKey(b, fAttachmentFlags, fAttachmentsDescriptor, fSelfDepFlags,
            fLoadFromResolve, (uint64_t)fRenderPass);
 }
 
-void GrVkRenderPass::GenKey(GrProcessorKeyBuilder* b,
+void GrVkRenderPass::GenKey(skgpu::KeyBuilder* b,
                             AttachmentFlags attachmentFlags,
                             const AttachmentsDescriptor& attachmentsDescriptor,
                             SelfDependencyFlags selfDepFlags,
diff --git a/third_party/skia/src/gpu/vk/GrVkRenderPass.h b/third_party/skia/src/gpu/vk/GrVkRenderPass.h
index 6d25e8fd8b1fe..10a40745b47a3 100644
--- a/third_party/skia/src/gpu/vk/GrVkRenderPass.h
+++ b/third_party/skia/src/gpu/vk/GrVkRenderPass.h
@@ -15,9 +15,11 @@
 
 #include <cinttypes>
 
-class GrProcessorKeyBuilder;
 class GrVkGpu;
 class GrVkRenderTarget;
+namespace skgpu {
+class KeyBuilder;
+}
 
 class GrVkRenderPass : public GrVkManagedResource {
 public:
@@ -156,9 +158,9 @@ class GrVkRenderPass : public GrVkManagedResource {
     uint32_t clearValueCount() const { return fClearValueCount; }
 
 
-    void genKey(GrProcessorKeyBuilder*) const;
+    void genKey(skgpu::KeyBuilder*) const;
 
-    static void GenKey(GrProcessorKeyBuilder*,
+    static void GenKey(skgpu::KeyBuilder*,
                        AttachmentFlags,
                        const AttachmentsDescriptor&,
                        SelfDependencyFlags selfDepFlags,
diff --git a/third_party/skia/src/gpu/vk/GrVkRenderTarget.cpp b/third_party/skia/src/gpu/vk/GrVkRenderTarget.cpp
index 4e7a729e13f04..011833df702ae 100644
--- a/third_party/skia/src/gpu/vk/GrVkRenderTarget.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkRenderTarget.cpp
@@ -64,7 +64,7 @@ GrVkRenderTarget::GrVkRenderTarget(GrVkGpu* gpu,
     SkASSERT(fColorAttachment);
 
     if (fColorAttachment->numSamples() == 1 && fColorAttachment->supportsInputAttachmentUsage()) {
-        SkASSERT(!resolveAttachment);
+        SkASSERT(!fResolveAttachment);
         // When we have a single sampled color attachment, we set both the color and resolve
         // to the same attachment. This way if we use DMAA on this render target we will resolve
         // to the single target attachment.
diff --git a/third_party/skia/src/gpu/vk/GrVkUniformHandler.cpp b/third_party/skia/src/gpu/vk/GrVkUniformHandler.cpp
index 010fca509d61f..9f856101682e4 100644
--- a/third_party/skia/src/gpu/vk/GrVkUniformHandler.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkUniformHandler.cpp
@@ -8,6 +8,7 @@
 #include "src/gpu/vk/GrVkUniformHandler.h"
 
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/GrUtil.h"
 #include "src/gpu/glsl/GrGLSLProgramBuilder.h"
 #include "src/gpu/vk/GrVkGpu.h"
 #include "src/gpu/vk/GrVkPipelineStateBuilder.h"
@@ -21,138 +22,138 @@
 // aligned to 16 bytes (i.e. has mask of 0xF).
 // These are designated in the Vulkan spec, section 14.5.4 "Offset and Stride Assignment".
 // https://www.khronos.org/registry/vulkan/specs/1.0-wsi_extensions/html/vkspec.html#interfaces-resources-layout
-static uint32_t grsltype_to_alignment_mask(GrSLType type) {
+static uint32_t sksltype_to_alignment_mask(SkSLType type) {
     switch(type) {
-        case kShort_GrSLType: // fall through
-        case kUShort_GrSLType:
+        case SkSLType::kShort: // fall through
+        case SkSLType::kUShort:
             return 0x1;
-        case kShort2_GrSLType: // fall through
-        case kUShort2_GrSLType:
+        case SkSLType::kShort2: // fall through
+        case SkSLType::kUShort2:
             return 0x3;
-        case kShort3_GrSLType: // fall through
-        case kShort4_GrSLType:
-        case kUShort3_GrSLType:
-        case kUShort4_GrSLType:
+        case SkSLType::kShort3: // fall through
+        case SkSLType::kShort4:
+        case SkSLType::kUShort3:
+        case SkSLType::kUShort4:
             return 0x7;
-        case kInt_GrSLType:
-        case kUInt_GrSLType:
+        case SkSLType::kInt:
+        case SkSLType::kUInt:
             return 0x3;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
             return 0x7;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
             return 0xF;
-        case kHalf_GrSLType: // fall through
-        case kFloat_GrSLType:
+        case SkSLType::kHalf: // fall through
+        case SkSLType::kFloat:
             return 0x3;
-        case kHalf2_GrSLType: // fall through
-        case kFloat2_GrSLType:
+        case SkSLType::kHalf2: // fall through
+        case SkSLType::kFloat2:
             return 0x7;
-        case kHalf3_GrSLType: // fall through
-        case kFloat3_GrSLType:
+        case SkSLType::kHalf3: // fall through
+        case SkSLType::kFloat3:
             return 0xF;
-        case kHalf4_GrSLType: // fall through
-        case kFloat4_GrSLType:
+        case SkSLType::kHalf4: // fall through
+        case SkSLType::kFloat4:
             return 0xF;
-        case kHalf2x2_GrSLType: // fall through
-        case kFloat2x2_GrSLType:
+        case SkSLType::kHalf2x2: // fall through
+        case SkSLType::kFloat2x2:
             return 0x7;
-        case kHalf3x3_GrSLType: // fall through
-        case kFloat3x3_GrSLType:
+        case SkSLType::kHalf3x3: // fall through
+        case SkSLType::kFloat3x3:
             return 0xF;
-        case kHalf4x4_GrSLType: // fall through
-        case kFloat4x4_GrSLType:
+        case SkSLType::kHalf4x4: // fall through
+        case SkSLType::kFloat4x4:
             return 0xF;
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
 }
 
-/** Returns the size in bytes taken up in vulkanbuffers for GrSLTypes. */
-static inline uint32_t grsltype_to_vk_size(GrSLType type, int layout) {
+/** Returns the size in bytes taken up in vulkanbuffers for SkSLTypes. */
+static inline uint32_t sksltype_to_vk_size(SkSLType type, int layout) {
     switch(type) {
-        case kShort_GrSLType:
+        case SkSLType::kShort:
             return sizeof(int16_t);
-        case kShort2_GrSLType:
+        case SkSLType::kShort2:
             return 2 * sizeof(int16_t);
-        case kShort3_GrSLType:
+        case SkSLType::kShort3:
             return 3 * sizeof(int16_t);
-        case kShort4_GrSLType:
+        case SkSLType::kShort4:
             return 4 * sizeof(int16_t);
-        case kUShort_GrSLType:
+        case SkSLType::kUShort:
             return sizeof(uint16_t);
-        case kUShort2_GrSLType:
+        case SkSLType::kUShort2:
             return 2 * sizeof(uint16_t);
-        case kUShort3_GrSLType:
+        case SkSLType::kUShort3:
             return 3 * sizeof(uint16_t);
-        case kUShort4_GrSLType:
+        case SkSLType::kUShort4:
             return 4 * sizeof(uint16_t);
-        case kHalf_GrSLType: // fall through
-        case kFloat_GrSLType:
+        case SkSLType::kHalf: // fall through
+        case SkSLType::kFloat:
             return sizeof(float);
-        case kHalf2_GrSLType: // fall through
-        case kFloat2_GrSLType:
+        case SkSLType::kHalf2: // fall through
+        case SkSLType::kFloat2:
             return 2 * sizeof(float);
-        case kHalf3_GrSLType: // fall through
-        case kFloat3_GrSLType:
+        case SkSLType::kHalf3: // fall through
+        case SkSLType::kFloat3:
             return 3 * sizeof(float);
-        case kHalf4_GrSLType: // fall through
-        case kFloat4_GrSLType:
+        case SkSLType::kHalf4: // fall through
+        case SkSLType::kFloat4:
             return 4 * sizeof(float);
-        case kInt_GrSLType: // fall through
-        case kUInt_GrSLType:
+        case SkSLType::kInt: // fall through
+        case SkSLType::kUInt:
             return sizeof(int32_t);
-        case kInt2_GrSLType: // fall through
-        case kUInt2_GrSLType:
+        case SkSLType::kInt2: // fall through
+        case SkSLType::kUInt2:
             return 2 * sizeof(int32_t);
-        case kInt3_GrSLType: // fall through
-        case kUInt3_GrSLType:
+        case SkSLType::kInt3: // fall through
+        case SkSLType::kUInt3:
             return 3 * sizeof(int32_t);
-        case kInt4_GrSLType: // fall through
-        case kUInt4_GrSLType:
+        case SkSLType::kInt4: // fall through
+        case SkSLType::kUInt4:
             return 4 * sizeof(int32_t);
-        case kHalf2x2_GrSLType: // fall through
-        case kFloat2x2_GrSLType:
+        case SkSLType::kHalf2x2: // fall through
+        case SkSLType::kFloat2x2:
             if (layout == GrVkUniformHandler::kStd430Layout) {
                 return 4 * sizeof(float);
             } else {
                 return 8 * sizeof(float);
             }
-        case kHalf3x3_GrSLType: // fall through
-        case kFloat3x3_GrSLType:
+        case SkSLType::kHalf3x3: // fall through
+        case SkSLType::kFloat3x3:
             return 12 * sizeof(float);
-        case kHalf4x4_GrSLType: // fall through
-        case kFloat4x4_GrSLType:
+        case SkSLType::kHalf4x4: // fall through
+        case SkSLType::kFloat4x4:
             return 16 * sizeof(float);
 
         // This query is only valid for certain types.
-        case kVoid_GrSLType:
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
-        case kTexture2DSampler_GrSLType:
-        case kTextureExternalSampler_GrSLType:
-        case kTexture2DRectSampler_GrSLType:
-        case kSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kVoid:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kTextureExternalSampler:
+        case SkSLType::kTexture2DRectSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             break;
     }
     SK_ABORT("Unexpected type");
@@ -162,12 +163,12 @@ static inline uint32_t grsltype_to_vk_size(GrSLType type, int layout) {
 // add taking into consideration all alignment requirements. The uniformOffset is set to the offset
 // for the new uniform, and currentOffset is updated to be the offset to the end of the new uniform.
 static uint32_t get_aligned_offset(uint32_t* currentOffset,
-                                   GrSLType type,
+                                   SkSLType type,
                                    int arrayCount,
                                    int layout) {
-    uint32_t alignmentMask = grsltype_to_alignment_mask(type);
+    uint32_t alignmentMask = sksltype_to_alignment_mask(type);
     // For std140 layout we must make arrays align to 16 bytes.
-    if (layout == GrVkUniformHandler::kStd140Layout && (arrayCount || type == kFloat2x2_GrSLType)) {
+    if (layout == GrVkUniformHandler::kStd140Layout && (arrayCount || type == SkSLType::kFloat2x2)) {
         alignmentMask = 0xF;
     }
     uint32_t offsetDiff = *currentOffset & alignmentMask;
@@ -178,11 +179,11 @@ static uint32_t get_aligned_offset(uint32_t* currentOffset,
     SkASSERT(sizeof(float) == 4);
     if (arrayCount) {
         // TODO: this shouldn't be necessary for std430
-        uint32_t elementSize = std::max<uint32_t>(16, grsltype_to_vk_size(type, layout));
+        uint32_t elementSize = std::max<uint32_t>(16, sksltype_to_vk_size(type, layout));
         SkASSERT(0 == (elementSize & 0xF));
         *currentOffset = uniformOffset + elementSize * arrayCount;
     } else {
-        *currentOffset = uniformOffset + grsltype_to_vk_size(type, layout);
+        *currentOffset = uniformOffset + sksltype_to_vk_size(type, layout);
     }
     return uniformOffset;
 }
@@ -199,13 +200,13 @@ GrVkUniformHandler::~GrVkUniformHandler() {
 GrGLSLUniformHandler::UniformHandle GrVkUniformHandler::internalAddUniformArray(
                                                                    const GrFragmentProcessor* owner,
                                                                    uint32_t visibility,
-                                                                   GrSLType type,
+                                                                   SkSLType type,
                                                                    const char* name,
                                                                    bool mangleName,
                                                                    int arrayCount,
                                                                    const char** outName) {
     SkASSERT(name && strlen(name));
-    SkASSERT(GrSLTypeCanBeUniformValue(type));
+    SkASSERT(SkSLTypeCanBeUniformValue(type));
 
     // TODO this is a bit hacky, lets think of a better way.  Basically we need to be able to use
     // the uniform view matrix name in the GP, and the GP is immutable so it has to tell the PB
@@ -246,7 +247,7 @@ GrGLSLUniformHandler::UniformHandle GrVkUniformHandler::internalAddUniformArray(
 }
 
 GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addSampler(
-        const GrBackendFormat& backendFormat, GrSamplerState state, const GrSwizzle& swizzle,
+        const GrBackendFormat& backendFormat, GrSamplerState state, const skgpu::Swizzle& swizzle,
         const char* name, const GrShaderCaps* shaderCaps) {
     SkASSERT(name && strlen(name));
 
@@ -259,7 +260,7 @@ GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addSampler(
     VkUniformInfo tempInfo;
     tempInfo.fVariable =
             GrShaderVar{std::move(mangleName),
-                        GrSLCombinedSamplerTypeForTextureType(backendFormat.textureType()),
+                        SkSLCombinedSamplerTypeForTextureType(backendFormat.textureType()),
                         GrShaderVar::TypeModifier::Uniform,
                         GrShaderVar::kNonArray,
                         std::move(layoutQualifier),
@@ -290,10 +291,10 @@ GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addSampler(
     return GrGLSLUniformHandler::SamplerHandle(fSamplers.count() - 1);
 }
 
-GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addInputSampler(const GrSwizzle& swizzle,
-                                                                        const char* name) {
+GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addInputSampler(
+            const skgpu::Swizzle& swizzle, const char* name) {
     SkASSERT(name && strlen(name));
-    SkASSERT(fInputUniform.fVariable.getType() == kVoid_GrSLType);
+    SkASSERT(fInputUniform.fVariable.getType() == SkSLType::kVoid);
 
     const char prefix = 'u';
     SkString mangleName = fProgramBuilder->nameVariable(prefix, name, /*mangle=*/true);
@@ -303,7 +304,7 @@ GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addInputSampler(const Gr
                             kDstInputAttachmentIndex, kInputDescSet, kInputBinding);
 
     fInputUniform = {
-            GrShaderVar{std::move(mangleName), kInput_GrSLType, GrShaderVar::TypeModifier::Uniform,
+            GrShaderVar{std::move(mangleName), SkSLType::kInput, GrShaderVar::TypeModifier::Uniform,
                         GrShaderVar::kNonArray, std::move(layoutQualifier), SkString()},
             kFragment_GrShaderFlag, nullptr, SkString(name)};
     fInputSwizzle = swizzle;
@@ -312,14 +313,14 @@ GrGLSLUniformHandler::SamplerHandle GrVkUniformHandler::addInputSampler(const Gr
 
 void GrVkUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString* out) const {
     for (const VkUniformInfo& sampler : fSamplers.items()) {
-        SkASSERT(sampler.fVariable.getType() == kTexture2DSampler_GrSLType ||
-                 sampler.fVariable.getType() == kTextureExternalSampler_GrSLType);
+        SkASSERT(sampler.fVariable.getType() == SkSLType::kTexture2DSampler ||
+                 sampler.fVariable.getType() == SkSLType::kTextureExternalSampler);
         if (visibility == sampler.fVisibility) {
             sampler.fVariable.appendDecl(fProgramBuilder->shaderCaps(), out);
             out->append(";\n");
         }
     }
-    if (fInputUniform.fVariable.getType() == kInput_GrSLType) {
+    if (fInputUniform.fVariable.getType() == SkSLType::kInput) {
         if (visibility == fInputUniform.fVisibility) {
             SkASSERT(visibility == kFragment_GrShaderFlag);
             fInputUniform.fVariable.appendDecl(fProgramBuilder->shaderCaps(), out);
@@ -347,7 +348,7 @@ void GrVkUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString*
     SkString uniformsString;
     for (const VkUniformInfo& localUniform : fUniforms.items()) {
         if (visibility & localUniform.fVisibility) {
-            if (GrSLTypeCanBeUniformValue(localUniform.fVariable.getType())) {
+            if (SkSLTypeCanBeUniformValue(localUniform.fVariable.getType())) {
                 Layout layout = fUsePushConstants ? kStd430Layout : kStd140Layout;
                 uniformsString.appendf("layout(offset=%d) ", localUniform.fOffsets[layout]);
                 localUniform.fVariable.appendDecl(fProgramBuilder->shaderCaps(), &uniformsString);
@@ -371,7 +372,7 @@ void GrVkUniformHandler::appendUniformDecls(GrShaderFlags visibility, SkString*
 uint32_t GrVkUniformHandler::getRTFlipOffset() const {
     Layout layout = fUsePushConstants ? kStd430Layout : kStd140Layout;
     uint32_t currentOffset = fCurrentOffsets[layout];
-    return get_aligned_offset(&currentOffset, kFloat2_GrSLType, 0, layout);
+    return get_aligned_offset(&currentOffset, SkSLType::kFloat2, 0, layout);
 }
 
 void GrVkUniformHandler::determineIfUsePushConstants() const {
diff --git a/third_party/skia/src/gpu/vk/GrVkUniformHandler.h b/third_party/skia/src/gpu/vk/GrVkUniformHandler.h
index 3328780d0ee7c..9fd6eaa17017f 100644
--- a/third_party/skia/src/gpu/vk/GrVkUniformHandler.h
+++ b/third_party/skia/src/gpu/vk/GrVkUniformHandler.h
@@ -55,7 +55,7 @@ class GrVkUniformHandler : public GrGLSLUniformHandler {
     static constexpr int kLayoutCount = kLastLayout + 1;
 
     struct VkUniformInfo : public UniformInfo {
-        // offsets are only valid if the GrSLType of the fVariable is not a sampler.
+        // offsets are only valid if the SkSLType of the fVariable is not a sampler.
         uint32_t                fOffsets[kLayoutCount];
         // fImmutableSampler is used for sampling an image with a ycbcr conversion.
         const GrVkSampler*      fImmutableSampler = nullptr;
@@ -104,7 +104,7 @@ class GrVkUniformHandler : public GrGLSLUniformHandler {
 
     UniformHandle internalAddUniformArray(const GrFragmentProcessor* owner,
                                           uint32_t visibility,
-                                          GrSLType type,
+                                          SkSLType type,
                                           const char* name,
                                           bool mangleName,
                                           int arrayCount,
@@ -112,17 +112,17 @@ class GrVkUniformHandler : public GrGLSLUniformHandler {
 
     SamplerHandle addSampler(const GrBackendFormat&,
                              GrSamplerState,
-                             const GrSwizzle&,
+                             const skgpu::Swizzle&,
                              const char* name,
                              const GrShaderCaps*) override;
 
-    SamplerHandle addInputSampler(const GrSwizzle& swizzle, const char* name) override;
+    SamplerHandle addInputSampler(const skgpu::Swizzle& swizzle, const char* name) override;
 
     int numSamplers() const { return fSamplers.count(); }
     const char* samplerVariable(SamplerHandle handle) const override {
         return fSamplers.item(handle.toIndex()).fVariable.c_str();
     }
-    GrSwizzle samplerSwizzle(SamplerHandle handle) const override {
+    skgpu::Swizzle samplerSwizzle(SamplerHandle handle) const override {
         return fSamplerSwizzles[handle.toIndex()];
     }
     uint32_t samplerVisibility(SamplerHandle handle) const {
@@ -140,7 +140,7 @@ class GrVkUniformHandler : public GrGLSLUniformHandler {
         SkASSERT(handle.toIndex() == 0);
         return fInputUniform.fVariable.c_str();
     }
-    GrSwizzle inputSamplerSwizzle(SamplerHandle handle) const override {
+    skgpu::Swizzle inputSamplerSwizzle(SamplerHandle handle) const override {
         SkASSERT(handle.toIndex() == 0);
         return fInputSwizzle;
     }
@@ -153,12 +153,12 @@ class GrVkUniformHandler : public GrGLSLUniformHandler {
 
     void determineIfUsePushConstants() const;
 
-    UniformInfoArray    fUniforms;
-    UniformInfoArray    fSamplers;
-    SkTArray<GrSwizzle> fSamplerSwizzles;
-    UniformInfo         fInputUniform;
-    GrSwizzle           fInputSwizzle;
-    mutable bool        fUsePushConstants;
+    UniformInfoArray         fUniforms;
+    UniformInfoArray         fSamplers;
+    SkTArray<skgpu::Swizzle> fSamplerSwizzles;
+    UniformInfo              fInputUniform;
+    skgpu::Swizzle           fInputSwizzle;
+    mutable bool             fUsePushConstants;
 
     uint32_t            fCurrentOffsets[kLayoutCount];
 
diff --git a/third_party/skia/src/gpu/vk/GrVkUtil.cpp b/third_party/skia/src/gpu/vk/GrVkUtil.cpp
index 9021edf0524d4..b49fe482b89fc 100644
--- a/third_party/skia/src/gpu/vk/GrVkUtil.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkUtil.cpp
@@ -84,12 +84,12 @@ SkSL::ProgramKind vk_shader_stage_to_skiasl_kind(VkShaderStageFlagBits stage) {
 }
 
 bool GrCompileVkShaderModule(GrVkGpu* gpu,
-                             const SkSL::String& shaderString,
+                             const std::string& shaderString,
                              VkShaderStageFlagBits stage,
                              VkShaderModule* shaderModule,
                              VkPipelineShaderStageCreateInfo* stageInfo,
                              const SkSL::Program::Settings& settings,
-                             SkSL::String* outSPIRV,
+                             std::string* outSPIRV,
                              SkSL::Program::Inputs* outInputs) {
     TRACE_EVENT0("skia.shaders", "CompileVkShaderModule");
     auto errorHandler = gpu->getContext()->priv().getShaderErrorHandler();
@@ -111,7 +111,7 @@ bool GrCompileVkShaderModule(GrVkGpu* gpu,
 }
 
 bool GrInstallVkShaderModule(GrVkGpu* gpu,
-                             const SkSL::String& spirv,
+                             const std::string& spirv,
                              VkShaderStageFlagBits stage,
                              VkShaderModule* shaderModule,
                              VkPipelineShaderStageCreateInfo* stageInfo) {
diff --git a/third_party/skia/src/gpu/vk/GrVkUtil.h b/third_party/skia/src/gpu/vk/GrVkUtil.h
index 08368975740f4..a19ce3b6cfdb3 100644
--- a/third_party/skia/src/gpu/vk/GrVkUtil.h
+++ b/third_party/skia/src/gpu/vk/GrVkUtil.h
@@ -178,16 +178,16 @@ bool GrVkFormatNeedsYcbcrSampler(VkFormat format);
 bool GrSampleCountToVkSampleCount(uint32_t samples, VkSampleCountFlagBits* vkSamples);
 
 bool GrCompileVkShaderModule(GrVkGpu* gpu,
-                             const SkSL::String& shaderString,
+                             const std::string& shaderString,
                              VkShaderStageFlagBits stage,
                              VkShaderModule* shaderModule,
                              VkPipelineShaderStageCreateInfo* stageInfo,
                              const SkSL::Program::Settings& settings,
-                             SkSL::String* outSPIRV,
+                             std::string* outSPIRV,
                              SkSL::Program::Inputs* outInputs);
 
 bool GrInstallVkShaderModule(GrVkGpu* gpu,
-                             const SkSL::String& spirv,
+                             const std::string& spirv,
                              VkShaderStageFlagBits stage,
                              VkShaderModule* shaderModule,
                              VkPipelineShaderStageCreateInfo* stageInfo);
diff --git a/third_party/skia/src/gpu/vk/GrVkVaryingHandler.cpp b/third_party/skia/src/gpu/vk/GrVkVaryingHandler.cpp
index 86fa7d51e5d9d..e53949bd0f7d1 100644
--- a/third_party/skia/src/gpu/vk/GrVkVaryingHandler.cpp
+++ b/third_party/skia/src/gpu/vk/GrVkVaryingHandler.cpp
@@ -7,67 +7,67 @@
 
 #include "src/gpu/vk/GrVkVaryingHandler.h"
 
-/** Returns the number of locations take up by a given GrSLType. We assume that all
+/** Returns the number of locations take up by a given SkSLType. We assume that all
     scalar values are 32 bits. */
-static inline int grsltype_to_location_size(GrSLType type) {
+static inline int sksltype_to_location_size(SkSLType type) {
     switch(type) {
-        case kVoid_GrSLType:
+        case SkSLType::kVoid:
             return 0;
-        case kFloat_GrSLType: // fall through
-        case kHalf_GrSLType:
+        case SkSLType::kFloat: // fall through
+        case SkSLType::kHalf:
             return 1;
-        case kFloat2_GrSLType: // fall through
-        case kHalf2_GrSLType:
+        case SkSLType::kFloat2: // fall through
+        case SkSLType::kHalf2:
             return 1;
-        case kFloat3_GrSLType:
-        case kHalf3_GrSLType:
+        case SkSLType::kFloat3:
+        case SkSLType::kHalf3:
             return 1;
-        case kFloat4_GrSLType:
-        case kHalf4_GrSLType:
+        case SkSLType::kFloat4:
+        case SkSLType::kHalf4:
             return 1;
-        case kInt2_GrSLType:
-        case kUInt2_GrSLType:
-        case kShort2_GrSLType:
-        case kUShort2_GrSLType:
+        case SkSLType::kInt2:
+        case SkSLType::kUInt2:
+        case SkSLType::kShort2:
+        case SkSLType::kUShort2:
             return 1;
-        case kInt3_GrSLType:
-        case kUInt3_GrSLType:
-        case kShort3_GrSLType:
-        case kUShort3_GrSLType:
+        case SkSLType::kInt3:
+        case SkSLType::kUInt3:
+        case SkSLType::kShort3:
+        case SkSLType::kUShort3:
             return 1;
-        case kInt4_GrSLType:
-        case kUInt4_GrSLType:
-        case kShort4_GrSLType:
-        case kUShort4_GrSLType:
+        case SkSLType::kInt4:
+        case SkSLType::kUInt4:
+        case SkSLType::kShort4:
+        case SkSLType::kUShort4:
             return 1;
-        case kFloat2x2_GrSLType:
-        case kHalf2x2_GrSLType:
+        case SkSLType::kFloat2x2:
+        case SkSLType::kHalf2x2:
             return 2;
-        case kFloat3x3_GrSLType:
-        case kHalf3x3_GrSLType:
+        case SkSLType::kFloat3x3:
+        case SkSLType::kHalf3x3:
             return 3;
-        case kFloat4x4_GrSLType:
-        case kHalf4x4_GrSLType:
+        case SkSLType::kFloat4x4:
+        case SkSLType::kHalf4x4:
             return 4;
-        case kTexture2DSampler_GrSLType:
-        case kSampler_GrSLType:
-        case kTexture2D_GrSLType:
-        case kInput_GrSLType:
+        case SkSLType::kTexture2DSampler:
+        case SkSLType::kSampler:
+        case SkSLType::kTexture2D:
+        case SkSLType::kInput:
             return 0;
-        case kTextureExternalSampler_GrSLType:
+        case SkSLType::kTextureExternalSampler:
              return 0;
-        case kTexture2DRectSampler_GrSLType:
+        case SkSLType::kTexture2DRectSampler:
              return 0;
-        case kBool_GrSLType:
-        case kBool2_GrSLType:
-        case kBool3_GrSLType:
-        case kBool4_GrSLType:
+        case SkSLType::kBool:
+        case SkSLType::kBool2:
+        case SkSLType::kBool3:
+        case SkSLType::kBool4:
              return 1;
-        case kInt_GrSLType: // fall through
-        case kShort_GrSLType:
+        case SkSLType::kInt: // fall through
+        case SkSLType::kShort:
              return 1;
-        case kUInt_GrSLType: // fall through
-        case kUShort_GrSLType:
+        case SkSLType::kUInt: // fall through
+        case SkSLType::kUShort:
              return 1;
     }
     SK_ABORT("Unexpected type");
@@ -80,7 +80,7 @@ static void finalize_helper(GrVkVaryingHandler::VarArray& vars) {
         location.appendf("location = %d", locationIndex);
         var.addLayoutQualifier(location.c_str());
 
-        int elementSize = grsltype_to_location_size(var.getType());
+        int elementSize = sksltype_to_location_size(var.getType());
         SkASSERT(elementSize > 0);
         int numElements = var.isArray() ? var.getArrayCount() : 1;
         SkASSERT(numElements > 0);
diff --git a/third_party/skia/src/image/BUILD.bazel b/third_party/skia/src/image/BUILD.bazel
index 8c5f3fd8a76f3..d48d6f654ad78 100644
--- a/third_party/skia/src/image/BUILD.bazel
+++ b/third_party/skia/src/image/BUILD.bazel
@@ -209,7 +209,6 @@ generated_cc_atom(
         "//include/core:SkImageGenerator_hdr",
         "//include/gpu:GrDirectContext_hdr",
         "//include/gpu:GrRecordingContext_hdr",
-        "//include/private:GrResourceKey_hdr",
         "//src/core:SkBitmapCache_hdr",
         "//src/core:SkCachedData_hdr",
         "//src/core:SkImagePriv_hdr",
@@ -224,6 +223,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrSamplerState_hdr",
         "//src/gpu:GrYUVATextureProxies_hdr",
+        "//src/gpu:ResourceKey_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu:SurfaceFillContext_hdr",
         "//src/gpu/effects:GrYUVtoRGBEffect_hdr",
@@ -383,6 +383,7 @@ generated_cc_atom(
         "//src/gpu:GrRecordingContextPriv_hdr",
         "//src/gpu:GrRenderTarget_hdr",
         "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkRenderEngineAbortf_hdr",
     ],
 )
 
diff --git a/third_party/skia/src/image/SkImage.cpp b/third_party/skia/src/image/SkImage.cpp
index 8363c83c6ef94..3496bead57851 100644
--- a/third_party/skia/src/image/SkImage.cpp
+++ b/third_party/skia/src/image/SkImage.cpp
@@ -178,7 +178,7 @@ sk_sp<SkData> SkImage::refEncodedData() const {
 }
 
 sk_sp<SkImage> SkImage::MakeFromEncoded(sk_sp<SkData> encoded,
-                                        skstd::optional<SkAlphaType> alphaType) {
+                                        std::optional<SkAlphaType> alphaType) {
     if (nullptr == encoded || 0 == encoded->size()) {
         return nullptr;
     }
@@ -422,14 +422,14 @@ GrSurfaceProxyView SkImage_Base::FindOrMakeCachedMipmappedView(GrRecordingContex
     }
     GrProxyProvider* proxyProvider = rContext->priv().proxyProvider();
 
-    GrUniqueKey baseKey;
+    skgpu::UniqueKey baseKey;
     GrMakeKeyFromImageID(&baseKey, imageUniqueID, SkIRect::MakeSize(view.dimensions()));
     SkASSERT(baseKey.isValid());
-    GrUniqueKey mipmappedKey;
-    static const GrUniqueKey::Domain kMipmappedDomain = GrUniqueKey::GenerateDomain();
+    skgpu::UniqueKey mipmappedKey;
+    static const skgpu::UniqueKey::Domain kMipmappedDomain = skgpu::UniqueKey::GenerateDomain();
     {  // No extra values beyond the domain are required. Must name the var to please
        // clang-tidy.
-        GrUniqueKey::Builder b(&mipmappedKey, baseKey, kMipmappedDomain, 0);
+        skgpu::UniqueKey::Builder b(&mipmappedKey, baseKey, kMipmappedDomain, 0);
     }
     SkASSERT(mipmappedKey.isValid());
     if (sk_sp<GrTextureProxy> cachedMippedView =
diff --git a/third_party/skia/src/image/SkImage_Gpu.cpp b/third_party/skia/src/image/SkImage_Gpu.cpp
index 745d6d5b03d87..eb4084a1143bb 100644
--- a/third_party/skia/src/image/SkImage_Gpu.cpp
+++ b/third_party/skia/src/image/SkImage_Gpu.cpp
@@ -401,7 +401,8 @@ static sk_sp<SkImage> new_wrapped_texture_common(GrRecordingContext* rContext,
         return nullptr;
     }
 
-    GrSwizzle swizzle = rContext->priv().caps()->getReadSwizzle(proxy->backendFormat(), colorType);
+    skgpu::Swizzle swizzle = rContext->priv().caps()->getReadSwizzle(proxy->backendFormat(),
+                                                                     colorType);
     GrSurfaceProxyView view(std::move(proxy), origin, swizzle);
     SkColorInfo info(GrColorTypeToSkColorType(colorType), at, std::move(colorSpace));
     return sk_make_sp<SkImage_Gpu>(sk_ref_sp(rContext),
@@ -439,7 +440,7 @@ sk_sp<SkImage> SkImage::MakeFromCompressedTexture(GrRecordingContext* rContext,
     CompressionType type = GrBackendFormatToCompressionType(tex.getBackendFormat());
     SkColorType ct = GrCompressionTypeToSkColorType(type);
 
-    GrSurfaceProxyView view(std::move(proxy), origin, GrSwizzle::RGBA());
+    GrSurfaceProxyView view(std::move(proxy), origin, skgpu::Swizzle::RGBA());
     return sk_make_sp<SkImage_Gpu>(sk_ref_sp(rContext),
                                    kNeedNewImageUniqueID,
                                    std::move(view),
@@ -615,7 +616,8 @@ sk_sp<SkImage> SkImage::MakePromiseTexture(sk_sp<GrContextThreadSafeProxy> threa
     if (!proxy) {
         return nullptr;
     }
-    GrSwizzle swizzle = threadSafeProxy->priv().caps()->getReadSwizzle(backendFormat, grColorType);
+    skgpu::Swizzle swizzle = threadSafeProxy->priv().caps()->getReadSwizzle(backendFormat,
+                                                                            grColorType);
     GrSurfaceProxyView view(std::move(proxy), origin, swizzle);
     sk_sp<GrImageContext> ctx(GrImageContextPriv::MakeForPromiseImage(std::move(threadSafeProxy)));
     return sk_make_sp<SkImage_Gpu>(std::move(ctx),
@@ -744,7 +746,7 @@ sk_sp<SkImage> SkImage::MakeFromAHardwareBufferWithData(GrDirectContext* dContex
         return nullptr;
     }
 
-    GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(backendFormat, grColorType);
+    skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(backendFormat, grColorType);
     GrSurfaceProxyView framebufferView(std::move(proxy), surfaceOrigin, swizzle);
     SkColorInfo colorInfo = pixmap.info().colorInfo().makeColorType(colorType);
     sk_sp<SkImage> image = sk_make_sp<SkImage_Gpu>(sk_ref_sp(dContext),
diff --git a/third_party/skia/src/image/SkImage_Gpu.h b/third_party/skia/src/image/SkImage_Gpu.h
index 6329919375b42..0d2427ea52b89 100644
--- a/third_party/skia/src/image/SkImage_Gpu.h
+++ b/third_party/skia/src/image/SkImage_Gpu.h
@@ -139,7 +139,7 @@ class SkImage_Gpu final : public SkImage_GpuBase {
     };
 
     mutable ProxyChooser fChooser;
-    GrSwizzle fSwizzle;
+    skgpu::Swizzle fSwizzle;
     GrSurfaceOrigin fOrigin;
 
     using INHERITED = SkImage_GpuBase;
diff --git a/third_party/skia/src/image/SkImage_Lazy.cpp b/third_party/skia/src/image/SkImage_Lazy.cpp
index 7bcb85c886252..e20a1e9e07c53 100644
--- a/third_party/skia/src/image/SkImage_Lazy.cpp
+++ b/third_party/skia/src/image/SkImage_Lazy.cpp
@@ -18,7 +18,6 @@
 #if SK_SUPPORT_GPU
 #include "include/gpu/GrDirectContext.h"
 #include "include/gpu/GrRecordingContext.h"
-#include "include/private/GrResourceKey.h"
 #include "src/core/SkResourceCache.h"
 #include "src/core/SkYUVPlanesCache.h"
 #include "src/gpu/GrCaps.h"
@@ -29,6 +28,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrSamplerState.h"
 #include "src/gpu/GrYUVATextureProxies.h"
+#include "src/gpu/ResourceKey.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/SurfaceFillContext.h"
 #include "src/gpu/effects/GrYUVtoRGBEffect.h"
@@ -426,7 +426,7 @@ GrSurfaceProxyView SkImage_Lazy::lockTextureProxyView(GrRecordingContext* rConte
 
     enum { kLockTexturePathCount = kRGBA_LockTexturePath + 1 };
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     if (texGenPolicy == GrImageTexGenPolicy::kDraw) {
         GrMakeKeyFromImageID(&key, this->uniqueID(), SkIRect::MakeSize(this->dimensions()));
     }
@@ -449,8 +449,9 @@ GrSurfaceProxyView SkImage_Lazy::lockTextureProxyView(GrRecordingContext* rConte
     if (key.isValid()) {
         auto proxy = proxyProvider->findOrCreateProxyByUniqueKey(key);
         if (proxy) {
-            GrSwizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
-            GrSurfaceProxyView view(std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle);
+            skgpu::Swizzle swizzle = caps->getReadSwizzle(proxy->backendFormat(), ct);
+            GrSurfaceOrigin origin = ScopedGenerator(fSharedGenerator)->origin();
+            GrSurfaceProxyView view(std::move(proxy), origin, swizzle);
             if (mipmapped == GrMipmapped::kNo ||
                 view.asTextureProxy()->mipmapped() == GrMipmapped::kYes) {
                 return view;
diff --git a/third_party/skia/src/image/SkImage_Lazy.h b/third_party/skia/src/image/SkImage_Lazy.h
index 698957c47794f..c2883ffd9d61a 100644
--- a/third_party/skia/src/image/SkImage_Lazy.h
+++ b/third_party/skia/src/image/SkImage_Lazy.h
@@ -23,7 +23,7 @@ class SkImage_Lazy : public SkImage_Base {
     struct Validator {
         Validator(sk_sp<SharedGenerator>, const SkColorType*, sk_sp<SkColorSpace>);
 
-        operator bool() const { return fSharedGenerator.get(); }
+        explicit operator bool() const { return fSharedGenerator.get(); }
 
         sk_sp<SharedGenerator> fSharedGenerator;
         SkImageInfo            fInfo;
diff --git a/third_party/skia/src/image/SkSurface.cpp b/third_party/skia/src/image/SkSurface.cpp
index 6c0a742021f5d..9be89f36e8ed4 100644
--- a/third_party/skia/src/image/SkSurface.cpp
+++ b/third_party/skia/src/image/SkSurface.cpp
@@ -356,6 +356,10 @@ bool SkSurface::replaceBackendTexture(const GrBackendTexture& backendTexture,
                                                releaseContext);
 }
 
+void SkSurface::resolveMSAA() {
+    asSB(this)->onResolveMSAA();
+}
+
 GrSemaphoresSubmitted SkSurface::flush(BackendSurfaceAccess access, const GrFlushInfo& flushInfo) {
     return asSB(this)->onFlush(access, flushInfo, nullptr);
 }
diff --git a/third_party/skia/src/image/SkSurface_Base.h b/third_party/skia/src/image/SkSurface_Base.h
index aeb3afbfffbb7..7c3112139d468 100644
--- a/third_party/skia/src/image/SkSurface_Base.h
+++ b/third_party/skia/src/image/SkSurface_Base.h
@@ -31,6 +31,8 @@ class SkSurface_Base : public SkSurface {
                                          TextureReleaseProc,
                                          ReleaseContext);
 
+    virtual void onResolveMSAA() {}
+
     /**
      * Issue any pending surface IO to the current backend 3D API and resolve any surface MSAA.
      * Inserts the requested number of semaphores for the gpu to signal when work is complete on the
diff --git a/third_party/skia/src/image/SkSurface_Gpu.cpp b/third_party/skia/src/image/SkSurface_Gpu.cpp
index 97d29e8d99361..f151a18615e09 100644
--- a/third_party/skia/src/image/SkSurface_Gpu.cpp
+++ b/third_party/skia/src/image/SkSurface_Gpu.cpp
@@ -24,6 +24,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrRenderTarget.h"
 #include "src/gpu/GrTexture.h"
+#include "src/gpu/SkRenderEngineAbortf.h"
 #include "src/image/SkImage_Base.h"
 #include "src/image/SkImage_Gpu.h"
 #include "src/image/SkSurface_Base.h"
@@ -207,6 +208,8 @@ bool SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) {
 
 void SkSurface_Gpu::onDiscard() { fDevice->discard(); }
 
+void SkSurface_Gpu::onResolveMSAA() { fDevice->resolveMSAA(); }
+
 GrSemaphoresSubmitted SkSurface_Gpu::onFlush(BackendSurfaceAccess access, const GrFlushInfo& info,
                                              const GrBackendSurfaceMutableState* newState) {
 
@@ -434,18 +437,29 @@ static bool validate_backend_texture(const GrCaps* caps, const GrBackendTexture&
 
     GrBackendFormat backendFormat = tex.getBackendFormat();
     if (!backendFormat.isValid()) {
+        RENDERENGINE_ABORTF("%s failed due to an invalid format", __func__);
         return false;
     }
 
     if (!caps->areColorTypeAndFormatCompatible(grCT, backendFormat)) {
+        RENDERENGINE_ABORTF("%s failed due to an invalid format and colorType combination",
+                                __func__);
         return false;
     }
 
     if (!caps->isFormatAsColorTypeRenderable(grCT, backendFormat, sampleCnt)) {
+        RENDERENGINE_ABORTF(
+                "%s failed due to no supported rendering path for the selected "
+                "format and colorType",
+                __func__);
         return false;
     }
 
     if (texturable && !caps->isFormatTexturable(backendFormat, tex.textureType())) {
+        RENDERENGINE_ABORTF(
+                "%s failed due to no texturing support for the selected format and "
+                "colorType",
+                __func__);
         return false;
     }
 
@@ -488,12 +502,15 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
     auto releaseHelper = GrRefCntedCallback::Make(textureReleaseProc, releaseContext);
 
     if (!rContext) {
+        RENDERENGINE_ABORTF("%s failed due to a null context ", __func__);
         return nullptr;
     }
     sampleCnt = std::max(1, sampleCnt);
 
     GrColorType grColorType = SkColorTypeToGrColorType(colorType);
     if (grColorType == GrColorType::kUnknown) {
+        RENDERENGINE_ABORTF(
+                "%s failed due to an unsupported colorType %d", __func__, colorType);
         return nullptr;
     }
 
@@ -505,6 +522,18 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
             tex, sampleCnt, kBorrow_GrWrapOwnership, GrWrapCacheable::kNo,
             std::move(releaseHelper)));
     if (!proxy) {
+#ifdef SK_IN_RENDERENGINE
+        GrGLTextureInfo textureInfo;
+        bool retrievedTextureInfo = tex.getGLTextureInfo(&textureInfo);
+        RENDERENGINE_ABORTF("%s failed to wrap the texture into a renderable target "
+             "\n\tGrBackendTexture: (%i x %i) hasMipmaps: %i isProtected: %i texType: %i"
+             "\n\t\tGrGLTextureInfo: success: %i fTarget: %u fFormat: %u"
+             "\n\tmaxRenderTargetSize: %d",
+             __func__, tex.width(), tex.height(), tex.hasMipmaps(),
+             tex.isProtected(), static_cast<int>(tex.textureType()),
+             retrievedTextureInfo, textureInfo.fTarget, textureInfo.fFormat,
+             rContext->priv().caps()->maxRenderTargetSize());
+#endif
         return nullptr;
     }
 
@@ -513,6 +542,7 @@ sk_sp<SkSurface> SkSurface::MakeFromBackendTexture(GrRecordingContext* rContext,
                                                 SkSurfacePropsCopyOrDefault(props),
                                                 skgpu::BaseDevice::InitContents::kUninit);
     if (!device) {
+        RENDERENGINE_ABORTF("%s failed to wrap the renderTarget into a surface", __func__);
         return nullptr;
     }
 
diff --git a/third_party/skia/src/image/SkSurface_Gpu.h b/third_party/skia/src/image/SkSurface_Gpu.h
index 1a9f0a8b8a6a4..813abead58a3b 100644
--- a/third_party/skia/src/image/SkSurface_Gpu.h
+++ b/third_party/skia/src/image/SkSurface_Gpu.h
@@ -46,6 +46,7 @@ class SkSurface_Gpu : public SkSurface_Base {
                                            ReadPixelsContext context) override;
     bool onCopyOnWrite(ContentChangeMode) override;
     void onDiscard() override;
+    void onResolveMSAA() override;
     GrSemaphoresSubmitted onFlush(BackendSurfaceAccess access, const GrFlushInfo& info,
                                   const GrBackendSurfaceMutableState*) override;
     bool onWait(int numSemaphores, const GrBackendSemaphore* waitSemaphores,
diff --git a/third_party/skia/src/images/SkPngEncoder.cpp b/third_party/skia/src/images/SkPngEncoder.cpp
index 13d8534c47d02..7fa6215c59188 100644
--- a/third_party/skia/src/images/SkPngEncoder.cpp
+++ b/third_party/skia/src/images/SkPngEncoder.cpp
@@ -339,6 +339,7 @@ static transform_scanline_proc choose_proc(const SkImageInfo& info) {
         case kA16_unorm_SkColorType:
         case kA16_float_SkColorType:
         case kR16G16B16A16_unorm_SkColorType:
+        case kR8_unorm_SkColorType:
             return nullptr;
     }
     SkASSERT(false);
diff --git a/third_party/skia/src/opts/SkBlitMask_opts.h b/third_party/skia/src/opts/SkBlitMask_opts.h
index 93ae81c3e2025..19860c75ce65f 100644
--- a/third_party/skia/src/opts/SkBlitMask_opts.h
+++ b/third_party/skia/src/opts/SkBlitMask_opts.h
@@ -50,7 +50,8 @@ namespace SK_OPTS_NS {
         const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
         uint8x8x4_t vpmc;
 
-        maskRB -= width;
+        // Nine patch may set maskRB to 0 to blit the same row repeatedly.
+        ptrdiff_t mask_adjust = (ptrdiff_t)maskRB - width;
         dstRB -= (width << 2);
 
         if (width >= 8) {
@@ -100,7 +101,7 @@ namespace SK_OPTS_NS {
             }
 
             device = (uint32_t*)((char*)device + dstRB);
-            mask += maskRB;
+            mask += mask_adjust;
 
         } while (--height != 0);
     }
@@ -125,7 +126,8 @@ namespace SK_OPTS_NS {
         SkPMColor* SK_RESTRICT device = (SkPMColor*)dst;
         const uint8_t* SK_RESTRICT mask = (const uint8_t*)maskPtr;
 
-        maskRB -= width;
+        // Nine patch may set maskRB to 0 to blit the same row repeatedly.
+        ptrdiff_t mask_adjust = (ptrdiff_t)maskRB - width;
         dstRB -= (width << 2);
         do {
             int w = width;
@@ -150,7 +152,7 @@ namespace SK_OPTS_NS {
                 device += 1;
             }
             device = (uint32_t*)((char*)device + dstRB);
-            mask += maskRB;
+            mask += mask_adjust;
         } while (--height != 0);
     }
 
diff --git a/third_party/skia/src/opts/SkRasterPipeline_opts.h b/third_party/skia/src/opts/SkRasterPipeline_opts.h
index 7948143a4c3d4..84c9aec1c766f 100644
--- a/third_party/skia/src/opts/SkRasterPipeline_opts.h
+++ b/third_party/skia/src/opts/SkRasterPipeline_opts.h
@@ -1957,6 +1957,12 @@ STAGE(store_a8, const SkRasterPipeline_MemoryCtx* ctx) {
     U8 packed = pack(pack(to_unorm(a, 255)));
     store(ptr, packed, tail);
 }
+STAGE(store_r8, const SkRasterPipeline_MemoryCtx* ctx) {
+    auto ptr = ptr_at_xy<uint8_t>(ctx, dx,dy);
+
+    U8 packed = pack(pack(to_unorm(r, 255)));
+    store(ptr, packed, tail);
+}
 
 STAGE(load_565, const SkRasterPipeline_MemoryCtx* ctx) {
     auto ptr = ptr_at_xy<const uint16_t>(ctx, dx,dy);
@@ -2356,6 +2362,15 @@ STAGE(alpha_to_gray_dst, Ctx::None) {
     dr = dg = db = da;
     da = 1;
 }
+STAGE(alpha_to_red, Ctx::None) {
+    r = a;
+    a = 1;
+}
+STAGE(alpha_to_red_dst, Ctx::None) {
+    dr = da;
+    da = 1;
+}
+
 STAGE(bt709_luminance_or_luma_to_alpha, Ctx::None) {
     a = r*0.2126f + g*0.7152f + b*0.0722f;
     r = g = b = 0;
@@ -2868,7 +2883,7 @@ STAGE(bicubic_clamp_8888, const SkRasterPipeline_GatherCtx* ctx) {
     }
 }
 
-// ~~~~~~ GrSwizzle stage ~~~~~~ //
+// ~~~~~~ skgpu::Swizzle stage ~~~~~~ //
 
 STAGE(swizzle, void* ctx) {
     auto ir = r, ig = g, ib = b, ia = a;
@@ -3833,6 +3848,9 @@ STAGE_GP(gather_a8, const SkRasterPipeline_GatherCtx* ctx) {
     r = g = b = 0;
     a = cast<U16>(gather<U8>(ptr, ix));
 }
+STAGE_PP(store_r8, const SkRasterPipeline_MemoryCtx* ctx) {
+    store_8(ptr_at_xy<uint8_t>(ctx, dx,dy), tail, r);
+}
 
 STAGE_PP(alpha_to_gray, Ctx::None) {
     r = g = b = a;
@@ -3842,6 +3860,15 @@ STAGE_PP(alpha_to_gray_dst, Ctx::None) {
     dr = dg = db = da;
     da = 255;
 }
+STAGE_PP(alpha_to_red, Ctx::None) {
+    r = a;
+    a = 255;
+}
+STAGE_PP(alpha_to_red_dst, Ctx::None) {
+    dr = da;
+    da = 255;
+}
+
 STAGE_PP(bt709_luminance_or_luma_to_alpha, Ctx::None) {
     a = (r*54 + g*183 + b*19)/256;  // 0.2126, 0.7152, 0.0722 with 256 denominator.
     r = g = b = 0;
@@ -4223,7 +4250,7 @@ STAGE_PP(srcover_rgba_8888, const SkRasterPipeline_MemoryCtx* ctx) {
     store_8888_(ptr, tail, r,g,b,a);
 }
 
-// ~~~~~~ GrSwizzle stage ~~~~~~ //
+// ~~~~~~ skgpu::Swizzle stage ~~~~~~ //
 
 STAGE_PP(swizzle, void* ctx) {
     auto ir = r, ig = g, ib = b, ia = a;
diff --git a/third_party/skia/src/opts/SkVM_opts.h b/third_party/skia/src/opts/SkVM_opts.h
index 1db89cd37dd95..6cf12b1ff5345 100644
--- a/third_party/skia/src/opts/SkVM_opts.h
+++ b/third_party/skia/src/opts/SkVM_opts.h
@@ -6,6 +6,9 @@
 
 #include "include/private/SkVx.h"
 #include "src/core/SkVM.h"
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
+    #include <immintrin.h>
+#endif
 
 template <int N>
 static inline skvx::Vec<N,int> gather32(const int* ptr, const skvx::Vec<N,int>& ix) {
@@ -84,8 +87,16 @@ namespace SkVMInterpreterTypes {
             r = (Slot*)addr;
         }
 
-        const auto should_trace = [&](int immA, Reg x, Reg y) -> bool {
-            return immA >= 0 && immA < nTraceHooks && any(r[x].i32 & r[y].i32);
+        const auto should_trace = [&](int stride, int immA, Reg x, Reg y) -> bool {
+            if (immA < 0 || immA >= nTraceHooks) {
+                return false;
+            }
+            // When stride == K, all lanes are used.
+            if (stride == K) {
+                return any(r[x].i32 & r[y].i32);
+            }
+            // When stride == 1, only the first lane is used; the rest are not meaningful.
+            return r[x].i32[0] & r[y].i32[0];
         };
 
         // Step each argument pointer ahead by its stride a number of times.
@@ -222,13 +233,13 @@ namespace SkVMInterpreterTypes {
                     break;
 
                     CASE(Op::trace_line):
-                        if (should_trace(immA, x, y)) {
+                        if (should_trace(stride, immA, x, y)) {
                             traceHooks[immA]->line(immB);
                         }
                         break;
 
                     CASE(Op::trace_var):
-                        if (should_trace(immA, x, y)) {
+                        if (should_trace(stride, immA, x, y)) {
                             for (int i = 0; i < K; ++i) {
                                 if (r[x].i32[i] & r[y].i32[i]) {
                                     traceHooks[immA]->var(immB, r[z].i32[i]);
@@ -239,17 +250,23 @@ namespace SkVMInterpreterTypes {
                         break;
 
                     CASE(Op::trace_enter):
-                        if (should_trace(immA, x, y)) {
+                        if (should_trace(stride, immA, x, y)) {
                             traceHooks[immA]->enter(immB);
                         }
                         break;
 
                     CASE(Op::trace_exit):
-                        if (should_trace(immA, x, y)) {
+                        if (should_trace(stride, immA, x, y)) {
                             traceHooks[immA]->exit(immB);
                         }
                         break;
 
+                    CASE(Op::trace_scope):
+                        if (should_trace(stride, immA, x, y)) {
+                            traceHooks[immA]->scope(immB);
+                        }
+                        break;
+
                     CASE(Op::index): {
                         const int iota[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,
                                             16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,
diff --git a/third_party/skia/src/pdf/SkPDFDevice.cpp b/third_party/skia/src/pdf/SkPDFDevice.cpp
index 5ab3a9b7c3603..873460d83b1eb 100644
--- a/third_party/skia/src/pdf/SkPDFDevice.cpp
+++ b/third_party/skia/src/pdf/SkPDFDevice.cpp
@@ -504,7 +504,7 @@ void SkPDFDevice::internalDrawPathWithFilter(const SkClipStack& clipStack,
 
     SkIRect bounds = clipStack.bounds(this->bounds()).roundOut();
     SkMask sourceMask;
-    if (!SkDraw::DrawToMask(path, &bounds, paint->getMaskFilter(), &SkMatrix::I(),
+    if (!SkDraw::DrawToMask(path, bounds, paint->getMaskFilter(), &SkMatrix::I(),
                             &sourceMask, SkMask::kComputeBoundsAndRenderImage_CreateMode,
                             initStyle)) {
         return;
@@ -956,7 +956,9 @@ void SkPDFDevice::internalDrawGlyphRun(
     }
 }
 
-void SkPDFDevice::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
+void SkPDFDevice::onDrawGlyphRunList(SkCanvas*,
+                                     const SkGlyphRunList& glyphRunList,
+                                     const SkPaint& paint) {
     SkASSERT(!glyphRunList.hasRSXForm());
     for (const SkGlyphRun& glyphRun : glyphRunList) {
         this->internalDrawGlyphRun(glyphRun, glyphRunList.origin(), paint);
@@ -970,6 +972,13 @@ void SkPDFDevice::drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPain
     // TODO: implement drawVertices
 }
 
+void SkPDFDevice::drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) {
+    if (this->hasEmptyClip()) {
+        return;
+    }
+    // TODO: implement drawCustomMesh
+}
+
 void SkPDFDevice::drawFormXObject(SkPDFIndirectReference xObject, SkDynamicMemoryWStream* content) {
     ScopedOutputMarkedContentTags mark(fNodeId, fDocument, content);
 
diff --git a/third_party/skia/src/pdf/SkPDFDevice.h b/third_party/skia/src/pdf/SkPDFDevice.h
index 28f77a7099305..bad2cda29869f 100644
--- a/third_party/skia/src/pdf/SkPDFDevice.h
+++ b/third_party/skia/src/pdf/SkPDFDevice.h
@@ -84,8 +84,9 @@ class SkPDFDevice final : public SkClipStackDevice {
                        const SkSamplingOptions&,
                        const SkPaint&,
                        SkCanvas::SrcRectConstraint) override;
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override;
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override;
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override;
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override;
 
     // PDF specific methods.
     void drawSprite(const SkBitmap& bitmap, int x, int y,
diff --git a/third_party/skia/src/pdf/SkPDFDocument.cpp b/third_party/skia/src/pdf/SkPDFDocument.cpp
index 8b478d34aadeb..f760451dc4179 100644
--- a/third_party/skia/src/pdf/SkPDFDocument.cpp
+++ b/third_party/skia/src/pdf/SkPDFDocument.cpp
@@ -219,7 +219,7 @@ SkPDFDocument::SkPDFDocument(SkWStream* stream,
     if (fMetadata.fStructureElementTreeRoot) {
         fTagTree.init(fMetadata.fStructureElementTreeRoot);
     }
-    fExecutor = metadata.fExecutor;
+    fExecutor = fMetadata.fExecutor;
 }
 
 SkPDFDocument::~SkPDFDocument() {
diff --git a/third_party/skia/src/pdf/SkPDFFont.cpp b/third_party/skia/src/pdf/SkPDFFont.cpp
index 276ca157738da..b5409f2acdba5 100644
--- a/third_party/skia/src/pdf/SkPDFFont.cpp
+++ b/third_party/skia/src/pdf/SkPDFFont.cpp
@@ -106,7 +106,7 @@ static bool can_embed(const SkAdvancedTypefaceMetrics& metrics) {
 const SkAdvancedTypefaceMetrics* SkPDFFont::GetMetrics(const SkTypeface* typeface,
                                                        SkPDFDocument* canon) {
     SkASSERT(typeface);
-    SkFontID id = typeface->uniqueID();
+    SkTypefaceID id = typeface->uniqueID();
     if (std::unique_ptr<SkAdvancedTypefaceMetrics>* ptr = canon->fTypefaceMetrics.find(id)) {
         return ptr->get();  // canon retains ownership.
     }
@@ -159,7 +159,7 @@ const std::vector<SkUnichar>& SkPDFFont::GetUnicodeMap(const SkTypeface* typefac
                                                        SkPDFDocument* canon) {
     SkASSERT(typeface);
     SkASSERT(canon);
-    SkFontID id = typeface->uniqueID();
+    SkTypefaceID id = typeface->uniqueID();
     if (std::vector<SkUnichar>* ptr = canon->fToUnicodeMap.find(id)) {
         return *ptr;
     }
@@ -203,9 +203,9 @@ SkPDFFont* SkPDFFont::GetFontResource(SkPDFDocument* doc,
     bool multibyte = SkPDFFont::IsMultiByte(type);
     SkGlyphID subsetCode =
             multibyte ? 0 : first_nonzero_glyph_for_single_byte_encoding(glyph->getGlyphID());
-    uint64_t fontID = (static_cast<uint64_t>(SkTypeface::UniqueID(face)) << 16) | subsetCode;
+    uint64_t typefaceID = (static_cast<uint64_t>(SkTypeface::UniqueID(face)) << 16) | subsetCode;
 
-    if (SkPDFFont* found = doc->fFontMap.find(fontID)) {
+    if (SkPDFFont* found = doc->fFontMap.find(typefaceID)) {
         SkASSERT(multibyte == found->multiByteGlyphs());
         return found;
     }
@@ -227,7 +227,7 @@ SkPDFFont* SkPDFFont::GetFontResource(SkPDFDocument* doc,
     }
     auto ref = doc->reserveRef();
     return doc->fFontMap.set(
-            fontID, SkPDFFont(std::move(typeface), firstNonZeroGlyph, lastGlyph, type, ref));
+            typefaceID, SkPDFFont(std::move(typeface), firstNonZeroGlyph, lastGlyph, type, ref));
 }
 
 SkPDFFont::SkPDFFont(sk_sp<SkTypeface> typeface,
diff --git a/third_party/skia/src/pdf/SkPDFType1Font.cpp b/third_party/skia/src/pdf/SkPDFType1Font.cpp
index 49143004b6c25..7a60669b4b113 100644
--- a/third_party/skia/src/pdf/SkPDFType1Font.cpp
+++ b/third_party/skia/src/pdf/SkPDFType1Font.cpp
@@ -256,12 +256,12 @@ static SkPDFIndirectReference make_type1_font_descriptor(SkPDFDocument* doc,
 
 static const std::vector<SkString>& type_1_glyphnames(SkPDFDocument* canon,
                                                       const SkTypeface* typeface) {
-    SkFontID fontID = typeface->uniqueID();
-    const std::vector<SkString>* glyphNames = canon->fType1GlyphNames.find(fontID);
+    SkTypefaceID typefaceID = typeface->uniqueID();
+    const std::vector<SkString>* glyphNames = canon->fType1GlyphNames.find(typefaceID);
     if (!glyphNames) {
         std::vector<SkString> names(typeface->countGlyphs());
         SkPDFFont::GetType1GlyphNames(*typeface, names.data());
-        glyphNames = canon->fType1GlyphNames.set(fontID, std::move(names));
+        glyphNames = canon->fType1GlyphNames.set(typefaceID, std::move(names));
     }
     SkASSERT(glyphNames);
     return *glyphNames;
@@ -269,13 +269,13 @@ static const std::vector<SkString>& type_1_glyphnames(SkPDFDocument* canon,
 
 static SkPDFIndirectReference type1_font_descriptor(SkPDFDocument* doc,
                                                     const SkTypeface* typeface) {
-    SkFontID fontID = typeface->uniqueID();
-    if (SkPDFIndirectReference* ptr = doc->fFontDescriptors.find(fontID)) {
+    SkTypefaceID typefaceID = typeface->uniqueID();
+    if (SkPDFIndirectReference* ptr = doc->fFontDescriptors.find(typefaceID)) {
         return *ptr;
     }
     const SkAdvancedTypefaceMetrics* info = SkPDFFont::GetMetrics(typeface, doc);
     auto fontDescriptor = make_type1_font_descriptor(doc, typeface, info);
-    doc->fFontDescriptors.set(fontID, fontDescriptor);
+    doc->fFontDescriptors.set(typefaceID, fontDescriptor);
     return fontDescriptor;
 }
 
diff --git a/third_party/skia/src/ports/BUILD.bazel b/third_party/skia/src/ports/BUILD.bazel
index 58e2abbec709b..5a820b35fcd6e 100644
--- a/third_party/skia/src/ports/BUILD.bazel
+++ b/third_party/skia/src/ports/BUILD.bazel
@@ -13,11 +13,17 @@ cc_library(
 cc_library(
     name = "fontmgr_factory",
     deps = selects.with_or({
+        "//bazel/common_config_settings:custom_directory_fontmgr_factory": [
+            ":fontmgr_custom_directory_factory",
+        ],
         "//bazel/common_config_settings:custom_embedded_fontmgr_factory": [
-            ":SkFontMgr_custom_embedded_factory_src",
+            ":fontmgr_custom_embedded_factory",
+        ],
+        "//bazel/common_config_settings:custom_empty_fontmgr_factory": [
+            ":fontmgr_custom_empty_factory",
         ],
         ("//bazel/common_config_settings:empty_fontmgr_factory", "//conditions:default"): [
-            ":SkFontMgr_empty_factory_src",
+            ":fontmgr_empty_factory",
         ],
     }),
 )
@@ -32,6 +38,21 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "fontmgr_empty_factory",
+    deps = [
+        ":SkFontMgr_empty_factory_src",
+    ],
+)
+
+cc_library(
+    name = "fontmgr_custom_directory_factory",
+    deps = [
+        ":SkFontMgr_custom_directory_factory_src",
+        ":fontmgr_custom_directory_srcs",
+    ],
+)
+
 cc_library(
     name = "fontmgr_custom_directory_srcs",
     deps = [
@@ -40,6 +61,14 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "fontmgr_custom_embedded_factory",
+    deps = [
+        ":SkFontMgr_custom_embedded_factory_src",
+        ":fontmgr_custom_embedded_srcs",
+    ],
+)
+
 cc_library(
     name = "fontmgr_custom_embedded_srcs",
     deps = [
@@ -48,6 +77,14 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "fontmgr_custom_empty_factory",
+    deps = [
+        ":SkFontMgr_custom_empty_factory_src",
+        ":fontmgr_custom_empty_srcs",
+    ],
+)
+
 cc_library(
     name = "fontmgr_custom_empty_srcs",
     deps = [
@@ -95,6 +132,15 @@ cc_library(
     }),
 )
 
+cc_library(
+    name = "load_dynamic_library",
+    visibility = ["//:__subpackages__"],
+    deps = select({
+        "@platforms//os:windows": [":SkOSLibrary_win_src"],
+        "//conditions:default": [":SkOSLibrary_posix_src"],
+    }),
+)
+
 cc_library(
     name = "srcs",
     visibility = ["//:__subpackages__"],
@@ -105,6 +151,8 @@ cc_library(
         ":malloc",
         ":osfile",
         ":skdebug",
+        ":load_dynamic_library",
+        ":SkDiscardableMemory_none_src",
     ] + select_multi(
         {
             "//bazel/common_config_settings:custom_directory_fontmgr": [":fontmgr_custom_directory_srcs"],
@@ -236,7 +284,9 @@ generated_cc_atom(
         "//include/core:SkBitmap_hdr",
         "//include/core:SkCanvas_hdr",
         "//include/core:SkColor_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
         "//include/effects:SkGradientShader_hdr",
         "//include/private:SkColorData_hdr",
         "//include/private:SkTo_hdr",
@@ -255,6 +305,7 @@ generated_cc_atom(
         "//include/core:SkBitmap_hdr",
         "//include/core:SkCanvas_hdr",
         "//include/core:SkData_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkFontMetrics_hdr",
         "//include/core:SkPath_hdr",
         "//include/core:SkStream_hdr",
@@ -1006,6 +1057,7 @@ generated_cc_atom(
         ":SkTypeface_win_dw_hdr",
         "//include/codec:SkCodec_hdr",
         "//include/core:SkBitmap_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkFontMetrics_hdr",
         "//include/core:SkPath_hdr",
         "//include/core:SkTypes_hdr",
diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp b/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
index 0cfc932d545ba..c16b2c1cf62b9 100644
--- a/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
+++ b/third_party/skia/src/ports/SkFontConfigInterface_direct.cpp
@@ -493,11 +493,15 @@ const char* kFontFormatTrueType = "TrueType";
 const char* kFontFormatCFF = "CFF";
 #endif
 
-SkFontConfigInterfaceDirect::SkFontConfigInterfaceDirect() {
+SkFontConfigInterfaceDirect::SkFontConfigInterfaceDirect(FcConfig* fc) : fFC(fc)
+{
     SkDEBUGCODE(fontconfiginterface_unittest();)
 }
 
 SkFontConfigInterfaceDirect::~SkFontConfigInterfaceDirect() {
+    if (fFC) {
+        FcConfigDestroy(fFC);
+    }
 }
 
 bool SkFontConfigInterfaceDirect::isAccessible(const char* filename) {
@@ -523,8 +527,15 @@ bool SkFontConfigInterfaceDirect::isValidPattern(FcPattern* pattern) {
     if (!c_filename) {
         return false;
     }
-    UniqueFCConfig fcConfig(FcConfigReference(nullptr));
-    const char* sysroot = (const char*)FcConfigGetSysRoot(fcConfig.get());
+
+    FcConfig* fc = fFC;
+    UniqueFCConfig fcStorage;
+    if (!fc) {
+        fcStorage.reset(FcConfigReference(nullptr));
+        fc = fcStorage.get();
+    }
+
+    const char* sysroot = (const char*)FcConfigGetSysRoot(fc);
     SkString resolvedFilename;
     if (sysroot) {
         resolvedFilename = sysroot;
@@ -584,8 +595,14 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
         return false;
     }
 
+    FcConfig* fc = fFC;
+    UniqueFCConfig fcStorage;
+    if (!fc) {
+        fcStorage.reset(FcConfigReference(nullptr));
+        fc = fcStorage.get();
+    }
+
     FCLocker lock;
-    UniqueFCConfig fcConfig(FcConfigReference(nullptr));
     FcPattern* pattern = FcPatternCreate();
 
     if (familyName) {
@@ -595,7 +612,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
 
     FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
 
-    FcConfigSubstitute(fcConfig.get(), pattern, FcMatchPattern);
+    FcConfigSubstitute(fc, pattern, FcMatchPattern);
     FcDefaultSubstitute(pattern);
 
     // Font matching:
@@ -634,7 +651,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
     }
 
     FcResult result;
-    FcFontSet* font_set = FcFontSort(fcConfig.get(), pattern, 0, nullptr, &result);
+    FcFontSet* font_set = FcFontSort(fc, pattern, 0, nullptr, &result);
     if (!font_set) {
         FcPatternDestroy(pattern);
         return false;
@@ -662,7 +679,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
         FcFontSetDestroy(font_set);
         return false;
     }
-    const char* sysroot = (const char*)FcConfigGetSysRoot(fcConfig.get());
+    const char* sysroot = (const char*)FcConfigGetSysRoot(fc);
     SkString resolvedFilename;
     if (sysroot) {
         resolvedFilename = sysroot;
diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct.h b/third_party/skia/src/ports/SkFontConfigInterface_direct.h
index 8293bfd99b203..e0f3127ed4ae1 100644
--- a/third_party/skia/src/ports/SkFontConfigInterface_direct.h
+++ b/third_party/skia/src/ports/SkFontConfigInterface_direct.h
@@ -15,7 +15,11 @@
 
 class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
 public:
-    SkFontConfigInterfaceDirect();
+    /** Create around a FontConfig instance.
+     *  If 'fc' is nullptr, each method call will use the current config.
+     *  Takes ownership of 'fc' and will call FcConfigDestroy on it.
+     */
+    SkFontConfigInterfaceDirect(FcConfig* fc);
     ~SkFontConfigInterfaceDirect() override;
 
     bool matchFamilyName(const char familyName[],
@@ -30,6 +34,7 @@ class SkFontConfigInterfaceDirect : public SkFontConfigInterface {
     virtual bool isAccessible(const char* filename);
 
 private:
+    FcConfig * const fFC;
     bool isValidPattern(FcPattern* pattern);
     FcPattern* MatchFont(FcFontSet* font_set, const char* post_config_family,
                          const SkString& family);
diff --git a/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp b/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
index 7b70b6413663c..f580bd5ab3cd5 100644
--- a/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
+++ b/third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp
@@ -11,6 +11,6 @@
 SkFontConfigInterface* SkFontConfigInterface::GetSingletonDirectInterface() {
     static SkFontConfigInterface* singleton;
     static SkOnce once;
-    once([]{ singleton = new SkFontConfigInterfaceDirect(); });
+    once([]{ singleton = new SkFontConfigInterfaceDirect(nullptr); });
     return singleton;
 }
diff --git a/third_party/skia/src/ports/SkFontHost_FreeType.cpp b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
index 8853acb76a102..7a677f2d68e50 100644
--- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp
+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
@@ -8,6 +8,7 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkData.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkPath.h"
 #include "include/core/SkStream.h"
@@ -33,6 +34,7 @@
 #include "src/utils/SkMatrix22.h"
 
 #include <memory>
+#include <optional>
 #include <tuple>
 
 #include <ft2build.h>
@@ -186,6 +188,8 @@ class SkTypeface_FreeType::FaceRec {
     SkUniqueFTFace fFace;
     FT_StreamRec fFTStream;
     std::unique_ptr<SkStreamAsset> fSkStream;
+    FT_UShort fFTPaletteEntryCount = 0;
+    std::unique_ptr<SkColor[]> fSkPalette;
 
     static std::unique_ptr<FaceRec> Make(const SkTypeface_FreeType* typeface);
     ~FaceRec();
@@ -193,6 +197,7 @@ class SkTypeface_FreeType::FaceRec {
 private:
     FaceRec(std::unique_ptr<SkStreamAsset> stream);
     void setupAxes(const SkFontData& data);
+    void setupPalette(const SkFontData& data);
 
     // Private to ref_ft_library and unref_ft_library
     static int gFTCount;
@@ -301,6 +306,44 @@ void SkTypeface_FreeType::FaceRec::setupAxes(const SkFontData& data) {
     }
 }
 
+void SkTypeface_FreeType::FaceRec::setupPalette(const SkFontData& data) {
+#ifdef FT_COLOR_H
+    FT_Palette_Data paletteData;
+    if (FT_Palette_Data_Get(fFace.get(), &paletteData)) {
+        return;
+    }
+    if (paletteData.num_palettes < data.getPaletteIndex() ) {
+        return;
+    }
+    FT_Color* ftPalette = nullptr;
+    if (FT_Palette_Select(fFace.get(), data.getPaletteIndex(), &ftPalette)) {
+        return;
+    }
+    fFTPaletteEntryCount = paletteData.num_palette_entries;
+
+    for (int i = 0; i < data.getPaletteOverrideCount(); ++i) {
+        const SkFontArguments::Palette::Override& paletteOverride = data.getPaletteOverrides()[i];
+        if (paletteOverride.index < 0 || fFTPaletteEntryCount <= paletteOverride.index) {
+            continue;
+        }
+        const SkColor& skColor = paletteOverride.color;
+        FT_Color& ftColor = ftPalette[paletteOverride.index];
+        ftColor.blue  = SkColorGetB(skColor);
+        ftColor.green = SkColorGetG(skColor);
+        ftColor.red   = SkColorGetR(skColor);
+        ftColor.alpha = SkColorGetA(skColor);
+    }
+
+    fSkPalette.reset(new SkColor[fFTPaletteEntryCount]);
+    for (int i = 0; i < fFTPaletteEntryCount; ++i) {
+        fSkPalette[i] = SkColorSetARGB(ftPalette[i].alpha,
+                                       ftPalette[i].red,
+                                       ftPalette[i].green,
+                                       ftPalette[i].blue);
+    }
+#endif
+}
+
 // Will return nullptr on failure
 // Caller must lock f_t_mutex() before calling this function.
 std::unique_ptr<SkTypeface_FreeType::FaceRec>
@@ -338,6 +381,7 @@ SkTypeface_FreeType::FaceRec::Make(const SkTypeface_FreeType* typeface) {
     SkASSERT(rec->fFace);
 
     rec->setupAxes(*data);
+    rec->setupPalette(*data);
 
     // FreeType will set the charmap to the "most unicode" cmap if it exists.
     // If there are no unicode cmaps, the charmap is set to nullptr.
@@ -387,6 +431,7 @@ class SkScalerContext_FreeType : public SkScalerContext_FreeType_Base {
     void generateMetrics(SkGlyph* glyph, SkArenaAlloc*) override;
     void generateImage(const SkGlyph& glyph) override;
     bool generatePath(const SkGlyph& glyph, SkPath* path) override;
+    sk_sp<SkDrawable> generateDrawable(const SkGlyph&) override;
     void generateFontMetrics(SkFontMetrics*) override;
 
 private:
@@ -660,9 +705,17 @@ std::unique_ptr<SkFontData> SkTypeface_FreeType::cloneFontData(const SkFontArgum
     SkAutoSTMalloc<4, SkFixed> axisValues(axisCount);
     Scanner::computeAxisValues(axisDefinitions, args.getVariationDesignPosition(), axisValues, name,
                                currentAxisCount == axisCount ? currentPosition.get() : nullptr);
+
     int ttcIndex;
     std::unique_ptr<SkStreamAsset> stream = this->openStream(&ttcIndex);
-    return std::make_unique<SkFontData>(std::move(stream), ttcIndex, axisValues.get(), axisCount);
+
+    return std::make_unique<SkFontData>(std::move(stream),
+                                        ttcIndex,
+                                        args.getPalette().index,
+                                        axisValues.get(),
+                                        axisCount,
+                                        args.getPalette().overrides,
+                                        args.getPalette().overrideCount);
 }
 
 void SkTypeface_FreeType::onFilterRec(SkScalerContextRec* rec) const {
@@ -942,10 +995,6 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(sk_sp<SkTypeface_FreeType> ty
     fMatrix22.yx = SkScalarToFixed(-fMatrix22Scalar.getSkewY());
     fMatrix22.yy = SkScalarToFixed(fMatrix22Scalar.getScaleY());
 
-#ifdef FT_COLOR_H
-    FT_Palette_Select(fFaceRec->fFace.get(), 0, nullptr);
-#endif
-
     fFTSize = ftSize.release();
     fFace = fFaceRec->fFace.get();
     fDoLinearMetrics = linearMetrics;
@@ -1204,9 +1253,7 @@ void SkScalerContext_FreeType::generateMetrics(SkGlyph* glyph, SkArenaAlloc* all
 
         if (haveLayers) {
             glyph->fMaskFormat = SkMask::kARGB32_Format;
-#ifndef SK_IGNORE_GLYPH_HAS_PATH_FIX
             glyph->setPath(alloc, nullptr, false);
-#endif
             if (!(bounds.xMin < bounds.xMax && bounds.yMin < bounds.yMax)) {
                 bounds = { 0, 0, 0, 0 };
             }
@@ -1332,9 +1379,38 @@ void SkScalerContext_FreeType::generateImage(const SkGlyph& glyph) {
                                            SkFixedToScalar(glyph.getSubYFixed()));
         bitmapMatrix = &subpixelBitmapMatrix;
     }
-    generateGlyphImage(fFace, glyph, *bitmapMatrix);
+
+    SkSpan<SkColor> palette(fFaceRec->fSkPalette.get(), fFaceRec->fFTPaletteEntryCount);
+    generateGlyphImage(fFace, glyph, fLoadGlyphFlags, palette, *bitmapMatrix);
 }
 
+sk_sp<SkDrawable> SkScalerContext_FreeType::generateDrawable(const SkGlyph& glyph) {
+    // Because FreeType's FT_Face is stateful (not thread safe) and the current design of this
+    // SkTypeface and SkScalerContext does not work around this, it is necessary lock at least the
+    // FT_Face when using it (this implementation currently locks the whole FT_Library).
+    // It should be possible to draw the drawable straight out of the FT_Face. However, this would
+    // mean locking each time any such drawable is drawn. To avoid locking, this implementation
+    // creates drawables backed as pictures so that they can be played back later without locking.
+    SkAutoMutexExclusive  ac(f_t_mutex());
+
+    if (this->setupSize()) {
+        sk_bzero(glyph.fImage, glyph.imageSize());
+        return nullptr;
+    }
+
+    FT_Error err = FT_Load_Glyph(fFace, glyph.getGlyphID(), fLoadGlyphFlags);
+    if (err != 0) {
+        SK_TRACEFTR(err, "SkScalerContext_FreeType::generateDrawable: FT_Load_Glyph(glyph:%d "
+                     "width:%d height:%d rb:%zu flags:%d) failed.",
+                     glyph.getGlyphID(), glyph.width(), glyph.height(), glyph.rowBytes(),
+                     fLoadGlyphFlags);
+        return nullptr;
+    }
+
+    emboldenIfNeeded(fFace, fFace->glyph, glyph.getGlyphID());
+    SkSpan<SkColor> palette(fFaceRec->fSkPalette.get(), fFaceRec->fFTPaletteEntryCount);
+    return generateGlyphDrawable(fFace, glyph, fLoadGlyphFlags, palette);
+}
 
 bool SkScalerContext_FreeType::generatePath(const SkGlyph& glyph, SkPath* path) {
     SkASSERT(path);
@@ -1795,6 +1871,16 @@ std::unique_ptr<SkFontData> SkTypeface_FreeType::makeFontData() const {
     return this->onMakeFontData();
 }
 
+void SkTypeface_FreeType::FontDataPaletteToDescriptorPalette(const SkFontData& fontData,
+                                                             SkFontDescriptor* desc) {
+    desc->setPaleteIndex(fontData.getPaletteIndex());
+    int paletteOverrideCount = fontData.getPaletteOverrideCount();
+    auto overrides = desc->setPaletteEntryOverrides(paletteOverrideCount);
+    for (int i = 0; i < paletteOverrideCount; ++i) {
+        overrides[i] = fontData.getPaletteOverrides()[i];
+    }
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -1880,9 +1966,13 @@ bool SkTypeface_FreeType::Scanner::scanFont(
         slant = SkFontStyle::kItalic_Slant;
     }
 
-    PS_FontInfoRec psFontInfo;
+    bool hasAxes = face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS;
     TT_OS2* os2 = static_cast<TT_OS2*>(FT_Get_Sfnt_Table(face.get(), ft_sfnt_os2));
-    if (os2 && os2->version != 0xffff) {
+    bool hasOs2 = os2 && os2->version != 0xffff;
+
+    PS_FontInfoRec psFontInfo;
+
+    if (hasOs2) {
         weight = os2->usWeightClass;
         width = os2->usWidthClass;
 
@@ -1890,7 +1980,69 @@ bool SkTypeface_FreeType::Scanner::scanFont(
         if (SkToBool(os2->fsSelection & (1u << 9))) {
             slant = SkFontStyle::kOblique_Slant;
         }
-    } else if (0 == FT_Get_PS_Font_Info(face.get(), &psFontInfo) && psFontInfo.weight) {
+    }
+
+    // Let variable axes override properties from the OS/2 table.
+    if (hasAxes) {
+      AxisDefinitions axisDefinitions;
+      if (GetAxes(face.get(), &axisDefinitions)) {
+        size_t numAxes = axisDefinitions.size();
+        static constexpr SkFourByteTag wghtTag = SkSetFourByteTag('w', 'g', 'h', 't');
+        static constexpr SkFourByteTag wdthTag = SkSetFourByteTag('w', 'd', 't', 'h');
+        static constexpr SkFourByteTag slntTag = SkSetFourByteTag('s', 'l', 'n', 't');
+        std::optional<size_t> wghtIndex;
+        std::optional<size_t> wdthIndex;
+        std::optional<size_t> slntIndex;
+        for(size_t i = 0; i < numAxes; ++i) {
+          if (axisDefinitions[i].fTag == wghtTag) {
+              // Rough validity check, is there sufficient spread and are ranges
+              // within 0-1000.
+              int wghtRange = SkFixedToScalar(axisDefinitions[i].fMaximum) -
+                              SkFixedToScalar(axisDefinitions[i].fMinimum);
+              if (wghtRange > 5 && wghtRange <= 1000 &&
+                  SkFixedToScalar(axisDefinitions[i].fMaximum) <= 1000) {
+                  wghtIndex = i;
+              }
+          }
+          if (axisDefinitions[i].fTag == wdthTag) {
+              // Rough validity check, is there a spread and are ranges within
+              // 0-500.
+              int widthRange = SkFixedToScalar(axisDefinitions[i].fMaximum) -
+                               SkFixedToScalar(axisDefinitions[i].fMinimum);
+              if (widthRange > 0 && widthRange <= 500 &&
+                  SkFixedToScalar(axisDefinitions[i].fMaximum) <= 500)
+                  wdthIndex = i;
+          }
+          if (axisDefinitions[i].fTag == slntTag)
+            slntIndex = i;
+        }
+        SkAutoSTMalloc<4, FT_Fixed> coords(numAxes);
+        if ((wghtIndex || wdthIndex || slntIndex) &&
+            !FT_Get_Var_Design_Coordinates(face.get(), numAxes, coords.get())) {
+            if (wghtIndex) {
+                SkASSERT(*wghtIndex < numAxes);
+                weight = SkScalarRoundToInt(SkFixedToScalar(coords[*wghtIndex]));
+            }
+            if (wdthIndex) {
+                SkASSERT(*wdthIndex < numAxes);
+                SkScalar wdthValue = SkFixedToScalar(coords[*wdthIndex]);
+                width = SkFontDescriptor::SkFontStyleWidthForWidthAxisValue(wdthValue);
+            }
+            if (slntIndex) {
+                SkASSERT(*slntIndex < numAxes);
+                // https://docs.microsoft.com/en-us/typography/opentype/spec/dvaraxistag_slnt
+                // "Scale interpretation: Values can be interpreted as the angle,
+                // in counter-clockwise degrees, of oblique slant from whatever
+                // the designer considers to be upright for that font design."
+                if (SkFixedToScalar(coords[*slntIndex]) < 0) {
+                    slant = SkFontStyle::kOblique_Slant;
+                }
+            }
+        }
+      }
+    }
+
+    if (!hasOs2 && !hasAxes && 0 == FT_Get_PS_Font_Info(face.get(), &psFontInfo) && psFontInfo.weight) {
         static const struct {
             char const * const name;
             int const weight;
diff --git a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
index 3cb383ef6cbc7..92a16991402fd 100644
--- a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
+++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
@@ -9,7 +9,9 @@
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkPath.h"
+#include "include/core/SkPictureRecorder.h"
 #include "include/effects/SkGradientShader.h"
 #include "include/private/SkColorData.h"
 #include "include/private/SkTo.h"
@@ -811,7 +813,7 @@ void colrv1_draw_glyph_with_path(SkCanvas* canvas, const SkSpan<SkColor>& palett
 void colrv1_transform(FT_Face face,
                       FT_COLR_Paint colrv1_paint,
                       SkCanvas* canvas,
-                      SkMatrix* out_transform = 0) {
+                      SkMatrix* out_transform = nullptr) {
     SkMatrix transform;
 
     SkASSERT(canvas || out_transform);
@@ -1235,10 +1237,56 @@ bool colrv1_start_glyph_bounds(SkMatrix *ctm,
 
 }  // namespace
 
-void SkScalerContext_FreeType_Base::generateGlyphImage(
-    FT_Face face,
-    const SkGlyph& glyph,
-    const SkMatrix& bitmapTransform)
+#ifdef FT_COLOR_H
+bool SkScalerContext_FreeType_Base::drawColorGlyph(FT_Face face,
+                                                   const SkGlyph& glyph,
+                                                   uint32_t loadGlyphFlags,
+                                                   SkSpan<SkColor> palette,
+                                                   SkCanvas* canvas) {
+    SkPaint paint;
+    paint.setAntiAlias(true);
+
+    // Only attempt to draw a COLRv1 glyph if FreeType is new enough to have the COLRv1 support.
+#ifdef TT_SUPPORT_COLRV1
+    VisitedSet visited_set;
+    if (colrv1_start_glyph(canvas, palette,
+                           fRec.fForegroundColor,
+                           face, glyph.getGlyphID(),
+                           FT_COLOR_INCLUDE_ROOT_TRANSFORM,
+                           &visited_set))
+    {
+        return true;
+    }
+#endif  // TT_SUPPORT_COLRV1
+
+    // If we didn't have colr v1 layers, try v0 layers.
+    bool haveLayers = false;
+    FT_LayerIterator layerIterator;
+    layerIterator.p = nullptr;
+    FT_UInt layerGlyphIndex = 0;
+    FT_UInt layerColorIndex = 0;
+    while (FT_Get_Color_Glyph_Layer(face, glyph.getGlyphID(), &layerGlyphIndex,
+                                    &layerColorIndex, &layerIterator)) {
+        haveLayers = true;
+        if (layerColorIndex == 0xFFFF) {
+            paint.setColor(fRec.fForegroundColor);
+        } else {
+            paint.setColor(palette[layerColorIndex]);
+        }
+        SkPath path;
+        if (this->generateFacePath(face, layerGlyphIndex, loadGlyphFlags, &path)) {
+            canvas->drawPath(path, paint);
+        }
+    }
+    return haveLayers;
+}
+#endif  // FT_COLOR_H
+
+void SkScalerContext_FreeType_Base::generateGlyphImage(FT_Face face,
+                                                       const SkGlyph& glyph,
+                                                       uint32_t loadGlyphFlags,
+                                                       SkSpan<SkColor> customPalette,
+                                                       const SkMatrix& bitmapTransform)
 {
     const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag);
     const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);
@@ -1281,76 +1329,12 @@ void SkScalerContext_FreeType_Base::generateGlyphImage(
                                      SkFixedToScalar(glyph.getSubYFixed()));
                 }
 
-                SkPaint paint;
-                paint.setAntiAlias(true);
-
-                FT_Palette_Data palette_data;
-                FT_Error err = FT_Palette_Data_Get(face, &palette_data);
-                if (err) {
-                    SK_TRACEFTR(err, "Could not get palette data from %s fontFace.",
-                                face->family_name);
-                    return;
-                }
-
-                SkAutoTArray<SkColor> originalPalette;
-
-                FT_Color* ftPalette;
-                err = FT_Palette_Select(face, 0, &ftPalette);
-                if (err) {
-                    SK_TRACEFTR(err, "Could not get palette colors from %s fontFace.",
-                                face->family_name);
-                    return;
-                }
-                originalPalette.reset(palette_data.num_palette_entries);
-                for (int i = 0; i < palette_data.num_palette_entries; ++i) {
-                    originalPalette[i] = SkColorSetARGB(ftPalette[i].alpha,
-                                                        ftPalette[i].red,
-                                                        ftPalette[i].green,
-                                                        ftPalette[i].blue);
-                }
-                SkSpan<SkColor> paletteSpan(originalPalette.data(),
-                                            palette_data.num_palette_entries);
-
-                FT_Bool haveLayers = false;
+                bool haveLayers = this->drawColorGlyph(face, glyph, loadGlyphFlags,
+                                                       customPalette, &canvas);
 
-#ifdef TT_SUPPORT_COLRV1
-                // Only attempt to draw COLRv1 glyph is FreeType is new enough
-                // to have the COLRv1 additions, as indicated by the
-                // TT_SUPPORT_COLRV1 flag defined by the FreeType headers in
-                // that case.
-                VisitedSet visited_set;
-                haveLayers = colrv1_start_glyph(&canvas, paletteSpan,
-                                                fRec.fForegroundColor,
-                                                face, glyph.getGlyphID(),
-                                                FT_COLOR_INCLUDE_ROOT_TRANSFORM,
-                                                &visited_set);
-#else
-                haveLayers = false;
-#endif
                 if (!haveLayers) {
-                    // If we didn't have colr v1 layers, try v0 layers.
-                    FT_LayerIterator layerIterator;
-                    layerIterator.p = NULL;
-                    FT_UInt layerGlyphIndex = 0;
-                    FT_UInt layerColorIndex = 0;
-                    while (FT_Get_Color_Glyph_Layer(face, glyph.getGlyphID(), &layerGlyphIndex,
-                                                    &layerColorIndex, &layerIterator)) {
-                        haveLayers = true;
-                        if (layerColorIndex == 0xFFFF) {
-                            paint.setColor(fRec.fForegroundColor);
-                        } else {
-                            paint.setColor(paletteSpan[layerColorIndex]);
-                        }
-                        SkPath path;
-                        if (this->generateFacePath(face, layerGlyphIndex, &path)) {
-                            canvas.drawPath(path, paint);
-                        }
-                    }
-                }
-
-                if (!haveLayers) {
-                    SK_TRACEFTR(err, "Could not get layers (neither v0, nor v1) from %s fontFace.",
-                                face->family_name);
+                    SkDebugf("Could not get layers (neither v0, nor v1) from %s fontFace.",
+                             face->family_name);
                     return;
                 }
             } else
@@ -1664,12 +1648,14 @@ bool generateGlyphPathStatic(FT_Face face, SkPath* path) {
     return true;
 }
 
-bool generateFacePathStatic(FT_Face face, SkGlyphID glyphID, SkPath* path) {
-    uint32_t flags = 0; //fLoadGlyphFlags;
-    flags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
-    flags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
+bool generateFacePathStatic(FT_Face face, SkGlyphID glyphID, uint32_t loadGlyphFlags, SkPath* path){
+#ifdef SK_IGNORE_FREETYPE_COLRV0_LOAD_FLAGS_FIX
+    loadGlyphFlags = 0;
+#endif
+    loadGlyphFlags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
+    loadGlyphFlags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
 
-    FT_Error err = FT_Load_Glyph(face, glyphID, flags);
+    FT_Error err = FT_Load_Glyph(face, glyphID, loadGlyphFlags);
     if (err != 0) {
         path->reset();
         return false;
@@ -1687,16 +1673,17 @@ bool generateFacePathCOLRv1(FT_Face face, SkGlyphID glyphID, SkPath* path) {
     uint32_t flags = 0;
     flags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
     flags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
-
+    flags |= FT_LOAD_NO_HINTING;
+    flags |= FT_LOAD_NO_AUTOHINT;
     flags |= FT_LOAD_IGNORE_TRANSFORM;
 
-
     using DoneFTSize = SkFunctionWrapper<decltype(FT_Done_Size), FT_Done_Size>;
     std::unique_ptr<std::remove_pointer_t<FT_Size>, DoneFTSize> unscaledFtSize([face]() -> FT_Size {
         FT_Size size;
         FT_Error err = FT_New_Size(face, &size);
         if (err != 0) {
-            SK_TRACEFTR(err, "FT_New_Size(%s) failed in generateFacePathStaticCOLRv1.", face->family_name);
+            SK_TRACEFTR(err, "FT_New_Size(%s) failed in generateFacePathStaticCOLRv1.",
+                        face->family_name);
             return nullptr;
         }
         return size;
@@ -1752,8 +1739,9 @@ bool SkScalerContext_FreeType_Base::generateGlyphPath(FT_Face face, SkPath* path
 
 bool SkScalerContext_FreeType_Base::generateFacePath(FT_Face face,
                                                      SkGlyphID glyphID,
+                                                     uint32_t loadGlyphFlags,
                                                      SkPath* path) {
-    return generateFacePathStatic(face, glyphID, path);
+    return generateFacePathStatic(face, glyphID, loadGlyphFlags, path);
 }
 
 bool SkScalerContext_FreeType_Base::computeColrV1GlyphBoundingBox(FT_Face face,
@@ -1781,3 +1769,18 @@ bool SkScalerContext_FreeType_Base::computeColrV1GlyphBoundingBox(FT_Face face,
     return false;
 #endif
 }
+
+sk_sp<SkDrawable> SkScalerContext_FreeType_Base::generateGlyphDrawable(
+        FT_Face face, const SkGlyph& glyph, uint32_t loadGlyphFlags, SkSpan<SkColor> palette) {
+#ifdef FT_COLOR_H
+    if (face->glyph->format == FT_GLYPH_FORMAT_OUTLINE && glyph.isColor()) {
+        SkPictureRecorder recorder;
+        SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::Make(glyph.mask().fBounds));
+        if (!this->drawColorGlyph(face, glyph, loadGlyphFlags, palette, recordingCanvas)) {
+            return nullptr;
+        }
+        return recorder.finishRecordingAsDrawable();
+    }
+#endif  // FT_COLOR_H
+    return nullptr;
+}
diff --git a/third_party/skia/src/ports/SkFontHost_FreeType_common.h b/third_party/skia/src/ports/SkFontHost_FreeType_common.h
index 5e6539f20a1c2..ed4869c3edd7e 100644
--- a/third_party/skia/src/ports/SkFontHost_FreeType_common.h
+++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.h
@@ -47,9 +47,14 @@ class SkScalerContext_FreeType_Base : public SkScalerContext {
         : INHERITED(std::move(typeface), effects, desc)
     {}
 
-    void generateGlyphImage(FT_Face face, const SkGlyph& glyph, const SkMatrix& bitmapTransform);
-    bool generateGlyphPath(FT_Face face, SkPath* path);
-    bool generateFacePath(FT_Face face, SkGlyphID glyphID, SkPath* path);
+    bool drawColorGlyph(FT_Face, const SkGlyph&, uint32_t loadGlyphFlags,
+                        SkSpan<SkColor> palette, SkCanvas*);
+    void generateGlyphImage(FT_Face, const SkGlyph&, uint32_t loadGlyphFlags,
+                            SkSpan<SkColor> palette, const SkMatrix& bitmapTransform);
+    bool generateGlyphPath(FT_Face, SkPath*);
+    bool generateFacePath(FT_Face, SkGlyphID, uint32_t loadGlyphFlags, SkPath*);
+    sk_sp<SkDrawable> generateGlyphDrawable(FT_Face, const SkGlyph&, uint32_t loadGlyphFlags,
+                                            SkSpan<SkColor> palette);
 
     // Computes a bounding box for a COLRv1 glyph id in FT_BBox 26.6 format and FreeType's y-up
     // coordinate space.
@@ -91,7 +96,6 @@ class SkTypeface_FreeType : public SkTypeface {
             const SkString& name,
             const SkFontArguments::VariationPosition::Coordinate* currentPosition = nullptr);
         static bool GetAxes(FT_Face face, AxisDefinitions* axes);
-
     private:
         FT_Face openFace(SkStreamAsset* stream, int ttcIndex, FT_Stream ftStream) const;
         FT_Library fLibrary;
@@ -101,9 +105,7 @@ class SkTypeface_FreeType : public SkTypeface {
     /** Fetch units/EM from "head" table if needed (ie for bitmap fonts) */
     static int GetUnitsPerEm(FT_Face face);
 
-    /**
-     *  Return the font data, or nullptr on failure.
-     */
+    /** Return the font data, or nullptr on failure. */
     std::unique_ptr<SkFontData> makeFontData() const;
     class FaceRec;
     FaceRec* getFaceRec() const;
@@ -139,6 +141,8 @@ class SkTypeface_FreeType : public SkTypeface {
     sk_sp<SkData> onCopyTableData(SkFontTableTag) const override;
 
     virtual std::unique_ptr<SkFontData> onMakeFontData() const = 0;
+    /** Utility to fill out the SkFontDescriptor palette information from the SkFontData. */
+    static void FontDataPaletteToDescriptorPalette(const SkFontData&, SkFontDescriptor*);
 
 private:
     mutable SkOnce fFTFaceOnce;
diff --git a/third_party/skia/src/ports/SkFontHost_win.cpp b/third_party/skia/src/ports/SkFontHost_win.cpp
index aec0881f8cd15..f322723a16237 100644
--- a/third_party/skia/src/ports/SkFontHost_win.cpp
+++ b/third_party/skia/src/ports/SkFontHost_win.cpp
@@ -462,10 +462,10 @@ class HDCOffscreen {
     const void* draw(const SkGlyph&, bool isBW, size_t* srcRBPtr);
 
 private:
-    HDC     fDC{0};
-    HFONT   fSavefont{0};
-    HBITMAP fBM{0};
-    HFONT   fFont{0};
+    HDC     fDC{nullptr};
+    HFONT   fSavefont{nullptr};
+    HBITMAP fBM{nullptr};
+    HFONT   fFont{nullptr};
     XFORM   fXform{1, 0, 0, 1, 0, 0};
     void*   fBits{nullptr};  // points into fBM
     int     fWidth{0};
@@ -477,9 +477,9 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
                                size_t* srcRBPtr) {
     // Can we share the scalercontext's fDDC, so we don't need to create
     // a separate fDC here?
-    if (0 == fDC) {
+    if (nullptr == fDC) {
         fDC = CreateCompatibleDC(0);
-        if (0 == fDC) {
+        if (nullptr == fDC) {
             return nullptr;
         }
         SetGraphicsMode(fDC, GM_ADVANCED);
@@ -494,7 +494,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
 
     if (fBM && (fIsBW != isBW || fWidth < glyph.width() || fHeight < glyph.height())) {
         DeleteObject(fBM);
-        fBM = 0;
+        fBM = nullptr;
     }
     fIsBW = isBW;
 
@@ -503,7 +503,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
 
     int biWidth = isBW ? alignTo32(fWidth) : fWidth;
 
-    if (0 == fBM) {
+    if (nullptr == fBM) {
         MyBitmapInfo info;
         sk_bzero(&info, sizeof(info));
         if (isBW) {
@@ -522,7 +522,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
             info.bmiHeader.biClrUsed = 2;
         }
         fBM = CreateDIBSection(fDC, &info, DIB_RGB_COLORS, &fBits, 0, 0);
-        if (0 == fBM) {
+        if (nullptr == fBM) {
             return nullptr;
         }
         SelectObject(fDC, fBM);
@@ -539,7 +539,8 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW,
     SetWorldTransform(fDC, &xform);
 
     uint16_t glyphID = glyph.getGlyphID();
-    BOOL ret = ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, nullptr, reinterpret_cast<LPCWSTR>(&glyphID), 1, nullptr);
+    BOOL ret = ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, nullptr, reinterpret_cast<LPCWSTR>(&glyphID),
+                           1, nullptr);
     GdiFlush();
     if (0 == ret) {
         return nullptr;
@@ -634,10 +635,10 @@ SkScalerContext_GDI::SkScalerContext_GDI(sk_sp<LogFontTypeface> rawTypeface,
                                          const SkScalerContextEffects& effects,
                                          const SkDescriptor* desc)
         : SkScalerContext(std::move(rawTypeface), effects, desc)
-        , fDDC(0)
-        , fSavefont(0)
-        , fFont(0)
-        , fSC(0)
+        , fDDC(nullptr)
+        , fSavefont(nullptr)
+        , fFont(nullptr)
+        , fSC(nullptr)
 {
     LogFontTypeface* typeface = static_cast<LogFontTypeface*>(this->getTypeface());
 
@@ -973,7 +974,7 @@ void SkScalerContext_GDI::generateFontMetrics(SkFontMetrics* metrics) {
     metrics->fXHeight = SkIntToScalar(otm.otmsXHeight);
     GLYPHMETRICS gm;
     sk_bzero(&gm, sizeof(gm));
-    DWORD len = GetGlyphOutlineW(fDDC, 'x', GGO_METRICS, &gm, 0, 0, &gMat2Identity);
+    DWORD len = GetGlyphOutlineW(fDDC, 'x', GGO_METRICS, &gm, 0, nullptr, &gMat2Identity);
     if (len != GDI_ERROR && gm.gmBlackBoxY > 0) {
         metrics->fXHeight = SkIntToScalar(gm.gmBlackBoxY);
     }
@@ -1784,7 +1785,7 @@ static HANDLE activate_font(SkData* fontData) {
     //AddFontMemResourceEx just copies the data, but does not specify const.
     HANDLE fontHandle = AddFontMemResourceEx(const_cast<void*>(fontData->data()),
                                              static_cast<DWORD>(fontData->size()),
-                                             0,
+                                             nullptr,
                                              &numFonts);
 
     if (fontHandle != nullptr && numFonts < 1) {
@@ -1961,7 +1962,7 @@ void LogFontTypeface::onCharsToGlyphs(const SkUnichar* uni, int glyphCount,
     }
     bool Ox1FHack = !(tm.tmPitchAndFamily & TMPF_VECTOR) /*&& winVer < Vista */;
 
-    SCRIPT_CACHE sc = 0;
+    SCRIPT_CACHE sc = nullptr;
     static const int scratchCount = 256;
     WCHAR scratch[scratchCount];
     int glyphIndex = 0;
diff --git a/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp b/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
index 43fa7a74fc7bd..33778e3e65bca 100644
--- a/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp
@@ -39,7 +39,7 @@ std::unique_ptr<SkFontData> SkTypeface_FCI::onMakeFontData() const {
 
     const SkFontConfigInterface::FontIdentity& id = this->getIdentity();
     return std::make_unique<SkFontData>(std::unique_ptr<SkStreamAsset>(fFCI->openStream(id)),
-                                          id.fTTCIndex, nullptr, 0);
+                                        id.fTTCIndex, 0, nullptr, 0, nullptr, 0);
 }
 
 void SkTypeface_FCI::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocalStream) const {
@@ -47,6 +47,9 @@ void SkTypeface_FCI::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocalSt
     this->getFamilyName(&name);
     desc->setFamilyName(name.c_str());
     desc->setStyle(this->fontStyle());
+    if (fFontData) {
+        SkTypeface_FreeType::FontDataPaletteToDescriptorPalette(*fFontData, desc);
+    }
     *isLocalStream = SkToBool(fFontData);
 }
 
@@ -234,11 +237,13 @@ class SkFontMgr_FCI : public SkFontMgr {
         SkString name;
         SkFontStyle style;
         bool isFixedPitch = false;
-        if (!fScanner.scanFont(stream.get(), 0, &name, &style, &isFixedPitch, nullptr)) {
+        if (!fScanner.scanFont(stream.get(), ttcIndex,
+                               &name, &style, &isFixedPitch, nullptr)) {
             return nullptr;
         }
 
-        auto fontData = std::make_unique<SkFontData>(std::move(stream), ttcIndex, nullptr, 0);
+        auto fontData = std::make_unique<SkFontData>(std::move(stream), ttcIndex, 0,
+                                                     nullptr, 0, nullptr, 0);
         return sk_sp<SkTypeface>(SkTypeface_FCI::Create(std::move(fontData), std::move(name),
                                                         style, isFixedPitch));
     }
@@ -270,8 +275,11 @@ class SkFontMgr_FCI : public SkFontMgr {
 
         auto fontData = std::make_unique<SkFontData>(std::move(stream),
                                                      args.getCollectionIndex(),
+                                                     args.getPalette().index,
                                                      axisValues.get(),
-                                                     axisDefinitions.count());
+                                                     axisDefinitions.count(),
+                                                     args.getPalette().overrides,
+                                                     args.getPalette().overrideCount);
         return sk_sp<SkTypeface>(SkTypeface_FCI::Create(std::move(fontData), std::move(name),
                                                         style, isFixedPitch));
     }
diff --git a/third_party/skia/src/ports/SkFontMgr_android.cpp b/third_party/skia/src/ports/SkFontMgr_android.cpp
index 3ef7e10edb29a..49fc79adde54f 100644
--- a/third_party/skia/src/ports/SkFontMgr_android.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_android.cpp
@@ -94,8 +94,8 @@ class SkTypeface_AndroidSystem : public SkTypeface_Android {
         return this->makeStream();
     }
     std::unique_ptr<SkFontData> onMakeFontData() const override {
-        return std::make_unique<SkFontData>(this->makeStream(), fIndex,
-                                              fAxes.begin(), fAxes.count());
+        return std::make_unique<SkFontData>(
+                this->makeStream(), fIndex, 0, fAxes.begin(), fAxes.count(), nullptr, 0);
     }
     sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override {
         std::unique_ptr<SkFontData> data = this->cloneFontData(args);
@@ -138,6 +138,7 @@ class SkTypeface_AndroidStream : public SkTypeface_Android {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
+        SkTypeface_FreeType::FontDataPaletteToDescriptorPalette(*fData, desc);
         *serialize = true;
     }
 
@@ -448,7 +449,8 @@ class SkFontMgr_Android : public SkFontMgr {
         if (!fScanner.scanFont(stream.get(), ttcIndex, &name, &style, &isFixedPitch, nullptr)) {
             return nullptr;
         }
-        auto data = std::make_unique<SkFontData>(std::move(stream), ttcIndex, nullptr, 0);
+        auto data = std::make_unique<SkFontData>(std::move(stream), ttcIndex, 0,
+                                                 nullptr, 0, nullptr, 0);
         return sk_sp<SkTypeface>(new SkTypeface_AndroidStream(std::move(data),
                                                               style, isFixedPitch, name));
     }
@@ -470,8 +472,10 @@ class SkFontMgr_Android : public SkFontMgr {
         Scanner::computeAxisValues(axisDefinitions, args.getVariationDesignPosition(),
                                    axisValues, name);
 
-        auto data = std::make_unique<SkFontData>(std::move(stream), args.getCollectionIndex(),
-                                                   axisValues.get(), axisDefinitions.count());
+        auto data = std::make_unique<SkFontData>(
+            std::move(stream), args.getCollectionIndex(), args.getPalette().index,
+            axisValues.get(), axisDefinitions.count(),
+            args.getPalette().overrides, args.getPalette().overrideCount);
         return sk_sp<SkTypeface>(new SkTypeface_AndroidStream(std::move(data),
                                                               style, isFixedPitch, name));
     }
diff --git a/third_party/skia/src/ports/SkFontMgr_android_parser.h b/third_party/skia/src/ports/SkFontMgr_android_parser.h
index 415874a7424a8..3a6dea230510e 100644
--- a/third_party/skia/src/ports/SkFontMgr_android_parser.h
+++ b/third_party/skia/src/ports/SkFontMgr_android_parser.h
@@ -123,7 +123,7 @@ void GetCustomFontFamilies(SkTDArray<FontFamily*>& fontFamilies,
  *
  *  If the string cannot be parsed into 'value', returns false and does not change 'value'.
  */
-template <typename T> static bool parse_non_negative_integer(const char* s, T* value) {
+template <typename T> bool parse_non_negative_integer(const char* s, T* value) {
     static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
 
     if (*s == '\0') {
@@ -160,7 +160,7 @@ template <typename T> static bool parse_non_negative_integer(const char* s, T* v
  *
  *  If the string cannot be parsed into 'value', returns false and does not change 'value'.
  */
-template <int N, typename T> static bool parse_fixed(const char* s, T* value) {
+template <int N, typename T> bool parse_fixed(const char* s, T* value) {
     static_assert(std::numeric_limits<T>::is_integer, "T_must_be_integer");
     static_assert(std::numeric_limits<T>::is_signed, "T_must_be_signed");
     static_assert(sizeof(T) * CHAR_BIT - N >= 5, "N_must_leave_four_bits_plus_sign");
diff --git a/third_party/skia/src/ports/SkFontMgr_custom.cpp b/third_party/skia/src/ports/SkFontMgr_custom.cpp
index 695c04de8b3fe..72ccb029ea043 100644
--- a/third_party/skia/src/ports/SkFontMgr_custom.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_custom.cpp
@@ -87,6 +87,11 @@ sk_sp<SkTypeface> SkTypeface_Stream::onMakeClone(const SkFontArguments& args) co
                                          familyName);
 }
 
+void SkTypeface_Stream::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const {
+    this->SkTypeface_Custom::onGetFontDescriptor(desc, isLocal);
+    SkTypeface_FreeType::FontDataPaletteToDescriptorPalette(*fData, desc);
+}
+
 SkTypeface_File::SkTypeface_File(const SkFontStyle& style, bool isFixedPitch, bool sysFont,
                                  const SkString familyName, const char path[], int index)
     : INHERITED(style, isFixedPitch, sysFont, familyName, index)
@@ -120,7 +125,7 @@ std::unique_ptr<SkFontData> SkTypeface_File::onMakeFontData() const {
     if (!stream) {
         return nullptr;
     }
-    return std::make_unique<SkFontData>(std::move(stream), index, nullptr, 0);
+    return std::make_unique<SkFontData>(std::move(stream), index, 0, nullptr, 0, nullptr, 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -240,8 +245,7 @@ sk_sp<SkTypeface> SkFontMgr_Custom::onMakeFromStreamArgs(std::unique_ptr<SkStrea
     SkString name;
     Scanner::AxisDefinitions axisDefinitions;
     if (!fScanner.scanFont(stream.get(), args.getCollectionIndex(),
-                            &name, &style, &isFixedPitch, &axisDefinitions))
-    {
+                           &name, &style, &isFixedPitch, &axisDefinitions)) {
         return nullptr;
     }
 
@@ -249,8 +253,10 @@ sk_sp<SkTypeface> SkFontMgr_Custom::onMakeFromStreamArgs(std::unique_ptr<SkStrea
     SkAutoSTMalloc<4, SkFixed> axisValues(axisDefinitions.count());
     Scanner::computeAxisValues(axisDefinitions, position, axisValues, name);
 
-    auto data = std::make_unique<SkFontData>(std::move(stream), args.getCollectionIndex(),
-                                               axisValues.get(), axisDefinitions.count());
+    auto data = std::make_unique<SkFontData>(
+        std::move(stream), args.getCollectionIndex(), args.getPalette().index,
+        axisValues.get(), axisDefinitions.count(),
+        args.getPalette().overrides, args.getPalette().overrideCount);
     return sk_sp<SkTypeface>(new SkTypeface_Stream(std::move(data), style, isFixedPitch, false, name));
 }
 
diff --git a/third_party/skia/src/ports/SkFontMgr_custom.h b/third_party/skia/src/ports/SkFontMgr_custom.h
index 8a70c6e32eaa6..f973f7485f153 100644
--- a/third_party/skia/src/ports/SkFontMgr_custom.h
+++ b/third_party/skia/src/ports/SkFontMgr_custom.h
@@ -68,6 +68,7 @@ class SkTypeface_Stream : public SkTypeface_Custom {
     std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override;
     std::unique_ptr<SkFontData> onMakeFontData() const override;
     sk_sp<SkTypeface> onMakeClone(const SkFontArguments& args) const override;
+    void onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) const override;
 
 private:
     const std::unique_ptr<const SkFontData> fData;
diff --git a/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp b/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
index 45af7d00aa69a..f99dfb7603353 100644
--- a/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_custom_embedded.cpp
@@ -99,7 +99,8 @@ static void load_font_from_data(const SkTypeface_FreeType::Scanner& scanner,
             addTo = new SkFontStyleSet_Custom(realname);
             families->push_back().reset(addTo);
         }
-        auto data = std::make_unique<SkFontData>(stream->duplicate(), faceIndex, nullptr, 0);
+        auto data = std::make_unique<SkFontData>(stream->duplicate(), faceIndex, 0,
+                                                 nullptr, 0, nullptr, 0);
         addTo->appendTypeface(sk_make_sp<SkTypeface_Stream>(std::move(data),
                                                             style, isFixedPitch,
                                                             true, realname));
diff --git a/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp b/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp
index 1a1416815c9de..c87f20ac7d2db 100644
--- a/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_fontconfig.cpp
@@ -410,6 +410,7 @@ class SkTypeface_stream : public SkTypeface_FreeType {
     }
 
     void onGetFontDescriptor(SkFontDescriptor* desc, bool* serialize) const override {
+        SkTypeface_FreeType::FontDataPaletteToDescriptorPalette(*fData, desc);
         *serialize = true;
     }
 
@@ -541,7 +542,7 @@ class SkTypeface_fontconfig : public SkTypeface_FreeType {
             return nullptr;
         }
         // TODO: FC_VARIABLE and FC_FONT_VARIATIONS
-        return std::make_unique<SkFontData>(std::move(stream), index, nullptr, 0);
+        return std::make_unique<SkFontData>(std::move(stream), index, 0, nullptr, 0, nullptr, 0);
     }
 
     ~SkTypeface_fontconfig() override {
@@ -966,7 +967,8 @@ class SkFontMgr_fontconfig : public SkFontMgr {
             return nullptr;
         }
 
-        auto data = std::make_unique<SkFontData>(std::move(stream), ttcIndex, nullptr, 0);
+        auto data = std::make_unique<SkFontData>(std::move(stream), ttcIndex, 0,
+                                                 nullptr, 0, nullptr, 0);
         return sk_sp<SkTypeface>(new SkTypeface_stream(std::move(data), std::move(name),
                                                        style, isFixedWidth));
     }
@@ -988,8 +990,10 @@ class SkFontMgr_fontconfig : public SkFontMgr {
         Scanner::computeAxisValues(axisDefinitions, args.getVariationDesignPosition(),
                                    axisValues, name);
 
-        auto data = std::make_unique<SkFontData>(std::move(stream), args.getCollectionIndex(),
-                                                   axisValues.get(), axisDefinitions.count());
+        auto data = std::make_unique<SkFontData>(
+            std::move(stream), args.getCollectionIndex(), args.getPalette().index,
+            axisValues.get(), axisDefinitions.count(),
+            args.getPalette().overrides, args.getPalette().overrideCount);
         return sk_sp<SkTypeface>(new SkTypeface_stream(std::move(data), std::move(name),
                                                        style, isFixedPitch));
     }
diff --git a/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp b/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp
index db9135fd1bae0..00c35240ad718 100644
--- a/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_fuchsia.cpp
@@ -217,8 +217,10 @@ sk_sp<SkTypeface> CreateTypefaceFromSkStream(std::unique_ptr<SkStreamAsset> stre
     SkAutoSTMalloc<4, SkFixed> axisValues(axisDefinitions.count());
     Scanner::computeAxisValues(axisDefinitions, position, axisValues, name);
 
-    auto fontData = std::make_unique<SkFontData>(std::move(stream), args.getCollectionIndex(),
-                                                 axisValues.get(), axisDefinitions.count());
+    auto fontData = std::make_unique<SkFontData>(
+        std::move(stream), args.getCollectionIndex(), args.getPalette().index,
+        axisValues.get(), axisDefinitions.count(),
+        args.getPalette().overrides, args.getPalette().overrideCount);
     return sk_make_sp<SkTypeface_Fuchsia>(std::move(fontData), style, isFixedPitch, name, id);
 }
 
@@ -369,9 +371,8 @@ SkTypeface* SkFontMgr_Fuchsia::onMatchFamilyStyleCharacter(const char familyName
     return typeface.release();
 }
 
-sk_sp<SkTypeface> SkFontMgr_Fuchsia::onMakeFromData(sk_sp<SkData>, int ttcIndex) const {
-    SkASSERT(false);
-    return nullptr;
+sk_sp<SkTypeface> SkFontMgr_Fuchsia::onMakeFromData(sk_sp<SkData> data, int ttcIndex) const {
+    return makeFromStream(std::make_unique<SkMemoryStream>(std::move(data)), ttcIndex);
 }
 
 sk_sp<SkTypeface> SkFontMgr_Fuchsia::onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset> asset,
diff --git a/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp b/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp
index 63ce994355fe2..23efa6e6b136e 100644
--- a/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp
+++ b/third_party/skia/src/ports/SkFontMgr_mac_ct.cpp
@@ -56,7 +56,8 @@ static uint32_t SkGetCoreTextVersion() {
 
 static uint32_t SkGetCoreTextVersion() {
     // Check for CoreText availability before calling CTGetCoreTextVersion().
-    if (&CTGetCoreTextVersion) {
+    static const bool kCoreTextIsAvailable = (&CTGetCoreTextVersion != nullptr);
+    if (kCoreTextIsAvailable) {
         return CTGetCoreTextVersion();
     }
 
diff --git a/third_party/skia/src/ports/SkImageGenerator_none.cpp b/third_party/skia/src/ports/SkImageGenerator_none.cpp
index 8af24474c200e..226bb126c1b07 100644
--- a/third_party/skia/src/ports/SkImageGenerator_none.cpp
+++ b/third_party/skia/src/ports/SkImageGenerator_none.cpp
@@ -8,6 +8,6 @@
 #include "include/core/SkImageGenerator.h"
 
 std::unique_ptr<SkImageGenerator> SkImageGenerator::MakeFromEncodedImpl(
-        sk_sp<SkData>, skstd::optional<SkAlphaType>) {
+        sk_sp<SkData>, std::optional<SkAlphaType>) {
     return nullptr;
 }
diff --git a/third_party/skia/src/ports/SkImageGenerator_skia.cpp b/third_party/skia/src/ports/SkImageGenerator_skia.cpp
index 1f1465d55c647..e0f990d388fed 100644
--- a/third_party/skia/src/ports/SkImageGenerator_skia.cpp
+++ b/third_party/skia/src/ports/SkImageGenerator_skia.cpp
@@ -9,6 +9,6 @@
 #include "src/codec/SkCodecImageGenerator.h"
 
 std::unique_ptr<SkImageGenerator> SkImageGenerator::MakeFromEncodedImpl(
-        sk_sp<SkData> data, skstd::optional<SkAlphaType> at) {
+        sk_sp<SkData> data, std::optional<SkAlphaType> at) {
     return SkCodecImageGenerator::MakeFromEncodedCodec(std::move(data), at);
 }
diff --git a/third_party/skia/src/ports/SkOSFile_posix.cpp b/third_party/skia/src/ports/SkOSFile_posix.cpp
index fa5987c04c93d..a76be4f34c53b 100644
--- a/third_party/skia/src/ports/SkOSFile_posix.cpp
+++ b/third_party/skia/src/ports/SkOSFile_posix.cpp
@@ -24,6 +24,13 @@
 #include "src/ports/SkOSFile_ios.h"
 #endif
 
+void sk_fsync(FILE* f) {
+#if !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) && !defined(_NEWLIB_VERSION)
+    int fd = fileno(f);
+    fsync(fd);
+#endif
+}
+
 bool sk_exists(const char *path, SkFILE_Flags flags) {
     int mode = F_OK;
     if (flags & kRead_SkFILE_Flag) {
diff --git a/third_party/skia/src/ports/SkOSFile_stdio.cpp b/third_party/skia/src/ports/SkOSFile_stdio.cpp
index fe2b74911e4e9..4e0bb98f3ada0 100644
--- a/third_party/skia/src/ports/SkOSFile_stdio.cpp
+++ b/third_party/skia/src/ports/SkOSFile_stdio.cpp
@@ -12,10 +12,6 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#ifdef SK_BUILD_FOR_UNIX
-#include <unistd.h>
-#endif
-
 #ifdef _WIN32
 #include <direct.h>
 #include <io.h>
@@ -128,14 +124,6 @@ void sk_fflush(FILE* f) {
     fflush(f);
 }
 
-void sk_fsync(FILE* f) {
-#if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
-        && !defined(_NEWLIB_VERSION)
-    int fd = fileno(f);
-    fsync(fd);
-#endif
-}
-
 size_t sk_ftell(FILE* f) {
     long curr = ftell(f);
     if (curr < 0) {
diff --git a/third_party/skia/src/ports/SkOSFile_win.cpp b/third_party/skia/src/ports/SkOSFile_win.cpp
index 09f727ec54a4a..2f5fc1610aa6a 100644
--- a/third_party/skia/src/ports/SkOSFile_win.cpp
+++ b/third_party/skia/src/ports/SkOSFile_win.cpp
@@ -20,6 +20,10 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
+void sk_fsync(FILE* f) {
+    _commit(sk_fileno(f));
+}
+
 bool sk_exists(const char *path, SkFILE_Flags flags) {
     int mode = 0; // existence
     if (flags & kRead_SkFILE_Flag) {
diff --git a/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp b/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
index b2202e58f78ba..5a24bf479ecca 100644
--- a/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
+++ b/third_party/skia/src/ports/SkScalerContext_mac_ct.cpp
@@ -118,6 +118,7 @@ SkScalerContext_Mac::SkScalerContext_Mac(sk_sp<SkTypeface_Mac> typeface,
                                          const SkScalerContextEffects& effects,
                                          const SkDescriptor* desc)
         : INHERITED(std::move(typeface), effects, desc)
+        , fOffscreen(fRec.fForegroundColor)
         , fDoSubPosition(SkToBool(fRec.fFlags & kSubpixelPositioning_Flag))
 
 {
@@ -150,6 +151,27 @@ static int RoundSize(int dimension) {
     return SkNextPow2(dimension);
 }
 
+static CGColorRef CGColorForSkColor(CGColorSpaceRef rgbcs, SkColor bgra) {
+    CGFloat components[4];
+    components[0] = (CGFloat)SkColorGetR(bgra) * (1/255.0f);
+    components[1] = (CGFloat)SkColorGetG(bgra) * (1/255.0f);
+    components[2] = (CGFloat)SkColorGetB(bgra) * (1/255.0f);
+    // CoreText applies the CGContext fill color as the COLR foreground color.
+    // However, the alpha is applied to the whole glyph drawing (and Skia will do that as well).
+    // For now, cannot really support COLR foreground color alpha.
+    components[3] = 1.0f;
+    return CGColorCreate(rgbcs, components);
+}
+
+SkScalerContext_Mac::Offscreen::Offscreen(SkColor foregroundColor)
+    : fCG(nullptr)
+    , fSKForegroundColor(foregroundColor)
+    , fDoAA(false)
+    , fDoLCD(false)
+{
+    fSize.set(0, 0);
+}
+
 CGRGBPixel* SkScalerContext_Mac::Offscreen::getCG(const SkScalerContext_Mac& context,
                                                   const SkGlyph& glyph, CGGlyph glyphID,
                                                   size_t* rowBytesPtr,
@@ -159,6 +181,7 @@ CGRGBPixel* SkScalerContext_Mac::Offscreen::getCG(const SkScalerContext_Mac& con
         //Regular blends and antialiased text are always (s*a + d*(1-a))
         //and subpixel antialiased text is always g=2.0.
         fRGBSpace.reset(CGColorSpaceCreateDeviceRGB());
+        fCGForegroundColor.reset(CGColorForSkColor(fRGBSpace.get(), fSKForegroundColor));
     }
 
     // default to kBW_Format
@@ -214,8 +237,12 @@ CGRGBPixel* SkScalerContext_Mac::Offscreen::getCG(const SkScalerContext_Mac& con
 
         CGContextSetTextDrawingMode(fCG.get(), kCGTextFill);
 
-        // Draw black on white to create mask. (Special path exists to speed this up in CG.)
-        CGContextSetGrayFillColor(fCG.get(), 0.0f, 1.0f);
+        if (SkMask::kARGB32_Format != glyph.maskFormat()) {
+            // Draw black on white to create mask. (Special path exists to speed this up in CG.)
+            CGContextSetGrayFillColor(fCG.get(), 0.0f, 1.0f);
+        } else {
+            CGContextSetFillColorWithColor(fCG.get(), fCGForegroundColor.get());
+        }
 
         // force our checks below to happen
         fDoAA = !doAA;
@@ -272,6 +299,10 @@ bool SkScalerContext_Mac::generateAdvance(SkGlyph* glyph) {
 void SkScalerContext_Mac::generateMetrics(SkGlyph* glyph, SkArenaAlloc* alloc) {
     glyph->fMaskFormat = fRec.fMaskFormat;
 
+    if (((SkTypeface_Mac*)this->getTypeface())->fHasColorGlyphs) {
+        glyph->setPath(alloc, nullptr, false);
+    }
+
     const CGGlyph cgGlyph = (CGGlyph) glyph->getGlyphID();
     glyph->zeroMetrics();
 
diff --git a/third_party/skia/src/ports/SkScalerContext_mac_ct.h b/third_party/skia/src/ports/SkScalerContext_mac_ct.h
index f9c9c9717c632..8f17eb54332e6 100644
--- a/third_party/skia/src/ports/SkScalerContext_mac_ct.h
+++ b/third_party/skia/src/ports/SkScalerContext_mac_ct.h
@@ -53,14 +53,7 @@ class SkScalerContext_Mac : public SkScalerContext {
 private:
     class Offscreen {
     public:
-        Offscreen()
-            : fRGBSpace(nullptr)
-            , fCG(nullptr)
-            , fDoAA(false)
-            , fDoLCD(false)
-        {
-            fSize.set(0, 0);
-        }
+        Offscreen(SkColor foregroundColor);
 
         CGRGBPixel* getCG(const SkScalerContext_Mac& context, const SkGlyph& glyph,
                           CGGlyph glyphID, size_t* rowBytesPtr, bool generateA8FromLCD);
@@ -74,6 +67,8 @@ class SkScalerContext_Mac : public SkScalerContext {
 
         // cached state
         SkUniqueCFRef<CGContextRef> fCG;
+        SkUniqueCFRef<CGColorRef> fCGForegroundColor;
+        SkColor fSKForegroundColor;
         SkISize fSize;
         bool fDoAA;
         bool fDoLCD;
diff --git a/third_party/skia/src/ports/SkScalerContext_win_dw.cpp b/third_party/skia/src/ports/SkScalerContext_win_dw.cpp
index e897614e3932b..c3637833dc51a 100644
--- a/third_party/skia/src/ports/SkScalerContext_win_dw.cpp
+++ b/third_party/skia/src/ports/SkScalerContext_win_dw.cpp
@@ -13,6 +13,7 @@
 
 #include "include/codec/SkCodec.h"
 #include "include/core/SkBitmap.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkFontMetrics.h"
 #include "include/core/SkPath.h"
 #include "include/private/SkMutex.h"
@@ -262,9 +263,6 @@ SkScalerContext_DW::SkScalerContext_DW(sk_sp<DWriteFontTypeface> typefaceRef,
 {
     DWriteFontTypeface* typeface = this->getDWriteTypeface();
     fGlyphCount = typeface->fDWriteFontFace->GetGlyphCount();
-    fIsColorFont = typeface->fFactory2 &&
-                   typeface->fDWriteFontFace2 &&
-                   typeface->fDWriteFontFace2->IsColorFont();
 
     // In general, all glyphs should use NATURAL_SYMMETRIC
     // except when bi-level rendering is requested or there are embedded
@@ -744,19 +742,16 @@ void SkScalerContext_DW::generateMetrics(SkGlyph* glyph, SkArenaAlloc* alloc) {
         return;
     }
 
-    if (fIsColorFont && isColorGlyph(*glyph) && generateColorMetrics(glyph)) {
+    DWriteFontTypeface* typeface = this->getDWriteTypeface();
+    if (typeface->fIsColorFont && isColorGlyph(*glyph) && generateColorMetrics(glyph)) {
         glyph->fMaskFormat = SkMask::kARGB32_Format;
-#ifndef SK_IGNORE_GLYPH_HAS_PATH_FIX
         glyph->setPath(alloc, nullptr, false);
-#endif
         return;
     }
 
-    if (fIsColorFont && isPngGlyph(*glyph) && generatePngMetrics(glyph)) {
+    if (typeface->fIsColorFont && isPngGlyph(*glyph) && generatePngMetrics(glyph)) {
         glyph->fMaskFormat = SkMask::kARGB32_Format;
-#ifndef SK_IGNORE_GLYPH_HAS_PATH_FIX
         glyph->setPath(alloc, nullptr, false);
-#endif
         return;
     }
 
@@ -1056,34 +1051,22 @@ const void* SkScalerContext_DW::drawDWMask(const SkGlyph& glyph,
     return fBits.begin();
 }
 
-void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
-    SkASSERT(isColorGlyph(glyph));
-    SkASSERT(glyph.fMaskFormat == SkMask::Format::kARGB32_Format);
-
-    memset(glyph.fImage, 0, glyph.imageSize());
-
+void SkScalerContext_DW::drawColorGlyphImage(const SkGlyph& glyph, SkCanvas& canvas) {
     SkTScopedComPtr<IDWriteColorGlyphRunEnumerator> colorLayers;
-    getColorGlyphRun(glyph, &colorLayers);
-    SkASSERT(colorLayers.get());
-
-    SkMatrix matrix = fSkXform;
-    matrix.postTranslate(-SkIntToScalar(glyph.left()), -SkIntToScalar(glyph.top()));
-    if (this->isSubpixel()) {
-        matrix.postTranslate(SkFixedToScalar(glyph.getSubXFixed()),
-                             SkFixedToScalar(glyph.getSubYFixed()));
+    if (!getColorGlyphRun(glyph, &colorLayers)) {
+        SK_ABORT("Could not get color layers");
+        return;
     }
-    SkRasterClip rc(SkIRect::MakeWH(glyph.width(), glyph.height()));
-    SkDraw draw;
-    draw.fDst = SkPixmap(SkImageInfo::MakeN32(glyph.width(), glyph.height(), kPremul_SkAlphaType),
-                         glyph.fImage,
-                         glyph.rowBytesUsingFormat(SkMask::Format::kARGB32_Format));
-    SkMatrixProvider matrixProvider(matrix);
-    draw.fMatrixProvider = &matrixProvider;
-    draw.fRC = &rc;
 
     SkPaint paint;
     paint.setAntiAlias(fRenderingMode != DWRITE_RENDERING_MODE_ALIASED);
 
+    if (this->isSubpixel()) {
+        canvas.translate(SkFixedToScalar(glyph.getSubXFixed()),
+                         SkFixedToScalar(glyph.getSubYFixed()));
+    }
+    canvas.concat(fSkXform);
+
     BOOL hasNextRun = FALSE;
     while (SUCCEEDED(colorLayers->MoveNext(&hasNextRun)) && hasNextRun) {
         const DWRITE_COLOR_GLYPH_RUN* colorGlyph;
@@ -1097,11 +1080,8 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
                                    sk_float_round2int(colorGlyph->runColor.b * 255));
         } else {
             // If all components of runColor are 0 or (equivalently) paletteIndex is 0xFFFF then
-            // the 'current brush' is used. fRec.getLuminanceColor() is kinda sorta what is wanted
-            // here, but not really, it will often be the wrong value because it wan't designed for
-            // this.
-            // TODO: implement this fully, bug.skia.org/5788
-            color = fRec.getLuminanceColor();
+            // the 'foreground color' is used.
+            color = fRec.fForegroundColor;
         }
         paint.setColor(color);
 
@@ -1112,25 +1092,42 @@ void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
         {
             Exclusive l(maybe_dw_mutex(*this->getDWriteTypeface()));
             HRVM(colorGlyph->glyphRun.fontFace->GetGlyphRunOutline(
-                colorGlyph->glyphRun.fontEmSize,
-                colorGlyph->glyphRun.glyphIndices,
-                colorGlyph->glyphRun.glyphAdvances,
-                colorGlyph->glyphRun.glyphOffsets,
-                colorGlyph->glyphRun.glyphCount,
-                colorGlyph->glyphRun.isSideways,
-                colorGlyph->glyphRun.bidiLevel % 2, //rtl
-                geometryToPath.get()),
-                "Could not create glyph outline.");
+                     colorGlyph->glyphRun.fontEmSize,
+                     colorGlyph->glyphRun.glyphIndices,
+                     colorGlyph->glyphRun.glyphAdvances,
+                     colorGlyph->glyphRun.glyphOffsets,
+                     colorGlyph->glyphRun.glyphCount,
+                     colorGlyph->glyphRun.isSideways,
+                     colorGlyph->glyphRun.bidiLevel % 2, //rtl
+                     geometryToPath.get()),
+                 "Could not create glyph outline.");
         }
-        draw.drawPath(path, paint, nullptr, true /* pathIsMutable */);
+        canvas.drawPath(path, paint);
     }
 }
-
-void SkScalerContext_DW::generatePngGlyphImage(const SkGlyph& glyph) {
-    SkASSERT(isPngGlyph(glyph));
+void SkScalerContext_DW::generateColorGlyphImage(const SkGlyph& glyph) {
+    SkASSERT(isColorGlyph(glyph));
     SkASSERT(glyph.fMaskFormat == SkMask::Format::kARGB32_Format);
-    SkASSERT(this->getDWriteTypeface()->fDWriteFontFace4);
 
+    SkBitmap dstBitmap;
+    // TODO: mark this as sRGB when the blits will be sRGB.
+    dstBitmap.setInfo(SkImageInfo::Make(glyph.fWidth, glyph.fHeight,
+                                        kN32_SkColorType, kPremul_SkAlphaType),
+                                        glyph.rowBytes());
+    dstBitmap.setPixels(glyph.fImage);
+
+    SkCanvas canvas(dstBitmap);
+#ifdef SK_SHOW_TEXT_BLIT_COVERAGE
+    canvas.clear(0x33FF0000);
+#else
+    canvas.clear(SK_ColorTRANSPARENT);
+#endif
+    canvas.translate(-SkIntToScalar(glyph.fLeft), -SkIntToScalar(glyph.fTop));
+
+    this->drawColorGlyphImage(glyph, canvas);
+}
+
+void SkScalerContext_DW::drawPngGlyphImage(const SkGlyph& glyph, SkCanvas& canvas) {
     IDWriteFontFace4* fontFace4 = this->getDWriteTypeface()->fDWriteFontFace4.get();
     DWRITE_GLYPH_IMAGE_DATA glyphData;
     void* glyphDataContext;
@@ -1147,16 +1144,6 @@ void SkScalerContext_DW::generatePngGlyphImage(const SkGlyph& glyph) {
                                               context);
     sk_sp<SkImage> image = SkImage::MakeFromEncoded(std::move(data));
 
-    SkBitmap dstBitmap;
-    dstBitmap.setInfo(SkImageInfo::Make(glyph.width(), glyph.height(),
-                                        kN32_SkColorType,
-                                        kPremul_SkAlphaType),
-                      glyph.rowBytes());
-    dstBitmap.setPixels(glyph.fImage);
-
-    SkCanvas canvas(dstBitmap);
-    canvas.clear(SK_ColorTRANSPARENT);
-    canvas.translate(-glyph.left(), -glyph.top());
     if (this->isSubpixel()) {
         canvas.translate(SkFixedToScalar(glyph.getSubXFixed()),
                          SkFixedToScalar(glyph.getSubYFixed()));
@@ -1168,6 +1155,24 @@ void SkScalerContext_DW::generatePngGlyphImage(const SkGlyph& glyph) {
     canvas.drawImage(image, 0, 0);
 }
 
+void SkScalerContext_DW::generatePngGlyphImage(const SkGlyph& glyph) {
+    SkASSERT(isPngGlyph(glyph));
+    SkASSERT(glyph.fMaskFormat == SkMask::Format::kARGB32_Format);
+    SkASSERT(this->getDWriteTypeface()->fDWriteFontFace4);
+
+    SkBitmap dstBitmap;
+    dstBitmap.setInfo(SkImageInfo::Make(glyph.width(), glyph.height(),
+                                        kN32_SkColorType, kPremul_SkAlphaType),
+                                        glyph.rowBytes());
+    dstBitmap.setPixels(glyph.fImage);
+
+    SkCanvas canvas(dstBitmap);
+    canvas.clear(SK_ColorTRANSPARENT);
+    canvas.translate(-glyph.left(), -glyph.top());
+
+    this->drawPngGlyphImage(glyph, canvas);
+}
+
 void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
     //Create the mask.
     DWRITE_RENDERING_MODE renderingMode = fRenderingMode;
@@ -1178,12 +1183,12 @@ void SkScalerContext_DW::generateImage(const SkGlyph& glyph) {
     }
 
     if (SkMask::kARGB32_Format == glyph.fMaskFormat) {
-        if (fIsColorFont) {
+        if (this->getDWriteTypeface()->fIsColorFont) {
             if (isColorGlyph(glyph)) {
-                generateColorGlyphImage(glyph);
+                this->generateColorGlyphImage(glyph);
                 return;
             } else if (isPngGlyph(glyph)) {
-                generatePngGlyphImage(glyph);
+                this->generatePngGlyphImage(glyph);
                 return;
             }
         }
@@ -1271,4 +1276,25 @@ bool SkScalerContext_DW::generatePath(const SkGlyph& glyph, SkPath* path) {
     return true;
 }
 
+sk_sp<SkDrawable> SkScalerContext_DW::generateDrawable(const SkGlyph& glyph) {
+    struct DirectWriteGlyphDrawable : public SkDrawable {
+        SkScalerContext_DW* fSelf;
+        SkGlyph fGlyph;
+        DirectWriteGlyphDrawable(SkScalerContext_DW* self, const SkGlyph& glyph)
+            : fSelf(self), fGlyph(glyph) {}
+        SkRect onGetBounds() override { return fGlyph.rect();  }
+        size_t onApproximateBytesUsed() override { return sizeof(DirectWriteGlyphDrawable); }
+
+        void onDraw(SkCanvas* canvas) override {
+            fSelf->drawColorGlyphImage(fGlyph, *canvas);
+        }
+    };
+    if (this->getDWriteTypeface()->fIsColorFont) {
+        if (isColorGlyph(glyph)) {
+            return sk_sp<DirectWriteGlyphDrawable>(new DirectWriteGlyphDrawable(this, glyph));
+        }
+    }
+    return nullptr;
+}
+
 #endif//defined(SK_BUILD_FOR_WIN)
diff --git a/third_party/skia/src/ports/SkScalerContext_win_dw.h b/third_party/skia/src/ports/SkScalerContext_win_dw.h
index 8ed5cf9a5233b..b3dfb61442d91 100644
--- a/third_party/skia/src/ports/SkScalerContext_win_dw.h
+++ b/third_party/skia/src/ports/SkScalerContext_win_dw.h
@@ -31,6 +31,7 @@ class SkScalerContext_DW : public SkScalerContext {
     void generateMetrics(SkGlyph* glyph, SkArenaAlloc*) override;
     void generateImage(const SkGlyph& glyph) override;
     bool generatePath(const SkGlyph&, SkPath*) override;
+    sk_sp<SkDrawable> generateDrawable(const SkGlyph&) override;
     void generateFontMetrics(SkFontMetrics*) override;
 
 private:
@@ -59,23 +60,20 @@ class SkScalerContext_DW : public SkScalerContext {
                            DWRITE_TEXTURE_TYPE textureType,
                            RECT* bbox);
 
-    bool isColorGlyph(const SkGlyph& glyph);
-
-    bool isPngGlyph(const SkGlyph& glyph);
-
     DWriteFontTypeface* getDWriteTypeface() {
         return static_cast<DWriteFontTypeface*>(this->getTypeface());
     }
 
-    bool getColorGlyphRun(const SkGlyph& glyph, IDWriteColorGlyphRunEnumerator** colorGlyph);
-
-    bool generateColorMetrics(SkGlyph* glyph);
-
-    void generateColorGlyphImage(const SkGlyph& glyph);
-
-    bool generatePngMetrics(SkGlyph* glyph);
+    bool isColorGlyph(const SkGlyph&);
+    bool getColorGlyphRun(const SkGlyph&, IDWriteColorGlyphRunEnumerator**);
+    bool generateColorMetrics(SkGlyph*);
+    void generateColorGlyphImage(const SkGlyph&);
+    void drawColorGlyphImage(const SkGlyph&, SkCanvas&);
 
-    void generatePngGlyphImage(const SkGlyph& glyph);
+    bool isPngGlyph(const SkGlyph&);
+    bool generatePngMetrics(SkGlyph*);
+    void generatePngGlyphImage(const SkGlyph&);
+    void drawPngGlyphImage(const SkGlyph&, SkCanvas&);
 
 
     SkTDArray<uint8_t> fBits;
@@ -93,7 +91,6 @@ class SkScalerContext_DW : public SkScalerContext {
     DWRITE_MEASURING_MODE fMeasuringMode;
     DWRITE_TEXT_ANTIALIAS_MODE fAntiAliasMode;
     DWRITE_GRID_FIT_MODE fGridFitMode;
-    bool fIsColorFont;
 };
 
 #endif
diff --git a/third_party/skia/src/ports/SkTypeface_mac_ct.cpp b/third_party/skia/src/ports/SkTypeface_mac_ct.cpp
index c770fd001b03c..fda759251571b 100644
--- a/third_party/skia/src/ports/SkTypeface_mac_ct.cpp
+++ b/third_party/skia/src/ports/SkTypeface_mac_ct.cpp
@@ -775,6 +775,33 @@ std::unique_ptr<SkStreamAsset> SkTypeface_Mac::onOpenStream(int* ttcIndex) const
     return fStream->duplicate();
 }
 
+std::unique_ptr<SkStreamAsset> SkTypeface_Mac::onOpenExistingStream(int* ttcIndex) const {
+    *ttcIndex = 0;
+    return fStream ? fStream->duplicate() : nullptr;
+}
+
+static bool has_table(CTFontRef ctFont, SkFontTableTag tableTag) {
+    SkUniqueCFRef<CFArrayRef> cfArray(
+            CTFontCopyAvailableTables(ctFont, kCTFontTableOptionNoOptions));
+    if (!cfArray) {
+        return 0;
+    }
+    CFIndex count = CFArrayGetCount(cfArray.get());
+    for (CFIndex i = 0; i < count; ++i) {
+        uintptr_t fontTag = reinterpret_cast<uintptr_t>(
+            CFArrayGetValueAtIndex(cfArray.get(), i));
+        if (tableTag == static_cast<SkFontTableTag>(fontTag)) {
+            return true;
+        }
+    }
+    return false;
+}
+bool SkTypeface_Mac::onGlyphMaskNeedsCurrentColor() const {
+    constexpr SkFontTableTag cpalTag = SkSetFourByteTag('C', 'P', 'A', 'L');
+    // CoreText only provides the size of a table with a copy, so do not use this->getTableSize().
+    return has_table(fFontRef.get(), cpalTag);
+}
+
 int SkTypeface_Mac::onGetVariationDesignPosition(
         SkFontArguments::VariationPosition::Coordinate coordinates[], int coordinateCount) const
 {
@@ -860,9 +887,9 @@ int SkTypeface_Mac::onGetTableTags(SkFontTableTag tags[]) const {
     if (!cfArray) {
         return 0;
     }
-    int count = SkToInt(CFArrayGetCount(cfArray.get()));
+    CFIndex count = CFArrayGetCount(cfArray.get());
     if (tags) {
-        for (int i = 0; i < count; ++i) {
+        for (CFIndex i = 0; i < count; ++i) {
             uintptr_t fontTag = reinterpret_cast<uintptr_t>(
                 CFArrayGetValueAtIndex(cfArray.get(), i));
             tags[i] = static_cast<SkFontTableTag>(fontTag);
diff --git a/third_party/skia/src/ports/SkTypeface_mac_ct.h b/third_party/skia/src/ports/SkTypeface_mac_ct.h
index 2937b025b3f02..70cfa98c2d37b 100644
--- a/third_party/skia/src/ports/SkTypeface_mac_ct.h
+++ b/third_party/skia/src/ports/SkTypeface_mac_ct.h
@@ -94,7 +94,8 @@ class SkTypeface_Mac : public SkTypeface {
 protected:
     int onGetUPEM() const override;
     std::unique_ptr<SkStreamAsset> onOpenStream(int* ttcIndex) const override;
-    bool onGlyphMaskNeedsCurrentColor() const override { return false; }
+    std::unique_ptr<SkStreamAsset> onOpenExistingStream(int* ttcIndex) const override;
+    bool onGlyphMaskNeedsCurrentColor() const override;
     int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
                                      int coordinateCount) const override;
     void onGetFamilyName(SkString* familyName) const override;
diff --git a/third_party/skia/src/ports/SkTypeface_win_dw.cpp b/third_party/skia/src/ports/SkTypeface_win_dw.cpp
index 525ddef6a3f9e..141a0f2effa32 100644
--- a/third_party/skia/src/ports/SkTypeface_win_dw.cpp
+++ b/third_party/skia/src/ports/SkTypeface_win_dw.cpp
@@ -155,6 +155,10 @@ SkTypeface::LocalizedStrings* DWriteFontTypeface::onCreateFamilyNameIterator() c
     return nameIter.release();
 }
 
+bool DWriteFontTypeface::onGlyphMaskNeedsCurrentColor() const {
+    return fDWriteFontFace2 && fDWriteFontFace2->GetColorPaletteCount() > 0;
+}
+
 int DWriteFontTypeface::onGetVariationDesignPosition(
     SkFontArguments::VariationPosition::Coordinate coordinates[], int coordinateCount) const
 {
diff --git a/third_party/skia/src/ports/SkTypeface_win_dw.h b/third_party/skia/src/ports/SkTypeface_win_dw.h
index 608966716dce8..77180adc0c0f2 100644
--- a/third_party/skia/src/ports/SkTypeface_win_dw.h
+++ b/third_party/skia/src/ports/SkTypeface_win_dw.h
@@ -90,6 +90,8 @@ class DWriteFontTypeface : public SkTypeface {
         if (fDWriteFontFace1 && fDWriteFontFace1->IsMonospacedFont()) {
             this->setIsFixedPitch(true);
         }
+
+        fIsColorFont = fFactory2 && fDWriteFontFace2 && fDWriteFontFace2->IsColorFont();
     }
 
 public:
@@ -101,6 +103,7 @@ class DWriteFontTypeface : public SkTypeface {
     SkTScopedComPtr<IDWriteFontFace1> fDWriteFontFace1;
     SkTScopedComPtr<IDWriteFontFace2> fDWriteFontFace2;
     SkTScopedComPtr<IDWriteFontFace4> fDWriteFontFace4;
+    bool fIsColorFont;
 
     static sk_sp<DWriteFontTypeface> Make(
         IDWriteFactory* factory,
@@ -136,7 +139,7 @@ class DWriteFontTypeface : public SkTypeface {
     void onGetFamilyName(SkString* familyName) const override;
     bool onGetPostScriptName(SkString*) const override;
     SkTypeface::LocalizedStrings* onCreateFamilyNameIterator() const override;
-    bool onGlyphMaskNeedsCurrentColor() const override { return false; }
+    bool onGlyphMaskNeedsCurrentColor() const override;
     int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
                                      int coordinateCount) const override;
     int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
diff --git a/third_party/skia/src/shaders/BUILD.bazel b/third_party/skia/src/shaders/BUILD.bazel
index a11a59dcfea6c..fa7db3e1e2275 100644
--- a/third_party/skia/src/shaders/BUILD.bazel
+++ b/third_party/skia/src/shaders/BUILD.bazel
@@ -92,6 +92,7 @@ generated_cc_atom(
         "//src/core:SkArenaAlloc_hdr",
         "//src/core:SkColorSpacePriv_hdr",
         "//src/core:SkColorSpaceXformSteps_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkUtils_hdr",
@@ -129,6 +130,7 @@ generated_cc_atom(
         "//src/core:SkArenaAlloc_hdr",
         "//src/core:SkBlendModePriv_hdr",
         "//src/core:SkBlenderBase_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkRuntimeEffectPriv_hdr",
@@ -154,6 +156,7 @@ generated_cc_atom(
         ":SkBitmapProcShader_hdr",
         ":SkShaderBase_hdr",
         "//include/core:SkImage_hdr",
+        "//include/core:SkM44_hdr",
     ],
 )
 
@@ -171,6 +174,7 @@ generated_cc_atom(
         "//src/core:SkColorSpacePriv_hdr",
         "//src/core:SkColorSpaceXformSteps_hdr",
         "//src/core:SkImagePriv_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkMatrixPriv_hdr",
         "//src/core:SkMatrixProvider_hdr",
         "//src/core:SkMipmapAccessor_hdr",
@@ -232,6 +236,7 @@ generated_cc_atom(
         "//src/core:SkWriteBuffer_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
         "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/effects:GrMatrixEffect_hdr",
         "//src/gpu/effects:GrTextureEffect_hdr",
@@ -267,6 +272,7 @@ generated_cc_atom(
         "//include/private:SkImageInfoPriv_hdr",
         "//src/core:SkArenaAlloc_hdr",
         "//src/core:SkImagePriv_hdr",
+        "//src/core:SkMatrixPriv_hdr",
         "//src/core:SkMatrixProvider_hdr",
         "//src/core:SkMatrixUtils_hdr",
         "//src/core:SkPicturePriv_hdr",
@@ -321,6 +327,7 @@ generated_cc_atom(
         "//src/core:SkArenaAlloc_hdr",
         "//src/core:SkColorSpacePriv_hdr",
         "//src/core:SkColorSpaceXformSteps_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkMatrixProvider_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
diff --git a/third_party/skia/src/shaders/SkColorShader.cpp b/third_party/skia/src/shaders/SkColorShader.cpp
index a855425a4b7fd..062b938fe40c7 100644
--- a/third_party/skia/src/shaders/SkColorShader.cpp
+++ b/third_party/skia/src/shaders/SkColorShader.cpp
@@ -5,15 +5,17 @@
  * found in the LICENSE file.
  */
 
+#include "src/shaders/SkColorShader.h"
+
 #include "include/core/SkColorSpace.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/core/SkColorSpaceXformSteps.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkUtils.h"
 #include "src/core/SkVM.h"
-#include "src/shaders/SkColorShader.h"
 
 SkColorShader::SkColorShader(SkColor c) : fColor(c) {}
 
@@ -134,3 +136,18 @@ std::unique_ptr<GrFragmentProcessor> SkColor4Shader::asFragmentProcessor(
 }
 
 #endif
+
+void SkColorShader::addToKey(SkShaderCodeDictionary* dict,
+                             SkBackend backend,
+                             SkPaintParamsKeyBuilder* builder,
+                             SkUniformBlock* uniformBlock) const {
+    SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock,
+                                    SkColor4f::FromColor(fColor));
+}
+
+void SkColor4Shader::addToKey(SkShaderCodeDictionary* dict,
+                              SkBackend backend,
+                              SkPaintParamsKeyBuilder* builder,
+                              SkUniformBlock* uniformBlock) const {
+    SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, fColor);
+}
diff --git a/third_party/skia/src/shaders/SkColorShader.h b/third_party/skia/src/shaders/SkColorShader.h
index 17ffeb1805600..58b0a02917963 100644
--- a/third_party/skia/src/shaders/SkColorShader.h
+++ b/third_party/skia/src/shaders/SkColorShader.h
@@ -31,6 +31,10 @@ class SkColorShader : public SkShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
 
 private:
     SK_FLATTENABLE_HOOKS(SkColorShader)
@@ -61,6 +65,10 @@ class SkColor4Shader : public SkShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
 
 private:
     SK_FLATTENABLE_HOOKS(SkColor4Shader)
diff --git a/third_party/skia/src/shaders/SkComposeShader.cpp b/third_party/skia/src/shaders/SkComposeShader.cpp
index 6a01ac992917b..32d6ad672c094 100644
--- a/third_party/skia/src/shaders/SkComposeShader.cpp
+++ b/third_party/skia/src/shaders/SkComposeShader.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkBlendModePriv.h"
 #include "src/core/SkBlenderBase.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkRuntimeEffectPriv.h"
@@ -72,7 +73,7 @@ SkShader_Blend::SkShader_Blend(sk_sp<SkBlender> blender, sk_sp<SkShader> dst, sk
         , fSrc(std::move(src))
         , fBlender(std::move(blender))
         , fMode((SkBlendMode)kCustom_SkBlendMode) {
-    if (skstd::optional<SkBlendMode> bm = as_BB(fBlender)->asBlendMode(); bm.has_value()) {
+    if (std::optional<SkBlendMode> bm = as_BB(fBlender)->asBlendMode(); bm.has_value()) {
         fMode = *bm;
         fBlender.reset();
     }
@@ -187,3 +188,14 @@ std::unique_ptr<GrFragmentProcessor> SkShader_Blend::asFragmentProcessor(
     }
 }
 #endif
+
+void SkShader_Blend::addToKey(SkShaderCodeDictionary* dict,
+                              SkBackend backend,
+                              SkPaintParamsKeyBuilder* builder,
+                              SkUniformBlock* uniformBlock) const {
+    // TODO: add blender support
+    SkASSERT(!fBlender);
+
+    BlendShaderBlock::AddToKey(dict, backend, builder, uniformBlock,
+                               { fDst.get(), fSrc.get(), fMode });
+}
diff --git a/third_party/skia/src/shaders/SkComposeShader.h b/third_party/skia/src/shaders/SkComposeShader.h
index a95ffe27a1841..6066b4283f77d 100644
--- a/third_party/skia/src/shaders/SkComposeShader.h
+++ b/third_party/skia/src/shaders/SkComposeShader.h
@@ -28,6 +28,11 @@ class SkShader_Blend final : public SkShaderBase {
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
 
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
+
 protected:
     SkShader_Blend(SkReadBuffer&);
     void flatten(SkWriteBuffer&) const override;
diff --git a/third_party/skia/src/shaders/SkImageShader.cpp b/third_party/skia/src/shaders/SkImageShader.cpp
index 54f8be79c48ce..c8a1571663148 100755
--- a/third_party/skia/src/shaders/SkImageShader.cpp
+++ b/third_party/skia/src/shaders/SkImageShader.cpp
@@ -11,6 +11,7 @@
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/core/SkColorSpaceXformSteps.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkMatrixPriv.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/core/SkMipmapAccessor.h"
@@ -67,7 +68,15 @@ static SkTileMode optimize(SkTileMode tm, int dimension) {
 #endif
 }
 
+// TODO: currently this only *always* used in asFragmentProcessor(), which is excluded on no-gpu
+// builds. No-gpu builds only use needs_subset() in asserts, so release+no-gpu doesn't use it, which
+// can cause builds to fail if unused warnings are treated as errors.
+SK_MAYBE_UNUSED static bool needs_subset(SkImage* img, const SkRect& subset) {
+    return subset != SkRect::Make(img->dimensions());
+}
+
 SkImageShader::SkImageShader(sk_sp<SkImage> img,
+                             const SkRect& subset,
                              SkTileMode tmx, SkTileMode tmy,
                              const SkSamplingOptions& sampling,
                              const SkMatrix* localMatrix,
@@ -78,6 +87,7 @@ SkImageShader::SkImageShader(sk_sp<SkImage> img,
         , fSampling(sampling)
         , fTileModeX(optimize(tmx, fImage->width()))
         , fTileModeY(optimize(tmy, fImage->height()))
+        , fSubset(subset)
         , fRaw(raw)
         , fClampAsIfUnpremul(clampAsIfUnpremul) {
     // These options should never appear together:
@@ -132,6 +142,9 @@ sk_sp<SkFlattenable> SkImageShader::CreateProc(SkReadBuffer& buffer) {
     bool raw = buffer.isVersionLT(SkPicturePriv::Version::kRawImageShaders) ? false
                                                                             : buffer.readBool();
 
+    // TODO(skbug.com/12784): Subset is not serialized yet; it's only used by special images so it
+    // will never be written to an SKP.
+
     return raw ? SkImageShader::MakeRaw(std::move(img), tmx, tmy, sampling, &localMatrix)
                : SkImageShader::Make(std::move(img), tmx, tmy, sampling, &localMatrix);
 }
@@ -146,6 +159,10 @@ void SkImageShader::flatten(SkWriteBuffer& buffer) const {
     buffer.writeImage(fImage.get());
     SkASSERT(fClampAsIfUnpremul == false);
 
+    // TODO(skbug.com/12784): Subset is not serialized yet; it's only used by special images so it
+    // will never be written to an SKP.
+    SkASSERT(!needs_subset(fImage.get(), fSubset));
+
     buffer.writeBool(fRaw);
 }
 
@@ -189,6 +206,7 @@ static bool legacy_shader_can_handle(const SkMatrix& inv) {
 
 SkShaderBase::Context* SkImageShader::onMakeContext(const ContextRec& rec,
                                                     SkArenaAlloc* alloc) const {
+    SkASSERT(!needs_subset(fImage.get(), fSubset)); // TODO(skbug.com/12784)
     if (fImage->alphaType() == kUnpremul_SkAlphaType) {
         return nullptr;
     }
@@ -265,6 +283,31 @@ sk_sp<SkShader> SkImageShader::Make(sk_sp<SkImage> image,
                                     const SkSamplingOptions& options,
                                     const SkMatrix* localMatrix,
                                     bool clampAsIfUnpremul) {
+    SkRect subset = image ? SkRect::Make(image->dimensions()) : SkRect::MakeEmpty();
+    return MakeSubset(std::move(image), subset, tmx, tmy, options, localMatrix, clampAsIfUnpremul);
+}
+
+sk_sp<SkShader> SkImageShader::MakeRaw(sk_sp<SkImage> image,
+                                       SkTileMode tmx, SkTileMode tmy,
+                                       const SkSamplingOptions& options,
+                                       const SkMatrix* localMatrix) {
+    if (options.useCubic) {
+        return nullptr;
+    }
+    if (!image) {
+        return sk_make_sp<SkEmptyShader>();
+    }
+    return sk_sp<SkShader>{new SkImageShader(
+            image, SkRect::Make(image->dimensions()), tmx, tmy, options, localMatrix,
+            /*raw=*/true, /*clampAsIfUnpremul=*/false)};
+}
+
+sk_sp<SkShader> SkImageShader::MakeSubset(sk_sp<SkImage> image,
+                                          const SkRect& subset,
+                                          SkTileMode tmx, SkTileMode tmy,
+                                          const SkSamplingOptions& options,
+                                          const SkMatrix* localMatrix,
+                                          bool clampAsIfUnpremul) {
     auto is_unit = [](float x) {
         return x >= 0 && x <= 1;
     };
@@ -273,25 +316,18 @@ sk_sp<SkShader> SkImageShader::Make(sk_sp<SkImage> image,
             return nullptr;
         }
     }
-    if (!image) {
+    if (!image || subset.isEmpty()) {
         return sk_make_sp<SkEmptyShader>();
     }
-    return sk_sp<SkShader>{new SkImageShader(
-            image, tmx, tmy, options, localMatrix, /*raw=*/false, clampAsIfUnpremul)};
-}
 
-sk_sp<SkShader> SkImageShader::MakeRaw(sk_sp<SkImage> image,
-                                       SkTileMode tmx, SkTileMode tmy,
-                                       const SkSamplingOptions& options,
-                                       const SkMatrix* localMatrix) {
-    if (options.useCubic) {
+    // Validate subset and check if we can drop it
+    if (!SkRect::Make(image->bounds()).contains(subset)) {
         return nullptr;
     }
-    if (!image) {
-        return sk_make_sp<SkEmptyShader>();
-    }
+    // TODO(skbug.com/12784): GPU-only for now since it's only supported in onAsFragmentProcessor()
+    SkASSERT(!needs_subset(image.get(), subset) || image->isTextureBacked());
     return sk_sp<SkShader>{new SkImageShader(
-            image, tmx, tmy, options, localMatrix, /*raw=*/true, /*clampAsIfUnpremul=*/false)};
+            image, subset, tmx, tmy, options, localMatrix, /*raw=*/false, clampAsIfUnpremul)};
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -310,10 +346,12 @@ std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor(
     }
 
     SkTileMode tileModes[2] = {fTileModeX, fTileModeY};
+    const SkRect* subset = needs_subset(fImage.get(), fSubset) ? &fSubset : nullptr;
     auto fp = as_IB(fImage.get())->asFragmentProcessor(args.fContext,
                                                        fSampling,
                                                        tileModes,
-                                                       lmInverse);
+                                                       lmInverse,
+                                                       subset);
     if (!fp) {
         return nullptr;
     }
@@ -335,6 +373,13 @@ std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor(
 
 #endif
 
+void SkImageShader::addToKey(SkShaderCodeDictionary* dict,
+                             SkBackend backend,
+                             SkPaintParamsKeyBuilder* builder,
+                             SkUniformBlock* uniformBlock) const {
+    ImageShaderBlock::AddToKey(dict, backend, builder, uniformBlock, { fTileModeX, fTileModeY });
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 #include "src/core/SkImagePriv.h"
 
@@ -407,6 +452,7 @@ static SkMatrix tweak_inv_matrix(SkFilterMode filter, SkMatrix matrix) {
 }
 
 bool SkImageShader::doStages(const SkStageRec& rec, TransformShader* updater) const {
+    SkASSERT(!needs_subset(fImage.get(), fSubset)); // TODO(skbug.com/12784)
     // We only support certain sampling options in stages so far
     auto sampling = fSampling;
     if (sampling.useCubic) {
@@ -515,6 +561,9 @@ bool SkImageShader::doStages(const SkStageRec& rec, TransformShader* updater) co
             case kGray_8_SkColorType:       p->append(SkRasterPipeline::gather_a8,      ctx);
                                             p->append(SkRasterPipeline::alpha_to_gray      ); break;
 
+            case kR8_unorm_SkColorType:     p->append(SkRasterPipeline::gather_a8,      ctx);
+                                            p->append(SkRasterPipeline::alpha_to_red       ); break;
+
             case kRGB_888x_SkColorType:     p->append(SkRasterPipeline::gather_8888,    ctx);
                                             p->append(SkRasterPipeline::force_opaque       ); break;
 
@@ -705,7 +754,7 @@ skvm::Color SkImageShader::makeProgram(
         skvm::Builder* p, skvm::Coord device, skvm::Coord origLocal, skvm::Color paint,
         const SkMatrixProvider& matrices, const SkMatrix* localM, const SkColorInfo& dst,
         skvm::Uniforms* uniforms, const TransformShader* coordShader, SkArenaAlloc* alloc) const {
-
+    SkASSERT(!needs_subset(fImage.get(), fSubset)); // TODO(skbug.com/12784)
     SkMatrix baseInv;
     if (!this->computeTotalInverse(matrices.localToDevice(), localM, &baseInv)) {
         return {};
diff --git a/third_party/skia/src/shaders/SkImageShader.h b/third_party/skia/src/shaders/SkImageShader.h
index a96222a02be1a..74c4a219dfadf 100644
--- a/third_party/skia/src/shaders/SkImageShader.h
+++ b/third_party/skia/src/shaders/SkImageShader.h
@@ -9,6 +9,7 @@
 #define SkImageShader_DEFINED
 
 #include "include/core/SkImage.h"
+#include "include/core/SkM44.h"
 #include "src/shaders/SkBitmapProcShader.h"
 #include "src/shaders/SkShaderBase.h"
 
@@ -27,18 +28,34 @@ class SkImageShader : public SkShaderBase {
                                    const SkSamplingOptions&,
                                    const SkMatrix* localMatrix);
 
+    // TODO(skbug.com/12784): Requires SkImage to be texture backed, and created SkShader can only
+    // be used on GPU-backed surfaces.
+    static sk_sp<SkShader> MakeSubset(sk_sp<SkImage>,
+                                      const SkRect& subset,
+                                      SkTileMode tmx,
+                                      SkTileMode tmy,
+                                      const SkSamplingOptions&,
+                                      const SkMatrix* localMatrix,
+                                      bool clampAsIfUnpremul = false);
+
     bool isOpaque() const override;
 
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
 
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
+
     static SkM44 CubicResamplerMatrix(float B, float C);
 
 private:
     SK_FLATTENABLE_HOOKS(SkImageShader)
 
     SkImageShader(sk_sp<SkImage>,
+                  const SkRect& subset,
                   SkTileMode tmx,
                   SkTileMode tmy,
                   const SkSamplingOptions&,
@@ -73,6 +90,11 @@ class SkImageShader : public SkShaderBase {
     const SkSamplingOptions fSampling;
     const SkTileMode        fTileModeX;
     const SkTileMode        fTileModeY;
+
+    // TODO(skbug.com/12784): This is only supported for GPU images currently.
+    // If subset == (0,0,w,h) of the image, then no subset is applied. Subset will not be empty.
+    const SkRect            fSubset;
+
     const bool              fRaw;
     const bool              fClampAsIfUnpremul;
 
diff --git a/third_party/skia/src/shaders/SkPerlinNoiseShader.cpp b/third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
index 8e8393ead0ec4..9719aaf915cd9 100644
--- a/third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
+++ b/third_party/skia/src/shaders/SkPerlinNoiseShader.cpp
@@ -23,6 +23,7 @@
 #include "include/gpu/GrRecordingContext.h"
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrMatrixEffect.h"
 #include "src/gpu/effects/GrTextureEffect.h"
@@ -623,7 +624,7 @@ class GrPerlinNoise2Effect : public GrFragmentProcessor {
         return std::make_unique<Impl>();
     }
 
-    void onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override;
+    void onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override;
 
     bool onIsEqual(const GrFragmentProcessor& sBase) const override {
         const GrPerlinNoise2Effect& s = sBase.cast<GrPerlinNoise2Effect>();
@@ -699,24 +700,24 @@ void GrPerlinNoise2Effect::Impl::emitCode(EmitArgs& args) {
     GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
     GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;
 
-    fBaseFrequencyUni = uniformHandler->addUniform(&pne, kFragment_GrShaderFlag, kHalf2_GrSLType,
+    fBaseFrequencyUni = uniformHandler->addUniform(&pne, kFragment_GrShaderFlag, SkSLType::kHalf2,
                                                    "baseFrequency");
     const char* baseFrequencyUni = uniformHandler->getUniformCStr(fBaseFrequencyUni);
 
     const char* stitchDataUni = nullptr;
     if (pne.stitchTiles()) {
-        fStitchDataUni = uniformHandler->addUniform(&pne, kFragment_GrShaderFlag, kHalf2_GrSLType,
+        fStitchDataUni = uniformHandler->addUniform(&pne, kFragment_GrShaderFlag, SkSLType::kHalf2,
                                                     "stitchData");
         stitchDataUni = uniformHandler->getUniformCStr(fStitchDataUni);
     }
 
     // Add noise function
-    const GrShaderVar gPerlinNoiseArgs[] = {{"chanCoord", kHalf_GrSLType },
-                                            {"noiseVec ", kHalf2_GrSLType}};
+    const GrShaderVar gPerlinNoiseArgs[] = {{"chanCoord", SkSLType::kHalf },
+                                            {"noiseVec ", SkSLType::kHalf2}};
 
-    const GrShaderVar gPerlinNoiseStitchArgs[] = {{"chanCoord" , kHalf_GrSLType },
-                                                  {"noiseVec"  , kHalf2_GrSLType},
-                                                  {"stitchData", kHalf2_GrSLType}};
+    const GrShaderVar gPerlinNoiseStitchArgs[] = {{"chanCoord" , SkSLType::kHalf },
+                                                  {"noiseVec"  , SkSLType::kHalf2},
+                                                  {"stitchData", SkSLType::kHalf2}};
 
     SkString noiseCode;
 
@@ -801,11 +802,11 @@ void GrPerlinNoise2Effect::Impl::emitCode(EmitArgs& args) {
 
     SkString noiseFuncName = fragBuilder->getMangledFunctionName("noiseFuncName");
     if (pne.stitchTiles()) {
-        fragBuilder->emitFunction(kHalf_GrSLType, noiseFuncName.c_str(),
+        fragBuilder->emitFunction(SkSLType::kHalf, noiseFuncName.c_str(),
                                   {gPerlinNoiseStitchArgs, SK_ARRAY_COUNT(gPerlinNoiseStitchArgs)},
                                   noiseCode.c_str());
     } else {
-        fragBuilder->emitFunction(kHalf_GrSLType, noiseFuncName.c_str(),
+        fragBuilder->emitFunction(SkSLType::kHalf, noiseFuncName.c_str(),
                                   {gPerlinNoiseArgs, SK_ARRAY_COUNT(gPerlinNoiseArgs)},
                                   noiseCode.c_str());
     }
@@ -894,7 +895,7 @@ void GrPerlinNoise2Effect::Impl::onSetData(const GrGLSLProgramDataManager& pdman
     }
 }
 
-void GrPerlinNoise2Effect::onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const {
+void GrPerlinNoise2Effect::onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const {
     uint32_t key = fNumOctaves;
     key = key << 3;  // Make room for next 3 bits
     switch (fType) {
diff --git a/third_party/skia/src/shaders/SkPictureShader.cpp b/third_party/skia/src/shaders/SkPictureShader.cpp
index 3c1a1ab8aa559..03fb3d7b8dc9a 100644
--- a/third_party/skia/src/shaders/SkPictureShader.cpp
+++ b/third_party/skia/src/shaders/SkPictureShader.cpp
@@ -13,6 +13,7 @@
 #include "include/private/SkImageInfoPriv.h"
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkImagePriv.h"
+#include "src/core/SkMatrixPriv.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/core/SkMatrixUtils.h"
 #include "src/core/SkPicturePriv.h"
@@ -184,7 +185,13 @@ struct CachedImageInfo {
             SkSize size;
             // Use a rotation-invariant scale
             if (!m.decomposeScale(&size, nullptr)) {
-                size = {1, 1};
+                SkPoint center = {bounds.centerX(), bounds.centerY()};
+                SkScalar area = SkMatrixPriv::DifferentialAreaScale(m, center);
+                if (!SkScalarIsFinite(area) || SkScalarNearlyZero(area)) {
+                    size = {1, 1}; // ill-conditioned matrix
+                } else {
+                    size.fWidth = size.fHeight = SkScalarSqrt(area);
+                }
             }
             size.fWidth  *= bounds.width();
             size.fHeight *= bounds.height();
@@ -387,9 +394,9 @@ std::unique_ptr<GrFragmentProcessor> SkPictureShader::asFragmentProcessor(
         info.imageInfo = info.imageInfo.makeColorType(kRGBA_8888_SkColorType);
     }
 
-    static const GrUniqueKey::Domain kDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey key;
-    GrUniqueKey::Builder builder(&key, kDomain, 10, "Picture Shader Image");
+    static const skgpu::UniqueKey::Domain kDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey key;
+    skgpu::UniqueKey::Builder builder(&key, kDomain, 10, "Picture Shader Image");
     builder[0] = dstCS->toXYZD50Hash();
     builder[1] = dstCS->transferFnHash();
     builder[2] = static_cast<uint32_t>(dstColorType);
@@ -401,7 +408,7 @@ std::unique_ptr<GrFragmentProcessor> SkPictureShader::asFragmentProcessor(
     GrProxyProvider* provider = ctx->priv().proxyProvider();
     GrSurfaceProxyView view;
     if (auto proxy = provider->findOrCreateProxyByUniqueKey(key)) {
-        view = GrSurfaceProxyView(proxy, kTopLeft_GrSurfaceOrigin, GrSwizzle());
+        view = GrSurfaceProxyView(proxy, kTopLeft_GrSurfaceOrigin, skgpu::Swizzle());
     } else {
         const int msaaSampleCount = 0;
         const SkSurfaceProps* props = nullptr;
diff --git a/third_party/skia/src/shaders/SkShader.cpp b/third_party/skia/src/shaders/SkShader.cpp
index f838b2e179b1c..ba8ca8e133531 100644
--- a/third_party/skia/src/shaders/SkShader.cpp
+++ b/third_party/skia/src/shaders/SkShader.cpp
@@ -12,6 +12,7 @@
 #include "src/core/SkArenaAlloc.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/core/SkColorSpaceXformSteps.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkMatrixProvider.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
@@ -148,6 +149,14 @@ SkUpdatableShader* SkShaderBase::onUpdatableShader(SkArenaAlloc* alloc) const {
     return nullptr;
 }
 
+// TODO: add implementations for derived classes
+void SkShaderBase::addToKey(SkShaderCodeDictionary* dict,
+                            SkBackend backend,
+                            SkPaintParamsKeyBuilder* builder,
+                            SkUniformBlock* uniformBlock) const {
+    SolidColorShaderBlock::AddToKey(dict, backend, builder, uniformBlock, SkColors::kRed);
+}
+
 sk_sp<SkShader> SkShaders::Empty() { return sk_make_sp<SkEmptyShader>(); }
 sk_sp<SkShader> SkShaders::Color(SkColor color) { return sk_make_sp<SkColorShader>(color); }
 
diff --git a/third_party/skia/src/shaders/SkShaderBase.h b/third_party/skia/src/shaders/SkShaderBase.h
index e572525769ae4..61517c66cfe64 100644
--- a/third_party/skia/src/shaders/SkShaderBase.h
+++ b/third_party/skia/src/shaders/SkShaderBase.h
@@ -24,12 +24,16 @@
 
 class GrFragmentProcessor;
 class SkArenaAlloc;
+enum class SkBackend : uint8_t;
 class SkColorSpace;
 class SkImage;
 struct SkImageInfo;
 class SkPaint;
+class SkPaintParamsKeyBuilder;
 class SkRasterPipeline;
 class SkRuntimeEffect;
+class SkShaderCodeDictionary;
+class SkUniformBlock;
 class SkStageUpdater;
 
 class SkUpdatableShader;
@@ -209,6 +213,21 @@ class SkShaderBase : public SkShader {
                         const SkMatrixProvider&, const SkMatrix* localM, const SkColorInfo& dst,
                         skvm::Uniforms* uniforms, SkArenaAlloc* alloc) const;
 
+
+    /**
+        Add implementation details, for the specified backend, of this SkShader to the
+        provided key.
+
+        @param dictionary   dictionary of code fragments available to be used in the key
+        @param backend      the backend that would be carrying out the drawing
+        @param builder      builder for creating the key for this SkShader
+        @param uniformBlock if non-null, storage for this shader's uniform data
+    */
+    virtual void addToKey(SkShaderCodeDictionary* dictionary,
+                          SkBackend backend,
+                          SkPaintParamsKeyBuilder* builder,
+                          SkUniformBlock* uniformBlock) const;
+
 protected:
     SkShaderBase(const SkMatrix* localMatrix = nullptr);
 
diff --git a/third_party/skia/src/shaders/gradients/BUILD.bazel b/third_party/skia/src/shaders/gradients/BUILD.bazel
index b7f2b5b4dae98..ad50bbe877250 100644
--- a/third_party/skia/src/shaders/gradients/BUILD.bazel
+++ b/third_party/skia/src/shaders/gradients/BUILD.bazel
@@ -114,6 +114,7 @@ generated_cc_atom(
     deps = [
         ":Sk4fLinearGradient_hdr",
         ":SkLinearGradient_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkWriteBuffer_hdr",
         "//src/gpu/gradients:GrGradientShader_hdr",
@@ -133,6 +134,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkRadialGradient_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkWriteBuffer_hdr",
@@ -154,6 +156,7 @@ generated_cc_atom(
     deps = [
         ":SkSweepGradient_hdr",
         "//include/private:SkFloatingPoint_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkWriteBuffer_hdr",
@@ -175,6 +178,7 @@ generated_cc_atom(
     deps = [
         ":SkTwoPointConicalGradient_hdr",
         "//include/private:SkFloatingPoint_hdr",
+        "//src/core:SkKeyHelpers_hdr",
         "//src/core:SkRasterPipeline_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkWriteBuffer_hdr",
diff --git a/third_party/skia/src/shaders/gradients/Sk4fLinearGradient.cpp b/third_party/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
index 2f6264386e760..f54541c701893 100644
--- a/third_party/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
+++ b/third_party/skia/src/shaders/gradients/Sk4fLinearGradient.cpp
@@ -106,7 +106,7 @@ const Sk4fGradientInterval*
 SkLinearGradient::LinearGradient4fContext::findInterval(SkScalar fx) const {
     SkASSERT(in_range(fx, fIntervals->front().fT0, fIntervals->back().fT1));
 
-    if (1) {
+    if ((true)) {
         // Linear search, using the last scanline interval as a starting point.
         SkASSERT(fCachedInterval >= fIntervals->begin());
         SkASSERT(fCachedInterval < fIntervals->end());
diff --git a/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp b/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
index 347fd177f0014..32e908f22999d 100644
--- a/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
+++ b/third_party/skia/src/shaders/gradients/SkLinearGradient.cpp
@@ -7,6 +7,7 @@
 
 #include "src/shaders/gradients/SkLinearGradient.h"
 
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
 #include "src/shaders/gradients/Sk4fLinearGradient.h"
@@ -102,3 +103,18 @@ std::unique_ptr<GrFragmentProcessor> SkLinearGradient::asFragmentProcessor(
 }
 
 #endif
+
+void SkLinearGradient::addToKey(SkShaderCodeDictionary* dict,
+                                SkBackend backend,
+                                SkPaintParamsKeyBuilder* builder,
+                                SkUniformBlock* uniformBlock) const {
+    GradientShaderBlocks::GradientData data(kLinear_GradientType,
+                                            fStart, fEnd,
+                                            0.0f, 0.0f,
+                                            fTileMode,
+                                            fColorCount,
+                                            fOrigColors4f,
+                                            fOrigPos);
+
+    GradientShaderBlocks::AddToKey(dict, backend, builder, uniformBlock, data);
+}
diff --git a/third_party/skia/src/shaders/gradients/SkLinearGradient.h b/third_party/skia/src/shaders/gradients/SkLinearGradient.h
index 37f5cc87be5f4..b545fca4138ed 100644
--- a/third_party/skia/src/shaders/gradients/SkLinearGradient.h
+++ b/third_party/skia/src/shaders/gradients/SkLinearGradient.h
@@ -18,6 +18,10 @@ class SkLinearGradient : public SkGradientShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
 
 protected:
     SkLinearGradient(SkReadBuffer& buffer);
diff --git a/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp b/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
index fea9ca6b31629..d25ffcc186e5d 100644
--- a/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
+++ b/third_party/skia/src/shaders/gradients/SkRadialGradient.cpp
@@ -5,10 +5,12 @@
  * found in the LICENSE file.
  */
 
+#include "src/shaders/gradients/SkRadialGradient.h"
+
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
-#include "src/shaders/gradients/SkRadialGradient.h"
 
 namespace {
 
@@ -80,3 +82,18 @@ std::unique_ptr<GrFragmentProcessor> SkRadialGradient::asFragmentProcessor(
 }
 
 #endif
+
+void SkRadialGradient::addToKey(SkShaderCodeDictionary* dict,
+                                SkBackend backend,
+                                SkPaintParamsKeyBuilder* builder,
+                                SkUniformBlock* uniformBlock) const {
+    GradientShaderBlocks::GradientData data(kRadial_GradientType,
+                                            fCenter, { 0.0f, 0.0f },
+                                            fRadius, 0.0f,
+                                            fTileMode,
+                                            fColorCount,
+                                            fOrigColors4f,
+                                            fOrigPos);
+
+    GradientShaderBlocks::AddToKey(dict, backend, builder, uniformBlock, data);
+}
diff --git a/third_party/skia/src/shaders/gradients/SkRadialGradient.h b/third_party/skia/src/shaders/gradients/SkRadialGradient.h
index 6d2272e2ca269..768d72b193fac 100644
--- a/third_party/skia/src/shaders/gradients/SkRadialGradient.h
+++ b/third_party/skia/src/shaders/gradients/SkRadialGradient.h
@@ -18,6 +18,10 @@ class SkRadialGradient final : public SkGradientShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
 
 protected:
     SkRadialGradient(SkReadBuffer& buffer);
diff --git a/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp b/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
index a0f0070819c18..88640aeb932cd 100644
--- a/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
+++ b/third_party/skia/src/shaders/gradients/SkSweepGradient.cpp
@@ -5,11 +5,13 @@
  * found in the LICENSE file.
  */
 
+#include "src/shaders/gradients/SkSweepGradient.h"
+
 #include "include/private/SkFloatingPoint.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
-#include "src/shaders/gradients/SkSweepGradient.h"
 
 SkSweepGradient::SkSweepGradient(const SkPoint& center, SkScalar t0, SkScalar t1,
                                  const Descriptor& desc)
@@ -104,3 +106,18 @@ std::unique_ptr<GrFragmentProcessor> SkSweepGradient::asFragmentProcessor(
 }
 
 #endif
+
+void SkSweepGradient::addToKey(SkShaderCodeDictionary* dict,
+                               SkBackend backend,
+                               SkPaintParamsKeyBuilder* builder,
+                               SkUniformBlock* uniformBlock) const {
+    GradientShaderBlocks::GradientData data(kSweep_GradientType,
+                                            fCenter, { 0.0f, 0.0f },
+                                            0.0, 0.0f,
+                                            fTileMode,
+                                            fColorCount,
+                                            fOrigColors4f,
+                                            fOrigPos);
+
+    GradientShaderBlocks::AddToKey(dict, backend, builder, uniformBlock, data);
+}
diff --git a/third_party/skia/src/shaders/gradients/SkSweepGradient.h b/third_party/skia/src/shaders/gradients/SkSweepGradient.h
index 1078ebb7a6ee9..6df721eb056e8 100644
--- a/third_party/skia/src/shaders/gradients/SkSweepGradient.h
+++ b/third_party/skia/src/shaders/gradients/SkSweepGradient.h
@@ -19,6 +19,10 @@ class SkSweepGradient final : public SkGradientShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
 
     SkScalar getTBias() const { return fTBias; }
 
diff --git a/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp
index 111b411e40c13..1c13268220e6f 100644
--- a/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp
+++ b/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.cpp
@@ -5,11 +5,13 @@
  * found in the LICENSE file.
  */
 
+#include "src/shaders/gradients/SkTwoPointConicalGradient.h"
+
 #include "include/private/SkFloatingPoint.h"
+#include "src/core/SkKeyHelpers.h"
 #include "src/core/SkRasterPipeline.h"
 #include "src/core/SkReadBuffer.h"
 #include "src/core/SkWriteBuffer.h"
-#include "src/shaders/gradients/SkTwoPointConicalGradient.h"
 
 #include <utility>
 
@@ -229,7 +231,7 @@ skvm::F32 SkTwoPointConicalGradient::transformT(skvm::Builder* p, skvm::Uniforms
 
     if (fType == Type::kStrip) {
         float r = fRadius1 / this->getCenterX1();
-        skvm::F32 t = x + sqrt(p->splat(r*r) - y*y);
+        skvm::F32 t = x + sqrt(p->uniformF(uniforms->pushF(r*r)) - y*y);
 
         *mask = (t == t);   // t != NaN
         return t;
@@ -274,3 +276,18 @@ std::unique_ptr<GrFragmentProcessor> SkTwoPointConicalGradient::asFragmentProces
 }
 
 #endif
+
+void SkTwoPointConicalGradient::addToKey(SkShaderCodeDictionary* dict,
+                                         SkBackend backend,
+                                         SkPaintParamsKeyBuilder* builder,
+                                         SkUniformBlock* uniformBlock) const {
+    GradientShaderBlocks::GradientData data(kConical_GradientType,
+                                            fCenter1, fCenter2,
+                                            fRadius1, fRadius2,
+                                            fTileMode,
+                                            fColorCount,
+                                            fOrigColors4f,
+                                            fOrigPos);
+
+    GradientShaderBlocks::AddToKey(dict, backend, builder, uniformBlock, data);
+}
diff --git a/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.h b/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.h
index 39d3b1134b923..c5c1eab18c5a5 100644
--- a/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.h
+++ b/third_party/skia/src/shaders/gradients/SkTwoPointConicalGradient.h
@@ -51,6 +51,11 @@ class SkTwoPointConicalGradient final : public SkGradientShaderBase {
 #if SK_SUPPORT_GPU
     std::unique_ptr<GrFragmentProcessor> asFragmentProcessor(const GrFPArgs&) const override;
 #endif
+    void addToKey(SkShaderCodeDictionary*,
+                  SkBackend,
+                  SkPaintParamsKeyBuilder*,
+                  SkUniformBlock*) const override;
+
     bool isOpaque() const override;
 
     SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
diff --git a/third_party/skia/src/sksl/BUILD.bazel b/third_party/skia/src/sksl/BUILD.bazel
index 56ba81d1245a3..a7584d2057177 100644
--- a/third_party/skia/src/sksl/BUILD.bazel
+++ b/third_party/skia/src/sksl/BUILD.bazel
@@ -17,6 +17,7 @@ cc_library(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLAnalysis_src",
+        ":SkSLBuiltinMap_src",
         ":SkSLBuiltinTypes_src",
         ":SkSLCompiler_src",
         ":SkSLConstantFolder_src",
@@ -25,7 +26,6 @@ cc_library(
         ":SkSLDehydrator_src",
         ":SkSLErrorReporter_src",
         ":SkSLInliner_src",
-        ":SkSLIntrinsicMap_src",
         ":SkSLLexer_src",
         ":SkSLMangler_src",
         ":SkSLOperators_src",
@@ -33,11 +33,13 @@ cc_library(
         ":SkSLPool_src",
         ":SkSLRehydrator_src",
         ":SkSLSampleUsage_src",
+        ":SkSLSharedCompiler_src",
         ":SkSLString_src",
         ":SkSLThreadContext_src",
         ":SkSLUtil_src",
         "//src/sksl/analysis:SkSLCanExitWithoutReturningValue_src",
         "//src/sksl/analysis:SkSLCheckProgramUnrolledSize_src",
+        "//src/sksl/analysis:SkSLFinalizationChecks_src",
         "//src/sksl/analysis:SkSLGetLoopUnrollInfo_src",
         "//src/sksl/analysis:SkSLIsConstantExpression_src",
         "//src/sksl/analysis:SkSLProgramUsage_src",
@@ -48,7 +50,6 @@ cc_library(
         "//src/sksl/codegen:SkSLSPIRVCodeGenerator_src",
         "//src/sksl/codegen:SkSLSPIRVtoHLSL_src",
         "//src/sksl/codegen:SkSLVMCodeGenerator_src",
-        "//src/sksl/codegen:SkVMDebugInfo_src",
         "//src/sksl/dsl:DSLBlock_src",
         "//src/sksl/dsl:DSLCase_src",
         "//src/sksl/dsl:DSLCore_src",
@@ -102,6 +103,8 @@ cc_library(
         "//src/sksl/lex:RegexNode_src",
         "//src/sksl/lex:RegexParser_src",
         "//src/sksl/lex:TransitionTable_src",
+        "//src/sksl/tracing:SkVMDebugTracePlayer_src",
+        "//src/sksl/tracing:SkVMDebugTrace_src",
         "//src/sksl/transform:SkSLBuiltinVariableScanner_src",
         "//src/sksl/transform:SkSLEliminateDeadFunctions_src",
         "//src/sksl/transform:SkSLEliminateDeadGlobalVariables_src",
@@ -226,10 +229,10 @@ generated_cc_atom(
     textual_hdrs = [":txts"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":SkSLBuiltinMap_hdr",
         ":SkSLCompiler_hdr",
         ":SkSLConstantFolder_hdr",
         ":SkSLDSLParser_hdr",
-        ":SkSLIntrinsicMap_hdr",
         ":SkSLOperators_hdr",
         ":SkSLProgramSettings_hdr",
         ":SkSLRehydrator_hdr",
@@ -327,9 +330,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLLexer_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/private:SkSLProgramKind_hdr",
-        "//include/private:SkTOptional_hdr",
         "//include/sksl:DSLSymbols_hdr",
         "//include/sksl:DSL_hdr",
         "//src/sksl/ir:SkSLProgram_hdr",
@@ -397,6 +398,7 @@ generated_cc_atom(
         "//src/sksl/ir:SkSLFunctionCall_hdr",
         "//src/sksl/ir:SkSLFunctionDeclaration_hdr",
         "//src/sksl/ir:SkSLFunctionDefinition_hdr",
+        "//src/sksl/ir:SkSLFunctionPrototype_hdr",
         "//src/sksl/ir:SkSLIfStatement_hdr",
         "//src/sksl/ir:SkSLIndexExpression_hdr",
         "//src/sksl/ir:SkSLInlineMarker_hdr",
@@ -410,7 +412,6 @@ generated_cc_atom(
         "//src/sksl/ir:SkSLSwitchCase_hdr",
         "//src/sksl/ir:SkSLSwitchStatement_hdr",
         "//src/sksl/ir:SkSLSwizzle_hdr",
-        "//src/sksl/ir:SkSLSymbolAlias_hdr",
         "//src/sksl/ir:SkSLSymbolTable_hdr",
         "//src/sksl/ir:SkSLTernaryExpression_hdr",
         "//src/sksl/ir:SkSLUnresolvedFunction_hdr",
@@ -425,6 +426,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLCompiler_hdr",
+        "//include/private:SkStringView_hdr",
         "//include/sksl:SkSLErrorReporter_hdr",
         "//src/sksl/dsl/priv:DSLWriter_hdr",
     ],
@@ -518,28 +520,10 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
 )
 
-generated_cc_atom(
-    name = "SkSLIntrinsicMap_hdr",
-    hdrs = ["SkSLIntrinsicMap.h"],
-    visibility = ["//:__subpackages__"],
-)
-
-generated_cc_atom(
-    name = "SkSLIntrinsicMap_src",
-    srcs = ["SkSLIntrinsicMap.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkSLIntrinsicMap_hdr",
-        "//include/private:SkSLProgramElement_hdr",
-        "//include/private:SkSLString_hdr",
-    ],
-)
-
 generated_cc_atom(
     name = "SkSLLexer_hdr",
     hdrs = ["SkSLLexer.h"],
     visibility = ["//:__subpackages__"],
-    deps = ["//include/core:SkStringView_hdr"],
 )
 
 generated_cc_atom(
@@ -559,15 +543,20 @@ generated_cc_atom(
         ":SkSLFileOutputStream_hdr",
         ":SkSLStringStream_hdr",
         ":SkSLUtil_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkStringView_hdr",
+        "//src/core:SkCpu_hdr",
         "//src/core:SkOpts_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/opts:SkChecksum_opts_hdr",
         "//src/opts:SkVM_opts_hdr",
         "//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr",
         "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
-        "//src/sksl/codegen:SkVMDebugInfo_hdr",
         "//src/sksl/ir:SkSLUnresolvedFunction_hdr",
         "//src/sksl/ir:SkSLVarDeclarations_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+        "//src/utils:SkShaderUtils_hdr",
+        "//src/utils:SkVMVisualizer_hdr",
     ],
 )
 
@@ -584,6 +573,7 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLMangler_hdr",
+        "//include/private:SkStringView_hdr",
         "//src/sksl/ir:SkSLSymbolTable_hdr",
     ],
 )
@@ -631,6 +621,7 @@ generated_cc_atom(
         ":SkSLOperators_hdr",
         ":SkSLProgramSettings_hdr",
         "//include/core:SkTypes_hdr",
+        "//include/private:SkStringView_hdr",
         "//src/sksl/ir:SkSLType_hdr",
     ],
 )
@@ -694,6 +685,7 @@ generated_cc_atom(
         "//include/private:SkSLDefines_hdr",
         "//include/private:SkSLModifiers_hdr",
         "//include/private:SkSLSymbol_hdr",
+        "//src/sksl/ir:SkSLProgram_hdr",
     ],
 )
 
@@ -703,7 +695,9 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLAnalysis_hdr",
+        ":SkSLCompiler_hdr",
         ":SkSLRehydrator_hdr",
+        ":SkSLThreadContext_hdr",
         "//include/private:SkSLModifiers_hdr",
         "//include/private:SkSLProgramElement_hdr",
         "//include/private:SkSLStatement_hdr",
@@ -729,11 +723,13 @@ generated_cc_atom(
         "//src/sksl/ir:SkSLFunctionCall_hdr",
         "//src/sksl/ir:SkSLFunctionDeclaration_hdr",
         "//src/sksl/ir:SkSLFunctionDefinition_hdr",
+        "//src/sksl/ir:SkSLFunctionPrototype_hdr",
         "//src/sksl/ir:SkSLIfStatement_hdr",
         "//src/sksl/ir:SkSLIndexExpression_hdr",
         "//src/sksl/ir:SkSLInlineMarker_hdr",
         "//src/sksl/ir:SkSLInterfaceBlock_hdr",
         "//src/sksl/ir:SkSLLiteral_hdr",
+        "//src/sksl/ir:SkSLNop_hdr",
         "//src/sksl/ir:SkSLPostfixExpression_hdr",
         "//src/sksl/ir:SkSLPrefixExpression_hdr",
         "//src/sksl/ir:SkSLReturnStatement_hdr",
@@ -742,7 +738,6 @@ generated_cc_atom(
         "//src/sksl/ir:SkSLSwitchCase_hdr",
         "//src/sksl/ir:SkSLSwitchStatement_hdr",
         "//src/sksl/ir:SkSLSwizzle_hdr",
-        "//src/sksl/ir:SkSLSymbolAlias_hdr",
         "//src/sksl/ir:SkSLSymbolTable_hdr",
         "//src/sksl/ir:SkSLTernaryExpression_hdr",
         "//src/sksl/ir:SkSLType_hdr",
@@ -767,7 +762,6 @@ generated_cc_atom(
         ":SkSLOutputStream_hdr",
         "//include/core:SkData_hdr",
         "//include/core:SkStream_hdr",
-        "//include/private:SkSLString_hdr",
     ],
 )
 
@@ -787,7 +781,6 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         ":SkSLMangler_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/private:SkSLModifiers_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
         "//src/sksl/ir:SkSLProgram_hdr",
@@ -799,8 +792,8 @@ generated_cc_atom(
     srcs = ["SkSLThreadContext.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":SkSLBuiltinMap_hdr",
         ":SkSLCompiler_hdr",
-        ":SkSLIntrinsicMap_hdr",
         ":SkSLThreadContext_hdr",
         "//include/sksl:DSLSymbols_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
@@ -819,6 +812,7 @@ generated_cc_atom(
         "//include/gpu:GrContextOptions_hdr",
         "//include/private:GrTypesPriv_hdr",
         "//include/private:SkSLDefines_hdr",
+        "//src/core:SkSLTypeShared_hdr",
     ],
 )
 
@@ -840,3 +834,38 @@ generated_cc_atom(
     hdrs = ["spirv.h"],
     visibility = ["//:__subpackages__"],
 )
+
+generated_cc_atom(
+    name = "SkSLBuiltinMap_hdr",
+    hdrs = ["SkSLBuiltinMap.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/private:SkSLString_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkSLBuiltinMap_src",
+    srcs = ["SkSLBuiltinMap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSLBuiltinMap_hdr",
+        "//include/private:SkSLProgramElement_hdr",
+        "//include/private:SkSLString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLSharedCompiler_hdr",
+    hdrs = ["SkSLSharedCompiler.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSLCompiler_hdr",
+        "//include/private:SkMutex_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLSharedCompiler_src",
+    srcs = ["SkSLSharedCompiler.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkSLSharedCompiler_hdr"],
+)
diff --git a/third_party/skia/src/sksl/SkSLAnalysis.cpp b/third_party/skia/src/sksl/SkSLAnalysis.cpp
index 6e0c9fc997a12..9a0b917fcab47 100644
--- a/third_party/skia/src/sksl/SkSLAnalysis.cpp
+++ b/third_party/skia/src/sksl/SkSLAnalysis.cpp
@@ -97,7 +97,7 @@ class MergeSampleUsageVisitor : public ProgramVisitor {
             SkASSERT(arguments.size() >= 1);
 
             const Expression* maybeCoords = arguments[0].get();
-            if (maybeCoords->type() == *fContext.fTypes.fFloat2) {
+            if (maybeCoords->type().matches(*fContext.fTypes.fFloat2)) {
                 // If the coords are a direct reference to the program's sample-coords, and those
                 // coords are never modified, we can conservatively turn this into PassThrough
                 // sampling. In all other cases, we consider it Explicit.
@@ -160,6 +160,31 @@ class SampleOutsideMainVisitor : public ProgramVisitor {
     using INHERITED = ProgramVisitor;
 };
 
+class ReturnsNonOpaqueColorVisitor : public ProgramVisitor {
+public:
+    ReturnsNonOpaqueColorVisitor() {}
+
+    bool visitStatement(const Statement& s) override {
+        if (s.is<ReturnStatement>()) {
+            const Expression* e = s.as<ReturnStatement>().expression().get();
+            bool knownOpaque = e && e->type().slotCount() == 4 &&
+                               ConstantFolder::GetConstantValueForVariable(*e)
+                                               ->getConstantValue(/*n=*/3)
+                                               .value_or(0) == 1;
+            return !knownOpaque;
+        }
+        return INHERITED::visitStatement(s);
+    }
+
+    bool visitExpression(const Expression& e) override {
+        // No need to recurse into expressions, these can never contain return statements
+        return false;
+    }
+
+    using INHERITED = ProgramVisitor;
+    using INHERITED::visitProgramElement;
+};
+
 // Visitor that counts the number of nodes visited
 class NodeCountVisitor : public ProgramVisitor {
 public:
@@ -224,7 +249,7 @@ class VariableWriteVisitor : public ProgramVisitor {
 class TrivialErrorReporter : public ErrorReporter {
 public:
     ~TrivialErrorReporter() override { this->reportPendingErrors({}); }
-    void handleError(skstd::string_view, PositionInfo) override {}
+    void handleError(std::string_view, PositionInfo) override {}
 };
 
 // This isn't actually using ProgramVisitor, because it only considers a subset of the fields for
@@ -249,8 +274,8 @@ class IsAssignableVisitor {
                 VariableReference& varRef = expr.as<VariableReference>();
                 const Variable* var = varRef.variable();
                 if (var->modifiers().fFlags & (Modifiers::kConst_Flag | Modifiers::kUniform_Flag)) {
-                    fErrors->error(expr.fLine,
-                                   "cannot modify immutable variable '" + var->name() + "'");
+                    fErrors->error(expr.fLine, "cannot modify immutable variable '" +
+                                               std::string(var->name()) + "'");
                 } else {
                     SkASSERT(fAssignedVar == nullptr);
                     fAssignedVar = &varRef;
@@ -336,6 +361,21 @@ bool Analysis::CallsSampleOutsideMain(const Program& program) {
     return visitor.visit(program);
 }
 
+bool Analysis::CallsColorTransformIntrinsics(const Program& program) {
+    for (auto [fn, count] : program.usage()->fCallCounts) {
+        if (count != 0 && (fn->intrinsicKind() == k_toLinearSrgb_IntrinsicKind ||
+                           fn->intrinsicKind() == k_fromLinearSrgb_IntrinsicKind)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool Analysis::ReturnsOpaqueColor(const FunctionDefinition& function) {
+    ReturnsNonOpaqueColorVisitor visitor;
+    return !visitor.visitProgramElement(function);
+}
+
 bool Analysis::DetectVarDeclarationWithoutScope(const Statement& stmt, ErrorReporter* errors) {
     // A variable declaration can create either a lone VarDeclaration or an unscoped Block
     // containing multiple VarDeclaration statements. We need to detect either case.
@@ -363,7 +403,8 @@ bool Analysis::DetectVarDeclarationWithoutScope(const Statement& stmt, ErrorRepo
     // Report an error.
     SkASSERT(var);
     if (errors) {
-        errors->error(stmt.fLine, "variable '" + var->name() + "' must be created in a scope");
+        errors->error(stmt.fLine, "variable '" + std::string(var->name()) +
+                                  "' must be created in a scope");
     }
     return true;
 }
@@ -416,7 +457,7 @@ bool Analysis::IsTrivialExpression(const Expression& expr) {
 }
 
 bool Analysis::IsSameExpressionTree(const Expression& left, const Expression& right) {
-    if (left.kind() != right.kind() || left.type() != right.type()) {
+    if (left.kind() != right.kind() || !left.type().matches(right.type())) {
         return false;
     }
 
@@ -520,90 +561,6 @@ void Analysis::ValidateIndexingForES2(const ProgramElement& pe, ErrorReporter& e
     visitor.visitProgramElement(pe);
 }
 
-void Analysis::VerifyStaticTestsAndExpressions(const Program& program) {
-    class TestsAndExpressions : public ProgramVisitor {
-    public:
-        TestsAndExpressions(const Context& ctx) : fContext(ctx) {}
-
-        bool visitProgramElement(const ProgramElement& pe) override {
-            if (pe.kind() == ProgramElement::Kind::kGlobalVar) {
-                const VarDeclaration& decl =
-                        pe.as<GlobalVarDeclaration>().declaration()->as<VarDeclaration>();
-
-                size_t prevSlotsUsed = fGlobalSlotsUsed;
-                fGlobalSlotsUsed = SkSafeMath::Add(fGlobalSlotsUsed, decl.var().type().slotCount());
-                // To avoid overzealous error reporting, only trigger the error at the first
-                // place where the global limit is exceeded.
-                if (prevSlotsUsed < kVariableSlotLimit && fGlobalSlotsUsed >= kVariableSlotLimit) {
-                    fContext.fErrors->error(pe.fLine, "global variable '" + decl.var().name() +
-                                                      "' exceeds the size limit");
-                }
-            }
-            return INHERITED::visitProgramElement(pe);
-        }
-
-        bool visitStatement(const Statement& stmt) override {
-            if (!fContext.fConfig->fSettings.fPermitInvalidStaticTests) {
-                switch (stmt.kind()) {
-                    case Statement::Kind::kIf:
-                        if (stmt.as<IfStatement>().isStatic()) {
-                            fContext.fErrors->error(stmt.fLine, "static if has non-static test");
-                        }
-                        break;
-
-                    case Statement::Kind::kSwitch:
-                        if (stmt.as<SwitchStatement>().isStatic()) {
-                            fContext.fErrors->error(stmt.fLine,
-                                                    "static switch has non-static test");
-                        }
-                        break;
-
-                    default:
-                        break;
-                }
-            }
-            return INHERITED::visitStatement(stmt);
-        }
-
-        bool visitExpression(const Expression& expr) override {
-            switch (expr.kind()) {
-                case Expression::Kind::kFunctionCall: {
-                    const FunctionDeclaration& decl = expr.as<FunctionCall>().function();
-                    if (!decl.isBuiltin() && !decl.definition()) {
-                        fContext.fErrors->error(expr.fLine, "function '" + decl.description() +
-                                                            "' is not defined");
-                    }
-                    break;
-                }
-                case Expression::Kind::kExternalFunctionReference:
-                case Expression::Kind::kFunctionReference:
-                case Expression::Kind::kMethodReference:
-                case Expression::Kind::kTypeReference:
-                    SkDEBUGFAIL("invalid reference-expr, should have been reported by coerce()");
-                    fContext.fErrors->error(expr.fLine, "invalid expression");
-                    break;
-                default:
-                    if (expr.type() == *fContext.fTypes.fInvalid) {
-                        fContext.fErrors->error(expr.fLine, "invalid expression");
-                    }
-                    break;
-            }
-            return INHERITED::visitExpression(expr);
-        }
-
-    private:
-        using INHERITED = ProgramVisitor;
-        size_t fGlobalSlotsUsed = 0;
-        const Context& fContext;
-    };
-
-    // Check all of the program's owned elements. (Built-in elements are assumed to be valid.)
-    TestsAndExpressions visitor{*program.fContext};
-    for (const std::unique_ptr<ProgramElement>& element : program.fOwnedElements) {
-        visitor.visitProgramElement(*element);
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // ProgramVisitor
 
@@ -721,9 +678,6 @@ template <typename T> bool TProgramVisitor<T>::visitStatement(typename T::Statem
 
         case Statement::Kind::kSwitchCase: {
             auto& sc = s.template as<SwitchCase>();
-            if (sc.value() && this->visitExpressionPtr(sc.value())) {
-                return true;
-            }
             return this->visitStatementPtr(sc.statement());
         }
         case Statement::Kind::kDo: {
diff --git a/third_party/skia/src/sksl/SkSLAnalysis.h b/third_party/skia/src/sksl/SkSLAnalysis.h
index 3c6bf3b418ee2..3353df311d306 100644
--- a/third_party/skia/src/sksl/SkSLAnalysis.h
+++ b/third_party/skia/src/sksl/SkSLAnalysis.h
@@ -56,6 +56,14 @@ bool ReferencesFragCoords(const Program& program);
 
 bool CallsSampleOutsideMain(const Program& program);
 
+bool CallsColorTransformIntrinsics(const Program& program);
+
+/**
+ * Determines if `function` always returns an opaque color (a vec4 where the last component is known
+ * to be 1). This is conservative, and based on constant expression analysis.
+ */
+bool ReturnsOpaqueColor(const FunctionDefinition& function);
+
 /**
  * Computes the size of the program in a completely flattened state--loops fully unrolled,
  * function calls inlined--and rejects programs that exceed an arbitrary upper bound. This is
@@ -170,10 +178,12 @@ void ValidateIndexingForES2(const ProgramElement& pe, ErrorReporter& errors);
 bool CanExitWithoutReturningValue(const FunctionDeclaration& funcDecl, const Statement& body);
 
 /**
- * Searches for @if/@switch statements that didn't optimize away, or dangling
- * FunctionReference or TypeReference expressions, and reports them as errors.
+ * Runs at finalization time to perform any last-minute correctness checks:
+ * - Reports @if/@switch statements that didn't optimize away
+ * - Reports dangling FunctionReference or TypeReference expressions
+ * - Reports function `out` params which are never written to (structs are currently exempt)
  */
-void VerifyStaticTestsAndExpressions(const Program& program);
+void DoFinalizationChecks(const Program& program);
 
 }  // namespace Analysis
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLBuiltinMap.cpp b/third_party/skia/src/sksl/SkSLBuiltinMap.cpp
new file mode 100644
index 0000000000000..fa33ad84287b2
--- /dev/null
+++ b/third_party/skia/src/sksl/SkSLBuiltinMap.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/private/SkSLProgramElement.h"
+#include "include/private/SkSLString.h"
+#include "src/sksl/SkSLBuiltinMap.h"
+
+namespace SkSL {
+
+void BuiltinMap::insertOrDie(std::string key, std::unique_ptr<ProgramElement> element) {
+    SkASSERT(fElements.find(key) == fElements.end());
+    fElements[key] = BuiltinElement{std::move(element), false};
+}
+
+const ProgramElement* BuiltinMap::find(const std::string& key) {
+    auto iter = fElements.find(key);
+    if (iter == fElements.end()) {
+        return fParent ? fParent->find(key) : nullptr;
+    }
+    return iter->second.fElement.get();
+}
+
+// Only returns a builtin element that isn't already marked as included, and then marks it.
+const ProgramElement* BuiltinMap::findAndInclude(const std::string& key) {
+    auto iter = fElements.find(key);
+    if (iter == fElements.end()) {
+        return fParent ? fParent->findAndInclude(key) : nullptr;
+    }
+    if (iter->second.fAlreadyIncluded) {
+        return nullptr;
+    }
+    iter->second.fAlreadyIncluded = true;
+    return iter->second.fElement.get();
+}
+
+void BuiltinMap::resetAlreadyIncluded() {
+    for (auto& pair : fElements) {
+        pair.second.fAlreadyIncluded = false;
+    }
+    if (fParent) {
+        fParent->resetAlreadyIncluded();
+    }
+}
+
+} // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLBuiltinMap.h b/third_party/skia/src/sksl/SkSLBuiltinMap.h
new file mode 100644
index 0000000000000..3c4c707b3952c
--- /dev/null
+++ b/third_party/skia/src/sksl/SkSLBuiltinMap.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SKSL_BUILTINMAP
+#define SKSL_BUILTINMAP
+
+#include "include/private/SkSLString.h"
+
+#include <memory>
+#include <unordered_map>
+
+namespace SkSL {
+
+class ProgramElement;
+
+/**
+ * Represents the builtin elements in the Context.
+ */
+class BuiltinMap {
+public:
+    BuiltinMap(BuiltinMap* parent) : fParent(parent) {}
+
+    void insertOrDie(std::string key, std::unique_ptr<ProgramElement> element);
+
+    const ProgramElement* find(const std::string& key);
+
+    const ProgramElement* findAndInclude(const std::string& key);
+
+    void resetAlreadyIncluded();
+
+private:
+    struct BuiltinElement {
+        std::unique_ptr<ProgramElement> fElement;
+        bool fAlreadyIncluded = false;
+    };
+
+    std::unordered_map<std::string, BuiltinElement> fElements;
+    BuiltinMap* fParent = nullptr;
+};
+
+} // namespace SkSL
+
+#endif
diff --git a/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp b/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
index 48241979722f3..84ab9485cc680 100644
--- a/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
+++ b/third_party/skia/src/sksl/SkSLBuiltinTypes.cpp
@@ -76,6 +76,27 @@ BuiltinTypes::BuiltinTypes()
         , fHalf4x2(Type::MakeMatrixType("half4x2", "h42", *fHalf, /*columns=*/4, /*rows=*/2))
         , fHalf4x3(Type::MakeMatrixType("half4x3", "h43", *fHalf, /*columns=*/4, /*rows=*/3))
         , fHalf4x4(Type::MakeMatrixType("half4x4", "h44", *fHalf, /*columns=*/4, /*rows=*/4))
+        , fVec2(Type::MakeAliasType("vec2", *fFloat2))
+        , fVec3(Type::MakeAliasType("vec3", *fFloat3))
+        , fVec4(Type::MakeAliasType("vec4", *fFloat4))
+        , fIVec2(Type::MakeAliasType("ivec2", *fInt2))
+        , fIVec3(Type::MakeAliasType("ivec3", *fInt3))
+        , fIVec4(Type::MakeAliasType("ivec4", *fInt4))
+        , fBVec2(Type::MakeAliasType("bvec2", *fBool2))
+        , fBVec3(Type::MakeAliasType("bvec3", *fBool3))
+        , fBVec4(Type::MakeAliasType("bvec4", *fBool4))
+        , fMat2(Type::MakeAliasType("mat2", *fFloat2x2))
+        , fMat3(Type::MakeAliasType("mat3", *fFloat3x3))
+        , fMat4(Type::MakeAliasType("mat4", *fFloat4x4))
+        , fMat2x2(Type::MakeAliasType("mat2x2", *fFloat2x2))
+        , fMat2x3(Type::MakeAliasType("mat2x3", *fFloat2x3))
+        , fMat2x4(Type::MakeAliasType("mat2x4", *fFloat2x4))
+        , fMat3x2(Type::MakeAliasType("mat3x2", *fFloat3x2))
+        , fMat3x3(Type::MakeAliasType("mat3x3", *fFloat3x3))
+        , fMat3x4(Type::MakeAliasType("mat3x4", *fFloat3x4))
+        , fMat4x2(Type::MakeAliasType("mat4x2", *fFloat4x2))
+        , fMat4x3(Type::MakeAliasType("mat4x3", *fFloat4x3))
+        , fMat4x4(Type::MakeAliasType("mat4x4", *fFloat4x4))
         , fTexture1D(Type::MakeTextureType("texture1D",
                                            SpvDim1D,
                                            /*isDepth=*/false,
diff --git a/third_party/skia/src/sksl/SkSLBuiltinTypes.h b/third_party/skia/src/sksl/SkSLBuiltinTypes.h
index 0b3db2b7405e6..a11325712baf4 100644
--- a/third_party/skia/src/sksl/SkSLBuiltinTypes.h
+++ b/third_party/skia/src/sksl/SkSLBuiltinTypes.h
@@ -82,6 +82,32 @@ class BuiltinTypes {
     const std::unique_ptr<Type> fHalf4x3;
     const std::unique_ptr<Type> fHalf4x4;
 
+    const std::unique_ptr<Type> fVec2;
+    const std::unique_ptr<Type> fVec3;
+    const std::unique_ptr<Type> fVec4;
+
+    const std::unique_ptr<Type> fIVec2;
+    const std::unique_ptr<Type> fIVec3;
+    const std::unique_ptr<Type> fIVec4;
+
+    const std::unique_ptr<Type> fBVec2;
+    const std::unique_ptr<Type> fBVec3;
+    const std::unique_ptr<Type> fBVec4;
+
+    const std::unique_ptr<Type> fMat2;
+    const std::unique_ptr<Type> fMat3;
+    const std::unique_ptr<Type> fMat4;
+
+    const std::unique_ptr<Type> fMat2x2;
+    const std::unique_ptr<Type> fMat2x3;
+    const std::unique_ptr<Type> fMat2x4;
+    const std::unique_ptr<Type> fMat3x2;
+    const std::unique_ptr<Type> fMat3x3;
+    const std::unique_ptr<Type> fMat3x4;
+    const std::unique_ptr<Type> fMat4x2;
+    const std::unique_ptr<Type> fMat4x3;
+    const std::unique_ptr<Type> fMat4x4;
+
     const std::unique_ptr<Type> fTexture1D;
     const std::unique_ptr<Type> fTexture2D;
     const std::unique_ptr<Type> fTexture3D;
diff --git a/third_party/skia/src/sksl/SkSLCompiler.cpp b/third_party/skia/src/sksl/SkSLCompiler.cpp
index beac937629e2d..156989310655c 100644
--- a/third_party/skia/src/sksl/SkSLCompiler.cpp
+++ b/third_party/skia/src/sksl/SkSLCompiler.cpp
@@ -12,9 +12,9 @@
 
 #include "include/sksl/DSLCore.h"
 #include "src/core/SkTraceEvent.h"
+#include "src/sksl/SkSLBuiltinMap.h"
 #include "src/sksl/SkSLConstantFolder.h"
 #include "src/sksl/SkSLDSLParser.h"
-#include "src/sksl/SkSLIntrinsicMap.h"
 #include "src/sksl/SkSLOperators.h"
 #include "src/sksl/SkSLProgramSettings.h"
 #include "src/sksl/SkSLRehydrator.h"
@@ -61,13 +61,13 @@
 #include "starboard/common/log.h"
 #endif
 
-#if defined(SKSL_STANDALONE)
-
-// In standalone mode, we load the textual sksl source files. GN generates or copies these files
-// to the skslc executable directory. The "data" in this mode is just the filename.
-#define MODULE_DATA(name) MakeModulePath("sksl_" #name ".sksl")
-
+#ifdef SKSL_STANDALONE
+#define REHYDRATE 0
 #else
+#define REHYDRATE 1
+#endif
+
+#if REHYDRATE
 
 // At runtime, we load the dehydrated sksl data files. The data is a (pointer, size) pair.
 #include "src/sksl/generated/sksl_frag.dehydrated.sksl"
@@ -79,6 +79,12 @@
 #define MODULE_DATA(name) MakeModuleData(SKSL_INCLUDE_sksl_##name,\
                                          SKSL_INCLUDE_sksl_##name##_LENGTH)
 
+#else
+
+// In standalone mode, we load the textual sksl source files. GN generates or copies these files
+// to the skslc executable directory. The "data" in this mode is just the filename.
+#define MODULE_DATA(name) MakeModulePath("sksl_" #name ".sksl")
+
 #endif
 
 namespace SkSL {
@@ -176,6 +182,8 @@ inline static constexpr BuiltinTypePtr kRootTypes[] = {
     TYPE(GenType),   TYPE(GenIType), TYPE(GenUType),
     TYPE(GenHType),   /* (GenSType)      (GenUSType) */
     TYPE(GenBType),
+    TYPE(IntLiteral),
+    TYPE(FloatLiteral),
 
     TYPE(Vec),     TYPE(IVec),     TYPE(UVec),
     TYPE(HVec),    TYPE(SVec),     TYPE(USVec),
@@ -200,7 +208,7 @@ inline static constexpr BuiltinTypePtr kPrivateTypes[] = {
 
 #undef TYPE
 
-std::shared_ptr<SymbolTable> Compiler::makeRootSymbolTable() {
+std::shared_ptr<SymbolTable> Compiler::makeRootSymbolTable() const {
     auto rootSymbolTable = std::make_shared<SymbolTable>(*fContext, /*builtin=*/true);
 
     for (BuiltinTypePtr rootType : kRootTypes) {
@@ -253,29 +261,35 @@ const ParsedModule& Compiler::loadVertexModule() {
 
 static void add_glsl_type_aliases(SkSL::SymbolTable* symbols, const SkSL::BuiltinTypes& types) {
     // Add some aliases to the runtime effect modules so that it's friendlier, and more like GLSL.
-    symbols->addAlias("vec2", types.fFloat2.get());
-    symbols->addAlias("vec3", types.fFloat3.get());
-    symbols->addAlias("vec4", types.fFloat4.get());
+    symbols->addWithoutOwnership(types.fVec2.get());
+    symbols->addWithoutOwnership(types.fVec3.get());
+    symbols->addWithoutOwnership(types.fVec4.get());
 
-    symbols->addAlias("ivec2", types.fInt2.get());
-    symbols->addAlias("ivec3", types.fInt3.get());
-    symbols->addAlias("ivec4", types.fInt4.get());
+    symbols->addWithoutOwnership(types.fIVec2.get());
+    symbols->addWithoutOwnership(types.fIVec3.get());
+    symbols->addWithoutOwnership(types.fIVec4.get());
 
-    symbols->addAlias("bvec2", types.fBool2.get());
-    symbols->addAlias("bvec3", types.fBool3.get());
-    symbols->addAlias("bvec4", types.fBool4.get());
+    symbols->addWithoutOwnership(types.fBVec2.get());
+    symbols->addWithoutOwnership(types.fBVec3.get());
+    symbols->addWithoutOwnership(types.fBVec4.get());
 
-    symbols->addAlias("mat2", types.fFloat2x2.get());
-    symbols->addAlias("mat3", types.fFloat3x3.get());
-    symbols->addAlias("mat4", types.fFloat4x4.get());
+    symbols->addWithoutOwnership(types.fMat2.get());
+    symbols->addWithoutOwnership(types.fMat3.get());
+    symbols->addWithoutOwnership(types.fMat4.get());
 
     // Alias every private type to "invalid". This will prevent code from using built-in names like
     // `sampler2D` as variable names.
     for (BuiltinTypePtr privateType : kPrivateTypes) {
-        symbols->addAlias((types.*privateType)->name(), types.fInvalid.get());
+        symbols->add(Type::MakeAliasType((types.*privateType)->name(), *types.fInvalid));
     }
 }
 
+std::shared_ptr<SymbolTable> Compiler::makeGLSLRootSymbolTable() const {
+    auto result = this->makeRootSymbolTable();
+    add_glsl_type_aliases(result.get(), fContext->fTypes);
+    return result;
+}
+
 const ParsedModule& Compiler::loadPublicModule() {
     if (!fPublicModule.fSymbols) {
         fPublicModule = this->parseModule(ProgramKind::kGeneric, MODULE_DATA(public), fRootModule);
@@ -299,6 +313,8 @@ const ParsedModule& Compiler::moduleForProgramKind(ProgramKind kind) {
         case ProgramKind::kRuntimeColorFilter: return this->loadPublicModule();        break;
         case ProgramKind::kRuntimeShader:      return this->loadRuntimeShaderModule(); break;
         case ProgramKind::kRuntimeBlender:     return this->loadPublicModule();        break;
+        case ProgramKind::kCustomMeshVertex:   return this->loadPublicModule();        break;
+        case ProgramKind::kCustomMeshFragment: return this->loadPublicModule();        break;
         case ProgramKind::kGeneric:            return this->loadPublicModule();        break;
     }
     SkUNREACHABLE;
@@ -326,31 +342,31 @@ LoadedModule Compiler::loadModule(ProgramKind kind,
     Program::Settings settings;
     settings.fReplaceSettings = !dehydrate;
 
-#if defined(SKSL_STANDALONE)
+#if REHYDRATE
+    ProgramConfig config;
+    config.fIsBuiltinCode = true;
+    config.fKind = kind;
+    config.fSettings = settings;
+    AutoProgramConfig autoConfig(fContext, &config);
+    SkASSERT(data.fData && (data.fSize != 0));
+    Rehydrator rehydrator(*this, data.fData, data.fSize, std::move(base));
+    LoadedModule result = { kind, rehydrator.symbolTable(), rehydrator.elements() };
+#else
     SkASSERT(this->errorCount() == 0);
     SkASSERT(data.fPath);
     std::ifstream in(data.fPath);
-    String text{std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>()};
+    std::string text{std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>()};
     if (in.rdstate()) {
         printf("error reading %s\n", data.fPath);
         abort();
     }
-    ParsedModule baseModule = {base, /*fIntrinsics=*/nullptr};
+    ParsedModule baseModule = {std::move(base), /*fElements=*/nullptr};
     LoadedModule result = DSLParser(this, settings, kind,
             std::move(text)).moduleInheritingFrom(std::move(baseModule));
     if (this->errorCount()) {
         printf("Unexpected errors: %s\n", this->fErrorText.c_str());
         SkDEBUGFAILF("%s %s\n", data.fPath, this->fErrorText.c_str());
     }
-#else
-    ProgramConfig config;
-    config.fIsBuiltinCode = true;
-    config.fKind = kind;
-    config.fSettings = settings;
-    AutoProgramConfig autoConfig(fContext, &config);
-    SkASSERT(data.fData && (data.fSize != 0));
-    Rehydrator rehydrator(fContext.get(), base, data.fData, data.fSize);
-    LoadedModule result = { kind, rehydrator.symbolTable(), rehydrator.elements() };
 #endif
 
     return result;
@@ -361,21 +377,21 @@ ParsedModule Compiler::parseModule(ProgramKind kind, ModuleData data, const Pars
     this->optimize(module);
 
     // For modules that just declare (but don't define) intrinsic functions, there will be no new
-    // program elements. In that case, we can share our parent's intrinsic map:
+    // program elements. In that case, we can share our parent's element map:
     if (module.fElements.empty()) {
-        return ParsedModule{module.fSymbols, base.fIntrinsics};
+        return ParsedModule{module.fSymbols, base.fElements};
     }
 
-    auto intrinsics = std::make_shared<IntrinsicMap>(base.fIntrinsics.get());
+    auto elements = std::make_shared<BuiltinMap>(base.fElements.get());
 
-    // Now, transfer all of the program elements to an intrinsic map. This maps certain types of
-    // global objects to the declaring ProgramElement.
+    // Now, transfer all of the program elements to a builtin element map. This maps certain types
+    // of global objects to the declaring ProgramElement.
     for (std::unique_ptr<ProgramElement>& element : module.fElements) {
         switch (element->kind()) {
             case ProgramElement::Kind::kFunction: {
                 const FunctionDefinition& f = element->as<FunctionDefinition>();
                 SkASSERT(f.declaration().isBuiltin());
-                intrinsics->insertOrDie(f.declaration().description(), std::move(element));
+                elements->insertOrDie(f.declaration().description(), std::move(element));
                 break;
             }
             case ProgramElement::Kind::kFunctionPrototype: {
@@ -386,13 +402,13 @@ ParsedModule Compiler::parseModule(ProgramKind kind, ModuleData data, const Pars
                 const GlobalVarDeclaration& global = element->as<GlobalVarDeclaration>();
                 const Variable& var = global.declaration()->as<VarDeclaration>().var();
                 SkASSERT(var.isBuiltin());
-                intrinsics->insertOrDie(String(var.name()), std::move(element));
+                elements->insertOrDie(std::string(var.name()), std::move(element));
                 break;
             }
             case ProgramElement::Kind::kInterfaceBlock: {
                 const Variable& var = element->as<InterfaceBlock>().variable();
                 SkASSERT(var.isBuiltin());
-                intrinsics->insertOrDie(String(var.name()), std::move(element));
+                elements->insertOrDie(std::string(var.name()), std::move(element));
                 break;
             }
             default:
@@ -406,11 +422,11 @@ ParsedModule Compiler::parseModule(ProgramKind kind, ModuleData data, const Pars
         }
     }
 
-    return ParsedModule{module.fSymbols, std::move(intrinsics)};
+    return ParsedModule{module.fSymbols, std::move(elements)};
 }
 
 std::unique_ptr<Program> Compiler::convertProgram(ProgramKind kind,
-                                                  String text,
+                                                  std::string text,
                                                   Program::Settings settings) {
     TRACE_EVENT0("skia.shaders", "SkSL::Compiler::convertProgram");
 
@@ -458,10 +474,10 @@ std::unique_ptr<Program> Compiler::convertProgram(ProgramKind kind,
     return DSLParser(this, settings, kind, std::move(text)).program();
 }
 
-std::unique_ptr<Expression> Compiler::convertIdentifier(int line, skstd::string_view name) {
+std::unique_ptr<Expression> Compiler::convertIdentifier(int line, std::string_view name) {
     const Symbol* result = (*fSymbolTable)[name];
     if (!result) {
-        this->errorReporter().error(line, "unknown identifier '" + name + "'");
+        this->errorReporter().error(line, "unknown identifier '" + std::string(name) + "'");
         return nullptr;
     }
     switch (result->kind()) {
@@ -499,7 +515,10 @@ std::unique_ptr<Expression> Compiler::convertIdentifier(int line, skstd::string_
                                      FieldAccess::OwnerKind::kAnonymousInterfaceBlock);
         }
         case Symbol::Kind::kType: {
-            return TypeReference::Convert(*fContext, line, &result->as<Type>());
+            // go through DSLType so we report errors on private types
+            dsl::DSLModifiers modifiers;
+            dsl::DSLType dslType(result->name(), &modifiers, PositionInfo(/*file=*/nullptr, line));
+            return TypeReference::Convert(*fContext, line, &dslType.skslType());
         }
         case Symbol::Kind::kExternal: {
             const ExternalFunction* r = &result->as<ExternalFunction>();
@@ -585,9 +604,10 @@ bool Compiler::runInliner(const std::vector<std::unique_ptr<ProgramElement>>& el
 }
 
 bool Compiler::finalize(Program& program) {
-    // Do a pass looking for @if/@switch statements that didn't optimize away, or dangling
-    // FunctionReference or TypeReference expressions. Report these as errors.
-    Analysis::VerifyStaticTestsAndExpressions(program);
+    // Do one last correctness-check pass. This looks for @if/@switch statements that didn't
+    // optimize away, or dangling FunctionReference or TypeReference expressions, and reports them
+    // as errors.
+    Analysis::DoFinalizationChecks(program);
 
     // Verify that the program conforms to ES2 limitations.
     if (fContext->fConfig->strictES2Mode() && this->errorCount() == 0) {
@@ -620,12 +640,12 @@ bool Compiler::toSPIRV(Program& program, OutputStream& out) {
     bool result = cg.generateCode();
     if (result && program.fConfig->fSettings.fValidateSPIRV) {
         spvtools::SpirvTools tools(SPV_ENV_VULKAN_1_0);
-        const String& data = buffer.str();
+        const std::string& data = buffer.str();
         SkASSERT(0 == data.size() % 4);
-        String errors;
+        std::string errors;
         auto dumpmsg = [&errors](spv_message_level_t, const char*, const spv_position_t&,
                                  const char* m) {
-            errors.appendf("SPIR-V validation error: %s\n", m);
+            String::appendf(&errors, "SPIR-V validation error: %s\n", m);
         };
         tools.SetMessageConsumer(dumpmsg);
 
@@ -657,7 +677,7 @@ bool Compiler::toSPIRV(Program& program, OutputStream& out) {
     return result;
 }
 
-bool Compiler::toSPIRV(Program& program, String* out) {
+bool Compiler::toSPIRV(Program& program, std::string* out) {
     StringStream buffer;
     bool result = this->toSPIRV(program, buffer);
     if (result) {
@@ -674,7 +694,7 @@ bool Compiler::toGLSL(Program& program, OutputStream& out) {
     return result;
 }
 
-bool Compiler::toGLSL(Program& program, String* out) {
+bool Compiler::toGLSL(Program& program, std::string* out) {
     StringStream buffer;
     bool result = this->toGLSL(program, buffer);
     if (result) {
@@ -685,7 +705,7 @@ bool Compiler::toGLSL(Program& program, String* out) {
 
 bool Compiler::toHLSL(Program& program, OutputStream& out) {
     TRACE_EVENT0("skia.shaders", "SkSL::Compiler::toHLSL");
-    String hlsl;
+    std::string hlsl;
     if (!this->toHLSL(program, &hlsl)) {
         return false;
     }
@@ -693,8 +713,8 @@ bool Compiler::toHLSL(Program& program, OutputStream& out) {
     return true;
 }
 
-bool Compiler::toHLSL(Program& program, String* out) {
-    String spirv;
+bool Compiler::toHLSL(Program& program, std::string* out) {
+    std::string spirv;
     if (!this->toSPIRV(program, &spirv)) {
         return false;
     }
@@ -720,7 +740,7 @@ bool Compiler::toMetal(Program& program, OutputStream& out) {
 #endif
 }
 
-bool Compiler::toMetal(Program& program, String* out) {
+bool Compiler::toMetal(Program& program, std::string* out) {
 #if defined(STARBOARD)
     SB_NOTREACHED();
     return false;
@@ -736,15 +756,19 @@ bool Compiler::toMetal(Program& program, String* out) {
 
 #endif // defined(SKSL_STANDALONE) || SK_SUPPORT_GPU
 
-void Compiler::handleError(skstd::string_view msg, PositionInfo pos) {
-    fErrorText += "error: " + (pos.line() >= 1 ? to_string(pos.line()) + ": " : "") + msg + "\n";
+void Compiler::handleError(std::string_view msg, PositionInfo pos) {
+    fErrorText += "error: ";
+    if (pos.line() >= 1) {
+        fErrorText += std::to_string(pos.line()) + ": ";
+    }
+    fErrorText += std::string(msg) + "\n";
 }
 
-String Compiler::errorText(bool showCount) {
+std::string Compiler::errorText(bool showCount) {
     if (showCount) {
         this->writeErrorCount();
     }
-    String result = fErrorText;
+    std::string result = fErrorText;
     this->resetErrors();
     return result;
 }
@@ -752,7 +776,7 @@ String Compiler::errorText(bool showCount) {
 void Compiler::writeErrorCount() {
     int count = this->errorCount();
     if (count) {
-        fErrorText += to_string(count) + " error";
+        fErrorText += std::to_string(count) + " error";
         if (count > 1) {
             fErrorText += "s";
         }
diff --git a/third_party/skia/src/sksl/SkSLCompiler.h b/third_party/skia/src/sksl/SkSLCompiler.h
index 1d4976883ef3e..0aabf43624076 100644
--- a/third_party/skia/src/sksl/SkSLCompiler.h
+++ b/third_party/skia/src/sksl/SkSLCompiler.h
@@ -139,30 +139,30 @@ class SK_API Compiler {
      */
     std::unique_ptr<Program> convertProgram(
             ProgramKind kind,
-            String text,
+            std::string text,
             Program::Settings settings);
 
-    std::unique_ptr<Expression> convertIdentifier(int line, skstd::string_view name);
+    std::unique_ptr<Expression> convertIdentifier(int line, std::string_view name);
 
     bool toSPIRV(Program& program, OutputStream& out);
 
-    bool toSPIRV(Program& program, String* out);
+    bool toSPIRV(Program& program, std::string* out);
 
     bool toGLSL(Program& program, OutputStream& out);
 
-    bool toGLSL(Program& program, String* out);
+    bool toGLSL(Program& program, std::string* out);
 
     bool toHLSL(Program& program, OutputStream& out);
 
-    bool toHLSL(Program& program, String* out);
+    bool toHLSL(Program& program, std::string* out);
 
     bool toMetal(Program& program, OutputStream& out);
 
-    bool toMetal(Program& program, String* out);
+    bool toMetal(Program& program, std::string* out);
 
-    void handleError(skstd::string_view msg, PositionInfo pos);
+    void handleError(std::string_view msg, PositionInfo pos);
 
-    String errorText(bool showCount = true);
+    std::string errorText(bool showCount = true);
 
     ErrorReporter& errorReporter() { return *fContext->fErrors; }
 
@@ -175,10 +175,14 @@ class SK_API Compiler {
         this->errorReporter().resetErrorCount();
     }
 
-    Context& context() {
+    Context& context() const {
         return *fContext;
     }
 
+    std::shared_ptr<SymbolTable> symbolTable() const {
+        return fSymbolTable;
+    }
+
     // When  SKSL_STANDALONE, fPath is used. (fData, fSize) will be (nullptr, 0)
     // When !SKSL_STANDALONE, fData and fSize are used. fPath will be nullptr.
     struct ModuleData {
@@ -207,7 +211,7 @@ class SK_API Compiler {
         CompilerErrorReporter(Compiler* compiler)
             : fCompiler(*compiler) {}
 
-        void handleError(skstd::string_view msg, PositionInfo pos) override {
+        void handleError(std::string_view msg, PositionInfo pos) override {
             fCompiler.handleError(msg, pos);
         }
 
@@ -221,7 +225,8 @@ class SK_API Compiler {
     const ParsedModule& loadPublicModule();
     const ParsedModule& loadRuntimeShaderModule();
 
-    std::shared_ptr<SymbolTable> makeRootSymbolTable();
+    std::shared_ptr<SymbolTable> makeRootSymbolTable() const;
+    std::shared_ptr<SymbolTable> makeGLSLRootSymbolTable() const;
     std::shared_ptr<SymbolTable> makePrivateSymbolTable(std::shared_ptr<SymbolTable> parent);
 
     /** Optimize every function in the program. */
@@ -260,7 +265,7 @@ class SK_API Compiler {
     // compilation
     std::shared_ptr<SymbolTable> fSymbolTable;
 
-    String fErrorText;
+    std::string fErrorText;
 
     static OverrideFlag sOptimizer;
     static OverrideFlag sInliner;
@@ -268,6 +273,7 @@ class SK_API Compiler {
     friend class AutoSource;
     friend class ::SkSLCompileBench;
     friend class DSLParser;
+    friend class Rehydrator;
     friend class ThreadContext;
     friend class dsl::DSLCore;
 };
diff --git a/third_party/skia/src/sksl/SkSLConstantFolder.cpp b/third_party/skia/src/sksl/SkSLConstantFolder.cpp
index a2de6906d7786..f4290786523d7 100644
--- a/third_party/skia/src/sksl/SkSLConstantFolder.cpp
+++ b/third_party/skia/src/sksl/SkSLConstantFolder.cpp
@@ -26,6 +26,17 @@
 
 namespace SkSL {
 
+static bool is_vec_or_mat(const Type& type) {
+    switch (type.typeKind()) {
+        case Type::TypeKind::kMatrix:
+        case Type::TypeKind::kVector:
+            return true;
+
+        default:
+            return false;
+    }
+}
+
 static std::unique_ptr<Expression> eliminate_no_op_boolean(const Expression& left,
                                                            Operator op,
                                                            const Expression& right) {
@@ -61,10 +72,10 @@ static std::unique_ptr<Expression> short_circuit_boolean(const Expression& left,
     return eliminate_no_op_boolean(right, op, left);
 }
 
-static std::unique_ptr<Expression> simplify_vector_equality(const Context& context,
-                                                            const Expression& left,
-                                                            Operator op,
-                                                            const Expression& right) {
+static std::unique_ptr<Expression> simplify_constant_equality(const Context& context,
+                                                              const Expression& left,
+                                                              Operator op,
+                                                              const Expression& right) {
     if (op.kind() == Token::Kind::TK_EQEQ || op.kind() == Token::Kind::TK_NEQ) {
         bool equality = (op.kind() == Token::Kind::TK_EQEQ);
 
@@ -83,16 +94,68 @@ static std::unique_ptr<Expression> simplify_vector_equality(const Context& conte
     return nullptr;
 }
 
-static std::unique_ptr<Expression> simplify_vector(const Context& context,
-                                                   const Expression& left,
-                                                   Operator op,
-                                                   const Expression& right) {
-    SkASSERT(left.type().isVector());
-    SkASSERT(left.type() == right.type());
+static std::unique_ptr<Expression> simplify_matrix_times_matrix(const Context& context,
+                                                                const Expression& left,
+                                                                const Expression& right) {
+    const Type& leftType = left.type();
+    const Type& rightType = right.type();
+
+    SkASSERT(leftType.isMatrix());
+    SkASSERT(rightType.isMatrix());
+
+    const Type& componentType = leftType.componentType();
+    SkASSERT(componentType.matches(rightType.componentType()));
+
+    const int leftColumns  = leftType.columns(),
+              leftRows     = leftType.rows(),
+              rightColumns = rightType.columns(),
+              rightRows    = rightType.rows(),
+              outColumns   = rightColumns,
+              outRows      = leftRows;
+    SkASSERT(leftColumns == rightRows);
+    const Type& resultType = componentType.toCompound(context, outColumns, outRows);
+
+    // Fetch the left matrix.
+    double leftVals[4][4];
+    for (int c = 0; c < leftColumns; ++c) {
+        for (int r = 0; r < leftRows; ++r) {
+            leftVals[c][r] = *left.getConstantValue((c * leftRows) + r);
+        }
+    }
+    // Fetch the right matrix.
+    double rightVals[4][4];
+    for (int c = 0; c < rightColumns; ++c) {
+        for (int r = 0; r < rightRows; ++r) {
+            rightVals[c][r] = *right.getConstantValue((c * rightRows) + r);
+        }
+    }
+
+    ExpressionArray args;
+    args.reserve_back(outColumns * outRows);
+    for (int c = 0; c < outColumns; ++c) {
+        for (int r = 0; r < outRows; ++r) {
+            // Compute a dot product for this position.
+            double val = 0;
+            for (int dotIdx = 0; dotIdx < leftColumns; ++dotIdx) {
+                val += leftVals[dotIdx][r] * rightVals[c][dotIdx];
+            }
+            args.push_back(Literal::Make(left.fLine, val, &componentType));
+        }
+    }
+
+    return ConstructorCompound::Make(context, left.fLine, resultType, std::move(args));
+}
+
+static std::unique_ptr<Expression> simplify_componentwise(const Context& context,
+                                                          const Expression& left,
+                                                          Operator op,
+                                                          const Expression& right) {
+    SkASSERT(is_vec_or_mat(left.type()));
+    SkASSERT(left.type().matches(right.type()));
     const Type& type = left.type();
 
     // Handle equality operations: == !=
-    if (std::unique_ptr<Expression> result = simplify_vector_equality(context, left, op, right)) {
+    if (std::unique_ptr<Expression> result = simplify_constant_equality(context, left, op, right)) {
         return result;
     }
 
@@ -109,6 +172,8 @@ static std::unique_ptr<Expression> simplify_vector(const Context& context,
     }
 
     const Type& componentType = type.componentType();
+    SkASSERT(componentType.isNumber());
+
     double minimumValue = -INFINITY, maximumValue = INFINITY;
     if (componentType.isInteger()) {
         minimumValue = componentType.minimumValue();
@@ -116,8 +181,9 @@ static std::unique_ptr<Expression> simplify_vector(const Context& context,
     }
 
     ExpressionArray args;
-    args.reserve_back(type.columns());
-    for (int i = 0; i < type.columns(); i++) {
+    int numSlots = type.slotCount();
+    args.reserve_back(numSlots);
+    for (int i = 0; i < numSlots; i++) {
         double value = foldFn(*left.getConstantValue(i), *right.getConstantValue(i));
         if (value < minimumValue || value > maximumValue) {
             return nullptr;
@@ -128,6 +194,25 @@ static std::unique_ptr<Expression> simplify_vector(const Context& context,
     return ConstructorCompound::Make(context, left.fLine, type, std::move(args));
 }
 
+static std::unique_ptr<Expression> splat_scalar(const Context& context,
+                                                const Expression& scalar,
+                                                const Type& type) {
+    if (type.isVector()) {
+        return ConstructorSplat::Make(context, scalar.fLine, type, scalar.clone());
+    }
+    if (type.isMatrix()) {
+        int numSlots = type.slotCount();
+        ExpressionArray splatMatrix;
+        splatMatrix.reserve_back(numSlots);
+        for (int index = 0; index < numSlots; ++index) {
+            splatMatrix.push_back(scalar.clone());
+        }
+        return ConstructorCompound::Make(context, scalar.fLine, type, std::move(splatMatrix));
+    }
+    SkDEBUGFAILF("unsupported type %s", type.description().c_str());
+    return nullptr;
+}
+
 static std::unique_ptr<Expression> cast_expression(const Context& context,
                                                    const Expression& expr,
                                                    const Type& type) {
@@ -157,7 +242,7 @@ bool ConstantFolder::GetConstantValue(const Expression& value, double* out) {
 static bool contains_constant_zero(const Expression& expr) {
     int numSlots = expr.type().slotCount();
     for (int index = 0; index < numSlots; ++index) {
-        skstd::optional<double> slotVal = expr.getConstantValue(index);
+        std::optional<double> slotVal = expr.getConstantValue(index);
         if (slotVal.has_value() && *slotVal == 0.0) {
             return true;
         }
@@ -168,7 +253,7 @@ static bool contains_constant_zero(const Expression& expr) {
 static bool is_constant_value(const Expression& expr, double value) {
     int numSlots = expr.type().slotCount();
     for (int index = 0; index < numSlots; ++index) {
-        skstd::optional<double> slotVal = expr.getConstantValue(index);
+        std::optional<double> slotVal = expr.getConstantValue(index);
         if (!slotVal.has_value() || *slotVal != value) {
             return false;
         }
@@ -419,9 +504,7 @@ std::unique_ptr<Expression> ConstantFolder::Simplify(const Context& context,
         return nullptr;
     }
 
-    // Note that we expressly do not worry about precision and overflow here -- we use the maximum
-    // precision to calculate the results and hope the result makes sense.
-    // TODO(skia:10932): detect and handle integer overflow properly.
+    // Note that fold_int_expression returns null if the result would overflow its type.
     using SKSL_UINT = uint64_t;
     if (left->isIntLiteral() && right->isIntLiteral()) {
         SKSL_INT leftVal  = left->as<Literal>().intValue();
@@ -500,76 +583,34 @@ std::unique_ptr<Expression> ConstantFolder::Simplify(const Context& context,
         #undef RESULT
     }
 
-    // Perform constant folding on pairs of vectors.
-    if (leftType.isVector() && leftType == rightType) {
-        if (leftType.componentType().isFloat()) {
-            return simplify_vector(context, *left, op, *right);
-        }
-        if (leftType.componentType().isInteger()) {
-            return simplify_vector(context, *left, op, *right);
-        }
-        if (leftType.componentType().isBoolean()) {
-            return simplify_vector_equality(context, *left, op, *right);
-        }
-        return nullptr;
+    // Perform matrix * matrix multiplication.
+    if (op.kind() == Token::Kind::TK_STAR && leftType.isMatrix() && rightType.isMatrix()) {
+        return simplify_matrix_times_matrix(context, *left, *right);
     }
 
-    // Perform constant folding on vectors against scalars, e.g.: half4(2) + 2
-    if (leftType.isVector() && leftType.componentType() == rightType) {
-        if (rightType.isFloat()) {
-            return simplify_vector(context, *left, op, ConstructorSplat(*right, left->type()));
-        }
-        if (rightType.isInteger()) {
-            return simplify_vector(context, *left, op, ConstructorSplat(*right, left->type()));
-        }
-        if (rightType.isBoolean()) {
-            return simplify_vector_equality(context, *left, op,
-                                            ConstructorSplat(*right, left->type()));
-        }
-        return nullptr;
+    // Perform constant folding on pairs of vectors/matrices.
+    if (is_vec_or_mat(leftType) && leftType.matches(rightType)) {
+        return simplify_componentwise(context, *left, op, *right);
     }
 
-    // Perform constant folding on scalars against vectors, e.g.: 2 + half4(2)
-    if (rightType.isVector() && rightType.componentType() == leftType) {
-        if (leftType.isFloat()) {
-            return simplify_vector(context, ConstructorSplat(*left, right->type()), op, *right);
-        }
-        if (leftType.isInteger()) {
-            return simplify_vector(context, ConstructorSplat(*left, right->type()), op, *right);
-        }
-        if (leftType.isBoolean()) {
-            return simplify_vector_equality(context, ConstructorSplat(*left, right->type()),
-                                            op, *right);
-        }
-        return nullptr;
+    // Perform constant folding on vectors/matrices against scalars, e.g.: half4(2) + 2
+    if (rightType.isScalar() && is_vec_or_mat(leftType) &&
+        leftType.componentType().matches(rightType)) {
+        return simplify_componentwise(context, *left, op,
+                                      *splat_scalar(context, *right, left->type()));
+    }
+
+    // Perform constant folding on scalars against vectors/matrices, e.g.: 2 + half4(2)
+    if (leftType.isScalar() && is_vec_or_mat(rightType) &&
+        rightType.componentType().matches(leftType)) {
+        return simplify_componentwise(context, *splat_scalar(context, *left, right->type()),
+                                      op, *right);
     }
 
     // Perform constant folding on pairs of matrices or arrays.
     if ((leftType.isMatrix() && rightType.isMatrix()) ||
         (leftType.isArray() && rightType.isArray())) {
-        bool equality;
-        switch (op.kind()) {
-            case Token::Kind::TK_EQEQ:
-                equality = true;
-                break;
-            case Token::Kind::TK_NEQ:
-                equality = false;
-                break;
-            default:
-                return nullptr;
-        }
-
-        switch (left->compareConstant(*right)) {
-            case Expression::ComparisonResult::kNotEqual:
-                equality = !equality;
-                [[fallthrough]];
-
-            case Expression::ComparisonResult::kEqual:
-                return Literal::MakeBool(context, line, equality);
-
-            case Expression::ComparisonResult::kUnknown:
-                return nullptr;
-        }
+        return simplify_constant_equality(context, *left, op, *right);
     }
 
     // We aren't able to constant-fold.
diff --git a/third_party/skia/src/sksl/SkSLContext.h b/third_party/skia/src/sksl/SkSLContext.h
index 29b137a3f4ae1..42bfb5573dc03 100644
--- a/third_party/skia/src/sksl/SkSLContext.h
+++ b/third_party/skia/src/sksl/SkSLContext.h
@@ -16,8 +16,8 @@
 
 namespace SkSL {
 
+class BuiltinMap;
 class ErrorReporter;
-class IntrinsicMap;
 class Mangler;
 class ModifiersPool;
 struct ProgramConfig;
@@ -49,7 +49,7 @@ class Context {
     Mangler* fMangler = nullptr;
 
     // Symbols which have definitions in the include files.
-    IntrinsicMap* fIntrinsics = nullptr;
+    BuiltinMap* fBuiltins = nullptr;
 };
 
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLDSLParser.cpp b/third_party/skia/src/sksl/SkSLDSLParser.cpp
index 1ff1ebf2e1c8f..1dbdb8b55c81f 100644
--- a/third_party/skia/src/sksl/SkSLDSLParser.cpp
+++ b/third_party/skia/src/sksl/SkSLDSLParser.cpp
@@ -55,7 +55,8 @@ class AutoDSLDepth {
         ++fDepth;
         ++fParser->fDepth;
         if (fParser->fDepth > kMaxParseDepth) {
-            fParser->error(fParser->peek(), String("exceeded max parse depth"));
+            fParser->error(fParser->peek(), "exceeded max parse depth");
+            fParser->fEncounteredFatalError = true;
             return false;
         }
         return true;
@@ -77,10 +78,10 @@ class AutoDSLSymbolTable {
     }
 };
 
-std::unordered_map<skstd::string_view, DSLParser::LayoutToken>* DSLParser::layoutTokens;
+std::unordered_map<std::string_view, DSLParser::LayoutToken>* DSLParser::layoutTokens;
 
 void DSLParser::InitLayoutMap() {
-    layoutTokens = new std::unordered_map<skstd::string_view, LayoutToken>;
+    layoutTokens = new std::unordered_map<std::string_view, LayoutToken>;
     #define TOKEN(name, text) (*layoutTokens)[text] = LayoutToken::name
     TOKEN(LOCATION,                     "location");
     TOKEN(OFFSET,                       "offset");
@@ -97,11 +98,11 @@ void DSLParser::InitLayoutMap() {
 }
 
 DSLParser::DSLParser(Compiler* compiler, const ProgramSettings& settings, ProgramKind kind,
-                     String text)
+                     std::string text)
     : fCompiler(*compiler)
     , fSettings(settings)
     , fKind(kind)
-    , fText(std::make_unique<String>(std::move(text)))
+    , fText(std::make_unique<std::string>(std::move(text)))
     , fPushback(Token::Kind::TK_NONE, /*offset=*/-1, /*length=*/-1, /*line=*/-1) {
     // We don't want to have to worry about manually releasing all of the objects in the event that
     // an error occurs
@@ -126,12 +127,13 @@ Token DSLParser::nextRawToken() {
         // Some tokens are always invalid, so we detect and report them here.
         switch (token.fKind) {
             case Token::Kind::TK_RESERVED:
-                this->error(token, "'" + this->text(token) + "' is a reserved word");
+                this->error(token, "'" + std::string(this->text(token)) + "' is a reserved word");
                 token.fKind = Token::Kind::TK_IDENTIFIER;  // reduces additional follow-up errors
                 break;
 
             case Token::Kind::TK_BAD_OCTAL:
-                this->error(token, "'" + this->text(token) + "' is not a valid octal number");
+                this->error(token, "'" + std::string(this->text(token)) +
+                                   "' is not a valid octal number");
                 break;
 
             default:
@@ -192,8 +194,8 @@ bool DSLParser::expect(Token::Kind kind, const char* expected, Token* result) {
         }
         return true;
     } else {
-        this->error(next, "expected " + String(expected) + ", but found '" +
-                    this->text(next) + "'");
+        this->error(next, "expected " + std::string(expected) + ", but found '" +
+                          std::string(this->text(next)) + "'");
         this->fEncounteredFatalError = true;
         return false;
     }
@@ -205,15 +207,26 @@ bool DSLParser::expectIdentifier(Token* result) {
     }
     if (IsBuiltinType(this->text(*result))) {
         this->error(*result, "expected an identifier, but found type '" +
-                             this->text(*result) + "'");
+                             std::string(this->text(*result)) + "'");
         this->fEncounteredFatalError = true;
         return false;
     }
     return true;
 }
 
-skstd::string_view DSLParser::text(Token token) {
-    return skstd::string_view(fText->data() + token.fOffset, token.fLength);
+bool DSLParser::checkIdentifier(Token* result) {
+    if (!this->checkNext(Token::Kind::TK_IDENTIFIER, result)) {
+        return false;
+    }
+    if (IsBuiltinType(this->text(*result))) {
+        this->pushback(std::move(*result));
+        return false;
+    }
+    return true;
+}
+
+std::string_view DSLParser::text(Token token) {
+    return std::string_view(fText->data() + token.fOffset, token.fLength);
 }
 
 PositionInfo DSLParser::position(Token t) {
@@ -224,11 +237,11 @@ PositionInfo DSLParser::position(int line) {
     return PositionInfo("<unknown>", line);
 }
 
-void DSLParser::error(Token token, String msg) {
+void DSLParser::error(Token token, std::string msg) {
     this->error(token.fLine, msg);
 }
 
-void DSLParser::error(int line, String msg) {
+void DSLParser::error(int line, std::string msg) {
     GetErrorReporter().error(msg.c_str(), this->position(line));
 }
 
@@ -275,7 +288,7 @@ void DSLParser::declarations() {
                 break;
             case Token::Kind::TK_INVALID: {
                 this->nextToken();
-                this->error(this->peek(), String("invalid token"));
+                this->error(this->peek(), "invalid token");
                 done = true;
                 break;
             }
@@ -293,8 +306,9 @@ void DSLParser::directive() {
     if (!this->expect(Token::Kind::TK_DIRECTIVE, "a directive", &start)) {
         return;
     }
-    skstd::string_view text = this->text(start);
-    if (text == "#extension") {
+    std::string_view text = this->text(start);
+    const bool allowExtensions = !ProgramConfig::IsRuntimeEffect(fKind);
+    if (text == "#extension" && allowExtensions) {
         Token name;
         if (!this->expectIdentifier(&name)) {
             return;
@@ -306,7 +320,7 @@ void DSLParser::directive() {
         if (!this->expect(Token::Kind::TK_IDENTIFIER, "an identifier", &behavior)) {
             return;
         }
-        skstd::string_view behaviorText = this->text(behavior);
+        std::string_view behaviorText = this->text(behavior);
         if (behaviorText == "disable") {
             return;
         }
@@ -316,7 +330,7 @@ void DSLParser::directive() {
         // We don't currently do anything different between require, enable, and warn
         dsl::AddExtension(this->text(name));
     } else {
-        this->error(start, "unsupported directive '" + this->text(start) + "'");
+        this->error(start, "unsupported directive '" + std::string(this->text(start)) + "'");
     }
 }
 
@@ -324,13 +338,10 @@ void DSLParser::directive() {
    (block | SEMICOLON)) | SEMICOLON) | interfaceBlock) */
 bool DSLParser::declaration() {
     Token lookahead = this->peek();
-    switch (lookahead.fKind) {
-        case Token::Kind::TK_SEMICOLON:
-            this->nextToken();
-            this->error(lookahead, "expected a declaration, but found ';'");
-            return false;
-        default:
-            break;
+    if (lookahead.fKind == Token::Kind::TK_SEMICOLON) {
+        this->nextToken();
+        this->error(lookahead, "expected a declaration, but found ';'");
+        return false;
     }
     DSLModifiers modifiers = this->modifiers();
     lookahead = this->peek();
@@ -347,7 +358,7 @@ bool DSLParser::declaration() {
         this->structVarDeclaration(modifiers);
         return true;
     }
-    skstd::optional<DSLType> type = this->type(&modifiers);
+    std::optional<DSLType> type = this->type(&modifiers);
     if (!type) {
         return false;
     }
@@ -376,7 +387,8 @@ bool DSLParser::functionDeclarationEnd(const DSLModifiers& modifiers,
         this->nextToken();
     } else {
         for (;;) {
-            skstd::optional<DSLWrapper<DSLParameter>> parameter = this->parameter();
+            size_t paramIndex = parameters.size();
+            std::optional<DSLWrapper<DSLParameter>> parameter = this->parameter(paramIndex);
             if (!parameter) {
                 return false;
             }
@@ -399,7 +411,7 @@ bool DSLParser::functionDeclarationEnd(const DSLModifiers& modifiers,
         for (DSLParameter* var : parameterPointers) {
             AddToSymbolTable(*var);
         }
-        skstd::optional<DSLBlock> body = this->block();
+        std::optional<DSLBlock> body = this->block();
         if (!body) {
             return false;
         }
@@ -458,7 +470,7 @@ bool DSLParser::parseInitializer(int line, DSLExpression* initializer) {
 /* (LBRACKET expression? RBRACKET)* (EQ assignmentExpression)? (COMMA IDENTIFER
    (LBRACKET expression? RBRACKET)* (EQ assignmentExpression)?)* SEMICOLON */
 void DSLParser::globalVarDeclarationEnd(PositionInfo pos, const dsl::DSLModifiers& mods,
-        dsl::DSLType baseType, skstd::string_view name) {
+        dsl::DSLType baseType, std::string_view name) {
     using namespace dsl;
     int line = this->peek().fLine;
     DSLType type = baseType;
@@ -497,7 +509,7 @@ void DSLParser::globalVarDeclarationEnd(PositionInfo pos, const dsl::DSLModifier
 /* (LBRACKET expression? RBRACKET)* (EQ assignmentExpression)? (COMMA IDENTIFER
    (LBRACKET expression? RBRACKET)* (EQ assignmentExpression)?)* SEMICOLON */
 DSLStatement DSLParser::localVarDeclarationEnd(PositionInfo pos, const dsl::DSLModifiers& mods,
-        dsl::DSLType baseType, skstd::string_view name) {
+        dsl::DSLType baseType, std::string_view name) {
     using namespace dsl;
     int line = this->peek().fLine;
     DSLType type = baseType;
@@ -570,7 +582,7 @@ DSLStatement DSLParser::varDeclarationsOrExpressionStatement() {
 bool DSLParser::varDeclarationsPrefix(VarDeclarationsPrefix* prefixData) {
     prefixData->fPosition = this->position(this->peek());
     prefixData->fModifiers = this->modifiers();
-    skstd::optional<DSLType> type = this->type(&prefixData->fModifiers);
+    std::optional<DSLType> type = this->type(&prefixData->fModifiers);
     if (!type) {
         return false;
     }
@@ -589,65 +601,78 @@ DSLStatement DSLParser::varDeclarations() {
 }
 
 /* STRUCT IDENTIFIER LBRACE varDeclaration* RBRACE */
-skstd::optional<DSLType> DSLParser::structDeclaration() {
-    AutoDSLDepth depth(this);
-    if (!depth.increase()) {
-        return skstd::nullopt;
-    }
+std::optional<DSLType> DSLParser::structDeclaration() {
     if (!this->expect(Token::Kind::TK_STRUCT, "'struct'")) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     Token name;
     if (!this->expectIdentifier(&name)) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     if (!this->expect(Token::Kind::TK_LBRACE, "'{'")) {
-        return skstd::nullopt;
+        return std::nullopt;
+    }
+    AutoDSLDepth depth(this);
+    if (!depth.increase()) {
+        return std::nullopt;
     }
     SkTArray<DSLField> fields;
+    std::unordered_set<std::string> field_names;
     while (!this->checkNext(Token::Kind::TK_RBRACE)) {
         DSLModifiers modifiers = this->modifiers();
-        skstd::optional<DSLType> type = this->type(&modifiers);
+        std::optional<DSLType> type = this->type(&modifiers);
         if (!type) {
-            return skstd::nullopt;
+            return std::nullopt;
         }
 
         do {
             DSLType actualType = *type;
             Token memberName;
             if (!this->expectIdentifier(&memberName)) {
-                return skstd::nullopt;
+                return std::nullopt;
             }
 
             while (this->checkNext(Token::Kind::TK_LBRACKET)) {
                 actualType = dsl::Array(actualType, this->arraySize(), this->position(memberName));
                 if (!this->expect(Token::Kind::TK_RBRACKET, "']'")) {
-                    return skstd::nullopt;
+                    return std::nullopt;
                 }
             }
-            fields.push_back(DSLField(modifiers, std::move(actualType), this->text(memberName),
-                    this->position(memberName)));
+
+            std::string key(this->text(memberName));
+            auto found = field_names.find(key);
+            if (found == field_names.end()) {
+                fields.push_back(DSLField(modifiers,
+                                    std::move(actualType),
+                                    this->text(memberName),
+                                    this->position(memberName)));
+                field_names.emplace(key);
+            } else {
+                this->error(name, "field '" + key + "' was already defined in the same struct ('" +
+                                  std::string(this->text(name)) + "')");
+            }
         } while (this->checkNext(Token::Kind::TK_COMMA));
         if (!this->expect(Token::Kind::TK_SEMICOLON, "';'")) {
-            return skstd::nullopt;
+            return std::nullopt;
         }
     }
     if (fields.empty()) {
-        this->error(name, "struct '" + this->text(name) + "' must contain at least one field");
+        this->error(name, "struct '" + std::string(this->text(name)) +
+                          "' must contain at least one field");
     }
     return dsl::Struct(this->text(name), SkMakeSpan(fields), this->position(name));
 }
 
 /* structDeclaration ((IDENTIFIER varDeclarationEnd) | SEMICOLON) */
 SkTArray<dsl::DSLGlobalVar> DSLParser::structVarDeclaration(const DSLModifiers& modifiers) {
-    skstd::optional<DSLType> type = this->structDeclaration();
+    std::optional<DSLType> type = this->structDeclaration();
     if (!type) {
         return {};
     }
     Token name;
-    if (this->checkNext(Token::Kind::TK_IDENTIFIER, &name)) {
+    if (this->checkIdentifier(&name)) {
         this->globalVarDeclarationEnd(this->position(name), modifiers, std::move(*type),
-                this->text(name));
+                                      this->text(name));
     } else {
         this->expect(Token::Kind::TK_SEMICOLON, "';'");
     }
@@ -655,20 +680,27 @@ SkTArray<dsl::DSLGlobalVar> DSLParser::structVarDeclaration(const DSLModifiers&
 }
 
 /* modifiers type IDENTIFIER (LBRACKET INT_LITERAL RBRACKET)? */
-skstd::optional<DSLWrapper<DSLParameter>> DSLParser::parameter() {
+std::optional<DSLWrapper<DSLParameter>> DSLParser::parameter(size_t paramIndex) {
     DSLModifiers modifiers = this->modifiers();
-    skstd::optional<DSLType> type = this->type(&modifiers);
+    std::optional<DSLType> type = this->type(&modifiers);
     if (!type) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     Token name;
-    if (!this->expectIdentifier(&name)) {
-        return skstd::nullopt;
+    std::string_view paramText;
+    PositionInfo paramPos;
+    if (this->checkIdentifier(&name)) {
+        paramPos = this->position(name);
+        paramText = this->text(name);
+    } else {
+        std::string anonymousName = String::printf("_skAnonymousParam%zu", paramIndex);
+        paramPos = this->position(this->peek());
+        paramText = *CurrentSymbolTable()->takeOwnershipOfString(std::move(anonymousName));
     }
     if (!this->parseArrayDimensions(name.fLine, &type.value())) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
-    return {{DSLParameter(modifiers, *type, this->text(name), this->position(name))}};
+    return {{DSLParameter(modifiers, *type, paramText, paramPos)}};
 }
 
 /** EQ INT_LITERAL */
@@ -680,17 +712,17 @@ int DSLParser::layoutInt() {
     if (!this->expect(Token::Kind::TK_INT_LITERAL, "a non-negative integer", &resultToken)) {
         return -1;
     }
-    skstd::string_view resultFrag = this->text(resultToken);
+    std::string_view resultFrag = this->text(resultToken);
     SKSL_INT resultValue;
     if (!SkSL::stoi(resultFrag, &resultValue)) {
-        this->error(resultToken, "value in layout is too large: " + resultFrag);
+        this->error(resultToken, "value in layout is too large: " + std::string(resultFrag));
         return -1;
     }
     return resultValue;
 }
 
 /** EQ IDENTIFIER */
-skstd::string_view DSLParser::layoutIdentifier() {
+std::string_view DSLParser::layoutIdentifier() {
     if (!this->expect(Token::Kind::TK_EQ, "'='")) {
         return {};
     }
@@ -710,7 +742,7 @@ DSLLayout DSLParser::layout() {
         }
         for (;;) {
             Token t = this->nextToken();
-            String text(this->text(t));
+            std::string text(this->text(t));
             auto found = layoutTokens->find(text);
             if (found != layoutTokens->end()) {
                 switch (found->second) {
@@ -812,7 +844,7 @@ DSLStatement DSLParser::statement() {
         case Token::Kind::TK_DISCARD:
             return this->discardStatement();
         case Token::Kind::TK_LBRACE: {
-            skstd::optional<DSLBlock> result = this->block();
+            std::optional<DSLBlock> result = this->block();
             return result ? DSLStatement(std::move(*result)) : DSLStatement();
         }
         case Token::Kind::TK_SEMICOLON:
@@ -830,14 +862,14 @@ DSLStatement DSLParser::statement() {
 }
 
 /* IDENTIFIER(type) (LBRACKET intLiteral? RBRACKET)* QUESTION? */
-skstd::optional<DSLType> DSLParser::type(DSLModifiers* modifiers) {
+std::optional<DSLType> DSLParser::type(DSLModifiers* modifiers) {
     Token type;
     if (!this->expect(Token::Kind::TK_IDENTIFIER, "a type", &type)) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     if (!IsType(this->text(type))) {
-        this->error(type, ("no type named '" + this->text(type) + "'").c_str());
-        return skstd::nullopt;
+        this->error(type, "no type named '" + std::string(this->text(type)) + "'");
+        return std::nullopt;
     }
     DSLType result(this->text(type), modifiers, this->position(type));
     while (this->checkNext(Token::Kind::TK_LBRACKET)) {
@@ -863,20 +895,21 @@ bool DSLParser::interfaceBlock(const dsl::DSLModifiers& modifiers) {
         // we only get into interfaceBlock if we found a top-level identifier which was not a type.
         // 99% of the time, the user was not actually intending to create an interface block, so
         // it's better to report it as an unknown type
-        this->error(typeName, "no type named '" + this->text(typeName) + "'");
+        this->error(typeName, "no type named '" + std::string(this->text(typeName)) + "'");
         return false;
     }
     this->nextToken();
     SkTArray<dsl::Field> fields;
+    std::unordered_set<std::string> field_names;
     while (!this->checkNext(Token::Kind::TK_RBRACE)) {
         DSLModifiers fieldModifiers = this->modifiers();
-        skstd::optional<dsl::DSLType> type = this->type(&fieldModifiers);
+        std::optional<dsl::DSLType> type = this->type(&fieldModifiers);
         if (!type) {
             return false;
         }
         do {
             Token fieldName;
-            if (!this->expect(Token::Kind::TK_IDENTIFIER, "an identifier", &fieldName)) {
+            if (!this->expectIdentifier(&fieldName)) {
                 return false;
             }
             DSLType actualType = *type;
@@ -893,15 +926,27 @@ bool DSLParser::interfaceBlock(const dsl::DSLModifiers& modifiers) {
             if (!this->expect(Token::Kind::TK_SEMICOLON, "';'")) {
                 return false;
             }
-            fields.push_back(dsl::Field(fieldModifiers, std::move(actualType),
-                    this->text(fieldName), this->position(fieldName)));
+
+            std::string key(this->text(fieldName));
+            if (field_names.find(key) == field_names.end()) {
+                fields.push_back(dsl::Field(fieldModifiers,
+                                            std::move(actualType),
+                                            this->text(fieldName),
+                                            this->position(fieldName)));
+                field_names.emplace(key);
+            } else {
+                this->error(typeName,
+                            "field '" + key +
+                            "' was already defined in the same interface block ('" +
+                            std::string(this->text(typeName)) +  "')");
+            }
         }
         while (this->checkNext(Token::Kind::TK_COMMA));
     }
-    skstd::string_view instanceName;
+    std::string_view instanceName;
     Token instanceNameToken;
     SKSL_INT arraySize = 0;
-    if (this->checkNext(Token::Kind::TK_IDENTIFIER, &instanceNameToken)) {
+    if (this->checkIdentifier(&instanceNameToken)) {
         instanceName = this->text(instanceNameToken);
         if (this->checkNext(Token::Kind::TK_LBRACKET)) {
             arraySize = this->arraySize();
@@ -910,7 +955,7 @@ bool DSLParser::interfaceBlock(const dsl::DSLModifiers& modifiers) {
     }
     this->expect(Token::Kind::TK_SEMICOLON, "';'");
     if (fields.empty()) {
-        this->error(typeName, "interface block '" + this->text(typeName) +
+        this->error(typeName, "interface block '" + std::string(this->text(typeName)) +
                               "' must contain at least one member");
     } else {
         dsl::InterfaceBlock(modifiers, this->text(typeName), std::move(fields), instanceName,
@@ -1009,7 +1054,7 @@ DSLStatement DSLParser::whileStatement() {
 }
 
 /* CASE expression COLON statement* */
-skstd::optional<DSLCase> DSLParser::switchCase() {
+std::optional<DSLCase> DSLParser::switchCase() {
     Token start;
     if (!this->expect(Token::Kind::TK_CASE, "'case'", &start)) {
         return {};
@@ -1056,7 +1101,7 @@ DSLStatement DSLParser::switchStatement() {
     }
     SkTArray<DSLCase> cases;
     while (this->peek().fKind == Token::Kind::TK_CASE) {
-        skstd::optional<DSLCase> c = this->switchCase();
+        std::optional<DSLCase> c = this->switchCase();
         if (!c) {
             return {};
         }
@@ -1204,14 +1249,14 @@ DSLStatement DSLParser::discardStatement() {
 }
 
 /* LBRACE statement* RBRACE */
-skstd::optional<DSLBlock> DSLParser::block() {
+std::optional<DSLBlock> DSLParser::block() {
     Token start;
     if (!this->expect(Token::Kind::TK_LBRACE, "'{'", &start)) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     AutoDSLDepth depth(this);
     if (!depth.increase()) {
-        return skstd::nullopt;
+        return std::nullopt;
     }
     AutoDSLSymbolTable symbols;
     StatementArray statements;
@@ -1222,13 +1267,15 @@ skstd::optional<DSLBlock> DSLParser::block() {
                 return DSLBlock(std::move(statements), CurrentSymbolTable());
             case Token::Kind::TK_END_OF_FILE:
                 this->error(this->peek(), "expected '}', but found end of file");
-                return skstd::nullopt;
+                return std::nullopt;
             default: {
                 DSLStatement statement = this->statement();
-                if (!statement.hasValue()) {
-                    return skstd::nullopt;
+                if (fEncounteredFatalError) {
+                    return std::nullopt;
+                }
+                if (statement.hasValue()) {
+                    statements.push_back(statement.release());
                 }
-                statements.push_back(statement.release());
                 break;
             }
         }
@@ -1314,29 +1361,29 @@ DSLExpression DSLParser::assignmentExpression() {
 
 /* logicalOrExpression ('?' expression ':' assignmentExpression)? */
 DSLExpression DSLParser::ternaryExpression() {
-    AutoDSLDepth depth(this);
     DSLExpression base = this->logicalOrExpression();
     if (!base.hasValue()) {
         return {};
     }
-    if (this->checkNext(Token::Kind::TK_QUESTION)) {
-        if (!depth.increase()) {
-            return {};
-        }
-        DSLExpression trueExpr = this->expression();
-        if (!trueExpr.hasValue()) {
-            return {};
-        }
-        if (this->expect(Token::Kind::TK_COLON, "':'")) {
-            DSLExpression falseExpr = this->assignmentExpression();
-            if (!falseExpr.hasValue()) {
-                return {};
-            }
-            return Select(std::move(base), std::move(trueExpr), std::move(falseExpr));
-        }
+    if (!this->checkNext(Token::Kind::TK_QUESTION)) {
+        return base;
+    }
+    AutoDSLDepth depth(this);
+    if (!depth.increase()) {
         return {};
     }
-    return base;
+    DSLExpression trueExpr = this->expression();
+    if (!trueExpr.hasValue()) {
+        return {};
+    }
+    if (!this->expect(Token::Kind::TK_COLON, "':'")) {
+        return {};
+    }
+    DSLExpression falseExpr = this->assignmentExpression();
+    if (!falseExpr.hasValue()) {
+        return {};
+    }
+    return Select(std::move(base), std::move(trueExpr), std::move(falseExpr));
 }
 
 /* logicalXorExpression (LOGICALOR logicalXorExpression)* */
@@ -1519,10 +1566,10 @@ DSLExpression DSLParser::unaryExpression() {
         case Token::Kind::TK_BITWISENOT:
         case Token::Kind::TK_PLUSPLUS:
         case Token::Kind::TK_MINUSMINUS: {
+            this->nextToken();
             if (!depth.increase()) {
                 return {};
             }
-            this->nextToken();
             DSLExpression expr = this->unaryExpression();
             if (!expr.hasValue()) {
                 return {};
@@ -1578,8 +1625,7 @@ DSLExpression DSLParser::postfixExpression() {
     }
 }
 
-DSLExpression DSLParser::swizzle(int line, DSLExpression base,
-        skstd::string_view swizzleMask) {
+DSLExpression DSLParser::swizzle(int line, DSLExpression base, std::string_view swizzleMask) {
     SkASSERT(swizzleMask.length() > 0);
     if (!base.type().isVector() && !base.type().isScalar()) {
         return base.field(swizzleMask, this->position(line));
@@ -1611,8 +1657,8 @@ DSLExpression DSLParser::swizzle(int line, DSLExpression base,
             case 'q': components[i] = SwizzleComponent::Q;    break;
             case 'B': components[i] = SwizzleComponent::UB;   break;
             default:
-                this->error(line,
-                        String::printf("invalid swizzle component '%c'", swizzleMask[i]).c_str());
+                this->error(line, String::printf("invalid swizzle component '%c'",
+                                                 swizzleMask[i]).c_str());
                 return DSLExpression::Poison();
         }
     }
@@ -1657,7 +1703,7 @@ DSLExpression DSLParser::suffix(DSLExpression base) {
         }
         case Token::Kind::TK_DOT: {
             int line = this->peek().fLine;
-            skstd::string_view text;
+            std::string_view text;
             if (this->identifier(&text)) {
                 return this->swizzle(line, std::move(base), text);
             }
@@ -1666,14 +1712,15 @@ DSLExpression DSLParser::suffix(DSLExpression base) {
         case Token::Kind::TK_FLOAT_LITERAL: {
             // Swizzles that start with a constant number, e.g. '.000r', will be tokenized as
             // floating point literals, possibly followed by an identifier. Handle that here.
-            skstd::string_view field = this->text(next);
+            std::string_view field = this->text(next);
             SkASSERT(field[0] == '.');
             field.remove_prefix(1);
             // use the next *raw* token so we don't ignore whitespace - we only care about
             // identifiers that directly follow the float
             Token id = this->nextRawToken();
             if (id.fKind == Token::Kind::TK_IDENTIFIER) {
-                return this->swizzle(next.fLine, std::move(base), field + this->text(id));
+                return this->swizzle(next.fLine, std::move(base),
+                                     std::string(field) + std::string(this->text(id)));
             } else if (field.empty()) {
                 this->error(next, "expected field name or swizzle mask after '.'");
                 return {{DSLExpression::Poison()}};
@@ -1703,7 +1750,8 @@ DSLExpression DSLParser::suffix(DSLExpression base) {
         case Token::Kind::TK_MINUSMINUS:
             return std::move(base)--;
         default: {
-            this->error(next,  "expected expression suffix, but found '" + this->text(next) + "'");
+            this->error(next, "expected expression suffix, but found '" +
+                              std::string(this->text(next)) + "'");
             return {};
         }
     }
@@ -1714,7 +1762,7 @@ DSLExpression DSLParser::term() {
     Token t = this->peek();
     switch (t.fKind) {
         case Token::Kind::TK_IDENTIFIER: {
-            skstd::string_view text;
+            std::string_view text;
             if (this->identifier(&text)) {
                 return dsl::Symbol(text, this->position(t));
             }
@@ -1755,7 +1803,7 @@ DSLExpression DSLParser::term() {
         }
         default:
             this->nextToken();
-            this->error(t, "expected expression, but found '" + this->text(t) + "'");
+            this->error(t, "expected expression, but found '" + std::string(this->text(t)) + "'");
             fEncounteredFatalError = true;
             break;
     }
@@ -1768,9 +1816,9 @@ bool DSLParser::intLiteral(SKSL_INT* dest) {
     if (!this->expect(Token::Kind::TK_INT_LITERAL, "integer literal", &t)) {
         return false;
     }
-    skstd::string_view s = this->text(t);
+    std::string_view s = this->text(t);
     if (!SkSL::stoi(s, dest)) {
-        this->error(t, "integer is too large: " + s);
+        this->error(t, "integer is too large: " + std::string(s));
         return false;
     }
     return true;
@@ -1782,9 +1830,9 @@ bool DSLParser::floatLiteral(SKSL_FLOAT* dest) {
     if (!this->expect(Token::Kind::TK_FLOAT_LITERAL, "float literal", &t)) {
         return false;
     }
-    skstd::string_view s = this->text(t);
+    std::string_view s = this->text(t);
     if (!SkSL::stod(s, dest)) {
-        this->error(t, "floating-point value is too large: " + s);
+        this->error(t, "floating-point value is too large: " + std::string(s));
         return false;
     }
     return true;
@@ -1801,13 +1849,14 @@ bool DSLParser::boolLiteral(bool* dest) {
             *dest = false;
             return true;
         default:
-            this->error(t, "expected 'true' or 'false', but found '" + this->text(t) + "'");
+            this->error(t, "expected 'true' or 'false', but found '" +
+                           std::string(this->text(t)) + "'");
             return false;
     }
 }
 
 /* IDENTIFIER */
-bool DSLParser::identifier(skstd::string_view* dest) {
+bool DSLParser::identifier(std::string_view* dest) {
     Token t;
     if (this->expect(Token::Kind::TK_IDENTIFIER, "identifier", &t)) {
         *dest = this->text(t);
diff --git a/third_party/skia/src/sksl/SkSLDSLParser.h b/third_party/skia/src/sksl/SkSLDSLParser.h
index 8e2a6cc239aa3..b3ca41ed4c8cd 100644
--- a/third_party/skia/src/sksl/SkSLDSLParser.h
+++ b/third_party/skia/src/sksl/SkSLDSLParser.h
@@ -8,16 +8,17 @@
 #ifndef SKSL_DSLPARSER
 #define SKSL_DSLPARSER
 
-#include <memory>
-#include <unordered_map>
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLProgramKind.h"
-#include "include/private/SkTOptional.h"
 #include "include/sksl/DSL.h"
 #include "include/sksl/DSLSymbols.h"
 #include "src/sksl/SkSLLexer.h"
 #include "src/sksl/ir/SkSLProgram.h"
 
+#include <memory>
+#include <optional>
+#include <string_view>
+#include <unordered_map>
+
 namespace SkSL {
 
 class ErrorReporter;
@@ -45,13 +46,13 @@ class DSLParser {
     };
 
     DSLParser(Compiler* compiler, const ProgramSettings& settings, ProgramKind kind,
-              String text);
+              std::string text);
 
     std::unique_ptr<Program> program();
 
     SkSL::LoadedModule moduleInheritingFrom(SkSL::ParsedModule baseModule);
 
-    skstd::string_view text(Token token);
+    std::string_view text(Token token);
 
     PositionInfo position(Token token);
 
@@ -88,6 +89,13 @@ class DSLParser {
      */
     bool checkNext(Token::Kind kind, Token* result = nullptr);
 
+    /**
+     * Behaves like checkNext(TK_IDENTIFIER), but also verifies that identifier is not a builtin
+     * type. If the token was actually a builtin type, false is returned (the next token is not
+     * considered to be an identifier).
+     */
+    bool checkIdentifier(Token* result = nullptr);
+
     /**
      * Reads the next non-whitespace token and generates an error if it is not the expected type.
      * The 'expected' string is part of the error message, which reads:
@@ -98,7 +106,7 @@ class DSLParser {
      * Returns true if the read token was as expected, false otherwise.
      */
     bool expect(Token::Kind kind, const char* expected, Token* result = nullptr);
-    bool expect(Token::Kind kind, String expected, Token* result = nullptr);
+    bool expect(Token::Kind kind, std::string expected, Token* result = nullptr);
 
     /**
      * Behaves like expect(TK_IDENTIFIER), but also verifies that identifier is not a type.
@@ -108,12 +116,8 @@ class DSLParser {
      */
     bool expectIdentifier(Token* result);
 
-    void error(Token token, String msg);
-    void error(int line, String msg);
-
-    SymbolTable& symbols() {
-        return *dsl::CurrentSymbolTable();
-    }
+    void error(Token token, std::string msg);
+    void error(int line, std::string msg);
 
     // these functions parse individual grammar rules from the current parse position; you probably
     // don't need to call any of these outside of the parser. The function declarations in the .cpp
@@ -144,7 +148,7 @@ class DSLParser {
 
     dsl::DSLStatement varDeclarations();
 
-    skstd::optional<dsl::DSLType> structDeclaration();
+    std::optional<dsl::DSLType> structDeclaration();
 
     SkTArray<dsl::DSLGlobalVar> structVarDeclaration(const dsl::DSLModifiers& modifiers);
 
@@ -153,16 +157,16 @@ class DSLParser {
     bool parseInitializer(int line, dsl::DSLExpression* initializer);
 
     void globalVarDeclarationEnd(PositionInfo position, const dsl::DSLModifiers& mods,
-            dsl::DSLType baseType, skstd::string_view name);
+            dsl::DSLType baseType, std::string_view name);
 
     dsl::DSLStatement localVarDeclarationEnd(PositionInfo position, const dsl::DSLModifiers& mods,
-            dsl::DSLType baseType, skstd::string_view name);
+            dsl::DSLType baseType, std::string_view name);
 
-    skstd::optional<dsl::DSLWrapper<dsl::DSLParameter>> parameter();
+    std::optional<dsl::DSLWrapper<dsl::DSLParameter>> parameter(size_t paramIndex);
 
     int layoutInt();
 
-    skstd::string_view layoutIdentifier();
+    std::string_view layoutIdentifier();
 
     dsl::DSLLayout layout();
 
@@ -170,7 +174,7 @@ class DSLParser {
 
     dsl::DSLStatement statement();
 
-    skstd::optional<dsl::DSLType> type(dsl::DSLModifiers* modifiers);
+    std::optional<dsl::DSLType> type(dsl::DSLModifiers* modifiers);
 
     bool interfaceBlock(const dsl::DSLModifiers& mods);
 
@@ -182,7 +186,7 @@ class DSLParser {
 
     dsl::DSLStatement forStatement();
 
-    skstd::optional<dsl::DSLCase> switchCase();
+    std::optional<dsl::DSLCase> switchCase();
 
     dsl::DSLStatement switchStatement();
 
@@ -194,7 +198,7 @@ class DSLParser {
 
     dsl::DSLStatement discardStatement();
 
-    skstd::optional<dsl::DSLBlock> block();
+    std::optional<dsl::DSLBlock> block();
 
     dsl::DSLStatement expressionStatement();
 
@@ -230,7 +234,7 @@ class DSLParser {
 
     dsl::DSLExpression postfixExpression();
 
-    dsl::DSLExpression swizzle(int line, dsl::DSLExpression base, skstd::string_view swizzleMask);
+    dsl::DSLExpression swizzle(int line, dsl::DSLExpression base, std::string_view swizzleMask);
 
     dsl::DSLExpression call(int line, dsl::DSLExpression base, ExpressionArray args);
 
@@ -244,7 +248,7 @@ class DSLParser {
 
     bool boolLiteral(bool* dest);
 
-    bool identifier(skstd::string_view* dest);
+    bool identifier(std::string_view* dest);
 
     class Checkpoint {
     public:
@@ -280,8 +284,8 @@ class DSLParser {
     private:
         class ForwardingErrorReporter : public ErrorReporter {
         public:
-            void handleError(skstd::string_view msg, PositionInfo pos) override {
-                fErrors.push_back({String(msg), pos});
+            void handleError(std::string_view msg, PositionInfo pos) override {
+                fErrors.push_back({std::string(msg), pos});
             }
 
             void forwardErrors() {
@@ -292,7 +296,7 @@ class DSLParser {
 
         private:
             struct Error {
-                String fMsg;
+                std::string fMsg;
                 PositionInfo fPos;
             };
 
@@ -314,14 +318,14 @@ class DSLParser {
         bool fOldEncounteredFatalError;
     };
 
-    static std::unordered_map<skstd::string_view, LayoutToken>* layoutTokens;
+    static std::unordered_map<std::string_view, LayoutToken>* layoutTokens;
 
     Compiler& fCompiler;
     ProgramSettings fSettings;
     ErrorReporter* fErrorReporter;
     bool fEncounteredFatalError;
     ProgramKind fKind;
-    std::unique_ptr<String> fText;
+    std::unique_ptr<std::string> fText;
     Lexer fLexer;
     // current parse depth, used to enforce a recursion limit to try to keep us from overflowing the
     // stack on pathological inputs
diff --git a/third_party/skia/src/sksl/SkSLDehydrator.cpp b/third_party/skia/src/sksl/SkSLDehydrator.cpp
index 80036e75b8f43..d9b94ab219517 100644
--- a/third_party/skia/src/sksl/SkSLDehydrator.cpp
+++ b/third_party/skia/src/sksl/SkSLDehydrator.cpp
@@ -35,6 +35,7 @@
 #include "src/sksl/ir/SkSLFunctionCall.h"
 #include "src/sksl/ir/SkSLFunctionDeclaration.h"
 #include "src/sksl/ir/SkSLFunctionDefinition.h"
+#include "src/sksl/ir/SkSLFunctionPrototype.h"
 #include "src/sksl/ir/SkSLIfStatement.h"
 #include "src/sksl/ir/SkSLIndexExpression.h"
 #include "src/sksl/ir/SkSLInlineMarker.h"
@@ -48,15 +49,12 @@
 #include "src/sksl/ir/SkSLSwitchCase.h"
 #include "src/sksl/ir/SkSLSwitchStatement.h"
 #include "src/sksl/ir/SkSLSwizzle.h"
-#include "src/sksl/ir/SkSLSymbolAlias.h"
 #include "src/sksl/ir/SkSLSymbolTable.h"
 #include "src/sksl/ir/SkSLTernaryExpression.h"
 #include "src/sksl/ir/SkSLUnresolvedFunction.h"
 #include "src/sksl/ir/SkSLVarDeclarations.h"
 #include "src/sksl/ir/SkSLVariable.h"
 
-#ifdef SKSL_STANDALONE
-
 namespace SkSL {
 
 static constexpr int HEADER_SIZE = 2;
@@ -81,6 +79,16 @@ class AutoDehydratorSymbolTable {
     Dehydrator* fDehydrator;
 };
 
+void Dehydrator::writeId(const Symbol* s) {
+    uint16_t id = this->symbolId(s);
+    if (id) {
+        this->writeU16(id);
+    } else {
+        this->writeU16(Rehydrator::kBuiltin_Symbol);
+        this->write(s->name());
+    }
+}
+
 void Dehydrator::write(Layout l) {
     if (l == Layout()) {
         this->writeCommand(Rehydrator::kDefaultLayout_Command);
@@ -91,8 +99,8 @@ void Dehydrator::write(Layout l) {
         this->writeCommand(Rehydrator::kLayout_Command);
         fBody.write32(l.fFlags);
         this->writeS8(l.fLocation);
-        this->writeS8(l.fOffset);
-        this->writeS8(l.fBinding);
+        this->writeS16(l.fOffset);
+        this->writeS16(l.fBinding);
         this->writeS8(l.fIndex);
         this->writeS8(l.fSet);
         this->writeS16(l.fBuiltin);
@@ -116,15 +124,15 @@ void Dehydrator::write(Modifiers m) {
     }
 }
 
-void Dehydrator::write(skstd::string_view s) {
-    this->write(String(s));
+void Dehydrator::write(std::string_view s) {
+    this->write(std::string(s));
 }
 
-void Dehydrator::write(String s) {
+void Dehydrator::write(std::string s) {
     auto found = fStrings.find(s);
     int offset;
     if (found == fStrings.end()) {
-        offset = fStringBuffer.str().length() + HEADER_SIZE;
+        offset = fStringBuffer.bytesWritten() + HEADER_SIZE;
         fStrings.insert({ s, offset });
         SkASSERT(s.length() <= 255);
         fStringBreaks.add(fStringBuffer.bytesWritten());
@@ -137,7 +145,7 @@ void Dehydrator::write(String s) {
 }
 
 void Dehydrator::write(const Symbol& s) {
-    uint16_t id = this->symbolId(&s, false);
+    uint16_t id = this->symbolId(&s);
     if (id) {
         this->writeCommand(Rehydrator::kSymbolRef_Command);
         this->writeU16(id);
@@ -145,6 +153,7 @@ void Dehydrator::write(const Symbol& s) {
     }
     switch (s.kind()) {
         case Symbol::Kind::kFunctionDeclaration: {
+            this->allocSymbolId(&s);
             const FunctionDeclaration& f = s.as<FunctionDeclaration>();
             this->writeCommand(Rehydrator::kFunctionDeclaration_Command);
             this->writeId(&f);
@@ -157,15 +166,8 @@ void Dehydrator::write(const Symbol& s) {
             this->write(f.returnType());
             break;
         }
-        case Symbol::Kind::kSymbolAlias: {
-            const SymbolAlias& alias = s.as<SymbolAlias>();
-            this->writeCommand(Rehydrator::kSymbolAlias_Command);
-            this->writeId(&alias);
-            this->write(alias.name());
-            this->write(*alias.origSymbol());
-            break;
-        }
         case Symbol::Kind::kUnresolvedFunction: {
+            this->allocSymbolId(&s);
             const UnresolvedFunction& f = s.as<UnresolvedFunction>();
             this->writeCommand(Rehydrator::kUnresolvedFunction_Command);
             this->writeId(&f);
@@ -179,12 +181,14 @@ void Dehydrator::write(const Symbol& s) {
             const Type& t = s.as<Type>();
             switch (t.typeKind()) {
                 case Type::TypeKind::kArray:
+                    this->allocSymbolId(&s);
                     this->writeCommand(Rehydrator::kArrayType_Command);
                     this->writeId(&t);
                     this->write(t.componentType());
                     this->writeS8(t.columns());
                     break;
                 case Type::TypeKind::kStruct:
+                    this->allocSymbolId(&s);
                     this->writeCommand(Rehydrator::kStructType_Command);
                     this->writeId(&t);
                     this->write(t.name());
@@ -197,14 +201,15 @@ void Dehydrator::write(const Symbol& s) {
                     this->writeU8(t.isInterfaceBlock());
                     break;
                 default:
-                    this->writeCommand(Rehydrator::kSystemType_Command);
-                    this->writeId(&t);
+                    this->writeCommand(Rehydrator::kSymbolRef_Command);
+                    this->writeU16(Rehydrator::kBuiltin_Symbol);
                     this->write(t.name());
                     break;
             }
             break;
         }
         case Symbol::Kind::kVariable: {
+            this->allocSymbolId(&s);
             const Variable& v = s.as<Variable>();
             this->writeCommand(Rehydrator::kVariable_Command);
             this->writeId(&v);
@@ -229,29 +234,40 @@ void Dehydrator::write(const Symbol& s) {
 
 void Dehydrator::write(const SymbolTable& symbols) {
     this->writeCommand(Rehydrator::kSymbolTable_Command);
+    this->writeU8(symbols.isBuiltin());
     this->writeU16(symbols.fOwnedSymbols.size());
+
+    // write owned symbols
     for (const std::unique_ptr<const Symbol>& s : symbols.fOwnedSymbols) {
         this->write(*s);
     }
+
+    // write symbols
     this->writeU16(symbols.fSymbols.count());
-    std::map<skstd::string_view, const Symbol*> ordered;
-    symbols.foreach([&](skstd::string_view name, const Symbol* symbol) {
+    std::map<std::string_view, const Symbol*> ordered;
+    symbols.foreach([&](std::string_view name, const Symbol* symbol) {
         ordered.insert({name, symbol});
     });
-    for (std::pair<skstd::string_view, const Symbol*> p : ordered) {
-        SkDEBUGCODE(bool found = false;)
+    for (std::pair<std::string_view, const Symbol*> p : ordered) {
+        bool found = false;
         for (size_t i = 0; i < symbols.fOwnedSymbols.size(); ++i) {
             if (symbols.fOwnedSymbols[i].get() == p.second) {
                 fCommandBreaks.add(fBody.bytesWritten());
                 this->writeU16(i);
-                SkDEBUGCODE(found = true;)
+                found = true;
                 break;
             }
         }
-        SkASSERT(found);
+        if (!found) {
+            // we should only fail to find builtin types
+            SkASSERT(p.second->is<Type>() && p.second->as<Type>().isInBuiltinTypes());
+            this->writeU16(Rehydrator::kBuiltin_Symbol);
+            this->write(p.second->name());
+        }
     }
 }
 
+
 void Dehydrator::writeExpressionSpan(const SkSpan<const std::unique_ptr<Expression>>& span) {
     this->writeU8(span.size());
     for (const auto& expr : span) {
@@ -479,11 +495,11 @@ void Dehydrator::write(const Statement* s) {
             case Statement::Kind::kFor: {
                 const ForStatement& f = s->as<ForStatement>();
                 this->writeCommand(Rehydrator::kFor_Command);
+                AutoDehydratorSymbolTable symbols(this, f.symbols());
                 this->write(f.initializer().get());
                 this->write(f.test().get());
                 this->write(f.next().get());
                 this->write(f.statement().get());
-                this->write(*f.symbols());
                 break;
             }
             case Statement::Kind::kIf: {
@@ -502,7 +518,7 @@ void Dehydrator::write(const Statement* s) {
                 break;
             }
             case Statement::Kind::kNop:
-                SkDEBUGFAIL("unexpected--nop statement in finished code");
+                this->writeCommand(Rehydrator::kNop_Command);
                 break;
             case Statement::Kind::kReturn: {
                 const ReturnStatement& r = s->as<ReturnStatement>();
@@ -519,7 +535,12 @@ void Dehydrator::write(const Statement* s) {
                 this->writeU8(ss.cases().size());
                 for (const std::unique_ptr<Statement>& stmt : ss.cases()) {
                     const SwitchCase& sc = stmt->as<SwitchCase>();
-                    this->write(sc.value().get());
+                    if (sc.isDefault()) {
+                        this->writeU8(1);
+                    } else {
+                        this->writeU8(0);
+                        this->writeS32(sc.value());
+                    }
                     this->write(sc.statement().get());
                 }
                 break;
@@ -532,7 +553,7 @@ void Dehydrator::write(const Statement* s) {
                 this->writeCommand(Rehydrator::kVarDeclaration_Command);
                 this->writeU16(this->symbolId(&v.var()));
                 this->write(v.baseType());
-                this->writeS8(v.arraySize());
+                this->writeU8(v.arraySize());
                 this->write(v.value().get());
                 break;
             }
@@ -555,9 +576,11 @@ void Dehydrator::write(const ProgramElement& e) {
             break;
         }
         case ProgramElement::Kind::kFunctionPrototype: {
-            // We don't need to emit function prototypes into the dehydrated data, because we don't
-            // ever need to re-emit the intrinsics files as raw GLSL/Metal. As long as the symbols
-            // exist in the symbol table, we're in good shape.
+            const FunctionPrototype& f = e.as<FunctionPrototype>();
+            if (!f.isBuiltin()) {
+                this->writeCommand(Rehydrator::kFunctionPrototype_Command);
+                this->writeU16(this->symbolId(&f.declaration()));
+            }
             break;
         }
         case ProgramElement::Kind::kInterfaceBlock: {
@@ -566,7 +589,7 @@ void Dehydrator::write(const ProgramElement& e) {
             this->write(i.variable());
             this->write(i.typeName());
             this->write(i.instanceName());
-            this->writeS8(i.arraySize());
+            this->writeU8(i.arraySize());
             break;
         }
         case ProgramElement::Kind::kModifiers:
@@ -580,7 +603,7 @@ void Dehydrator::write(const ProgramElement& e) {
         }
         case ProgramElement::Kind::kGlobalVar: {
             const GlobalVarDeclaration& v = e.as<GlobalVarDeclaration>();
-            this->writeCommand(Rehydrator::kVarDeclarations_Command);
+            this->writeCommand(Rehydrator::kGlobalVar_Command);
             this->write(v.declaration().get());
             break;
         }
@@ -595,12 +618,43 @@ void Dehydrator::write(const std::vector<std::unique_ptr<ProgramElement>>& eleme
     this->writeCommand(Rehydrator::kElementsComplete_Command);
 }
 
-void Dehydrator::finish(OutputStream& out) {
-    String stringBuffer = fStringBuffer.str();
-    String commandBuffer = fBody.str();
+void Dehydrator::write(const Program& program) {
+    this->writeCommand(Rehydrator::kProgram_Command);
+    this->writeU8((int)program.fConfig->fKind);
+    this->write(*program.fSymbols);
+
+    // Write the elements
+    this->writeCommand(Rehydrator::kElements_Command);
+    for (const auto& e : program.fSharedElements) {
+        this->writeCommand(Rehydrator::kSharedFunction_Command);
+        const FunctionDefinition& f = e->as<FunctionDefinition>();
+        const FunctionDeclaration& decl = f.declaration();
+        this->writeU8(decl.parameters().size());
+        for (const Variable* param : decl.parameters()) {
+            this->write(*param);
+        }
+        this->write(f.declaration());
+        this->write(*e);
+    }
+    for (const auto& e : program.fOwnedElements) {
+        this->write(*e);
+    }
+    this->writeCommand(Rehydrator::kElementsComplete_Command);
 
+    // Write the inputs
+    struct KnownSkSLProgramInputs { bool useRTFlipUniform; };
+    // Since it would be easy to forget to update this code in the face of Inputs changes and any
+    // resulting bugs could be very subtle, assert that the struct hasn't changed:
+    static_assert(sizeof(SkSL::Program::Inputs) == sizeof(KnownSkSLProgramInputs));
+    this->writeU8(program.fInputs.fUseFlipRTUniform);
+}
+
+void Dehydrator::finish(OutputStream& out) {
+    out.write16(Rehydrator::kVersion);
+    std::string stringBuffer = fStringBuffer.str();
+    std::string commandBuffer = fBody.str();
     out.write16(fStringBuffer.str().size());
-    fStringBufferStart = 2;
+    fStringBufferStart = 4;
     out.writeString(stringBuffer);
     fCommandStart = fStringBufferStart + stringBuffer.size();
     out.writeString(commandBuffer);
@@ -616,6 +670,4 @@ const char* Dehydrator::prefixAtOffset(size_t byte) {
     return "";
 }
 
-} // namespace
-
-#endif
+} // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLDehydrator.h b/third_party/skia/src/sksl/SkSLDehydrator.h
index bec942323f79b..1ed1a1a09012a 100644
--- a/third_party/skia/src/sksl/SkSLDehydrator.h
+++ b/third_party/skia/src/sksl/SkSLDehydrator.h
@@ -8,8 +8,6 @@
 #ifndef SKSL_DEHYDRATOR
 #define SKSL_DEHYDRATOR
 
-#ifdef SKSL_STANDALONE
-
 #include "include/core/SkSpan.h"
 #include "include/private/SkSLModifiers.h"
 #include "include/private/SkSLSymbol.h"
@@ -25,17 +23,16 @@ namespace SkSL {
 
 class AnyConstructor;
 class Expression;
+struct Program;
 class ProgramElement;
 class Statement;
 class Symbol;
 class SymbolTable;
 
-// The file has the structure:
-//
-// uint16 total string length
-// string data
-// symboltable
-// elements
+/**
+ * Converts SkSL objects into a binary file. See binary_format.md for a description of the file
+ * format.
+ */
 class Dehydrator {
 public:
     Dehydrator() {
@@ -46,6 +43,8 @@ class Dehydrator {
         SkASSERT(fSymbolMap.size() == 1);
     }
 
+    void write(const Program& program);
+
     void write(const SymbolTable& symbols);
 
     void write(const std::vector<std::unique_ptr<ProgramElement>>& elements);
@@ -82,25 +81,24 @@ class Dehydrator {
     }
 
     void writeS32(int64_t i) {
-        SkASSERT(i >= -2147483648 && i <= 2147483647);
+        SkASSERT(i >= -2147483648LL && i <= 2147483647);
         fBody.write32(i);
     }
 
-    void writeId(const Symbol* s) {
-        if (!symbolId(s, false)) {
-            fSymbolMap.back()[s] = fNextId++;
-        }
-        this->writeU16(symbolId(s));
+    void allocSymbolId(const Symbol* s) {
+        SkASSERT(!symbolId(s));
+        fSymbolMap.back()[s] = fNextId++;
     }
 
-    uint16_t symbolId(const Symbol* s, bool required = true) {
+    void writeId(const Symbol* s);
+
+    uint16_t symbolId(const Symbol* s) {
         for (const auto& symbols : fSymbolMap) {
             auto found = symbols.find(s);
             if (found != symbols.end()) {
                 return found->second;
             }
         }
-        SkASSERT(!required);
         return 0;
     }
 
@@ -108,9 +106,9 @@ class Dehydrator {
 
     void write(Modifiers m);
 
-    void write(skstd::string_view s);
+    void write(std::string_view s);
 
-    void write(String s);
+    void write(std::string s);
 
     void write(const ProgramElement& e);
 
@@ -128,7 +126,7 @@ class Dehydrator {
 
     StringStream fBody;
 
-    std::unordered_map<String, int> fStrings;
+    std::unordered_map<std::string, int> fStrings;
 
     std::vector<std::unordered_map<const Symbol*, int>> fSymbolMap;
     SkTHashSet<size_t> fStringBreaks;
@@ -139,8 +137,6 @@ class Dehydrator {
     friend class AutoDehydratorSymbolTable;
 };
 
-} // namespace
-
-#endif
+} // namespace SkSL
 
 #endif
diff --git a/third_party/skia/src/sksl/SkSLErrorReporter.cpp b/third_party/skia/src/sksl/SkSLErrorReporter.cpp
index 6be9dd05c4510..64f7867d161db 100644
--- a/third_party/skia/src/sksl/SkSLErrorReporter.cpp
+++ b/third_party/skia/src/sksl/SkSLErrorReporter.cpp
@@ -7,13 +7,14 @@
 
 #include "include/sksl/SkSLErrorReporter.h"
 
+#include "include/private/SkStringView.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/dsl/priv/DSLWriter.h"
 
 namespace SkSL {
 
-void ErrorReporter::error(skstd::string_view msg, PositionInfo position) {
-    if (msg.contains(Compiler::POISON_TAG)) {
+void ErrorReporter::error(std::string_view msg, PositionInfo position) {
+    if (skstd::contains(msg, Compiler::POISON_TAG)) {
         // don't report errors on poison values
         return;
     }
@@ -21,14 +22,14 @@ void ErrorReporter::error(skstd::string_view msg, PositionInfo position) {
     this->handleError(msg, position);
 }
 
-void ErrorReporter::error(int line, skstd::string_view msg) {
-    if (msg.contains(Compiler::POISON_TAG)) {
+void ErrorReporter::error(int line, std::string_view msg) {
+    if (skstd::contains(msg, Compiler::POISON_TAG)) {
         // don't report errors on poison values
         return;
     }
     if (line == -1) {
         ++fErrorCount;
-        fPendingErrors.push_back(String(msg));
+        fPendingErrors.push_back(std::string(msg));
     } else {
         this->error(msg, PositionInfo(/*file=*/nullptr, line));
     }
diff --git a/third_party/skia/src/sksl/SkSLFileOutputStream.h b/third_party/skia/src/sksl/SkSLFileOutputStream.h
index 956ed3f120280..26f59edefc2a3 100644
--- a/third_party/skia/src/sksl/SkSLFileOutputStream.h
+++ b/third_party/skia/src/sksl/SkSLFileOutputStream.h
@@ -16,8 +16,8 @@ namespace SkSL {
 
 class FileOutputStream : public OutputStream {
 public:
-    FileOutputStream(const SkSL::String& name) {
-        fFile = fopen(name.c_str(), "wb");
+    FileOutputStream(const char* name) {
+        fFile = fopen(name, "wb");
     }
 
     ~FileOutputStream() override {
diff --git a/third_party/skia/src/sksl/SkSLInliner.cpp b/third_party/skia/src/sksl/SkSLInliner.cpp
index 06cc9aa3e23c4..fc3c2677b36d8 100644
--- a/third_party/skia/src/sksl/SkSLInliner.cpp
+++ b/third_party/skia/src/sksl/SkSLInliner.cpp
@@ -566,8 +566,11 @@ std::unique_ptr<Statement> Inliner::inlineStatement(int line,
             cases.reserve_back(ss.cases().size());
             for (const std::unique_ptr<Statement>& switchCaseStmt : ss.cases()) {
                 const SwitchCase& sc = switchCaseStmt->as<SwitchCase>();
-                cases.push_back(std::make_unique<SwitchCase>(line, expr(sc.value()),
-                                                             stmt(sc.statement())));
+                if (sc.isDefault()) {
+                    cases.push_back(SwitchCase::MakeDefault(line, stmt(sc.statement())));
+                } else {
+                    cases.push_back(SwitchCase::Make(line, sc.value(), stmt(sc.statement())));
+                }
             }
             return SwitchStatement::Make(*fContext, line, ss.isStatic(), expr(ss.value()),
                                         std::move(cases), SymbolTable::WrapIfBuiltin(ss.symbols()));
@@ -580,7 +583,7 @@ std::unique_ptr<Statement> Inliner::inlineStatement(int line,
             // We assign unique names to inlined variables--scopes hide most of the problems in this
             // regard, but see `InlinerAvoidsVariableNameOverlap` for a counterexample where unique
             // names are important.
-            const String* name = symbolTableForStatement->takeOwnershipOfString(
+            const std::string* name = symbolTableForStatement->takeOwnershipOfString(
                     fContext->fMangler->uniqueName(variable.name(), symbolTableForStatement));
             auto clonedVar = std::make_unique<Variable>(
                                                      line,
@@ -709,7 +712,7 @@ Inliner::InlinedCall Inliner::inlineCall(FunctionCall* call,
         // Still, discard our output and generate an error.
         SkDEBUGFAIL("inliner found non-void function that fails to return a value on any path");
         fContext->fErrors->error(function.fLine, "inliner found non-void function '" +
-                                                 function.declaration().name() +
+                                                 std::string(function.declaration().name()) +
                                                  "' that fails to return a value on any path");
         inlinedCall = {};
     }
diff --git a/third_party/skia/src/sksl/SkSLIntrinsicList.h b/third_party/skia/src/sksl/SkSLIntrinsicList.h
index 7c29ce1a5e98d..d4c1622780f84 100644
--- a/third_party/skia/src/sksl/SkSLIntrinsicList.h
+++ b/third_party/skia/src/sksl/SkSLIntrinsicList.h
@@ -103,6 +103,7 @@
     SKSL_INTRINSIC(unpackSnorm4x8)   \
     SKSL_INTRINSIC(unpackUnorm2x16)  \
     SKSL_INTRINSIC(unpackUnorm4x8)   \
-    SKSL_INTRINSIC(unpremul)
+    SKSL_INTRINSIC(toLinearSrgb)     \
+    SKSL_INTRINSIC(fromLinearSrgb)
 
 #endif
diff --git a/third_party/skia/src/sksl/SkSLIntrinsicMap.cpp b/third_party/skia/src/sksl/SkSLIntrinsicMap.cpp
deleted file mode 100644
index 21ce4749abcc1..0000000000000
--- a/third_party/skia/src/sksl/SkSLIntrinsicMap.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "include/private/SkSLProgramElement.h"
-#include "include/private/SkSLString.h"
-#include "src/sksl/SkSLIntrinsicMap.h"
-
-namespace SkSL {
-
-void IntrinsicMap::insertOrDie(String key, std::unique_ptr<ProgramElement> element) {
-    SkASSERT(fIntrinsics.find(key) == fIntrinsics.end());
-    fIntrinsics[key] = Intrinsic{std::move(element), false};
-}
-
-const ProgramElement* IntrinsicMap::find(const String& key) {
-    auto iter = fIntrinsics.find(key);
-    if (iter == fIntrinsics.end()) {
-        return fParent ? fParent->find(key) : nullptr;
-    }
-    return iter->second.fIntrinsic.get();
-}
-
-// Only returns an intrinsic that isn't already marked as included, and then marks it.
-const ProgramElement* IntrinsicMap::findAndInclude(const String& key) {
-    auto iter = fIntrinsics.find(key);
-    if (iter == fIntrinsics.end()) {
-        return fParent ? fParent->findAndInclude(key) : nullptr;
-    }
-    if (iter->second.fAlreadyIncluded) {
-        return nullptr;
-    }
-    iter->second.fAlreadyIncluded = true;
-    return iter->second.fIntrinsic.get();
-}
-
-void IntrinsicMap::resetAlreadyIncluded() {
-    for (auto& pair : fIntrinsics) {
-        pair.second.fAlreadyIncluded = false;
-    }
-    if (fParent) {
-        fParent->resetAlreadyIncluded();
-    }
-}
-
-} // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLIntrinsicMap.h b/third_party/skia/src/sksl/SkSLIntrinsicMap.h
deleted file mode 100644
index dc7701cdfa5f9..0000000000000
--- a/third_party/skia/src/sksl/SkSLIntrinsicMap.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SKSL_INTRINSICMAP
-#define SKSL_INTRINSICMAP
-
-#include <memory>
-#include <unordered_map>
-
-namespace SkSL {
-
-class ProgramElement;
-class String;
-
-/**
- * Represents the intrinsics in the Context.
- */
-class IntrinsicMap {
-public:
-    IntrinsicMap(IntrinsicMap* parent) : fParent(parent) {}
-
-    void insertOrDie(String key, std::unique_ptr<ProgramElement> element);
-
-    const ProgramElement* find(const String& key);
-
-    const ProgramElement* findAndInclude(const String& key);
-
-    void resetAlreadyIncluded();
-
-private:
-    struct Intrinsic {
-        std::unique_ptr<ProgramElement> fIntrinsic;
-        bool fAlreadyIncluded = false;
-    };
-
-    std::unordered_map<String, Intrinsic> fIntrinsics;
-    IntrinsicMap* fParent = nullptr;
-};
-
-} // namespace SkSL
-
-#endif
diff --git a/third_party/skia/src/sksl/SkSLLexer.cpp b/third_party/skia/src/sksl/SkSLLexer.cpp
index 3f87b7a34a7f2..6e021b3277661 100644
--- a/third_party/skia/src/sksl/SkSLLexer.cpp
+++ b/third_party/skia/src/sksl/SkSLLexer.cpp
@@ -36,84 +36,84 @@ struct CompactEntry {
 static constexpr FullEntry kFull[] = {
         {
                 0,   2,   3,   4,   5,   7,   9,   14,  16,  19,  20,  21,  23,  26,  27,
-                31,  36,  42,  61,  61,  61,  61,  61,  61,  63,  64,  65,  69,  71,  75,
-                76,  85,  85,  85,  85,  85,  85,  85,  85,  85,  86,  87,  88,  85,  91,
-                101, 106, 122, 142, 154, 170, 175, 183, 85,  207, 217, 224, 250, 255, 271,
-                277, 349, 366, 382, 394, 85,  85,  85,  399, 400, 403, 404,
+                30,  35,  41,  60,  60,  60,  60,  60,  60,  62,  63,  64,  68,  70,  74,
+                75,  84,  84,  84,  84,  84,  84,  84,  84,  84,  85,  86,  87,  84,  90,
+                100, 105, 121, 141, 153, 169, 174, 182, 84,  206, 216, 223, 249, 254, 270,
+                276, 348, 365, 381, 393, 84,  84,  84,  398, 399, 402, 403,
         },
         {
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  43, 0, 51, 51, 51, 51, 51, 51, 52,
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 58, 59, 0, 0,  0,  0,  0,  0,  0,  0,
-                53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 58, 0,  0, 59, 0,  0,  0,  0,  0,  0,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  42, 0, 50, 50, 50, 50, 50, 50, 51,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 57, 58, 0, 0,  0,  0,  0,  0,  0,  0,
+                52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 57, 0,  0, 58, 0,  0,  0,  0,  0,  0,
         },
         {
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  43, 0, 51, 51, 51, 51, 51, 51, 52,
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 57, 0,  0, 0,  0,  0,  0,  0,  0,  0,
-                53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 57, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  42, 0, 50, 50, 50, 50, 50, 50, 51,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 56, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 56, 0,  0, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  43, 0, 52, 52, 52, 52, 52, 52, 52,
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 56, 0,  0, 0,  0,  0,  0,  0,  0,  0,
-                53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 56, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  42, 0, 51, 51, 51, 51, 51, 51, 51,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 55, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 55, 0,  0, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  43, 0, 62, 62, 62, 62, 62, 62, 62,
-                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 53, 0, 0, 0, 58, 0,  0, 0,  0,  0,  0,  0,  0,  0,
-                53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 58, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0,  42, 0, 61, 61, 61, 61, 61, 61, 61,
+                0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 57, 0,  0, 0,  0,  0,  0,  0,  0,  0,
+                52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 57, 0,  0, 0,  0,  0,  0,  0,  0,  0,
         },
         {
-                0,   0,  0,  0,   0,  0,  10, 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  10,
+                0,   0,  0,  0,   0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  10,
                 10,  10, 10, 10,  10, 10, 0,  0,  0,   0,  0,  0,  0,  10, 10, 10, 10, 10,
-                10,  10, 10, 10,  0,  0,  0,  10, 107, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                110, 10, 10, 113, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 0,  0,  0,  0,
+                10,  10, 10, 10,  0,  0,  0,  10, 106, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                109, 10, 10, 112, 10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 0,  0,  0,  0,
         },
         {
-                0,  0,  0,  0,   0,  0,  10, 0,  0,  0,   0,  0,  0,   0,  0,  0,  0,   10,
+                0,  0,  0,  0,   0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,   10,
                 10, 10, 10, 10,  10, 10, 0,  0,  0,  0,   0,  0,  0,   10, 10, 10, 10,  10,
-                10, 10, 10, 10,  0,  0,  0,  10, 10, 10,  10, 10, 123, 10, 10, 10, 129, 10,
-                10, 10, 10, 135, 10, 10, 10, 10, 10, 139, 10, 10, 10,  10, 0,  0,  0,   0,
+                10, 10, 10, 10,  0,  0,  0,  10, 10, 10,  10, 10, 122, 10, 10, 10, 128, 10,
+                10, 10, 10, 134, 10, 10, 10, 10, 10, 138, 10, 10, 10,  10, 0,  0,  0,   0,
         },
         {
-                0,   0,  0,   0,  0,  0,  10, 0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  10,
+                0,   0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  10,
                 10,  10, 10,  10, 10, 10, 0,  0,  0,  0,  0,  0,   0,  10, 10, 10, 10, 10,
                 10,  10, 10,  10, 0,  0,  0,  10, 10, 10, 10, 10,  10, 10, 10, 10, 10, 10,
-                143, 10, 146, 10, 10, 10, 10, 10, 10, 10, 10, 148, 10, 10, 0,  0,  0,  0,
+                142, 10, 145, 10, 10, 10, 10, 10, 10, 10, 10, 147, 10, 10, 0,  0,  0,  0,
         },
         {
-                0,   0,  0,  0,   0,  0,  10, 0,  0,   0,   0,  0,  0,  0,  0,  0,  0,   10,
+                0,   0,  0,  0,   0,  0,  0,  0,  0,   0,   0,  0,  0,  0,  0,  0,  0,   10,
                 10,  10, 10, 10,  10, 10, 0,  0,  0,   0,   0,  0,  0,  10, 10, 10, 10,  10,
-                10,  10, 10, 10,  0,  0,  0,  10, 155, 10,  10, 10, 10, 10, 10, 10, 159, 10,
-                162, 10, 10, 165, 10, 10, 10, 10, 10,  167, 10, 10, 10, 10, 0,  0,  0,   0,
+                10,  10, 10, 10,  0,  0,  0,  10, 154, 10,  10, 10, 10, 10, 10, 10, 158, 10,
+                161, 10, 10, 164, 10, 10, 10, 10, 10,  166, 10, 10, 10, 10, 0,  0,  0,   0,
         },
         {
-                0,   0,  0,  0,   0,   0,  10, 0,   0,  0,   0,  0,  0,  0,  0,  0,  0,  10,
+                0,   0,  0,  0,   0,   0,  0,  0,   0,  0,   0,  0,  0,  0,  0,  0,  0,  10,
                 10,  10, 10, 10,  10,  10, 0,  0,   0,  0,   0,  0,  0,  10, 10, 10, 10, 10,
                 10,  10, 10, 10,  0,   0,  0,  10,  10, 10,  10, 10, 10, 10, 10, 10, 10, 10,
-                186, 10, 10, 190, 193, 10, 10, 195, 10, 201, 10, 10, 10, 10, 0,  0,  0,  0,
+                185, 10, 10, 189, 192, 10, 10, 194, 10, 200, 10, 10, 10, 10, 0,  0,  0,  0,
         },
         {
-                0,  0,  0,  0,  0,  0,   10, 0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  10,
+                0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  0,  0,  0,  0,  0,  0,  0,  10,
                 10, 10, 10, 10, 10, 10,  0,  0,  0,   0,  0,  0,  0,  10, 10, 10, 10, 10,
-                10, 10, 10, 10, 0,  0,   0,  10, 256, 10, 10, 10, 10, 10, 10, 10, 10, 10,
-                10, 10, 10, 10, 10, 260, 10, 10, 267, 10, 10, 10, 10, 10, 0,  0,  0,  0,
+                10, 10, 10, 10, 0,  0,   0,  10, 255, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+                10, 10, 10, 10, 10, 259, 10, 10, 266, 10, 10, 10, 10, 10, 0,  0,  0,  0,
         },
         {
-                0,  0,  0,  0,  0,  0,  10, 0,   0,   0,  0,   0,  0,  0,  0,  0,  0,   10,
+                0,  0,  0,  0,  0,  0,  0,  0,   0,   0,  0,   0,  0,  0,  0,  0,  0,   10,
                 10, 10, 10, 10, 10, 10, 0,  0,   0,   0,  0,   0,  0,  10, 10, 10, 10,  10,
-                10, 10, 10, 10, 0,  0,  0,  10,  278, 10, 10,  10, 10, 10, 10, 10, 310, 314,
-                10, 10, 10, 10, 10, 10, 10, 332, 340, 10, 344, 10, 10, 10, 0,  0,  0,   0,
+                10, 10, 10, 10, 0,  0,  0,  10,  277, 10, 10,  10, 10, 10, 10, 10, 309, 313,
+                10, 10, 10, 10, 10, 10, 10, 331, 339, 10, 343, 10, 10, 10, 0,  0,  0,   0,
         },
         {
-                0,   0,   0,   0,  0,  0,  10, 0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  10,
-                284, 291, 302, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,  10, 307, 10, 10, 10,
+                0,   0,   0,   0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,   0,  0,  10,
+                283, 290, 301, 10, 10, 10, 0,  0,  0,  0,  0,  0,  0,  10, 306, 10, 10, 10,
                 10,  10,  10,  10, 0,  0,  0,  10, 10, 10, 10, 10, 10, 10, 10,  10, 10, 10,
                 10,  10,  10,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0,   0,  0,  0,
         },
         {
-                0,  0,  0,  0,  0,  0,   10, 0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  10,
+                0,  0,  0,  0,  0,  0,   0,  0,  0,  0,  0,  0,  0,   0,  0,  0,   0,  10,
                 10, 10, 10, 10, 10, 10,  0,  0,  0,  0,  0,  0,  0,   10, 10, 10,  10, 10,
-                10, 10, 10, 10, 0,  0,   0,  10, 10, 10, 10, 10, 350, 10, 10, 356, 10, 10,
-                10, 10, 10, 10, 10, 358, 10, 10, 10, 10, 10, 10, 361, 10, 0,  0,   0,  0,
+                10, 10, 10, 10, 0,  0,   0,  10, 10, 10, 10, 10, 349, 10, 10, 355, 10, 10,
+                10, 10, 10, 10, 10, 357, 10, 10, 10, 10, 10, 10, 360, 10, 0,  0,   0,  0,
         },
 };
 static constexpr CompactEntry kCompact[] = {
@@ -133,37 +133,37 @@ static constexpr CompactEntry kCompact[] = {
          0,
          8,
          {
-                 0, 48, 0, 0, 0, 0, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
+                 0, 0, 0, 0, 0, 0, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
          }},
         {0,
          0,
          8,
          {
-                 0, 48, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
+                 0, 0, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
          }},
         {0,
          10,
          11,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          0,
          10,
          {
-                 0, 48, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
+                 0, 0, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
          }},
         {0,
          10,
          12,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          13,
          {
-                 0, 32, 0, 0, 168, 171, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 171, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          0,
@@ -189,45 +189,45 @@ static constexpr CompactEntry kCompact[] = {
          {
                  0, 0, 0, 2, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
-        {28,
+        {0,
+         28,
          29,
-         30,
          {
-                 0, 0, 0, 16, 0, 0, 128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                 0, 0, 0, 32, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         32,
+         31,
          {
                  0, 0, 0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
+         31,
          32,
-         33,
          {
                  0, 0, 0, 0, 168, 170, 0, 0, 48, 0, 0, 0, 3, 0, 0, 0, 0, 0,
          }},
         {0,
+         33,
          34,
-         35,
          {
                  0, 0, 0, 34, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         35,
+         34,
          {
                  0, 0, 0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
-        {37,
+        {36,
+         39,
          40,
-         41,
          {
                  0, 0, 64, 0, 2, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
+         36,
          37,
-         38,
          {
                  168,
                  170,
@@ -249,8 +249,8 @@ static constexpr CompactEntry kCompact[] = {
                  170,
          }},
         {0,
-         37,
-         39,
+         36,
+         38,
          {
                  168,
                  170,
@@ -273,7 +273,7 @@ static constexpr CompactEntry kCompact[] = {
          }},
         {0,
          0,
-         40,
+         39,
          {
                  204,
                  255,
@@ -295,1652 +295,1652 @@ static constexpr CompactEntry kCompact[] = {
                  255,
          }},
         {0,
-         44,
-         48,
+         43,
+         47,
          {
                  0, 0, 0, 0, 168, 170, 0, 0, 48, 0, 0, 0, 3, 0, 0, 0, 0, 0,
          }},
         {0,
+         43,
          44,
-         45,
          {
                  0, 0, 0, 0, 168, 170, 0, 0, 48, 0, 0, 0, 3, 0, 0, 0, 0, 0,
          }},
         {0,
+         45,
          46,
-         47,
          {
                  0, 0, 0, 34, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         47,
+         46,
          {
                  0, 0, 0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
+         48,
          49,
-         50,
          {
                  0, 0, 0, 34, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         50,
+         49,
          {
                  0, 0, 0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
+         53,
          54,
-         55,
          {
                  0, 0, 0, 34, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         55,
+         54,
          {
                  0, 0, 0, 0, 252, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         60,
+         59,
          {
                  0, 0, 0, 0, 252, 255, 0, 192, 63, 0, 0, 255, 15, 0, 0, 0, 0, 0,
          }},
         {0,
-         58,
-         60,
+         57,
+         59,
          {
                  0, 0, 0, 0, 252, 255, 0, 192, 63, 32, 0, 255, 15, 0, 0, 32, 0, 0,
          }},
         {0,
-         66,
-         68,
+         65,
+         67,
          {
                  0, 0, 0, 0, 0, 0, 224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         67,
+         66,
          {
                  0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         70,
+         69,
          {
                  0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
+         71,
          72,
-         73,
          {
                  0, 0, 0, 0, 0, 0, 128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         74,
+         73,
          {
                  0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
          }},
         {0,
-         77,
-         79,
+         76,
+         78,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 0, 0,
          }},
         {0,
          0,
-         78,
+         77,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         80,
+         79,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0,
          }},
         {0,
          0,
-         81,
+         80,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
          }},
         {0,
          0,
-         82,
+         81,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0,
          }},
         {0,
          0,
-         83,
+         82,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0,
          }},
         {0,
          0,
-         84,
+         83,
          {
                  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 0, 0, 0, 0, 0,
          }},
         {0,
+         88,
          89,
-         90,
          {
                  0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 48, 0, 0, 0, 0, 0, 0, 0,
          }},
         {10,
+         91,
+         93,
+         {
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 85, 94, 85, 0,
+         }},
+        {0,
+         10,
          92,
-         94,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 85, 94, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         94,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          95,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          96,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          97,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          98,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          99,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         100,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         101,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          102,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          103,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          104,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 174, 170, 170, 170, 0,
          }},
         {0,
          10,
-         105,
+         107,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 174, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
-        {0,
-         10,
+        {10,
+         92,
          108,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 87, 85, 85, 89, 85, 0,
          }},
-        {10,
-         93,
-         109,
+        {0,
+         10,
+         110,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 87, 85, 85, 89, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          111,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
-         112,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
-         93,
+         113,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
-        {0,
-         10,
+        {10,
          114,
+         116,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 85, 94, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          115,
-         117,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 85, 94, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         116,
+         117,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          118,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          119,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          120,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         121,
+         123,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          124,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          125,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          126,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          127,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         128,
+         129,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          130,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          131,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          132,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          133,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         134,
+         135,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          136,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          137,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
-         138,
+         139,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          140,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         141,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 232, 175, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         143,
          {
-                 0, 32, 0, 0, 232, 175, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          144,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         145,
+         146,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
-         147,
+         148,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          149,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          150,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          151,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          152,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         153,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         155,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          156,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          157,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         158,
+         159,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 174, 0,
          }},
         {0,
          10,
          160,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 174, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         161,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         162,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          163,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         164,
+         165,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
-         166,
+         167,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          168,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
-         }},
-        {0,
-         10,
-         169,
-         {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {10,
-         171,
-         173,
+         170,
+         172,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 101, 93, 85, 85, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 101, 93, 85, 85, 0,
          }},
         {0,
          10,
-         172,
+         171,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          0,
-         172,
+         171,
          {
-                 0, 48, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
+                 0, 0, 0, 0, 252, 255, 0, 192, 255, 255, 192, 255, 255, 255, 255, 255, 255, 0,
          }},
         {0,
          10,
-         174,
+         173,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         93,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {10,
-         176,
-         180,
+         175,
+         179,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 85, 213, 85, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 85, 213, 85, 0,
          }},
         {0,
          10,
-         177,
+         176,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         178,
+         177,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         179,
+         178,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
-         181,
+         180,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         182,
+         181,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {10,
+         183,
          184,
-         185,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 89, 85, 87, 85, 85, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 89, 85, 87, 85, 85, 0,
+         }},
+        {0,
+         10,
+         186,
+         {
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          187,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          188,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         189,
+         190,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          191,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         192,
+         193,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
-         194,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         93,
+         195,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          196,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          197,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          198,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          199,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         200,
+         201,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          202,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          203,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          204,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          205,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
-        {0,
-         10,
-         206,
+        {10,
+         207,
+         212,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          208,
-         213,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 186, 0,
          }},
         {0,
          10,
          209,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 186, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
          210,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          211,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
-         }},
-        {0,
-         10,
-         212,
-         {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {10,
+         213,
          214,
-         215,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 86, 85, 87, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 86, 85, 87, 0,
          }},
         {0,
          10,
-         93,
+         92,
+         {
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
+         }},
+        {0,
+         10,
+         215,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
-         216,
+         217,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          218,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          219,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          220,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          221,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
          222,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
-        {0,
-         10,
-         223,
+        {10,
+         224,
+         231,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          225,
-         232,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
          226,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          227,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          228,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          229,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          230,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
-        {0,
-         10,
-         231,
+        {10,
+         232,
+         238,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 117, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          233,
-         239,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 117, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          234,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          235,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          236,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          237,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         238,
+         239,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          240,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          241,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          242,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          243,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          244,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          245,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          246,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          247,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 234, 170, 0,
          }},
         {0,
          10,
          248,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 234, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         249,
+         250,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          251,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          252,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          253,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
-         254,
+         256,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          257,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 174, 170, 170, 170, 0,
          }},
         {0,
          10,
          258,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 174, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         259,
+         260,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          261,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          262,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          263,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          264,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          265,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
-         266,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         267,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          268,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          269,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
-         270,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         271,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          272,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          273,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          274,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          275,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
-         276,
+         278,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
          279,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          280,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          281,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          282,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
-         283,
+         284,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          285,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 174, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          286,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 174, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          287,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          288,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          289,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
-         290,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 171, 0,
          }},
         {0,
          10,
-         93,
+         291,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 171, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
-        {0,
-         10,
+        {10,
+         285,
          292,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 91, 64, 85, 85, 85, 85, 85, 85, 0,
          }},
-        {10,
-         286,
+        {0,
+         10,
          293,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 91, 64, 85, 85, 85, 85, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          294,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          295,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          296,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 174, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          297,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 174, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          298,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          299,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          300,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
-         301,
+         302,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          303,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 174, 170, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 171, 128, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          304,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 171, 128, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          305,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         306,
+         307,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          308,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         309,
+         310,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 174, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 234, 0,
          }},
         {0,
          10,
          311,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 234, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          312,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
-         313,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         314,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          315,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          316,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          317,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          318,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          319,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
         {0,
          10,
          320,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          321,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          322,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          323,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          324,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 192, 170, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          325,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          326,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          327,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 174, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          328,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          329,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          330,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
          }},
-        {0,
-         10,
-         331,
+        {10,
+         332,
+         335,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 171, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 213, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          333,
-         336,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 213, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          334,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
-         335,
+         336,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          337,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          338,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         339,
+         340,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          341,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          342,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
-         343,
+         92,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
-         93,
+         344,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          345,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          346,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          347,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 186, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         348,
+         350,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
          351,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          352,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          353,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          354,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
-         355,
+         356,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
-         357,
+         358,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
          }},
         {0,
          10,
          359,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 186, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         360,
+         361,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
          }},
         {0,
          10,
          362,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 186, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          363,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          364,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 234, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
-        {0,
-         10,
-         365,
+        {10,
+         366,
+         378,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 86, 87, 85, 0,
          }},
         {10,
          367,
-         379,
+         373,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 85, 86, 87, 85, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 85, 87, 85, 0,
          }},
         {10,
          368,
-         374,
+         372,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 85, 86, 85, 87, 85, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 89, 85, 93, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          369,
-         373,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 85, 89, 85, 93, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
          }},
         {0,
          10,
          370,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 174, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          371,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
          }},
         {0,
          10,
-         372,
+         374,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 234, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          375,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          376,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 186, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
          377,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
-         378,
+         379,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          380,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
-        {0,
-         10,
-         381,
+        {10,
+         382,
+         387,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
          }},
-        {10,
+        {0,
+         10,
          383,
-         388,
          {
-                 0, 16, 0, 0, 84, 85, 0, 64, 85, 85, 64, 86, 85, 85, 93, 85, 85, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
          }},
         {0,
          10,
          384,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 234, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 186, 0,
          }},
         {0,
          10,
          385,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 170, 186, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          386,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
          }},
         {0,
          10,
-         387,
+         388,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 171, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          389,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          390,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 171, 170, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
          }},
         {0,
          10,
          391,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 170, 170, 174, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          392,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
-         393,
+         394,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
          }},
         {0,
          10,
          395,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 234, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
          }},
         {0,
          10,
          396,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 171, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
          }},
         {0,
          10,
          397,
          {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 170, 186, 170, 170, 170, 0,
-         }},
-        {0,
-         10,
-         398,
-         {
-                 0, 32, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
+                 0, 0, 0, 0, 168, 170, 0, 128, 170, 170, 128, 170, 171, 170, 170, 170, 170, 0,
          }},
         {0,
+         400,
          401,
-         402,
          {
                  0, 0, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12,
          }},
@@ -1949,48 +1949,48 @@ static constexpr IndexEntry kIndices[] = {
         {0, 0},   {1, 0},   {2, 0},   {2, 0},   {0, 0},   {2, 1},   {0, 0},   {2, 2},   {2, 3},
         {2, 4},   {2, 5},   {2, 6},   {2, 7},   {2, 5},   {2, 8},   {0, 0},   {2, 9},   {0, 0},
         {0, 0},   {0, 0},   {0, 0},   {2, 10},  {0, 0},   {2, 11},  {0, 0},   {0, 0},   {0, 0},
-        {2, 12},  {0, 0},   {0, 0},   {0, 0},   {2, 13},  {2, 14},  {2, 15},  {2, 16},  {2, 16},
-        {2, 17},  {2, 18},  {2, 19},  {0, 0},   {2, 20},  {0, 0},   {1, 1},   {2, 21},  {2, 22},
-        {2, 23},  {2, 24},  {2, 24},  {2, 25},  {2, 26},  {2, 26},  {1, 2},   {1, 3},   {2, 27},
-        {2, 28},  {2, 28},  {0, 0},   {0, 0},   {0, 0},   {2, 29},  {2, 30},  {1, 4},   {1, 4},
-        {0, 0},   {0, 0},   {2, 31},  {2, 32},  {0, 0},   {0, 0},   {2, 33},  {0, 0},   {2, 34},
-        {0, 0},   {2, 35},  {0, 0},   {0, 0},   {2, 36},  {2, 37},  {0, 0},   {2, 38},  {2, 39},
-        {2, 40},  {2, 41},  {2, 42},  {0, 0},   {2, 5},   {0, 0},   {0, 0},   {2, 43},  {0, 0},
-        {0, 0},   {2, 44},  {2, 45},  {2, 5},   {2, 46},  {2, 47},  {2, 48},  {2, 49},  {2, 50},
-        {2, 51},  {2, 52},  {2, 53},  {2, 54},  {2, 55},  {2, 56},  {2, 5},   {1, 5},   {2, 57},
-        {2, 58},  {2, 5},   {2, 59},  {2, 60},  {2, 61},  {2, 62},  {2, 63},  {2, 64},  {2, 5},
-        {2, 65},  {2, 66},  {2, 67},  {2, 68},  {2, 5},   {1, 6},   {2, 69},  {2, 70},  {2, 71},
-        {2, 72},  {2, 73},  {2, 5},   {2, 74},  {2, 75},  {2, 76},  {2, 77},  {2, 78},  {2, 5},
-        {2, 79},  {2, 80},  {2, 81},  {2, 52},  {2, 82},  {2, 83},  {2, 84},  {1, 7},   {2, 85},
-        {2, 86},  {2, 5},   {2, 87},  {2, 45},  {2, 88},  {2, 89},  {2, 90},  {2, 91},  {2, 92},
-        {2, 93},  {1, 8},   {2, 94},  {2, 95},  {2, 96},  {2, 5},   {2, 97},  {2, 98},  {2, 99},
-        {2, 100}, {2, 101}, {2, 5},   {2, 102}, {2, 5},   {2, 103}, {2, 104}, {2, 84},  {2, 105},
-        {2, 106}, {2, 107}, {2, 108}, {2, 109}, {2, 110}, {2, 111}, {2, 112}, {2, 113}, {2, 5},
-        {2, 114}, {2, 115}, {2, 84},  {2, 116}, {2, 5},   {1, 9},   {2, 117}, {2, 118}, {2, 119},
-        {2, 5},   {2, 120}, {2, 121}, {2, 5},   {2, 122}, {2, 123}, {2, 124}, {2, 125}, {2, 126},
-        {2, 127}, {2, 128}, {2, 52},  {2, 129}, {2, 130}, {2, 131}, {2, 132}, {2, 133}, {2, 123},
-        {2, 134}, {2, 135}, {2, 136}, {2, 137}, {2, 138}, {2, 5},   {2, 139}, {2, 140}, {2, 141},
-        {2, 5},   {2, 142}, {2, 143}, {2, 144}, {2, 145}, {2, 146}, {2, 147}, {2, 5},   {2, 148},
-        {2, 149}, {2, 150}, {2, 151}, {2, 152}, {2, 153}, {2, 154}, {2, 52},  {2, 155}, {2, 156},
-        {2, 157}, {2, 158}, {2, 159}, {2, 160}, {2, 5},   {2, 161}, {2, 162}, {2, 163}, {2, 164},
-        {2, 165}, {2, 166}, {2, 167}, {2, 168}, {2, 169}, {2, 170}, {2, 5},   {2, 171}, {2, 172},
-        {2, 173}, {2, 174}, {2, 123}, {1, 10},  {2, 175}, {2, 176}, {2, 177}, {2, 99},  {2, 178},
-        {2, 179}, {2, 180}, {2, 181}, {2, 182}, {2, 183}, {2, 184}, {2, 185}, {2, 186}, {2, 187},
-        {2, 188}, {2, 189}, {2, 190}, {2, 191}, {2, 192}, {2, 193}, {2, 5},   {1, 11},  {2, 194},
-        {2, 195}, {2, 196}, {2, 197}, {2, 198}, {1, 12},  {2, 199}, {2, 200}, {2, 201}, {2, 202},
-        {2, 203}, {2, 204}, {2, 205}, {2, 206}, {2, 207}, {2, 208}, {2, 209}, {2, 210}, {2, 211},
-        {2, 212}, {2, 213}, {2, 214}, {2, 215}, {2, 205}, {2, 216}, {2, 217}, {2, 218}, {2, 219},
-        {2, 123}, {2, 220}, {2, 221}, {2, 52},  {2, 222}, {2, 223}, {2, 224}, {2, 225}, {2, 226},
-        {2, 227}, {2, 228}, {2, 229}, {2, 230}, {2, 231}, {2, 232}, {2, 233}, {2, 234}, {2, 235},
-        {2, 236}, {2, 237}, {2, 238}, {2, 239}, {2, 240}, {2, 241}, {2, 242}, {2, 5},   {2, 243},
-        {2, 244}, {2, 245}, {2, 188}, {2, 246}, {2, 247}, {2, 248}, {2, 5},   {2, 249}, {2, 250},
-        {2, 251}, {2, 252}, {2, 253}, {2, 254}, {2, 255}, {2, 256}, {2, 5},   {1, 13},  {2, 257},
-        {2, 258}, {2, 259}, {2, 260}, {2, 261}, {2, 52},  {2, 262}, {2, 61},  {2, 263}, {2, 264},
-        {2, 5},   {2, 265}, {2, 266}, {2, 267}, {2, 268}, {2, 225}, {2, 269}, {2, 270}, {2, 271},
-        {2, 272}, {2, 273}, {2, 274}, {2, 5},   {2, 184}, {2, 275}, {2, 276}, {2, 277}, {2, 278},
-        {2, 99},  {2, 279}, {2, 280}, {2, 140}, {2, 281}, {2, 282}, {2, 283}, {2, 284}, {2, 285},
-        {2, 140}, {2, 286}, {2, 287}, {2, 288}, {2, 289}, {2, 290}, {2, 52},  {2, 291}, {2, 292},
-        {2, 293}, {2, 294}, {2, 5},   {0, 0},   {2, 295}, {0, 0},   {0, 0},   {0, 0},   {0, 0},
+        {2, 12},  {0, 0},   {0, 0},   {2, 13},  {2, 14},  {2, 15},  {2, 16},  {2, 16},  {2, 17},
+        {2, 18},  {2, 19},  {0, 0},   {2, 20},  {0, 0},   {1, 1},   {2, 21},  {2, 22},  {2, 23},
+        {2, 24},  {2, 24},  {2, 25},  {2, 26},  {2, 26},  {1, 2},   {1, 3},   {2, 27},  {2, 28},
+        {2, 28},  {0, 0},   {0, 0},   {0, 0},   {2, 29},  {2, 30},  {1, 4},   {1, 4},   {0, 0},
+        {0, 0},   {2, 31},  {2, 32},  {0, 0},   {0, 0},   {2, 33},  {0, 0},   {2, 34},  {0, 0},
+        {2, 35},  {0, 0},   {0, 0},   {2, 36},  {2, 37},  {0, 0},   {2, 38},  {2, 39},  {2, 40},
+        {2, 41},  {2, 42},  {0, 0},   {2, 5},   {0, 0},   {0, 0},   {2, 43},  {0, 0},   {0, 0},
+        {2, 44},  {2, 45},  {2, 5},   {2, 46},  {2, 47},  {2, 48},  {2, 49},  {2, 50},  {2, 51},
+        {2, 52},  {2, 53},  {2, 54},  {2, 55},  {2, 56},  {2, 5},   {1, 5},   {2, 57},  {2, 58},
+        {2, 5},   {2, 59},  {2, 60},  {2, 61},  {2, 62},  {2, 63},  {2, 64},  {2, 5},   {2, 65},
+        {2, 66},  {2, 67},  {2, 68},  {2, 5},   {1, 6},   {2, 69},  {2, 70},  {2, 71},  {2, 72},
+        {2, 73},  {2, 5},   {2, 74},  {2, 75},  {2, 76},  {2, 77},  {2, 78},  {2, 5},   {2, 79},
+        {2, 80},  {2, 81},  {2, 52},  {2, 82},  {2, 83},  {2, 84},  {1, 7},   {2, 85},  {2, 86},
+        {2, 5},   {2, 87},  {2, 45},  {2, 88},  {2, 89},  {2, 90},  {2, 91},  {2, 92},  {2, 93},
+        {1, 8},   {2, 94},  {2, 95},  {2, 96},  {2, 5},   {2, 97},  {2, 98},  {2, 99},  {2, 100},
+        {2, 101}, {2, 5},   {2, 102}, {2, 5},   {2, 103}, {2, 104}, {2, 84},  {2, 105}, {2, 106},
+        {2, 107}, {2, 108}, {2, 109}, {2, 110}, {2, 111}, {2, 112}, {2, 113}, {2, 5},   {2, 114},
+        {2, 115}, {2, 84},  {2, 116}, {2, 5},   {1, 9},   {2, 117}, {2, 118}, {2, 119}, {2, 5},
+        {2, 120}, {2, 121}, {2, 5},   {2, 122}, {2, 123}, {2, 124}, {2, 125}, {2, 126}, {2, 127},
+        {2, 128}, {2, 52},  {2, 129}, {2, 130}, {2, 131}, {2, 132}, {2, 133}, {2, 123}, {2, 134},
+        {2, 135}, {2, 136}, {2, 137}, {2, 138}, {2, 5},   {2, 139}, {2, 140}, {2, 141}, {2, 5},
+        {2, 142}, {2, 143}, {2, 144}, {2, 145}, {2, 146}, {2, 147}, {2, 5},   {2, 148}, {2, 149},
+        {2, 150}, {2, 151}, {2, 152}, {2, 153}, {2, 154}, {2, 52},  {2, 155}, {2, 156}, {2, 157},
+        {2, 158}, {2, 159}, {2, 160}, {2, 5},   {2, 161}, {2, 162}, {2, 163}, {2, 164}, {2, 165},
+        {2, 166}, {2, 167}, {2, 168}, {2, 169}, {2, 170}, {2, 5},   {2, 171}, {2, 172}, {2, 173},
+        {2, 174}, {2, 123}, {1, 10},  {2, 175}, {2, 176}, {2, 177}, {2, 99},  {2, 178}, {2, 179},
+        {2, 180}, {2, 181}, {2, 182}, {2, 183}, {2, 184}, {2, 185}, {2, 186}, {2, 187}, {2, 188},
+        {2, 189}, {2, 190}, {2, 191}, {2, 192}, {2, 193}, {2, 5},   {1, 11},  {2, 194}, {2, 195},
+        {2, 196}, {2, 197}, {2, 198}, {1, 12},  {2, 199}, {2, 200}, {2, 201}, {2, 202}, {2, 203},
+        {2, 204}, {2, 205}, {2, 206}, {2, 207}, {2, 208}, {2, 209}, {2, 210}, {2, 211}, {2, 212},
+        {2, 213}, {2, 214}, {2, 215}, {2, 205}, {2, 216}, {2, 217}, {2, 218}, {2, 219}, {2, 123},
+        {2, 220}, {2, 221}, {2, 52},  {2, 222}, {2, 223}, {2, 224}, {2, 225}, {2, 226}, {2, 227},
+        {2, 228}, {2, 229}, {2, 230}, {2, 231}, {2, 232}, {2, 233}, {2, 234}, {2, 235}, {2, 236},
+        {2, 237}, {2, 238}, {2, 239}, {2, 240}, {2, 241}, {2, 242}, {2, 5},   {2, 243}, {2, 244},
+        {2, 245}, {2, 188}, {2, 246}, {2, 247}, {2, 248}, {2, 5},   {2, 249}, {2, 250}, {2, 251},
+        {2, 252}, {2, 253}, {2, 254}, {2, 255}, {2, 256}, {2, 5},   {1, 13},  {2, 257}, {2, 258},
+        {2, 259}, {2, 260}, {2, 261}, {2, 52},  {2, 262}, {2, 61},  {2, 263}, {2, 264}, {2, 5},
+        {2, 265}, {2, 266}, {2, 267}, {2, 268}, {2, 225}, {2, 269}, {2, 270}, {2, 271}, {2, 272},
+        {2, 273}, {2, 274}, {2, 5},   {2, 184}, {2, 275}, {2, 276}, {2, 277}, {2, 278}, {2, 99},
+        {2, 279}, {2, 280}, {2, 140}, {2, 281}, {2, 282}, {2, 283}, {2, 284}, {2, 285}, {2, 140},
+        {2, 286}, {2, 287}, {2, 288}, {2, 289}, {2, 290}, {2, 52},  {2, 291}, {2, 292}, {2, 293},
+        {2, 294}, {2, 5},   {0, 0},   {2, 295}, {0, 0},   {0, 0},   {0, 0},   {0, 0},
 };
 State get_transition(int transition, int state) {
     IndexEntry index = kIndices[state];
@@ -2007,25 +2007,25 @@ State get_transition(int transition, int state) {
     State table[] = {0, entry.v0, entry.v1, entry.v2};
     return table[value];
 }
-static const int8_t kAccepts[405] = {
-        -1, -1, 85, 85, 88, 63, 68, 88, 38, 37, 37, 37, 37, 35, 53, 77, 58, 62, 82, 39, 40, 51, 75,
-        49, 47, 73, 46, 50, 48, 74, 84, 45, 1,  -1, -1, 1,  52, -1, -1, 87, 86, 76, 2,  1,  1,  -1,
-        -1, 1,  -1, -1, 1,  2,  3,  -1, -1, 1,  3,  2,  2,  -1, 2,  2,  2,  65, 83, 70, 54, 78, 72,
-        66, 67, 69, 71, 55, 79, 64, 88, -1, 7,  -1, -1, -1, -1, -1, 13, 37, 43, 44, 57, 81, 61, 37,
-        37, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 16, 37, 37, 37, 14, 37, 37, 37, 37, 37,
-        37, 24, 37, 37, 37, 37, 17, 37, 37, 37, 37, 37, 37, 15, 37, 37, 37, 37, 37, 18, 11, 37, 37,
-        37, 37, 37, 37, 37, 37, 37, 8,  37, 37, 37, 37, 37, 37, 36, 37, 37, 37, 37, 37, 5,  37, 37,
-        37, 37, 37, 25, 37, 9,  37, 37, 37, 37, 37, 36, 37, 37, 37, 37, 37, 37, 32, 37, 37, 37, 37,
-        6,  20, 37, 37, 37, 27, 37, 37, 22, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 37, 37, 31, 37, 37, 37, 34, 37, 37, 37, 37, 37, 37, 33, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 37, 37, 37, 37, 37, 28, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 26, 37, 37, 21,
+static const int8_t kAccepts[404] = {
+        -1, -1, 84, 84, 87, 63, 68, 87, 38, 37, 37, 37, 37, 35, 53, 77, 58, 62, 82, 39, 40, 51, 75,
+        49, 47, 73, 46, 50, 48, 74, 45, 1,  -1, -1, 1,  52, -1, -1, 86, 85, 76, 2,  1,  1,  -1, -1,
+        1,  -1, -1, 1,  2,  3,  -1, -1, 1,  3,  2,  2,  -1, 2,  2,  2,  65, 83, 70, 54, 78, 72, 66,
+        67, 69, 71, 55, 79, 64, 87, -1, 7,  -1, -1, -1, -1, -1, 13, 37, 43, 44, 57, 81, 61, 37, 37,
+        36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 16, 37, 37, 37, 14, 37, 37, 37, 37, 37, 37,
+        24, 37, 37, 37, 37, 17, 37, 37, 37, 37, 37, 37, 15, 37, 37, 37, 37, 37, 18, 11, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 8,  37, 37, 37, 37, 37, 37, 36, 37, 37, 37, 37, 37, 5,  37, 37, 37,
+        37, 37, 25, 37, 9,  37, 37, 37, 37, 37, 36, 37, 37, 37, 37, 37, 37, 32, 37, 37, 37, 37, 6,
+        20, 37, 37, 37, 27, 37, 37, 22, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 31, 37, 37, 37, 34, 37, 37, 37, 37, 37, 37, 33, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 37, 28, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 26, 37, 37, 21, 37,
+        37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 19,
         37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-        19, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
         37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 37, 37, 37, 37, 37, 37, 29, 37, 37, 37, 37, 37, 37, 37, 30, 37, 37, 37, 37, 37,
-        37, 37, 37, 12, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 4,  37, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 37, 23, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-        37, 37, 37, 37, 37, 37, 37, 10, 41, 56, 80, 60, 42, 59,
+        37, 37, 37, 37, 37, 37, 37, 37, 29, 37, 37, 37, 37, 37, 37, 37, 30, 37, 37, 37, 37, 37, 37,
+        37, 37, 12, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 4,  37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 23, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+        37, 37, 37, 37, 37, 37, 10, 41, 56, 80, 60, 42, 59,
 };
 
 Token Lexer::next() {
diff --git a/third_party/skia/src/sksl/SkSLLexer.h b/third_party/skia/src/sksl/SkSLLexer.h
index 61b4acf52db8f..b68a0576745cc 100644
--- a/third_party/skia/src/sksl/SkSLLexer.h
+++ b/third_party/skia/src/sksl/SkSLLexer.h
@@ -11,7 +11,7 @@
 #define SKSL_Lexer
 #include <cstddef>
 #include <cstdint>
-#include "include/core/SkStringView.h"
+#include <string_view>
 namespace SkSL {
 
 struct Token {
@@ -100,7 +100,6 @@ struct Token {
         TK_BITWISEXOREQ,
         TK_BITWISEANDEQ,
         TK_SEMICOLON,
-        TK_ARROW,
         TK_WHITESPACE,
         TK_LINE_COMMENT,
         TK_BLOCK_COMMENT,
@@ -120,7 +119,7 @@ struct Token {
 
 class Lexer {
 public:
-    void start(skstd::string_view text) {
+    void start(std::string_view text) {
         fText = text;
         fOffset = 0;
         fLine = 1;
@@ -141,7 +140,7 @@ class Lexer {
     }
 
 private:
-    skstd::string_view fText;
+    std::string_view fText;
     int32_t fOffset;
     int32_t fLine;
 };
diff --git a/third_party/skia/src/sksl/SkSLMain.cpp b/third_party/skia/src/sksl/SkSLMain.cpp
index 4af5deb11e806..84798008d5047 100644
--- a/third_party/skia/src/sksl/SkSLMain.cpp
+++ b/third_party/skia/src/sksl/SkSLMain.cpp
@@ -6,11 +6,13 @@
  */
 
 #define SK_OPTS_NS skslc_standalone
+#include "include/core/SkGraphics.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkStringView.h"
+#include "src/core/SkCpu.h"
 #include "src/core/SkOpts.h"
 #include "src/opts/SkChecksum_opts.h"
 #include "src/opts/SkVM_opts.h"
-
-#include "src/gpu/GrShaderUtils.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/SkSLDehydrator.h"
 #include "src/sksl/SkSLFileOutputStream.h"
@@ -18,17 +20,22 @@
 #include "src/sksl/SkSLUtil.h"
 #include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
 #include "src/sksl/ir/SkSLUnresolvedFunction.h"
 #include "src/sksl/ir/SkSLVarDeclarations.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+#include "src/utils/SkShaderUtils.h"
+#include "src/utils/SkVMVisualizer.h"
 
 #include "spirv-tools/libspirv.hpp"
 
 #include <fstream>
 #include <limits.h>
+#include <optional>
 #include <stdarg.h>
 #include <stdio.h>
 
+extern bool gSkVMAllowJIT;
+
 void SkDebugf(const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -73,8 +80,8 @@ static std::unique_ptr<SkWStream> as_SkWStream(SkSL::OutputStream& s) {
 // Given the path to a file (e.g. src/gpu/effects/GrFooFragmentProcessor.fp) and the expected
 // filename prefix and suffix (e.g. "Gr" and ".fp"), returns the "base name" of the
 // file (in this case, 'FooFragmentProcessor'). If no match, returns the empty string.
-static SkSL::String base_name(const SkSL::String& fpPath, const char* prefix, const char* suffix) {
-    SkSL::String result;
+static std::string base_name(const std::string& fpPath, const char* prefix, const char* suffix) {
+    std::string result;
     const char* end = &*fpPath.end();
     const char* fileName = end;
     // back up until we find a slash
@@ -88,10 +95,18 @@ static SkSL::String base_name(const SkSL::String& fpPath, const char* prefix, co
     return result;
 }
 
+static bool consume_suffix(std::string* str, const char suffix[]) {
+    if (!skstd::ends_with(*str, suffix)) {
+        return false;
+    }
+    str->resize(str->length() - strlen(suffix));
+    return true;
+}
+
 // Given a string containing an SkSL program, searches for a #pragma settings comment, like so:
 //    /*#pragma settings Default Sharpen*/
 // The passed-in Settings object will be updated accordingly. Any number of options can be provided.
-static bool detect_shader_settings(const SkSL::String& text,
+static bool detect_shader_settings(const std::string& text,
                                    SkSL::Program::Settings* settings,
                                    const SkSL::ShaderCaps** caps,
                                    std::unique_ptr<SkSL::SkVMDebugTrace>* debugTrace) {
@@ -107,120 +122,120 @@ static bool detect_shader_settings(const SkSL::String& text,
 
         const char* settingsEnd = strstr(settingsPtr, "*/");
         if (settingsEnd != nullptr) {
-            SkSL::String settingsText{settingsPtr, size_t(settingsEnd - settingsPtr)};
+            std::string settingsText{settingsPtr, size_t(settingsEnd - settingsPtr)};
 
             // Apply settings as requested. Since they can come in any order, repeat until we've
             // consumed them all.
             for (;;) {
                 const size_t startingLength = settingsText.length();
 
-                if (settingsText.consumeSuffix(" AddAndTrueToLoopCondition")) {
+                if (consume_suffix(&settingsText, " AddAndTrueToLoopCondition")) {
                     static auto s_addAndTrueCaps = Factory::AddAndTrueToLoopCondition();
                     *caps = s_addAndTrueCaps.get();
                 }
-                if (settingsText.consumeSuffix(" CannotUseFractForNegativeValues")) {
+                if (consume_suffix(&settingsText, " CannotUseFractForNegativeValues")) {
                     static auto s_negativeFractCaps = Factory::CannotUseFractForNegativeValues();
                     *caps = s_negativeFractCaps.get();
                 }
-                if (settingsText.consumeSuffix(" CannotUseFragCoord")) {
+                if (consume_suffix(&settingsText, " CannotUseFragCoord")) {
                     static auto s_noFragCoordCaps = Factory::CannotUseFragCoord();
                     *caps = s_noFragCoordCaps.get();
                 }
-                if (settingsText.consumeSuffix(" CannotUseMinAndAbsTogether")) {
+                if (consume_suffix(&settingsText, " CannotUseMinAndAbsTogether")) {
                     static auto s_minAbsCaps = Factory::CannotUseMinAndAbsTogether();
                     *caps = s_minAbsCaps.get();
                 }
-                if (settingsText.consumeSuffix(" Default")) {
+                if (consume_suffix(&settingsText, " Default")) {
                     static auto s_defaultCaps = Factory::Default();
                     *caps = s_defaultCaps.get();
                 }
-                if (settingsText.consumeSuffix(" EmulateAbsIntFunction")) {
+                if (consume_suffix(&settingsText, " EmulateAbsIntFunction")) {
                     static auto s_emulateAbsIntCaps = Factory::EmulateAbsIntFunction();
                     *caps = s_emulateAbsIntCaps.get();
                 }
-                if (settingsText.consumeSuffix(" FramebufferFetchSupport")) {
+                if (consume_suffix(&settingsText, " FramebufferFetchSupport")) {
                     static auto s_fbFetchSupport = Factory::FramebufferFetchSupport();
                     *caps = s_fbFetchSupport.get();
                 }
-                if (settingsText.consumeSuffix(" IncompleteShortIntPrecision")) {
+                if (consume_suffix(&settingsText, " IncompleteShortIntPrecision")) {
                     static auto s_incompleteShortIntCaps = Factory::IncompleteShortIntPrecision();
                     *caps = s_incompleteShortIntCaps.get();
                 }
-                if (settingsText.consumeSuffix(" MustGuardDivisionEvenAfterExplicitZeroCheck")) {
+                if (consume_suffix(&settingsText, " MustGuardDivisionEvenAfterExplicitZeroCheck")) {
                     static auto s_div0Caps = Factory::MustGuardDivisionEvenAfterExplicitZeroCheck();
                     *caps = s_div0Caps.get();
                 }
-                if (settingsText.consumeSuffix(" MustForceNegatedAtanParamToFloat")) {
+                if (consume_suffix(&settingsText, " MustForceNegatedAtanParamToFloat")) {
                     static auto s_negativeAtanCaps = Factory::MustForceNegatedAtanParamToFloat();
                     *caps = s_negativeAtanCaps.get();
                 }
-                if (settingsText.consumeSuffix(" MustForceNegatedLdexpParamToMultiply")) {
+                if (consume_suffix(&settingsText, " MustForceNegatedLdexpParamToMultiply")) {
                     static auto s_negativeLdexpCaps =
                             Factory::MustForceNegatedLdexpParamToMultiply();
                     *caps = s_negativeLdexpCaps.get();
                 }
-                if (settingsText.consumeSuffix(" RemovePowWithConstantExponent")) {
+                if (consume_suffix(&settingsText, " RemovePowWithConstantExponent")) {
                     static auto s_powCaps = Factory::RemovePowWithConstantExponent();
                     *caps = s_powCaps.get();
                 }
-                if (settingsText.consumeSuffix(" RewriteDoWhileLoops")) {
+                if (consume_suffix(&settingsText, " RewriteDoWhileLoops")) {
                     static auto s_rewriteLoopCaps = Factory::RewriteDoWhileLoops();
                     *caps = s_rewriteLoopCaps.get();
                 }
-                if (settingsText.consumeSuffix(" RewriteSwitchStatements")) {
+                if (consume_suffix(&settingsText, " RewriteSwitchStatements")) {
                     static auto s_rewriteSwitchCaps = Factory::RewriteSwitchStatements();
                     *caps = s_rewriteSwitchCaps.get();
                 }
-                if (settingsText.consumeSuffix(" RewriteMatrixVectorMultiply")) {
+                if (consume_suffix(&settingsText, " RewriteMatrixVectorMultiply")) {
                     static auto s_rewriteMatVecMulCaps = Factory::RewriteMatrixVectorMultiply();
                     *caps = s_rewriteMatVecMulCaps.get();
                 }
-                if (settingsText.consumeSuffix(" RewriteMatrixComparisons")) {
+                if (consume_suffix(&settingsText, " RewriteMatrixComparisons")) {
                     static auto s_rewriteMatrixComparisons = Factory::RewriteMatrixComparisons();
                     *caps = s_rewriteMatrixComparisons.get();
                 }
-                if (settingsText.consumeSuffix(" ShaderDerivativeExtensionString")) {
+                if (consume_suffix(&settingsText, " ShaderDerivativeExtensionString")) {
                     static auto s_derivativeCaps = Factory::ShaderDerivativeExtensionString();
                     *caps = s_derivativeCaps.get();
                 }
-                if (settingsText.consumeSuffix(" UnfoldShortCircuitAsTernary")) {
+                if (consume_suffix(&settingsText, " UnfoldShortCircuitAsTernary")) {
                     static auto s_ternaryCaps = Factory::UnfoldShortCircuitAsTernary();
                     *caps = s_ternaryCaps.get();
                 }
-                if (settingsText.consumeSuffix(" UsesPrecisionModifiers")) {
+                if (consume_suffix(&settingsText, " UsesPrecisionModifiers")) {
                     static auto s_precisionCaps = Factory::UsesPrecisionModifiers();
                     *caps = s_precisionCaps.get();
                 }
-                if (settingsText.consumeSuffix(" Version110")) {
+                if (consume_suffix(&settingsText, " Version110")) {
                     static auto s_version110Caps = Factory::Version110();
                     *caps = s_version110Caps.get();
                 }
-                if (settingsText.consumeSuffix(" Version450Core")) {
+                if (consume_suffix(&settingsText, " Version450Core")) {
                     static auto s_version450CoreCaps = Factory::Version450Core();
                     *caps = s_version450CoreCaps.get();
                 }
-                if (settingsText.consumeSuffix(" AllowNarrowingConversions")) {
+                if (consume_suffix(&settingsText, " AllowNarrowingConversions")) {
                     settings->fAllowNarrowingConversions = true;
                 }
-                if (settingsText.consumeSuffix(" ForceHighPrecision")) {
+                if (consume_suffix(&settingsText, " ForceHighPrecision")) {
                     settings->fForceHighPrecision = true;
                 }
-                if (settingsText.consumeSuffix(" NoES2Restrictions")) {
+                if (consume_suffix(&settingsText, " NoES2Restrictions")) {
                     settings->fEnforceES2Restrictions = false;
                 }
-                if (settingsText.consumeSuffix(" NoInline")) {
+                if (consume_suffix(&settingsText, " NoInline")) {
                     settings->fInlineThreshold = 0;
                 }
-                if (settingsText.consumeSuffix(" NoTraceVarInSkVMDebugTrace")) {
+                if (consume_suffix(&settingsText, " NoTraceVarInSkVMDebugTrace")) {
                     settings->fAllowTraceVarInSkVMDebugTrace = false;
                 }
-                if (settingsText.consumeSuffix(" InlineThresholdMax")) {
+                if (consume_suffix(&settingsText, " InlineThresholdMax")) {
                     settings->fInlineThreshold = INT_MAX;
                 }
-                if (settingsText.consumeSuffix(" Sharpen")) {
+                if (consume_suffix(&settingsText, " Sharpen")) {
                     settings->fSharpenTextures = true;
                 }
-                if (settingsText.consumeSuffix(" SkVMDebugTrace")) {
+                if (consume_suffix(&settingsText, " SkVMDebugTrace")) {
                     settings->fOptimize = false;
                     *debugTrace = std::make_unique<SkSL::SkVMDebugTrace>();
                 }
@@ -251,48 +266,68 @@ static void show_usage() {
            "--nosettings: ignore /*#pragma settings*/ comments\n");
 }
 
+static bool set_flag(std::optional<bool>* flag, const char* name, bool value) {
+    if (flag->has_value()) {
+        printf("%s flag was specified multiple times\n", name);
+        return false;
+    }
+    *flag = value;
+    return true;
+}
+
 /**
  * Handle a single input.
  */
-ResultCode processCommand(std::vector<SkSL::String>& args) {
-    bool honorSettings = true;
-    if (args.size() == 4) {
-        // Handle four-argument case: `skslc in.sksl out.glsl --settings`
-        const SkSL::String& settingsArg = args[3];
-        if (settingsArg == "--settings") {
-            honorSettings = true;
-        } else if (settingsArg == "--nosettings") {
-            honorSettings = false;
+ResultCode processCommand(const std::vector<std::string>& args) {
+    std::optional<bool> honorSettings;
+    std::vector<std::string> paths;
+    for (size_t i = 1; i < args.size(); ++i) {
+        const std::string& arg = args[i];
+        if (arg == "--settings") {
+            if (!set_flag(&honorSettings, "settings", true)) {
+                return ResultCode::kInputError;
+            }
+        } else if (arg == "--nosettings") {
+            if (!set_flag(&honorSettings, "settings", false)) {
+                return ResultCode::kInputError;
+            }
+        } else if (!skstd::starts_with(arg, "--")) {
+            paths.push_back(arg);
         } else {
-            printf("unrecognized flag: %s\n\n", settingsArg.c_str());
             show_usage();
             return ResultCode::kInputError;
         }
-    } else if (args.size() != 3) {
+    }
+    if (paths.size() != 2) {
         show_usage();
         return ResultCode::kInputError;
     }
 
+    if (!honorSettings.has_value()) {
+        honorSettings = true;
+    }
+
+    const std::string& inputPath = paths[0];
+    const std::string& outputPath = paths[1];
     SkSL::ProgramKind kind;
-    const SkSL::String& inputPath = args[1];
-    if (inputPath.ends_with(".vert")) {
+    if (skstd::ends_with(inputPath, ".vert")) {
         kind = SkSL::ProgramKind::kVertex;
-    } else if (inputPath.ends_with(".frag") || inputPath.ends_with(".sksl")) {
+    } else if (skstd::ends_with(inputPath, ".frag") || skstd::ends_with(inputPath, ".sksl")) {
         kind = SkSL::ProgramKind::kFragment;
-    } else if (inputPath.ends_with(".rtb")) {
+    } else if (skstd::ends_with(inputPath, ".rtb")) {
         kind = SkSL::ProgramKind::kRuntimeBlender;
-    } else if (inputPath.ends_with(".rtcf")) {
+    } else if (skstd::ends_with(inputPath, ".rtcf")) {
         kind = SkSL::ProgramKind::kRuntimeColorFilter;
-    } else if (inputPath.ends_with(".rts")) {
+    } else if (skstd::ends_with(inputPath, ".rts")) {
         kind = SkSL::ProgramKind::kRuntimeShader;
     } else {
         printf("input filename must end in '.vert', '.frag', '.rtb', '.rtcf', "
-               "'.rts', or '.sksl'\n");
+               "'.rts' or '.sksl'\n");
         return ResultCode::kInputError;
     }
 
     std::ifstream in(inputPath);
-    SkSL::String text((std::istreambuf_iterator<char>(in)),
+    std::string text((std::istreambuf_iterator<char>(in)),
                        std::istreambuf_iterator<char>());
     if (in.rdstate()) {
         printf("error reading '%s'\n", inputPath.c_str());
@@ -303,7 +338,7 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
     auto standaloneCaps = SkSL::ShaderCapsFactory::Standalone();
     const SkSL::ShaderCaps* caps = standaloneCaps.get();
     std::unique_ptr<SkSL::SkVMDebugTrace> debugTrace;
-    if (honorSettings) {
+    if (*honorSettings) {
         if (!detect_shader_settings(text, &settings, &caps, &debugTrace)) {
             return ResultCode::kInputError;
         }
@@ -316,11 +351,10 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
     settings.fRTFlipSet     = 0;
     settings.fRTFlipBinding = 0;
 
-    const SkSL::String& outputPath = args[2];
     auto emitCompileError = [&](SkSL::FileOutputStream& out, const char* errorText) {
         // Overwrite the compiler output, if any, with an error message.
         out.close();
-        SkSL::FileOutputStream errorStream(outputPath);
+        SkSL::FileOutputStream errorStream(outputPath.c_str());
         errorStream.writeText("### Compilation failed:\n\n");
         errorStream.writeText(errorText);
         errorStream.close();
@@ -329,7 +363,7 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
     };
 
     auto compileProgram = [&](const auto& writeFn) -> ResultCode {
-        SkSL::FileOutputStream out(outputPath);
+        SkSL::FileOutputStream out(outputPath.c_str());
         SkSL::Compiler compiler(caps);
         if (!out.isValid()) {
             printf("error writing '%s'\n", outputPath.c_str());
@@ -359,12 +393,13 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
         return compileProgram(writeFn);
     };
 
-    if (outputPath.ends_with(".spirv")) {
+    if (skstd::ends_with(outputPath, ".spirv")) {
         return compileProgram(
                 [](SkSL::Compiler& compiler, SkSL::Program& program, SkSL::OutputStream& out) {
                     return compiler.toSPIRV(program, out);
                 });
-    } else if (outputPath.ends_with(".asm.frag") || outputPath.ends_with(".asm.vert")) {
+    } else if (skstd::ends_with(outputPath, ".asm.frag") ||
+               skstd::ends_with(outputPath, ".asm.vert")) {
         return compileProgram(
                 [](SkSL::Compiler& compiler, SkSL::Program& program, SkSL::OutputStream& out) {
                     // Compile program to SPIR-V assembly in a string-stream.
@@ -374,7 +409,7 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
                     }
                     // Convert the string-stream to a SPIR-V disassembly.
                     spvtools::SpirvTools tools(SPV_ENV_VULKAN_1_0);
-                    const SkSL::String& spirv(assembly.str());
+                    const std::string& spirv(assembly.str());
                     std::string disassembly;
                     if (!tools.Disassemble((const uint32_t*)spirv.data(),
                                            spirv.size() / 4, &disassembly)) {
@@ -384,22 +419,22 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
                     out.write(disassembly.data(), disassembly.size());
                     return true;
                 });
-    } else if (outputPath.ends_with(".glsl")) {
+    } else if (skstd::ends_with(outputPath, ".glsl")) {
         return compileProgram(
                 [](SkSL::Compiler& compiler, SkSL::Program& program, SkSL::OutputStream& out) {
                     return compiler.toGLSL(program, out);
                 });
-    } else if (outputPath.ends_with(".metal")) {
+    } else if (skstd::ends_with(outputPath, ".metal")) {
         return compileProgram(
                 [](SkSL::Compiler& compiler, SkSL::Program& program, SkSL::OutputStream& out) {
                     return compiler.toMetal(program, out);
                 });
-    } else if (outputPath.ends_with(".hlsl")) {
+    } else if (skstd::ends_with(outputPath, ".hlsl")) {
         return compileProgram(
                 [](SkSL::Compiler& compiler, SkSL::Program& program, SkSL::OutputStream& out) {
                     return compiler.toHLSL(program, out);
                 });
-    } else if (outputPath.ends_with(".skvm")) {
+    } else if (skstd::ends_with(outputPath, ".skvm")) {
         return compileProgramForSkVM(
                 [&](SkSL::Compiler&, SkSL::Program& program, SkSL::OutputStream& out) {
                     skvm::Builder builder{skvm::Features{}};
@@ -415,30 +450,28 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
                     builder.done().dump(redirect.get());
                     return true;
                 });
-    } else if (outputPath.ends_with(".stage")) {
+    } else if (skstd::ends_with(outputPath, ".stage")) {
         return compileProgram(
                 [](SkSL::Compiler&, SkSL::Program& program, SkSL::OutputStream& out) {
                     class Callbacks : public SkSL::PipelineStage::Callbacks {
                     public:
-                        using String = SkSL::String;
-
-                        String getMangledName(const char* name) override {
-                            return String(name) + "_0";
+                        std::string getMangledName(const char* name) override {
+                            return std::string(name) + "_0";
                         }
 
-                        String declareUniform(const SkSL::VarDeclaration* decl) override {
+                        std::string declareUniform(const SkSL::VarDeclaration* decl) override {
                             fOutput += decl->description();
-                            return String(decl->var().name());
+                            return std::string(decl->var().name());
                         }
 
                         void defineFunction(const char* decl,
                                             const char* body,
                                             bool /*isMain*/) override {
-                            fOutput += String(decl) + "{" + body + "}";
+                            fOutput += std::string(decl) + "{" + body + "}";
                         }
 
                         void declareFunction(const char* decl) override {
-                            fOutput += String(decl) + ";";
+                            fOutput += std::string(decl) + ";";
                         }
 
                         void defineStruct(const char* definition) override {
@@ -449,20 +482,29 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
                             fOutput += declaration;
                         }
 
-                        String sampleShader(int index, String coords) override {
-                            return "child_" + SkSL::to_string(index) + ".eval(" + coords + ")";
+                        std::string sampleShader(int index, std::string coords) override {
+                            return "child_" + std::to_string(index) + ".eval(" + coords + ")";
                         }
 
-                        String sampleColorFilter(int index, String color) override {
-                            return "child_" + SkSL::to_string(index) + ".eval(" + color + ")";
+                        std::string sampleColorFilter(int index, std::string color) override {
+                            return "child_" + std::to_string(index) + ".eval(" + color + ")";
                         }
 
-                        String sampleBlender(int index, String src, String dst) override {
-                            return "child_" + SkSL::to_string(index) + ".eval(" + src + ", " +
+                        std::string sampleBlender(int index,
+                                                  std::string src,
+                                                  std::string dst) override {
+                            return "child_" + std::to_string(index) + ".eval(" + src + ", " +
                                    dst + ")";
                         }
 
-                        String fOutput;
+                        std::string toLinearSrgb(std::string color) override {
+                            return "toLinearSrgb(" + color + ")";
+                        }
+                        std::string fromLinearSrgb(std::string color) override {
+                            return "fromLinearSrgb(" + color + ")";
+                        }
+
+                        std::string fOutput;
                     };
                     // The .stage output looks almost like valid SkSL, but not quite.
                     // The PipelineStageGenerator bridges the gap between the SkSL in `program`,
@@ -478,11 +520,11 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
                     Callbacks callbacks;
                     SkSL::PipelineStage::ConvertProgram(program, "_coords", "_inColor",
                                                         "_canvasColor", &callbacks);
-                    out.writeString(GrShaderUtils::PrettyPrint(callbacks.fOutput));
+                    out.writeString(SkShaderUtils::PrettyPrint(callbacks.fOutput));
                     return true;
                 });
-    } else if (outputPath.ends_with(".dehydrated.sksl")) {
-        SkSL::FileOutputStream out(outputPath);
+    } else if (skstd::ends_with(outputPath, ".dehydrated.sksl")) {
+        SkSL::FileOutputStream out(outputPath.c_str());
         SkSL::Compiler compiler(caps);
         if (!out.isValid()) {
             printf("error writing '%s'\n", outputPath.c_str());
@@ -494,10 +536,10 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
         SkSL::Dehydrator dehydrator;
         dehydrator.write(*module.fSymbols);
         dehydrator.write(module.fElements);
-        SkSL::String baseName = base_name(inputPath, "", ".sksl");
+        std::string baseName = base_name(inputPath, "", ".sksl");
         SkSL::StringStream buffer;
         dehydrator.finish(buffer);
-        const SkSL::String& data = buffer.str();
+        const std::string& data = buffer.str();
         out.printf("static uint8_t SKSL_INCLUDE_%s[] = {", baseName.c_str());
         for (size_t i = 0; i < data.length(); ++i) {
             out.printf("%s%d,", dehydrator.prefixAtOffset(i), uint8_t(data[i]));
@@ -509,9 +551,41 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
             printf("error writing '%s'\n", outputPath.c_str());
             return ResultCode::kOutputError;
         }
+    } else if (skstd::ends_with(outputPath, ".html")) {
+        settings.fAllowTraceVarInSkVMDebugTrace = false;
+
+        SkCpu::CacheRuntimeFeatures();
+        gSkVMAllowJIT = true;
+        return compileProgramForSkVM(
+            [&](SkSL::Compiler&, SkSL::Program& program, SkSL::OutputStream& out) {
+                if (!debugTrace) {
+                    debugTrace = std::make_unique<SkSL::SkVMDebugTrace>();
+                    debugTrace->setSource(text.c_str());
+                }
+                auto visualizer = std::make_unique<skvm::viz::Visualizer>(debugTrace.get());
+                skvm::Builder builder(skvm::Features{}, /*createDuplicates=*/true);
+                if (!SkSL::testingOnly_ProgramToSkVMShader(program, &builder, debugTrace.get())) {
+                    return false;
+                }
+
+                std::unique_ptr<SkWStream> redirect = as_SkWStream(out);
+                skvm::Program p = builder.done(
+                        /*debug_name=*/nullptr, /*allow_jit=*/true, std::move(visualizer));
+#if defined(SKVM_JIT)
+                SkDynamicMemoryWStream asmFile;
+                p.disassemble(&asmFile);
+                auto dumpData = asmFile.detachAsData();
+                std::string dumpString(static_cast<const char*>(dumpData->data()),dumpData->size());
+                p.visualize(redirect.get(), dumpString.c_str());
+#else
+                p.visualize(redirect.get(), nullptr);
+#endif
+                return true;
+            });
     } else {
-        printf("expected output path to end with one of: .glsl, .metal, .hlsl, .spirv, .asm.frag, "
-               ".skvm, .stage, .asm.vert, .dehydrated.sksl (got '%s')\n", outputPath.c_str());
+        printf("expected output path to end with one of: .glsl, .html, .metal, .hlsl, .spirv, "
+               ".asm.frag, .skvm, .stage, .asm.vert, .dehydrated.sksl (got '%s')\n",
+               outputPath.c_str());
         return ResultCode::kConfigurationError;
     }
     return ResultCode::kSuccess;
@@ -521,8 +595,8 @@ ResultCode processCommand(std::vector<SkSL::String>& args) {
  * Processes multiple inputs in a single invocation of skslc.
  */
 ResultCode processWorklist(const char* worklistPath) {
-    SkSL::String inputPath(worklistPath);
-    if (!inputPath.ends_with(".worklist")) {
+    std::string inputPath(worklistPath);
+    if (!skstd::ends_with(inputPath, ".worklist")) {
         printf("expected .worklist file, found: %s\n\n", worklistPath);
         show_usage();
         return ResultCode::kConfigurationError;
@@ -531,9 +605,9 @@ ResultCode processWorklist(const char* worklistPath) {
     // The worklist contains one line per argument to pass to skslc. When a blank line is reached,
     // those arguments will be passed to `processCommand`.
     auto resultCode = ResultCode::kSuccess;
-    std::vector<SkSL::String> args = {"skslc"};
+    std::vector<std::string> args = {"skslc"};
     std::ifstream in(worklistPath);
-    for (SkSL::String line; std::getline(in, line); ) {
+    for (std::string line; std::getline(in, line); ) {
         if (in.rdstate()) {
             printf("error reading '%s'\n", worklistPath);
             return ResultCode::kInputError;
@@ -573,7 +647,7 @@ int main(int argc, const char** argv) {
         return (int)processWorklist(argv[1]);
     } else {
         // Process non-worklist inputs.
-        std::vector<SkSL::String> args;
+        std::vector<std::string> args;
         for (int index=0; index<argc; ++index) {
             args.push_back(argv[index]);
         }
diff --git a/third_party/skia/src/sksl/SkSLMangler.cpp b/third_party/skia/src/sksl/SkSLMangler.cpp
index aeb69ee457f04..59050c666a6f2 100644
--- a/third_party/skia/src/sksl/SkSLMangler.cpp
+++ b/third_party/skia/src/sksl/SkSLMangler.cpp
@@ -6,15 +6,17 @@
  */
 
 #include "src/sksl/SkSLMangler.h"
+
+#include "include/private/SkStringView.h"
 #include "src/sksl/ir/SkSLSymbolTable.h"
 
 namespace SkSL {
 
-String Mangler::uniqueName(skstd::string_view baseName, SymbolTable* symbolTable) {
+std::string Mangler::uniqueName(std::string_view baseName, SymbolTable* symbolTable) {
     SkASSERT(symbolTable);
     // The inliner runs more than once, so the base name might already have been mangled and have a
     // prefix like "_123_x". Let's strip that prefix off to make the generated code easier to read.
-    if (baseName.starts_with("_")) {
+    if (skstd::starts_with(baseName, '_')) {
         // Determine if we have a string of digits.
         int offset = 1;
         while (isdigit(baseName[offset])) {
@@ -35,9 +37,10 @@ String Mangler::uniqueName(skstd::string_view baseName, SymbolTable* symbolTable
     // Append a unique numeric prefix to avoid name overlap. Check the symbol table to make sure
     // we're not reusing an existing name. (Note that within a single compilation pass, this check
     // isn't fully comprehensive, as code isn't always generated in top-to-bottom order.)
-    String uniqueName;
+    std::string uniqueName;
     for (;;) {
-        uniqueName = String::printf("_%d_%.*s", fCounter++, (int)baseName.size(), baseName.data());
+        uniqueName = SkSL::String::printf("_%d_%.*s", fCounter++,
+                                          (int)baseName.size(), baseName.data());
         if ((*symbolTable)[uniqueName] == nullptr) {
             break;
         }
diff --git a/third_party/skia/src/sksl/SkSLMangler.h b/third_party/skia/src/sksl/SkSLMangler.h
index d1c49491016b1..14089f827db1b 100644
--- a/third_party/skia/src/sksl/SkSLMangler.h
+++ b/third_party/skia/src/sksl/SkSLMangler.h
@@ -19,7 +19,7 @@ class Mangler {
     /**
      * Mangles baseName to create a name that is unique within symbolTable.
      */
-    String uniqueName(skstd::string_view baseName, SymbolTable* symbolTable);
+    std::string uniqueName(std::string_view baseName, SymbolTable* symbolTable);
 
     void reset() {
         fCounter = 0;
diff --git a/third_party/skia/src/sksl/SkSLMemoryLayout.h b/third_party/skia/src/sksl/SkSLMemoryLayout.h
index 49ab50e45c6b0..dd1ccc69877fa 100644
--- a/third_party/skia/src/sksl/SkSLMemoryLayout.h
+++ b/third_party/skia/src/sksl/SkSLMemoryLayout.h
@@ -69,7 +69,7 @@ class MemoryLayout {
                 return this->roundUpIfNeeded(result);
             }
             default:
-                SK_ABORT("cannot determine size of type %s", String(type.name()).c_str());
+                SK_ABORT("cannot determine size of type %s", type.displayName().c_str());
         }
     }
 
@@ -135,7 +135,7 @@ class MemoryLayout {
                 return (total + alignment - 1) & ~(alignment - 1);
             }
             default:
-                SK_ABORT("cannot determine size of type %s", String(type.name()).c_str());
+                SK_ABORT("cannot determine size of type %s", type.displayName().c_str());
         }
     }
 
diff --git a/third_party/skia/src/sksl/SkSLOperators.cpp b/third_party/skia/src/sksl/SkSLOperators.cpp
index 5daa1e9c89bed..f1344d0486a84 100644
--- a/third_party/skia/src/sksl/SkSLOperators.cpp
+++ b/third_party/skia/src/sksl/SkSLOperators.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "include/core/SkTypes.h"
+#include "include/private/SkStringView.h"
 #include "src/sksl/SkSLContext.h"
 #include "src/sksl/SkSLOperators.h"
 #include "src/sksl/SkSLProgramSettings.h"
@@ -95,46 +96,57 @@ bool Operator::isOperator() const {
 
 const char* Operator::operatorName() const {
     switch (this->kind()) {
-        case Kind::TK_PLUS:         return "+";
-        case Kind::TK_MINUS:        return "-";
-        case Kind::TK_STAR:         return "*";
-        case Kind::TK_SLASH:        return "/";
-        case Kind::TK_PERCENT:      return "%";
-        case Kind::TK_SHL:          return "<<";
-        case Kind::TK_SHR:          return ">>";
+        case Kind::TK_PLUS:         return " + ";
+        case Kind::TK_MINUS:        return " - ";
+        case Kind::TK_STAR:         return " * ";
+        case Kind::TK_SLASH:        return " / ";
+        case Kind::TK_PERCENT:      return " % ";
+        case Kind::TK_SHL:          return " << ";
+        case Kind::TK_SHR:          return " >> ";
         case Kind::TK_LOGICALNOT:   return "!";
-        case Kind::TK_LOGICALAND:   return "&&";
-        case Kind::TK_LOGICALOR:    return "||";
-        case Kind::TK_LOGICALXOR:   return "^^";
+        case Kind::TK_LOGICALAND:   return " && ";
+        case Kind::TK_LOGICALOR:    return " || ";
+        case Kind::TK_LOGICALXOR:   return " ^^ ";
         case Kind::TK_BITWISENOT:   return "~";
-        case Kind::TK_BITWISEAND:   return "&";
-        case Kind::TK_BITWISEOR:    return "|";
-        case Kind::TK_BITWISEXOR:   return "^";
-        case Kind::TK_EQ:           return "=";
-        case Kind::TK_EQEQ:         return "==";
-        case Kind::TK_NEQ:          return "!=";
-        case Kind::TK_LT:           return "<";
-        case Kind::TK_GT:           return ">";
-        case Kind::TK_LTEQ:         return "<=";
-        case Kind::TK_GTEQ:         return ">=";
-        case Kind::TK_PLUSEQ:       return "+=";
-        case Kind::TK_MINUSEQ:      return "-=";
-        case Kind::TK_STAREQ:       return "*=";
-        case Kind::TK_SLASHEQ:      return "/=";
-        case Kind::TK_PERCENTEQ:    return "%=";
-        case Kind::TK_SHLEQ:        return "<<=";
-        case Kind::TK_SHREQ:        return ">>=";
-        case Kind::TK_BITWISEANDEQ: return "&=";
-        case Kind::TK_BITWISEOREQ:  return "|=";
-        case Kind::TK_BITWISEXOREQ: return "^=";
+        case Kind::TK_BITWISEAND:   return " & ";
+        case Kind::TK_BITWISEOR:    return " | ";
+        case Kind::TK_BITWISEXOR:   return " ^ ";
+        case Kind::TK_EQ:           return " = ";
+        case Kind::TK_EQEQ:         return " == ";
+        case Kind::TK_NEQ:          return " != ";
+        case Kind::TK_LT:           return " < ";
+        case Kind::TK_GT:           return " > ";
+        case Kind::TK_LTEQ:         return " <= ";
+        case Kind::TK_GTEQ:         return " >= ";
+        case Kind::TK_PLUSEQ:       return " += ";
+        case Kind::TK_MINUSEQ:      return " -= ";
+        case Kind::TK_STAREQ:       return " *= ";
+        case Kind::TK_SLASHEQ:      return " /= ";
+        case Kind::TK_PERCENTEQ:    return " %= ";
+        case Kind::TK_SHLEQ:        return " <<= ";
+        case Kind::TK_SHREQ:        return " >>= ";
+        case Kind::TK_BITWISEANDEQ: return " &= ";
+        case Kind::TK_BITWISEOREQ:  return " |= ";
+        case Kind::TK_BITWISEXOREQ: return " ^= ";
         case Kind::TK_PLUSPLUS:     return "++";
         case Kind::TK_MINUSMINUS:   return "--";
-        case Kind::TK_COMMA:        return ",";
+        case Kind::TK_COMMA:        return ", ";
         default:
             SK_ABORT("unsupported operator: %d\n", (int) fKind);
     }
 }
 
+std::string_view Operator::tightOperatorName() const {
+    std::string_view name = this->operatorName();
+    if (skstd::starts_with(name, ' ')) {
+        name.remove_prefix(1);
+    }
+    if (skstd::ends_with(name, ' ')) {
+        name.remove_suffix(1);
+    }
+    return name;
+}
+
 bool Operator::isAssignment() const {
     switch (this->kind()) {
         case Kind::TK_EQ:           // fall through
@@ -230,7 +242,7 @@ bool Operator::isValidForMatrixOrVector() const {
     }
 }
 
-bool Operator::isMatrixMultiply(const Type& left, const Type& right) {
+bool Operator::isMatrixMultiply(const Type& left, const Type& right) const {
     if (this->kind() != Token::Kind::TK_STAR && this->kind() != Token::Kind::TK_STAREQ) {
         return false;
     }
@@ -249,7 +261,7 @@ bool Operator::determineBinaryType(const Context& context,
                                    const Type& right,
                                    const Type** outLeftType,
                                    const Type** outRightType,
-                                   const Type** outResultType) {
+                                   const Type** outResultType) const {
     const bool allowNarrowing = context.fConfig->fSettings.fAllowNarrowingConversions;
     switch (this->kind()) {
         case Token::Kind::TK_EQ:  // left = right
diff --git a/third_party/skia/src/sksl/SkSLOperators.h b/third_party/skia/src/sksl/SkSLOperators.h
index 8504c07c9239e..1a11b1fd6c58c 100644
--- a/third_party/skia/src/sksl/SkSLOperators.h
+++ b/third_party/skia/src/sksl/SkSLOperators.h
@@ -11,6 +11,8 @@
 #include "include/private/SkSLDefines.h"
 #include "src/sksl/SkSLLexer.h"
 
+#include <string_view>
+
 namespace SkSL {
 
 class Context;
@@ -54,8 +56,12 @@ class Operator {
 
     Precedence getBinaryPrecedence() const;
 
+    // Returns the operator name surrounded by the expected whitespace for a tidy binary expression.
     const char* operatorName() const;
 
+    // Returns the operator name without any surrounding whitespace.
+    std::string_view tightOperatorName() const;
+
     // Returns true if op is '=' or any compound assignment operator ('+=', '-=', etc.)
     bool isAssignment() const;
 
@@ -101,11 +107,11 @@ class Operator {
                              const Type& right,
                              const Type** outLeftType,
                              const Type** outRightType,
-                             const Type** outResultType);
+                             const Type** outResultType) const;
 
 private:
     bool isOperator() const;
-    bool isMatrixMultiply(const Type& left, const Type& right);
+    bool isMatrixMultiply(const Type& left, const Type& right) const;
 
     Kind fKind;
 };
diff --git a/third_party/skia/src/sksl/SkSLOutputStream.cpp b/third_party/skia/src/sksl/SkSLOutputStream.cpp
index f242e81f2a695..cce5f6053649e 100644
--- a/third_party/skia/src/sksl/SkSLOutputStream.cpp
+++ b/third_party/skia/src/sksl/SkSLOutputStream.cpp
@@ -11,7 +11,7 @@
 
 namespace SkSL {
 
-void OutputStream::writeString(const String& s) {
+void OutputStream::writeString(const std::string& s) {
     this->write(s.c_str(), s.size());
 }
 
diff --git a/third_party/skia/src/sksl/SkSLOutputStream.h b/third_party/skia/src/sksl/SkSLOutputStream.h
index 505df403b8d27..2bcb2ff70a721 100644
--- a/third_party/skia/src/sksl/SkSLOutputStream.h
+++ b/third_party/skia/src/sksl/SkSLOutputStream.h
@@ -37,11 +37,11 @@ class OutputStream {
 
     virtual void write(const void* s, size_t size) = 0;
 
-    void writeString(const String& s);
+    void writeString(const std::string& s);
 
     void printf(const char format[], ...) SK_PRINTF_LIKE(2, 3);
 
-    void appendVAList(const char format[], va_list args);
+    void appendVAList(const char format[], va_list args) SK_PRINTF_LIKE(2, 0);
 
     virtual ~OutputStream() {}
 
diff --git a/third_party/skia/src/sksl/SkSLParsedModule.h b/third_party/skia/src/sksl/SkSLParsedModule.h
index 7e24c5c5d672b..096204d48a6a3 100644
--- a/third_party/skia/src/sksl/SkSLParsedModule.h
+++ b/third_party/skia/src/sksl/SkSLParsedModule.h
@@ -12,12 +12,12 @@
 
 namespace SkSL {
 
+class BuiltinMap;
 class SymbolTable;
-class IntrinsicMap;
 
 struct ParsedModule {
-    std::shared_ptr<SymbolTable>  fSymbols;
-    std::shared_ptr<IntrinsicMap> fIntrinsics;
+    std::shared_ptr<SymbolTable> fSymbols;
+    std::shared_ptr<BuiltinMap>  fElements;
 };
 
 } //namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLProgramSettings.h b/third_party/skia/src/sksl/SkSLProgramSettings.h
index 25a3297336879..0ceb541a28b61 100644
--- a/third_party/skia/src/sksl/SkSLProgramSettings.h
+++ b/third_party/skia/src/sksl/SkSLProgramSettings.h
@@ -81,6 +81,9 @@ struct ProgramSettings {
     bool fDSLUseMemoryPool = true;
     // If true, DSL objects assert that they were used prior to destruction
     bool fAssertDSLObjectsReleased = true;
+    // If true, VarDeclaration can be cloned for testing purposes. See VarDeclaration::clone for
+    // more information.
+    bool fAllowVarDeclarationCloneForTesting = false;
     // External functions available for use in runtime effects. These values are registered in the
     // symbol table of the Program, but ownership is *not* transferred. It is up to the caller to
     // keep them alive.
@@ -104,7 +107,9 @@ struct ProgramConfig {
     static bool IsRuntimeEffect(ProgramKind kind) {
         return (kind == ProgramKind::kRuntimeColorFilter ||
                 kind == ProgramKind::kRuntimeShader ||
-                kind == ProgramKind::kRuntimeBlender);
+                kind == ProgramKind::kRuntimeBlender ||
+                kind == ProgramKind::kCustomMeshVertex ||
+                kind == ProgramKind::kCustomMeshFragment);
     }
 };
 
diff --git a/third_party/skia/src/sksl/SkSLRehydrator.cpp b/third_party/skia/src/sksl/SkSLRehydrator.cpp
index d73258dbd0b98..c692f2a47b7c3 100644
--- a/third_party/skia/src/sksl/SkSLRehydrator.cpp
+++ b/third_party/skia/src/sksl/SkSLRehydrator.cpp
@@ -14,6 +14,8 @@
 #include "include/private/SkSLProgramElement.h"
 #include "include/private/SkSLStatement.h"
 #include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLThreadContext.h"
 #include "src/sksl/ir/SkSLBinaryExpression.h"
 #include "src/sksl/ir/SkSLBreakStatement.h"
 #include "src/sksl/ir/SkSLConstructor.h"
@@ -36,11 +38,13 @@
 #include "src/sksl/ir/SkSLFunctionCall.h"
 #include "src/sksl/ir/SkSLFunctionDeclaration.h"
 #include "src/sksl/ir/SkSLFunctionDefinition.h"
+#include "src/sksl/ir/SkSLFunctionPrototype.h"
 #include "src/sksl/ir/SkSLIfStatement.h"
 #include "src/sksl/ir/SkSLIndexExpression.h"
 #include "src/sksl/ir/SkSLInlineMarker.h"
 #include "src/sksl/ir/SkSLInterfaceBlock.h"
 #include "src/sksl/ir/SkSLLiteral.h"
+#include "src/sksl/ir/SkSLNop.h"
 #include "src/sksl/ir/SkSLPostfixExpression.h"
 #include "src/sksl/ir/SkSLPrefixExpression.h"
 #include "src/sksl/ir/SkSLReturnStatement.h"
@@ -49,7 +53,6 @@
 #include "src/sksl/ir/SkSLSwitchCase.h"
 #include "src/sksl/ir/SkSLSwitchStatement.h"
 #include "src/sksl/ir/SkSLSwizzle.h"
-#include "src/sksl/ir/SkSLSymbolAlias.h"
 #include "src/sksl/ir/SkSLSymbolTable.h"
 #include "src/sksl/ir/SkSLTernaryExpression.h"
 #include "src/sksl/ir/SkSLType.h"
@@ -64,7 +67,10 @@ class AutoRehydratorSymbolTable {
     AutoRehydratorSymbolTable(Rehydrator* rehydrator)
         : fRehydrator(rehydrator)
         , fOldSymbols(fRehydrator->fSymbolTable) {
-        fRehydrator->fSymbolTable = fRehydrator->symbolTable();
+        std::shared_ptr<SymbolTable> symbols = fRehydrator->symbolTable();
+        if (symbols) {
+            fRehydrator->fSymbolTable = std::move(symbols);
+        }
     }
 
     ~AutoRehydratorSymbolTable() {
@@ -76,19 +82,33 @@ class AutoRehydratorSymbolTable {
     std::shared_ptr<SymbolTable> fOldSymbols;
 };
 
-Rehydrator::Rehydrator(const Context* context,  std::shared_ptr<SymbolTable> symbolTable,
-                       const uint8_t* src, size_t length)
-                : fContext(*context)
-                , fSymbolTable(std::move(symbolTable))
-                , fStart(src)
-    SkDEBUGCODE(, fEnd(fStart + length)) {
+Rehydrator::Rehydrator(Compiler& compiler, const uint8_t* src, size_t length,
+        std::shared_ptr<SymbolTable> symbols)
+    : fCompiler(compiler)
+    , fSymbolTable(symbols ? std::move(symbols) : compiler.makeGLSLRootSymbolTable())
+    SkDEBUGCODE(, fEnd(src + length)) {
     SkASSERT(fSymbolTable);
     SkASSERT(fSymbolTable->isBuiltin());
-    // skip past string data
-    fIP = fStart;
+    fIP = src;
+    [[maybe_unused]] uint16_t version = this->readU16();
+    SkASSERTF(version == kVersion, "Dehydrated file is an unsupported version (current version is "
+            "%d, found version %d)", kVersion, version);
+    fStringStart = fIP;
+    // skip over string data
     fIP += this->readU16();
 }
 
+#ifdef SK_DEBUG
+Rehydrator::~Rehydrator() {
+    // ensure that we have read the expected number of bytes
+    SkASSERT(fIP == fEnd);
+}
+#endif
+
+Context& Rehydrator::context() const {
+    return fCompiler.context();
+}
+
 Layout Rehydrator::layout() {
     switch (this->readU8()) {
         case kBuiltinLayout_Command: {
@@ -101,8 +121,8 @@ Layout Rehydrator::layout() {
         case kLayout_Command: {
             int flags = this->readU32();
             int location = this->readS8();
-            int offset = this->readS8();
-            int binding = this->readS8();
+            int offset = this->readS16();
+            int binding = this->readS16();
             int index = this->readS8();
             int set = this->readS8();
             int builtin = this->readS16();
@@ -143,7 +163,7 @@ const Symbol* Rehydrator::symbol() {
             uint16_t id = this->readU16();
             const Type* componentType = this->type();
             int8_t count = this->readS8();
-            const String* arrayName =
+            const std::string* arrayName =
                     fSymbolTable->takeOwnershipOfString(componentType->getArrayName(count));
             const Type* result = fSymbolTable->takeOwnershipOfSymbol(
                     Type::MakeArrayType(*arrayName, *componentType, count));
@@ -153,7 +173,7 @@ const Symbol* Rehydrator::symbol() {
         case kFunctionDeclaration_Command: {
             uint16_t id = this->readU16();
             Modifiers modifiers = this->modifiers();
-            skstd::string_view name = this->readString();
+            std::string_view name = this->readString();
             int parameterCount = this->readU8();
             std::vector<const Variable*> parameters;
             parameters.reserve(parameterCount);
@@ -168,7 +188,7 @@ const Symbol* Rehydrator::symbol() {
                             name,
                             std::move(parameters),
                             returnType,
-                            /*builtin=*/true));
+                            fSymbolTable->isBuiltin()));
             this->addSymbol(id, result);
             return result;
         }
@@ -181,18 +201,18 @@ const Symbol* Rehydrator::symbol() {
         }
         case kStructType_Command: {
             uint16_t id = this->readU16();
-            String name(this->readString());
+            std::string name(this->readString());
             uint8_t fieldCount = this->readU8();
             std::vector<Type::Field> fields;
             fields.reserve(fieldCount);
             for (int i = 0; i < fieldCount; ++i) {
                 Modifiers m = this->modifiers();
-                skstd::string_view fieldName = this->readString();
+                std::string_view fieldName = this->readString();
                 const Type* type = this->type();
                 fields.emplace_back(m, fieldName, type);
             }
             bool interfaceBlock = this->readU8();
-            skstd::string_view nameChars(*fSymbolTable->takeOwnershipOfString(std::move(name)));
+            std::string_view nameChars(*fSymbolTable->takeOwnershipOfString(std::move(name)));
             const Type* result = fSymbolTable->takeOwnershipOfSymbol(Type::MakeStructType(
                     /*line=*/-1, nameChars, std::move(fields), interfaceBlock));
             this->addSymbol(id, result);
@@ -200,26 +220,12 @@ const Symbol* Rehydrator::symbol() {
         }
         case kSymbolRef_Command: {
             uint16_t id = this->readU16();
+            if (id == kBuiltin_Symbol) {
+                return (*fSymbolTable)[this->readString()];
+            }
             SkASSERT(fSymbols.size() > id);
             return fSymbols[id];
         }
-        case kSymbolAlias_Command: {
-            uint16_t id = this->readU16();
-            skstd::string_view name = this->readString();
-            const Symbol* origSymbol = this->symbol();
-            const SymbolAlias* symbolAlias = fSymbolTable->takeOwnershipOfSymbol(
-                    std::make_unique<SymbolAlias>(/*line=*/-1, name, origSymbol));
-            this->addSymbol(id, symbolAlias);
-            return symbolAlias;
-        }
-        case kSystemType_Command: {
-            uint16_t id = this->readU16();
-            skstd::string_view name = this->readString();
-            const Symbol* result = (*fSymbolTable)[name];
-            SkASSERT(result && result->kind() == Symbol::Kind::kType);
-            this->addSymbol(id, result);
-            return result;
-        }
         case kUnresolvedFunction_Command: {
             uint16_t id = this->readU16();
             int length = this->readU8();
@@ -238,11 +244,11 @@ const Symbol* Rehydrator::symbol() {
         case kVariable_Command: {
             uint16_t id = this->readU16();
             const Modifiers* m = this->modifiersPool().add(this->modifiers());
-            skstd::string_view name = this->readString();
+            std::string_view name = this->readString();
             const Type* type = this->type();
             Variable::Storage storage = (Variable::Storage) this->readU8();
             const Variable* result = fSymbolTable->takeOwnershipOfSymbol(std::make_unique<Variable>(
-                    /*line=*/-1, m, name, type, /*builtin=*/true, storage));
+                    /*line=*/-1, m, name, type, fSymbolTable->isBuiltin(), storage));
             this->addSymbol(id, result);
             return result;
         }
@@ -259,6 +265,29 @@ const Type* Rehydrator::type() {
     return (const Type*) result;
 }
 
+std::unique_ptr<Program> Rehydrator::program() {
+    [[maybe_unused]] uint8_t command = this->readU8();
+    Context& context = this->context();
+    SkASSERT(command == kProgram_Command);
+    ProgramConfig* oldConfig = context.fConfig;
+    ModifiersPool* oldModifiersPool = context.fModifiersPool;
+    auto config = std::make_unique<ProgramConfig>();
+    config->fKind = (ProgramKind)this->readU8();
+    context.fConfig = config.get();
+    fSymbolTable = fCompiler.moduleForProgramKind(config->fKind).fSymbols;
+    auto modifiers = std::make_unique<ModifiersPool>();
+    context.fModifiersPool = modifiers.get();
+    this->symbolTable();
+    std::vector<std::unique_ptr<ProgramElement>> elements = this->elements();
+    context.fConfig = oldConfig;
+    context.fModifiersPool = oldModifiersPool;
+    Program::Inputs inputs;
+    inputs.fUseFlipRTUniform = this->readU8();
+    return std::make_unique<Program>(nullptr, std::move(config), fCompiler.fContext,
+            std::move(elements), /*sharedElements=*/std::vector<const ProgramElement*>(),
+            std::move(modifiers), fSymbolTable, /*pool=*/nullptr, inputs);
+}
+
 std::vector<std::unique_ptr<ProgramElement>> Rehydrator::elements() {
     SkDEBUGCODE(uint8_t command = )this->readU8();
     SkASSERT(command == kElements_Command);
@@ -276,29 +305,48 @@ std::unique_ptr<ProgramElement> Rehydrator::element() {
             const FunctionDeclaration* decl = this->symbolRef<FunctionDeclaration>(
                                                                 Symbol::Kind::kFunctionDeclaration);
             std::unique_ptr<Statement> body = this->statement();
-            auto result = FunctionDefinition::Convert(fContext, /*line=*/-1, *decl,
-                                                      std::move(body), /*builtin=*/true);
+            auto result = FunctionDefinition::Convert(this->context(), /*line=*/-1, *decl,
+                                                      std::move(body), fSymbolTable->isBuiltin());
             decl->setDefinition(result.get());
             return std::move(result);
         }
+        case Rehydrator::kFunctionPrototype_Command: {
+            const FunctionDeclaration* decl = this->symbolRef<FunctionDeclaration>(
+                                                                Symbol::Kind::kFunctionDeclaration);
+            // since we skip over builtin prototypes when dehydrating, we know that this
+            // builtin=false
+            return std::make_unique<FunctionPrototype>(/*line=*/-1, decl, /*builtin=*/false);
+        }
+        case Rehydrator::kGlobalVar_Command: {
+            std::unique_ptr<Statement> decl = this->statement();
+            return std::make_unique<GlobalVarDeclaration>(std::move(decl));
+        }
         case Rehydrator::kInterfaceBlock_Command: {
             const Symbol* var = this->symbol();
             SkASSERT(var && var->is<Variable>());
-            skstd::string_view typeName = this->readString();
-            skstd::string_view instanceName = this->readString();
-            int arraySize = this->readS8();
+            std::string_view typeName = this->readString();
+            std::string_view instanceName = this->readString();
+            int arraySize = this->readU8();
             return std::make_unique<InterfaceBlock>(/*line=*/-1, var->as<Variable>(), typeName,
                                                     instanceName, arraySize, nullptr);
         }
-        case Rehydrator::kVarDeclarations_Command: {
-            std::unique_ptr<Statement> decl = this->statement();
-            return std::make_unique<GlobalVarDeclaration>(std::move(decl));
-        }
         case Rehydrator::kStructDefinition_Command: {
             const Symbol* type = this->symbol();
             SkASSERT(type && type->is<Type>());
             return std::make_unique<StructDefinition>(/*line=*/-1, type->as<Type>());
         }
+        case Rehydrator::kSharedFunction_Command: {
+            int count = this->readU8();
+            for (int i = 0; i < count; ++i) {
+                [[maybe_unused]] const Symbol* param = this->symbol();
+                SkASSERT(param->is<Variable>());
+            }
+            [[maybe_unused]] const Symbol* decl = this->symbol();
+            SkASSERT(decl->is<FunctionDeclaration>());
+            std::unique_ptr<ProgramElement> result = this->element();
+            SkASSERT(result->is<FunctionDefinition>());
+            return result;
+        }
         case Rehydrator::kElementsComplete_Command:
             return nullptr;
         default:
@@ -330,31 +378,31 @@ std::unique_ptr<Statement> Rehydrator::statement() {
         case Rehydrator::kDo_Command: {
             std::unique_ptr<Statement> stmt = this->statement();
             std::unique_ptr<Expression> expr = this->expression();
-            return DoStatement::Make(fContext, std::move(stmt), std::move(expr));
+            return DoStatement::Make(this->context(), std::move(stmt), std::move(expr));
         }
         case Rehydrator::kExpressionStatement_Command: {
             std::unique_ptr<Expression> expr = this->expression();
-            return ExpressionStatement::Make(fContext, std::move(expr));
+            return ExpressionStatement::Make(this->context(), std::move(expr));
         }
         case Rehydrator::kFor_Command: {
+            AutoRehydratorSymbolTable symbols(this);
             std::unique_ptr<Statement> initializer = this->statement();
             std::unique_ptr<Expression> test = this->expression();
             std::unique_ptr<Expression> next = this->expression();
             std::unique_ptr<Statement> body = this->statement();
-            std::shared_ptr<SymbolTable> symbols = this->symbolTable();
             std::unique_ptr<LoopUnrollInfo> unrollInfo =
                     Analysis::GetLoopUnrollInfo(/*line=*/-1, initializer.get(), test.get(),
                                                 next.get(), body.get(), /*errors=*/nullptr);
-            return ForStatement::Make(fContext, /*line=*/-1, std::move(initializer),
+            return ForStatement::Make(this->context(), /*line=*/-1, std::move(initializer),
                                       std::move(test), std::move(next), std::move(body),
-                                      std::move(unrollInfo), std::move(symbols));
+                                      std::move(unrollInfo), fSymbolTable);
         }
         case Rehydrator::kIf_Command: {
             bool isStatic = this->readU8();
             std::unique_ptr<Expression> test = this->expression();
             std::unique_ptr<Statement> ifTrue = this->statement();
             std::unique_ptr<Statement> ifFalse = this->statement();
-            return IfStatement::Make(fContext, /*line=*/-1, isStatic, std::move(test),
+            return IfStatement::Make(this->context(), /*line=*/-1, isStatic, std::move(test),
                                      std::move(ifTrue), std::move(ifFalse));
         }
         case Rehydrator::kInlineMarker_Command: {
@@ -362,6 +410,8 @@ std::unique_ptr<Statement> Rehydrator::statement() {
                                                           Symbol::Kind::kFunctionDeclaration);
             return InlineMarker::Make(funcDecl);
         }
+        case Rehydrator::kNop_Command:
+            return std::make_unique<SkSL::Nop>();
         case Rehydrator::kReturn_Command: {
             std::unique_ptr<Expression> expr = this->expression();
             return ReturnStatement::Make(/*line=*/-1, std::move(expr));
@@ -374,20 +424,27 @@ std::unique_ptr<Statement> Rehydrator::statement() {
             StatementArray cases;
             cases.reserve_back(caseCount);
             for (int i = 0; i < caseCount; ++i) {
-                std::unique_ptr<Expression> value = this->expression();
-                std::unique_ptr<Statement> statement = this->statement();
-                cases.push_back(std::make_unique<SwitchCase>(/*line=*/-1, std::move(value),
-                                                             std::move(statement)));
+                bool isDefault = this->readU8();
+                if (isDefault) {
+                    std::unique_ptr<Statement> statement = this->statement();
+                    cases.push_back(SwitchCase::MakeDefault(/*line=*/-1, std::move(statement)));
+                } else {
+                    SKSL_INT value = this->readS32();
+                    std::unique_ptr<Statement> statement = this->statement();
+                    cases.push_back(SwitchCase::Make(/*line=*/-1, std::move(value),
+                            std::move(statement)));
+                }
             }
-            return SwitchStatement::Make(fContext, /*line=*/-1, isStatic, std::move(expr),
+            return SwitchStatement::Make(this->context(), /*line=*/-1, isStatic, std::move(expr),
                                          std::move(cases), fSymbolTable);
         }
         case Rehydrator::kVarDeclaration_Command: {
             Variable* var = this->symbolRef<Variable>(Symbol::Kind::kVariable);
             const Type* baseType = this->type();
-            int arraySize = this->readS8();
+            int arraySize = this->readU8();
             std::unique_ptr<Expression> value = this->expression();
-            return VarDeclaration::Make(fContext, var, baseType, arraySize, std::move(value));
+            return VarDeclaration::Make(this->context(), var, baseType, arraySize,
+                    std::move(value));
         }
         case Rehydrator::kVoid_Command:
             return nullptr;
@@ -415,62 +472,66 @@ std::unique_ptr<Expression> Rehydrator::expression() {
             std::unique_ptr<Expression> left = this->expression();
             Token::Kind op = (Token::Kind) this->readU8();
             std::unique_ptr<Expression> right = this->expression();
-            return BinaryExpression::Make(fContext, std::move(left), op, std::move(right));
+            return BinaryExpression::Make(this->context(), std::move(left), op, std::move(right));
         }
         case Rehydrator::kBoolLiteral_Command: {
             bool value = this->readU8();
-            return Literal::MakeBool(fContext, /*line=*/-1, value);
+            return Literal::MakeBool(this->context(), /*line=*/-1, value);
         }
         case Rehydrator::kConstructorArray_Command: {
             const Type* type = this->type();
-            return ConstructorArray::Make(fContext, /*line=*/-1, *type, this->expressionArray());
+            return ConstructorArray::Make(this->context(), /*line=*/-1, *type,
+                    this->expressionArray());
         }
         case Rehydrator::kConstructorCompound_Command: {
             const Type* type = this->type();
-            return ConstructorCompound::Make(fContext, /*line=*/-1, *type,
+            return ConstructorCompound::Make(this->context(), /*line=*/-1, *type,
                                               this->expressionArray());
         }
         case Rehydrator::kConstructorDiagonalMatrix_Command: {
             const Type* type = this->type();
             ExpressionArray args = this->expressionArray();
             SkASSERT(args.size() == 1);
-            return ConstructorDiagonalMatrix::Make(fContext, /*line=*/-1, *type,
+            return ConstructorDiagonalMatrix::Make(this->context(), /*line=*/-1, *type,
                                                    std::move(args[0]));
         }
         case Rehydrator::kConstructorMatrixResize_Command: {
             const Type* type = this->type();
             ExpressionArray args = this->expressionArray();
             SkASSERT(args.size() == 1);
-            return ConstructorMatrixResize::Make(fContext, /*line=*/-1, *type,
+            return ConstructorMatrixResize::Make(this->context(), /*line=*/-1, *type,
                                                  std::move(args[0]));
         }
         case Rehydrator::kConstructorScalarCast_Command: {
             const Type* type = this->type();
             ExpressionArray args = this->expressionArray();
             SkASSERT(args.size() == 1);
-            return ConstructorScalarCast::Make(fContext, /*line=*/-1, *type, std::move(args[0]));
+            return ConstructorScalarCast::Make(this->context(), /*line=*/-1, *type,
+                    std::move(args[0]));
         }
         case Rehydrator::kConstructorSplat_Command: {
             const Type* type = this->type();
             ExpressionArray args = this->expressionArray();
             SkASSERT(args.size() == 1);
-            return ConstructorSplat::Make(fContext, /*line=*/-1, *type, std::move(args[0]));
+            return ConstructorSplat::Make(this->context(), /*line=*/-1, *type, std::move(args[0]));
         }
         case Rehydrator::kConstructorStruct_Command: {
             const Type* type = this->type();
-            return ConstructorStruct::Make(fContext, /*line=*/-1, *type, this->expressionArray());
+            return ConstructorStruct::Make(this->context(), /*line=*/-1, *type,
+                    this->expressionArray());
         }
         case Rehydrator::kConstructorCompoundCast_Command: {
             const Type* type = this->type();
             ExpressionArray args = this->expressionArray();
             SkASSERT(args.size() == 1);
-            return ConstructorCompoundCast::Make(fContext,/*line=*/-1, *type, std::move(args[0]));
+            return ConstructorCompoundCast::Make(this->context(),/*line=*/-1, *type,
+                    std::move(args[0]));
         }
         case Rehydrator::kFieldAccess_Command: {
             std::unique_ptr<Expression> base = this->expression();
             int index = this->readU8();
             FieldAccess::OwnerKind ownerKind = (FieldAccess::OwnerKind) this->readU8();
-            return FieldAccess::Make(fContext, std::move(base), index, ownerKind);
+            return FieldAccess::Make(this->context(), std::move(base), index, ownerKind);
         }
         case Rehydrator::kFloatLiteral_Command: {
             const Type* type = this->type();
@@ -481,15 +542,26 @@ std::unique_ptr<Expression> Rehydrator::expression() {
         }
         case Rehydrator::kFunctionCall_Command: {
             const Type* type = this->type();
-            const FunctionDeclaration* f = this->symbolRef<FunctionDeclaration>(
-                                                                Symbol::Kind::kFunctionDeclaration);
+            const Symbol* symbol = this->possiblyBuiltinSymbolRef();
             ExpressionArray args = this->expressionArray();
-            return FunctionCall::Make(fContext, /*line=*/-1, type, *f, std::move(args));
+            const FunctionDeclaration* f;
+            if (symbol->is<FunctionDeclaration>()) {
+                f = &symbol->as<FunctionDeclaration>();
+            } else if (symbol->is<UnresolvedFunction>()) {
+                const UnresolvedFunction& unresolved = symbol->as<UnresolvedFunction>();
+                f = FunctionCall::FindBestFunctionForCall(this->context(), unresolved.functions(),
+                        args);
+                SkASSERT(f);
+            } else {
+                SkASSERT(false);
+                return nullptr;
+            }
+            return FunctionCall::Make(this->context(), /*line=*/-1, type, *f, std::move(args));
         }
         case Rehydrator::kIndex_Command: {
             std::unique_ptr<Expression> base = this->expression();
             std::unique_ptr<Expression> index = this->expression();
-            return IndexExpression::Make(fContext, std::move(base), std::move(index));
+            return IndexExpression::Make(this->context(), std::move(base), std::move(index));
         }
         case Rehydrator::kIntLiteral_Command: {
             const Type* type = this->type();
@@ -499,16 +571,16 @@ std::unique_ptr<Expression> Rehydrator::expression() {
         case Rehydrator::kPostfix_Command: {
             Token::Kind op = (Token::Kind) this->readU8();
             std::unique_ptr<Expression> operand = this->expression();
-            return PostfixExpression::Make(fContext, std::move(operand), op);
+            return PostfixExpression::Make(this->context(), std::move(operand), op);
         }
         case Rehydrator::kPrefix_Command: {
             Token::Kind op = (Token::Kind) this->readU8();
             std::unique_ptr<Expression> operand = this->expression();
-            return PrefixExpression::Make(fContext, op, std::move(operand));
+            return PrefixExpression::Make(this->context(), op, std::move(operand));
         }
         case Rehydrator::kSetting_Command: {
-            String name(this->readString());
-            return Setting::Convert(fContext, /*line=*/-1, name);
+            std::string name(this->readString());
+            return Setting::Convert(this->context(), /*line=*/-1, name);
         }
         case Rehydrator::kSwizzle_Command: {
             std::unique_ptr<Expression> base = this->expression();
@@ -517,13 +589,13 @@ std::unique_ptr<Expression> Rehydrator::expression() {
             for (int i = 0; i < count; ++i) {
                 components.push_back(this->readU8());
             }
-            return Swizzle::Make(fContext, std::move(base), components);
+            return Swizzle::Make(this->context(), std::move(base), components);
         }
         case Rehydrator::kTernary_Command: {
             std::unique_ptr<Expression> test = this->expression();
             std::unique_ptr<Expression> ifTrue = this->expression();
             std::unique_ptr<Expression> ifFalse = this->expression();
-            return TernaryExpression::Make(fContext, std::move(test),
+            return TernaryExpression::Make(this->context(), std::move(test),
                                            std::move(ifTrue), std::move(ifFalse));
         }
         case Rehydrator::kVariableReference_Command: {
@@ -540,32 +612,39 @@ std::unique_ptr<Expression> Rehydrator::expression() {
     }
 }
 
-std::shared_ptr<SymbolTable> Rehydrator::symbolTable(bool inherit) {
+std::shared_ptr<SymbolTable> Rehydrator::symbolTable() {
     int command = this->readU8();
     if (command == kVoid_Command) {
         return nullptr;
     }
     SkASSERT(command == kSymbolTable_Command);
+    bool builtin = this->readU8();
     uint16_t ownedCount = this->readU16();
-    std::shared_ptr<SymbolTable> oldTable = fSymbolTable;
-    std::shared_ptr<SymbolTable> result =
-            inherit ? std::make_shared<SymbolTable>(fSymbolTable, /*builtin=*/true)
-                    : std::make_shared<SymbolTable>(fContext, /*builtin=*/true);
-    fSymbolTable = result;
+    fSymbolTable = std::make_shared<SymbolTable>(std::move(fSymbolTable), builtin);
     std::vector<const Symbol*> ownedSymbols;
     ownedSymbols.reserve(ownedCount);
     for (int i = 0; i < ownedCount; ++i) {
         ownedSymbols.push_back(this->symbol());
     }
     uint16_t symbolCount = this->readU16();
-    std::vector<std::pair<skstd::string_view, int>> symbols;
+    std::vector<std::pair<std::string_view, int>> symbols;
     symbols.reserve(symbolCount);
     for (int i = 0; i < symbolCount; ++i) {
         int index = this->readU16();
-        fSymbolTable->addWithoutOwnership(ownedSymbols[index]);
+        if (index != kBuiltin_Symbol) {
+            fSymbolTable->addWithoutOwnership(ownedSymbols[index]);
+        } else {
+            std::string_view name = this->readString();
+            SymbolTable* root = fSymbolTable.get();
+            while (root->fParent) {
+                root = root->fParent.get();
+            }
+            const Symbol* s = (*root)[name];
+            SkASSERT(s);
+            fSymbolTable->addWithoutOwnership(s);
+        }
     }
-    fSymbolTable = oldTable;
-    return result;
+    return fSymbolTable;
 }
 
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLRehydrator.h b/third_party/skia/src/sksl/SkSLRehydrator.h
index ae44a8f8eb489..45eca09845905 100644
--- a/third_party/skia/src/sksl/SkSLRehydrator.h
+++ b/third_party/skia/src/sksl/SkSLRehydrator.h
@@ -12,11 +12,13 @@
 #include "include/private/SkSLModifiers.h"
 #include "include/private/SkSLSymbol.h"
 #include "src/sksl/SkSLContext.h"
+#include "src/sksl/ir/SkSLProgram.h"
 
 #include <vector>
 
 namespace SkSL {
 
+class Compiler;
 class Context;
 class ErrorReporter;
 class Expression;
@@ -32,19 +34,16 @@ class Type;
  */
 class Rehydrator {
 public:
+    static constexpr uint16_t kVersion = 8;
+
+    // see binary_format.md for a description of the command data
     enum Command {
-        // uint16 id, Type componentType, uint8 count
         kArrayType_Command,
-        // Expression left, uint8 op, Expression right, Type type
         kBinary_Command,
-        // SymbolTable symbolTable, uint8 statementCount, Statement[] statements, bool isScope
         kBlock_Command,
-        // bool value
         kBoolLiteral_Command,
         kBreak_Command,
-        // int16 builtin
         kBuiltinLayout_Command,
-        // (All constructors) Type type, uint8 argCount, Expression[] arguments
         kConstructorArray_Command,
         kConstructorArrayCast_Command,
         kConstructorCompound_Command,
@@ -58,97 +57,70 @@ class Rehydrator {
         kDefaultLayout_Command,
         kDefaultModifiers_Command,
         kDiscard_Command,
-        // Statement stmt, Expression test
         kDo_Command,
-        // ProgramElement[] elements (reads until command `kElementsComplete_Command` is found)
         kElements_Command,
-        // no arguments--indicates end of Elements list
         kElementsComplete_Command,
-        // Expression expression
         kExpressionStatement_Command,
-        // uint16 ownerId, uint8 index
         kField_Command,
-        // Expression base, uint8 index, uint8 ownerKind
         kFieldAccess_Command,
-        // float value
         kFloatLiteral_Command,
-        // Statement initializer, Expression test, Expression next, Statement body,
-        // SymbolTable symbols
         kFor_Command,
-        // Type type, uint16 function, uint8 argCount, Expression[] arguments
         kFunctionCall_Command,
-        // uint16 declaration, Statement body, uint8 refCount
-        kFunctionDefinition_Command,
-        // uint16 id, Modifiers modifiers, String name, uint8 parameterCount, uint16[] parameterIds,
-        // Type returnType
         kFunctionDeclaration_Command,
-        // bool isStatic, Expression test, Statement ifTrue, Statement ifFalse
+        kFunctionDefinition_Command,
+        kFunctionPrototype_Command,
+        kGlobalVar_Command,
         kIf_Command,
-        // Expression base, Expression index
         kIndex_Command,
-        // FunctionDeclaration function
         kInlineMarker_Command,
-        // Variable* var, String typeName, String instanceName, uint8 sizeCount, Expression[] sizes
         kInterfaceBlock_Command,
-        // int32 value
         kIntLiteral_Command,
-        // int32 flags, int8 location, int8 offset, int8 binding, int8 index, int8 set,
-        // int16 builtin, int8 inputAttachmentIndex
         kLayout_Command,
-        // Layout layout, uint8 flags
         kModifiers8Bit_Command,
-        // Layout layout, uint32 flags
         kModifiers_Command,
-        // uint8 op, Expression operand
+        kNop_Command,
         kPostfix_Command,
-        // uint8 op, Expression operand
         kPrefix_Command,
-        // Expression value
+        kProgram_Command,
         kReturn_Command,
-        // String name, Expression value
         kSetting_Command,
-        // uint16 id, Type structType
+        kSharedFunction_Command,
         kStructDefinition_Command,
-        // uint16 id, String name, uint8 fieldCount, (Modifiers, String, Type)[] fields
         kStructType_Command,
-        // bool isStatic, SymbolTable symbols, Expression value, uint8 caseCount,
-        // (Expression value, uint8 statementCount, Statement[] statements)[] cases
         kSwitch_Command,
-        // Expression base, uint8 componentCount, uint8[] components
         kSwizzle_Command,
-        // uint16 id
         kSymbolRef_Command,
-        // String name, uint16 origSymbolId
-        kSymbolAlias_Command,
-        // uint16 owned symbol count, Symbol[] ownedSymbols, uint16 symbol count,
-        // (String, uint16/*index*/)[].
         kSymbolTable_Command,
-        // uint16 id, String name
-        kSystemType_Command,
-        // Expression test, Expression ifTrue, Expression ifFalse
         kTernary_Command,
-        // uint16 id, FunctionDeclaration[] functions
         kUnresolvedFunction_Command,
-        // uint16 id, Modifiers modifiers, String name, Type type, uint8 storage
         kVariable_Command,
-        // uint16 varId, uint8 sizeCount, Expression[] sizes, Expression? value
         kVarDeclaration_Command,
-        // Type baseType, uint8 varCount, VarDeclaration vars
-        kVarDeclarations_Command,
-        // uint16 varId, uint8 refKind
         kVariableReference_Command,
         kVoid_Command,
     };
 
     // src must remain in memory as long as the objects created from it do
-    Rehydrator(const Context* context, std::shared_ptr<SymbolTable> symbolTable,
-               const uint8_t* src, size_t length);
+    Rehydrator(Compiler& compiler, const uint8_t* src, size_t length,
+            std::shared_ptr<SymbolTable> base = nullptr);
+
+#ifdef SK_DEBUG
+    ~Rehydrator();
+#endif
+
+    // Reads a symbol table and makes it current (inheriting from the previous current table)
+    std::shared_ptr<SymbolTable> symbolTable();
 
+    // Reads a collection of program elements and returns it
     std::vector<std::unique_ptr<ProgramElement>> elements();
 
-    std::shared_ptr<SymbolTable> symbolTable(bool inherit = true);
+    // Reads an entire program.
+    std::unique_ptr<Program> program();
 
 private:
+    // If this ID appears in place of a symbol ID, it means the corresponding symbol isn't actually
+    // present in the file as it's a builtin. The string name of the symbol follows.
+    static constexpr uint16_t kBuiltin_Symbol = 65535;
+
     int8_t readS8() {
         SkASSERT(fIP < fEnd);
         return *(fIP++);
@@ -180,11 +152,11 @@ class Rehydrator {
         return this->readS32();
     }
 
-    skstd::string_view readString() {
+    std::string_view readString() {
         uint16_t offset = this->readU16();
-        uint8_t length = *(uint8_t*) (fStart + offset);
-        const char* chars = (const char*) fStart + offset + 1;
-        return skstd::string_view(chars, length);
+        uint8_t length = *(uint8_t*) (fStringStart + offset);
+        const char* chars = (const char*) fStringStart + offset + 1;
+        return std::string_view(chars, length);
     }
 
     void addSymbol(int id, const Symbol* symbol) {
@@ -201,6 +173,24 @@ class Rehydrator {
         return (T*) fSymbols[result];
     }
 
+    /**
+     * Reads either a symbol belonging to this program, or a named reference to a builtin symbol.
+     * This has to be a separate method from symbolRef() because builtin symbols can be const, and
+     * thus this method must have a const return, but there is at least one case in which we
+     * specifically require a non-const return value.
+     */
+    const Symbol* possiblyBuiltinSymbolRef() {
+        uint16_t id = this->readU16();
+        if (id == kBuiltin_Symbol) {
+            std::string_view name = this->readString();
+            const Symbol* result = (*fSymbolTable)[name];
+            SkASSERTF(result, "symbol '%s' not found", std::string(name).c_str());
+            return result;
+        }
+        SkASSERT(fSymbols.size() > id);
+        return fSymbols[id];
+    }
+
     Layout layout();
 
     Modifiers modifiers();
@@ -217,19 +207,22 @@ class Rehydrator {
 
     const Type* type();
 
-    ErrorReporter* errorReporter() { return fContext.fErrors; }
+    Context& context() const;
+
+    ErrorReporter* errorReporter() const { return this->context().fErrors; }
 
-    ModifiersPool& modifiersPool() const { return *fContext.fModifiersPool; }
+    ModifiersPool& modifiersPool() const { return *this->context().fModifiersPool; }
 
-    const Context& fContext;
+    Compiler& fCompiler;
     std::shared_ptr<SymbolTable> fSymbolTable;
     std::vector<const Symbol*> fSymbols;
 
-    const uint8_t* fStart;
+    const uint8_t* fStringStart;
     const uint8_t* fIP;
     SkDEBUGCODE(const uint8_t* fEnd;)
 
     friend class AutoRehydratorSymbolTable;
+    friend class Dehydrator;
 };
 
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/SkSLSharedCompiler.cpp b/third_party/skia/src/sksl/SkSLSharedCompiler.cpp
index b27e0bf2eaced..f6226ca37cae7 100644
--- a/third_party/skia/src/sksl/SkSLSharedCompiler.cpp
+++ b/third_party/skia/src/sksl/SkSLSharedCompiler.cpp
@@ -13,7 +13,7 @@ namespace SkSL {
 struct SharedCompiler::Impl {
     Impl() {
         // These caps are configured to apply *no* workarounds. This avoids changes that are
-        // unnecessary (GLSL intrinsic rewrites), or possibly incorrect (adding do-while loops).
+        // unnecessary (GLSL intrinsic rewrites), or possibly even incorrect.
         // We may apply other "neutral" transformations to the user's SkSL, including inlining.
         // Anything determined by the device caps is deferred to the GPU backend. The processor
         // set produces the final program (including our re-emitted SkSL), and the backend's
@@ -21,8 +21,6 @@ struct SharedCompiler::Impl {
         fCaps = ShaderCapsFactory::Standalone();
         fCaps->fBuiltinFMASupport = true;
         fCaps->fBuiltinDeterminantSupport = true;
-        // Don't inline if it would require a do loop, some devices don't support them.
-        fCaps->fCanUseDoLoops = false;
 
         // SkSL created by the GPU backend is typically parsed, converted to a backend format,
         // and the IR is immediately discarded. In that situation, it makes sense to use node
diff --git a/third_party/skia/src/sksl/SkSLString.cpp b/third_party/skia/src/sksl/SkSLString.cpp
index 07d1d542965d4..39d55ad9d021a 100644
--- a/third_party/skia/src/sksl/SkSLString.cpp
+++ b/third_party/skia/src/sksl/SkSLString.cpp
@@ -9,6 +9,7 @@
 #include "src/sksl/SkSLUtil.h"
 #include <algorithm>
 #include <cinttypes>
+#include <cmath>
 #include <errno.h>
 #include <limits.h>
 #include <locale>
@@ -18,117 +19,11 @@
 
 #include "base/strings/string_number_conversions.h"
 
-namespace SkSL {
-
-String String::printf(const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    String result;
-    result.vappendf(fmt, args);
-    va_end(args);
-    return result;
-}
-
-void String::appendf(const char* fmt, ...) {
-    va_list args;
-    va_start(args, fmt);
-    this->vappendf(fmt, args);
-    va_end(args);
-}
-
-void String::vappendf(const char* fmt, va_list args) {
-    #define BUFFER_SIZE 256
-    char buffer[BUFFER_SIZE];
-    va_list reuse;
-    va_copy(reuse, args);
-    size_t size = vsnprintf(buffer, BUFFER_SIZE, fmt, args);
-    if (BUFFER_SIZE >= size + 1) {
-        this->append(buffer, size);
-    } else {
-        auto newBuffer = std::unique_ptr<char[]>(new char[size + 1]);
-        vsnprintf(newBuffer.get(), size + 1, fmt, reuse);
-        this->append(newBuffer.get(), size);
-    }
-    va_end(reuse);
-}
-
-bool String::consumeSuffix(const char suffix[]) {
-    size_t suffixLength = strlen(suffix);
-    if (this->length() < suffixLength) {
-        return false;
-    }
-    if (0 != strncmp(this->data() + this->size() - suffixLength, suffix, suffixLength)) {
-        return false;
-    }
-    this->resize(this->length() - suffixLength);
-    return true;
-}
-
-String String::operator+(const char* s) const {
-    String result(*this);
-    result.append(s);
-    return result;
-}
-
-String String::operator+(const String& s) const {
-    String result(*this);
-    result.append(s);
-    return result;
-}
-
-String String::operator+(skstd::string_view s) const {
-    String result(*this);
-    result.append(s.data(), s.length());
-    return result;
-}
-
-String& String::operator+=(char c) {
-    INHERITED::operator+=(c);
-    return *this;
-}
-
-String& String::operator+=(const char* s) {
-    INHERITED::operator+=(s);
-    return *this;
-}
-
-String& String::operator+=(const String& s) {
-    INHERITED::operator+=(s);
-    return *this;
+std::string skstd::to_string(float value) {
+    return skstd::to_string((double)value);
 }
 
-String& String::operator+=(skstd::string_view s) {
-    this->append(s.data(), s.length());
-    return *this;
-}
-
-String operator+(const char* s1, const String& s2) {
-    String result(s1);
-    result.append(s2);
-    return result;
-}
-
-String operator+(skstd::string_view left, skstd::string_view right) {
-    return String(left) + right;
-}
-
-String to_string(int32_t value) {
-    return SkSL::String(std::to_string(value));
-}
-
-String to_string(uint32_t value) {
-    return SkSL::String(std::to_string(value));
-}
-
-String to_string(int64_t value) {
-    return SkSL::String(std::to_string(value));
-}
-
-String to_string(uint64_t value) {
-    return SkSL::String(std::to_string(value));
-}
-
-String to_string(double value) {
+std::string skstd::to_string(double value) {
 #if defined(STARBOARD)
     std::string s = base::NumberToString(value);
     bool needsDotZero = true;
@@ -145,7 +40,7 @@ String to_string(double value) {
     if (s.size() > 0 && s[0] == '.') {
       s = "0" + s;
     }
-    return String(s.c_str());
+    return std::string(s.c_str());
 #else
     std::stringstream buffer;
     buffer.imbue(std::locale::classic());
@@ -163,19 +58,19 @@ String to_string(double value) {
     if (needsDotZero) {
         buffer << ".0";
     }
-    return String(buffer.str().c_str());
+    return buffer.str();
 #endif
 }
 
-bool stod(skstd::string_view s, SKSL_FLOAT* value) {
+bool SkSL::stod(std::string_view s, SKSL_FLOAT* value) {
     std::string str(s.data(), s.size());
     std::stringstream buffer(str);
     buffer.imbue(std::locale::classic());
     buffer >> *value;
-    return !buffer.fail();
+    return !buffer.fail() && std::isfinite(*value);
 }
 
-bool stoi(skstd::string_view s, SKSL_INT* value) {
+bool SkSL::stoi(std::string_view s, SKSL_INT* value) {
     if (s.empty()) {
         return false;
     }
@@ -183,11 +78,43 @@ bool stoi(skstd::string_view s, SKSL_INT* value) {
     if (suffix == 'u' || suffix == 'U') {
         s.remove_suffix(1);
     }
+    std::string str(s);  // s is not null-terminated
+    const char* strEnd = str.data() + str.length();
     char* p;
     errno = 0;
-    unsigned long long result = strtoull(s.begin(), &p, /*base=*/0);
+    unsigned long long result = strtoull(str.data(), &p, /*base=*/0);
     *value = static_cast<SKSL_INT>(result);
-    return p == s.end() && errno == 0 && result <= 0xFFFFFFFF;
+    return p == strEnd && errno == 0 && result <= 0xFFFFFFFF;
 }
 
-}  // namespace SkSL
+std::string SkSL::String::printf(const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    std::string result;
+    vappendf(&result, fmt, args);
+    va_end(args);
+    return result;
+}
+
+void SkSL::String::appendf(std::string *str, const char* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    vappendf(str, fmt, args);
+    va_end(args);
+}
+
+void SkSL::String::vappendf(std::string *str, const char* fmt, va_list args) {
+    #define BUFFER_SIZE 256
+    char buffer[BUFFER_SIZE];
+    va_list reuse;
+    va_copy(reuse, args);
+    size_t size = vsnprintf(buffer, BUFFER_SIZE, fmt, args);
+    if (BUFFER_SIZE >= size + 1) {
+        str->append(buffer, size);
+    } else {
+        auto newBuffer = std::unique_ptr<char[]>(new char[size + 1]);
+        vsnprintf(newBuffer.get(), size + 1, fmt, reuse);
+        str->append(newBuffer.get(), size);
+    }
+    va_end(reuse);
+}
diff --git a/third_party/skia/src/sksl/SkSLStringStream.h b/third_party/skia/src/sksl/SkSLStringStream.h
index c4071c3a5cf6a..aabda3894e484 100644
--- a/third_party/skia/src/sksl/SkSLStringStream.h
+++ b/third_party/skia/src/sksl/SkSLStringStream.h
@@ -8,61 +8,26 @@
 #ifndef SKSL_STRINGSTREAM
 #define SKSL_STRINGSTREAM
 
-#include "include/private/SkSLString.h"
-#include "src/sksl/SkSLOutputStream.h"
-
-#ifdef SKSL_STANDALONE
-
-namespace SkSL {
-
-class StringStream : public OutputStream {
-public:
-    void write8(uint8_t b) override {
-        fBuffer += (char) b;
-    }
-
-    void writeText(const char* s) override {
-        fBuffer += s;
-    }
-
-    void write(const void* s, size_t size) override {
-        fBuffer.append((const char*) s, size);
-    }
-
-    size_t bytesWritten() const {
-        return fBuffer.size();
-    }
-
-    const String& str() const {
-        return fBuffer;
-    }
-
-    void reset() {
-        fBuffer = "";
-    }
-
-private:
-    String fBuffer;
-};
-
-#else
-
 #include "include/core/SkData.h"
 #include "include/core/SkStream.h"
+#include "src/sksl/SkSLOutputStream.h"
 
 namespace SkSL {
 
 class StringStream : public OutputStream {
 public:
     void write8(uint8_t b) override {
+        SkASSERT(fString.empty());
         fStream.write8(b);
     }
 
     void writeText(const char* s) override {
+        SkASSERT(fString.empty());
         fStream.writeText(s);
     }
 
     void write(const void* s, size_t size) override {
+        SkASSERT(fString.empty());
         fStream.write(s, size);
     }
 
@@ -70,10 +35,10 @@ class StringStream : public OutputStream {
         return fStream.bytesWritten();
     }
 
-    const String& str() const {
+    const std::string& str() const {
         if (!fString.size()) {
             sk_sp<SkData> data = fStream.detachAsData();
-            fString = String((const char*) data->data(), data->size());
+            fString = std::string((const char*) data->data(), data->size());
         }
         return fString;
     }
@@ -85,11 +50,9 @@ class StringStream : public OutputStream {
 
 private:
     mutable SkDynamicMemoryWStream fStream;
-    mutable String fString;
+    mutable std::string fString;
 };
 
-#endif // SKSL_STANDALONE
-
 }  // namespace SkSL
 
 #endif
diff --git a/third_party/skia/src/sksl/SkSLThreadContext.cpp b/third_party/skia/src/sksl/SkSLThreadContext.cpp
index 85b466a1c1372..46e4583432f79 100644
--- a/third_party/skia/src/sksl/SkSLThreadContext.cpp
+++ b/third_party/skia/src/sksl/SkSLThreadContext.cpp
@@ -11,8 +11,8 @@
 #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #endif // !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
+#include "src/sksl/SkSLBuiltinMap.h"
 #include "src/sksl/SkSLCompiler.h"
-#include "src/sksl/SkSLIntrinsicMap.h"
 #include "src/sksl/ir/SkSLExternalFunction.h"
 
 namespace SkSL {
@@ -41,9 +41,9 @@ ThreadContext::ThreadContext(SkSL::Compiler* compiler, SkSL::ProgramKind kind,
     fConfig->fIsBuiltinCode = isModule;
     fCompiler->fContext->fConfig = fConfig.get();
     fCompiler->fContext->fErrors = &fDefaultErrorReporter;
-    fCompiler->fContext->fIntrinsics = module.fIntrinsics.get();
-    if (fCompiler->fContext->fIntrinsics) {
-        fCompiler->fContext->fIntrinsics->resetAlreadyIncluded();
+    fCompiler->fContext->fBuiltins = module.fElements.get();
+    if (fCompiler->fContext->fBuiltins) {
+        fCompiler->fContext->fBuiltins->resetAlreadyIncluded();
     }
 
     fCompiler->fSymbolTable = module.fSymbols;
@@ -82,44 +82,44 @@ void ThreadContext::setupSymbolTable() {
     if (runtimeEffect && !context.fConfig->fSettings.fEnforceES2Restrictions) {
         // We're compiling a runtime effect, but we're not enforcing ES2 restrictions. Add various
         // non-ES2 types to our symbol table to allow them to be tested.
-        symbols.addAlias("mat2x2", context.fTypes.fFloat2x2.get());
-        symbols.addAlias("mat2x3", context.fTypes.fFloat2x3.get());
-        symbols.addAlias("mat2x4", context.fTypes.fFloat2x4.get());
-        symbols.addAlias("mat3x2", context.fTypes.fFloat3x2.get());
-        symbols.addAlias("mat3x3", context.fTypes.fFloat3x3.get());
-        symbols.addAlias("mat3x4", context.fTypes.fFloat3x4.get());
-        symbols.addAlias("mat4x2", context.fTypes.fFloat4x2.get());
-        symbols.addAlias("mat4x3", context.fTypes.fFloat4x3.get());
-        symbols.addAlias("mat4x4", context.fTypes.fFloat4x4.get());
-
-        symbols.addAlias("float2x3", context.fTypes.fFloat2x3.get());
-        symbols.addAlias("float2x4", context.fTypes.fFloat2x4.get());
-        symbols.addAlias("float3x2", context.fTypes.fFloat3x2.get());
-        symbols.addAlias("float3x4", context.fTypes.fFloat3x4.get());
-        symbols.addAlias("float4x2", context.fTypes.fFloat4x2.get());
-        symbols.addAlias("float4x3", context.fTypes.fFloat4x3.get());
-
-        symbols.addAlias("half2x3", context.fTypes.fHalf2x3.get());
-        symbols.addAlias("half2x4", context.fTypes.fHalf2x4.get());
-        symbols.addAlias("half3x2", context.fTypes.fHalf3x2.get());
-        symbols.addAlias("half3x4", context.fTypes.fHalf3x4.get());
-        symbols.addAlias("half4x2", context.fTypes.fHalf4x2.get());
-        symbols.addAlias("half4x3", context.fTypes.fHalf4x3.get());
-
-        symbols.addAlias("uint", context.fTypes.fUInt.get());
-        symbols.addAlias("uint2", context.fTypes.fUInt2.get());
-        symbols.addAlias("uint3", context.fTypes.fUInt3.get());
-        symbols.addAlias("uint4", context.fTypes.fUInt4.get());
-
-        symbols.addAlias("short", context.fTypes.fShort.get());
-        symbols.addAlias("short2", context.fTypes.fShort2.get());
-        symbols.addAlias("short3", context.fTypes.fShort3.get());
-        symbols.addAlias("short4", context.fTypes.fShort4.get());
-
-        symbols.addAlias("ushort", context.fTypes.fUShort.get());
-        symbols.addAlias("ushort2", context.fTypes.fUShort2.get());
-        symbols.addAlias("ushort3", context.fTypes.fUShort3.get());
-        symbols.addAlias("ushort4", context.fTypes.fUShort4.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat2x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat2x3.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat2x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat3x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat3x3.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat3x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat4x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat4x3.get());
+        symbols.addWithoutOwnership(context.fTypes.fMat4x4.get());
+
+        symbols.addWithoutOwnership(context.fTypes.fFloat2x3.get());
+        symbols.addWithoutOwnership(context.fTypes.fFloat2x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fFloat3x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fFloat3x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fFloat4x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fFloat4x3.get());
+
+        symbols.addWithoutOwnership(context.fTypes.fHalf2x3.get());
+        symbols.addWithoutOwnership(context.fTypes.fHalf2x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fHalf3x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fHalf3x4.get());
+        symbols.addWithoutOwnership(context.fTypes.fHalf4x2.get());
+        symbols.addWithoutOwnership(context.fTypes.fHalf4x3.get());
+
+        symbols.addWithoutOwnership(context.fTypes.fUInt.get());
+        symbols.addWithoutOwnership(context.fTypes.fUInt2.get());
+        symbols.addWithoutOwnership(context.fTypes.fUInt3.get());
+        symbols.addWithoutOwnership(context.fTypes.fUInt4.get());
+
+        symbols.addWithoutOwnership(context.fTypes.fShort.get());
+        symbols.addWithoutOwnership(context.fTypes.fShort2.get());
+        symbols.addWithoutOwnership(context.fTypes.fShort3.get());
+        symbols.addWithoutOwnership(context.fTypes.fShort4.get());
+
+        symbols.addWithoutOwnership(context.fTypes.fUShort.get());
+        symbols.addWithoutOwnership(context.fTypes.fUShort2.get());
+        symbols.addWithoutOwnership(context.fTypes.fUShort3.get());
+        symbols.addWithoutOwnership(context.fTypes.fUShort4.get());
     }
 }
 
@@ -127,7 +127,7 @@ SkSL::Context& ThreadContext::Context() {
     return Compiler().context();
 }
 
-SkSL::ProgramSettings& ThreadContext::Settings() {
+const SkSL::ProgramSettings& ThreadContext::Settings() {
     return Context().fConfig->fSettings;
 }
 
@@ -166,11 +166,11 @@ void ThreadContext::SetErrorReporter(ErrorReporter* errorReporter) {
     Context().fErrors = errorReporter;
 }
 
-void ThreadContext::ReportError(skstd::string_view msg, PositionInfo info) {
+void ThreadContext::ReportError(std::string_view msg, PositionInfo info) {
     GetErrorReporter().error(msg, info);
 }
 
-void ThreadContext::DefaultErrorReporter::handleError(skstd::string_view msg, PositionInfo pos) {
+void ThreadContext::DefaultErrorReporter::handleError(std::string_view msg, PositionInfo pos) {
     if (pos.line() > -1) {
         SK_ABORT("error: %s: %d: %.*sNo SkSL error reporter configured, treating this as a fatal "
                  "error\n", pos.file_name(), pos.line(), (int)msg.length(), msg.data());
diff --git a/third_party/skia/src/sksl/SkSLThreadContext.h b/third_party/skia/src/sksl/SkSLThreadContext.h
index a368c5df8adbb..ab238af1b405d 100644
--- a/third_party/skia/src/sksl/SkSLThreadContext.h
+++ b/third_party/skia/src/sksl/SkSLThreadContext.h
@@ -8,7 +8,6 @@
 #ifndef SKSL_THREADCONTEXT
 #define SKSL_THREADCONTEXT
 
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLModifiers.h"
 #include "src/sksl/SkSLMangler.h"
 #include "src/sksl/ir/SkSLProgram.h"
@@ -17,6 +16,7 @@
 #endif // !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
 #include <list>
 #include <stack>
+#include <string_view>
 
 namespace SkSL {
 
@@ -63,7 +63,7 @@ class ThreadContext {
     /**
      * Returns the Settings used by DSL operations in the current thread.
      */
-    static SkSL::ProgramSettings& Settings();
+    static const SkSL::ProgramSettings& Settings();
 
     /**
      * Returns the Program::Inputs used by the current thread.
@@ -99,7 +99,7 @@ class ThreadContext {
     /**
      * Returns the current ProgramConfig.
      */
-    static std::unique_ptr<ProgramConfig>& GetProgramConfig() { return Instance().fConfig; }
+    static const std::unique_ptr<ProgramConfig>& GetProgramConfig() { return Instance().fConfig; }
 
     static bool IsModule() { return GetProgramConfig()->fIsBuiltinCode; }
 
@@ -175,7 +175,7 @@ class ThreadContext {
      * Notifies the current ErrorReporter that an error has occurred. The default error handler
      * prints the message to stderr and aborts.
      */
-    static void ReportError(skstd::string_view msg, PositionInfo info = PositionInfo::Capture());
+    static void ReportError(std::string_view msg, PositionInfo info = PositionInfo::Capture());
 
     /**
      * Forwards any pending errors to the DSL ErrorReporter.
@@ -188,7 +188,7 @@ class ThreadContext {
 
 private:
     class DefaultErrorReporter : public ErrorReporter {
-        void handleError(skstd::string_view msg, PositionInfo pos) override;
+        void handleError(std::string_view msg, PositionInfo pos) override;
     };
 
     void setupSymbolTable();
diff --git a/third_party/skia/src/sksl/SkSLUtil.cpp b/third_party/skia/src/sksl/SkSLUtil.cpp
index 9db7f294a67eb..dce9b50d965b6 100644
--- a/third_party/skia/src/sksl/SkSLUtil.cpp
+++ b/third_party/skia/src/sksl/SkSLUtil.cpp
@@ -32,10 +32,6 @@ std::unique_ptr<ShaderCaps> ShaderCapsFactory::MakeShaderCaps() {
     standalone->fNoPerspectiveInterpolationSupport = true;
     standalone->fSampleMaskSupport = true;
     standalone->fExternalTextureSupport = true;
-    // we define canUseDoLoops to false in standalone so we don't use do loops while inlining
-    // in FP files (which would then, being baked in, end up being used even in contexts where
-    // do loops are not allowed)
-    standalone->fCanUseDoLoops = false;
     return standalone;
 }
 #else
@@ -49,45 +45,45 @@ void write_stringstream(const StringStream& s, OutputStream& out) {
 }
 
 #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
-bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType) {
+bool type_to_sksltype(const Context& context, const Type& type, SkSLType* outType) {
     // If a new GrSL type is added, this function will need to be updated.
-    static_assert(kGrSLTypeCount == 41);
+    static_assert(kSkSLTypeCount == 41);
 
-    if (type == *context.fTypes.fVoid    ) { *outType = kVoid_GrSLType;     return true; }
-    if (type == *context.fTypes.fBool    ) { *outType = kBool_GrSLType;     return true; }
-    if (type == *context.fTypes.fBool2   ) { *outType = kBool2_GrSLType;    return true; }
-    if (type == *context.fTypes.fBool3   ) { *outType = kBool3_GrSLType;    return true; }
-    if (type == *context.fTypes.fBool4   ) { *outType = kBool4_GrSLType;    return true; }
-    if (type == *context.fTypes.fShort   ) { *outType = kShort_GrSLType;    return true; }
-    if (type == *context.fTypes.fShort2  ) { *outType = kShort2_GrSLType;   return true; }
-    if (type == *context.fTypes.fShort3  ) { *outType = kShort3_GrSLType;   return true; }
-    if (type == *context.fTypes.fShort4  ) { *outType = kShort4_GrSLType;   return true; }
-    if (type == *context.fTypes.fUShort  ) { *outType = kUShort_GrSLType;   return true; }
-    if (type == *context.fTypes.fUShort2 ) { *outType = kUShort2_GrSLType;  return true; }
-    if (type == *context.fTypes.fUShort3 ) { *outType = kUShort3_GrSLType;  return true; }
-    if (type == *context.fTypes.fUShort4 ) { *outType = kUShort4_GrSLType;  return true; }
-    if (type == *context.fTypes.fFloat   ) { *outType = kFloat_GrSLType;    return true; }
-    if (type == *context.fTypes.fFloat2  ) { *outType = kFloat2_GrSLType;   return true; }
-    if (type == *context.fTypes.fFloat3  ) { *outType = kFloat3_GrSLType;   return true; }
-    if (type == *context.fTypes.fFloat4  ) { *outType = kFloat4_GrSLType;   return true; }
-    if (type == *context.fTypes.fFloat2x2) { *outType = kFloat2x2_GrSLType; return true; }
-    if (type == *context.fTypes.fFloat3x3) { *outType = kFloat3x3_GrSLType; return true; }
-    if (type == *context.fTypes.fFloat4x4) { *outType = kFloat4x4_GrSLType; return true; }
-    if (type == *context.fTypes.fHalf    ) { *outType = kHalf_GrSLType;     return true; }
-    if (type == *context.fTypes.fHalf2   ) { *outType = kHalf2_GrSLType;    return true; }
-    if (type == *context.fTypes.fHalf3   ) { *outType = kHalf3_GrSLType;    return true; }
-    if (type == *context.fTypes.fHalf4   ) { *outType = kHalf4_GrSLType;    return true; }
-    if (type == *context.fTypes.fHalf2x2 ) { *outType = kHalf2x2_GrSLType;  return true; }
-    if (type == *context.fTypes.fHalf3x3 ) { *outType = kHalf3x3_GrSLType;  return true; }
-    if (type == *context.fTypes.fHalf4x4 ) { *outType = kHalf4x4_GrSLType;  return true; }
-    if (type == *context.fTypes.fInt     ) { *outType = kInt_GrSLType;      return true; }
-    if (type == *context.fTypes.fInt2    ) { *outType = kInt2_GrSLType;     return true; }
-    if (type == *context.fTypes.fInt3    ) { *outType = kInt3_GrSLType;     return true; }
-    if (type == *context.fTypes.fInt4    ) { *outType = kInt4_GrSLType;     return true; }
-    if (type == *context.fTypes.fUInt    ) { *outType = kUInt_GrSLType;     return true; }
-    if (type == *context.fTypes.fUInt2   ) { *outType = kUInt2_GrSLType;    return true; }
-    if (type == *context.fTypes.fUInt3   ) { *outType = kUInt3_GrSLType;    return true; }
-    if (type == *context.fTypes.fUInt4   ) { *outType = kUInt4_GrSLType;    return true; }
+    if (type.matches(*context.fTypes.fVoid    )) { *outType = SkSLType::kVoid;     return true; }
+    if (type.matches(*context.fTypes.fBool    )) { *outType = SkSLType::kBool;     return true; }
+    if (type.matches(*context.fTypes.fBool2   )) { *outType = SkSLType::kBool2;    return true; }
+    if (type.matches(*context.fTypes.fBool3   )) { *outType = SkSLType::kBool3;    return true; }
+    if (type.matches(*context.fTypes.fBool4   )) { *outType = SkSLType::kBool4;    return true; }
+    if (type.matches(*context.fTypes.fShort   )) { *outType = SkSLType::kShort;    return true; }
+    if (type.matches(*context.fTypes.fShort2  )) { *outType = SkSLType::kShort2;   return true; }
+    if (type.matches(*context.fTypes.fShort3  )) { *outType = SkSLType::kShort3;   return true; }
+    if (type.matches(*context.fTypes.fShort4  )) { *outType = SkSLType::kShort4;   return true; }
+    if (type.matches(*context.fTypes.fUShort  )) { *outType = SkSLType::kUShort;   return true; }
+    if (type.matches(*context.fTypes.fUShort2 )) { *outType = SkSLType::kUShort2;  return true; }
+    if (type.matches(*context.fTypes.fUShort3 )) { *outType = SkSLType::kUShort3;  return true; }
+    if (type.matches(*context.fTypes.fUShort4 )) { *outType = SkSLType::kUShort4;  return true; }
+    if (type.matches(*context.fTypes.fFloat   )) { *outType = SkSLType::kFloat;    return true; }
+    if (type.matches(*context.fTypes.fFloat2  )) { *outType = SkSLType::kFloat2;   return true; }
+    if (type.matches(*context.fTypes.fFloat3  )) { *outType = SkSLType::kFloat3;   return true; }
+    if (type.matches(*context.fTypes.fFloat4  )) { *outType = SkSLType::kFloat4;   return true; }
+    if (type.matches(*context.fTypes.fFloat2x2)) { *outType = SkSLType::kFloat2x2; return true; }
+    if (type.matches(*context.fTypes.fFloat3x3)) { *outType = SkSLType::kFloat3x3; return true; }
+    if (type.matches(*context.fTypes.fFloat4x4)) { *outType = SkSLType::kFloat4x4; return true; }
+    if (type.matches(*context.fTypes.fHalf    )) { *outType = SkSLType::kHalf;     return true; }
+    if (type.matches(*context.fTypes.fHalf2   )) { *outType = SkSLType::kHalf2;    return true; }
+    if (type.matches(*context.fTypes.fHalf3   )) { *outType = SkSLType::kHalf3;    return true; }
+    if (type.matches(*context.fTypes.fHalf4   )) { *outType = SkSLType::kHalf4;    return true; }
+    if (type.matches(*context.fTypes.fHalf2x2 )) { *outType = SkSLType::kHalf2x2;  return true; }
+    if (type.matches(*context.fTypes.fHalf3x3 )) { *outType = SkSLType::kHalf3x3;  return true; }
+    if (type.matches(*context.fTypes.fHalf4x4 )) { *outType = SkSLType::kHalf4x4;  return true; }
+    if (type.matches(*context.fTypes.fInt     )) { *outType = SkSLType::kInt;      return true; }
+    if (type.matches(*context.fTypes.fInt2    )) { *outType = SkSLType::kInt2;     return true; }
+    if (type.matches(*context.fTypes.fInt3    )) { *outType = SkSLType::kInt3;     return true; }
+    if (type.matches(*context.fTypes.fInt4    )) { *outType = SkSLType::kInt4;     return true; }
+    if (type.matches(*context.fTypes.fUInt    )) { *outType = SkSLType::kUInt;     return true; }
+    if (type.matches(*context.fTypes.fUInt2   )) { *outType = SkSLType::kUInt2;    return true; }
+    if (type.matches(*context.fTypes.fUInt3   )) { *outType = SkSLType::kUInt3;    return true; }
+    if (type.matches(*context.fTypes.fUInt4   )) { *outType = SkSLType::kUInt4;    return true; }
     return false;
 }
 #endif
diff --git a/third_party/skia/src/sksl/SkSLUtil.h b/third_party/skia/src/sksl/SkSLUtil.h
index beef4b900e1e8..f8204ea71c7c0 100644
--- a/third_party/skia/src/sksl/SkSLUtil.h
+++ b/third_party/skia/src/sksl/SkSLUtil.h
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "include/private/SkSLDefines.h"
+#include "src/core/SkSLTypeShared.h"
 #include "src/sksl/SkSLGLSL.h"
 #include "src/sksl/SkSLLexer.h"
 
@@ -162,10 +163,6 @@ struct ShaderCaps {
     // Rewrites matrix equality comparisons to avoid an Adreno driver bug. (skia:11308)
     bool rewriteMatrixComparisons() const { return fRewriteMatrixComparisons; }
 
-    // ANGLE disallows do loops altogether, and we're seeing crashes on Tegra3 with do loops in at
-    // least some cases.
-    bool canUseDoLoops() const { return fCanUseDoLoops; }
-
     // By default, SkSL pools IR nodes per-program. To debug memory corruption, it is sometimes
     // helpful to disable that feature.
     bool useNodePools() const { return fUseNodePools; }
@@ -233,7 +230,6 @@ struct ShaderCaps {
     bool fNoDefaultPrecisionForExternalSamplers = false;
     bool fRewriteMatrixVectorMultiply = false;
     bool fRewriteMatrixComparisons = false;
-    bool fCanUseDoLoops = true;
 
     // This controls behavior of the SkSL compiler, not the code we generate
     bool fUseNodePools = true;
@@ -256,7 +252,6 @@ class ShaderCapsFactory {
         result->fVersionDeclString = "#version 400";
         result->fShaderDerivativeSupport = true;
         result->fBuiltinDeterminantSupport = true;
-        result->fCanUseDoLoops = true;
         return result;
     }
 
@@ -416,7 +411,7 @@ class ShaderCapsFactory {
 };
 
 #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
-bool type_to_grsltype(const Context& context, const Type& type, GrSLType* outType);
+bool type_to_sksltype(const Context& context, const Type& type, SkSLType* outType);
 #endif
 
 void write_stringstream(const StringStream& d, OutputStream& out);
diff --git a/third_party/skia/src/sksl/analysis/BUILD.bazel b/third_party/skia/src/sksl/analysis/BUILD.bazel
index 13aa90996cfd6..fcef96ff8adcf 100644
--- a/third_party/skia/src/sksl/analysis/BUILD.bazel
+++ b/third_party/skia/src/sksl/analysis/BUILD.bazel
@@ -103,3 +103,25 @@ generated_cc_atom(
         "//src/sksl:SkSLAnalysis_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkSLFinalizationChecks_src",
+    srcs = ["SkSLFinalizationChecks.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSLProgramVisitor_hdr",
+        "//include/private:SkSLStatement_hdr",
+        "//src/core:SkSafeMath_hdr",
+        "//src/sksl:SkSLAnalysis_hdr",
+        "//src/sksl:SkSLContext_hdr",
+        "//src/sksl:SkSLProgramSettings_hdr",
+        "//src/sksl/ir:SkSLFunctionCall_hdr",
+        "//src/sksl/ir:SkSLFunctionDeclaration_hdr",
+        "//src/sksl/ir:SkSLFunctionDefinition_hdr",
+        "//src/sksl/ir:SkSLIfStatement_hdr",
+        "//src/sksl/ir:SkSLProgram_hdr",
+        "//src/sksl/ir:SkSLSwitchStatement_hdr",
+        "//src/sksl/ir:SkSLVarDeclarations_hdr",
+        "//src/sksl/ir:SkSLVariable_hdr",
+    ],
+)
diff --git a/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp b/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
index 6e0667e783902..aa6796e4f9b33 100644
--- a/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
+++ b/third_party/skia/src/sksl/analysis/SkSLCanExitWithoutReturningValue.cpp
@@ -97,7 +97,7 @@ class ReturnsOnAllPathsVisitor : public ProgramVisitor {
                     // The default case is indicated by a null value. A switch without a default
                     // case cannot definitively return, as its value might not be in the cases list.
                     const SwitchCase& sc = switchStmt->as<SwitchCase>();
-                    if (!sc.value()) {
+                    if (sc.isDefault()) {
                         foundDefault = true;
                     }
                     // Scan this switch-case for any exit (break, continue or return).
diff --git a/third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp b/third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp
index 16d28da2f4d6a..2deb6ec9b4646 100644
--- a/third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp
+++ b/third_party/skia/src/sksl/analysis/SkSLCheckProgramUnrolledSize.cpp
@@ -62,7 +62,7 @@ bool Analysis::CheckProgramUnrolledSize(const Program& program) {
                         // If the function is present in the map with an unknown cost, we're
                         // recursively processing it--in other words, we found a cycle in the code.
                         // Unwind our stack into a string.
-                        String msg = "\n\t" + decl->description();
+                        std::string msg = "\n\t" + decl->description();
                         for (auto unwind = fStack.rbegin(); unwind != fStack.rend(); ++unwind) {
                             msg = "\n\t" + (*unwind)->description() + msg;
                             if (*unwind == decl) {
@@ -81,7 +81,7 @@ bool Analysis::CheckProgramUnrolledSize(const Program& program) {
 
                 // If the function-call stack has gotten too deep, stop the analysis.
                 if (fStack.size() >= kProgramStackDepthLimit) {
-                    String msg = "exceeded max function call depth:";
+                    std::string msg = "exceeded max function call depth:";
                     for (auto unwind = fStack.begin(); unwind != fStack.end(); ++unwind) {
                         msg += "\n\t" + (*unwind)->description();
                     }
diff --git a/third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp b/third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
new file mode 100644
index 0000000000000..04c13205faaf7
--- /dev/null
+++ b/third_party/skia/src/sksl/analysis/SkSLFinalizationChecks.cpp
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/private/SkSLStatement.h"
+#include "src/core/SkSafeMath.h"
+#include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLProgramSettings.h"
+#include "src/sksl/analysis/SkSLProgramVisitor.h"
+#include "src/sksl/ir/SkSLFunctionCall.h"
+#include "src/sksl/ir/SkSLFunctionDeclaration.h"
+#include "src/sksl/ir/SkSLFunctionDefinition.h"
+#include "src/sksl/ir/SkSLIfStatement.h"
+#include "src/sksl/ir/SkSLProgram.h"
+#include "src/sksl/ir/SkSLSwitchStatement.h"
+#include "src/sksl/ir/SkSLVarDeclarations.h"
+#include "src/sksl/ir/SkSLVariable.h"
+
+namespace SkSL {
+namespace {
+
+class FinalizationVisitor : public ProgramVisitor {
+public:
+    FinalizationVisitor(const Context& c, const ProgramUsage& u) : fContext(c), fUsage(u) {}
+
+    bool visitProgramElement(const ProgramElement& pe) override {
+        switch (pe.kind()) {
+            case ProgramElement::Kind::kGlobalVar: {
+                this->checkGlobalVariableSizeLimit(pe.as<GlobalVarDeclaration>());
+                break;
+            }
+            case ProgramElement::Kind::kFunction: {
+                this->checkOutParamsAreAssigned(pe.as<FunctionDefinition>());
+                break;
+            }
+            default:
+                break;
+        }
+        return INHERITED::visitProgramElement(pe);
+    }
+
+    void checkGlobalVariableSizeLimit(const GlobalVarDeclaration& globalDecl) {
+        const VarDeclaration& decl = globalDecl.declaration()->as<VarDeclaration>();
+
+        size_t prevSlotsUsed = fGlobalSlotsUsed;
+        fGlobalSlotsUsed = SkSafeMath::Add(fGlobalSlotsUsed, decl.var().type().slotCount());
+        // To avoid overzealous error reporting, only trigger the error at the first place where the
+        // global limit is exceeded.
+        if (prevSlotsUsed < kVariableSlotLimit && fGlobalSlotsUsed >= kVariableSlotLimit) {
+            fContext.fErrors->error(decl.fLine,
+                                    "global variable '" + std::string(decl.var().name()) +
+                                    "' exceeds the size limit");
+        }
+    }
+
+    void checkOutParamsAreAssigned(const FunctionDefinition& funcDef) {
+        const FunctionDeclaration& funcDecl = funcDef.declaration();
+
+        // Searches for `out` parameters that are not written to. According to the GLSL spec,
+        // the value of an out-param that's never assigned to is unspecified, so report it.
+        // Structs are currently exempt from the rule because custom mesh specifications require an
+        // `out` parameter for a Varyings struct, even if your mesh program doesn't need Varyings.
+        for (const Variable* param : funcDecl.parameters()) {
+            const int paramInout = param->modifiers().fFlags & (Modifiers::Flag::kIn_Flag |
+                                                                Modifiers::Flag::kOut_Flag);
+            if (!param->type().isStruct() && paramInout == Modifiers::Flag::kOut_Flag) {
+                ProgramUsage::VariableCounts counts = fUsage.get(*param);
+                if (counts.fWrite <= 0) {
+                    fContext.fErrors->error(funcDecl.fLine,
+                                            "function '" + std::string(funcDecl.name()) +
+                                            "' never assigns a value to out parameter '" +
+                                            std::string(param->name()) + "'");
+                }
+            }
+        }
+    }
+
+    bool visitStatement(const Statement& stmt) override {
+        if (!fContext.fConfig->fSettings.fPermitInvalidStaticTests) {
+            switch (stmt.kind()) {
+                case Statement::Kind::kIf:
+                    if (stmt.as<IfStatement>().isStatic()) {
+                        fContext.fErrors->error(stmt.fLine, "static if has non-static test");
+                    }
+                    break;
+
+                case Statement::Kind::kSwitch:
+                    if (stmt.as<SwitchStatement>().isStatic()) {
+                        fContext.fErrors->error(stmt.fLine, "static switch has non-static test");
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        return INHERITED::visitStatement(stmt);
+    }
+
+    bool visitExpression(const Expression& expr) override {
+        switch (expr.kind()) {
+            case Expression::Kind::kFunctionCall: {
+                const FunctionDeclaration& decl = expr.as<FunctionCall>().function();
+                if (!decl.isBuiltin() && !decl.definition()) {
+                    fContext.fErrors->error(expr.fLine, "function '" + decl.description() +
+                                                        "' is not defined");
+                }
+                break;
+            }
+            case Expression::Kind::kExternalFunctionReference:
+            case Expression::Kind::kFunctionReference:
+            case Expression::Kind::kMethodReference:
+            case Expression::Kind::kTypeReference:
+                SkDEBUGFAIL("invalid reference-expr, should have been reported by coerce()");
+                fContext.fErrors->error(expr.fLine, "invalid expression");
+                break;
+            default:
+                if (expr.type().matches(*fContext.fTypes.fInvalid)) {
+                    fContext.fErrors->error(expr.fLine, "invalid expression");
+                }
+                break;
+        }
+        return INHERITED::visitExpression(expr);
+    }
+
+private:
+    using INHERITED = ProgramVisitor;
+    size_t fGlobalSlotsUsed = 0;
+    const Context& fContext;
+    const ProgramUsage& fUsage;
+};
+
+}  // namespace
+
+void Analysis::DoFinalizationChecks(const Program& program) {
+    // Check all of the program's owned elements. (Built-in elements are assumed to be valid.)
+    FinalizationVisitor visitor{*program.fContext, *program.usage()};
+    for (const std::unique_ptr<ProgramElement>& element : program.fOwnedElements) {
+        visitor.visitProgramElement(*element);
+    }
+}
+
+}  // namespace SkSL
diff --git a/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h b/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
index 3b99fec1d6c9a..3a27ef35d164d 100644
--- a/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
+++ b/third_party/skia/src/sksl/analysis/SkSLProgramVisitor.h
@@ -55,15 +55,7 @@ struct ProgramVisitorTypes {
     using UniquePtrStatement = const std::unique_ptr<SkSL::Statement>;
 };
 
-// Squelch bogus Clang warning about template vtables: https://bugs.llvm.org/show_bug.cgi?id=18733
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-template-vtables"
-#endif
 extern template class TProgramVisitor<ProgramVisitorTypes>;
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
 
 class ProgramVisitor : public TProgramVisitor<ProgramVisitorTypes> {
 public:
diff --git a/third_party/skia/src/sksl/binary_format.md b/third_party/skia/src/sksl/binary_format.md
new file mode 100644
index 0000000000000..2afadc5cbe6c8
--- /dev/null
+++ b/third_party/skia/src/sksl/binary_format.md
@@ -0,0 +1,766 @@
+SkSL Binary Format
+==================
+
+Background
+----------
+
+The SkSL binary format was originally created for internal use, to store our built-in include files
+in a format which required less processing time than the original text versions.
+
+This improved compiler startup time and memory footprint, but as the format was purpose-built for
+encoding our include files, it could not encode a normal SkSL program. It only supported the subset
+of SkSL required by the include files, had no means of referring to external symbols, and had not
+been tested outside of being used to encode our small handful of include files.
+
+To both improve testability and to support the needs of clients requiring a binary SkSL format, this
+feature has been extended to support arbitrary SkSL files. Full test coverage is achieved by
+encoding our entire corpus of SkSL tests to binary, decoding them, and ensuring that the decoded
+output program matches the unmodified original program.
+
+Design
+------
+
+### Overview
+
+A binary SkSL file has the following header:
+
+| Type                 | Field Name   |
+|----------------------|--------------|
+| `uint16`             | version      |
+| `uint16`             | stringLength |
+| `char[stringLength]` | stringData   |
+
+The version number is incremented whenever the file format changes. This document describes version
+8.
+
+`stringLength` is the total length of all of the string data in the file, including the length bytes
+of the strings, but not counting the `stringLength` field itself. Each string consists of a `uint8`
+length followed by the string’s characters, which are not null terminated.
+
+The header is immediately followed by a sequence of one or more commands encoding the contents. A
+typical SkSL binary will contain exactly one `kProgram_Command`.
+
+### Types
+
+The following types may appear as data members of commands. All numbers are stored in little endian
+byte ordering.
+
+| Name                   | Description                                                             |
+|------------------------|-------------------------------------------------------------------------|
+| `int8`                 | a signed 8 bit integer                                                  |
+| `int16`                | a signed 16 bit integer                                                 |
+| `int32`                | a signed 32 bit integer                                                 |
+| `uint8`                | an unsigned 8 bit integer                                               |
+| `uint16`               | an unsigned 16 bit integer                                              |
+| `uint32`               | an unsigned 32 bit integer                                              |
+| `float`                | a 32 bit IEEE floating point number                                     |
+| `bool`                 | a single byte with the value either 0 (`false`) or 1 (`true`)           |
+| `String`               | a `uint8` length, followed by a `uint16` offset [^1]                    |
+| `ProgramKind`          | a `uint8` mapping to a value in the `SkSL::ProgramKind` enum            |
+| `VariableStorage`      | a `uint8` mapping to a value in the `SkSL::VariableStorage` enum        |
+| `Operator`             | a `uint8` mapping to a value in the `SkSL::Token::Kind` enum            |
+| `FieldAccessOwnerKind` | a `uint8` mapping to a value in the `SkSL::FieldAccessOwnerKind` enum   |
+| `VariableRefKind`      | a `uint8` mapping to a value in the `SkSL::VariableRefKind` enum        |
+| `SwizzleComponent`     | a `uint8` mapping to a value in the `SkSL::SwizzleComponent::Type` enum |
+| `Symbol`               | an instance of any command in the Symbol category                       |
+| `SymbolId`             | a `uint16` ID specified by a Symbol category command [^2]               |
+| `Expression`           | an instance of any command in the Expressions category                  |
+| `ProgramElement`       | an instance of any command in the ProgramElements category              |
+| `Statement`            | an instance of any command in the Statements category                   |
+| `Type`                 | an instance of one of the “Type� Symbol commands [^3]                   |
+| `Layout`               | an instance of the one of the Layout commands [^4]                      |
+| `Modifiers`            | an instance of one of the Modifiers commands [^5]                       |
+| `k*_Command`           | an instance of the specified command                                    |
+
+[^1]: The offset of a `String` is relative to the beginning of the `stringData` field of the header.
+
+[^2]: There is one exception to `SymbolId`s referring to Symbol commands: if a `SymbolId` is
+      `kBuiltin_Symbol`, the `SymbolId` is followed by a String representing the name of the symbol.
+
+[^3]: The Type symbol commands are `kArrayType_Command`, `kStructType_Command`, or a
+      `kSymbolRef_Command` referring to an existing type.
+
+[^4]: The "Layout" commands are `kBuiltinLayout_Command`, `kDefaultLayout_Command`, and
+      `kLayout_Command`.
+
+[^5]: The "Modifiers" commands are `kDefaultModifiers_Command`, `kModifiers8Bit_Command`, and
+      `kModifiers_Command)`.
+
+Commands
+--------
+
+Each command consists of a single `uint8` identifying the command, followed by its data.
+
+### General Commands
+
+#### kBuiltinLayout_Command
+
+| Type    | Field Name |
+|---------|------------|
+| `int16` | builtin    |
+
+An `SkSL::Layout` with the specified builtin value, but all other fields left with their default
+values.
+
+---
+
+#### kDefaultLayout_Command
+
+An `SkSL::Layout` with every field set to its default value.
+
+---
+
+#### kDefaultModifiers_Command
+
+An `SkSL::Modifiers` with every field set to its default value.
+
+---
+
+#### kElements_Command
+
+| Type                        | Field Name |
+|-----------------------------|------------|
+| `ProgramElement[]`          | elements   |
+| `kElementsComplete_Command` |            |
+
+The end of the elements array is indicated by the presence of `kElementsComplete_Command`.
+
+---
+
+#### kElementsComplete_Command
+
+Signifies the end of a list of elements.
+
+---
+
+#### kLayout_Command
+
+| Type    | Field Name           |
+|---------|----------------------|
+| `int32` | flags                |
+| `int8`  | location             |
+| `int16` | offset               |
+| `int16` | binding              |
+| `int8`  | index                |
+| `int8`  | set                  |
+| `int16` | builtin              |
+| `int8`  | inputAttachmentIndex |
+
+Represents an `SkSL::Layout` with all fields specified.
+
+---
+
+#### kModifiers8Bit_Command
+
+| Type     | Field Name |
+|----------|------------|
+| `Layout` | layout     |
+| `uint8`  | flags      |
+
+A shortened version of `Modifiers` which only represents the least significant 8 bits of `flags`,
+leaving the other bits as zero.
+
+---
+
+#### kModifiers_Command
+
+| Type     | Field Name |
+|----------|------------|
+| `Layout` | layout     |
+| `uint32` | flags      |
+
+---
+
+#### kProgram_Command
+
+| Type                   | Field Name       |
+|------------------------|------------------|
+| `ProgramKind`          | programKind      |
+| `kSymbolTable_Command` | symbolTable      |
+| `kElements_Command`    | elements         |
+| `bool`                 | useFlipRTUniform |
+
+`useFlipRTUniform` refers to a field in `Program::Inputs`.
+
+---
+
+#### kSymbolTable_Command
+
+| Type                       | Field Name       |
+|----------------------------|------------------|
+| `uint16`                   | ownedSymbolCount |
+| `Symbol[ownedSymbolCount]` | ownedSymbols     |
+| `uint16`                   | symbolCount      |
+| `SymbolID[symbolCount]`    | symbols          |
+
+The IDs in the symbols array do not relate to indices in `ownedSymbols`, and instead refer to the
+IDs specified at the beginning of commands in the Symbol category.
+
+---
+
+### ProgramElement Commands
+
+#### kFunctionDefinition_Command
+
+| Type        | Field Name  |
+|-------------|-------------|
+| `SymbolId`  | declaration |
+| `Statement` | body        |
+
+Provides the body corresponding to a `FunctionDeclaration`.
+
+---
+
+#### kFunctionPrototype_Command
+
+| Type     | Field Name  |
+|----------|-------------|
+| `uint16` | declaration |
+
+Represents a function declaration appearing in the program as a function prototype.
+
+---
+
+#### kInterfaceBlock_Command
+
+| Type       | Field Name   |
+|------------|--------------|
+| `SymbolId` | var          |
+| `String`   | typeName     |
+| `String`   | instanceName |
+| `uint8`    | arraySize    |
+
+An interface block. `instanceName` may be zero-length to indicate the lack of an instance name.
+`arraySize` will be zero if the instance name was not present or was not followed by an array size.
+
+---
+
+#### kStructDefinition_Command
+
+| Type   | Field Name |
+|--------|------------|
+| `Type` | structType |
+
+Represents a struct definition appearing at top-level scope.
+
+---
+
+#### kSharedFunction_Command
+
+| Type                       | Field Name     |
+|----------------------------|----------------|
+| `uint8`                    | parameterCount |
+| `Variable[parameterCount]` | parameters     |
+| `FunctionDeclaration`      | decl           |
+| `FunctionDefinition`       | defn           |
+
+Represents a function from `Program.fSharedElements`.
+
+---
+
+#### kGlobalVar_Command
+
+| Type                      | Field Name |
+|---------------------------|------------|
+| `kVarDeclaration_Command` | decl       |
+
+A `VarDeclaration` appearing in global scope.
+
+---
+
+### Symbol Commands
+
+#### kArrayType_Command
+
+| Type     | Field Name    |
+|----------|---------------|
+| `uint16` | id            |
+| `Type`   | componentType |
+| `uint8`  | count         |
+
+---
+
+#### kField_Command
+
+| Type       | Field Name |
+|------------|------------|
+| `SymbolId` | ownerId    |
+| `uint8`    | index      |
+
+Symbol referring to a particular field of a `StructType`. Unlike other symbols, Field does not have
+its own ID; references to a Field are compiled in terms of the owner’s ID.
+
+---
+
+#### kFunctionDeclaration_Command
+
+| Type                       | Field Name     |
+|----------------------------|----------------|
+| `uint16`                   | id             |
+| `Modifiers`                | modifiers      |
+| `String`                   | name           |
+| `uint8`                    | parameterCount |
+| `SymbolId[parameterCount]` | parameters     |
+| `Type`                     | returnType     |
+
+---
+
+#### kStructType_Command
+
+| Type                | Field Name |
+|---------------------|------------|
+| `uint16`            | id         |
+| `String`            | name       |
+| `uint8`             | fieldCount |
+| `Field[fieldCount]` | fields     |
+
+The `Field` type referenced in this command is:
+
+    struct Field {
+        Modifiers modifiers;
+        String name;
+        Type type;
+    };
+
+---
+
+#### kSymbolRef_Command
+
+| Type       | Field Name |
+|------------|------------|
+| `SymbolId` | id         |
+
+Refers to a Symbol which has already been written by another command.
+
+---
+
+#### kUnresolvedFunction_Command
+
+| Type                         | Field Name |
+|------------------------------|------------|
+| `uint16`                     | id         |
+| `uint8`                      | count      |
+| `FunctionDeclaration[count]` | functions  |
+
+---
+
+#### kVariable_Command
+
+| Type                 | Field Name |
+|----------------------|------------|
+| `uint16`             | id         |
+| `Modifiers`          | modifiers  |
+| `String`             | name       |
+| `Type`               | type       |
+| `VariableStorage`    | storage    |
+
+---
+
+### Expression Commands
+
+#### kBinary_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Expression` | left       |
+| `Operator`   | op         |
+| `Expression` | right      |
+| `Type`       | type       |
+
+Represents a binary operator applied to two expressions.
+
+---
+
+#### kBoolLiteral_Command
+
+| Type   | Field Name |
+|--------|------------|
+| `bool` | value      |
+
+Represents a literal `true` or `false` value.
+
+---
+
+#### kConstructorArray_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorArray`.
+
+---
+
+#### kConstructorArrayCast_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorArrayCast`.
+
+---
+
+#### kConstructorCompound_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorCompound`.
+
+---
+
+#### kConstructorCompoundCast_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorCompoundCast`.
+
+---
+
+#### kConstructorDiagonalMatrix_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorDiagonalMatrix`.
+
+---
+
+#### kConstructorMatrixResize_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorMatrixResize`.
+
+---
+
+#### kConstructorScalarCast_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorScalarCast`.
+
+---
+
+#### kConstructorSplat_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorSplat`.
+
+---
+
+#### kConstructorStruct_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents an instance of `SkSL::ConstructorStruct`.
+
+---
+
+#### kFieldAccess_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Expression`           | base       |
+| `uint8`                | index      |
+| `FieldAccessOwnerKind` | ownerKind  |
+
+A reference to the `index`’th field of the `base` struct.
+
+---
+
+#### kFloatLiteral_Command
+
+| Type    | Field Name |
+|---------|------------|
+| `float` | value      |
+
+Represents a floating point literal.
+
+---
+
+#### kFunctionCall_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Type`                 | type       |
+| `SymbolId`             | function   |
+| `uint8`                | argCount   |
+| `Expression[argCount]` | arguments  |
+
+Represents a call to `function(arguments...)`.
+
+---
+
+#### kIndex_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Expression` | base       |
+| `Expression` | index      |
+
+Represents the expression `base[index]`.
+
+---
+
+#### kIntLiteral_Command
+
+| Type    | Field Name |
+|---------|------------|
+| `int32` | value      |
+
+Represents an integer literal.
+
+---
+
+#### kPostfix_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Operator`   | op         |
+| `Expression` | operand    |
+
+Represents applying the postfix operator `op` to `operand`.
+
+---
+
+#### kPrefix_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Operator`   | op         |
+| `Expression` | operand    |
+
+Represents applying the prefix operator `op` to `operand`.
+
+---
+
+#### kSetting_Command
+
+| Type     | Field Name |
+|----------|------------|
+| `String` | name       |
+
+Represents a field of `sk_Caps`, such as `“builtinDeterminantSupport�`.
+
+---
+
+#### kSwizzle_Command
+
+| Type                               | Field Name     |
+|------------------------------------|----------------|
+| `Expression`                       | base           |
+| `uint8`                            | componentCount |
+| `SwizzleComponent[componentCount]` | components     |
+
+Represents the swizzle `base.components`.
+
+---
+
+#### kTernary_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Expression` | test       |
+| `Expression` | ifTrue     |
+| `Expression` | ifFalse    |
+
+Represents the ternary expression `test ? ifTrue : ifFalse`.
+
+---
+
+#### kVariableReference_Command
+
+| Type              | Field Name |
+|-------------------|------------|
+| `SymbolID`        | var        |
+| `VariableRefKind` | refKind    |
+
+Represents a reference to the variable `var`.
+
+---
+
+### Statement Commands
+
+#### kBlock_Command
+
+| Type                        | Field Name     |
+|-----------------------------|----------------|
+| `kSymbolTable_Command`      | symbolTable    |
+| `uint8`                     | statementCount |
+| `Statement[statementCount]` | statements     |
+| `bool`                      | isScope        |
+
+A block of statements.
+
+---
+
+#### kBreak_Command
+
+A `break` statement.
+
+---
+
+#### kContinue_Command
+
+A `continue` statement.
+
+---
+
+#### kDiscard_Command
+
+A `discard` statement.
+
+---
+
+#### kDo_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Statement`  | stmt       |
+| `Expression` | test       |
+
+Represents `do stmt; while(test);`.
+
+---
+
+#### kExpressionStatement_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `Expression` | expression |
+
+Represents the statement `expression;`.
+
+---
+
+#### kFor_Command
+
+| Type          | Field Name  |
+|---------------|-------------|
+| `Statement`   | initializer |
+| `Expression`  | test        |
+| `Expression`  | next        |
+| `Statement`   | body        |
+| `SymbolTable` | symbols     |
+
+Represents `for (initializer; test; next) body;`.
+`test`, `next`, and `body` may all be `kVoid_Command` to represent their absence.
+
+---
+
+#### kIf_Command
+
+| Type         | Field Name |
+|--------------|------------|
+| `bool`       | isStatic   |
+| `Expression` | test       |
+| `Statement`  | ifTrue     |
+| `Statement`  | ifFalse    |
+
+Represents `if (test) ifTrue; else ifFalse;` (or `@if`, if `isStatic` is true).
+`ifFalse` may be `kVoid_Command` to represent the absence of an `else` statement.
+
+---
+
+#### kInlineMarker_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `SymbolId`             | function   |
+
+Represents an `SkSL::InlineMarker`, which is inserted before an inlined function’s code.
+
+---
+
+#### kNop_Command
+
+Represents an empty statement (a bare semicolon).
+
+---
+
+#### kReturn_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `Expression`           | value      |
+
+Represents the statement `return value;`.
+`value` may be `kVoid_Command` to represent the absence of a return value.
+
+---
+
+#### kSwitch_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `bool`                 | isStatic   |
+| `kSymbolTable_Command` | symbols    |
+| `Expression`           | value      |
+| `uint8`                | caseCount  |
+| `Case[caseCount]`      | cases      |
+
+The `Case` type referenced in this command is:
+
+    struct Case {
+        bool isDefault;
+        (when !isDefault) Expression value;
+        uint8 statementCount;
+        Statement statements[statementCount];
+    };
+
+Represents a `switch` or `@switch` statement on value. Each case begins with a `bool` identifying
+whether or not it is the default case; the default case does not contain the `value` field.
+
+---
+
+#### kVarDeclaration_Command
+
+| Type                   | Field Name |
+|------------------------|------------|
+| `SymbolId`             | var        |
+| `Type`                 | baseType   |
+| `uint8`                | arraySize  |
+| `Expression`           | value      |
+
+Represents the variable declaration statement `baseType var[arraySize] = value;`.
+An `arraySize` of zero omits the array declaration. A value of `kVoid_Command` omits the
+initializer.
+
+---
+
+#### kVoid_Command
+
+A marker indicating that a node is not present.
diff --git a/third_party/skia/src/sksl/codegen/BUILD.bazel b/third_party/skia/src/sksl/codegen/BUILD.bazel
index e99820a093439..ae335db09dd77 100644
--- a/third_party/skia/src/sksl/codegen/BUILD.bazel
+++ b/third_party/skia/src/sksl/codegen/BUILD.bazel
@@ -246,7 +246,6 @@ generated_cc_atom(
     deps = [
         ":SkSLCodeGenerator_hdr",
         ":SkSLVMCodeGenerator_hdr",
-        ":SkVMDebugInfo_hdr",
         "//include/private:SkSLProgramElement_hdr",
         "//include/private:SkSLStatement_hdr",
         "//include/private:SkTArray_hdr",
@@ -285,28 +284,6 @@ generated_cc_atom(
         "//src/sksl/ir:SkSLTernaryExpression_hdr",
         "//src/sksl/ir:SkSLVarDeclarations_hdr",
         "//src/sksl/ir:SkSLVariableReference_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "SkVMDebugInfo_hdr",
-    hdrs = ["SkVMDebugInfo.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//include/core:SkPoint_hdr",
-        "//src/core:SkVM_hdr",
-        "//src/sksl/ir:SkSLType_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "SkVMDebugInfo_src",
-    srcs = ["SkVMDebugInfo.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":SkVMDebugInfo_hdr",
-        "//src/core:SkStreamPriv_hdr",
-        "//src/utils:SkJSONWriter_hdr",
-        "//src/utils:SkJSON_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
     ],
 )
diff --git a/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp b/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
index 6c818b7308ffa..c9fd453b8b12a 100644
--- a/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.cpp
@@ -42,7 +42,7 @@
 
 namespace SkSL {
 
-void GLSLCodeGenerator::write(skstd::string_view s) {
+void GLSLCodeGenerator::write(std::string_view s) {
     if (!s.length()) {
         return;
     }
@@ -55,7 +55,7 @@ void GLSLCodeGenerator::write(skstd::string_view s) {
     fAtLineStart = false;
 }
 
-void GLSLCodeGenerator::writeLine(skstd::string_view s) {
+void GLSLCodeGenerator::writeLine(std::string_view s) {
     this->write(s);
     fOut->writeText(fLineEnding);
     fAtLineStart = true;
@@ -67,7 +67,7 @@ void GLSLCodeGenerator::finishLine() {
     }
 }
 
-void GLSLCodeGenerator::writeExtension(skstd::string_view name, bool require) {
+void GLSLCodeGenerator::writeExtension(std::string_view name, bool require) {
     fExtensions.writeText("#extension ");
     fExtensions.write(name.data(), name.length());
     fExtensions.writeText(require ? " : require\n" : " : enable\n");
@@ -78,12 +78,14 @@ bool GLSLCodeGenerator::usesPrecisionModifiers() const {
 }
 
 // Returns the name of the type with array dimensions, e.g. `float[2]`.
-String GLSLCodeGenerator::getTypeName(const Type& type) {
+std::string GLSLCodeGenerator::getTypeName(const Type& raw) {
+    const Type& type = raw.resolve();
     switch (type.typeKind()) {
         case Type::TypeKind::kVector: {
             const Type& component = type.componentType();
-            String result;
-            if (component == *fContext.fTypes.fFloat || component == *fContext.fTypes.fHalf) {
+            std::string result;
+            if (component.matches(*fContext.fTypes.fFloat) ||
+                component.matches(*fContext.fTypes.fHalf)) {
                 result = "vec";
             }
             else if (component.isSigned()) {
@@ -92,52 +94,53 @@ String GLSLCodeGenerator::getTypeName(const Type& type) {
             else if (component.isUnsigned()) {
                 result = "uvec";
             }
-            else if (component == *fContext.fTypes.fBool) {
+            else if (component.matches(*fContext.fTypes.fBool)) {
                 result = "bvec";
             }
             else {
                 SK_ABORT("unsupported vector type");
             }
-            result += to_string(type.columns());
+            result += std::to_string(type.columns());
             return result;
         }
         case Type::TypeKind::kMatrix: {
-            String result;
+            std::string result;
             const Type& component = type.componentType();
-            if (component == *fContext.fTypes.fFloat || component == *fContext.fTypes.fHalf) {
+            if (component.matches(*fContext.fTypes.fFloat) ||
+                component.matches(*fContext.fTypes.fHalf)) {
                 result = "mat";
             }
             else {
                 SK_ABORT("unsupported matrix type");
             }
-            result += to_string(type.columns());
+            result += std::to_string(type.columns());
             if (type.columns() != type.rows()) {
                 result += "x";
-                result += to_string(type.rows());
+                result += std::to_string(type.rows());
             }
             return result;
         }
         case Type::TypeKind::kArray: {
-            String baseTypeName = this->getTypeName(type.componentType());
+            std::string baseTypeName = this->getTypeName(type.componentType());
             return String::printf("%s[%d]", baseTypeName.c_str(), type.columns());
         }
         case Type::TypeKind::kScalar: {
-            if (type == *fContext.fTypes.fHalf) {
+            if (type.matches(*fContext.fTypes.fHalf)) {
                 return "float";
             }
-            else if (type == *fContext.fTypes.fShort) {
+            else if (type.matches(*fContext.fTypes.fShort)) {
                 return "int";
             }
-            else if (type == *fContext.fTypes.fUShort) {
+            else if (type.matches(*fContext.fTypes.fUShort)) {
                 return "uint";
             }
             else {
-                return String(type.name());
+                return std::string(type.name());
             }
             break;
         }
         default:
-            return String(type.name());
+            return std::string(type.name());
     }
 }
 
@@ -155,7 +158,7 @@ void GLSLCodeGenerator::writeStructDefinition(const StructDefinition& s) {
         this->write(" ");
         this->write(f.fName);
         if (f.fType->isArray()) {
-            this->write("[" + to_string(f.fType->columns()) + "]");
+            this->write("[" + std::to_string(f.fType->columns()) + "]");
         }
         this->writeLine(";");
     }
@@ -235,11 +238,11 @@ static bool is_abs(Expression& expr) {
 // Tegra3 compiler bug.
 void GLSLCodeGenerator::writeMinAbsHack(Expression& absExpr, Expression& otherExpr) {
     SkASSERT(!this->caps().canUseMinAndAbsTogether());
-    String tmpVar1 = "minAbsHackVar" + to_string(fVarCount++);
-    String tmpVar2 = "minAbsHackVar" + to_string(fVarCount++);
-    this->fFunctionHeader += String("    ") + this->getTypePrecision(absExpr.type()) +
+    std::string tmpVar1 = "minAbsHackVar" + std::to_string(fVarCount++);
+    std::string tmpVar2 = "minAbsHackVar" + std::to_string(fVarCount++);
+    this->fFunctionHeader += std::string("    ") + this->getTypePrecision(absExpr.type()) +
                              this->getTypeName(absExpr.type()) + " " + tmpVar1 + ";\n";
-    this->fFunctionHeader += String("    ") + this->getTypePrecision(otherExpr.type()) +
+    this->fFunctionHeader += std::string("    ") + this->getTypePrecision(otherExpr.type()) +
                              this->getTypeName(otherExpr.type()) + " " + tmpVar2 + ";\n";
     this->write("((" + tmpVar1 + " = ");
     this->writeExpression(absExpr, Precedence::kTopLevel);
@@ -255,9 +258,9 @@ void GLSLCodeGenerator::writeInverseSqrtHack(const Expression& x) {
 }
 
 void GLSLCodeGenerator::writeDeterminantHack(const Expression& mat) {
-    String name;
+    std::string name;
     const Type& type = mat.type();
-    if (type == *fContext.fTypes.fFloat2x2 || type == *fContext.fTypes.fHalf2x2) {
+    if (type.matches(*fContext.fTypes.fFloat2x2) || type.matches(*fContext.fTypes.fHalf2x2)) {
         name = "_determinant2";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -268,7 +271,7 @@ void GLSLCodeGenerator::writeDeterminantHack(const Expression& mat) {
             ).c_str());
         }
     }
-    else if (type == *fContext.fTypes.fFloat3x3 || type == *fContext.fTypes.fHalf3x3) {
+    else if (type.matches(*fContext.fTypes.fFloat3x3) || type.matches(*fContext.fTypes.fHalf3x3)) {
         name = "_determinant3";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -285,7 +288,7 @@ void GLSLCodeGenerator::writeDeterminantHack(const Expression& mat) {
             ).c_str());
         }
     }
-    else if (type == *fContext.fTypes.fFloat4x4 || type == *fContext.fTypes.fHalf4x4) {
+    else if (type.matches(*fContext.fTypes.fFloat4x4) || type.matches(*fContext.fTypes.fHalf4x4)) {
         name = "_determinant4";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -321,9 +324,9 @@ void GLSLCodeGenerator::writeDeterminantHack(const Expression& mat) {
 }
 
 void GLSLCodeGenerator::writeInverseHack(const Expression& mat) {
-    String name;
+    std::string name;
     const Type& type = mat.type();
-    if (type == *fContext.fTypes.fFloat2x2 || type == *fContext.fTypes.fHalf2x2) {
+    if (type.matches(*fContext.fTypes.fFloat2x2) || type.matches(*fContext.fTypes.fHalf2x2)) {
         name = "_inverse2";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -335,7 +338,7 @@ void GLSLCodeGenerator::writeInverseHack(const Expression& mat) {
             ).c_str());
         }
     }
-    else if (type == *fContext.fTypes.fFloat3x3 || type == *fContext.fTypes.fHalf3x3) {
+    else if (type.matches(*fContext.fTypes.fFloat3x3) || type.matches(*fContext.fTypes.fHalf3x3)) {
         name = "_inverse3";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -355,7 +358,7 @@ void GLSLCodeGenerator::writeInverseHack(const Expression& mat) {
             ).c_str());
         }
     }
-    else if (type == *fContext.fTypes.fFloat4x4 || type == *fContext.fTypes.fHalf4x4) {
+    else if (type.matches(*fContext.fTypes.fFloat4x4) || type.matches(*fContext.fTypes.fHalf4x4)) {
         name = "_inverse4";
         if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
             fWrittenIntrinsics.insert(name);
@@ -410,12 +413,12 @@ void GLSLCodeGenerator::writeInverseHack(const Expression& mat) {
 
 void GLSLCodeGenerator::writeTransposeHack(const Expression& mat) {
     const Type& type = mat.type();
-    String name = "transpose" + to_string(type.columns()) + to_string(type.rows());
+    std::string name = "transpose" + std::to_string(type.columns()) + std::to_string(type.rows());
     if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
         fWrittenIntrinsics.insert(name);
-        String typeName = this->getTypeName(type);
+        std::string typeName = this->getTypeName(type);
         const Type& base = type.componentType();
-        String transposed =  this->getTypeName(base.toCompound(fContext,
+        std::string transposed =  this->getTypeName(base.toCompound(fContext,
                                                                type.rows(),
                                                                type.columns()));
         fExtraFunctions.writeText((transposed + " " + name + "(" + typeName + " m) {\nreturn " +
@@ -424,8 +427,8 @@ void GLSLCodeGenerator::writeTransposeHack(const Expression& mat) {
         for (int row = 0; row < type.rows(); ++row) {
             for (int column = 0; column < type.columns(); ++column) {
                 fExtraFunctions.writeText(separator);
-                fExtraFunctions.writeText(("m[" + to_string(column) + "][" + to_string(row) +
-                                           "]").c_str());
+                fExtraFunctions.writeText(("m[" + std::to_string(column) + "][" +
+                                           std::to_string(row) + "]").c_str());
                 separator = ", ";
             }
         }
@@ -447,11 +450,11 @@ void GLSLCodeGenerator::writeFunctionCall(const FunctionCall& c) {
             if (!this->caps().emulateAbsIntFunction())
                 break;
             SkASSERT(arguments.size() == 1);
-            if (arguments[0]->type() != *fContext.fTypes.fInt) {
+            if (!arguments[0]->type().matches(*fContext.fTypes.fInt)) {
                 break;
             }
             // abs(int) on Intel OSX is incorrect, so emulate it:
-            String name = "_absemulation";
+            std::string name = "_absemulation";
             this->write(name);
             nameWritten = true;
             if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
@@ -598,32 +601,32 @@ void GLSLCodeGenerator::writeFunctionCall(const FunctionCall& c) {
                 case SpvDim1D:
                     dim = "1D";
                     isTextureFunctionWithBias = true;
-                    if (arg1Type == *fContext.fTypes.fFloat) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat)) {
                         proj = false;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat2);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat2));
                         proj = true;
                     }
                     break;
                 case SpvDim2D:
                     dim = "2D";
-                    if (arg0Type != *fContext.fTypes.fSamplerExternalOES) {
+                    if (!arg0Type.matches(*fContext.fTypes.fSamplerExternalOES)) {
                         isTextureFunctionWithBias = true;
                     }
-                    if (arg1Type == *fContext.fTypes.fFloat2) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat2)) {
                         proj = false;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat3);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat3));
                         proj = true;
                     }
                     break;
                 case SpvDim3D:
                     dim = "3D";
                     isTextureFunctionWithBias = true;
-                    if (arg1Type == *fContext.fTypes.fFloat3) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat3)) {
                         proj = false;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat4);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat4));
                         proj = true;
                     }
                     break;
@@ -712,7 +715,7 @@ void GLSLCodeGenerator::writeCastConstructor(const AnyConstructor& c, Precedence
 
     const Expression& argument = *arguments.front();
     if ((this->getTypeName(c.type()) == this->getTypeName(argument.type()) ||
-         (argument.type() == *fContext.fTypes.fFloatLiteral))) {
+         (argument.type().matches(*fContext.fTypes.fFloatLiteral)))) {
         // In cases like half(float), they're different types as far as SkSL is concerned but
         // the same type as far as GLSL is concerned. We avoid a redundant float(float) by just
         // writing out the inner expression here.
@@ -829,7 +832,7 @@ void GLSLCodeGenerator::writeFieldAccess(const FieldAccess& f) {
         this->write(".");
     }
     const Type& baseType = f.base()->type();
-    skstd::string_view name = baseType.fields()[f.fieldIndex()].fName;
+    std::string_view name = baseType.fields()[f.fieldIndex()].fName;
     if (name == "sk_Position") {
         this->write("gl_Position");
     } else if (name == "sk_PointSize") {
@@ -857,10 +860,10 @@ void GLSLCodeGenerator::writeMatrixComparisonWorkaround(const BinaryExpression&
     SkASSERT(left.type().isMatrix());
     SkASSERT(right.type().isMatrix());
 
-    String tempMatrix1 = "_tempMatrix" + to_string(fVarCount++);
-    String tempMatrix2 = "_tempMatrix" + to_string(fVarCount++);
+    std::string tempMatrix1 = "_tempMatrix" + std::to_string(fVarCount++);
+    std::string tempMatrix2 = "_tempMatrix" + std::to_string(fVarCount++);
 
-    this->fFunctionHeader += String("    ") + this->getTypePrecision(left.type()) +
+    this->fFunctionHeader += std::string("    ") + this->getTypePrecision(left.type()) +
                              this->getTypeName(left.type()) + " " + tempMatrix1 + ";\n    " +
                              this->getTypePrecision(right.type()) +
                              this->getTypeName(right.type()) + " " + tempMatrix2 + ";\n";
@@ -868,9 +871,9 @@ void GLSLCodeGenerator::writeMatrixComparisonWorkaround(const BinaryExpression&
     this->writeExpression(left, Precedence::kAssignment);
     this->write("), (" + tempMatrix2 + " = ");
     this->writeExpression(right, Precedence::kAssignment);
-    this->write("), (" + tempMatrix1 + " ");
+    this->write("), (" + tempMatrix1);
     this->write(op.operatorName());
-    this->write(" " + tempMatrix2 + "))");
+    this->write(tempMatrix2 + "))");
 }
 
 void GLSLCodeGenerator::writeBinaryExpression(const BinaryExpression& b,
@@ -905,9 +908,7 @@ void GLSLCodeGenerator::writeBinaryExpression(const BinaryExpression& b,
         this->write("sk_FragCoord_Workaround = (");
     }
     this->writeExpression(left, precedence);
-    this->write(" ");
     this->write(op.operatorName());
-    this->write(" ");
     this->writeExpression(right, precedence);
     if (positionWorkaround) {
         this->write(")");
@@ -966,7 +967,7 @@ void GLSLCodeGenerator::writePrefixExpression(const PrefixExpression& p,
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write("(");
     }
-    this->write(p.getOperator().operatorName());
+    this->write(p.getOperator().tightOperatorName());
     this->writeExpression(*p.operand(), Precedence::kPrefix);
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write(")");
@@ -979,7 +980,7 @@ void GLSLCodeGenerator::writePostfixExpression(const PostfixExpression& p,
         this->write("(");
     }
     this->writeExpression(*p.operand(), Precedence::kPostfix);
-    this->write(p.getOperator().operatorName());
+    this->write(p.getOperator().tightOperatorName());
     if (Precedence::kPostfix >= parentPrecedence) {
         this->write(")");
     }
@@ -988,16 +989,16 @@ void GLSLCodeGenerator::writePostfixExpression(const PostfixExpression& p,
 void GLSLCodeGenerator::writeLiteral(const Literal& l) {
     const Type& type = l.type();
     if (type.isFloat()) {
-        this->write(to_string(l.floatValue()));
+        this->write(skstd::to_string(l.floatValue()));
         return;
     }
     if (type.isInteger()) {
-        if (type == *fContext.fTypes.fUInt) {
-            this->write(to_string(l.intValue() & 0xffffffff) + "u");
-        } else if (type == *fContext.fTypes.fUShort) {
-            this->write(to_string(l.intValue() & 0xffff) + "u");
+        if (type.matches(*fContext.fTypes.fUInt)) {
+            this->write(std::to_string(l.intValue() & 0xffffffff) + "u");
+        } else if (type.matches(*fContext.fTypes.fUShort)) {
+            this->write(std::to_string(l.intValue() & 0xffff) + "u");
         } else {
-            this->write(to_string(l.intValue()));
+            this->write(std::to_string(l.intValue()));
         }
         return;
     }
@@ -1032,9 +1033,9 @@ void GLSLCodeGenerator::writeFunctionDeclaration(const FunctionDeclaration& f) {
         }
         this->writeTypePrecision(*type);
         this->writeType(*type);
-        this->write(" " + param->name());
+        this->write(" " + std::string(param->name()));
         for (int s : sizes) {
-            this->write("[" + to_string(s) + "]");
+            this->write("[" + std::to_string(s) + "]");
         }
     }
     this->write(")");
@@ -1074,7 +1075,7 @@ void GLSLCodeGenerator::writeFunctionPrototype(const FunctionPrototype& f) {
 
 void GLSLCodeGenerator::writeModifiers(const Modifiers& modifiers,
                                        bool globalContext) {
-    String layout = modifiers.fLayout.description();
+    std::string layout = modifiers.fLayout.description();
     if (layout.size()) {
         this->write(layout + " ");
     }
@@ -1120,7 +1121,7 @@ void GLSLCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
         return;
     }
     this->writeModifiers(intf.variable().modifiers(), true);
-    this->writeLine(intf.typeName() + " {");
+    this->writeLine(std::string(intf.typeName()) + " {");
     fIndentation++;
     const Type* structType = &intf.variable().type();
     if (structType->isArray()) {
@@ -1130,7 +1131,7 @@ void GLSLCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
         this->writeModifiers(f.fModifiers, false);
         this->writeTypePrecision(*f.fType);
         this->writeType(*f.fType);
-        this->writeLine(" " + f.fName + ";");
+        this->writeLine(" " + std::string(f.fName) + ";");
     }
     fIndentation--;
     this->write("}");
@@ -1139,7 +1140,7 @@ void GLSLCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
         this->write(intf.instanceName());
         if (intf.arraySize() > 0) {
             this->write("[");
-            this->write(to_string(intf.arraySize()));
+            this->write(std::to_string(intf.arraySize()));
             this->write("]");
         }
     }
@@ -1154,18 +1155,19 @@ const char* GLSLCodeGenerator::getTypePrecision(const Type& type) {
     if (usesPrecisionModifiers()) {
         switch (type.typeKind()) {
             case Type::TypeKind::kScalar:
-                if (type == *fContext.fTypes.fShort || type == *fContext.fTypes.fUShort) {
+                if (type.matches(*fContext.fTypes.fShort) ||
+                    type.matches(*fContext.fTypes.fUShort)) {
                     if (fProgram.fConfig->fSettings.fForceHighPrecision ||
                             this->caps().incompleteShortIntPrecision()) {
                         return "highp ";
                     }
                     return "mediump ";
                 }
-                if (type == *fContext.fTypes.fHalf) {
+                if (type.matches(*fContext.fTypes.fHalf)) {
                     return fProgram.fConfig->fSettings.fForceHighPrecision ? "highp " : "mediump ";
                 }
-                if (type == *fContext.fTypes.fFloat || type == *fContext.fTypes.fInt ||
-                        type == *fContext.fTypes.fUInt) {
+                if (type.matches(*fContext.fTypes.fFloat) || type.matches(*fContext.fTypes.fInt) ||
+                        type.matches(*fContext.fTypes.fUInt)) {
                     return "highp ";
                 }
                 return "";
@@ -1192,14 +1194,15 @@ void GLSLCodeGenerator::writeVarDeclaration(const VarDeclaration& var, bool glob
     this->write(var.var().name());
     if (var.arraySize() > 0) {
         this->write("[");
-        this->write(to_string(var.arraySize()));
+        this->write(std::to_string(var.arraySize()));
         this->write("]");
     }
     if (var.value()) {
         this->write(" = ");
         this->writeVarInitializer(var.var(), *var.value());
     }
-    if (!fFoundExternalSamplerDecl && var.var().type() == *fContext.fTypes.fSamplerExternalOES) {
+    if (!fFoundExternalSamplerDecl &&
+        var.var().type().matches(*fContext.fTypes.fSamplerExternalOES)) {
         if (this->caps().externalTextureExtensionString()) {
             this->writeExtension(this->caps().externalTextureExtensionString());
         }
@@ -1208,7 +1211,7 @@ void GLSLCodeGenerator::writeVarDeclaration(const VarDeclaration& var, bool glob
         }
         fFoundExternalSamplerDecl = true;
     }
-    if (!fFoundRectSamplerDecl && var.var().type() == *fContext.fTypes.fSampler2DRect) {
+    if (!fFoundRectSamplerDecl && var.var().type().matches(*fContext.fTypes.fSampler2DRect)) {
         fFoundRectSamplerDecl = true;
     }
     this->write(";");
@@ -1220,8 +1223,7 @@ void GLSLCodeGenerator::writeStatement(const Statement& s) {
             this->writeBlock(s.as<Block>());
             break;
         case Statement::Kind::kExpression:
-            this->writeExpression(*s.as<ExpressionStatement>().expression(), Precedence::kTopLevel);
-            this->write(";");
+            this->writeExpressionStatement(s.as<ExpressionStatement>());
             break;
         case Statement::Kind::kReturn:
             this->writeReturnStatement(s.as<ReturnStatement>());
@@ -1352,7 +1354,7 @@ void GLSLCodeGenerator::writeDoStatement(const DoStatement& d) {
     //         temp = true;
     //         CODE;
     //     }
-    String tmpVar = "_tmpLoopSeenOnce" + to_string(fVarCount++);
+    std::string tmpVar = "_tmpLoopSeenOnce" + std::to_string(fVarCount++);
     this->write("bool ");
     this->write(tmpVar);
     this->writeLine(" = false;");
@@ -1379,11 +1381,18 @@ void GLSLCodeGenerator::writeDoStatement(const DoStatement& d) {
     this->write("}");
 }
 
+void GLSLCodeGenerator::writeExpressionStatement(const ExpressionStatement& s) {
+    if (s.expression()->hasSideEffects()) {
+        this->writeExpression(*s.expression(), Precedence::kTopLevel);
+        this->write(";");
+    }
+}
+
 void GLSLCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
     if (this->caps().rewriteSwitchStatements()) {
-        String fallthroughVar = "_tmpSwitchFallthrough" + to_string(fVarCount++);
-        String valueVar = "_tmpSwitchValue" + to_string(fVarCount++);
-        String loopVar = "_tmpSwitchLoop" + to_string(fVarCount++);
+        std::string fallthroughVar = "_tmpSwitchFallthrough" + std::to_string(fVarCount++);
+        std::string valueVar = "_tmpSwitchValue" + std::to_string(fVarCount++);
+        std::string loopVar = "_tmpSwitchLoop" + std::to_string(fVarCount++);
         this->write("int ");
         this->write(valueVar);
         this->write(" = ");
@@ -1403,7 +1412,7 @@ void GLSLCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
         bool firstCase = true;
         for (const std::unique_ptr<Statement>& stmt : s.cases()) {
             const SwitchCase& c = stmt->as<SwitchCase>();
-            if (c.value()) {
+            if (!c.isDefault()) {
                 this->write("if ((");
                 if (firstCase) {
                     firstCase = false;
@@ -1413,7 +1422,7 @@ void GLSLCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
                 }
                 this->write(valueVar);
                 this->write(" == ");
-                this->writeExpression(*c.value(), Precedence::kEquality);
+                this->write(std::to_string(c.value()));
                 this->writeLine(")) {");
                 fIndentation++;
 
@@ -1450,17 +1459,17 @@ void GLSLCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
     // If a switch contains only a `default` case and nothing else, this confuses some drivers and
     // can lead to a crash. Adding a real case before the default seems to work around the bug,
     // and doesn't change the meaning of the switch. (skia:12465)
-    if (s.cases().size() == 1 && !s.cases().front()->as<SwitchCase>().value()) {
+    if (s.cases().size() == 1 && s.cases().front()->as<SwitchCase>().isDefault()) {
         this->writeLine("case 0:");
     }
     for (const std::unique_ptr<Statement>& stmt : s.cases()) {
         const SwitchCase& c = stmt->as<SwitchCase>();
-        if (c.value()) {
+        if (c.isDefault()) {
+            this->writeLine("default:");
+        } else {
             this->write("case ");
-            this->writeExpression(*c.value(), Precedence::kTopLevel);
+            this->write(std::to_string(c.value()));
             this->writeLine(":");
-        } else {
-            this->writeLine("default:");
         }
         if (!c.statement()->isEmpty()) {
             fIndentation++;
diff --git a/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h b/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h
index ff7001996f082..6b4308e46141e 100644
--- a/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h
+++ b/third_party/skia/src/sksl/codegen/SkSLGLSLCodeGenerator.h
@@ -21,6 +21,7 @@ class Block;
 class ConstructorDiagonalMatrix;
 class ConstructorScalarCast;
 class DoStatement;
+class ExpressionStatement;
 class Extension;
 class FieldAccess;
 class ForStatement;
@@ -57,9 +58,9 @@ class GLSLCodeGenerator : public CodeGenerator {
 protected:
     using Precedence = Operator::Precedence;
 
-    void write(skstd::string_view s);
+    void write(std::string_view s);
 
-    void writeLine(skstd::string_view s = skstd::string_view());
+    void writeLine(std::string_view s = std::string_view());
 
     void finishLine();
 
@@ -67,13 +68,13 @@ class GLSLCodeGenerator : public CodeGenerator {
 
     virtual bool usesPrecisionModifiers() const;
 
-    virtual String getTypeName(const Type& type);
+    virtual std::string getTypeName(const Type& type);
 
     void writeStructDefinition(const StructDefinition& s);
 
     void writeType(const Type& type);
 
-    void writeExtension(skstd::string_view name, bool require = true);
+    void writeExtension(std::string_view name, bool require = true);
 
     void writeInterfaceBlock(const InterfaceBlock& intf);
 
@@ -159,6 +160,8 @@ class GLSLCodeGenerator : public CodeGenerator {
 
     void writeDoStatement(const DoStatement& d);
 
+    void writeExpressionStatement(const ExpressionStatement& s);
+
     virtual void writeSwitchStatement(const SwitchStatement& s);
 
     virtual void writeReturnStatement(const ReturnStatement& r);
@@ -171,11 +174,11 @@ class GLSLCodeGenerator : public CodeGenerator {
     StringStream fExtensions;
     StringStream fGlobals;
     StringStream fExtraFunctions;
-    String fFunctionHeader;
+    std::string fFunctionHeader;
     int fVarCount = 0;
     int fIndentation = 0;
     bool fAtLineStart = false;
-    std::set<String> fWrittenIntrinsics;
+    std::set<std::string> fWrittenIntrinsics;
     // true if we have run into usages of dFdx / dFdy
     bool fFoundDerivatives = false;
     bool fFoundExternalSamplerDecl = false;
@@ -184,7 +187,7 @@ class GLSLCodeGenerator : public CodeGenerator {
     bool fSetupFragPosition = false;
     bool fSetupFragCoordWorkaround = false;
     // if non-empty, replace all texture / texture2D / textureProj / etc. calls with this name
-    String fTextureFunctionOverride;
+    std::string fTextureFunctionOverride;
 
     // We map function names to function class so we can quickly deal with function calls that need
     // extra processing
@@ -205,7 +208,7 @@ class GLSLCodeGenerator : public CodeGenerator {
         kTexture,
         kTranspose
     };
-    static std::unordered_map<skstd::string_view, FunctionClass>* fFunctionClasses;
+    static std::unordered_map<std::string_view, FunctionClass>* fFunctionClasses;
 
     using INHERITED = CodeGenerator;
 };
diff --git a/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp b/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
index d61280fba7e81..e02c07c1f8fdb 100644
--- a/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.cpp
@@ -48,9 +48,9 @@
 
 namespace SkSL {
 
-const char* MetalCodeGenerator::OperatorName(Operator op) {
+static const char* operator_name(Operator op) {
     switch (op.kind()) {
-        case Token::Kind::TK_LOGICALXOR:  return "!=";
+        case Token::Kind::TK_LOGICALXOR:  return " != ";
         default:                          return op.operatorName();
     }
 }
@@ -58,13 +58,13 @@ const char* MetalCodeGenerator::OperatorName(Operator op) {
 class MetalCodeGenerator::GlobalStructVisitor {
 public:
     virtual ~GlobalStructVisitor() = default;
-    virtual void visitInterfaceBlock(const InterfaceBlock& block, skstd::string_view blockName) = 0;
-    virtual void visitTexture(const Type& type, skstd::string_view name) = 0;
-    virtual void visitSampler(const Type& type, skstd::string_view name) = 0;
+    virtual void visitInterfaceBlock(const InterfaceBlock& block, std::string_view blockName) = 0;
+    virtual void visitTexture(const Type& type, std::string_view name) = 0;
+    virtual void visitSampler(const Type& type, std::string_view name) = 0;
     virtual void visitVariable(const Variable& var, const Expression* value) = 0;
 };
 
-void MetalCodeGenerator::write(skstd::string_view s) {
+void MetalCodeGenerator::write(std::string_view s) {
     if (s.empty()) {
         return;
     }
@@ -73,11 +73,11 @@ void MetalCodeGenerator::write(skstd::string_view s) {
             fOut->writeText("    ");
         }
     }
-    fOut->writeText(String(s).c_str());
+    fOut->writeText(std::string(s).c_str());
     fAtLineStart = false;
 }
 
-void MetalCodeGenerator::writeLine(skstd::string_view s) {
+void MetalCodeGenerator::writeLine(std::string_view s) {
     this->write(s);
     fOut->writeText(fLineEnding);
     fAtLineStart = true;
@@ -90,10 +90,10 @@ void MetalCodeGenerator::finishLine() {
 }
 
 void MetalCodeGenerator::writeExtension(const Extension& ext) {
-    this->writeLine("#extension " + ext.name() + " : enable");
+    this->writeLine("#extension " + std::string(ext.name()) + " : enable");
 }
 
-String MetalCodeGenerator::typeName(const Type& type) {
+std::string MetalCodeGenerator::typeName(const Type& type) {
     switch (type.typeKind()) {
         case Type::TypeKind::kArray:
             SkASSERTF(type.columns() > 0, "invalid array size: %s", type.description().c_str());
@@ -101,23 +101,23 @@ String MetalCodeGenerator::typeName(const Type& type) {
                                   this->typeName(type.componentType()).c_str(), type.columns());
 
         case Type::TypeKind::kVector:
-            return this->typeName(type.componentType()) + to_string(type.columns());
+            return this->typeName(type.componentType()) + std::to_string(type.columns());
 
         case Type::TypeKind::kMatrix:
-            return this->typeName(type.componentType()) + to_string(type.columns()) + "x" +
-                                  to_string(type.rows());
+            return this->typeName(type.componentType()) + std::to_string(type.columns()) + "x" +
+                                  std::to_string(type.rows());
 
         case Type::TypeKind::kSampler:
             return "texture2d<half>"; // FIXME - support other texture types
 
         default:
-            return String(type.name());
+            return std::string(type.name());
     }
 }
 
 void MetalCodeGenerator::writeStructDefinition(const StructDefinition& s) {
     const Type& type = s.type();
-    this->writeLine("struct " + type.name() + " {");
+    this->writeLine("struct " + type.displayName() + " {");
     fIndentation++;
     this->writeFields(type.fields(), type.fLine);
     fIndentation--;
@@ -191,14 +191,14 @@ void MetalCodeGenerator::writeExpression(const Expression& expr, Precedence pare
     }
 }
 
-String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
+std::string MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
                                              const ExpressionArray& arguments,
                                              const SkTArray<VariableReference*>& outVars) {
     AutoOutputStream outputToExtraFunctions(this, &fExtraFunctions, &fIndentation);
     const FunctionDeclaration& function = call.function();
 
-    String name = "_skOutParamHelper" + to_string(fSwizzleHelperCount++) +
-                  "_" + function.mangledName();
+    std::string name = "_skOutParamHelper" + std::to_string(fSwizzleHelperCount++) +
+                       "_" + function.mangledName();
     const char* separator = "";
 
     // Emit a prototype for the function we'll be calling through to in our helper.
@@ -248,7 +248,7 @@ String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
             }
         } else {
             this->write(" _var");
-            this->write(to_string(index));
+            this->write(std::to_string(index));
         }
     }
     this->writeLine(") {");
@@ -261,7 +261,7 @@ String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
         // float3 _var2[ = outParam.zyx];
         this->writeType(arguments[index]->type());
         this->write(" _var");
-        this->write(to_string(index));
+        this->write(std::to_string(index));
 
         const Variable* param = function.parameters()[index];
         if (param->modifiers().fFlags & Modifiers::kIn_Flag) {
@@ -291,7 +291,7 @@ String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
         separator = ", ";
 
         this->write("_var");
-        this->write(to_string(index));
+        this->write(std::to_string(index));
     }
     this->writeLine(");");
 
@@ -304,7 +304,7 @@ String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
         this->writeExpression(*arguments[index], Precedence::kAssignment);
         fIgnoreVariableReferenceModifiers = false;
         this->write(" = _var");
-        this->write(to_string(index));
+        this->write(std::to_string(index));
         this->writeLine(";");
     }
 
@@ -318,7 +318,7 @@ String MetalCodeGenerator::getOutParamHelper(const FunctionCall& call,
     return name;
 }
 
-String MetalCodeGenerator::getBitcastIntrinsic(const Type& outType) {
+std::string MetalCodeGenerator::getBitcastIntrinsic(const Type& outType) {
     return "as_type<" +  outType.displayName() + ">";
 }
 
@@ -445,7 +445,7 @@ matrix<T, 4, 4> mat4_inverse(matrix<T, 4, 4> m) {
 }
 )";
 
-String MetalCodeGenerator::getInversePolyfill(const ExpressionArray& arguments) {
+std::string MetalCodeGenerator::getInversePolyfill(const ExpressionArray& arguments) {
     // Only use polyfills for a function taking a single-argument square matrix.
     if (arguments.size() == 1) {
         const Type& type = arguments.front()->type();
@@ -484,7 +484,7 @@ matrix<T, C, R> matrixCompMult(matrix<T, C, R> a, const matrix<T, C, R> b) {
 }
 )";
 
-    String name = "matrixCompMult";
+    std::string name = "matrixCompMult";
     if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
         fWrittenIntrinsics.insert(name);
         fExtraFunctions.writeText(kMatrixCompMult);
@@ -503,15 +503,15 @@ matrix<T, C, R> outerProduct(const vec<T, R> a, const vec<T, C> b) {
 }
 )";
 
-    String name = "outerProduct";
+    std::string name = "outerProduct";
     if (fWrittenIntrinsics.find(name) == fWrittenIntrinsics.end()) {
         fWrittenIntrinsics.insert(name);
         fExtraFunctions.writeText(kOuterProduct);
     }
 }
 
-String MetalCodeGenerator::getTempVariable(const Type& type) {
-    String tempVar = "_skTemp" + to_string(fVarCount++);
+std::string MetalCodeGenerator::getTempVariable(const Type& type) {
+    std::string tempVar = "_skTemp" + std::to_string(fVarCount++);
     this->fFunctionHeader += "    " + this->typeName(type) + " " + tempVar + ";\n";
     return tempVar;
 }
@@ -545,7 +545,7 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
             const Type& arg1Type = arguments[1]->type();
             if (arg1Type.columns() == 3) {
                 // have to store the vector in a temp variable to avoid double evaluating it
-                String tmpVar = this->getTempVariable(arg1Type);
+                std::string tmpVar = this->getTempVariable(arg1Type);
                 this->write("(" + tmpVar + " = ");
                 this->writeExpression(*arguments[1], Precedence::kSequence);
                 this->write(", " + tmpVar + ".xy / " + tmpVar + ".z))");
@@ -558,8 +558,8 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
         }
         case k_mod_IntrinsicKind: {
             // fmod(x, y) in metal calculates x - y * trunc(x / y) instead of x - y * floor(x / y)
-            String tmpX = this->getTempVariable(arguments[0]->type());
-            String tmpY = this->getTempVariable(arguments[1]->type());
+            std::string tmpX = this->getTempVariable(arguments[0]->type());
+            std::string tmpY = this->getTempVariable(arguments[1]->type());
             this->write("(" + tmpX + " = ");
             this->writeExpression(*arguments[0], Precedence::kSequence);
             this->write(", " + tmpY + " = ");
@@ -730,8 +730,8 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
         case k_reflect_IntrinsicKind: {
             if (arguments[0]->type().columns() == 1) {
                 // We need to synthesize `I - 2 * N * I * N`.
-                String tmpI = this->getTempVariable(arguments[0]->type());
-                String tmpN = this->getTempVariable(arguments[1]->type());
+                std::string tmpI = this->getTempVariable(arguments[0]->type());
+                std::string tmpN = this->getTempVariable(arguments[1]->type());
 
                 // (_skTempI = ...
                 this->write("(" + tmpI + " = ");
@@ -777,8 +777,8 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
         }
         case k_findLSB_IntrinsicKind: {
             // Create a temp variable to store the expression, to avoid double-evaluating it.
-            String skTemp = this->getTempVariable(arguments[0]->type());
-            String exprType = this->typeName(arguments[0]->type());
+            std::string skTemp = this->getTempVariable(arguments[0]->type());
+            std::string exprType = this->typeName(arguments[0]->type());
 
             // ctz returns numbits(type) on zero inputs; GLSL documents it as generating -1 instead.
             // Use select to detect zero inputs and force a -1 result.
@@ -801,8 +801,8 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
         }
         case k_findMSB_IntrinsicKind: {
             // Create a temp variable to store the expression, to avoid double-evaluating it.
-            String skTemp1 = this->getTempVariable(arguments[0]->type());
-            String exprType = this->typeName(arguments[0]->type());
+            std::string skTemp1 = this->getTempVariable(arguments[0]->type());
+            std::string exprType = this->typeName(arguments[0]->type());
 
             // GLSL findMSB is actually quite different from Metal's clz:
             // - For signed negative numbers, it returns the first zero bit, not the first one bit!
@@ -817,7 +817,7 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
 
             // Signed input types might be negative; we need another helper variable to negate the
             // input (since we can only find one bits, not zero bits).
-            String skTemp2;
+            std::string skTemp2;
             if (arguments[0]->type().isSigned()) {
                 // ... _skTemp2 = (select(_skTemp1, ~_skTemp1, _skTemp1 < 0)),
                 skTemp2 = this->getTempVariable(arguments[0]->type());
@@ -847,6 +847,36 @@ bool MetalCodeGenerator::writeIntrinsicCall(const FunctionCall& c, IntrinsicKind
             this->write("(0)))");
             return true;
         }
+        case k_sign_IntrinsicKind: {
+            if (arguments[0]->type().componentType().isInteger()) {
+                // Create a temp variable to store the expression, to avoid double-evaluating it.
+                std::string skTemp = this->getTempVariable(arguments[0]->type());
+                std::string exprType = this->typeName(arguments[0]->type());
+
+                // (_skTemp = (.....),
+                this->write("(");
+                this->write(skTemp);
+                this->write(" = (");
+                this->writeExpression(*arguments[0], Precedence::kSequence);
+                this->write("), ");
+
+                // ... select(select(int4(0), int4(-1), _skTemp < 0), int4(1), _skTemp > 0))
+                this->write("select(select(");
+                this->write(exprType);
+                this->write("(0), ");
+                this->write(exprType);
+                this->write("(-1), ");
+                this->write(skTemp);
+                this->write(" < 0), ");
+                this->write(exprType);
+                this->write("(1), ");
+                this->write(skTemp);
+                this->write(" > 0))");
+            } else {
+                this->writeSimpleIntrinsic(c);
+            }
+            return true;
+        }
         case k_matrixCompMult_IntrinsicKind: {
             this->writeMatrixCompMult();
             this->writeSimpleIntrinsic(c);
@@ -1028,18 +1058,17 @@ void MetalCodeGenerator::assembleMatrixFromExpressions(const AnyConstructor& cto
 // Keeps track of previously generated constructors so that we won't generate more than one
 // constructor for any given permutation of input argument types. Returns the name of the
 // generated constructor method.
-String MetalCodeGenerator::getMatrixConstructHelper(const AnyConstructor& c) {
+std::string MetalCodeGenerator::getMatrixConstructHelper(const AnyConstructor& c) {
     const Type& type = c.type();
     int columns = type.columns();
     int rows = type.rows();
     auto args = c.argumentSpan();
-    String typeName = this->typeName(type);
+    std::string typeName = this->typeName(type);
 
     // Create the helper-method name and use it as our lookup key.
-    String name;
-    name.appendf("%s_from", typeName.c_str());
+    std::string name = String::printf("%s_from", typeName.c_str());
     for (const std::unique_ptr<Expression>& expr : args) {
-        name.appendf("_%s", this->typeName(expr->type()).c_str());
+        String::appendf(&name, "_%s", this->typeName(expr->type()).c_str());
     }
 
     // If a helper-method has already been synthesized, we don't need to synthesize it again.
@@ -1142,10 +1171,10 @@ void MetalCodeGenerator::writeConstructorArrayCast(const ConstructorArrayCast& c
                                                    Precedence parentPrecedence) {
     const Type& inType = c.argument()->type().componentType();
     const Type& outType = c.type().componentType();
-    String inTypeName = this->typeName(inType);
-    String outTypeName = this->typeName(outType);
+    std::string inTypeName = this->typeName(inType);
+    std::string outTypeName = this->typeName(outType);
 
-    String name = "array_of_" + outTypeName + "_from_" + inTypeName;
+    std::string name = "array_of_" + outTypeName + "_from_" + inTypeName;
     auto [iter, didInsert] = fHelpers.insert(name);
     if (didInsert) {
         fExtraFunctions.printf(R"(
@@ -1169,13 +1198,13 @@ array<%s, N> %s(thread const array<%s, N>& x) {
     this->write(")");
 }
 
-String MetalCodeGenerator::getVectorFromMat2x2ConstructorHelper(const Type& matrixType) {
+std::string MetalCodeGenerator::getVectorFromMat2x2ConstructorHelper(const Type& matrixType) {
     SkASSERT(matrixType.isMatrix());
     SkASSERT(matrixType.rows() == 2);
     SkASSERT(matrixType.columns() == 2);
 
-    String baseType = this->typeName(matrixType.componentType());
-    String name = String::printf("%s4_from_%s2x2", baseType.c_str(), baseType.c_str());
+    std::string baseType = this->typeName(matrixType.componentType());
+    std::string name = String::printf("%s4_from_%s2x2", baseType.c_str(), baseType.c_str());
     if (fHelpers.find(name) == fHelpers.end()) {
         fHelpers.insert(name);
 
@@ -1386,7 +1415,7 @@ void MetalCodeGenerator::writeMatrixTimesEqualHelper(const Type& left, const Typ
     SkASSERT(left.rows() == result.rows());
     SkASSERT(left.columns() == result.columns());
 
-    String key = "Matrix *= " + this->typeName(left) + ":" + this->typeName(right);
+    std::string key = "Matrix *= " + this->typeName(left) + ":" + this->typeName(right);
 
     auto [iter, wasInserted] = fHelpers.insert(key);
     if (wasInserted) {
@@ -1405,7 +1434,7 @@ void MetalCodeGenerator::writeMatrixEqualityHelpers(const Type& left, const Type
     SkASSERT(left.rows() == right.rows());
     SkASSERT(left.columns() == right.columns());
 
-    String key = "Matrix == " + this->typeName(left) + ":" + this->typeName(right);
+    std::string key = "Matrix == " + this->typeName(left) + ":" + this->typeName(right);
 
     auto [iter, wasInserted] = fHelpers.insert(key);
     if (wasInserted) {
@@ -1442,11 +1471,11 @@ thread bool operator!=(const %s left, const %s right);
 void MetalCodeGenerator::writeMatrixDivisionHelpers(const Type& type) {
     SkASSERT(type.isMatrix());
 
-    String key = "Matrix / " + this->typeName(type);
+    std::string key = "Matrix / " + this->typeName(type);
 
     auto [iter, wasInserted] = fHelpers.insert(key);
     if (wasInserted) {
-        String typeName = this->typeName(type);
+        std::string typeName = this->typeName(type);
 
         fExtraFunctions.printf(
                 "thread %s operator/(const %s left, const %s right) {\n"
@@ -1504,7 +1533,7 @@ bool operator!=(thread const array<T1, N>& left, thread const array<T2, N>& righ
 
 void MetalCodeGenerator::writeStructEqualityHelpers(const Type& type) {
     SkASSERT(type.isStruct());
-    String key = "StructEquality " + this->typeName(type);
+    std::string key = "StructEquality " + this->typeName(type);
 
     auto [iter, wasInserted] = fHelpers.insert(key);
     if (wasInserted) {
@@ -1642,11 +1671,9 @@ void MetalCodeGenerator::writeBinaryExpression(const BinaryExpression& b,
         // as long as the LHS has no side effects, and hope for the best otherwise.
         this->write(" = ");
         this->writeExpression(left, Precedence::kAssignment);
-        this->write(" ");
-        this->write(OperatorName(op.removeAssignment()));
-        this->write(" ");
+        this->write(operator_name(op.removeAssignment()));
     } else {
-        this->write(String(" ") + OperatorName(op) + " ");
+        this->write(operator_name(op));
     }
 
     needMatrixSplatOnScalar = leftType.isMatrix() && rightType.isNumber() &&
@@ -1678,11 +1705,11 @@ void MetalCodeGenerator::writeTernaryExpression(const TernaryExpression& t,
 }
 
 void MetalCodeGenerator::writePrefixExpression(const PrefixExpression& p,
-                                              Precedence parentPrecedence) {
+                                               Precedence parentPrecedence) {
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write("(");
     }
-    this->write(OperatorName(p.getOperator()));
+    this->write(p.getOperator().tightOperatorName());
     this->writeExpression(*p.operand(), Precedence::kPrefix);
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write(")");
@@ -1690,12 +1717,12 @@ void MetalCodeGenerator::writePrefixExpression(const PrefixExpression& p,
 }
 
 void MetalCodeGenerator::writePostfixExpression(const PostfixExpression& p,
-                                               Precedence parentPrecedence) {
+                                                Precedence parentPrecedence) {
     if (Precedence::kPostfix >= parentPrecedence) {
         this->write("(");
     }
     this->writeExpression(*p.operand(), Precedence::kPostfix);
-    this->write(OperatorName(p.getOperator()));
+    this->write(p.getOperator().tightOperatorName());
     if (Precedence::kPostfix >= parentPrecedence) {
         this->write(")");
     }
@@ -1704,21 +1731,21 @@ void MetalCodeGenerator::writePostfixExpression(const PostfixExpression& p,
 void MetalCodeGenerator::writeLiteral(const Literal& l) {
     const Type& type = l.type();
     if (type.isFloat()) {
-        this->write(to_string(l.floatValue()));
+        this->write(skstd::to_string(l.floatValue()));
         if (!l.type().highPrecision()) {
             this->write("h");
         }
         return;
     }
     if (type.isInteger()) {
-        if (type == *fContext.fTypes.fUInt) {
-            this->write(to_string(l.intValue() & 0xffffffff));
+        if (type.matches(*fContext.fTypes.fUInt)) {
+            this->write(std::to_string(l.intValue() & 0xffffffff));
             this->write("u");
-        } else if (type == *fContext.fTypes.fUShort) {
-            this->write(to_string(l.intValue() & 0xffff));
+        } else if (type.matches(*fContext.fTypes.fUShort)) {
+            this->write(std::to_string(l.intValue() & 0xffff));
             this->write("u");
         } else {
-            this->write(to_string(l.intValue()));
+            this->write(std::to_string(l.intValue()));
         }
         return;
     }
@@ -1820,7 +1847,7 @@ bool MetalCodeGenerator::writeFunctionDeclaration(const FunctionDeclaration& f)
         this->write("(Inputs _in [[stage_in]]");
         if (-1 != fUniformBuffer) {
             this->write(", constant Uniforms& _uniforms [[buffer(" +
-                        to_string(fUniformBuffer) + ")]]");
+                        std::to_string(fUniformBuffer) + ")]]");
         }
         for (const ProgramElement* e : fProgram.elements()) {
             if (e->is<GlobalVarDeclaration>()) {
@@ -1836,13 +1863,13 @@ bool MetalCodeGenerator::writeFunctionDeclaration(const FunctionDeclaration& f)
                     this->write(", texture2d<half> ");
                     this->writeName(var.var().name());
                     this->write("[[texture(");
-                    this->write(to_string(binding));
+                    this->write(std::to_string(binding));
                     this->write(")]]");
                     this->write(", sampler ");
                     this->writeName(var.var().name());
                     this->write(SAMPLER_SUFFIX);
                     this->write("[[sampler(");
-                    this->write(to_string(binding));
+                    this->write(std::to_string(binding));
                     this->write(")]]");
                 }
             } else if (e->is<InterfaceBlock>()) {
@@ -1855,7 +1882,7 @@ bool MetalCodeGenerator::writeFunctionDeclaration(const FunctionDeclaration& f)
                 this->write("& " );
                 this->write(fInterfaceBlockNameMap[&intf]);
                 this->write(" [[buffer(");
-                this->write(to_string(this->getUniformBinding(intf.variable().modifiers())));
+                this->write(std::to_string(this->getUniformBinding(intf.variable().modifiers())));
                 this->write(")]]");
             }
         }
@@ -1980,7 +2007,7 @@ void MetalCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
     }
     this->writeModifiers(intf.variable().modifiers());
     this->write("struct ");
-    this->writeLine(intf.typeName() + " {");
+    this->writeLine(std::string(intf.typeName()) + " {");
     const Type* structType = &intf.variable().type();
     if (structType->isArray()) {
         structType = &structType->componentType();
@@ -1997,13 +2024,13 @@ void MetalCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf) {
         this->write(intf.instanceName());
         if (intf.arraySize() > 0) {
             this->write("[");
-            this->write(to_string(intf.arraySize()));
+            this->write(std::to_string(intf.arraySize()));
             this->write("]");
         }
         fInterfaceBlockNameMap[&intf] = intf.instanceName();
     } else {
-        fInterfaceBlockNameMap[&intf] = *fProgram.fSymbols->takeOwnershipOfString("_anonInterface" +
-                to_string(fAnonInterfaceCount++));
+        fInterfaceBlockNameMap[&intf] = *fProgram.fSymbols->takeOwnershipOfString(
+                "_anonInterface" + std::to_string(fAnonInterfaceCount++));
     }
     this->writeLine(";");
 }
@@ -2016,29 +2043,29 @@ void MetalCodeGenerator::writeFields(const std::vector<Type::Field>& fields, int
         int fieldOffset = field.fModifiers.fLayout.fOffset;
         const Type* fieldType = field.fType;
         if (!MemoryLayout::LayoutIsSupported(*fieldType)) {
-            fContext.fErrors->error(parentLine, "type '" + fieldType->name() +
+            fContext.fErrors->error(parentLine, "type '" + std::string(fieldType->name()) +
                                                 "' is not permitted here");
             return;
         }
         if (fieldOffset != -1) {
             if (currentOffset > fieldOffset) {
                 fContext.fErrors->error(parentLine,
-                        "offset of field '" + field.fName + "' must be at least " +
-                        to_string((int) currentOffset));
+                                        "offset of field '" + std::string(field.fName) +
+                                        "' must be at least " + std::to_string(currentOffset));
                 return;
             } else if (currentOffset < fieldOffset) {
                 this->write("char pad");
-                this->write(to_string(fPaddingCount++));
+                this->write(std::to_string(fPaddingCount++));
                 this->write("[");
-                this->write(to_string(fieldOffset - currentOffset));
+                this->write(std::to_string(fieldOffset - currentOffset));
                 this->writeLine("];");
                 currentOffset = fieldOffset;
             }
             int alignment = memoryLayout.alignment(*fieldType);
             if (fieldOffset % alignment) {
                 fContext.fErrors->error(parentLine,
-                        "offset of field '" + field.fName + "' must be a multiple of " +
-                        to_string((int) alignment));
+                                        "offset of field '" + std::string(field.fName) +
+                                        "' must be a multiple of " + std::to_string(alignment));
                 return;
             }
         }
@@ -2063,7 +2090,7 @@ void MetalCodeGenerator::writeVarInitializer(const Variable& var, const Expressi
     this->writeExpression(value, Precedence::kTopLevel);
 }
 
-void MetalCodeGenerator::writeName(skstd::string_view name) {
+void MetalCodeGenerator::writeName(std::string_view name) {
     if (fReservedWords.find(name) != fReservedWords.end()) {
         this->write("_"); // adding underscore before name to avoid conflict with reserved words
     }
@@ -2088,8 +2115,7 @@ void MetalCodeGenerator::writeStatement(const Statement& s) {
             this->writeBlock(s.as<Block>());
             break;
         case Statement::Kind::kExpression:
-            this->writeExpression(*s.as<ExpressionStatement>().expression(), Precedence::kTopLevel);
-            this->write(";");
+            this->writeExpressionStatement(s.as<ExpressionStatement>());
             break;
         case Statement::Kind::kReturn:
             this->writeReturnStatement(s.as<ReturnStatement>());
@@ -2194,6 +2220,13 @@ void MetalCodeGenerator::writeDoStatement(const DoStatement& d) {
     this->write(");");
 }
 
+void MetalCodeGenerator::writeExpressionStatement(const ExpressionStatement& s) {
+    if (s.expression()->hasSideEffects()) {
+        this->writeExpression(*s.expression(), Precedence::kTopLevel);
+        this->write(";");
+    }
+}
+
 void MetalCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
     this->write("switch (");
     this->writeExpression(*s.value(), Precedence::kTopLevel);
@@ -2201,12 +2234,12 @@ void MetalCodeGenerator::writeSwitchStatement(const SwitchStatement& s) {
     fIndentation++;
     for (const std::unique_ptr<Statement>& stmt : s.cases()) {
         const SwitchCase& c = stmt->as<SwitchCase>();
-        if (c.value()) {
+        if (c.isDefault()) {
+            this->writeLine("default:");
+        } else {
             this->write("case ");
-            this->writeExpression(*c.value(), Precedence::kTopLevel);
+            this->write(std::to_string(c.value()));
             this->writeLine(":");
-        } else {
-            this->writeLine("default:");
         }
         if (!c.statement()->isEmpty()) {
             fIndentation++;
@@ -2234,7 +2267,7 @@ void MetalCodeGenerator::writeReturnStatementFromMain() {
 void MetalCodeGenerator::writeReturnStatement(const ReturnStatement& r) {
     if (fCurrentFunction && fCurrentFunction->isMain()) {
         if (r.expression()) {
-            if (r.expression()->type() == *fContext.fTypes.fHalf4) {
+            if (r.expression()->type().matches(*fContext.fTypes.fHalf4)) {
                 this->write("_out.sk_FragColor = ");
                 this->writeExpression(*r.expression(), Precedence::kTopLevel);
                 this->writeLine(";");
@@ -2307,10 +2340,10 @@ void MetalCodeGenerator::writeInputStruct() {
                 if (-1 != var.modifiers().fLayout.fLocation) {
                     if (fProgram.fConfig->fKind == ProgramKind::kVertex) {
                         this->write("  [[attribute(" +
-                                    to_string(var.modifiers().fLayout.fLocation) + ")]]");
+                                    std::to_string(var.modifiers().fLayout.fLocation) + ")]]");
                     } else if (fProgram.fConfig->fKind == ProgramKind::kFragment) {
                         this->write("  [[user(locn" +
-                                    to_string(var.modifiers().fLayout.fLocation) + ")]]");
+                                    std::to_string(var.modifiers().fLayout.fLocation) + ")]]");
                     }
                 }
                 this->write(";\n");
@@ -2343,12 +2376,12 @@ void MetalCodeGenerator::writeOutputStruct() {
                     fContext.fErrors->error(var.fLine,
                             "Metal out variables must have 'layout(location=...)'");
                 } else if (fProgram.fConfig->fKind == ProgramKind::kVertex) {
-                    this->write(" [[user(locn" + to_string(location) + ")]]");
+                    this->write(" [[user(locn" + std::to_string(location) + ")]]");
                 } else if (fProgram.fConfig->fKind == ProgramKind::kFragment) {
-                    this->write(" [[color(" + to_string(location) + ")");
+                    this->write(" [[color(" + std::to_string(location) + ")");
                     int colorIndex = var.modifiers().fLayout.fIndex;
                     if (colorIndex) {
-                        this->write(", index(" + to_string(colorIndex) + ")");
+                        this->write(", index(" + std::to_string(colorIndex) + ")");
                     }
                     this->write("]]");
                 }
@@ -2400,7 +2433,7 @@ void MetalCodeGenerator::visitGlobalStruct(GlobalStructVisitor* visitor) {
         if (var.type().typeKind() == Type::TypeKind::kSampler) {
             // Samplers are represented as a "texture/sampler" duo in the global struct.
             visitor->visitTexture(var.type(), var.name());
-            visitor->visitSampler(var.type(), var.name() + SAMPLER_SUFFIX);
+            visitor->visitSampler(var.type(), std::string(var.name()) + SAMPLER_SUFFIX);
             continue;
         }
 
@@ -2416,7 +2449,7 @@ void MetalCodeGenerator::writeGlobalStruct() {
     class : public GlobalStructVisitor {
     public:
         void visitInterfaceBlock(const InterfaceBlock& block,
-                                 skstd::string_view blockName) override {
+                                 std::string_view blockName) override {
             this->addElement();
             fCodeGen->write("    constant ");
             fCodeGen->write(block.typeName());
@@ -2424,7 +2457,7 @@ void MetalCodeGenerator::writeGlobalStruct() {
             fCodeGen->writeName(blockName);
             fCodeGen->write(";\n");
         }
-        void visitTexture(const Type& type, skstd::string_view name) override {
+        void visitTexture(const Type& type, std::string_view name) override {
             this->addElement();
             fCodeGen->write("    ");
             fCodeGen->writeType(type);
@@ -2432,7 +2465,7 @@ void MetalCodeGenerator::writeGlobalStruct() {
             fCodeGen->writeName(name);
             fCodeGen->write(";\n");
         }
-        void visitSampler(const Type&, skstd::string_view name) override {
+        void visitSampler(const Type&, std::string_view name) override {
             this->addElement();
             fCodeGen->write("    sampler ");
             fCodeGen->writeName(name);
@@ -2473,16 +2506,16 @@ void MetalCodeGenerator::writeGlobalInit() {
     class : public GlobalStructVisitor {
     public:
         void visitInterfaceBlock(const InterfaceBlock& blockType,
-                                 skstd::string_view blockName) override {
+                                 std::string_view blockName) override {
             this->addElement();
             fCodeGen->write("&");
             fCodeGen->writeName(blockName);
         }
-        void visitTexture(const Type&, skstd::string_view name) override {
+        void visitTexture(const Type&, std::string_view name) override {
             this->addElement();
             fCodeGen->writeName(name);
         }
-        void visitSampler(const Type&, skstd::string_view name) override {
+        void visitSampler(const Type&, std::string_view name) override {
             this->addElement();
             fCodeGen->writeName(name);
         }
diff --git a/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h b/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h
index d83d42615dc82..09652a831b229 100644
--- a/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h
+++ b/third_party/skia/src/sksl/codegen/SkSLMetalCodeGenerator.h
@@ -23,6 +23,7 @@ class ConstructorArrayCast;
 class ConstructorCompound;
 class ConstructorMatrixResize;
 class DoStatement;
+class ExpressionStatement;
 class Extension;
 class FieldAccess;
 class ForStatement;
@@ -72,14 +73,12 @@ class MetalCodeGenerator : public CodeGenerator {
     inline static constexpr Requirements kGlobals_Requirement   = 1 << 3;
     inline static constexpr Requirements kFragCoord_Requirement = 1 << 4;
 
-    static const char* OperatorName(Operator op);
-
     class GlobalStructVisitor;
     void visitGlobalStruct(GlobalStructVisitor* visitor);
 
-    void write(skstd::string_view s);
+    void write(std::string_view s);
 
-    void writeLine(skstd::string_view s = skstd::string_view());
+    void writeLine(std::string_view s = std::string_view());
 
     void finishLine();
 
@@ -108,7 +107,7 @@ class MetalCodeGenerator : public CodeGenerator {
 
     void writePrecisionModifier();
 
-    String typeName(const Type& type);
+    std::string typeName(const Type& type);
 
     void writeStructDefinition(const StructDefinition& s);
 
@@ -137,7 +136,7 @@ class MetalCodeGenerator : public CodeGenerator {
 
     void writeVarInitializer(const Variable& var, const Expression& value);
 
-    void writeName(skstd::string_view name);
+    void writeName(std::string_view name);
 
     void writeVarDeclaration(const VarDeclaration& decl);
 
@@ -149,20 +148,20 @@ class MetalCodeGenerator : public CodeGenerator {
 
     void writeMinAbsHack(Expression& absExpr, Expression& otherExpr);
 
-    String getOutParamHelper(const FunctionCall& c,
+    std::string getOutParamHelper(const FunctionCall& c,
                              const ExpressionArray& arguments,
                              const SkTArray<VariableReference*>& outVars);
 
-    String getInversePolyfill(const ExpressionArray& arguments);
+    std::string getInversePolyfill(const ExpressionArray& arguments);
 
-    String getBitcastIntrinsic(const Type& outType);
+    std::string getBitcastIntrinsic(const Type& outType);
 
-    String getTempVariable(const Type& varType);
+    std::string getTempVariable(const Type& varType);
 
     void writeFunctionCall(const FunctionCall& c);
 
     bool matrixConstructHelperIsNeeded(const ConstructorCompound& c);
-    String getMatrixConstructHelper(const AnyConstructor& c);
+    std::string getMatrixConstructHelper(const AnyConstructor& c);
     void assembleMatrixFromMatrix(const Type& sourceMatrix, int rows, int columns);
     void assembleMatrixFromExpressions(const AnyConstructor& ctor, int rows, int columns);
 
@@ -176,7 +175,7 @@ class MetalCodeGenerator : public CodeGenerator {
 
     void writeMatrixEqualityHelpers(const Type& left, const Type& right);
 
-    String getVectorFromMat2x2ConstructorHelper(const Type& matrixType);
+    std::string getVectorFromMat2x2ConstructorHelper(const Type& matrixType);
 
     void writeArrayEqualityHelpers(const Type& type);
 
@@ -244,6 +243,8 @@ class MetalCodeGenerator : public CodeGenerator {
 
     void writeDoStatement(const DoStatement& d);
 
+    void writeExpressionStatement(const ExpressionStatement& s);
+
     void writeSwitchStatement(const SwitchStatement& s);
 
     void writeReturnStatementFromMain();
@@ -262,27 +263,27 @@ class MetalCodeGenerator : public CodeGenerator {
 
     int getUniformSet(const Modifiers& m);
 
-    std::unordered_set<skstd::string_view> fReservedWords;
+    std::unordered_set<std::string_view> fReservedWords;
     std::unordered_map<const Type::Field*, const InterfaceBlock*> fInterfaceBlockMap;
-    std::unordered_map<const InterfaceBlock*, skstd::string_view> fInterfaceBlockNameMap;
+    std::unordered_map<const InterfaceBlock*, std::string_view> fInterfaceBlockNameMap;
     int fAnonInterfaceCount = 0;
     int fPaddingCount = 0;
     const char* fLineEnding;
-    String fFunctionHeader;
+    std::string fFunctionHeader;
     StringStream fExtraFunctions;
     StringStream fExtraFunctionPrototypes;
     int fVarCount = 0;
     int fIndentation = 0;
     bool fAtLineStart = false;
-    std::set<String> fWrittenIntrinsics;
+    std::set<std::string> fWrittenIntrinsics;
     // true if we have run into usages of dFdx / dFdy
     bool fFoundDerivatives = false;
     std::unordered_map<const FunctionDeclaration*, Requirements> fRequirements;
     bool fSetupFragPositionGlobal = false;
     bool fSetupFragPositionLocal = false;
-    std::unordered_set<String> fHelpers;
+    std::unordered_set<std::string> fHelpers;
     int fUniformBuffer = -1;
-    String fRTFlipName;
+    std::string fRTFlipName;
     const FunctionDeclaration* fCurrentFunction = nullptr;
     int fSwizzleHelperCount = 0;
     bool fIgnoreVariableReferenceModifiers = false;
diff --git a/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp b/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
index b8f9e205f2519..e6df08a9303ed 100644
--- a/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.cpp
@@ -61,21 +61,21 @@ class PipelineStageCodeGenerator {
 private:
     using Precedence = Operator::Precedence;
 
-    void write(skstd::string_view s);
-    void writeLine(skstd::string_view s = skstd::string_view());
+    void write(std::string_view s);
+    void writeLine(std::string_view s = std::string_view());
 
-    String typeName(const Type& type);
+    std::string typeName(const Type& type);
     void writeType(const Type& type);
 
-    String functionName(const FunctionDeclaration& decl);
+    std::string functionName(const FunctionDeclaration& decl);
     void writeFunction(const FunctionDefinition& f);
     void writeFunctionDeclaration(const FunctionDeclaration& decl);
 
-    String modifierString(const Modifiers& modifiers);
-    String functionDeclaration(const FunctionDeclaration& decl);
+    std::string modifierString(const Modifiers& modifiers);
+    std::string functionDeclaration(const FunctionDeclaration& decl);
 
     // Handles arrays correctly, eg: `float x[2]`
-    String typedVariable(const Type& type, skstd::string_view name);
+    std::string typedVariable(const Type& type, std::string_view name);
 
     void writeVarDeclaration(const VarDeclaration& var);
     void writeGlobalVarDeclaration(const GlobalVarDeclaration& g);
@@ -126,20 +126,20 @@ class PipelineStageCodeGenerator {
     const char*    fDestColor;
     Callbacks*     fCallbacks;
 
-    std::unordered_map<const Variable*, String>            fVariableNames;
-    std::unordered_map<const FunctionDeclaration*, String> fFunctionNames;
-    std::unordered_map<const Type*, String>                fStructNames;
+    std::unordered_map<const Variable*, std::string>            fVariableNames;
+    std::unordered_map<const FunctionDeclaration*, std::string> fFunctionNames;
+    std::unordered_map<const Type*, std::string>                fStructNames;
 
     StringStream* fBuffer = nullptr;
     bool          fCastReturnsToHalf = false;
 };
 
 
-void PipelineStageCodeGenerator::write(skstd::string_view s) {
+void PipelineStageCodeGenerator::write(std::string_view s) {
     fBuffer->write(s.data(), s.length());
 }
 
-void PipelineStageCodeGenerator::writeLine(skstd::string_view s) {
+void PipelineStageCodeGenerator::writeLine(std::string_view s) {
     fBuffer->write(s.data(), s.length());
     fBuffer->writeText("\n");
 }
@@ -167,7 +167,7 @@ void PipelineStageCodeGenerator::writeChildCall(const ChildCall& c) {
 
     // Shaders require a coordinate argument. Color filters require a color argument.
     // Blenders require two color arguments.
-    String sampleOutput;
+    std::string sampleOutput;
     {
         AutoOutputBuffer exprBuffer(this);
         this->writeExpression(*arguments[0], Precedence::kSequence);
@@ -175,23 +175,23 @@ void PipelineStageCodeGenerator::writeChildCall(const ChildCall& c) {
         switch (c.child().type().typeKind()) {
             case Type::TypeKind::kShader: {
                 SkASSERT(arguments.size() == 1);
-                SkASSERT(arguments[0]->type() == *fProgram.fContext->fTypes.fFloat2);
+                SkASSERT(arguments[0]->type().matches(*fProgram.fContext->fTypes.fFloat2));
                 sampleOutput = fCallbacks->sampleShader(index, exprBuffer.fBuffer.str());
                 break;
             }
             case Type::TypeKind::kColorFilter: {
                 SkASSERT(arguments.size() == 1);
-                SkASSERT(arguments[0]->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                         arguments[0]->type() == *fProgram.fContext->fTypes.fFloat4);
+                SkASSERT(arguments[0]->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                         arguments[0]->type().matches(*fProgram.fContext->fTypes.fFloat4));
                 sampleOutput = fCallbacks->sampleColorFilter(index, exprBuffer.fBuffer.str());
                 break;
             }
             case Type::TypeKind::kBlender: {
                 SkASSERT(arguments.size() == 2);
-                SkASSERT(arguments[0]->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                         arguments[0]->type() == *fProgram.fContext->fTypes.fFloat4);
-                SkASSERT(arguments[1]->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                         arguments[1]->type() == *fProgram.fContext->fTypes.fFloat4);
+                SkASSERT(arguments[0]->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                         arguments[0]->type().matches(*fProgram.fContext->fTypes.fFloat4));
+                SkASSERT(arguments[1]->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                         arguments[1]->type().matches(*fProgram.fContext->fTypes.fFloat4));
 
                 AutoOutputBuffer exprBuffer2(this);
                 this->writeExpression(*arguments[1], Precedence::kSequence);
@@ -213,6 +213,30 @@ void PipelineStageCodeGenerator::writeChildCall(const ChildCall& c) {
 void PipelineStageCodeGenerator::writeFunctionCall(const FunctionCall& c) {
     const FunctionDeclaration& function = c.function();
 
+    if (function.intrinsicKind() == IntrinsicKind::k_toLinearSrgb_IntrinsicKind ||
+        function.intrinsicKind() == IntrinsicKind::k_fromLinearSrgb_IntrinsicKind) {
+        SkASSERT(c.arguments().size() == 1);
+        std::string colorArg;
+        {
+            AutoOutputBuffer exprBuffer(this);
+            this->writeExpression(*c.arguments()[0], Precedence::kSequence);
+            colorArg = exprBuffer.fBuffer.str();
+        }
+
+        switch (function.intrinsicKind()) {
+            case IntrinsicKind::k_toLinearSrgb_IntrinsicKind:
+                this->write(fCallbacks->toLinearSrgb(std::move(colorArg)));
+                break;
+            case IntrinsicKind::k_fromLinearSrgb_IntrinsicKind:
+                this->write(fCallbacks->fromLinearSrgb(std::move(colorArg)));
+                break;
+            default:
+                SkUNREACHABLE;
+        }
+
+        return;
+    }
+
     if (function.isBuiltin()) {
         this->write(function.name());
     } else {
@@ -287,12 +311,12 @@ void PipelineStageCodeGenerator::writeSwitchStatement(const SwitchStatement& s)
     this->writeLine(") {");
     for (const std::unique_ptr<Statement>& stmt : s.cases()) {
         const SwitchCase& c = stmt->as<SwitchCase>();
-        if (c.value()) {
+        if (c.isDefault()) {
+            this->writeLine("default:");
+        } else {
             this->write("case ");
-            this->writeExpression(*c.value(), Precedence::kTopLevel);
+            this->write(std::to_string(c.value()));
             this->writeLine(":");
-        } else {
-            this->writeLine("default:");
         }
         if (!c.statement()->isEmpty()) {
             this->writeStatement(*c.statement());
@@ -303,9 +327,9 @@ void PipelineStageCodeGenerator::writeSwitchStatement(const SwitchStatement& s)
     this->write("}");
 }
 
-String PipelineStageCodeGenerator::functionName(const FunctionDeclaration& decl) {
+std::string PipelineStageCodeGenerator::functionName(const FunctionDeclaration& decl) {
     if (decl.isMain()) {
-        return String(decl.name());
+        return std::string(fCallbacks->getMainName());
     }
 
     auto it = fFunctionNames.find(&decl);
@@ -313,7 +337,7 @@ String PipelineStageCodeGenerator::functionName(const FunctionDeclaration& decl)
         return it->second;
     }
 
-    String mangledName = fCallbacks->getMangledName(String(decl.name()).c_str());
+    std::string mangledName = fCallbacks->getMangledName(std::string(decl.name()).c_str());
     fFunctionNames.insert({&decl, mangledName});
     return mangledName;
 }
@@ -327,7 +351,9 @@ void PipelineStageCodeGenerator::writeFunction(const FunctionDefinition& f) {
     // if the return type is float4 - injecting it unconditionally reduces the risk of an
     // obscure bug.
     const FunctionDeclaration& decl = f.declaration();
-    if (decl.isMain()) {
+    if (decl.isMain() &&
+        fProgram.fConfig->fKind != SkSL::ProgramKind::kCustomMeshVertex &&
+        fProgram.fConfig->fKind != SkSL::ProgramKind::kCustomMeshFragment) {
         fCastReturnsToHalf = true;
     }
 
@@ -345,10 +371,10 @@ void PipelineStageCodeGenerator::writeFunction(const FunctionDefinition& f) {
                                decl.isMain());
 }
 
-String PipelineStageCodeGenerator::functionDeclaration(const FunctionDeclaration& decl) {
+std::string PipelineStageCodeGenerator::functionDeclaration(const FunctionDeclaration& decl) {
     // This is similar to decl.description(), but substitutes a mangled name, and handles modifiers
     // on the function (e.g. `inline`) and its parameters (e.g. `inout`).
-    String declString =
+    std::string declString =
             String::printf("%s%s%s %s(",
                            (decl.modifiers().fFlags & Modifiers::kInline_Flag) ? "inline " : "",
                            (decl.modifiers().fFlags & Modifiers::kNoInline_Flag) ? "noinline " : "",
@@ -378,13 +404,13 @@ void PipelineStageCodeGenerator::writeGlobalVarDeclaration(const GlobalVarDeclar
     if (var.isBuiltin() || var.type().isOpaque()) {
         // Don't re-declare these. (eg, sk_FragCoord, or fragmentProcessor children)
     } else if (var.modifiers().fFlags & Modifiers::kUniform_Flag) {
-        String uniformName = fCallbacks->declareUniform(&decl);
+        std::string uniformName = fCallbacks->declareUniform(&decl);
         fVariableNames.insert({&var, std::move(uniformName)});
     } else {
-        String mangledName = fCallbacks->getMangledName(String(var.name()).c_str());
-        String declaration = this->modifierString(var.modifiers()) +
+        std::string mangledName = fCallbacks->getMangledName(std::string(var.name()).c_str());
+        std::string declaration = this->modifierString(var.modifiers()) +
                              this->typedVariable(var.type(),
-                                                 skstd::string_view(mangledName.c_str()));
+                                                 std::string_view(mangledName.c_str()));
         if (decl.value()) {
             AutoOutputBuffer outputToBuffer(this);
             this->writeExpression(*decl.value(), Precedence::kTopLevel);
@@ -399,8 +425,8 @@ void PipelineStageCodeGenerator::writeGlobalVarDeclaration(const GlobalVarDeclar
 
 void PipelineStageCodeGenerator::writeStructDefinition(const StructDefinition& s) {
     const Type& type = s.type();
-    String mangledName = fCallbacks->getMangledName(String(type.name()).c_str());
-    String definition = "struct " + mangledName + " {\n";
+    std::string mangledName = fCallbacks->getMangledName(type.displayName().c_str());
+    std::string definition = "struct " + mangledName + " {\n";
     for (const auto& f : type.fields()) {
         definition += this->typedVariable(*f.fType, f.fName) + ";\n";
     }
@@ -440,18 +466,19 @@ void PipelineStageCodeGenerator::writeProgramElementSecondPass(const ProgramElem
     }
 }
 
-String PipelineStageCodeGenerator::typeName(const Type& type) {
+std::string PipelineStageCodeGenerator::typeName(const Type& raw) {
+    const Type& type = raw.resolve();
     if (type.isArray()) {
         // This is necessary so that name mangling on arrays-of-structs works properly.
-        String arrayName = this->typeName(type.componentType());
+        std::string arrayName = this->typeName(type.componentType());
         arrayName.push_back('[');
-        arrayName += to_string(type.columns());
+        arrayName += std::to_string(type.columns());
         arrayName.push_back(']');
         return arrayName;
     }
 
     auto it = fStructNames.find(&type);
-    return it != fStructNames.end() ? it->second : String(type.name());
+    return it != fStructNames.end() ? it->second : std::string(type.name());
 }
 
 void PipelineStageCodeGenerator::writeType(const Type& type) {
@@ -561,9 +588,7 @@ void PipelineStageCodeGenerator::writeBinaryExpression(const BinaryExpression& b
         this->write("(");
     }
     this->writeExpression(left, precedence);
-    this->write(" ");
     this->write(op.operatorName());
-    this->write(" ");
     this->writeExpression(right, precedence);
     if (precedence >= parentPrecedence) {
         this->write(")");
@@ -590,7 +615,7 @@ void PipelineStageCodeGenerator::writePrefixExpression(const PrefixExpression& p
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write("(");
     }
-    this->write(p.getOperator().operatorName());
+    this->write(p.getOperator().tightOperatorName());
     this->writeExpression(*p.operand(), Precedence::kPrefix);
     if (Precedence::kPrefix >= parentPrecedence) {
         this->write(")");
@@ -603,14 +628,14 @@ void PipelineStageCodeGenerator::writePostfixExpression(const PostfixExpression&
         this->write("(");
     }
     this->writeExpression(*p.operand(), Precedence::kPostfix);
-    this->write(p.getOperator().operatorName());
+    this->write(p.getOperator().tightOperatorName());
     if (Precedence::kPostfix >= parentPrecedence) {
         this->write(")");
     }
 }
 
-String PipelineStageCodeGenerator::modifierString(const Modifiers& modifiers) {
-    String result;
+std::string PipelineStageCodeGenerator::modifierString(const Modifiers& modifiers) {
+    std::string result;
     if (modifiers.fFlags & Modifiers::kConst_Flag) {
         result.append("const ");
     }
@@ -626,12 +651,12 @@ String PipelineStageCodeGenerator::modifierString(const Modifiers& modifiers) {
     return result;
 }
 
-String PipelineStageCodeGenerator::typedVariable(const Type& type, skstd::string_view name) {
+std::string PipelineStageCodeGenerator::typedVariable(const Type& type, std::string_view name) {
     const Type& baseType = type.isArray() ? type.componentType() : type;
 
-    String decl = this->typeName(baseType) + " " + name;
+    std::string decl = this->typeName(baseType) + " " + std::string(name);
     if (type.isArray()) {
-        decl += "[" + to_string(type.columns()) + "]";
+        decl += "[" + std::to_string(type.columns()) + "]";
     }
     return decl;
 }
diff --git a/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h b/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
index cd5cd316bfefe..e4398edd1e425 100644
--- a/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
+++ b/third_party/skia/src/sksl/codegen/SkSLPipelineStageCodeGenerator.h
@@ -22,16 +22,20 @@ namespace PipelineStage {
     public:
         virtual ~Callbacks() = default;
 
-        virtual String getMangledName(const char* name) { return name; }
+        virtual std::string getMainName() { return "main"; }
+        virtual std::string getMangledName(const char* name) { return name; }
         virtual void   defineFunction(const char* declaration, const char* body, bool isMain) = 0;
         virtual void   declareFunction(const char* declaration) = 0;
         virtual void   defineStruct(const char* definition) = 0;
         virtual void   declareGlobal(const char* declaration) = 0;
 
-        virtual String declareUniform(const VarDeclaration*) = 0;
-        virtual String sampleShader(int index, String coords) = 0;
-        virtual String sampleColorFilter(int index, String color) = 0;
-        virtual String sampleBlender(int index, String src, String dst) = 0;
+        virtual std::string declareUniform(const VarDeclaration*) = 0;
+        virtual std::string sampleShader(int index, std::string coords) = 0;
+        virtual std::string sampleColorFilter(int index, std::string color) = 0;
+        virtual std::string sampleBlender(int index, std::string src, std::string dst) = 0;
+
+        virtual std::string toLinearSrgb(std::string color) = 0;
+        virtual std::string fromLinearSrgb(std::string color) = 0;
     };
 
     /*
diff --git a/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp b/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
index d419a9a3edb4c..52a6d1ab49bd9 100644
--- a/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.cpp
@@ -60,18 +60,22 @@ namespace SkSL {
 static const int32_t SKSL_MAGIC  = 0x001F0000;
 
 void SPIRVCodeGenerator::setupIntrinsics() {
-#define ALL_GLSL(x) std::make_tuple(kGLSL_STD_450_IntrinsicOpcodeKind, GLSLstd450 ## x, \
-                                    GLSLstd450 ## x, GLSLstd450 ## x, GLSLstd450 ## x)
-#define BY_TYPE_GLSL(ifFloat, ifInt, ifUInt) std::make_tuple(kGLSL_STD_450_IntrinsicOpcodeKind, \
-                                                             GLSLstd450 ## ifFloat,             \
-                                                             GLSLstd450 ## ifInt,               \
-                                                             GLSLstd450 ## ifUInt,              \
-                                                             SpvOpUndef)
-#define ALL_SPIRV(x) std::make_tuple(kSPIRV_IntrinsicOpcodeKind, \
-                                     SpvOp ## x, SpvOp ## x, SpvOp ## x, SpvOp ## x)
-#define SPECIAL(x) std::make_tuple(kSpecial_IntrinsicOpcodeKind, k ## x ## _SpecialIntrinsic, \
-                                   k ## x ## _SpecialIntrinsic, k ## x ## _SpecialIntrinsic,  \
-                                   k ## x ## _SpecialIntrinsic)
+#define ALL_GLSL(x) Intrinsic{kGLSL_STD_450_IntrinsicOpcodeKind, GLSLstd450 ## x, \
+                              GLSLstd450 ## x, GLSLstd450 ## x, GLSLstd450 ## x}
+#define BY_TYPE_GLSL(ifFloat, ifInt, ifUInt) Intrinsic{kGLSL_STD_450_IntrinsicOpcodeKind, \
+                                                       GLSLstd450 ## ifFloat,             \
+                                                       GLSLstd450 ## ifInt,               \
+                                                       GLSLstd450 ## ifUInt,              \
+                                                       SpvOpUndef}
+#define ALL_SPIRV(x) Intrinsic{kSPIRV_IntrinsicOpcodeKind, \
+                               SpvOp ## x, SpvOp ## x, SpvOp ## x, SpvOp ## x}
+#define BOOL_SPIRV(x) Intrinsic{kSPIRV_IntrinsicOpcodeKind, \
+                                SpvOpUndef, SpvOpUndef, SpvOpUndef, SpvOp ## x}
+#define FLOAT_SPIRV(x) Intrinsic{kSPIRV_IntrinsicOpcodeKind, \
+                                 SpvOp ## x, SpvOpUndef, SpvOpUndef, SpvOpUndef}
+#define SPECIAL(x) Intrinsic{kSpecial_IntrinsicOpcodeKind, k ## x ## _SpecialIntrinsic, \
+                             k ## x ## _SpecialIntrinsic, k ## x ## _SpecialIntrinsic,  \
+                             k ## x ## _SpecialIntrinsic}
     fIntrinsicMap[k_round_IntrinsicKind]         = ALL_GLSL(Round);
     fIntrinsicMap[k_roundEven_IntrinsicKind]     = ALL_GLSL(RoundEven);
     fIntrinsicMap[k_trunc_IntrinsicKind]         = ALL_GLSL(Trunc);
@@ -115,8 +119,7 @@ void SPIRVCodeGenerator::setupIntrinsics() {
     fIntrinsicMap[k_max_IntrinsicKind]           = SPECIAL(Max);
     fIntrinsicMap[k_clamp_IntrinsicKind]         = SPECIAL(Clamp);
     fIntrinsicMap[k_saturate_IntrinsicKind]      = SPECIAL(Saturate);
-    fIntrinsicMap[k_dot_IntrinsicKind]           = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                      SpvOpDot, SpvOpUndef, SpvOpUndef, SpvOpUndef);
+    fIntrinsicMap[k_dot_IntrinsicKind]           = FLOAT_SPIRV(Dot);
     fIntrinsicMap[k_mix_IntrinsicKind]           = SPECIAL(Mix);
     fIntrinsicMap[k_step_IntrinsicKind]          = SPECIAL(Step);
     fIntrinsicMap[k_smoothstep_IntrinsicKind]    = SPECIAL(SmoothStep);
@@ -143,59 +146,49 @@ void SPIRVCodeGenerator::setupIntrinsics() {
     fIntrinsicMap[k_bitCount_IntrinsicKind]    = ALL_SPIRV(BitCount);
     fIntrinsicMap[k_findLSB_IntrinsicKind]     = ALL_GLSL(FindILsb);
     fIntrinsicMap[k_findMSB_IntrinsicKind]     = BY_TYPE_GLSL(FindSMsb, FindSMsb, FindUMsb);
-    fIntrinsicMap[k_dFdx_IntrinsicKind]        = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                 SpvOpDPdx, SpvOpUndef,
-                                                                 SpvOpUndef, SpvOpUndef);
+    fIntrinsicMap[k_dFdx_IntrinsicKind]        = FLOAT_SPIRV(DPdx);
     fIntrinsicMap[k_dFdy_IntrinsicKind]        = SPECIAL(DFdy);
-    fIntrinsicMap[k_fwidth_IntrinsicKind]      = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                 SpvOpFwidth, SpvOpUndef,
-                                                                 SpvOpUndef, SpvOpUndef);
+    fIntrinsicMap[k_fwidth_IntrinsicKind]      = FLOAT_SPIRV(Fwidth);
     fIntrinsicMap[k_makeSampler2D_IntrinsicKind] = SPECIAL(SampledImage);
 
     fIntrinsicMap[k_sample_IntrinsicKind]      = SPECIAL(Texture);
     fIntrinsicMap[k_subpassLoad_IntrinsicKind] = SPECIAL(SubpassLoad);
 
-    fIntrinsicMap[k_floatBitsToInt_IntrinsicKind]  = ALL_SPIRV(Bitcast);
-    fIntrinsicMap[k_floatBitsToUint_IntrinsicKind] = ALL_SPIRV(Bitcast);
-    fIntrinsicMap[k_intBitsToFloat_IntrinsicKind]  = ALL_SPIRV(Bitcast);
-    fIntrinsicMap[k_uintBitsToFloat_IntrinsicKind] = ALL_SPIRV(Bitcast);
-
-    fIntrinsicMap[k_any_IntrinsicKind]        = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                SpvOpUndef, SpvOpUndef,
-                                                                SpvOpUndef, SpvOpAny);
-    fIntrinsicMap[k_all_IntrinsicKind]        = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                SpvOpUndef, SpvOpUndef,
-                                                                SpvOpUndef, SpvOpAll);
-    fIntrinsicMap[k_not_IntrinsicKind]        = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                SpvOpUndef, SpvOpUndef, SpvOpUndef,
-                                                                SpvOpLogicalNot);
-    fIntrinsicMap[k_equal_IntrinsicKind]      = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
+    fIntrinsicMap[k_floatBitsToInt_IntrinsicKind]   = ALL_SPIRV(Bitcast);
+    fIntrinsicMap[k_floatBitsToUint_IntrinsicKind]  = ALL_SPIRV(Bitcast);
+    fIntrinsicMap[k_intBitsToFloat_IntrinsicKind]   = ALL_SPIRV(Bitcast);
+    fIntrinsicMap[k_uintBitsToFloat_IntrinsicKind]  = ALL_SPIRV(Bitcast);
+
+    fIntrinsicMap[k_any_IntrinsicKind]              = BOOL_SPIRV(Any);
+    fIntrinsicMap[k_all_IntrinsicKind]              = BOOL_SPIRV(All);
+    fIntrinsicMap[k_not_IntrinsicKind]              = BOOL_SPIRV(LogicalNot);
+    fIntrinsicMap[k_equal_IntrinsicKind]            = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
                                                                 SpvOpFOrdEqual, SpvOpIEqual,
-                                                                SpvOpIEqual, SpvOpLogicalEqual);
-    fIntrinsicMap[k_notEqual_IntrinsicKind]   = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
+                                                                SpvOpIEqual, SpvOpLogicalEqual};
+    fIntrinsicMap[k_notEqual_IntrinsicKind]         = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
                                                                 SpvOpFOrdNotEqual, SpvOpINotEqual,
                                                                 SpvOpINotEqual,
-                                                                SpvOpLogicalNotEqual);
-    fIntrinsicMap[k_lessThan_IntrinsicKind]         = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                      SpvOpFOrdLessThan,
-                                                                      SpvOpSLessThan,
-                                                                      SpvOpULessThan,
-                                                                      SpvOpUndef);
-    fIntrinsicMap[k_lessThanEqual_IntrinsicKind]    = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                      SpvOpFOrdLessThanEqual,
-                                                                      SpvOpSLessThanEqual,
-                                                                      SpvOpULessThanEqual,
-                                                                      SpvOpUndef);
-    fIntrinsicMap[k_greaterThan_IntrinsicKind]      = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                      SpvOpFOrdGreaterThan,
-                                                                      SpvOpSGreaterThan,
-                                                                      SpvOpUGreaterThan,
-                                                                      SpvOpUndef);
-    fIntrinsicMap[k_greaterThanEqual_IntrinsicKind] = std::make_tuple(kSPIRV_IntrinsicOpcodeKind,
-                                                                      SpvOpFOrdGreaterThanEqual,
-                                                                      SpvOpSGreaterThanEqual,
-                                                                      SpvOpUGreaterThanEqual,
-                                                                      SpvOpUndef);
+                                                                SpvOpLogicalNotEqual};
+    fIntrinsicMap[k_lessThan_IntrinsicKind]         = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
+                                                                SpvOpFOrdLessThan,
+                                                                SpvOpSLessThan,
+                                                                SpvOpULessThan,
+                                                                SpvOpUndef};
+    fIntrinsicMap[k_lessThanEqual_IntrinsicKind]    = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
+                                                                SpvOpFOrdLessThanEqual,
+                                                                SpvOpSLessThanEqual,
+                                                                SpvOpULessThanEqual,
+                                                                SpvOpUndef};
+    fIntrinsicMap[k_greaterThan_IntrinsicKind]      = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
+                                                                SpvOpFOrdGreaterThan,
+                                                                SpvOpSGreaterThan,
+                                                                SpvOpUGreaterThan,
+                                                                SpvOpUndef};
+    fIntrinsicMap[k_greaterThanEqual_IntrinsicKind] = Intrinsic{kSPIRV_IntrinsicOpcodeKind,
+                                                                SpvOpFOrdGreaterThanEqual,
+                                                                SpvOpSGreaterThanEqual,
+                                                                SpvOpUGreaterThanEqual,
+                                                                SpvOpUndef};
 // interpolateAt* not yet supported...
 }
 
@@ -316,7 +309,7 @@ void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, int32_t word1, OutputSt
     this->writeWord(word1, out);
 }
 
-void SPIRVCodeGenerator::writeString(skstd::string_view s, OutputStream& out) {
+void SPIRVCodeGenerator::writeString(std::string_view s, OutputStream& out) {
     out.write(s.data(), s.length());
     switch (s.length() % 4) {
         case 1:
@@ -334,14 +327,14 @@ void SPIRVCodeGenerator::writeString(skstd::string_view s, OutputStream& out) {
     }
 }
 
-void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, skstd::string_view string,
+void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, std::string_view string,
                                           OutputStream& out) {
     this->writeOpCode(opCode, 1 + (string.length() + 4) / 4, out);
     this->writeString(string, out);
 }
 
 
-void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, int32_t word1, skstd::string_view string,
+void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, int32_t word1, std::string_view string,
                                           OutputStream& out) {
     this->writeOpCode(opCode, 2 + (string.length() + 4) / 4, out);
     this->writeWord(word1, out);
@@ -349,7 +342,7 @@ void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, int32_t word1, skstd::s
 }
 
 void SPIRVCodeGenerator::writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2,
-                                          skstd::string_view string, OutputStream& out) {
+                                          std::string_view string, OutputStream& out) {
     this->writeOpCode(opCode, 3 + (string.length() + 4) / 4, out);
     this->writeWord(word1, out);
     this->writeWord(word2, out);
@@ -456,7 +449,7 @@ SpvId SPIRVCodeGenerator::nextId(Precision precision) {
 
 void SPIRVCodeGenerator::writeStruct(const Type& type, const MemoryLayout& memoryLayout,
                                      SpvId resultId) {
-    this->writeInstruction(SpvOpName, resultId, String(type.name()).c_str(), fNameBuffer);
+    this->writeInstruction(SpvOpName, resultId, type.name(), fNameBuffer);
     // go ahead and write all of the field types, so we don't inadvertently write them while we're
     // in the middle of writing the struct instruction
     std::vector<SpvId> types;
@@ -472,8 +465,8 @@ void SPIRVCodeGenerator::writeStruct(const Type& type, const MemoryLayout& memor
     for (int32_t i = 0; i < (int32_t) type.fields().size(); i++) {
         const Type::Field& field = type.fields()[i];
         if (!MemoryLayout::LayoutIsSupported(*field.fType)) {
-            fContext.fErrors->error(type.fLine, "type '" + field.fType->name() +
-                                    "' is not permitted here");
+            fContext.fErrors->error(type.fLine, "type '" + field.fType->displayName() +
+                                                "' is not permitted here");
             return;
         }
         size_t size = memoryLayout.size(*field.fType);
@@ -481,14 +474,13 @@ void SPIRVCodeGenerator::writeStruct(const Type& type, const MemoryLayout& memor
         const Layout& fieldLayout = field.fModifiers.fLayout;
         if (fieldLayout.fOffset >= 0) {
             if (fieldLayout.fOffset < (int) offset) {
-                fContext.fErrors->error(type.fLine,
-                                        "offset of field '" + field.fName + "' must be at "
-                                        "least " + to_string((int) offset));
+                fContext.fErrors->error(type.fLine, "offset of field '" + std::string(field.fName) +
+                                                    "' must be at least " + std::to_string(offset));
             }
             if (fieldLayout.fOffset % alignment) {
                 fContext.fErrors->error(type.fLine,
-                                        "offset of field '" + field.fName + "' must be a multiple"
-                                        " of " + to_string((int) alignment));
+                                        "offset of field '" + std::string(field.fName) +
+                                        "' must be a multiple of " + std::to_string(alignment));
             }
             offset = fieldLayout.fOffset;
         } else {
@@ -532,13 +524,13 @@ const Type& SPIRVCodeGenerator::getActualType(const Type& type) {
         return *fContext.fTypes.fUInt;
     }
     if (type.isMatrix() || type.isVector()) {
-        if (type.componentType() == *fContext.fTypes.fHalf) {
+        if (type.componentType().matches(*fContext.fTypes.fHalf)) {
             return fContext.fTypes.fFloat->toCompound(fContext, type.columns(), type.rows());
         }
-        if (type.componentType() == *fContext.fTypes.fShort) {
+        if (type.componentType().matches(*fContext.fTypes.fShort)) {
             return fContext.fTypes.fInt->toCompound(fContext, type.columns(), type.rows());
         }
-        if (type.componentType() == *fContext.fTypes.fUShort) {
+        if (type.componentType().matches(*fContext.fTypes.fUShort)) {
             return fContext.fTypes.fUInt->toCompound(fContext, type.columns(), type.rows());
         }
     }
@@ -552,7 +544,7 @@ SpvId SPIRVCodeGenerator::getType(const Type& type) {
 SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layout) {
     const Type* type;
     std::unique_ptr<Type> arrayType;
-    String arrayName;
+    std::string arrayName;
 
     if (rawType.isArray()) {
         // For arrays, we need to synthesize a temporary Array type using the "actual" component
@@ -567,16 +559,16 @@ SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layou
         type = &this->getActualType(rawType);
     }
 
-    String key(type->name());
+    std::string key(type->name());
     if (type->isStruct() || type->isArray()) {
-        key += to_string((int)layout.fStd);
+        key += std::to_string(layout.fStd);
 #ifdef SK_DEBUG
         SkASSERT(layout.fStd == MemoryLayout::Standard::k140_Standard ||
                  layout.fStd == MemoryLayout::Standard::k430_Standard);
         MemoryLayout::Standard otherStd = layout.fStd == MemoryLayout::Standard::k140_Standard
                                                   ? MemoryLayout::Standard::k430_Standard
                                                   : MemoryLayout::Standard::k140_Standard;
-        String otherKey = type->name() + to_string((int)otherStd);
+        std::string otherKey = type->displayName() + std::to_string(otherStd);
         SkASSERT(fTypeMap.find(otherKey) == fTypeMap.end());
 #endif
     }
@@ -615,8 +607,8 @@ SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layou
                 break;
             case Type::TypeKind::kArray: {
                 if (!MemoryLayout::LayoutIsSupported(*type)) {
-                    fContext.fErrors->error(type->fLine,
-                                            "type '" + type->name() + "' is not permitted here");
+                    fContext.fErrors->error(type->fLine, "type '" + type->displayName() +
+                                                         "' is not permitted here");
                     return this->nextId(nullptr);
                 }
                 if (type->columns() > 0) {
@@ -684,19 +676,19 @@ SpvId SPIRVCodeGenerator::getType(const Type& rawType, const MemoryLayout& layou
 SpvId SPIRVCodeGenerator::getImageType(const Type& type) {
     SkASSERT(type.typeKind() == Type::TypeKind::kSampler);
     this->getType(type);
-    String key = type.name() + to_string((int) fDefaultLayout.fStd);
+    std::string key = type.displayName() + std::to_string(fDefaultLayout.fStd);
     SkASSERT(fImageTypeMap.find(key) != fImageTypeMap.end());
     return fImageTypeMap[key];
 }
 
 SpvId SPIRVCodeGenerator::getFunctionType(const FunctionDeclaration& function) {
-    String key = to_string(this->getType(function.returnType())) + "(";
-    String separator;
+    std::string key = std::to_string(this->getType(function.returnType())) + "(";
+    std::string separator;
     const std::vector<const Variable*>& parameters = function.parameters();
     for (size_t i = 0; i < parameters.size(); i++) {
         key += separator;
         separator = ", ";
-        key += to_string(this->getType(parameters[i]->type()));
+        key += std::to_string(this->getType(parameters[i]->type()));
     }
     key += ")";
     auto entry = fTypeMap.find(key);
@@ -750,7 +742,8 @@ SpvId SPIRVCodeGenerator::getPointerType(const Type& type, SpvStorageClass_ stor
 SpvId SPIRVCodeGenerator::getPointerType(const Type& rawType, const MemoryLayout& layout,
                                          SpvStorageClass_ storageClass) {
     const Type& type = this->getActualType(rawType);
-    String key = type.displayName() + "*" + to_string(layout.fStd) + to_string(storageClass);
+    std::string key = type.displayName() + "*" + std::to_string(layout.fStd) +
+                      std::to_string(storageClass);
     auto entry = fTypeMap.find(key);
     if (entry == fTypeMap.end()) {
         SpvId result = this->nextId(nullptr);
@@ -810,46 +803,34 @@ SpvId SPIRVCodeGenerator::writeExpression(const Expression& expr, OutputStream&
 
 SpvId SPIRVCodeGenerator::writeIntrinsicCall(const FunctionCall& c, OutputStream& out) {
     const FunctionDeclaration& function = c.function();
-    auto intrinsic = fIntrinsicMap.find(function.intrinsicKind());
-    if (intrinsic == fIntrinsicMap.end()) {
+    auto iter = fIntrinsicMap.find(function.intrinsicKind());
+    if (iter == fIntrinsicMap.end()) {
         fContext.fErrors->error(c.fLine, "unsupported intrinsic '" + function.description() + "'");
         return -1;
     }
-    int32_t intrinsicId;
     const ExpressionArray& arguments = c.arguments();
+    const Intrinsic& intrinsic = iter->second;
+    int32_t intrinsicId = intrinsic.floatOp;
     if (arguments.size() > 0) {
         const Type& type = arguments[0]->type();
-        if (std::get<0>(intrinsic->second) == kSpecial_IntrinsicOpcodeKind ||
-            is_float(fContext, type)) {
-            intrinsicId = std::get<1>(intrinsic->second);
+        if (intrinsic.opKind == kSpecial_IntrinsicOpcodeKind || is_float(fContext, type)) {
+            // Keep the default float op.
         } else if (is_signed(fContext, type)) {
-            intrinsicId = std::get<2>(intrinsic->second);
+            intrinsicId = intrinsic.signedOp;
         } else if (is_unsigned(fContext, type)) {
-            intrinsicId = std::get<3>(intrinsic->second);
+            intrinsicId = intrinsic.unsignedOp;
         } else if (is_bool(fContext, type)) {
-            intrinsicId = std::get<4>(intrinsic->second);
-        } else {
-            intrinsicId = std::get<1>(intrinsic->second);
+            intrinsicId = intrinsic.boolOp;
         }
-    } else {
-        intrinsicId = std::get<1>(intrinsic->second);
     }
-    switch (std::get<0>(intrinsic->second)) {
+    switch (intrinsic.opKind) {
         case kGLSL_STD_450_IntrinsicOpcodeKind: {
             SpvId result = this->nextId(&c.type());
             std::vector<SpvId> argumentIds;
             std::vector<TempVar> tempVars;
             argumentIds.reserve(arguments.size());
             for (size_t i = 0; i < arguments.size(); i++) {
-                if (is_out(function.parameters()[i]->modifiers())) {
-                    argumentIds.push_back(
-                            this->writeFunctionCallArgument(*arguments[i],
-                                                            function.parameters()[i]->modifiers(),
-                                                            &tempVars,
-                                                            out));
-                } else {
-                    argumentIds.push_back(this->writeExpression(*arguments[i], out));
-                }
+                argumentIds.push_back(this->writeFunctionCallArgument(c, i, &tempVars, out));
             }
             this->writeOpCode(SpvOpExtInst, 5 + (int32_t) argumentIds.size(), out);
             this->writeWord(this->getType(c.type()), out);
@@ -872,15 +853,7 @@ SpvId SPIRVCodeGenerator::writeIntrinsicCall(const FunctionCall& c, OutputStream
             std::vector<TempVar> tempVars;
             argumentIds.reserve(arguments.size());
             for (size_t i = 0; i < arguments.size(); i++) {
-                if (is_out(function.parameters()[i]->modifiers())) {
-                    argumentIds.push_back(
-                            this->writeFunctionCallArgument(*arguments[i],
-                                                            function.parameters()[i]->modifiers(),
-                                                            &tempVars,
-                                                            out));
-                } else {
-                    argumentIds.push_back(this->writeExpression(*arguments[i], out));
-                }
+                argumentIds.push_back(this->writeFunctionCallArgument(c, i, &tempVars, out));
             }
             if (!c.type().isVoid()) {
                 this->writeOpCode((SpvOp_) intrinsicId, 3 + (int32_t) arguments.size(), out);
@@ -1036,24 +1009,24 @@ SpvId SPIRVCodeGenerator::writeSpecialIntrinsic(const FunctionCall& c, SpecialIn
             const Type& arg1Type = arguments[1]->type();
             switch (arguments[0]->type().dimensions()) {
                 case SpvDim1D:
-                    if (arg1Type == *fContext.fTypes.fFloat2) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat2)) {
                         op = SpvOpImageSampleProjImplicitLod;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat));
                     }
                     break;
                 case SpvDim2D:
-                    if (arg1Type == *fContext.fTypes.fFloat3) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat3)) {
                         op = SpvOpImageSampleProjImplicitLod;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat2);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat2));
                     }
                     break;
                 case SpvDim3D:
-                    if (arg1Type == *fContext.fTypes.fFloat4) {
+                    if (arg1Type.matches(*fContext.fTypes.fFloat4)) {
                         op = SpvOpImageSampleProjImplicitLod;
                     } else {
-                        SkASSERT(arg1Type == *fContext.fTypes.fFloat3);
+                        SkASSERT(arg1Type.matches(*fContext.fTypes.fFloat3));
                     }
                     break;
                 case SpvDimCube:   // fall through
@@ -1196,10 +1169,14 @@ SpvId SPIRVCodeGenerator::writeSpecialIntrinsic(const FunctionCall& c, SpecialIn
     return result;
 }
 
-SpvId SPIRVCodeGenerator::writeFunctionCallArgument(const Expression& arg,
-                                                    const Modifiers& paramModifiers,
+SpvId SPIRVCodeGenerator::writeFunctionCallArgument(const FunctionCall& call,
+                                                    int argIndex,
                                                     std::vector<TempVar>* tempVars,
                                                     OutputStream& out) {
+    const FunctionDeclaration& funcDecl = call.function();
+    const Expression& arg = *call.arguments()[argIndex];
+    const Modifiers& paramModifiers = funcDecl.parameters()[argIndex]->modifiers();
+
     // ID of temporary variable that we will use to hold this argument, or 0 if it is being
     // passed directly
     SpvId tmpVar;
@@ -1208,20 +1185,21 @@ SpvId SPIRVCodeGenerator::writeFunctionCallArgument(const Expression& arg,
 
     if (is_out(paramModifiers)) {
         std::unique_ptr<LValue> lv = this->getLValue(arg, out);
-        SpvId ptr = lv->getPointer();
-        if (ptr != (SpvId) -1 && lv->isMemoryObjectPointer()) {
-            return ptr;
-        }
-
-        // lvalue cannot simply be read and written via a pointer (e.g. it's a swizzle). We need to
-        // to use a temp variable.
+        // We handle out params with a temp var that we copy back to the original variable at the
+        // end of the call. GLSL guarantees that the original variable will be unchanged until the
+        // end of the call, and also that out params are written back to their original variables in
+        // a specific order (left-to-right), so it's unsafe to pass a pointer to the original value.
         if (is_in(paramModifiers)) {
             tmpValueId = lv->load(out);
         }
         tmpVar = this->nextId(&arg.type());
         tempVars->push_back(TempVar{tmpVar, &arg.type(), std::move(lv)});
+    } else if (funcDecl.isIntrinsic()) {
+        // Unlike user function calls, non-out intrinsic arguments don't need pointer parameters.
+        return this->writeExpression(arg, out);
     } else {
-        // See getFunctionType for an explanation of why we're always using pointer parameters.
+        // We always use pointer parameters when calling user functions.
+        // See getFunctionType for further explanation.
         tmpValueId = this->writeExpression(arg, out);
         tmpVar = this->nextId(nullptr);
     }
@@ -1261,10 +1239,7 @@ SpvId SPIRVCodeGenerator::writeFunctionCall(const FunctionCall& c, OutputStream&
     std::vector<SpvId> argumentIds;
     argumentIds.reserve(arguments.size());
     for (size_t i = 0; i < arguments.size(); i++) {
-        argumentIds.push_back(this->writeFunctionCallArgument(*arguments[i],
-                                                              function.parameters()[i]->modifiers(),
-                                                              &tempVars,
-                                                              out));
+        argumentIds.push_back(this->writeFunctionCallArgument(c, i, &tempVars, out));
     }
     SpvId result = this->nextId(nullptr);
     this->writeOpCode(SpvOpFunctionCall, 4 + (int32_t) arguments.size(), out);
@@ -1289,7 +1264,7 @@ SpvId SPIRVCodeGenerator::writeConstantVector(const AnyConstructor& c) {
 
     const Type& scalarType = type.componentType();
     for (int n = 0; n < type.columns(); n++) {
-        skstd::optional<double> slotVal = c.getConstantValue(n);
+        std::optional<double> slotVal = c.getConstantValue(n);
         if (!slotVal.has_value()) {
             SkDEBUGFAILF("writeConstantVector: %s not actually constant", c.description().c_str());
             return (SpvId)-1;
@@ -1509,7 +1484,7 @@ SpvId SPIRVCodeGenerator::writeMatrixCopy(SpvId src, const Type& srcType, const
                                           OutputStream& out) {
     SkASSERT(srcType.isMatrix());
     SkASSERT(dstType.isMatrix());
-    SkASSERT(srcType.componentType() == dstType.componentType());
+    SkASSERT(srcType.componentType().matches(dstType.componentType()));
     SpvId id = this->nextId(&dstType);
     SpvId srcColumnType = this->getType(srcType.componentType().toCompound(fContext,
                                                                            srcType.rows(),
@@ -1673,7 +1648,7 @@ SpvId SPIRVCodeGenerator::writeVectorConstructor(const ConstructorCompound& c, O
     arguments.reserve(c.arguments().size());
     for (size_t i = 0; i < c.arguments().size(); i++) {
         const Type& argType = c.arguments()[i]->type();
-        SkASSERT(componentType == argType.componentType());
+        SkASSERT(componentType.matches(argType.componentType()));
 
         SpvId arg = this->writeExpression(*c.arguments()[i], out);
         if (argType.isMatrix()) {
@@ -1751,7 +1726,7 @@ SpvId SPIRVCodeGenerator::writeCompositeConstructor(const AnyConstructor& c, Out
 SpvId SPIRVCodeGenerator::writeConstructorScalarCast(const ConstructorScalarCast& c,
                                                      OutputStream& out) {
     const Type& type = c.type();
-    if (this->getActualType(type) == this->getActualType(c.argument()->type())) {
+    if (this->getActualType(type).matches(this->getActualType(c.argument()->type()))) {
         return this->writeExpression(*c.argument(), out);
     }
 
@@ -1768,7 +1743,7 @@ SpvId SPIRVCodeGenerator::writeConstructorCompoundCast(const ConstructorCompound
 
     // Write the composite that we are casting. If the actual type matches, we are done.
     SpvId compositeId = this->writeExpression(*c.argument(), out);
-    if (this->getActualType(ctorType) == this->getActualType(argType)) {
+    if (this->getActualType(ctorType).matches(this->getActualType(argType))) {
         return compositeId;
     }
 
@@ -2113,10 +2088,10 @@ SpvId SPIRVCodeGenerator::writeVariableReference(const VariableReference& ref, O
         this->addRTFlipUniform(ref.fLine);
         // Use sk_RTAdjust to compute the flipped coordinate
         using namespace dsl;
-        const char* DEVICE_COORDS_NAME = "__device_FragCoords";
+        const char* DEVICE_COORDS_NAME = "$device_FragCoords";
         SymbolTable& symbols = *ThreadContext::SymbolTable();
         // Use a uniform to flip the Y coordinate. The new expression will be written in
-        // terms of __device_FragCoords, which is a fake variable that means "access the
+        // terms of $device_FragCoords, which is a fake variable that means "access the
         // underlying fragcoords directly without flipping it".
         DSLExpression rtFlip(ThreadContext::Compiler().convertIdentifier(/*line=*/-1,
                 SKSL_RTFLIP_NAME));
@@ -2128,7 +2103,7 @@ SpvId SPIRVCodeGenerator::writeVariableReference(const VariableReference& ref, O
                                                         fContext.fModifiersPool->add(modifiers),
                                                         DEVICE_COORDS_NAME,
                                                         fContext.fTypes.fFloat4.get(),
-                                                        true,
+                                                        /*builtin=*/true,
                                                         Variable::Storage::kGlobal);
             fSPIRVBonusVariables.insert(coordsVar.get());
             symbols.add(std::move(coordsVar));
@@ -2148,10 +2123,10 @@ SpvId SPIRVCodeGenerator::writeVariableReference(const VariableReference& ref, O
     if (variable->modifiers().fLayout.fBuiltin == SK_CLOCKWISE_BUILTIN) {
         this->addRTFlipUniform(ref.fLine);
         using namespace dsl;
-        const char* DEVICE_CLOCKWISE_NAME = "__device_Clockwise";
+        const char* DEVICE_CLOCKWISE_NAME = "$device_Clockwise";
         SymbolTable& symbols = *ThreadContext::SymbolTable();
         // Use a uniform to flip the Y coordinate. The new expression will be written in
-        // terms of __device_Clockwise, which is a fake variable that means "access the
+        // terms of $device_Clockwise, which is a fake variable that means "access the
         // underlying FrontFacing directly".
         DSLExpression rtFlip(ThreadContext::Compiler().convertIdentifier(/*line=*/-1,
                 SKSL_RTFLIP_NAME));
@@ -2163,7 +2138,7 @@ SpvId SPIRVCodeGenerator::writeVariableReference(const VariableReference& ref, O
                                                            fContext.fModifiersPool->add(modifiers),
                                                            DEVICE_CLOCKWISE_NAME,
                                                            fContext.fTypes.fBool.get(),
-                                                           true,
+                                                           /*builtin=*/true,
                                                            Variable::Storage::kGlobal);
             fSPIRVBonusVariables.insert(clockwiseVar.get());
             symbols.add(std::move(clockwiseVar));
@@ -2334,7 +2309,7 @@ SpvId SPIRVCodeGenerator::writeBinaryExpression(const Type& leftType, SpvId lhs,
     const Type* operandType;
     // IR allows mismatched types in expressions (e.g. float2 * float), but they need special
     // handling in SPIR-V
-    if (this->getActualType(leftType) != this->getActualType(rightType)) {
+    if (!this->getActualType(leftType).matches(this->getActualType(rightType))) {
         if (leftType.isVector() && rightType.isNumber()) {
             if (resultType.componentType().isFloat()) {
                 switch (op.kind()) {
@@ -2441,7 +2416,7 @@ SpvId SPIRVCodeGenerator::writeBinaryExpression(const Type& leftType, SpvId lhs,
         }
     } else {
         operandType = &this->getActualType(leftType);
-        SkASSERT(*operandType == this->getActualType(rightType));
+        SkASSERT(operandType->matches(this->getActualType(rightType)));
     }
     switch (op.kind()) {
         case Token::Kind::TK_EQEQ: {
@@ -2517,14 +2492,14 @@ SpvId SPIRVCodeGenerator::writeBinaryExpression(const Type& leftType, SpvId lhs,
                                               SpvOpULessThanEqual, SpvOpUndef, out);
         case Token::Kind::TK_PLUS:
             if (leftType.isMatrix() && rightType.isMatrix()) {
-                SkASSERT(leftType == rightType);
+                SkASSERT(leftType.matches(rightType));
                 return this->writeComponentwiseMatrixBinary(leftType, lhs, rhs, SpvOpFAdd, out);
             }
             return this->writeBinaryOperation(resultType, *operandType, lhs, rhs, SpvOpFAdd,
                                               SpvOpIAdd, SpvOpIAdd, SpvOpUndef, out);
         case Token::Kind::TK_MINUS:
             if (leftType.isMatrix() && rightType.isMatrix()) {
-                SkASSERT(leftType == rightType);
+                SkASSERT(leftType.matches(rightType));
                 return this->writeComponentwiseMatrixBinary(leftType, lhs, rhs, SpvOpFSub, out);
             }
             return this->writeBinaryOperation(resultType, *operandType, lhs, rhs, SpvOpFSub,
@@ -2541,7 +2516,7 @@ SpvId SPIRVCodeGenerator::writeBinaryExpression(const Type& leftType, SpvId lhs,
                                               SpvOpIMul, SpvOpIMul, SpvOpUndef, out);
         case Token::Kind::TK_SLASH:
             if (leftType.isMatrix() && rightType.isMatrix()) {
-                SkASSERT(leftType == rightType);
+                SkASSERT(leftType.matches(rightType));
                 return this->writeComponentwiseMatrixBinary(leftType, lhs, rhs, SpvOpFDiv, out);
             }
             return this->writeBinaryOperation(resultType, *operandType, lhs, rhs, SpvOpFDiv,
@@ -2913,10 +2888,10 @@ SpvId SPIRVCodeGenerator::writeFunctionStart(const FunctionDeclaration& f, Outpu
     SpvId functionTypeId = this->getFunctionType(f);
     this->writeInstruction(SpvOpFunction, returnTypeId, result,
                            SpvFunctionControlMaskNone, functionTypeId, out);
-    String mangledName = f.mangledName();
+    std::string mangledName = f.mangledName();
     this->writeInstruction(SpvOpName,
                            result,
-                           skstd::string_view(mangledName.c_str(), mangledName.size()),
+                           std::string_view(mangledName.c_str(), mangledName.size()),
                            fNameBuffer);
     for (const Variable* parameter : f.parameters()) {
         SpvId id = this->nextId(nullptr);
@@ -3020,7 +2995,8 @@ SpvId SPIRVCodeGenerator::writeInterfaceBlock(const InterfaceBlock& intf, bool a
     const Variable& intfVar = intf.variable();
     const Type& type = intfVar.type();
     if (!MemoryLayout::LayoutIsSupported(type)) {
-        fContext.fErrors->error(type.fLine, "type '" + type.name() + "' is not permitted here");
+        fContext.fErrors->error(type.fLine, "type '" + type.displayName() +
+                                            "' is not permitted here");
         return this->nextId(nullptr);
     }
     SpvStorageClass_ storageClass = get_storage_class(intf.variable(), SpvStorageClassFunction);
@@ -3108,9 +3084,6 @@ void SPIRVCodeGenerator::writeGlobalVar(ProgramKind kind, const VarDeclaration&
         SkASSERT(!fProgram.fConfig->fSettings.fFragColorIsInOut);
         return;
     }
-    if (var.modifiers().fLayout.fBuiltin == SK_SECONDARYFRAGCOLOR_BUILTIN) {
-        return;
-    }
     if (this->isDead(var)) {
         return;
     }
@@ -3120,13 +3093,20 @@ void SPIRVCodeGenerator::writeGlobalVar(ProgramKind kind, const VarDeclaration&
         fTopLevelUniforms.push_back(&varDecl);
         return;
     }
+    // Add this global to the variable map.
     const Type& type = var.type();
+    SpvId id = this->nextId(&type);
+    fVariableMap[&var] = id;
+    if (var.modifiers().fLayout.fBuiltin == SK_SECONDARYFRAGCOLOR_BUILTIN) {
+        // sk_SecondaryFragColor corresponds to gl_SecondaryFragColorEXT, which isn't supposed to
+        // appear in a SPIR-V program (it's only valid in ES2). Report an error.
+        fContext.fErrors->error(varDecl.fLine, "sk_SecondaryFragColor is not allowed in SPIR-V");
+        return;
+    }
     Layout layout = var.modifiers().fLayout;
     if (layout.fSet < 0 && storageClass == SpvStorageClassUniformConstant) {
         layout.fSet = fProgram.fConfig->fSettings.fDefaultUniformSet;
     }
-    SpvId id = this->nextId(&type);
-    fVariableMap[&var] = id;
     SpvId typeId = this->getPointerType(type, storageClass);
     this->writeInstruction(SpvOpVariable, typeId, id, storageClass, fConstantBuffer);
     this->writeInstruction(SpvOpName, id, var.name(), fNameBuffer);
@@ -3317,7 +3297,7 @@ void SPIRVCodeGenerator::writeSwitchStatement(const SwitchStatement& s, OutputSt
         const SwitchCase& c = stmt->as<SwitchCase>();
         SpvId label = this->nextId(nullptr);
         labels.push_back(label);
-        if (c.value()) {
+        if (!c.isDefault()) {
             size += 2;
         } else {
             defaultLabel = label;
@@ -3330,10 +3310,10 @@ void SPIRVCodeGenerator::writeSwitchStatement(const SwitchStatement& s, OutputSt
     this->writeWord(defaultLabel, out);
     for (size_t i = 0; i < cases.size(); ++i) {
         const SwitchCase& c = cases[i]->as<SwitchCase>();
-        if (!c.value()) {
+        if (c.isDefault()) {
             continue;
         }
-        this->writeWord(c.value()->as<Literal>().intValue(), out);
+        this->writeWord(c.value(), out);
         this->writeWord(labels[i], out);
     }
     for (size_t i = 0; i < cases.size(); ++i) {
@@ -3377,14 +3357,14 @@ SPIRVCodeGenerator::EntrypointAdapter SPIRVCodeGenerator::writeEntrypointAdapter
     auto skFragColorRef = std::make_unique<VariableReference>(/*line=*/-1, &skFragColorVar,
                                                               VariableReference::RefKind::kWrite);
     // Synthesize a call to the `main()` function.
-    if (main.returnType() != skFragColorRef->type()) {
+    if (!main.returnType().matches(skFragColorRef->type())) {
         fContext.fErrors->error(main.fLine, "SPIR-V does not support returning '" +
                                             main.returnType().description() + "' from main()");
         return {};
     }
     ExpressionArray args;
     if (main.parameters().size() == 1) {
-        if (main.parameters()[0]->type() != *fContext.fTypes.fFloat2) {
+        if (!main.parameters()[0]->type().matches(*fContext.fTypes.fFloat2)) {
             fContext.fErrors->error(main.fLine,
                     "SPIR-V does not support parameter of type '" +
                     main.parameters()[0]->type().description() + "' to main()");
@@ -3488,7 +3468,7 @@ void SPIRVCodeGenerator::addRTFlipUniform(int line) {
                                   /*flags=*/0),
                         SKSL_RTFLIP_NAME,
                         fContext.fTypes.fFloat2.get());
-    skstd::string_view name = "sksl_synthetic_uniforms";
+    std::string_view name = "sksl_synthetic_uniforms";
     const Type* intfStruct = fSynthetics.takeOwnershipOfSymbol(
             Type::MakeStructType(/*line=*/-1, name, fields, /*interfaceBlock=*/true));
     bool usePushConstants = fProgram.fConfig->fSettings.fUsePushConstants;
@@ -3588,7 +3568,7 @@ void SPIRVCodeGenerator::writeInstructions(const Program& program, OutputStream&
     // If main() returns a half4, synthesize a tiny entrypoint function which invokes the real
     // main() and stores the result into sk_FragColor.
     EntrypointAdapter adapter;
-    if (main->returnType() == *fContext.fTypes.fHalf4) {
+    if (main->returnType().matches(*fContext.fTypes.fHalf4)) {
         adapter = this->writeEntrypointAdapter(*main);
         if (adapter.entrypointDecl) {
             fFunctionMap[adapter.entrypointDecl.get()] = this->nextId(nullptr);
diff --git a/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h b/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
index cc59e3fc1bb96..d1730203266f8 100644
--- a/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
+++ b/third_party/skia/src/sksl/codegen/SkSLSPIRVCodeGenerator.h
@@ -9,7 +9,6 @@
 #define SKSL_SPIRVCODEGENERATOR
 
 #include <stack>
-#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -231,8 +230,8 @@ class SPIRVCodeGenerator : public CodeGenerator {
 
     SpvId writeIntrinsicCall(const FunctionCall& c, OutputStream& out);
 
-    SpvId writeFunctionCallArgument(const Expression& arg,
-                                    const Modifiers& paramModifiers,
+    SpvId writeFunctionCallArgument(const FunctionCall& call,
+                                    int argIndex,
                                     std::vector<TempVar>* tempVars,
                                     OutputStream& out);
 
@@ -410,20 +409,20 @@ class SPIRVCodeGenerator : public CodeGenerator {
 
     void writeWord(int32_t word, OutputStream& out);
 
-    void writeString(skstd::string_view s, OutputStream& out);
+    void writeString(std::string_view s, OutputStream& out);
 
     void writeLabel(SpvId id, OutputStream& out);
 
     void writeInstruction(SpvOp_ opCode, OutputStream& out);
 
-    void writeInstruction(SpvOp_ opCode, skstd::string_view string, OutputStream& out);
+    void writeInstruction(SpvOp_ opCode, std::string_view string, OutputStream& out);
 
     void writeInstruction(SpvOp_ opCode, int32_t word1, OutputStream& out);
 
-    void writeInstruction(SpvOp_ opCode, int32_t word1, skstd::string_view string,
+    void writeInstruction(SpvOp_ opCode, int32_t word1, std::string_view string,
                           OutputStream& out);
 
-    void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, skstd::string_view string,
+    void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, std::string_view string,
                           OutputStream& out);
 
     void writeInstruction(SpvOp_ opCode, int32_t word1, int32_t word2, OutputStream& out);
@@ -475,13 +474,19 @@ class SPIRVCodeGenerator : public CodeGenerator {
     uint64_t fCapabilities;
     SpvId fIdCount;
     SpvId fGLSLExtendedInstructions;
-    typedef std::tuple<IntrinsicOpcodeKind, int32_t, int32_t, int32_t, int32_t> Intrinsic;
+    struct Intrinsic {
+        IntrinsicOpcodeKind opKind;
+        int32_t floatOp;
+        int32_t signedOp;
+        int32_t unsignedOp;
+        int32_t boolOp;
+    };
     std::unordered_map<IntrinsicKind, Intrinsic> fIntrinsicMap;
     std::unordered_map<const FunctionDeclaration*, SpvId> fFunctionMap;
     std::unordered_map<const Variable*, SpvId> fVariableMap;
     std::unordered_map<const Variable*, int32_t> fInterfaceBlockMap;
-    std::unordered_map<String, SpvId> fImageTypeMap;
-    std::unordered_map<String, SpvId> fTypeMap;
+    std::unordered_map<std::string, SpvId> fImageTypeMap;
+    std::unordered_map<std::string, SpvId> fTypeMap;
     StringStream fCapabilitiesBuffer;
     StringStream fGlobalInitializersBuffer;
     StringStream fConstantBuffer;
diff --git a/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp b/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
index bcfa07ad722d3..8f63bf0380c5a 100644
--- a/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.cpp
@@ -19,7 +19,7 @@
 
 namespace SkSL {
 
-bool SPIRVtoHLSL(const String& spirv, String* hlsl) {
+bool SPIRVtoHLSL(const std::string& spirv, std::string* hlsl) {
     spirv_cross::CompilerHLSL hlslCompiler((const uint32_t*)spirv.c_str(),
                                            spirv.size() / sizeof(uint32_t));
 
@@ -44,6 +44,6 @@ bool SPIRVtoHLSL(const String& spirv, String* hlsl) {
 
 #else
 
-namespace SkSL { bool SPIRVtoHLSL(const String&, String*) { return false; } }
+namespace SkSL { bool SPIRVtoHLSL(const std::string&, std::string*) { return false; } }
 
 #endif
diff --git a/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h b/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
index 459adbd4343d3..bcb6a1cb338eb 100644
--- a/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
+++ b/third_party/skia/src/sksl/codegen/SkSLSPIRVtoHLSL.h
@@ -12,7 +12,7 @@
 
 namespace SkSL {
 
-bool SPIRVtoHLSL(const String& spirv, String* hlsl);
+bool SPIRVtoHLSL(const std::string& spirv, std::string* hlsl);
 
 }  // namespace SkSL
 
diff --git a/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp b/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp
index bfe03d2110083..542a0a69b6715 100644
--- a/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp
+++ b/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.cpp
@@ -13,7 +13,6 @@
 #include "src/sksl/SkSLOperators.h"
 #include "src/sksl/codegen/SkSLCodeGenerator.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
 #include "src/sksl/ir/SkSLBinaryExpression.h"
 #include "src/sksl/ir/SkSLBlock.h"
 #include "src/sksl/ir/SkSLBreakStatement.h"
@@ -46,6 +45,7 @@
 #include "src/sksl/ir/SkSLTernaryExpression.h"
 #include "src/sksl/ir/SkSLVarDeclarations.h"
 #include "src/sksl/ir/SkSLVariableReference.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
 
 #include <algorithm>
 #include <unordered_map>
@@ -68,7 +68,7 @@ namespace {
 
         void line(int lineNum) override {
             fTrace->fTraceInfo.push_back({SkSL::SkVMTraceInfo::Op::kLine,
-                                              /*data=*/{lineNum, 0}});
+                                          /*data=*/{lineNum, 0}});
         }
         void var(int slot, int32_t val) override {
             fTrace->fTraceInfo.push_back({SkSL::SkVMTraceInfo::Op::kVar,
@@ -82,12 +82,15 @@ namespace {
             fTrace->fTraceInfo.push_back({SkSL::SkVMTraceInfo::Op::kExit,
                                           /*data=*/{fnIdx, 0}});
         }
+        void scope(int delta) override {
+            fTrace->fTraceInfo.push_back({SkSL::SkVMTraceInfo::Op::kScope,
+                                          /*data=*/{delta, 0}});
+        }
 
     private:
         SkSL::SkVMDebugTrace* fTrace;
     };
-}
-
+}  // namespace
 
 namespace SkSL {
 
@@ -108,8 +111,6 @@ struct Value {
 
     struct ValRef {
         ValRef(skvm::Val& val) : fVal(val) {}
-        // Required until C++17 copy elision
-        ValRef(const ValRef&) = default;
 
         ValRef& operator=(ValRef    v) { fVal = v.fVal; return *this; }
         ValRef& operator=(skvm::Val v) { fVal = v;      return *this; }
@@ -147,9 +148,7 @@ class SkVMGenerator {
     SkVMGenerator(const Program& program,
                   skvm::Builder* builder,
                   SkVMDebugTrace* debugTrace,
-                  SampleShaderFn sampleShader,
-                  SampleColorFilterFn sampleColorFilter,
-                  SampleBlenderFn sampleBlender);
+                  SkVMCallbacks* callbacks);
 
     void writeProgram(SkSpan<skvm::Val> uniforms,
                       skvm::Coord device,
@@ -187,10 +186,14 @@ class SkVMGenerator {
     int getDebugFunctionInfo(const FunctionDeclaration& decl);
 
     /** Used by `createSlot` to add this variable to the SkVMSlotInfo array inside SkVMDebugTrace.*/
-    void addDebugSlotInfo(String varName, const Type& type, int line);
+    void addDebugSlotInfo(const std::string& varName, const Type& type, int line,
+                          int fnReturnValue);
+
+    void addDebugSlotInfoForGroup(const std::string& varName, const Type& type, int line,
+                                  int* groupIndex, int fnReturnValue);
 
     /** Used by `getSlot` to create a new slot on its first access. */
-    size_t createSlot(const String& name, const Type& type, int line);
+    size_t createSlot(const std::string& name, const Type& type, int line, int fnReturnValue);
 
     /**
      * Returns the slot holding v's Val(s). Allocates storage if this is first time 'v' is
@@ -211,11 +214,14 @@ class SkVMGenerator {
     void writeToSlot(int slot, skvm::Val value);
 
     /**
-     * Emits an trace_line opcode. writeStatement already does this, but statements that alter
-     * control flow may need to explicitly add additional traces.
+     * Emits an trace_line opcode. writeStatement does this, and statements that alter control flow
+     * may need to explicitly add additional traces.
      */
     void emitTraceLine(int line);
 
+    /** Emits an trace_scope opcode, which alters the SkSL variable-scope depth. */
+    void emitTraceScope(skvm::I32 executionMask, int delta);
+
     /** Initializes uniforms and global variables at the start of main(). */
     void setupGlobals(SkSpan<skvm::Val> uniforms, skvm::Coord device);
 
@@ -305,10 +311,7 @@ class SkVMGenerator {
     skvm::Builder* fBuilder;
     SkVMDebugTrace* fDebugTrace;
     int fTraceHookID = -1;
-
-    const SampleShaderFn fSampleShader;
-    const SampleColorFilterFn fSampleColorFilter;
-    const SampleBlenderFn fSampleBlender;
+    SkVMCallbacks* fCallbacks;
 
     struct Slot {
         skvm::Val  val;
@@ -373,15 +376,11 @@ static inline bool is_uniform(const SkSL::Variable& var) {
 SkVMGenerator::SkVMGenerator(const Program& program,
                              skvm::Builder* builder,
                              SkVMDebugTrace* debugTrace,
-                             SampleShaderFn sampleShader,
-                             SampleColorFilterFn sampleColorFilter,
-                             SampleBlenderFn sampleBlender)
+                             SkVMCallbacks* callbacks)
         : fProgram(program)
         , fBuilder(builder)
         , fDebugTrace(debugTrace)
-        , fSampleShader(std::move(sampleShader))
-        , fSampleColorFilter(std::move(sampleColorFilter))
-        , fSampleBlender(std::move(sampleBlender)) {}
+        , fCallbacks(callbacks) {}
 
 void SkVMGenerator::writeProgram(SkSpan<skvm::Val> uniforms,
                                  skvm::Coord device,
@@ -563,14 +562,6 @@ size_t SkVMGenerator::writeFunction(const FunctionDefinition& function,
 
     if (fDebugTrace) {
         fBuilder->trace_exit(fTraceHookID, this->mask(), fTraceMask, funcIndex);
-
-        if (fProgram.fConfig->fSettings.fAllowTraceVarInSkVMDebugTrace) {
-            size_t nslots = function.declaration().returnType().slotCount();
-            for (size_t i = 0; i < nslots; ++i) {
-                fBuilder->trace_var(fTraceHookID, this->mask(), fTraceMask,
-                                    returnSlot + i, i32(fSlots[returnSlot + i].val));
-            }
-        }
     }
 
     return returnSlot;
@@ -587,24 +578,23 @@ void SkVMGenerator::writeToSlot(int slot, skvm::Val value) {
     fSlots[slot].val = value;
 }
 
-void SkVMGenerator::addDebugSlotInfo(String varName, const Type& type, int line) {
+void SkVMGenerator::addDebugSlotInfoForGroup(const std::string& varName, const Type& type, int line,
+                                             int* groupIndex, int fnReturnValue) {
     SkASSERT(fDebugTrace);
     switch (type.typeKind()) {
         case Type::TypeKind::kArray: {
             int nslots = type.columns();
             const Type& elemType = type.componentType();
             for (int slot = 0; slot < nslots; ++slot) {
-                this->addDebugSlotInfo(varName + "[" + to_string(slot) + "]",
-                                       elemType,
-                                       line);
+                this->addDebugSlotInfoForGroup(varName + "[" + std::to_string(slot) + "]", elemType,
+                                               line, groupIndex, fnReturnValue);
             }
             break;
         }
         case Type::TypeKind::kStruct: {
             for (const Type::Field& field : type.fields()) {
-                this->addDebugSlotInfo(varName + "." + field.fName,
-                                       *field.fType,
-                                       line);
+                this->addDebugSlotInfoForGroup(varName + "." + std::string(field.fName),
+                                               *field.fType, line, groupIndex, fnReturnValue);
             }
             break;
         }
@@ -624,8 +614,10 @@ void SkVMGenerator::addDebugSlotInfo(String varName, const Type& type, int line)
                 slotInfo.columns = type.columns();
                 slotInfo.rows = type.rows();
                 slotInfo.componentIndex = slot;
+                slotInfo.groupIndex = (*groupIndex)++;
                 slotInfo.numberKind = numberKind;
                 slotInfo.line = line;
+                slotInfo.fnReturnValue = fnReturnValue;
                 fDebugTrace->fSlotInfo.push_back(std::move(slotInfo));
             }
             break;
@@ -633,25 +625,37 @@ void SkVMGenerator::addDebugSlotInfo(String varName, const Type& type, int line)
     }
 }
 
-size_t SkVMGenerator::createSlot(const String& name, const Type& type, int line) {
+void SkVMGenerator::addDebugSlotInfo(const std::string& varName, const Type& type, int line,
+                                     int fnReturnValue) {
+    int groupIndex = 0;
+    this->addDebugSlotInfoForGroup(varName, type, line, &groupIndex, fnReturnValue);
+    SkASSERT((size_t)groupIndex == type.slotCount());
+}
+
+size_t SkVMGenerator::createSlot(const std::string& name,
+                                 const Type& type,
+                                 int line,
+                                 int fnReturnValue) {
     size_t slot   = fSlots.size(),
            nslots = type.slotCount();
 
-    if (fDebugTrace) {
-        // Our debug slot-info table should always have the same length as the actual slot table.
-        SkASSERT(fDebugTrace->fSlotInfo.size() == slot);
+    if (nslots > 0) {
+        if (fDebugTrace) {
+            // Our debug slot-info table should have the same length as the actual slot table.
+            SkASSERT(fDebugTrace->fSlotInfo.size() == slot);
 
-        // Append slot names and types to our debug slot-info table.
-        fDebugTrace->fSlotInfo.reserve(slot + nslots);
-        this->addDebugSlotInfo(name, type, line);
+            // Append slot names and types to our debug slot-info table.
+            fDebugTrace->fSlotInfo.reserve(slot + nslots);
+            this->addDebugSlotInfo(name, type, line, fnReturnValue);
 
-        // Confirm that we added the expected number of slots.
-        SkASSERT(fDebugTrace->fSlotInfo.size() == (slot + nslots));
-    }
+            // Confirm that we added the expected number of slots.
+            SkASSERT(fDebugTrace->fSlotInfo.size() == (slot + nslots));
+        }
 
-    // Create brand new slots initialized to zero.
-    skvm::Val initialValue = fBuilder->splat(0.0f).id;
-    fSlots.insert(fSlots.end(), nslots, Slot{initialValue});
+        // Create brand new slots initialized to zero.
+        skvm::Val initialValue = fBuilder->splat(0.0f).id;
+        fSlots.insert(fSlots.end(), nslots, Slot{initialValue});
+    }
     return slot;
 }
 
@@ -661,7 +665,7 @@ size_t SkVMGenerator::getSlot(const Variable& v) {
         return entry->second;
     }
 
-    size_t slot = this->createSlot(String(v.name()), v.type(), v.fLine);
+    size_t slot = this->createSlot(std::string(v.name()), v.type(), v.fLine, /*fnReturnValue=*/-1);
     fVariableMap[&v] = slot;
     return slot;
 }
@@ -672,9 +676,13 @@ size_t SkVMGenerator::getSlot(const FunctionDefinition& fn) {
         return entry->second;
     }
 
-    size_t slot = this->createSlot("[" + fn.declaration().name() + "].result",
-                                   fn.declaration().returnType(),
-                                   fn.fLine);
+    const FunctionDeclaration& decl = fn.declaration();
+    int fnReturnValue = fDebugTrace ? this->getDebugFunctionInfo(decl) : -1;
+
+    size_t slot = this->createSlot("[" + std::string(decl.name()) + "].result",
+                                   decl.returnType(),
+                                   fn.fLine,
+                                   fnReturnValue);
     fReturnValueMap[&fn] = slot;
     return slot;
 }
@@ -1035,7 +1043,7 @@ Value SkVMGenerator::writeConstructorSplat(const ConstructorSplat& c) {
 Value SkVMGenerator::writeConstructorDiagonalMatrix(const ConstructorDiagonalMatrix& ctor) {
     const Type& dstType = ctor.type();
     SkASSERT(dstType.isMatrix());
-    SkASSERT(ctor.argument()->type() == dstType.componentType());
+    SkASSERT(ctor.argument()->type().matches(dstType.componentType()));
 
     Value src = this->writeExpression(*ctor.argument());
     Value dst(dstType.rows() * dstType.columns());
@@ -1225,32 +1233,32 @@ Value SkVMGenerator::writeChildCall(const ChildCall& c) {
     switch (c.child().type().typeKind()) {
         case Type::TypeKind::kShader: {
             SkASSERT(c.arguments().size() == 1);
-            SkASSERT(arg->type() == *fProgram.fContext->fTypes.fFloat2);
+            SkASSERT(arg->type().matches(*fProgram.fContext->fTypes.fFloat2));
             skvm::Coord coord = {f32(argVal[0]), f32(argVal[1])};
-            color = fSampleShader(child_it->second, coord);
+            color = fCallbacks->sampleShader(child_it->second, coord);
             break;
         }
         case Type::TypeKind::kColorFilter: {
             SkASSERT(c.arguments().size() == 1);
-            SkASSERT(arg->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                     arg->type() == *fProgram.fContext->fTypes.fFloat4);
+            SkASSERT(arg->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                     arg->type().matches(*fProgram.fContext->fTypes.fFloat4));
             skvm::Color inColor = {f32(argVal[0]), f32(argVal[1]), f32(argVal[2]), f32(argVal[3])};
-            color = fSampleColorFilter(child_it->second, inColor);
+            color = fCallbacks->sampleColorFilter(child_it->second, inColor);
             break;
         }
         case Type::TypeKind::kBlender: {
             SkASSERT(c.arguments().size() == 2);
-            SkASSERT(arg->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                     arg->type() == *fProgram.fContext->fTypes.fFloat4);
+            SkASSERT(arg->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                     arg->type().matches(*fProgram.fContext->fTypes.fFloat4));
             skvm::Color srcColor = {f32(argVal[0]), f32(argVal[1]), f32(argVal[2]), f32(argVal[3])};
 
             arg = c.arguments()[1].get();
             argVal = this->writeExpression(*arg);
-            SkASSERT(arg->type() == *fProgram.fContext->fTypes.fHalf4 ||
-                     arg->type() == *fProgram.fContext->fTypes.fFloat4);
+            SkASSERT(arg->type().matches(*fProgram.fContext->fTypes.fHalf4) ||
+                     arg->type().matches(*fProgram.fContext->fTypes.fFloat4));
             skvm::Color dstColor = {f32(argVal[0]), f32(argVal[1]), f32(argVal[2]), f32(argVal[3])};
 
-            color = fSampleBlender(child_it->second, srcColor, dstColor);
+            color = fCallbacks->sampleBlender(child_it->second, srcColor, dstColor);
             break;
         }
         default: {
@@ -1480,6 +1488,27 @@ Value SkVMGenerator::writeIntrinsicCall(const FunctionCall& c) {
         }
         case k_not_IntrinsicKind: return unary(args[0], [](skvm::I32 x) { return ~x; });
 
+        case k_toLinearSrgb_IntrinsicKind: {
+            skvm::Color color = {
+                    f32(args[0][0]), f32(args[0][1]), f32(args[0][2]), fBuilder->splat(1.0f)};
+            color = fCallbacks->toLinearSrgb(color);
+            Value result(3);
+            result[0] = color.r;
+            result[1] = color.g;
+            result[2] = color.b;
+            return result;
+        }
+        case k_fromLinearSrgb_IntrinsicKind: {
+            skvm::Color color = {
+                    f32(args[0][0]), f32(args[0][1]), f32(args[0][2]), fBuilder->splat(1.0f)};
+            color = fCallbacks->fromLinearSrgb(color);
+            Value result(3);
+            result[0] = color.r;
+            result[1] = color.g;
+            result[2] = color.b;
+            return result;
+        }
+
         default:
             SkDEBUGFAILF("unsupported intrinsic %s", c.function().description().c_str());
             return {};
@@ -1798,9 +1827,18 @@ skvm::Val SkVMGenerator::writeConditionalStore(skvm::Val lhs, skvm::Val rhs, skv
 }
 
 void SkVMGenerator::writeBlock(const Block& b) {
+    skvm::I32 mask = this->mask();
+    if (b.isScope()) {
+        this->emitTraceScope(mask, +1);
+    }
+
     for (const std::unique_ptr<Statement>& stmt : b.children()) {
         this->writeStatement(*stmt);
     }
+
+    if (b.isScope()) {
+        this->emitTraceScope(mask, -1);
+    }
 }
 
 void SkVMGenerator::writeBreakStatement() {
@@ -1831,17 +1869,26 @@ void SkVMGenerator::writeForStatement(const ForStatement& f) {
 
     const Type::NumberKind indexKind = base_number_kind(loop.fIndex->type());
 
-    for (int i = 0; i < loop.fCount; ++i) {
-        this->writeToSlot(indexSlot, (indexKind == Type::NumberKind::kFloat)
-                                        ? fBuilder->splat(static_cast<float>(val)).id
-                                        : fBuilder->splat(static_cast<int>(val)).id);
+    // We want the loop index to disappear at the end of the loop, so wrap the for statement in a
+    // trace scope.
+    if (loop.fCount > 0) {
+        skvm::I32 mask = this->mask();
+        this->emitTraceScope(mask, +1);
+
+        for (int i = 0; i < loop.fCount; ++i) {
+            this->writeToSlot(indexSlot, (indexKind == Type::NumberKind::kFloat)
+                                            ? fBuilder->splat(static_cast<float>(val)).id
+                                            : fBuilder->splat(static_cast<int>(val)).id);
 
-        fContinueMask = zero;
-        this->writeStatement(*f.statement());
-        fLoopMask |= fContinueMask;
+            fContinueMask = zero;
+            this->writeStatement(*f.statement());
+            fLoopMask |= fContinueMask;
 
-        this->emitTraceLine(f.test() ? f.test()->fLine : f.fLine);
-        val += loop.fDelta;
+            this->emitTraceLine(f.test() ? f.test()->fLine : f.fLine);
+            val += loop.fDelta;
+        }
+
+        this->emitTraceScope(mask, -1);
     }
 
     fLoopMask     = oldLoopMask;
@@ -1869,8 +1916,10 @@ void SkVMGenerator::writeReturnStatement(const ReturnStatement& r) {
         size_t slot = currentFunction().fReturnSlot;
         size_t nslots = r.expression()->type().slotCount();
         for (size_t i = 0; i < nslots; ++i) {
-            fSlots[slot + i].val = this->writeConditionalStore(fSlots[slot + i].val, val[i],
-                                                               returnsHere);
+            fSlots[slot + i].writtenTo = false;
+            skvm::Val conditionalStore = this->writeConditionalStore(fSlots[slot + i].val, val[i],
+                                                                     returnsHere);
+            this->writeToSlot(slot + i, conditionalStore);
         }
     }
 
@@ -1891,8 +1940,8 @@ void SkVMGenerator::writeSwitchStatement(const SwitchStatement& s) {
 
     for (const std::unique_ptr<Statement>& stmt : s.cases()) {
         const SwitchCase& c = stmt->as<SwitchCase>();
-        if (c.value()) {
-            Value caseValue = this->writeExpression(*c.value());
+        if (!c.isDefault()) {
+            Value caseValue = fBuilder->splat((int) c.value());
 
             // We want to execute this switch case if we're falling through from a previous case, or
             // if the case value matches.
@@ -1932,6 +1981,12 @@ void SkVMGenerator::emitTraceLine(int line) {
     }
 }
 
+void SkVMGenerator::emitTraceScope(skvm::I32 executionMask, int delta) {
+    if (fDebugTrace) {
+        fBuilder->trace_scope(fTraceHookID, executionMask, fTraceMask, delta);
+    }
+}
+
 void SkVMGenerator::writeStatement(const Statement& s) {
     this->emitTraceLine(s.fLine);
 
@@ -1985,9 +2040,7 @@ skvm::Color ProgramToSkVM(const Program& program,
                           skvm::Coord local,
                           skvm::Color inputColor,
                           skvm::Color destColor,
-                          SampleShaderFn sampleShader,
-                          SampleColorFilterFn sampleColorFilter,
-                          SampleBlenderFn sampleBlender) {
+                          SkVMCallbacks* callbacks) {
     skvm::Val zero = builder->splat(0.0f).id;
     skvm::Val result[4] = {zero,zero,zero,zero};
 
@@ -2031,8 +2084,7 @@ skvm::Color ProgramToSkVM(const Program& program,
         debugTrace->fTraceInfo.clear();
     }
 
-    SkVMGenerator generator(program, builder, debugTrace, std::move(sampleShader),
-                            std::move(sampleColorFilter), std::move(sampleBlender));
+    SkVMGenerator generator(program, builder, debugTrace, callbacks);
     generator.writeProgram(uniforms, device, function, {args, argSlots}, SkMakeSpan(result));
 
     return skvm::Color{{builder, result[0]},
@@ -2071,18 +2123,34 @@ bool ProgramToSkVM(const Program& program,
         returnVals.push_back(b->splat(0.0f).id);
     }
 
-    bool sampledChildEffects = false;
-    auto sampleShader = [&](int, skvm::Coord) {
-        sampledChildEffects = true;
-        return skvm::Color{};
-    };
-    auto sampleColorFilter = [&](int, skvm::Color) {
-        sampledChildEffects = true;
-        return skvm::Color{};
-    };
-    auto sampleBlender = [&](int, skvm::Color, skvm::Color) {
-        sampledChildEffects = true;
-        return skvm::Color{};
+    class Callbacks : public SkVMCallbacks {
+    public:
+        Callbacks(skvm::Color color) : fColor(color) {}
+
+        skvm::Color sampleShader(int, skvm::Coord) override {
+            fUsedUnsupportedFeatures = true;
+            return fColor;
+        }
+        skvm::Color sampleColorFilter(int, skvm::Color) override {
+            fUsedUnsupportedFeatures = true;
+            return fColor;
+        }
+        skvm::Color sampleBlender(int, skvm::Color, skvm::Color) override {
+            fUsedUnsupportedFeatures = true;
+            return fColor;
+        }
+
+        skvm::Color toLinearSrgb(skvm::Color) override {
+            fUsedUnsupportedFeatures = true;
+            return fColor;
+        }
+        skvm::Color fromLinearSrgb(skvm::Color) override {
+            fUsedUnsupportedFeatures = true;
+            return fColor;
+        }
+
+        bool fUsedUnsupportedFeatures = false;
+        const skvm::Color fColor;
     };
 
     // Set up device coordinates so that the rightmost evaluated pixel will be centered on (0, 0).
@@ -2091,12 +2159,16 @@ bool ProgramToSkVM(const Program& program,
     skvm::Coord device = {pixelCenter, pixelCenter};
     device.x += to_F32(b->splat(1) - b->index());
 
-    SkVMGenerator generator(program, b, debugTrace, sampleShader, sampleColorFilter, sampleBlender);
+    skvm::F32 zero = b->splat(0.0f);
+    skvm::Color sampledColor{zero, zero, zero, zero};
+    Callbacks callbacks(sampledColor);
+
+    SkVMGenerator generator(program, b, debugTrace, &callbacks);
     generator.writeProgram(uniforms, device, function, SkMakeSpan(argVals), SkMakeSpan(returnVals));
 
     // If the SkSL tried to use any shader, colorFilter, or blender objects - we don't have a
     // mechanism (yet) for binding to those.
-    if (sampledChildEffects) {
+    if (callbacks.fUsedUnsupportedFeatures) {
         return false;
     }
 
@@ -2132,11 +2204,11 @@ const FunctionDefinition* Program_GetFunction(const Program& program, const char
     return nullptr;
 }
 
-static void gather_uniforms(UniformInfo* info, const Type& type, const String& name) {
+static void gather_uniforms(UniformInfo* info, const Type& type, const std::string& name) {
     switch (type.typeKind()) {
         case Type::TypeKind::kStruct:
             for (const auto& f : type.fields()) {
-                gather_uniforms(info, *f.fType, name + "." + f.fName);
+                gather_uniforms(info, *f.fType, name + "." + std::string(f.fName));
             }
             break;
         case Type::TypeKind::kArray:
@@ -2166,7 +2238,7 @@ std::unique_ptr<UniformInfo> Program_GetUniformInfo(const Program& program) {
         const GlobalVarDeclaration& decl = e->as<GlobalVarDeclaration>();
         const Variable& var = decl.declaration()->as<VarDeclaration>().var();
         if (var.modifiers().fFlags & Modifiers::kUniform_Flag) {
-            gather_uniforms(info.get(), var.type(), String(var.name()));
+            gather_uniforms(info.get(), var.type(), std::string(var.name()));
         }
     }
     return info;
@@ -2206,22 +2278,46 @@ bool testingOnly_ProgramToSkVMShader(const Program& program,
     skvm::Coord device = {pun_to_F32(builder->index()), new_uni()};
     skvm::Coord local  = device;
 
-    struct Child {
-        skvm::Uniform addr;
-        skvm::I32     rowBytesAsPixels;
-    };
+    class Callbacks : public SkVMCallbacks {
+    public:
+        Callbacks(skvm::Builder* builder, skvm::Uniforms* uniforms, int numChildren) {
+            for (int i = 0; i < numChildren; ++i) {
+                fChildren.push_back(
+                        {uniforms->pushPtr(nullptr), builder->uniform32(uniforms->push(0))});
+            }
+        }
 
-    std::vector<Child> children;
-    for (int i = 0; i < childSlots; ++i) {
-        children.push_back({uniforms.pushPtr(nullptr), builder->uniform32(uniforms.push(0))});
-    }
+        skvm::Color sampleShader(int i, skvm::Coord coord) override {
+            skvm::PixelFormat pixelFormat = skvm::SkColorType_to_PixelFormat(kRGBA_F32_SkColorType);
+            skvm::I32 index  = trunc(coord.x);
+                      index += trunc(coord.y) * fChildren[i].rowBytesAsPixels;
+            return gather(pixelFormat, fChildren[i].addr, index);
+        }
+
+        skvm::Color sampleColorFilter(int i, skvm::Color color) override {
+            return color;
+        }
+
+        skvm::Color sampleBlender(int i, skvm::Color src, skvm::Color dst) override {
+            return blend(SkBlendMode::kSrcOver, src, dst);
+        }
+
+        // TODO(skia:10479): Make these actually convert to/from something like sRGB, for use in
+        // test files.
+        skvm::Color toLinearSrgb(skvm::Color color) override {
+            return color;
+        }
+        skvm::Color fromLinearSrgb(skvm::Color color) override {
+            return color;
+        }
 
-    auto sampleShader = [&](int i, skvm::Coord coord) {
-        skvm::PixelFormat pixelFormat = skvm::SkColorType_to_PixelFormat(kRGBA_F32_SkColorType);
-        skvm::I32 index  = trunc(coord.x);
-                  index += trunc(coord.y) * children[i].rowBytesAsPixels;
-        return gather(pixelFormat, children[i].addr, index);
+        struct Child {
+            skvm::Uniform addr;
+            skvm::I32     rowBytesAsPixels;
+        };
+        std::vector<Child> fChildren;
     };
+    Callbacks callbacks(builder, &uniforms, childSlots);
 
     std::vector<skvm::Val> uniformVals;
     for (size_t i = 0; i < uniformSlots; ++i) {
@@ -2233,8 +2329,7 @@ bool testingOnly_ProgramToSkVMShader(const Program& program,
 
     skvm::Color result = SkSL::ProgramToSkVM(program, *main, builder, debugTrace,
                                              SkMakeSpan(uniformVals), device, local, inColor,
-                                             destColor, sampleShader, /*sampleColorFilter=*/nullptr,
-                                             /*sampleBlender=*/nullptr);
+                                             destColor, &callbacks);
 
     storeF(builder->varying<float>(), result.r);
     storeF(builder->varying<float>(), result.g);
diff --git a/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h b/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h
index c0715b3198632..a88f0b378594f 100644
--- a/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h
+++ b/third_party/skia/src/sksl/codegen/SkSLVMCodeGenerator.h
@@ -21,9 +21,17 @@ class FunctionDefinition;
 struct Program;
 class SkVMDebugTrace;
 
-using SampleShaderFn = std::function<skvm::Color(int, skvm::Coord)>;
-using SampleColorFilterFn = std::function<skvm::Color(int, skvm::Color)>;
-using SampleBlenderFn = std::function<skvm::Color(int, skvm::Color, skvm::Color)>;
+class SkVMCallbacks {
+public:
+    virtual ~SkVMCallbacks() = default;
+
+    virtual skvm::Color sampleShader(int index, skvm::Coord coord) = 0;
+    virtual skvm::Color sampleColorFilter(int index, skvm::Color color) = 0;
+    virtual skvm::Color sampleBlender(int index, skvm::Color src, skvm::Color dst) = 0;
+
+    virtual skvm::Color toLinearSrgb(skvm::Color color) = 0;
+    virtual skvm::Color fromLinearSrgb(skvm::Color color) = 0;
+};
 
 // Convert 'function' to skvm instructions in 'builder', for use by blends, shaders, & color filters
 skvm::Color ProgramToSkVM(const Program& program,
@@ -35,9 +43,7 @@ skvm::Color ProgramToSkVM(const Program& program,
                           skvm::Coord local,
                           skvm::Color inputColor,
                           skvm::Color destColor,
-                          SampleShaderFn sampleShader,
-                          SampleColorFilterFn sampleColorFilter,
-                          SampleBlenderFn sampleBlender);
+                          SkVMCallbacks* callbacks);
 
 struct SkVMSignature {
     size_t fParameterSlots = 0;
@@ -69,7 +75,7 @@ const FunctionDefinition* Program_GetFunction(const Program& program, const char
 
 struct UniformInfo {
     struct Uniform {
-        String fName;
+        std::string fName;
         Type::NumberKind fKind;
         int fColumns;
         int fRows;
diff --git a/third_party/skia/src/sksl/dsl/DSLCore.cpp b/third_party/skia/src/sksl/dsl/DSLCore.cpp
index 38290c06b8fee..691109da7f296 100644
--- a/third_party/skia/src/sksl/dsl/DSLCore.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLCore.cpp
@@ -68,12 +68,12 @@ void SetErrorReporter(ErrorReporter* errorReporter) {
 
 class DSLCore {
 public:
-    static std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<String> source) {
+    static std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<std::string> source) {
         ThreadContext& instance = ThreadContext::Instance();
         SkSL::Compiler& compiler = *instance.fCompiler;
         const SkSL::Context& context = *compiler.fContext;
         // Variables defined in the pre-includes need their declaring elements added to the program
-        if (!instance.fConfig->fIsBuiltinCode && context.fIntrinsics) {
+        if (!instance.fConfig->fIsBuiltinCode && context.fBuiltins) {
             Transform::FindAndDeclareBuiltinVariables(context, instance.fConfig->fKind,
                     instance.fSharedElements);
         }
@@ -220,7 +220,7 @@ class DSLCore {
         for (size_t i = 0; i < fields.size(); ++i) {
             const SkSL::Type::Field& f = fields[i];
             if (f.fName == SkSL::Compiler::RTADJUST_NAME) {
-                if (*f.fType == *context.fTypes.fFloat4) {
+                if (f.fType->matches(*context.fTypes.fFloat4)) {
                     ThreadContext::RTAdjustData& rtAdjust = ThreadContext::RTAdjustState();
                     rtAdjust.fInterfaceBlock = &intf.variable();
                     rtAdjust.fFieldIndex = i;
@@ -232,8 +232,8 @@ class DSLCore {
         }
     }
 
-    static DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers, skstd::string_view typeName,
-                                       SkTArray<DSLField> fields, skstd::string_view varName,
+    static DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers, std::string_view typeName,
+                                       SkTArray<DSLField> fields, std::string_view varName,
                                        int arraySize, PositionInfo pos) {
         // We need to create a new struct type for the interface block, but we don't want it in the
         // symbol table. Since dsl::Struct automatically sticks it in the symbol table, we create it
@@ -356,7 +356,7 @@ class DSLCore {
     }
 };
 
-std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<String> source) {
+std::unique_ptr<SkSL::Program> ReleaseProgram(std::unique_ptr<std::string> source) {
     return DSLCore::ReleaseProgram(std::move(source));
 }
 
@@ -372,7 +372,7 @@ DSLExpression sk_Position() {
     return DSLCore::sk_Position();
 }
 
-void AddExtension(skstd::string_view name, PositionInfo pos) {
+void AddExtension(std::string_view name, PositionInfo pos) {
     ThreadContext::ProgramElements().push_back(std::make_unique<SkSL::Extension>(pos.line(), name));
     ThreadContext::ReportErrors(pos);
 }
@@ -447,8 +447,8 @@ DSLStatement If(DSLExpression test, DSLStatement ifTrue, DSLStatement ifFalse, P
                         pos);
 }
 
-DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers,  skstd::string_view typeName,
-                            SkTArray<DSLField> fields, skstd::string_view varName, int arraySize,
+DSLGlobalVar InterfaceBlock(const DSLModifiers& modifiers,  std::string_view typeName,
+                            SkTArray<DSLField> fields, std::string_view varName, int arraySize,
                             PositionInfo pos) {
     SkSL::ProgramKind kind = ThreadContext::GetProgramConfig()->fKind;
     if (kind != ProgramKind::kFragment &&
diff --git a/third_party/skia/src/sksl/dsl/DSLExpression.cpp b/third_party/skia/src/sksl/dsl/DSLExpression.cpp
index ff0f90387a68f..f0d4fdcbb4dd2 100644
--- a/third_party/skia/src/sksl/dsl/DSLExpression.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLExpression.cpp
@@ -164,7 +164,7 @@ DSLExpression DSLExpression::a(PositionInfo pos) {
     return Swizzle(std::move(*this), A, pos);
 }
 
-DSLExpression DSLExpression::field(skstd::string_view name, PositionInfo pos) {
+DSLExpression DSLExpression::field(std::string_view name, PositionInfo pos) {
     return DSLExpression(FieldAccess::Convert(ThreadContext::Context(),
             *ThreadContext::SymbolTable(), this->release(), name), pos);
 }
@@ -332,7 +332,7 @@ DSLExpression DSLPossibleExpression::a(PositionInfo pos) {
     return DSLExpression(this->release()).a(pos);
 }
 
-DSLExpression DSLPossibleExpression::field(skstd::string_view name, PositionInfo pos) {
+DSLExpression DSLPossibleExpression::field(std::string_view name, PositionInfo pos) {
     return DSLExpression(this->release()).field(name, pos);
 }
 
diff --git a/third_party/skia/src/sksl/dsl/DSLFunction.cpp b/third_party/skia/src/sksl/dsl/DSLFunction.cpp
index 61d4bb7ce7045..713d3a62b9018 100644
--- a/third_party/skia/src/sksl/dsl/DSLFunction.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLFunction.cpp
@@ -21,7 +21,7 @@ namespace SkSL {
 
 namespace dsl {
 
-void DSLFunction::init(DSLModifiers modifiers, const DSLType& returnType, skstd::string_view name,
+void DSLFunction::init(DSLModifiers modifiers, const DSLType& returnType, std::string_view name,
                        SkTArray<DSLParameter*> params, PositionInfo pos) {
     fPosition = pos;
     // Conservatively assume all user-defined functions have side effects.
@@ -91,7 +91,7 @@ void DSLFunction::define(DSLBlock block, PositionInfo pos) {
         }
     }
     if (fDecl->definition()) {
-        ThreadContext::ReportError(String::printf("function '%s' was already defined",
+        ThreadContext::ReportError(SkSL::String::printf("function '%s' was already defined",
                 fDecl->description().c_str()), pos);
         block.release();
         return;
diff --git a/third_party/skia/src/sksl/dsl/DSLLayout.cpp b/third_party/skia/src/sksl/dsl/DSLLayout.cpp
index 9b1c27ae7614c..f3ec013c621b8 100644
--- a/third_party/skia/src/sksl/dsl/DSLLayout.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLLayout.cpp
@@ -15,8 +15,8 @@ namespace dsl {
 
 DSLLayout& DSLLayout::flag(SkSL::Layout::Flag mask, const char* name, PositionInfo pos) {
     if (fSkSLLayout.fFlags & mask) {
-        ThreadContext::ReportError("layout qualifier '" + String(name) + "' appears more than once",
-                pos);
+        ThreadContext::ReportError(
+                "layout qualifier '" + std::string(name) + "' appears more than once", pos);
     }
     fSkSLLayout.fFlags |= mask;
     return *this;
diff --git a/third_party/skia/src/sksl/dsl/DSLRuntimeEffects.cpp b/third_party/skia/src/sksl/dsl/DSLRuntimeEffects.cpp
index 33eb72c7fee48..c71fbcbacd6ca 100644
--- a/third_party/skia/src/sksl/dsl/DSLRuntimeEffects.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLRuntimeEffects.cpp
@@ -20,7 +20,7 @@ namespace dsl {
 
 void StartRuntimeShader(SkSL::Compiler* compiler) {
     Start(compiler, SkSL::ProgramKind::kRuntimeShader);
-    SkSL::ProgramSettings& settings = ThreadContext::Settings();
+    SkSL::ProgramSettings& settings = ThreadContext::Context().fConfig->fSettings;
     SkASSERT(settings.fInlineThreshold == SkSL::kDefaultInlineThreshold);
     settings.fInlineThreshold = 0;
     SkASSERT(!settings.fAllowNarrowingConversions);
@@ -29,14 +29,13 @@ void StartRuntimeShader(SkSL::Compiler* compiler) {
 
 sk_sp<SkRuntimeEffect> EndRuntimeShader(SkRuntimeEffect::Options options) {
     std::unique_ptr<SkSL::Program> program = ReleaseProgram();
-    SkRuntimeEffect::Result result;
+    ThreadContext::ReportErrors(PositionInfo{});
+    sk_sp<SkRuntimeEffect> result;
     if (program) {
-        result = SkRuntimeEffect::MakeForShader(std::move(program), options);
-        // TODO(skbug.com/11862): propagate errors properly
-        SkASSERTF(result.effect, "%s\n", result.errorText.c_str());
+        result = SkRuntimeEffect::MakeForShader(std::move(program), options, &GetErrorReporter());
     }
     End();
-    return result.effect;
+    return result;
 }
 
 #endif // SKSL_STANDALONE
diff --git a/third_party/skia/src/sksl/dsl/DSLSymbols.cpp b/third_party/skia/src/sksl/dsl/DSLSymbols.cpp
index 5b4df4468520c..9d6c8e6bce4a1 100644
--- a/third_party/skia/src/sksl/dsl/DSLSymbols.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLSymbols.cpp
@@ -16,7 +16,7 @@ namespace SkSL {
 
 namespace dsl {
 
-static bool is_type_in_symbol_table(skstd::string_view name, SkSL::SymbolTable* symbols) {
+static bool is_type_in_symbol_table(std::string_view name, SkSL::SymbolTable* symbols) {
     const SkSL::Symbol* s = (*symbols)[name];
     return s && s->is<Type>();
 }
@@ -33,15 +33,15 @@ std::shared_ptr<SymbolTable> CurrentSymbolTable() {
     return ThreadContext::SymbolTable();
 }
 
-DSLPossibleExpression Symbol(skstd::string_view name, PositionInfo pos) {
+DSLPossibleExpression Symbol(std::string_view name, PositionInfo pos) {
     return ThreadContext::Compiler().convertIdentifier(pos.line(), name);
 }
 
-bool IsType(skstd::string_view name) {
+bool IsType(std::string_view name) {
     return is_type_in_symbol_table(name, CurrentSymbolTable().get());
 }
 
-bool IsBuiltinType(skstd::string_view name) {
+bool IsBuiltinType(std::string_view name) {
     return is_type_in_symbol_table(name, CurrentSymbolTable()->builtinParent());
 }
 
@@ -53,7 +53,7 @@ void AddToSymbolTable(DSLVarBase& var, PositionInfo pos) {
     ThreadContext::ReportErrors(pos);
 }
 
-const String* Retain(String string) {
+const std::string* Retain(std::string string) {
     return CurrentSymbolTable()->takeOwnershipOfString(std::move(string));
 }
 
diff --git a/third_party/skia/src/sksl/dsl/DSLType.cpp b/third_party/skia/src/sksl/dsl/DSLType.cpp
index 4434924348329..04cfd02dff04a 100644
--- a/third_party/skia/src/sksl/dsl/DSLType.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLType.cpp
@@ -21,11 +21,12 @@ static const SkSL::Type* verify_type(const Context& context,
                                      PositionInfo pos) {
     if (!context.fConfig->fIsBuiltinCode) {
         if (!allowPrivateTypes && type->isPrivate()) {
-            context.fErrors->error("type '" + String(type->name()) + "' is private", pos);
+            context.fErrors->error("type '" + std::string(type->name()) + "' is private", pos);
             return context.fTypes.fPoison.get();
         }
         if (!type->isAllowedInES2(context)) {
-            context.fErrors->error("type '" + String(type->name()) + "' is not supported", pos);
+            context.fErrors->error("type '" + std::string(type->name()) + "' is not supported",
+                                   pos);
             return context.fTypes.fPoison.get();
         }
     }
@@ -33,7 +34,7 @@ static const SkSL::Type* verify_type(const Context& context,
 }
 
 static const SkSL::Type* find_type(const Context& context,
-                                   skstd::string_view name,
+                                   std::string_view name,
                                    PositionInfo pos) {
     const Symbol* symbol = (*ThreadContext::SymbolTable())[name];
     if (!symbol) {
@@ -51,7 +52,7 @@ static const SkSL::Type* find_type(const Context& context,
 }
 
 static const SkSL::Type* find_type(const Context& context,
-                                   skstd::string_view name,
+                                   std::string_view name,
                                    Modifiers* modifiers,
                                    PositionInfo pos) {
     const Type* type = find_type(context, name, pos);
@@ -166,10 +167,10 @@ static const SkSL::Type* get_type_from_type_constant(const Context& context, Typ
     }
 }
 
-DSLType::DSLType(skstd::string_view name)
+DSLType::DSLType(std::string_view name)
         : fSkSLType(find_type(ThreadContext::Context(), name, PositionInfo())) {}
 
-DSLType::DSLType(skstd::string_view name, DSLModifiers* modifiers, PositionInfo position)
+DSLType::DSLType(std::string_view name, DSLModifiers* modifiers, PositionInfo position)
         : fSkSLType(find_type(ThreadContext::Context(), name, &modifiers->fModifiers, position)) {}
 
 DSLType::DSLType(const SkSL::Type* type)
@@ -259,12 +260,12 @@ DSLType Array(const DSLType& base, int count, PositionInfo pos) {
     return ThreadContext::SymbolTable()->addArrayDimension(&base.skslType(), count);
 }
 
-DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields, PositionInfo pos) {
+DSLType Struct(std::string_view name, SkSpan<DSLField> fields, PositionInfo pos) {
     std::vector<SkSL::Type::Field> skslFields;
     skslFields.reserve(fields.size());
     for (const DSLField& field : fields) {
         if (field.fModifiers.fModifiers.fFlags != Modifiers::kNo_Flag) {
-            String desc = field.fModifiers.fModifiers.description();
+            std::string desc = field.fModifiers.fModifiers.description();
             desc.pop_back();  // remove trailing space
             ThreadContext::ReportError("modifier '" + desc + "' is not permitted on a struct field",
                     field.fPosition);
@@ -291,7 +292,7 @@ DSLType Struct(skstd::string_view name, SkSpan<DSLField> fields, PositionInfo po
     const SkSL::Type* result = ThreadContext::SymbolTable()->add(Type::MakeStructType(pos.line(),
             name, skslFields));
     if (result->isTooDeeplyNested()) {
-        ThreadContext::ReportError("struct '" + String(name) + "' is too deeply nested", pos);
+        ThreadContext::ReportError("struct '" + std::string(name) + "' is too deeply nested", pos);
     }
     ThreadContext::ProgramElements().push_back(std::make_unique<SkSL::StructDefinition>(/*line=*/-1,
             *result));
diff --git a/third_party/skia/src/sksl/dsl/DSLVar.cpp b/third_party/skia/src/sksl/dsl/DSLVar.cpp
index 5960d8d4c6fc2..da4a29b66d9d2 100644
--- a/third_party/skia/src/sksl/dsl/DSLVar.cpp
+++ b/third_party/skia/src/sksl/dsl/DSLVar.cpp
@@ -23,7 +23,7 @@ namespace SkSL {
 
 namespace dsl {
 
-DSLVarBase::DSLVarBase(DSLType type, skstd::string_view name, DSLExpression initialValue,
+DSLVarBase::DSLVarBase(DSLType type, std::string_view name, DSLExpression initialValue,
                        PositionInfo pos)
     : DSLVarBase(DSLModifiers(), std::move(type), name, std::move(initialValue), pos) {}
 
@@ -34,7 +34,7 @@ DSLVarBase::DSLVarBase(const DSLModifiers& modifiers, DSLType type, DSLExpressio
                        PositionInfo pos)
     : DSLVarBase(modifiers, type, "var", std::move(initialValue), pos) {}
 
-DSLVarBase::DSLVarBase(const DSLModifiers& modifiers, DSLType type, skstd::string_view name,
+DSLVarBase::DSLVarBase(const DSLModifiers& modifiers, DSLType type, std::string_view name,
                        DSLExpression initialValue, PositionInfo pos)
     : fModifiers(std::move(modifiers))
     , fType(std::move(type))
@@ -46,24 +46,24 @@ DSLVarBase::DSLVarBase(const DSLModifiers& modifiers, DSLType type, skstd::strin
     if (fModifiers.fModifiers.fFlags & Modifiers::kUniform_Flag) {
 #if SK_SUPPORT_GPU && !defined(SKSL_STANDALONE)
         if (ThreadContext::InFragmentProcessor()) {
-            const SkSL::Type& skslType = type.skslType();
-            GrSLType grslType;
+            const SkSL::Type& skslType = fType.skslType();
+            SkSLType gpuType;
             int count;
             if (skslType.isArray()) {
-                SkAssertResult(SkSL::type_to_grsltype(ThreadContext::Context(),
-                        skslType.componentType(), &grslType));
+                SkAssertResult(SkSL::type_to_sksltype(ThreadContext::Context(),
+                                                      skslType.componentType(), &gpuType));
                 count = skslType.columns();
                 SkASSERT(count > 0);
             } else {
-                SkAssertResult(SkSL::type_to_grsltype(ThreadContext::Context(), skslType,
-                        &grslType));
+                SkAssertResult(SkSL::type_to_sksltype(ThreadContext::Context(), skslType,
+                                                      &gpuType));
                 count = 0;
             }
             const char* uniformName;
             SkASSERT(ThreadContext::CurrentEmitArgs());
             fUniformHandle = ThreadContext::CurrentEmitArgs()->fUniformHandler->addUniformArray(
-                    &ThreadContext::CurrentEmitArgs()->fFp, kFragment_GrShaderFlag, grslType,
-                    String(this->name()).c_str(), count, &uniformName).toIndex();
+                    &ThreadContext::CurrentEmitArgs()->fFp, kFragment_GrShaderFlag, gpuType,
+                    std::string(this->name()).c_str(), count, &uniformName).toIndex();
             fName = uniformName;
         }
 #endif // SK_SUPPORT_GPU && !defined(SKSL_STANDALONE)
@@ -176,7 +176,7 @@ DSLPossibleExpression DSLParameter::operator=(DSLExpression expr) {
     return this->assign(std::move(expr));
 }
 
-std::unique_ptr<SkSL::Expression> DSLGlobalVar::methodCall(skstd::string_view methodName,
+std::unique_ptr<SkSL::Expression> DSLGlobalVar::methodCall(std::string_view methodName,
                                                            PositionInfo pos) {
     if (!this->fType.isEffectChild()) {
         ThreadContext::ReportError("type does not support method calls", pos);
diff --git a/third_party/skia/src/sksl/dsl/priv/BUILD.bazel b/third_party/skia/src/sksl/dsl/priv/BUILD.bazel
index 1bcf836cef223..cb6ce11f3f121 100644
--- a/third_party/skia/src/sksl/dsl/priv/BUILD.bazel
+++ b/third_party/skia/src/sksl/dsl/priv/BUILD.bazel
@@ -27,7 +27,6 @@ generated_cc_atom(
     hdrs = ["DSLWriter.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//include/core:SkStringView_hdr",
         "//include/core:SkTypes_hdr",
         "//src/gpu:GrFragmentProcessor_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
diff --git a/third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp b/third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp
index 37ea579f350a3..e0bacbbf94b31 100644
--- a/third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp
+++ b/third_party/skia/src/sksl/dsl/priv/DSLWriter.cpp
@@ -25,9 +25,9 @@ bool DSLWriter::ManglingEnabled() {
     return ThreadContext::Instance().fSettings.fDSLMangling;
 }
 
-skstd::string_view DSLWriter::Name(skstd::string_view name) {
+std::string_view DSLWriter::Name(std::string_view name) {
     if (ManglingEnabled()) {
-        const String* s = ThreadContext::SymbolTable()->takeOwnershipOfString(
+        const std::string* s = ThreadContext::SymbolTable()->takeOwnershipOfString(
                 ThreadContext::Instance().fMangler.uniqueName(name,
                     ThreadContext::SymbolTable().get()));
         return s->c_str();
diff --git a/third_party/skia/src/sksl/dsl/priv/DSLWriter.h b/third_party/skia/src/sksl/dsl/priv/DSLWriter.h
index a3efcf48f53ce..f44967b8944e0 100644
--- a/third_party/skia/src/sksl/dsl/priv/DSLWriter.h
+++ b/third_party/skia/src/sksl/dsl/priv/DSLWriter.h
@@ -8,7 +8,6 @@
 #ifndef SKSL_DSLWRITER
 #define SKSL_DSLWRITER
 
-#include "include/core/SkStringView.h"
 #include "include/core/SkTypes.h"
 #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
 #include "src/gpu/GrFragmentProcessor.h"
@@ -16,6 +15,7 @@
 #endif // !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU
 
 #include <memory>
+#include <string_view>
 
 namespace SkSL {
 
@@ -55,7 +55,7 @@ class DSLWriter {
      */
     static bool ManglingEnabled();
 
-    static skstd::string_view Name(skstd::string_view name);
+    static std::string_view Name(std::string_view name);
 
     /**
      * Returns the SkSL variable corresponding to a DSL var.
diff --git a/third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl b/third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
index dc6c48fd4154b..3d84a4dbf7df9 100644
--- a/third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
+++ b/third_party/skia/src/sksl/generated/sksl_frag.dehydrated.sksl
@@ -1,4 +1,4 @@
-static uint8_t SKSL_INCLUDE_sksl_frag[] = {96,0,
+static uint8_t SKSL_INCLUDE_sksl_frag[] = {8,0,96,0,
 12,115,107,95,70,114,97,103,67,111,111,114,100,
 6,102,108,111,97,116,52,
 12,115,107,95,67,108,111,99,107,119,105,115,101,
@@ -7,52 +7,52 @@ static uint8_t SKSL_INCLUDE_sksl_frag[] = {96,0,
 5,104,97,108,102,52,
 16,115,107,95,76,97,115,116,70,114,97,103,67,111,108,111,114,
 21,115,107,95,83,101,99,111,110,100,97,114,121,70,114,97,103,67,111,108,111,114,
-48,5,0,
-52,1,0,
-36,
-35,0,2,0,0,255,255,255,255,255,15,0,255,16,2,0,
-49,2,0,15,0,0,
-52,3,0,
-36,
-35,0,2,0,0,255,255,255,255,255,17,0,255,16,22,0,
-49,4,0,35,0,0,
-52,5,0,
-36,
-35,144,2,0,0,0,255,255,0,255,17,39,255,32,40,0,
-49,6,0,53,0,0,
-52,7,0,
-36,
-35,0,2,0,0,255,255,255,255,255,24,39,255,0,59,0,
-46,6,0,0,
-52,8,0,
-36,
-35,0,2,0,0,255,255,255,255,255,28,39,255,32,76,0,
-46,6,0,0,5,0,
+52,1,5,0,
+55,1,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,15,0,255,16,2,0,
+51,255,255,15,0,0,
+55,2,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,17,0,255,16,22,0,
+51,255,255,35,0,0,
+55,3,0,
+38,
+37,144,2,0,0,0,255,255,255,255,0,255,17,39,255,32,40,0,
+51,255,255,53,0,0,
+55,4,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,24,39,255,0,59,0,
+51,255,255,53,0,0,
+55,5,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,28,39,255,32,76,0,
+51,255,255,53,0,0,5,0,
 1,0,
 2,0,
 0,0,
 3,0,
 4,0,
 20,
-54,
-53,1,0,
-46,2,0,0,
-56,
-54,
-53,3,0,
-46,4,0,0,
-56,
-54,
-53,5,0,
-46,6,0,0,
-56,
-54,
-53,7,0,
-46,6,0,0,
-56,
-54,
-53,8,0,
-46,6,0,0,
-56,
+31,
+56,1,0,
+51,255,255,15,0,0,
+58,
+31,
+56,2,0,
+51,255,255,35,0,0,
+58,
+31,
+56,3,0,
+51,255,255,53,0,0,
+58,
+31,
+56,4,0,
+51,255,255,53,0,0,
+58,
+31,
+56,5,0,
+51,255,255,53,0,0,
+58,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_frag_LENGTH = sizeof(SKSL_INCLUDE_sksl_frag);
diff --git a/third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl b/third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
index 896cd20380252..d2e4693d96f38 100644
--- a/third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
+++ b/third_party/skia/src/sksl/generated/sksl_gpu.dehydrated.sksl
@@ -1,4 +1,4 @@
-static uint8_t SKSL_INCLUDE_sksl_gpu[] = {173,8,
+static uint8_t SKSL_INCLUDE_sksl_gpu[] = {8,0,189,8,
 7,100,101,103,114,101,101,115,
 8,36,103,101,110,84,121,112,101,
 7,114,97,100,105,97,110,115,
@@ -189,41 +189,42 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {173,8,
 14,98,108,101,110,100,95,109,111,100,117,108,97,116,101,
 12,98,108,101,110,100,95,115,99,114,101,101,110,
 1,100,
-24,95,98,108,101,110,100,95,111,118,101,114,108,97,121,95,99,111,109,112,111,110,101,110,116,
+24,36,98,108,101,110,100,95,111,118,101,114,108,97,121,95,99,111,109,112,111,110,101,110,116,
 13,98,108,101,110,100,95,111,118,101,114,108,97,121,
 12,98,108,101,110,100,95,100,97,114,107,101,110,
 13,98,108,101,110,100,95,108,105,103,104,116,101,110,
 1,110,
-15,95,103,117,97,114,100,101,100,95,100,105,118,105,100,101,
-22,95,99,111,108,111,114,95,100,111,100,103,101,95,99,111,109,112,111,110,101,110,116,
+15,36,103,117,97,114,100,101,100,95,100,105,118,105,100,101,
+22,36,99,111,108,111,114,95,100,111,100,103,101,95,99,111,109,112,111,110,101,110,116,
 17,98,108,101,110,100,95,99,111,108,111,114,95,100,111,100,103,101,
-21,95,99,111,108,111,114,95,98,117,114,110,95,99,111,109,112,111,110,101,110,116,
+21,36,99,111,108,111,114,95,98,117,114,110,95,99,111,109,112,111,110,101,110,116,
 16,98,108,101,110,100,95,99,111,108,111,114,95,98,117,114,110,
 16,98,108,101,110,100,95,104,97,114,100,95,108,105,103,104,116,
-21,95,115,111,102,116,95,108,105,103,104,116,95,99,111,109,112,111,110,101,110,116,
+21,36,115,111,102,116,95,108,105,103,104,116,95,99,111,109,112,111,110,101,110,116,
 16,98,108,101,110,100,95,115,111,102,116,95,108,105,103,104,116,
 16,98,108,101,110,100,95,100,105,102,102,101,114,101,110,99,101,
 15,98,108,101,110,100,95,101,120,99,108,117,115,105,111,110,
 14,98,108,101,110,100,95,109,117,108,116,105,112,108,121,
 5,99,111,108,111,114,
-22,95,98,108,101,110,100,95,99,111,108,111,114,95,108,117,109,105,110,97,110,99,101,
+22,36,98,108,101,110,100,95,99,111,108,111,114,95,108,117,109,105,110,97,110,99,101,
 11,104,117,101,83,97,116,67,111,108,111,114,
 5,97,108,112,104,97,
 8,108,117,109,67,111,108,111,114,
-26,95,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,108,117,109,105,110,97,110,99,101,
-23,95,98,108,101,110,100,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,
+26,36,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,108,117,109,105,110,97,110,99,101,
+23,36,98,108,101,110,100,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,
 9,109,105,110,77,105,100,77,97,120,
 3,115,97,116,
-34,95,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,95,104,101,108,112,101,114,
+34,36,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,95,104,101,108,112,101,114,
 11,104,117,101,76,117,109,67,111,108,111,114,
 8,115,97,116,67,111,108,111,114,
-27,95,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,
+27,36,98,108,101,110,100,95,115,101,116,95,99,111,108,111,114,95,115,97,116,117,114,97,116,105,111,110,
 9,98,108,101,110,100,95,104,117,101,
 16,98,108,101,110,100,95,115,97,116,117,114,97,116,105,111,110,
 11,98,108,101,110,100,95,99,111,108,111,114,
 16,98,108,101,110,100,95,108,117,109,105,110,111,115,105,116,121,
 8,117,110,112,114,101,109,117,108,
 4,112,114,111,106,
+15,99,114,111,115,115,95,108,101,110,103,116,104,95,50,100,
 6,114,101,115,117,108,116,
 43,109,117,115,116,71,117,97,114,100,68,105,118,105,115,105,111,110,69,118,101,110,65,102,116,101,114,69,120,112,108,105,99,105,116,90,101,114,111,67,104,101,99,107,
 5,100,101,108,116,97,
@@ -239,3316 +240,3310 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {173,8,
 25,98,117,105,108,116,105,110,68,101,116,101,114,109,105,110,97,110,116,83,117,112,112,111,114,116,
 8,102,108,111,97,116,50,120,50,
 7,104,97,108,102,50,120,50,
-48,211,3,
-52,1,0,
+52,1,210,3,
+55,1,0,
 17,2,0,
-49,2,0,10,0,3,
-29,3,0,
+51,255,255,10,0,3,
+28,2,0,
 17,19,0,1,1,0,
-46,2,0,
-52,4,0,
+51,255,255,10,0,
+55,3,0,
 17,19,0,
-46,2,0,3,
-29,5,0,
-17,2,0,1,4,0,
-46,2,0,
-52,6,0,
+51,255,255,10,0,3,
+28,4,0,
+17,2,0,1,3,0,
+51,255,255,10,0,
+55,5,0,
 17,27,0,
-46,2,0,3,
-29,7,0,
-17,33,0,1,6,0,
-46,2,0,
-52,8,0,
+51,255,255,10,0,3,
+28,6,0,
+17,33,0,1,5,0,
+51,255,255,10,0,
+55,7,0,
 17,27,0,
-46,2,0,3,
-29,9,0,
-17,37,0,1,8,0,
-46,2,0,
-52,10,0,
+51,255,255,10,0,3,
+28,8,0,
+17,37,0,1,7,0,
+51,255,255,10,0,
+55,9,0,
 17,27,0,
-46,2,0,3,
-29,11,0,
-17,41,0,1,10,0,
-46,2,0,
-52,12,0,
-17,45,0,
-46,2,0,3,
-29,13,0,
-17,47,0,1,12,0,
-46,2,0,
-52,14,0,
-17,45,0,
-46,2,0,3,
-29,15,0,
-17,52,0,1,14,0,
-46,2,0,
-52,16,0,
+51,255,255,10,0,3,
+28,10,0,
+17,41,0,1,9,0,
+51,255,255,10,0,
+55,11,0,
+17,45,0,
+51,255,255,10,0,3,
+28,12,0,
+17,47,0,1,11,0,
+51,255,255,10,0,
+55,13,0,
+17,45,0,
+51,255,255,10,0,3,
+28,14,0,
+17,52,0,1,13,0,
+51,255,255,10,0,
+55,15,0,
 17,57,0,
-46,2,0,3,
-52,17,0,
-17,45,0,
-46,2,0,3,
-29,18,0,
-17,59,0,2,16,0,17,0,
-46,2,0,
-52,19,0,
+51,255,255,10,0,3,
+55,16,0,
+17,45,0,
+51,255,255,10,0,3,
+28,17,0,
+17,59,0,2,15,0,16,0,
+51,255,255,10,0,
+55,18,0,
 17,64,0,
-46,2,0,3,
-51,20,0,2,
-46,18,0,
-29,21,0,
-17,59,0,1,19,0,
-46,2,0,
-46,21,0,
-52,22,0,
-17,45,0,
-46,2,0,3,
-29,23,0,
-17,73,0,1,22,0,
-46,2,0,
-52,24,0,
-17,45,0,
-46,2,0,3,
-29,25,0,
-17,78,0,1,24,0,
-46,2,0,
-52,26,0,
-17,45,0,
-46,2,0,3,
-29,27,0,
-17,83,0,1,26,0,
-46,2,0,
-52,28,0,
-17,45,0,
-46,2,0,3,
-29,29,0,
-17,88,0,1,28,0,
-46,2,0,
-52,30,0,
-17,45,0,
-46,2,0,3,
-29,31,0,
-17,94,0,1,30,0,
-46,2,0,
-52,32,0,
-17,45,0,
-46,2,0,3,
-29,33,0,
-17,100,0,1,32,0,
-46,2,0,
-52,34,0,
-17,45,0,
-46,2,0,3,
-52,35,0,
+51,255,255,10,0,3,
+54,19,0,2,
+51,17,0,
+28,20,0,
+17,59,0,1,18,0,
+51,255,255,10,0,
+51,20,0,
+55,21,0,
+17,45,0,
+51,255,255,10,0,3,
+28,22,0,
+17,73,0,1,21,0,
+51,255,255,10,0,
+55,23,0,
+17,45,0,
+51,255,255,10,0,3,
+28,24,0,
+17,78,0,1,23,0,
+51,255,255,10,0,
+55,25,0,
+17,45,0,
+51,255,255,10,0,3,
+28,26,0,
+17,83,0,1,25,0,
+51,255,255,10,0,
+55,27,0,
+17,45,0,
+51,255,255,10,0,3,
+28,28,0,
+17,88,0,1,27,0,
+51,255,255,10,0,
+55,29,0,
+17,45,0,
+51,255,255,10,0,3,
+28,30,0,
+17,94,0,1,29,0,
+51,255,255,10,0,
+55,31,0,
+17,45,0,
+51,255,255,10,0,3,
+28,32,0,
+17,100,0,1,31,0,
+51,255,255,10,0,
+55,33,0,
+17,45,0,
+51,255,255,10,0,3,
+55,34,0,
 17,57,0,
-46,2,0,3,
-29,36,0,
-17,106,0,2,34,0,35,0,
-46,2,0,
-52,37,0,
-17,45,0,
-46,2,0,3,
-29,38,0,
-17,110,0,1,37,0,
-46,2,0,
-52,39,0,
-17,45,0,
-46,2,0,3,
-29,40,0,
-17,114,0,1,39,0,
-46,2,0,
-52,41,0,
-17,45,0,
-46,2,0,3,
-29,42,0,
-17,118,0,1,41,0,
-46,2,0,
-52,43,0,
-17,45,0,
-46,2,0,3,
-29,44,0,
-17,123,0,1,43,0,
-46,2,0,
-52,45,0,
-17,45,0,
-46,2,0,3,
-29,46,0,
-17,128,0,1,45,0,
-46,2,0,
-52,47,0,
+51,255,255,10,0,3,
+28,35,0,
+17,106,0,2,33,0,34,0,
+51,255,255,10,0,
+55,36,0,
+17,45,0,
+51,255,255,10,0,3,
+28,37,0,
+17,110,0,1,36,0,
+51,255,255,10,0,
+55,38,0,
+17,45,0,
+51,255,255,10,0,3,
+28,39,0,
+17,114,0,1,38,0,
+51,255,255,10,0,
+55,40,0,
+17,45,0,
+51,255,255,10,0,3,
+28,41,0,
+17,118,0,1,40,0,
+51,255,255,10,0,
+55,42,0,
+17,45,0,
+51,255,255,10,0,3,
+28,43,0,
+17,123,0,1,42,0,
+51,255,255,10,0,
+55,44,0,
+17,45,0,
+51,255,255,10,0,3,
+28,45,0,
+17,128,0,1,44,0,
+51,255,255,10,0,
+55,46,0,
 17,2,0,
-49,48,0,133,0,3,
-51,49,0,2,
-46,3,0,
-29,50,0,
-17,19,0,1,47,0,
-46,48,0,
-46,50,0,
-52,51,0,
+51,255,255,133,0,3,
+54,47,0,2,
+51,2,0,
+28,48,0,
+17,19,0,1,46,0,
+51,255,255,133,0,
+51,48,0,
+55,49,0,
 17,19,0,
-46,48,0,3,
-51,52,0,2,
-46,5,0,
-29,53,0,
-17,2,0,1,51,0,
-46,48,0,
-46,53,0,
-52,54,0,
+51,255,255,133,0,3,
+54,50,0,2,
+51,4,0,
+28,51,0,
+17,2,0,1,49,0,
+51,255,255,133,0,
+51,51,0,
+55,52,0,
 17,27,0,
-46,48,0,3,
-51,55,0,2,
-46,7,0,
-29,56,0,
-17,33,0,1,54,0,
-46,48,0,
-46,56,0,
-52,57,0,
+51,255,255,133,0,3,
+54,53,0,2,
+51,6,0,
+28,54,0,
+17,33,0,1,52,0,
+51,255,255,133,0,
+51,54,0,
+55,55,0,
 17,27,0,
-46,48,0,3,
-51,58,0,2,
-46,9,0,
-29,59,0,
-17,37,0,1,57,0,
-46,48,0,
-46,59,0,
-52,60,0,
+51,255,255,133,0,3,
+54,56,0,2,
+51,8,0,
+28,57,0,
+17,37,0,1,55,0,
+51,255,255,133,0,
+51,57,0,
+55,58,0,
 17,27,0,
-46,48,0,3,
-51,61,0,2,
-46,11,0,
-29,62,0,
-17,41,0,1,60,0,
-46,48,0,
-46,62,0,
-52,63,0,
-17,45,0,
-46,48,0,3,
-51,64,0,2,
-46,13,0,
-29,65,0,
-17,47,0,1,63,0,
-46,48,0,
-46,65,0,
-52,66,0,
-17,45,0,
-46,48,0,3,
-51,67,0,2,
-46,15,0,
-29,68,0,
-17,52,0,1,66,0,
-46,48,0,
-46,68,0,
-52,69,0,
+51,255,255,133,0,3,
+54,59,0,2,
+51,10,0,
+28,60,0,
+17,41,0,1,58,0,
+51,255,255,133,0,
+51,60,0,
+55,61,0,
+17,45,0,
+51,255,255,133,0,3,
+54,62,0,2,
+51,12,0,
+28,63,0,
+17,47,0,1,61,0,
+51,255,255,133,0,
+51,63,0,
+55,64,0,
+17,45,0,
+51,255,255,133,0,3,
+54,65,0,2,
+51,14,0,
+28,66,0,
+17,52,0,1,64,0,
+51,255,255,133,0,
+51,66,0,
+55,67,0,
 17,57,0,
-46,48,0,3,
-52,70,0,
-17,45,0,
-46,48,0,3,
-51,71,0,3,
-46,18,0,
-46,21,0,
-29,72,0,
-17,59,0,2,69,0,70,0,
-46,48,0,
-46,72,0,
-52,73,0,
+51,255,255,133,0,3,
+55,68,0,
+17,45,0,
+51,255,255,133,0,3,
+54,69,0,3,
+51,17,0,
+51,20,0,
+28,70,0,
+17,59,0,2,67,0,68,0,
+51,255,255,133,0,
+51,70,0,
+55,71,0,
 17,64,0,
-46,48,0,3,
-51,74,0,4,
-46,18,0,
-46,21,0,
-46,72,0,
-29,75,0,
-17,59,0,1,73,0,
-46,48,0,
-46,75,0,
-52,76,0,
-17,45,0,
-46,48,0,3,
-51,77,0,2,
-46,23,0,
-29,78,0,
-17,73,0,1,76,0,
-46,48,0,
-46,78,0,
-52,79,0,
-17,45,0,
-46,48,0,3,
-51,80,0,2,
-46,25,0,
-29,81,0,
-17,78,0,1,79,0,
-46,48,0,
-46,81,0,
-52,82,0,
-17,45,0,
-46,48,0,3,
-51,83,0,2,
-46,27,0,
-29,84,0,
-17,83,0,1,82,0,
-46,48,0,
-46,84,0,
-52,85,0,
-17,45,0,
-46,48,0,3,
-51,86,0,2,
-46,29,0,
-29,87,0,
-17,88,0,1,85,0,
-46,48,0,
-46,87,0,
-52,88,0,
-17,45,0,
-46,48,0,3,
-51,89,0,2,
-46,31,0,
-29,90,0,
-17,94,0,1,88,0,
-46,48,0,
-46,90,0,
-52,91,0,
-17,45,0,
-46,48,0,3,
-51,92,0,2,
-46,33,0,
-29,93,0,
-17,100,0,1,91,0,
-46,48,0,
-46,93,0,
-52,94,0,
-17,45,0,
-46,48,0,3,
-52,95,0,
+51,255,255,133,0,3,
+54,72,0,4,
+51,17,0,
+51,20,0,
+51,70,0,
+28,73,0,
+17,59,0,1,71,0,
+51,255,255,133,0,
+51,73,0,
+55,74,0,
+17,45,0,
+51,255,255,133,0,3,
+54,75,0,2,
+51,22,0,
+28,76,0,
+17,73,0,1,74,0,
+51,255,255,133,0,
+51,76,0,
+55,77,0,
+17,45,0,
+51,255,255,133,0,3,
+54,78,0,2,
+51,24,0,
+28,79,0,
+17,78,0,1,77,0,
+51,255,255,133,0,
+51,79,0,
+55,80,0,
+17,45,0,
+51,255,255,133,0,3,
+54,81,0,2,
+51,26,0,
+28,82,0,
+17,83,0,1,80,0,
+51,255,255,133,0,
+51,82,0,
+55,83,0,
+17,45,0,
+51,255,255,133,0,3,
+54,84,0,2,
+51,28,0,
+28,85,0,
+17,88,0,1,83,0,
+51,255,255,133,0,
+51,85,0,
+55,86,0,
+17,45,0,
+51,255,255,133,0,3,
+54,87,0,2,
+51,30,0,
+28,88,0,
+17,94,0,1,86,0,
+51,255,255,133,0,
+51,88,0,
+55,89,0,
+17,45,0,
+51,255,255,133,0,3,
+54,90,0,2,
+51,32,0,
+28,91,0,
+17,100,0,1,89,0,
+51,255,255,133,0,
+51,91,0,
+55,92,0,
+17,45,0,
+51,255,255,133,0,3,
+55,93,0,
 17,57,0,
-46,48,0,3,
-51,96,0,2,
-46,36,0,
-29,97,0,
-17,106,0,2,94,0,95,0,
-46,48,0,
-46,97,0,
-52,98,0,
-17,45,0,
-46,48,0,3,
-51,99,0,2,
-46,38,0,
-29,100,0,
-17,110,0,1,98,0,
-46,48,0,
-46,100,0,
-52,101,0,
-17,45,0,
-46,48,0,3,
-51,102,0,2,
-46,40,0,
-29,103,0,
-17,114,0,1,101,0,
-46,48,0,
-46,103,0,
-52,104,0,
-17,45,0,
-46,48,0,3,
-51,105,0,2,
-46,42,0,
-29,106,0,
-17,118,0,1,104,0,
-46,48,0,
-46,106,0,
-52,107,0,
-17,45,0,
-46,48,0,3,
-51,108,0,2,
-46,44,0,
-29,109,0,
-17,123,0,1,107,0,
-46,48,0,
-46,109,0,
-52,110,0,
-17,45,0,
-46,48,0,3,
-51,111,0,2,
-46,46,0,
-29,112,0,
-17,128,0,1,110,0,
-46,48,0,
-46,112,0,
-52,113,0,
-17,45,0,
-46,2,0,3,
-29,114,0,
+51,255,255,133,0,3,
+54,94,0,2,
+51,35,0,
+28,95,0,
+17,106,0,2,92,0,93,0,
+51,255,255,133,0,
+51,95,0,
+55,96,0,
+17,45,0,
+51,255,255,133,0,3,
+54,97,0,2,
+51,37,0,
+28,98,0,
+17,110,0,1,96,0,
+51,255,255,133,0,
+51,98,0,
+55,99,0,
+17,45,0,
+51,255,255,133,0,3,
+54,100,0,2,
+51,39,0,
+28,101,0,
+17,114,0,1,99,0,
+51,255,255,133,0,
+51,101,0,
+55,102,0,
+17,45,0,
+51,255,255,133,0,3,
+54,103,0,2,
+51,41,0,
+28,104,0,
+17,118,0,1,102,0,
+51,255,255,133,0,
+51,104,0,
+55,105,0,
+17,45,0,
+51,255,255,133,0,3,
+54,106,0,2,
+51,43,0,
+28,107,0,
+17,123,0,1,105,0,
+51,255,255,133,0,
+51,107,0,
+55,108,0,
+17,45,0,
+51,255,255,133,0,3,
+54,109,0,2,
+51,45,0,
+28,110,0,
+17,128,0,1,108,0,
+51,255,255,133,0,
+51,110,0,
+55,111,0,
+17,45,0,
+51,255,255,10,0,3,
+28,112,0,
+17,143,0,1,111,0,
+51,255,255,10,0,
+55,113,0,
+17,45,0,
+51,255,255,133,0,3,
+54,114,0,2,
+51,112,0,
+28,115,0,
 17,143,0,1,113,0,
-46,2,0,
-52,115,0,
-17,45,0,
-46,48,0,3,
-51,116,0,2,
-46,114,0,
-29,117,0,
-17,143,0,1,115,0,
-46,48,0,
-46,117,0,
-52,118,0,
-17,45,0,
-46,2,0,3,
-29,119,0,
+51,255,255,133,0,
+51,115,0,
+55,116,0,
+17,45,0,
+51,255,255,10,0,3,
+28,117,0,
+17,155,0,1,116,0,
+51,255,255,10,0,
+55,118,0,
+17,45,0,
+51,255,255,133,0,3,
+54,119,0,2,
+51,117,0,
+28,120,0,
 17,155,0,1,118,0,
-46,2,0,
-52,120,0,
-17,45,0,
-46,48,0,3,
-51,121,0,2,
-46,119,0,
-29,122,0,
-17,155,0,1,120,0,
-46,48,0,
-46,122,0,
-52,123,0,
-17,45,0,
-49,124,0,159,0,3,
-51,125,0,3,
-46,119,0,
-46,122,0,
-29,126,0,
-17,155,0,1,123,0,
-46,124,0,
-46,126,0,
-52,127,0,
-17,45,0,
-46,2,0,3,
-29,128,0,
-17,169,0,1,127,0,
-46,2,0,
-52,129,0,
-17,45,0,
-46,48,0,3,
-51,130,0,2,
-46,128,0,
-29,131,0,
+51,255,255,133,0,
+51,120,0,
+55,121,0,
+17,45,0,
+51,255,255,159,0,3,
+54,122,0,3,
+51,117,0,
+51,120,0,
+28,123,0,
+17,155,0,1,121,0,
+51,255,255,159,0,
+51,123,0,
+55,124,0,
+17,45,0,
+51,255,255,10,0,3,
+28,125,0,
+17,169,0,1,124,0,
+51,255,255,10,0,
+55,126,0,
+17,45,0,
+51,255,255,133,0,3,
+54,127,0,2,
+51,125,0,
+28,128,0,
+17,169,0,1,126,0,
+51,255,255,133,0,
+51,128,0,
+55,129,0,
+17,45,0,
+51,255,255,159,0,3,
+54,130,0,3,
+51,125,0,
+51,128,0,
+28,131,0,
 17,169,0,1,129,0,
-46,48,0,
-46,131,0,
-52,132,0,
-17,45,0,
-46,124,0,3,
-51,133,0,3,
-46,128,0,
-46,131,0,
-29,134,0,
-17,169,0,1,132,0,
-46,124,0,
-46,134,0,
-52,135,0,
-17,45,0,
-46,2,0,3,
-29,136,0,
-17,174,0,1,135,0,
-46,2,0,
-52,137,0,
-17,45,0,
-46,48,0,3,
-51,138,0,2,
-46,136,0,
-29,139,0,
-17,174,0,1,137,0,
-46,48,0,
-46,139,0,
-52,140,0,
-17,45,0,
-46,2,0,3,
-29,141,0,
-17,180,0,1,140,0,
-46,2,0,
-52,142,0,
-17,45,0,
-46,48,0,3,
-51,143,0,2,
-46,141,0,
-29,144,0,
-17,180,0,1,142,0,
-46,48,0,
-46,144,0,
-52,145,0,
-17,45,0,
-46,2,0,3,
-29,146,0,
-17,186,0,1,145,0,
-46,2,0,
-52,147,0,
-17,45,0,
-46,48,0,3,
-51,148,0,2,
-46,146,0,
-29,149,0,
-17,186,0,1,147,0,
-46,48,0,
-46,149,0,
-52,150,0,
-17,45,0,
-46,2,0,3,
-29,151,0,
-17,192,0,1,150,0,
-46,2,0,
-52,152,0,
-17,45,0,
-46,48,0,3,
-51,153,0,2,
-46,151,0,
-29,154,0,
-17,192,0,1,152,0,
-46,48,0,
-46,154,0,
-52,155,0,
-17,45,0,
-46,2,0,3,
-29,156,0,
-17,202,0,1,155,0,
-46,2,0,
-52,157,0,
-17,45,0,
-46,48,0,3,
-51,158,0,2,
-46,156,0,
-29,159,0,
-17,202,0,1,157,0,
-46,48,0,
-46,159,0,
-52,160,0,
-17,45,0,
-46,2,0,3,
-29,161,0,
-17,207,0,1,160,0,
-46,2,0,
-52,162,0,
-17,45,0,
-46,48,0,3,
-51,163,0,2,
-46,161,0,
-29,164,0,
-17,207,0,1,162,0,
-46,48,0,
-46,164,0,
-52,165,0,
-17,45,0,
-46,2,0,3,
-52,166,0,
+51,255,255,159,0,
+51,131,0,
+55,132,0,
+17,45,0,
+51,255,255,10,0,3,
+28,133,0,
+17,174,0,1,132,0,
+51,255,255,10,0,
+55,134,0,
+17,45,0,
+51,255,255,133,0,3,
+54,135,0,2,
+51,133,0,
+28,136,0,
+17,174,0,1,134,0,
+51,255,255,133,0,
+51,136,0,
+55,137,0,
+17,45,0,
+51,255,255,10,0,3,
+28,138,0,
+17,180,0,1,137,0,
+51,255,255,10,0,
+55,139,0,
+17,45,0,
+51,255,255,133,0,3,
+54,140,0,2,
+51,138,0,
+28,141,0,
+17,180,0,1,139,0,
+51,255,255,133,0,
+51,141,0,
+55,142,0,
+17,45,0,
+51,255,255,10,0,3,
+28,143,0,
+17,186,0,1,142,0,
+51,255,255,10,0,
+55,144,0,
+17,45,0,
+51,255,255,133,0,3,
+54,145,0,2,
+51,143,0,
+28,146,0,
+17,186,0,1,144,0,
+51,255,255,133,0,
+51,146,0,
+55,147,0,
+17,45,0,
+51,255,255,10,0,3,
+28,148,0,
+17,192,0,1,147,0,
+51,255,255,10,0,
+55,149,0,
+17,45,0,
+51,255,255,133,0,3,
+54,150,0,2,
+51,148,0,
+28,151,0,
+17,192,0,1,149,0,
+51,255,255,133,0,
+51,151,0,
+55,152,0,
+17,45,0,
+51,255,255,10,0,3,
+28,153,0,
+17,202,0,1,152,0,
+51,255,255,10,0,
+55,154,0,
+17,45,0,
+51,255,255,133,0,3,
+54,155,0,2,
+51,153,0,
+28,156,0,
+17,202,0,1,154,0,
+51,255,255,133,0,
+51,156,0,
+55,157,0,
+17,45,0,
+51,255,255,10,0,3,
+28,158,0,
+17,207,0,1,157,0,
+51,255,255,10,0,
+55,159,0,
+17,45,0,
+51,255,255,133,0,3,
+54,160,0,2,
+51,158,0,
+28,161,0,
+17,207,0,1,159,0,
+51,255,255,133,0,
+51,161,0,
+55,162,0,
+17,45,0,
+51,255,255,10,0,3,
+55,163,0,
 17,57,0,
-49,167,0,213,0,3,
-29,168,0,
+51,255,255,213,0,3,
+28,164,0,
+17,219,0,2,162,0,163,0,
+51,255,255,10,0,
+55,165,0,
+17,45,0,
+51,255,255,10,0,3,
+55,166,0,
+17,57,0,
+51,255,255,10,0,3,
+54,167,0,2,
+51,164,0,
+28,168,0,
 17,219,0,2,165,0,166,0,
-46,2,0,
-52,169,0,
+51,255,255,10,0,
+51,168,0,
+55,169,0,
 17,45,0,
-46,2,0,3,
-52,170,0,
+51,255,255,133,0,3,
+55,170,0,
 17,57,0,
-46,2,0,3,
-51,171,0,2,
-46,168,0,
-29,172,0,
+51,255,255,223,0,3,
+54,171,0,3,
+51,164,0,
+51,168,0,
+28,172,0,
 17,219,0,2,169,0,170,0,
-46,2,0,
-46,172,0,
-52,173,0,
+51,255,255,133,0,
+51,172,0,
+55,173,0,
 17,45,0,
-46,48,0,3,
-52,174,0,
+51,255,255,133,0,3,
+55,174,0,
 17,57,0,
-49,175,0,223,0,3,
-51,176,0,3,
-46,168,0,
-46,172,0,
-29,177,0,
+51,255,255,133,0,3,
+54,175,0,4,
+51,164,0,
+51,168,0,
+51,172,0,
+28,176,0,
 17,219,0,2,173,0,174,0,
-46,48,0,
-46,177,0,
-52,178,0,
+51,255,255,133,0,
+51,176,0,
+55,177,0,
 17,45,0,
-46,48,0,3,
-52,179,0,
-17,57,0,
-46,48,0,3,
-51,180,0,4,
-46,168,0,
-46,172,0,
-46,177,0,
-29,181,0,
-17,219,0,2,178,0,179,0,
-46,48,0,
-46,181,0,
-52,182,0,
-17,45,0,
-46,2,0,3,
-52,183,0,
-36,
+51,255,255,10,0,3,
+55,178,0,
+38,
 16,32,228,0,
-46,2,0,3,
-29,184,0,
-17,230,0,2,182,0,183,0,
-46,2,0,
-52,185,0,
-17,45,0,
-46,48,0,3,
-52,186,0,
-36,
+51,255,255,10,0,3,
+28,179,0,
+17,230,0,2,177,0,178,0,
+51,255,255,10,0,
+55,180,0,
+17,45,0,
+51,255,255,133,0,3,
+55,181,0,
+38,
 16,32,228,0,
-46,48,0,3,
-51,187,0,2,
-46,184,0,
-29,188,0,
-17,230,0,2,185,0,186,0,
-46,48,0,
-46,188,0,
-52,189,0,
-17,45,0,
-46,2,0,3,
-52,190,0,
+51,255,255,133,0,3,
+54,182,0,2,
+51,179,0,
+28,183,0,
+17,230,0,2,180,0,181,0,
+51,255,255,133,0,
+51,183,0,
+55,184,0,
+17,45,0,
+51,255,255,10,0,3,
+55,185,0,
 17,57,0,
-46,2,0,3,
-29,191,0,
-17,235,0,2,189,0,190,0,
-46,2,0,
-52,192,0,
-17,45,0,
-46,2,0,3,
-52,193,0,
+51,255,255,10,0,3,
+28,186,0,
+17,235,0,2,184,0,185,0,
+51,255,255,10,0,
+55,187,0,
+17,45,0,
+51,255,255,10,0,3,
+55,188,0,
 17,57,0,
-46,167,0,3,
-51,194,0,2,
-46,191,0,
-29,195,0,
-17,235,0,2,192,0,193,0,
-46,2,0,
-46,195,0,
-52,196,0,
-17,45,0,
-46,48,0,3,
-52,197,0,
+51,255,255,213,0,3,
+54,189,0,2,
+51,186,0,
+28,190,0,
+17,235,0,2,187,0,188,0,
+51,255,255,10,0,
+51,190,0,
+55,191,0,
+17,45,0,
+51,255,255,133,0,3,
+55,192,0,
 17,57,0,
-46,48,0,3,
-51,198,0,3,
-46,191,0,
-46,195,0,
-29,199,0,
-17,235,0,2,196,0,197,0,
-46,48,0,
-46,199,0,
-52,200,0,
-17,45,0,
-46,48,0,3,
-52,201,0,
+51,255,255,133,0,3,
+54,193,0,3,
+51,186,0,
+51,190,0,
+28,194,0,
+17,235,0,2,191,0,192,0,
+51,255,255,133,0,
+51,194,0,
+55,195,0,
+17,45,0,
+51,255,255,133,0,3,
+55,196,0,
 17,57,0,
-46,175,0,3,
-51,202,0,4,
-46,191,0,
-46,195,0,
-46,199,0,
-29,203,0,
-17,235,0,2,200,0,201,0,
-46,48,0,
-46,203,0,
-52,204,0,
-17,45,0,
-46,124,0,3,
-52,205,0,
+51,255,255,223,0,3,
+54,197,0,4,
+51,186,0,
+51,190,0,
+51,194,0,
+28,198,0,
+17,235,0,2,195,0,196,0,
+51,255,255,133,0,
+51,198,0,
+55,199,0,
+17,45,0,
+51,255,255,159,0,3,
+55,200,0,
 17,57,0,
-46,124,0,3,
-51,206,0,5,
-46,191,0,
-46,195,0,
-46,199,0,
-46,203,0,
-29,207,0,
-17,235,0,2,204,0,205,0,
-46,124,0,
-46,207,0,
-52,208,0,
-17,45,0,
-46,124,0,3,
-52,209,0,
+51,255,255,159,0,3,
+54,201,0,5,
+51,186,0,
+51,190,0,
+51,194,0,
+51,198,0,
+28,202,0,
+17,235,0,2,199,0,200,0,
+51,255,255,159,0,
+51,202,0,
+55,203,0,
+17,45,0,
+51,255,255,159,0,3,
+55,204,0,
 17,57,0,
-49,210,0,239,0,3,
-51,211,0,6,
-46,191,0,
-46,195,0,
-46,199,0,
-46,203,0,
-46,207,0,
-29,212,0,
-17,235,0,2,208,0,209,0,
-46,124,0,
-46,212,0,
-52,213,0,
-17,45,0,
-46,2,0,3,
-52,214,0,
+51,255,255,239,0,3,
+54,205,0,6,
+51,186,0,
+51,190,0,
+51,194,0,
+51,198,0,
+51,202,0,
+28,206,0,
+17,235,0,2,203,0,204,0,
+51,255,255,159,0,
+51,206,0,
+55,207,0,
+17,45,0,
+51,255,255,10,0,3,
+55,208,0,
 17,57,0,
-46,2,0,3,
-29,215,0,
-17,243,0,2,213,0,214,0,
-46,2,0,
-52,216,0,
-17,45,0,
-46,2,0,3,
-52,217,0,
+51,255,255,10,0,3,
+28,209,0,
+17,243,0,2,207,0,208,0,
+51,255,255,10,0,
+55,210,0,
+17,45,0,
+51,255,255,10,0,3,
+55,211,0,
 17,57,0,
-46,167,0,3,
-51,218,0,2,
-46,215,0,
-29,219,0,
-17,243,0,2,216,0,217,0,
-46,2,0,
-46,219,0,
-52,220,0,
-17,45,0,
-46,48,0,3,
-52,221,0,
+51,255,255,213,0,3,
+54,212,0,2,
+51,209,0,
+28,213,0,
+17,243,0,2,210,0,211,0,
+51,255,255,10,0,
+51,213,0,
+55,214,0,
+17,45,0,
+51,255,255,133,0,3,
+55,215,0,
 17,57,0,
-46,48,0,3,
-51,222,0,3,
-46,215,0,
-46,219,0,
-29,223,0,
-17,243,0,2,220,0,221,0,
-46,48,0,
-46,223,0,
-52,224,0,
-17,45,0,
-46,48,0,3,
-52,225,0,
+51,255,255,133,0,3,
+54,216,0,3,
+51,209,0,
+51,213,0,
+28,217,0,
+17,243,0,2,214,0,215,0,
+51,255,255,133,0,
+51,217,0,
+55,218,0,
+17,45,0,
+51,255,255,133,0,3,
+55,219,0,
 17,57,0,
-46,175,0,3,
-51,226,0,4,
-46,215,0,
-46,219,0,
-46,223,0,
-29,227,0,
-17,243,0,2,224,0,225,0,
-46,48,0,
-46,227,0,
-52,228,0,
-17,45,0,
-46,124,0,3,
-52,229,0,
+51,255,255,223,0,3,
+54,220,0,4,
+51,209,0,
+51,213,0,
+51,217,0,
+28,221,0,
+17,243,0,2,218,0,219,0,
+51,255,255,133,0,
+51,221,0,
+55,222,0,
+17,45,0,
+51,255,255,159,0,3,
+55,223,0,
 17,57,0,
-46,124,0,3,
-51,230,0,5,
-46,215,0,
-46,219,0,
-46,223,0,
-46,227,0,
-29,231,0,
-17,243,0,2,228,0,229,0,
-46,124,0,
-46,231,0,
-52,232,0,
-17,45,0,
-46,124,0,3,
-52,233,0,
+51,255,255,159,0,3,
+54,224,0,5,
+51,209,0,
+51,213,0,
+51,217,0,
+51,221,0,
+28,225,0,
+17,243,0,2,222,0,223,0,
+51,255,255,159,0,
+51,225,0,
+55,226,0,
+17,45,0,
+51,255,255,159,0,3,
+55,227,0,
 17,57,0,
-46,210,0,3,
-51,234,0,6,
-46,215,0,
-46,219,0,
-46,223,0,
-46,227,0,
-46,231,0,
-29,235,0,
-17,243,0,2,232,0,233,0,
-46,124,0,
-46,235,0,
-52,236,0,
-17,45,0,
-46,2,0,3,
-52,237,0,
+51,255,255,239,0,3,
+54,228,0,6,
+51,209,0,
+51,213,0,
+51,217,0,
+51,221,0,
+51,225,0,
+28,229,0,
+17,243,0,2,226,0,227,0,
+51,255,255,159,0,
+51,229,0,
+55,230,0,
+17,45,0,
+51,255,255,10,0,3,
+55,231,0,
 17,247,0,
-46,2,0,3,
-52,238,0,
+51,255,255,10,0,3,
+55,232,0,
 17,254,0,
-46,2,0,3,
-29,239,0,
-17,5,1,3,236,0,237,0,238,0,
-46,2,0,
-52,240,0,
-17,45,0,
-46,2,0,3,
-52,241,0,
+51,255,255,10,0,3,
+28,233,0,
+17,5,1,3,230,0,231,0,232,0,
+51,255,255,10,0,
+55,234,0,
+17,45,0,
+51,255,255,10,0,3,
+55,235,0,
 17,247,0,
-46,167,0,3,
-52,242,0,
+51,255,255,213,0,3,
+55,236,0,
 17,254,0,
-46,167,0,3,
-51,243,0,2,
-46,239,0,
-29,244,0,
-17,5,1,3,240,0,241,0,242,0,
-46,2,0,
-46,244,0,
-52,245,0,
-17,45,0,
-46,48,0,3,
-52,246,0,
+51,255,255,213,0,3,
+54,237,0,2,
+51,233,0,
+28,238,0,
+17,5,1,3,234,0,235,0,236,0,
+51,255,255,10,0,
+51,238,0,
+55,239,0,
+17,45,0,
+51,255,255,133,0,3,
+55,240,0,
 17,247,0,
-46,48,0,3,
-52,247,0,
+51,255,255,133,0,3,
+55,241,0,
 17,254,0,
-46,48,0,3,
-51,248,0,3,
-46,239,0,
-46,244,0,
-29,249,0,
-17,5,1,3,245,0,246,0,247,0,
-46,48,0,
-46,249,0,
-52,250,0,
-17,45,0,
-46,48,0,3,
-52,251,0,
+51,255,255,133,0,3,
+54,242,0,3,
+51,233,0,
+51,238,0,
+28,243,0,
+17,5,1,3,239,0,240,0,241,0,
+51,255,255,133,0,
+51,243,0,
+55,244,0,
+17,45,0,
+51,255,255,133,0,3,
+55,245,0,
 17,247,0,
-46,175,0,3,
-52,252,0,
+51,255,255,223,0,3,
+55,246,0,
 17,254,0,
-46,175,0,3,
-51,253,0,4,
-46,239,0,
-46,244,0,
-46,249,0,
-29,254,0,
-17,5,1,3,250,0,251,0,252,0,
-46,48,0,
-46,254,0,
-52,255,0,
-17,45,0,
-46,124,0,3,
-52,0,1,
+51,255,255,223,0,3,
+54,247,0,4,
+51,233,0,
+51,238,0,
+51,243,0,
+28,248,0,
+17,5,1,3,244,0,245,0,246,0,
+51,255,255,133,0,
+51,248,0,
+55,249,0,
+17,45,0,
+51,255,255,159,0,3,
+55,250,0,
 17,247,0,
-46,124,0,3,
-52,1,1,
+51,255,255,159,0,3,
+55,251,0,
 17,254,0,
-46,124,0,3,
-51,2,1,5,
-46,239,0,
-46,244,0,
-46,249,0,
-46,254,0,
-29,3,1,
-17,5,1,3,255,0,0,1,1,1,
-46,124,0,
-46,3,1,
-52,4,1,
-17,45,0,
-46,124,0,3,
-52,5,1,
+51,255,255,159,0,3,
+54,252,0,5,
+51,233,0,
+51,238,0,
+51,243,0,
+51,248,0,
+28,253,0,
+17,5,1,3,249,0,250,0,251,0,
+51,255,255,159,0,
+51,253,0,
+55,254,0,
+17,45,0,
+51,255,255,159,0,3,
+55,255,0,
 17,247,0,
-46,210,0,3,
-52,6,1,
+51,255,255,239,0,3,
+55,0,1,
 17,254,0,
-46,210,0,3,
-51,7,1,6,
-46,239,0,
-46,244,0,
-46,249,0,
-46,254,0,
-46,3,1,
-29,8,1,
-17,5,1,3,4,1,5,1,6,1,
-46,124,0,
-46,8,1,
-52,9,1,
-17,45,0,
-49,10,1,11,1,3,
-52,11,1,
+51,255,255,239,0,3,
+54,1,1,6,
+51,233,0,
+51,238,0,
+51,243,0,
+51,248,0,
+51,253,0,
+28,2,1,
+17,5,1,3,254,0,255,0,0,1,
+51,255,255,159,0,
+51,2,1,
+55,3,1,
+17,45,0,
+51,255,255,11,1,3,
+55,4,1,
 17,247,0,
-46,10,1,3,
-52,12,1,
+51,255,255,11,1,3,
+55,5,1,
 17,254,0,
-46,10,1,3,
-51,13,1,7,
-46,239,0,
-46,244,0,
-46,249,0,
-46,254,0,
-46,3,1,
-46,8,1,
-29,14,1,
-17,5,1,3,9,1,11,1,12,1,
-46,10,1,
-46,14,1,
-52,15,1,
-17,45,0,
-46,10,1,3,
-52,16,1,
+51,255,255,11,1,3,
+54,6,1,7,
+51,233,0,
+51,238,0,
+51,243,0,
+51,248,0,
+51,253,0,
+51,2,1,
+28,7,1,
+17,5,1,3,3,1,4,1,5,1,
+51,255,255,11,1,
+51,7,1,
+55,8,1,
+17,45,0,
+51,255,255,11,1,3,
+55,9,1,
 17,247,0,
-49,17,1,21,1,3,
-52,18,1,
+51,255,255,21,1,3,
+55,10,1,
 17,254,0,
-46,17,1,3,
-51,19,1,8,
-46,239,0,
-46,244,0,
-46,249,0,
-46,254,0,
-46,3,1,
-46,8,1,
-46,14,1,
-29,20,1,
-17,5,1,3,15,1,16,1,18,1,
-46,10,1,
-46,20,1,
-52,21,1,
-17,45,0,
-46,2,0,3,
-29,22,1,
-17,26,1,1,21,1,
-46,2,0,
-52,23,1,
-17,45,0,
-46,48,0,3,
-51,24,1,2,
-46,22,1,
-29,25,1,
-17,26,1,1,23,1,
-46,48,0,
-46,25,1,
-52,26,1,
-17,45,0,
-46,2,0,3,
-52,27,1,
+51,255,255,21,1,3,
+54,11,1,8,
+51,233,0,
+51,238,0,
+51,243,0,
+51,248,0,
+51,253,0,
+51,2,1,
+51,7,1,
+28,12,1,
+17,5,1,3,8,1,9,1,10,1,
+51,255,255,11,1,
+51,12,1,
+55,13,1,
+17,45,0,
+51,255,255,10,0,3,
+28,14,1,
+17,26,1,1,13,1,
+51,255,255,10,0,
+55,15,1,
+17,45,0,
+51,255,255,133,0,3,
+54,16,1,2,
+51,14,1,
+28,17,1,
+17,26,1,1,15,1,
+51,255,255,133,0,
+51,17,1,
+55,18,1,
+17,45,0,
+51,255,255,10,0,3,
+55,19,1,
 17,57,0,
-46,2,0,3,
-52,28,1,
+51,255,255,10,0,3,
+55,20,1,
 17,35,1,
-46,2,0,3,
-29,29,1,
-17,37,1,3,26,1,27,1,28,1,
-46,2,0,
-52,30,1,
-17,45,0,
-46,2,0,3,
-52,31,1,
+51,255,255,10,0,3,
+28,21,1,
+17,37,1,3,18,1,19,1,20,1,
+51,255,255,10,0,
+55,22,1,
+17,45,0,
+51,255,255,10,0,3,
+55,23,1,
 17,57,0,
-46,2,0,3,
-52,32,1,
+51,255,255,10,0,3,
+55,24,1,
 17,35,1,
-46,167,0,3,
-51,33,1,2,
-46,29,1,
-29,34,1,
-17,37,1,3,30,1,31,1,32,1,
-46,2,0,
-46,34,1,
-52,35,1,
-17,45,0,
-46,48,0,3,
-52,36,1,
+51,255,255,213,0,3,
+54,25,1,2,
+51,21,1,
+28,26,1,
+17,37,1,3,22,1,23,1,24,1,
+51,255,255,10,0,
+51,26,1,
+55,27,1,
+17,45,0,
+51,255,255,133,0,3,
+55,28,1,
 17,57,0,
-46,48,0,3,
-52,37,1,
+51,255,255,133,0,3,
+55,29,1,
 17,35,1,
-46,48,0,3,
-51,38,1,3,
-46,29,1,
-46,34,1,
-29,39,1,
-17,37,1,3,35,1,36,1,37,1,
-46,48,0,
-46,39,1,
-52,40,1,
-17,45,0,
-46,48,0,3,
-52,41,1,
+51,255,255,133,0,3,
+54,30,1,3,
+51,21,1,
+51,26,1,
+28,31,1,
+17,37,1,3,27,1,28,1,29,1,
+51,255,255,133,0,
+51,31,1,
+55,32,1,
+17,45,0,
+51,255,255,133,0,3,
+55,33,1,
 17,57,0,
-46,48,0,3,
-52,42,1,
+51,255,255,133,0,3,
+55,34,1,
 17,35,1,
-46,175,0,3,
-51,43,1,4,
-46,29,1,
-46,34,1,
-46,39,1,
-29,44,1,
-17,37,1,3,40,1,41,1,42,1,
-46,48,0,
-46,44,1,
-52,45,1,
-17,45,0,
-46,2,0,3,
-52,46,1,
+51,255,255,223,0,3,
+54,35,1,4,
+51,21,1,
+51,26,1,
+51,31,1,
+28,36,1,
+17,37,1,3,32,1,33,1,34,1,
+51,255,255,133,0,
+51,36,1,
+55,37,1,
+17,45,0,
+51,255,255,10,0,3,
+55,38,1,
 17,57,0,
-46,2,0,3,
-52,47,1,
+51,255,255,10,0,3,
+55,39,1,
 17,35,1,
-49,48,1,41,1,3,
-51,49,1,5,
-46,29,1,
-46,34,1,
-46,39,1,
-46,44,1,
-29,50,1,
-17,37,1,3,45,1,46,1,47,1,
-46,2,0,
-46,50,1,
-52,51,1,
-17,45,0,
-46,48,0,3,
-52,52,1,
+51,255,255,41,1,3,
+54,40,1,5,
+51,21,1,
+51,26,1,
+51,31,1,
+51,36,1,
+28,41,1,
+17,37,1,3,37,1,38,1,39,1,
+51,255,255,10,0,
+51,41,1,
+55,42,1,
+17,45,0,
+51,255,255,133,0,3,
+55,43,1,
 17,57,0,
-46,48,0,3,
-52,53,1,
+51,255,255,133,0,3,
+55,44,1,
 17,35,1,
-46,48,1,3,
-51,54,1,6,
-46,29,1,
-46,34,1,
-46,39,1,
-46,44,1,
-46,50,1,
-29,55,1,
-17,37,1,3,51,1,52,1,53,1,
-46,48,0,
-46,55,1,
-52,56,1,
-17,45,0,
-46,124,0,3,
-52,57,1,
+51,255,255,41,1,3,
+54,45,1,6,
+51,21,1,
+51,26,1,
+51,31,1,
+51,36,1,
+51,41,1,
+28,46,1,
+17,37,1,3,42,1,43,1,44,1,
+51,255,255,133,0,
+51,46,1,
+55,47,1,
+17,45,0,
+51,255,255,159,0,3,
+55,48,1,
 17,57,0,
-46,124,0,3,
-52,58,1,
+51,255,255,159,0,3,
+55,49,1,
 17,35,1,
-46,48,1,3,
-51,59,1,7,
-46,29,1,
-46,34,1,
-46,39,1,
-46,44,1,
-46,50,1,
-46,55,1,
-29,60,1,
-17,37,1,3,56,1,57,1,58,1,
-46,124,0,
-46,60,1,
-52,61,1,
-17,45,0,
-46,48,1,3,
-52,62,1,
+51,255,255,41,1,3,
+54,50,1,7,
+51,21,1,
+51,26,1,
+51,31,1,
+51,36,1,
+51,41,1,
+51,46,1,
+28,51,1,
+17,37,1,3,47,1,48,1,49,1,
+51,255,255,159,0,
+51,51,1,
+55,52,1,
+17,45,0,
+51,255,255,41,1,3,
+55,53,1,
 17,57,0,
-46,48,1,3,
-52,63,1,
+51,255,255,41,1,3,
+55,54,1,
 17,35,1,
-46,48,1,3,
-51,64,1,8,
-46,29,1,
-46,34,1,
-46,39,1,
-46,44,1,
-46,50,1,
-46,55,1,
-46,60,1,
-29,65,1,
-17,37,1,3,61,1,62,1,63,1,
-46,48,1,
-46,65,1,
-52,66,1,
+51,255,255,41,1,3,
+54,55,1,8,
+51,21,1,
+51,26,1,
+51,31,1,
+51,36,1,
+51,41,1,
+51,46,1,
+51,51,1,
+28,56,1,
+17,37,1,3,52,1,53,1,54,1,
+51,255,255,41,1,
+51,56,1,
+55,57,1,
 17,51,1,
-46,2,0,3,
-52,67,1,
-17,45,0,
-46,2,0,3,
-29,68,1,
-17,56,1,2,66,1,67,1,
-46,2,0,
-52,69,1,
+51,255,255,10,0,3,
+55,58,1,
+17,45,0,
+51,255,255,10,0,3,
+28,59,1,
+17,56,1,2,57,1,58,1,
+51,255,255,10,0,
+55,60,1,
 17,51,1,
-46,167,0,3,
-52,70,1,
-17,45,0,
-46,2,0,3,
-51,71,1,2,
-46,68,1,
-29,72,1,
-17,56,1,2,69,1,70,1,
-46,2,0,
-46,72,1,
-52,73,1,
+51,255,255,213,0,3,
+55,61,1,
+17,45,0,
+51,255,255,10,0,3,
+54,62,1,2,
+51,59,1,
+28,63,1,
+17,56,1,2,60,1,61,1,
+51,255,255,10,0,
+51,63,1,
+55,64,1,
 17,51,1,
-46,48,0,3,
-52,74,1,
-17,45,0,
-46,48,0,3,
-51,75,1,3,
-46,68,1,
-46,72,1,
-29,76,1,
-17,56,1,2,73,1,74,1,
-46,48,0,
-46,76,1,
-52,77,1,
+51,255,255,133,0,3,
+55,65,1,
+17,45,0,
+51,255,255,133,0,3,
+54,66,1,3,
+51,59,1,
+51,63,1,
+28,67,1,
+17,56,1,2,64,1,65,1,
+51,255,255,133,0,
+51,67,1,
+55,68,1,
 17,51,1,
-46,175,0,3,
-52,78,1,
-17,45,0,
-46,48,0,3,
-51,79,1,4,
-46,68,1,
-46,72,1,
-46,76,1,
-29,80,1,
-17,56,1,2,77,1,78,1,
-46,48,0,
-46,80,1,
-52,81,1,
+51,255,255,223,0,3,
+55,69,1,
+17,45,0,
+51,255,255,133,0,3,
+54,70,1,4,
+51,59,1,
+51,63,1,
+51,67,1,
+28,71,1,
+17,56,1,2,68,1,69,1,
+51,255,255,133,0,
+51,71,1,
+55,72,1,
 17,61,1,
-46,2,0,3,
-52,82,1,
+51,255,255,10,0,3,
+55,73,1,
 17,67,1,
-46,2,0,3,
-52,83,1,
-17,45,0,
-46,2,0,3,
-29,84,1,
-17,73,1,3,81,1,82,1,83,1,
-46,2,0,
-52,85,1,
+51,255,255,10,0,3,
+55,74,1,
+17,45,0,
+51,255,255,10,0,3,
+28,75,1,
+17,73,1,3,72,1,73,1,74,1,
+51,255,255,10,0,
+55,76,1,
 17,61,1,
-46,167,0,3,
-52,86,1,
+51,255,255,213,0,3,
+55,77,1,
 17,67,1,
-46,167,0,3,
-52,87,1,
-17,45,0,
-46,2,0,3,
-51,88,1,2,
-46,84,1,
-29,89,1,
-17,73,1,3,85,1,86,1,87,1,
-46,2,0,
-46,89,1,
-52,90,1,
+51,255,255,213,0,3,
+55,78,1,
+17,45,0,
+51,255,255,10,0,3,
+54,79,1,2,
+51,75,1,
+28,80,1,
+17,73,1,3,76,1,77,1,78,1,
+51,255,255,10,0,
+51,80,1,
+55,81,1,
 17,61,1,
-46,48,0,3,
-52,91,1,
+51,255,255,133,0,3,
+55,82,1,
 17,67,1,
-46,48,0,3,
-52,92,1,
-17,45,0,
-46,48,0,3,
-51,93,1,3,
-46,84,1,
-46,89,1,
-29,94,1,
-17,73,1,3,90,1,91,1,92,1,
-46,48,0,
-46,94,1,
-52,95,1,
+51,255,255,133,0,3,
+55,83,1,
+17,45,0,
+51,255,255,133,0,3,
+54,84,1,3,
+51,75,1,
+51,80,1,
+28,85,1,
+17,73,1,3,81,1,82,1,83,1,
+51,255,255,133,0,
+51,85,1,
+55,86,1,
 17,61,1,
-46,175,0,3,
-52,96,1,
+51,255,255,223,0,3,
+55,87,1,
 17,67,1,
-46,175,0,3,
-52,97,1,
-17,45,0,
-46,48,0,3,
-51,98,1,4,
-46,84,1,
-46,89,1,
-46,94,1,
-29,99,1,
-17,73,1,3,95,1,96,1,97,1,
-46,48,0,
-46,99,1,
-52,100,1,
-17,45,0,
-46,2,0,3,
-29,101,1,
-17,84,1,1,100,1,
-46,48,1,
-52,102,1,
-17,45,0,
-46,2,0,3,
-29,103,1,
-17,90,1,1,102,1,
-46,48,1,
-52,104,1,
+51,255,255,223,0,3,
+55,88,1,
+17,45,0,
+51,255,255,133,0,3,
+54,89,1,4,
+51,75,1,
+51,80,1,
+51,85,1,
+28,90,1,
+17,73,1,3,86,1,87,1,88,1,
+51,255,255,133,0,
+51,90,1,
+55,91,1,
+17,45,0,
+51,255,255,10,0,3,
+28,92,1,
+17,84,1,1,91,1,
+51,255,255,41,1,
+55,93,1,
+17,45,0,
+51,255,255,10,0,3,
+28,94,1,
+17,90,1,1,93,1,
+51,255,255,41,1,
+55,95,1,
 17,96,1,
-46,2,0,3,
-29,105,1,
-17,102,1,1,104,1,
-46,124,0,
-52,106,1,
+51,255,255,10,0,3,
+28,96,1,
+17,102,1,1,95,1,
+51,255,255,159,0,
+55,97,1,
 17,96,1,
-46,2,0,3,
-29,107,1,
-17,117,1,1,106,1,
-46,10,1,
-52,108,1,
+51,255,255,10,0,3,
+28,98,1,
+17,117,1,1,97,1,
+51,255,255,11,1,
+55,99,1,
 17,96,1,
-46,124,0,3,
-29,109,1,
-17,133,1,1,108,1,
-46,2,0,
-52,110,1,
+51,255,255,159,0,3,
+28,100,1,
+17,133,1,1,99,1,
+51,255,255,10,0,
+55,101,1,
 17,96,1,
-46,10,1,3,
-29,111,1,
-17,148,1,1,110,1,
-46,2,0,
-52,112,1,
+51,255,255,11,1,3,
+28,102,1,
+17,148,1,1,101,1,
+51,255,255,10,0,
+55,103,1,
 17,35,1,
-46,2,0,3,
-52,113,1,
+51,255,255,10,0,3,
+55,104,1,
 17,164,1,
-46,2,0,3,
-52,114,1,
+51,255,255,10,0,3,
+55,105,1,
 17,166,1,
-46,2,0,3,
-29,115,1,
-17,168,1,3,112,1,113,1,114,1,
-46,2,0,
-52,116,1,
+51,255,255,10,0,3,
+28,106,1,
+17,168,1,3,103,1,104,1,105,1,
+51,255,255,10,0,
+55,107,1,
 17,35,1,
-46,48,0,3,
-52,117,1,
+51,255,255,133,0,3,
+55,108,1,
 17,164,1,
-46,48,0,3,
-52,118,1,
+51,255,255,133,0,3,
+55,109,1,
 17,166,1,
-46,48,0,3,
-51,119,1,2,
-46,115,1,
-29,120,1,
-17,168,1,3,116,1,117,1,118,1,
-46,48,0,
-46,120,1,
-52,121,1,
-17,45,0,
-46,2,0,3,
-52,122,1,
-36,
+51,255,255,133,0,3,
+54,110,1,2,
+51,106,1,
+28,111,1,
+17,168,1,3,107,1,108,1,109,1,
+51,255,255,133,0,
+51,111,1,
+55,112,1,
+17,45,0,
+51,255,255,10,0,3,
+55,113,1,
+38,
 16,32,110,0,
-46,124,0,3,
-29,123,1,
-37,
-16,0,4,0,0,172,1,2,121,1,122,1,
-46,2,0,
-52,124,1,
-17,45,0,
-46,48,0,3,
-52,125,1,
-36,
+51,255,255,159,0,3,
+28,114,1,
+39,
+16,0,4,0,0,172,1,2,112,1,113,1,
+51,255,255,10,0,
+55,115,1,
+17,45,0,
+51,255,255,133,0,3,
+55,116,1,
+38,
 16,32,110,0,
-46,124,0,3,
-51,126,1,2,
-46,123,1,
-29,127,1,
-37,
-16,0,4,0,0,172,1,2,124,1,125,1,
-46,48,0,
-46,127,1,
-52,128,1,
-17,45,0,
-46,2,0,3,
-52,129,1,
+51,255,255,159,0,3,
+54,117,1,2,
+51,114,1,
+28,118,1,
+39,
+16,0,4,0,0,172,1,2,115,1,116,1,
+51,255,255,133,0,
+51,118,1,
+55,119,1,
+17,45,0,
+51,255,255,10,0,3,
+55,120,1,
 17,110,0,
-46,124,0,3,
-29,130,1,
-17,178,1,2,128,1,129,1,
-46,2,0,
-52,131,1,
-17,45,0,
-46,48,0,3,
-52,132,1,
+51,255,255,159,0,3,
+28,121,1,
+17,178,1,2,119,1,120,1,
+51,255,255,10,0,
+55,122,1,
+17,45,0,
+51,255,255,133,0,3,
+55,123,1,
 17,110,0,
-46,124,0,3,
-51,133,1,2,
-46,130,1,
-29,134,1,
-17,178,1,2,131,1,132,1,
-46,48,0,
-46,134,1,
-52,135,1,
+51,255,255,159,0,3,
+54,124,1,2,
+51,121,1,
+28,125,1,
+17,178,1,2,122,1,123,1,
+51,255,255,133,0,
+51,125,1,
+55,126,1,
 17,184,1,
-49,136,1,186,1,3,
-29,137,1,
-17,193,1,1,135,1,
-46,17,1,
-52,138,1,
+51,255,255,186,1,3,
+28,127,1,
+17,193,1,1,126,1,
+51,255,255,21,1,
+55,128,1,
 17,184,1,
-46,136,1,3,
-29,139,1,
-17,207,1,1,138,1,
-46,17,1,
-52,140,1,
+51,255,255,186,1,3,
+28,129,1,
+17,207,1,1,128,1,
+51,255,255,21,1,
+55,130,1,
 17,184,1,
-49,141,1,221,1,3,
-29,142,1,
-17,228,1,1,140,1,
-46,17,1,
-52,143,1,
+51,255,255,221,1,3,
+28,131,1,
+17,228,1,1,130,1,
+51,255,255,21,1,
+55,132,1,
 17,184,1,
-46,141,1,3,
-29,144,1,
-17,241,1,1,143,1,
-46,17,1,
-52,145,1,
+51,255,255,221,1,3,
+28,133,1,
+17,241,1,1,132,1,
+51,255,255,21,1,
+55,134,1,
 17,254,1,
-46,17,1,3,
-29,146,1,
-17,0,2,1,145,1,
-46,136,1,
-52,147,1,
+51,255,255,21,1,3,
+28,135,1,
+17,0,2,1,134,1,
+51,255,255,186,1,
+55,136,1,
 17,254,1,
-46,17,1,3,
-29,148,1,
-17,16,2,1,147,1,
-46,136,1,
-52,149,1,
+51,255,255,21,1,3,
+28,137,1,
+17,16,2,1,136,1,
+51,255,255,186,1,
+55,138,1,
 17,254,1,
-46,17,1,3,
-29,150,1,
-17,32,2,1,149,1,
-46,141,1,
-52,151,1,
+51,255,255,21,1,3,
+28,139,1,
+17,32,2,1,138,1,
+51,255,255,221,1,
+55,140,1,
 17,254,1,
-46,17,1,3,
-29,152,1,
-17,47,2,1,151,1,
-46,141,1,
-52,153,1,
+51,255,255,21,1,3,
+28,141,1,
+17,47,2,1,140,1,
+51,255,255,221,1,
+55,142,1,
 17,184,1,
-46,136,1,3,
-29,154,1,
-17,62,2,1,153,1,
-46,17,1,
-52,155,1,
+51,255,255,186,1,3,
+28,143,1,
+17,62,2,1,142,1,
+51,255,255,21,1,
+55,144,1,
 17,184,1,
-46,17,1,3,
-29,156,1,
-17,75,2,1,155,1,
-46,136,1,
-52,157,1,
-17,45,0,
-46,2,0,3,
-29,158,1,
-17,90,2,1,157,1,
-46,167,0,
-52,159,1,
-17,45,0,
-46,48,0,3,
-51,160,1,2,
-46,158,1,
-29,161,1,
-17,90,2,1,159,1,
-46,175,0,
-46,161,1,
-52,162,1,
+51,255,255,21,1,3,
+28,145,1,
+17,75,2,1,144,1,
+51,255,255,186,1,
+55,146,1,
+17,45,0,
+51,255,255,10,0,3,
+28,147,1,
+17,90,2,1,146,1,
+51,255,255,213,0,
+55,148,1,
+17,45,0,
+51,255,255,133,0,3,
+54,149,1,2,
+51,147,1,
+28,150,1,
+17,90,2,1,148,1,
+51,255,255,223,0,
+51,150,1,
+55,151,1,
 17,97,2,
-46,2,0,3,
-52,163,1,
+51,255,255,10,0,3,
+55,152,1,
 17,100,2,
-46,2,0,3,
-29,164,1,
-17,103,2,2,162,1,163,1,
-46,167,0,
-52,165,1,
+51,255,255,10,0,3,
+28,153,1,
+17,103,2,2,151,1,152,1,
+51,255,255,213,0,
+55,154,1,
 17,97,2,
-46,48,0,3,
-52,166,1,
+51,255,255,133,0,3,
+55,155,1,
 17,100,2,
-46,48,0,3,
-51,167,1,2,
-46,164,1,
-29,168,1,
-17,103,2,2,165,1,166,1,
-46,175,0,
-46,168,1,
-52,169,1,
-17,45,0,
-46,2,0,3,
-52,170,1,
+51,255,255,133,0,3,
+54,156,1,2,
+51,153,1,
+28,157,1,
+17,103,2,2,154,1,155,1,
+51,255,255,223,0,
+51,157,1,
+55,158,1,
+17,45,0,
+51,255,255,10,0,3,
+55,159,1,
 17,57,0,
-46,2,0,3,
-29,171,1,
-17,112,2,2,169,1,170,1,
-46,167,0,
-52,172,1,
-17,45,0,
-46,48,0,3,
-52,173,1,
+51,255,255,10,0,3,
+28,160,1,
+17,112,2,2,158,1,159,1,
+51,255,255,213,0,
+55,161,1,
+17,45,0,
+51,255,255,133,0,3,
+55,162,1,
 17,57,0,
-46,48,0,3,
-51,174,1,2,
-46,171,1,
-29,175,1,
-17,112,2,2,172,1,173,1,
-46,175,0,
-46,175,1,
-52,176,1,
-17,45,0,
-49,177,1,116,2,3,
-52,178,1,
+51,255,255,133,0,3,
+54,163,1,2,
+51,160,1,
+28,164,1,
+17,112,2,2,161,1,162,1,
+51,255,255,223,0,
+51,164,1,
+55,165,1,
+17,45,0,
+51,255,255,116,2,3,
+55,166,1,
 17,57,0,
-46,177,1,3,
-29,179,1,
-17,123,2,2,176,1,178,1,
-46,177,1,
-52,180,1,
-17,45,0,
-49,181,1,129,2,3,
-52,182,1,
+51,255,255,116,2,3,
+28,167,1,
+17,123,2,2,165,1,166,1,
+51,255,255,116,2,
+55,168,1,
+17,45,0,
+51,255,255,129,2,3,
+55,169,1,
 17,57,0,
-46,181,1,3,
-51,183,1,2,
-46,179,1,
-29,184,1,
-17,123,2,2,180,1,182,1,
-46,181,1,
-46,184,1,
-52,185,1,
-17,45,0,
-46,2,0,3,
-29,186,1,
-17,135,2,1,185,1,
-46,2,0,
-52,187,1,
-17,45,0,
-46,48,0,3,
-51,188,1,2,
-46,186,1,
-29,189,1,
-17,135,2,1,187,1,
-46,48,0,
-46,189,1,
-52,190,1,
+51,255,255,129,2,3,
+54,170,1,2,
+51,167,1,
+28,171,1,
+17,123,2,2,168,1,169,1,
+51,255,255,129,2,
+51,171,1,
+55,172,1,
+17,45,0,
+51,255,255,10,0,3,
+28,173,1,
+17,135,2,1,172,1,
+51,255,255,10,0,
+55,174,1,
+17,45,0,
+51,255,255,133,0,3,
+54,175,1,2,
+51,173,1,
+28,176,1,
+17,135,2,1,174,1,
+51,255,255,133,0,
+51,176,1,
+55,177,1,
 17,145,2,
-46,2,0,3,
-52,191,1,
+51,255,255,10,0,3,
+55,178,1,
 17,147,2,
-46,2,0,3,
-52,192,1,
+51,255,255,10,0,3,
+55,179,1,
 17,149,2,
-46,2,0,3,
-29,193,1,
-17,154,2,3,190,1,191,1,192,1,
-46,2,0,
-52,194,1,
+51,255,255,10,0,3,
+28,180,1,
+17,154,2,3,177,1,178,1,179,1,
+51,255,255,10,0,
+55,181,1,
 17,145,2,
-46,48,0,3,
-52,195,1,
+51,255,255,133,0,3,
+55,182,1,
 17,147,2,
-46,48,0,3,
-52,196,1,
+51,255,255,133,0,3,
+55,183,1,
 17,149,2,
-46,48,0,3,
-51,197,1,2,
-46,193,1,
-29,198,1,
-17,154,2,3,194,1,195,1,196,1,
-46,48,0,
-46,198,1,
-52,199,1,
+51,255,255,133,0,3,
+54,184,1,2,
+51,180,1,
+28,185,1,
+17,154,2,3,181,1,182,1,183,1,
+51,255,255,133,0,
+51,185,1,
+55,186,1,
 17,147,2,
-46,2,0,3,
-52,200,1,
+51,255,255,10,0,3,
+55,187,1,
 17,145,2,
-46,2,0,3,
-29,201,1,
-17,166,2,2,199,1,200,1,
-46,2,0,
-52,202,1,
+51,255,255,10,0,3,
+28,188,1,
+17,166,2,2,186,1,187,1,
+51,255,255,10,0,
+55,189,1,
 17,147,2,
-46,48,0,3,
-52,203,1,
+51,255,255,133,0,3,
+55,190,1,
 17,145,2,
-46,48,0,3,
-51,204,1,2,
-46,201,1,
-29,205,1,
-17,166,2,2,202,1,203,1,
-46,48,0,
-46,205,1,
-52,206,1,
+51,255,255,133,0,3,
+54,191,1,2,
+51,188,1,
+28,192,1,
+17,166,2,2,189,1,190,1,
+51,255,255,133,0,
+51,192,1,
+55,193,1,
 17,147,2,
-46,2,0,3,
-52,207,1,
+51,255,255,10,0,3,
+55,194,1,
 17,145,2,
-46,2,0,3,
-52,208,1,
+51,255,255,10,0,3,
+55,195,1,
 17,174,2,
-46,167,0,3,
-29,209,1,
-17,178,2,3,206,1,207,1,208,1,
-46,2,0,
-52,210,1,
+51,255,255,213,0,3,
+28,196,1,
+17,178,2,3,193,1,194,1,195,1,
+51,255,255,10,0,
+55,197,1,
 17,147,2,
-46,48,0,3,
-52,211,1,
+51,255,255,133,0,3,
+55,198,1,
 17,145,2,
-46,48,0,3,
-52,212,1,
+51,255,255,133,0,3,
+55,199,1,
 17,174,2,
-46,175,0,3,
-51,213,1,2,
-46,209,1,
-29,214,1,
-17,178,2,3,210,1,211,1,212,1,
-46,48,0,
-46,214,1,
-52,215,1,
-17,45,0,
-49,216,1,186,2,3,
-52,217,1,
+51,255,255,223,0,3,
+54,200,1,2,
+51,196,1,
+28,201,1,
+17,178,2,3,197,1,198,1,199,1,
+51,255,255,133,0,
+51,201,1,
+55,202,1,
+17,45,0,
+51,255,255,186,2,3,
+55,203,1,
 17,57,0,
-46,216,1,3,
-29,218,1,
-17,191,2,2,215,1,217,1,
-46,216,1,
-52,219,1,
-17,45,0,
-49,220,1,206,2,3,
-52,221,1,
+51,255,255,186,2,3,
+28,204,1,
+17,191,2,2,202,1,203,1,
+51,255,255,186,2,
+55,205,1,
+17,45,0,
+51,255,255,206,2,3,
+55,206,1,
 17,57,0,
-46,220,1,3,
-51,222,1,2,
-46,218,1,
-29,223,1,
-17,191,2,2,219,1,221,1,
-46,220,1,
-46,223,1,
-52,224,1,
+51,255,255,206,2,3,
+54,207,1,2,
+51,204,1,
+28,208,1,
+17,191,2,2,205,1,206,1,
+51,255,255,206,2,
+51,208,1,
+55,209,1,
 17,166,1,
-49,225,1,212,2,3,
-52,226,1,
+51,255,255,212,2,3,
+55,210,1,
 17,217,2,
-46,225,1,3,
-29,227,1,
-17,219,2,2,224,1,226,1,
-49,228,1,232,2,
-52,229,1,
+51,255,255,212,2,3,
+28,211,1,
+17,219,2,2,209,1,210,1,
+51,255,255,232,2,
+55,212,1,
 17,166,1,
-46,177,1,3,
-52,230,1,
+51,255,255,116,2,3,
+55,213,1,
 17,217,2,
-46,136,1,3,
-51,231,1,2,
-46,227,1,
-29,232,1,
-17,219,2,2,229,1,230,1,
-49,233,1,243,2,
-46,232,1,
-52,234,1,
+51,255,255,186,1,3,
+54,214,1,2,
+51,211,1,
+28,215,1,
+17,219,2,2,212,1,213,1,
+51,255,255,243,2,
+51,215,1,
+55,216,1,
 17,166,1,
-46,136,1,3,
-52,235,1,
+51,255,255,186,1,3,
+55,217,1,
 17,217,2,
-46,177,1,3,
-51,236,1,3,
-46,227,1,
-46,232,1,
-29,237,1,
-17,219,2,2,234,1,235,1,
-49,238,1,252,2,
-46,237,1,
-52,239,1,
+51,255,255,116,2,3,
+54,218,1,3,
+51,211,1,
+51,215,1,
+28,219,1,
+17,219,2,2,216,1,217,1,
+51,255,255,252,2,
+51,219,1,
+55,220,1,
 17,166,1,
-46,141,1,3,
-52,240,1,
+51,255,255,221,1,3,
+55,221,1,
 17,217,2,
-46,136,1,3,
-51,241,1,4,
-46,227,1,
-46,232,1,
-46,237,1,
-29,242,1,
-17,219,2,2,239,1,240,1,
-49,243,1,5,3,
-46,242,1,
-52,244,1,
+51,255,255,186,1,3,
+54,222,1,4,
+51,211,1,
+51,215,1,
+51,219,1,
+28,223,1,
+17,219,2,2,220,1,221,1,
+51,255,255,5,3,
+51,223,1,
+55,224,1,
 17,166,1,
-46,136,1,3,
-52,245,1,
+51,255,255,186,1,3,
+55,225,1,
 17,217,2,
-46,141,1,3,
-51,246,1,5,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-29,247,1,
-17,219,2,2,244,1,245,1,
-49,248,1,14,3,
-46,247,1,
-52,249,1,
+51,255,255,221,1,3,
+54,226,1,5,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+28,227,1,
+17,219,2,2,224,1,225,1,
+51,255,255,14,3,
+51,227,1,
+55,228,1,
 17,166,1,
-46,141,1,3,
-52,250,1,
+51,255,255,221,1,3,
+55,229,1,
 17,217,2,
-46,177,1,3,
-51,251,1,6,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-29,252,1,
-17,219,2,2,249,1,250,1,
-49,253,1,23,3,
-46,252,1,
-52,254,1,
+51,255,255,116,2,3,
+54,230,1,6,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+28,231,1,
+17,219,2,2,228,1,229,1,
+51,255,255,23,3,
+51,231,1,
+55,232,1,
 17,166,1,
-46,177,1,3,
-52,255,1,
+51,255,255,116,2,3,
+55,233,1,
 17,217,2,
-46,141,1,3,
-51,0,2,7,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-29,1,2,
-17,219,2,2,254,1,255,1,
-49,2,2,32,3,
-46,1,2,
-52,3,2,
+51,255,255,221,1,3,
+54,234,1,7,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+28,235,1,
+17,219,2,2,232,1,233,1,
+51,255,255,32,3,
+51,235,1,
+55,236,1,
 17,166,1,
-49,4,2,41,3,3,
-52,5,2,
+51,255,255,41,3,3,
+55,237,1,
 17,217,2,
-46,4,2,3,
-51,6,2,8,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-29,7,2,
-17,219,2,2,3,2,5,2,
-49,8,2,47,3,
-46,7,2,
-52,9,2,
+51,255,255,41,3,3,
+54,238,1,8,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+28,239,1,
+17,219,2,2,236,1,237,1,
+51,255,255,47,3,
+51,239,1,
+55,240,1,
 17,166,1,
-46,181,1,3,
-52,10,2,
+51,255,255,129,2,3,
+55,241,1,
 17,217,2,
-49,11,2,59,3,3,
-51,12,2,9,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-29,13,2,
-17,219,2,2,9,2,10,2,
-49,14,2,65,3,
-46,13,2,
-52,15,2,
+51,255,255,59,3,3,
+54,242,1,9,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+28,243,1,
+17,219,2,2,240,1,241,1,
+51,255,255,65,3,
+51,243,1,
+55,244,1,
 17,166,1,
-46,11,2,3,
-52,16,2,
+51,255,255,59,3,3,
+55,245,1,
 17,217,2,
-46,181,1,3,
-51,17,2,10,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-46,13,2,
-29,18,2,
-17,219,2,2,15,2,16,2,
-49,19,2,73,3,
-46,18,2,
-52,20,2,
+51,255,255,129,2,3,
+54,246,1,10,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+28,247,1,
+17,219,2,2,244,1,245,1,
+51,255,255,73,3,
+51,247,1,
+55,248,1,
 17,166,1,
-49,21,2,81,3,3,
-52,22,2,
+51,255,255,81,3,3,
+55,249,1,
 17,217,2,
-46,11,2,3,
-51,23,2,11,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-46,13,2,
-46,18,2,
-29,24,2,
-17,219,2,2,20,2,22,2,
-49,25,2,87,3,
-46,24,2,
-52,26,2,
+51,255,255,59,3,3,
+54,250,1,11,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+28,251,1,
+17,219,2,2,248,1,249,1,
+51,255,255,87,3,
+51,251,1,
+55,252,1,
 17,166,1,
-46,11,2,3,
-52,27,2,
+51,255,255,59,3,3,
+55,253,1,
 17,217,2,
-46,21,2,3,
-51,28,2,12,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-46,13,2,
-46,18,2,
-46,24,2,
-29,29,2,
-17,219,2,2,26,2,27,2,
-49,30,2,95,3,
-46,29,2,
-52,31,2,
+51,255,255,81,3,3,
+54,254,1,12,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+28,255,1,
+17,219,2,2,252,1,253,1,
+51,255,255,95,3,
+51,255,1,
+55,0,2,
 17,166,1,
-46,21,2,3,
-52,32,2,
+51,255,255,81,3,3,
+55,1,2,
 17,217,2,
-46,181,1,3,
-51,33,2,13,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-46,13,2,
-46,18,2,
-46,24,2,
-46,29,2,
-29,34,2,
-17,219,2,2,31,2,32,2,
-49,35,2,103,3,
-46,34,2,
-52,36,2,
+51,255,255,129,2,3,
+54,2,2,13,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+28,3,2,
+17,219,2,2,0,2,1,2,
+51,255,255,103,3,
+51,3,2,
+55,4,2,
 17,166,1,
-46,181,1,3,
-52,37,2,
+51,255,255,129,2,3,
+55,5,2,
 17,217,2,
-46,21,2,3,
-51,38,2,14,
-46,227,1,
-46,232,1,
-46,237,1,
-46,242,1,
-46,247,1,
-46,252,1,
-46,1,2,
-46,7,2,
-46,13,2,
-46,18,2,
-46,24,2,
-46,29,2,
-46,34,2,
-29,39,2,
-17,219,2,2,36,2,37,2,
-49,40,2,111,3,
-46,39,2,
-52,41,2,
+51,255,255,81,3,3,
+54,6,2,14,
+51,211,1,
+51,215,1,
+51,219,1,
+51,223,1,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+28,7,2,
+17,219,2,2,4,2,5,2,
+51,255,255,111,3,
+51,7,2,
+55,8,2,
 17,119,3,
-46,228,1,3,
-29,42,2,
-17,121,3,1,41,2,
-46,228,1,
-52,43,2,
+51,255,255,232,2,3,
+28,9,2,
+17,121,3,1,8,2,
+51,255,255,232,2,
+55,10,2,
 17,119,3,
-46,238,1,3,
-51,44,2,2,
-46,42,2,
-29,45,2,
-17,121,3,1,43,2,
-46,233,1,
-46,45,2,
-52,46,2,
+51,255,255,252,2,3,
+54,11,2,2,
+51,9,2,
+28,12,2,
+17,121,3,1,10,2,
+51,255,255,243,2,
+51,12,2,
+55,13,2,
 17,119,3,
-46,233,1,3,
-51,47,2,3,
-46,42,2,
-46,45,2,
-29,48,2,
-17,121,3,1,46,2,
-46,238,1,
-46,48,2,
-52,49,2,
+51,255,255,243,2,3,
+54,14,2,3,
+51,9,2,
+51,12,2,
+28,15,2,
+17,121,3,1,13,2,
+51,255,255,252,2,
+51,15,2,
+55,16,2,
 17,119,3,
-46,248,1,3,
-51,50,2,4,
-46,42,2,
-46,45,2,
-46,48,2,
-29,51,2,
-17,121,3,1,49,2,
-46,243,1,
-46,51,2,
-52,52,2,
+51,255,255,14,3,3,
+54,17,2,4,
+51,9,2,
+51,12,2,
+51,15,2,
+28,18,2,
+17,121,3,1,16,2,
+51,255,255,5,3,
+51,18,2,
+55,19,2,
 17,119,3,
-46,243,1,3,
-51,53,2,5,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-29,54,2,
-17,121,3,1,52,2,
-46,248,1,
-46,54,2,
-52,55,2,
+51,255,255,5,3,3,
+54,20,2,5,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+28,21,2,
+17,121,3,1,19,2,
+51,255,255,14,3,
+51,21,2,
+55,22,2,
 17,119,3,
-46,2,2,3,
-51,56,2,6,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-29,57,2,
-17,121,3,1,55,2,
-46,253,1,
-46,57,2,
-52,58,2,
+51,255,255,32,3,3,
+54,23,2,6,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+28,24,2,
+17,121,3,1,22,2,
+51,255,255,23,3,
+51,24,2,
+55,25,2,
 17,119,3,
-46,253,1,3,
-51,59,2,7,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-29,60,2,
-17,121,3,1,58,2,
-46,2,2,
-46,60,2,
-52,61,2,
+51,255,255,23,3,3,
+54,26,2,7,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+28,27,2,
+17,121,3,1,25,2,
+51,255,255,32,3,
+51,27,2,
+55,28,2,
 17,119,3,
-46,8,2,3,
-51,62,2,8,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-29,63,2,
-17,121,3,1,61,2,
-46,8,2,
-46,63,2,
-52,64,2,
+51,255,255,47,3,3,
+54,29,2,8,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+28,30,2,
+17,121,3,1,28,2,
+51,255,255,47,3,
+51,30,2,
+55,31,2,
 17,119,3,
-46,19,2,3,
-51,65,2,9,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-29,66,2,
-17,121,3,1,64,2,
-46,14,2,
-46,66,2,
-52,67,2,
+51,255,255,73,3,3,
+54,32,2,9,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+28,33,2,
+17,121,3,1,31,2,
+51,255,255,65,3,
+51,33,2,
+55,34,2,
 17,119,3,
-46,14,2,3,
-51,68,2,10,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-46,66,2,
-29,69,2,
-17,121,3,1,67,2,
-46,19,2,
-46,69,2,
-52,70,2,
+51,255,255,65,3,3,
+54,35,2,10,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+51,33,2,
+28,36,2,
+17,121,3,1,34,2,
+51,255,255,73,3,
+51,36,2,
+55,37,2,
 17,119,3,
-46,30,2,3,
-51,71,2,11,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-46,66,2,
-46,69,2,
-29,72,2,
-17,121,3,1,70,2,
-46,25,2,
-46,72,2,
-52,73,2,
+51,255,255,95,3,3,
+54,38,2,11,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+51,33,2,
+51,36,2,
+28,39,2,
+17,121,3,1,37,2,
+51,255,255,87,3,
+51,39,2,
+55,40,2,
 17,119,3,
-46,25,2,3,
-51,74,2,12,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-46,66,2,
-46,69,2,
-46,72,2,
-29,75,2,
-17,121,3,1,73,2,
-46,30,2,
-46,75,2,
-52,76,2,
+51,255,255,87,3,3,
+54,41,2,12,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+51,33,2,
+51,36,2,
+51,39,2,
+28,42,2,
+17,121,3,1,40,2,
+51,255,255,95,3,
+51,42,2,
+55,43,2,
 17,119,3,
-46,40,2,3,
-51,77,2,13,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-46,66,2,
-46,69,2,
-46,72,2,
-46,75,2,
-29,78,2,
-17,121,3,1,76,2,
-46,35,2,
-46,78,2,
-52,79,2,
+51,255,255,111,3,3,
+54,44,2,13,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+51,33,2,
+51,36,2,
+51,39,2,
+51,42,2,
+28,45,2,
+17,121,3,1,43,2,
+51,255,255,103,3,
+51,45,2,
+55,46,2,
 17,119,3,
-46,35,2,3,
-51,80,2,14,
-46,42,2,
-46,45,2,
-46,48,2,
-46,51,2,
-46,54,2,
-46,57,2,
-46,60,2,
-46,63,2,
-46,66,2,
-46,69,2,
-46,72,2,
-46,75,2,
-46,78,2,
-29,81,2,
-17,121,3,1,79,2,
-46,40,2,
-46,81,2,
-52,82,2,
+51,255,255,103,3,3,
+54,47,2,14,
+51,9,2,
+51,12,2,
+51,15,2,
+51,18,2,
+51,21,2,
+51,24,2,
+51,27,2,
+51,30,2,
+51,33,2,
+51,36,2,
+51,39,2,
+51,42,2,
+51,45,2,
+28,48,2,
+17,121,3,1,46,2,
+51,255,255,111,3,
+51,48,2,
+55,49,2,
 17,119,3,
-46,228,1,3,
-29,83,2,
-17,131,3,1,82,2,
-46,167,0,
-52,84,2,
+51,255,255,232,2,3,
+28,50,2,
+17,131,3,1,49,2,
+51,255,255,213,0,
+55,51,2,
 17,119,3,
-46,8,2,3,
-51,85,2,2,
-46,83,2,
-29,86,2,
-17,131,3,1,84,2,
-46,175,0,
-46,86,2,
-52,87,2,
+51,255,255,47,3,3,
+54,52,2,2,
+51,50,2,
+28,53,2,
+17,131,3,1,51,2,
+51,255,255,223,0,
+51,53,2,
+55,54,2,
 17,119,3,
-46,228,1,3,
-29,88,2,
-17,143,3,1,87,2,
-46,228,1,
-52,89,2,
+51,255,255,232,2,3,
+28,55,2,
+17,143,3,1,54,2,
+51,255,255,232,2,
+55,56,2,
 17,119,3,
-46,8,2,3,
-51,90,2,2,
-46,88,2,
-29,91,2,
-17,143,3,1,89,2,
-46,8,2,
-46,91,2,
-52,92,2,
-17,45,0,
-46,225,1,3,
-52,93,2,
+51,255,255,47,3,3,
+54,57,2,2,
+51,55,2,
+28,58,2,
+17,143,3,1,56,2,
+51,255,255,47,3,
+51,58,2,
+55,59,2,
+17,45,0,
+51,255,255,212,2,3,
+55,60,2,
 17,57,0,
-46,225,1,3,
-29,94,2,
-17,151,3,2,92,2,93,2,
-49,95,2,160,3,
-52,96,2,
-17,45,0,
-46,4,2,3,
-52,97,2,
+51,255,255,212,2,3,
+28,61,2,
+17,151,3,2,59,2,60,2,
+51,255,255,160,3,
+55,62,2,
+17,45,0,
+51,255,255,41,3,3,
+55,63,2,
 17,57,0,
-46,4,2,3,
-51,98,2,2,
-46,94,2,
-29,99,2,
-17,151,3,2,96,2,97,2,
-46,95,2,
-46,99,2,
-52,100,2,
-17,45,0,
-49,101,2,166,3,3,
-52,102,2,
+51,255,255,41,3,3,
+54,64,2,2,
+51,61,2,
+28,65,2,
+17,151,3,2,62,2,63,2,
+51,255,255,160,3,
+51,65,2,
+55,66,2,
+17,45,0,
+51,255,255,166,3,3,
+55,67,2,
 17,57,0,
-46,101,2,3,
-51,103,2,3,
-46,94,2,
-46,99,2,
-29,104,2,
-17,151,3,2,100,2,102,2,
-46,95,2,
-46,104,2,
-52,105,2,
-17,45,0,
-49,106,2,172,3,3,
-52,107,2,
+51,255,255,166,3,3,
+54,68,2,3,
+51,61,2,
+51,65,2,
+28,69,2,
+17,151,3,2,66,2,67,2,
+51,255,255,160,3,
+51,69,2,
+55,70,2,
+17,45,0,
+51,255,255,172,3,3,
+55,71,2,
 17,57,0,
-46,106,2,3,
-51,108,2,4,
-46,94,2,
-46,99,2,
-46,104,2,
-29,109,2,
-17,151,3,2,105,2,107,2,
-46,95,2,
-46,109,2,
-52,110,2,
-17,45,0,
-49,111,2,178,3,3,
-52,112,2,
+51,255,255,172,3,3,
+54,72,2,4,
+51,61,2,
+51,65,2,
+51,69,2,
+28,73,2,
+17,151,3,2,70,2,71,2,
+51,255,255,160,3,
+51,73,2,
+55,74,2,
+17,45,0,
+51,255,255,178,3,3,
+55,75,2,
 17,57,0,
-46,111,2,3,
-51,113,2,5,
-46,94,2,
-46,99,2,
-46,104,2,
-46,109,2,
-29,114,2,
-17,151,3,2,110,2,112,2,
-46,95,2,
-46,114,2,
-52,115,2,
-17,45,0,
-49,116,2,185,3,3,
-52,117,2,
+51,255,255,178,3,3,
+54,76,2,5,
+51,61,2,
+51,65,2,
+51,69,2,
+51,73,2,
+28,77,2,
+17,151,3,2,74,2,75,2,
+51,255,255,160,3,
+51,77,2,
+55,78,2,
+17,45,0,
+51,255,255,185,3,3,
+55,79,2,
 17,57,0,
-46,116,2,3,
-51,118,2,6,
-46,94,2,
-46,99,2,
-46,104,2,
-46,109,2,
-46,114,2,
-29,119,2,
-17,151,3,2,115,2,117,2,
-46,95,2,
-46,119,2,
-52,120,2,
-17,45,0,
-46,225,1,3,
-52,121,2,
+51,255,255,185,3,3,
+54,80,2,6,
+51,61,2,
+51,65,2,
+51,69,2,
+51,73,2,
+51,77,2,
+28,81,2,
+17,151,3,2,78,2,79,2,
+51,255,255,160,3,
+51,81,2,
+55,82,2,
+17,45,0,
+51,255,255,212,2,3,
+55,83,2,
 17,57,0,
-46,225,1,3,
-29,122,2,
-17,191,3,2,120,2,121,2,
-46,95,2,
-52,123,2,
-17,45,0,
-46,4,2,3,
-52,124,2,
+51,255,255,212,2,3,
+28,84,2,
+17,191,3,2,82,2,83,2,
+51,255,255,160,3,
+55,85,2,
+17,45,0,
+51,255,255,41,3,3,
+55,86,2,
 17,57,0,
-46,4,2,3,
-51,125,2,2,
-46,122,2,
-29,126,2,
-17,191,3,2,123,2,124,2,
-46,95,2,
-46,126,2,
-52,127,2,
-17,45,0,
-46,101,2,3,
-52,128,2,
+51,255,255,41,3,3,
+54,87,2,2,
+51,84,2,
+28,88,2,
+17,191,3,2,85,2,86,2,
+51,255,255,160,3,
+51,88,2,
+55,89,2,
+17,45,0,
+51,255,255,166,3,3,
+55,90,2,
 17,57,0,
-46,101,2,3,
-51,129,2,3,
-46,122,2,
-46,126,2,
-29,130,2,
-17,191,3,2,127,2,128,2,
-46,95,2,
-46,130,2,
-52,131,2,
-17,45,0,
-46,116,2,3,
-52,132,2,
+51,255,255,166,3,3,
+54,91,2,3,
+51,84,2,
+51,88,2,
+28,92,2,
+17,191,3,2,89,2,90,2,
+51,255,255,160,3,
+51,92,2,
+55,93,2,
+17,45,0,
+51,255,255,185,3,3,
+55,94,2,
 17,57,0,
-46,116,2,3,
-51,133,2,4,
-46,122,2,
-46,126,2,
-46,130,2,
-29,134,2,
-17,191,3,2,131,2,132,2,
-46,95,2,
-46,134,2,
-52,135,2,
-17,45,0,
-46,106,2,3,
-52,136,2,
+51,255,255,185,3,3,
+54,95,2,4,
+51,84,2,
+51,88,2,
+51,92,2,
+28,96,2,
+17,191,3,2,93,2,94,2,
+51,255,255,160,3,
+51,96,2,
+55,97,2,
+17,45,0,
+51,255,255,172,3,3,
+55,98,2,
 17,57,0,
-46,106,2,3,
-51,137,2,5,
-46,122,2,
-46,126,2,
-46,130,2,
-46,134,2,
-29,138,2,
-17,191,3,2,135,2,136,2,
-46,95,2,
-46,138,2,
-52,139,2,
-17,45,0,
-46,111,2,3,
-52,140,2,
+51,255,255,172,3,3,
+54,99,2,5,
+51,84,2,
+51,88,2,
+51,92,2,
+51,96,2,
+28,100,2,
+17,191,3,2,97,2,98,2,
+51,255,255,160,3,
+51,100,2,
+55,101,2,
+17,45,0,
+51,255,255,178,3,3,
+55,102,2,
 17,57,0,
-46,111,2,3,
-51,141,2,6,
-46,122,2,
-46,126,2,
-46,130,2,
-46,134,2,
-46,138,2,
-29,142,2,
-17,191,3,2,139,2,140,2,
-46,95,2,
-46,142,2,
-52,143,2,
-17,45,0,
-46,225,1,3,
-52,144,2,
+51,255,255,178,3,3,
+54,103,2,6,
+51,84,2,
+51,88,2,
+51,92,2,
+51,96,2,
+51,100,2,
+28,104,2,
+17,191,3,2,101,2,102,2,
+51,255,255,160,3,
+51,104,2,
+55,105,2,
+17,45,0,
+51,255,255,212,2,3,
+55,106,2,
 17,57,0,
-46,225,1,3,
-29,145,2,
-17,205,3,2,143,2,144,2,
-46,95,2,
-52,146,2,
-17,45,0,
-46,4,2,3,
-52,147,2,
+51,255,255,212,2,3,
+28,107,2,
+17,205,3,2,105,2,106,2,
+51,255,255,160,3,
+55,108,2,
+17,45,0,
+51,255,255,41,3,3,
+55,109,2,
 17,57,0,
-46,4,2,3,
-51,148,2,2,
-46,145,2,
-29,149,2,
-17,205,3,2,146,2,147,2,
-46,95,2,
-46,149,2,
-52,150,2,
-17,45,0,
-46,101,2,3,
-52,151,2,
+51,255,255,41,3,3,
+54,110,2,2,
+51,107,2,
+28,111,2,
+17,205,3,2,108,2,109,2,
+51,255,255,160,3,
+51,111,2,
+55,112,2,
+17,45,0,
+51,255,255,166,3,3,
+55,113,2,
 17,57,0,
-46,101,2,3,
-51,152,2,3,
-46,145,2,
-46,149,2,
-29,153,2,
-17,205,3,2,150,2,151,2,
-46,95,2,
-46,153,2,
-52,154,2,
-17,45,0,
-46,116,2,3,
-52,155,2,
+51,255,255,166,3,3,
+54,114,2,3,
+51,107,2,
+51,111,2,
+28,115,2,
+17,205,3,2,112,2,113,2,
+51,255,255,160,3,
+51,115,2,
+55,116,2,
+17,45,0,
+51,255,255,185,3,3,
+55,117,2,
 17,57,0,
-46,116,2,3,
-51,156,2,4,
-46,145,2,
-46,149,2,
-46,153,2,
-29,157,2,
-17,205,3,2,154,2,155,2,
-46,95,2,
-46,157,2,
-52,158,2,
-17,45,0,
-46,106,2,3,
-52,159,2,
+51,255,255,185,3,3,
+54,118,2,4,
+51,107,2,
+51,111,2,
+51,115,2,
+28,119,2,
+17,205,3,2,116,2,117,2,
+51,255,255,160,3,
+51,119,2,
+55,120,2,
+17,45,0,
+51,255,255,172,3,3,
+55,121,2,
 17,57,0,
-46,106,2,3,
-51,160,2,5,
-46,145,2,
-46,149,2,
-46,153,2,
-46,157,2,
-29,161,2,
-17,205,3,2,158,2,159,2,
-46,95,2,
-46,161,2,
-52,162,2,
-17,45,0,
-46,111,2,3,
-52,163,2,
+51,255,255,172,3,3,
+54,122,2,5,
+51,107,2,
+51,111,2,
+51,115,2,
+51,119,2,
+28,123,2,
+17,205,3,2,120,2,121,2,
+51,255,255,160,3,
+51,123,2,
+55,124,2,
+17,45,0,
+51,255,255,178,3,3,
+55,125,2,
 17,57,0,
-46,111,2,3,
-51,164,2,6,
-46,145,2,
-46,149,2,
-46,153,2,
-46,157,2,
-46,161,2,
-29,165,2,
-17,205,3,2,162,2,163,2,
-46,95,2,
-46,165,2,
-52,166,2,
-17,45,0,
-46,225,1,3,
-52,167,2,
+51,255,255,178,3,3,
+54,126,2,6,
+51,107,2,
+51,111,2,
+51,115,2,
+51,119,2,
+51,123,2,
+28,127,2,
+17,205,3,2,124,2,125,2,
+51,255,255,160,3,
+51,127,2,
+55,128,2,
+17,45,0,
+51,255,255,212,2,3,
+55,129,2,
 17,57,0,
-46,225,1,3,
-29,168,2,
-17,217,3,2,166,2,167,2,
-46,95,2,
-52,169,2,
-17,45,0,
-46,4,2,3,
-52,170,2,
+51,255,255,212,2,3,
+28,130,2,
+17,217,3,2,128,2,129,2,
+51,255,255,160,3,
+55,131,2,
+17,45,0,
+51,255,255,41,3,3,
+55,132,2,
 17,57,0,
-46,4,2,3,
-51,171,2,2,
-46,168,2,
-29,172,2,
-17,217,3,2,169,2,170,2,
-46,95,2,
-46,172,2,
-52,173,2,
-17,45,0,
-46,101,2,3,
-52,174,2,
+51,255,255,41,3,3,
+54,133,2,2,
+51,130,2,
+28,134,2,
+17,217,3,2,131,2,132,2,
+51,255,255,160,3,
+51,134,2,
+55,135,2,
+17,45,0,
+51,255,255,166,3,3,
+55,136,2,
 17,57,0,
-46,101,2,3,
-51,175,2,3,
-46,168,2,
-46,172,2,
-29,176,2,
-17,217,3,2,173,2,174,2,
-46,95,2,
-46,176,2,
-52,177,2,
-17,45,0,
-46,116,2,3,
-52,178,2,
+51,255,255,166,3,3,
+54,137,2,3,
+51,130,2,
+51,134,2,
+28,138,2,
+17,217,3,2,135,2,136,2,
+51,255,255,160,3,
+51,138,2,
+55,139,2,
+17,45,0,
+51,255,255,185,3,3,
+55,140,2,
 17,57,0,
-46,116,2,3,
-51,179,2,4,
-46,168,2,
-46,172,2,
-46,176,2,
-29,180,2,
-17,217,3,2,177,2,178,2,
-46,95,2,
-46,180,2,
-52,181,2,
-17,45,0,
-46,106,2,3,
-52,182,2,
+51,255,255,185,3,3,
+54,141,2,4,
+51,130,2,
+51,134,2,
+51,138,2,
+28,142,2,
+17,217,3,2,139,2,140,2,
+51,255,255,160,3,
+51,142,2,
+55,143,2,
+17,45,0,
+51,255,255,172,3,3,
+55,144,2,
 17,57,0,
-46,106,2,3,
-51,183,2,5,
-46,168,2,
-46,172,2,
-46,176,2,
-46,180,2,
-29,184,2,
-17,217,3,2,181,2,182,2,
-46,95,2,
-46,184,2,
-52,185,2,
-17,45,0,
-46,111,2,3,
-52,186,2,
+51,255,255,172,3,3,
+54,145,2,5,
+51,130,2,
+51,134,2,
+51,138,2,
+51,142,2,
+28,146,2,
+17,217,3,2,143,2,144,2,
+51,255,255,160,3,
+51,146,2,
+55,147,2,
+17,45,0,
+51,255,255,178,3,3,
+55,148,2,
 17,57,0,
-46,111,2,3,
-51,187,2,6,
-46,168,2,
-46,172,2,
-46,176,2,
-46,180,2,
-46,184,2,
-29,188,2,
-17,217,3,2,185,2,186,2,
-46,95,2,
-46,188,2,
-52,189,2,
-17,45,0,
-46,225,1,3,
-52,190,2,
+51,255,255,178,3,3,
+54,149,2,6,
+51,130,2,
+51,134,2,
+51,138,2,
+51,142,2,
+51,146,2,
+28,150,2,
+17,217,3,2,147,2,148,2,
+51,255,255,160,3,
+51,150,2,
+55,151,2,
+17,45,0,
+51,255,255,212,2,3,
+55,152,2,
 17,57,0,
-46,225,1,3,
-29,191,2,
-17,234,3,2,189,2,190,2,
-46,95,2,
-52,192,2,
-17,45,0,
-46,4,2,3,
-52,193,2,
+51,255,255,212,2,3,
+28,153,2,
+17,234,3,2,151,2,152,2,
+51,255,255,160,3,
+55,154,2,
+17,45,0,
+51,255,255,41,3,3,
+55,155,2,
 17,57,0,
-46,4,2,3,
-51,194,2,2,
-46,191,2,
-29,195,2,
-17,234,3,2,192,2,193,2,
-46,95,2,
-46,195,2,
-52,196,2,
-17,45,0,
-46,101,2,3,
-52,197,2,
+51,255,255,41,3,3,
+54,156,2,2,
+51,153,2,
+28,157,2,
+17,234,3,2,154,2,155,2,
+51,255,255,160,3,
+51,157,2,
+55,158,2,
+17,45,0,
+51,255,255,166,3,3,
+55,159,2,
 17,57,0,
-46,101,2,3,
-51,198,2,3,
-46,191,2,
-46,195,2,
-29,199,2,
-17,234,3,2,196,2,197,2,
-46,95,2,
-46,199,2,
-52,200,2,
-17,45,0,
-46,116,2,3,
-52,201,2,
+51,255,255,166,3,3,
+54,160,2,3,
+51,153,2,
+51,157,2,
+28,161,2,
+17,234,3,2,158,2,159,2,
+51,255,255,160,3,
+51,161,2,
+55,162,2,
+17,45,0,
+51,255,255,185,3,3,
+55,163,2,
 17,57,0,
-46,116,2,3,
-51,202,2,4,
-46,191,2,
-46,195,2,
-46,199,2,
-29,203,2,
-17,234,3,2,200,2,201,2,
-46,95,2,
-46,203,2,
-52,204,2,
-17,45,0,
-46,106,2,3,
-52,205,2,
+51,255,255,185,3,3,
+54,164,2,4,
+51,153,2,
+51,157,2,
+51,161,2,
+28,165,2,
+17,234,3,2,162,2,163,2,
+51,255,255,160,3,
+51,165,2,
+55,166,2,
+17,45,0,
+51,255,255,172,3,3,
+55,167,2,
 17,57,0,
-46,106,2,3,
-51,206,2,5,
-46,191,2,
-46,195,2,
-46,199,2,
-46,203,2,
-29,207,2,
-17,234,3,2,204,2,205,2,
-46,95,2,
-46,207,2,
-52,208,2,
-17,45,0,
-46,111,2,3,
-52,209,2,
+51,255,255,172,3,3,
+54,168,2,5,
+51,153,2,
+51,157,2,
+51,161,2,
+51,165,2,
+28,169,2,
+17,234,3,2,166,2,167,2,
+51,255,255,160,3,
+51,169,2,
+55,170,2,
+17,45,0,
+51,255,255,178,3,3,
+55,171,2,
 17,57,0,
-46,111,2,3,
-51,210,2,6,
-46,191,2,
-46,195,2,
-46,199,2,
-46,203,2,
-46,207,2,
-29,211,2,
-17,234,3,2,208,2,209,2,
-46,95,2,
-46,211,2,
-52,212,2,
-17,45,0,
-46,95,2,3,
-52,213,2,
+51,255,255,178,3,3,
+54,172,2,6,
+51,153,2,
+51,157,2,
+51,161,2,
+51,165,2,
+51,169,2,
+28,173,2,
+17,234,3,2,170,2,171,2,
+51,255,255,160,3,
+51,173,2,
+55,174,2,
+17,45,0,
+51,255,255,160,3,3,
+55,175,2,
 17,57,0,
-46,95,2,3,
-51,214,2,7,
-46,191,2,
-46,195,2,
-46,199,2,
-46,203,2,
-46,207,2,
-46,211,2,
-29,215,2,
-17,234,3,2,212,2,213,2,
-46,95,2,
-46,215,2,
-52,216,2,
-17,45,0,
-46,225,1,3,
-52,217,2,
+51,255,255,160,3,3,
+54,176,2,7,
+51,153,2,
+51,157,2,
+51,161,2,
+51,165,2,
+51,169,2,
+51,173,2,
+28,177,2,
+17,234,3,2,174,2,175,2,
+51,255,255,160,3,
+51,177,2,
+55,178,2,
+17,45,0,
+51,255,255,212,2,3,
+55,179,2,
 17,57,0,
-46,225,1,3,
-29,218,2,
-17,240,3,2,216,2,217,2,
-46,95,2,
-52,219,2,
-17,45,0,
-46,4,2,3,
-52,220,2,
+51,255,255,212,2,3,
+28,180,2,
+17,240,3,2,178,2,179,2,
+51,255,255,160,3,
+55,181,2,
+17,45,0,
+51,255,255,41,3,3,
+55,182,2,
 17,57,0,
-46,4,2,3,
-51,221,2,2,
-46,218,2,
-29,222,2,
-17,240,3,2,219,2,220,2,
-46,95,2,
-46,222,2,
-52,223,2,
-17,45,0,
-46,101,2,3,
-52,224,2,
+51,255,255,41,3,3,
+54,183,2,2,
+51,180,2,
+28,184,2,
+17,240,3,2,181,2,182,2,
+51,255,255,160,3,
+51,184,2,
+55,185,2,
+17,45,0,
+51,255,255,166,3,3,
+55,186,2,
 17,57,0,
-46,101,2,3,
-51,225,2,3,
-46,218,2,
-46,222,2,
-29,226,2,
-17,240,3,2,223,2,224,2,
-46,95,2,
-46,226,2,
-52,227,2,
-17,45,0,
-46,116,2,3,
-52,228,2,
+51,255,255,166,3,3,
+54,187,2,3,
+51,180,2,
+51,184,2,
+28,188,2,
+17,240,3,2,185,2,186,2,
+51,255,255,160,3,
+51,188,2,
+55,189,2,
+17,45,0,
+51,255,255,185,3,3,
+55,190,2,
 17,57,0,
-46,116,2,3,
-51,229,2,4,
-46,218,2,
-46,222,2,
-46,226,2,
-29,230,2,
-17,240,3,2,227,2,228,2,
-46,95,2,
-46,230,2,
-52,231,2,
-17,45,0,
-46,106,2,3,
-52,232,2,
+51,255,255,185,3,3,
+54,191,2,4,
+51,180,2,
+51,184,2,
+51,188,2,
+28,192,2,
+17,240,3,2,189,2,190,2,
+51,255,255,160,3,
+51,192,2,
+55,193,2,
+17,45,0,
+51,255,255,172,3,3,
+55,194,2,
 17,57,0,
-46,106,2,3,
-51,233,2,5,
-46,218,2,
-46,222,2,
-46,226,2,
-46,230,2,
-29,234,2,
-17,240,3,2,231,2,232,2,
-46,95,2,
-46,234,2,
-52,235,2,
-17,45,0,
-46,111,2,3,
-52,236,2,
+51,255,255,172,3,3,
+54,195,2,5,
+51,180,2,
+51,184,2,
+51,188,2,
+51,192,2,
+28,196,2,
+17,240,3,2,193,2,194,2,
+51,255,255,160,3,
+51,196,2,
+55,197,2,
+17,45,0,
+51,255,255,178,3,3,
+55,198,2,
 17,57,0,
-46,111,2,3,
-51,237,2,6,
-46,218,2,
-46,222,2,
-46,226,2,
-46,230,2,
-46,234,2,
-29,238,2,
-17,240,3,2,235,2,236,2,
-46,95,2,
-46,238,2,
-52,239,2,
-17,45,0,
-46,95,2,3,
-52,240,2,
+51,255,255,178,3,3,
+54,199,2,6,
+51,180,2,
+51,184,2,
+51,188,2,
+51,192,2,
+51,196,2,
+28,200,2,
+17,240,3,2,197,2,198,2,
+51,255,255,160,3,
+51,200,2,
+55,201,2,
+17,45,0,
+51,255,255,160,3,3,
+55,202,2,
 17,57,0,
-46,95,2,3,
-51,241,2,7,
-46,218,2,
-46,222,2,
-46,226,2,
-46,230,2,
-46,234,2,
-46,238,2,
-29,242,2,
-17,240,3,2,239,2,240,2,
-46,95,2,
-46,242,2,
-52,243,2,
-17,45,0,
-46,95,2,3,
-29,244,2,
-17,249,3,1,243,2,
-49,245,2,253,3,
-52,246,2,
-17,45,0,
-46,95,2,3,
-29,247,2,
-17,2,4,1,246,2,
-46,245,2,
-52,248,2,
-17,45,0,
-46,95,2,3,
-29,249,2,
-17,6,4,1,248,2,
-46,95,2,
-52,250,2,
+51,255,255,160,3,3,
+54,203,2,7,
+51,180,2,
+51,184,2,
+51,188,2,
+51,192,2,
+51,196,2,
+51,200,2,
+28,204,2,
+17,240,3,2,201,2,202,2,
+51,255,255,160,3,
+51,204,2,
+55,205,2,
+17,45,0,
+51,255,255,160,3,3,
+28,206,2,
+17,249,3,1,205,2,
+51,255,255,253,3,
+55,207,2,
+17,45,0,
+51,255,255,160,3,3,
+28,208,2,
+17,2,4,1,207,2,
+51,255,255,253,3,
+55,209,2,
+17,45,0,
+51,255,255,160,3,3,
+28,210,2,
+17,6,4,1,209,2,
+51,255,255,160,3,
+55,211,2,
 17,96,1,
-46,124,0,3,
-29,251,2,
-17,10,4,1,250,2,
-46,124,0,
-52,252,2,
+51,255,255,159,0,3,
+28,212,2,
+17,10,4,1,211,2,
+51,255,255,159,0,
+55,213,2,
 17,96,1,
-46,10,1,3,
-51,253,2,2,
-46,251,2,
-29,254,2,
-17,10,4,1,252,2,
-46,124,0,
-46,254,2,
-52,255,2,
+51,255,255,11,1,3,
+54,214,2,2,
+51,212,2,
+28,215,2,
+17,10,4,1,213,2,
+51,255,255,159,0,
+51,215,2,
+55,216,2,
 17,96,1,
-46,124,0,3,
-29,0,3,
-17,19,4,1,255,2,
-46,124,0,
-52,1,3,
+51,255,255,159,0,3,
+28,217,2,
+17,19,4,1,216,2,
+51,255,255,159,0,
+55,218,2,
 17,96,1,
-46,10,1,3,
-51,2,3,2,
-46,0,3,
-29,3,3,
-17,19,4,1,1,3,
-46,124,0,
-46,3,3,
-52,4,3,
+51,255,255,11,1,3,
+54,219,2,2,
+51,217,2,
+28,220,2,
+17,19,4,1,218,2,
+51,255,255,159,0,
+51,220,2,
+55,221,2,
 17,96,1,
-46,124,0,3,
-29,5,3,
-17,27,4,1,4,3,
-46,124,0,
-52,6,3,
+51,255,255,159,0,3,
+28,222,2,
+17,27,4,1,221,2,
+51,255,255,159,0,
+55,223,2,
 17,96,1,
-46,10,1,3,
-51,7,3,2,
-46,5,3,
-29,8,3,
-17,27,4,1,6,3,
-46,124,0,
-46,8,3,
-52,9,3,
+51,255,255,11,1,3,
+54,224,2,2,
+51,222,2,
+28,225,2,
+17,27,4,1,223,2,
+51,255,255,159,0,
+51,225,2,
+55,226,2,
 17,35,4,
-49,10,3,43,4,3,
-52,11,3,
+51,255,255,43,4,3,
+55,227,2,
 17,53,4,
-49,12,3,55,4,3,
-29,13,3,
-17,63,4,2,9,3,11,3,
-49,14,3,77,4,
-52,15,3,
+51,255,255,55,4,3,
+28,228,2,
+17,63,4,2,226,2,227,2,
+51,255,255,77,4,
+55,229,2,
 17,53,4,
-49,16,3,87,4,3,
-29,17,3,
-17,101,4,1,15,3,
-49,18,3,113,4,
-52,19,3,
+51,255,255,87,4,3,
+28,230,2,
+17,101,4,1,229,2,
+51,255,255,113,4,
+55,231,2,
 17,53,4,
-49,20,3,118,4,3,
-52,21,3,
+51,255,255,118,4,3,
+55,232,2,
 17,128,4,
-46,167,0,3,
-29,22,3,
-17,130,4,2,19,3,21,3,
-46,21,2,
-52,23,3,
+51,255,255,213,0,3,
+28,233,2,
+17,130,4,2,231,2,232,2,
+51,255,255,81,3,
+55,234,2,
 17,53,4,
-46,20,3,3,
-52,24,3,
+51,255,255,118,4,3,
+55,235,2,
 17,128,4,
-46,167,0,3,
-52,25,3,
+51,255,255,213,0,3,
+55,236,2,
 17,137,4,
-46,167,0,3,
-51,26,3,2,
-46,22,3,
-29,27,3,
-17,130,4,3,23,3,24,3,25,3,
-46,21,2,
-46,27,3,
-52,28,3,
+51,255,255,213,0,3,
+54,237,2,2,
+51,233,2,
+28,238,2,
+17,130,4,3,234,2,235,2,236,2,
+51,255,255,81,3,
+51,238,2,
+55,239,2,
 17,53,4,
-46,14,3,3,
-52,29,3,
+51,255,255,77,4,3,
+55,240,2,
 17,128,4,
-46,136,1,3,
-51,30,3,3,
-46,22,3,
-46,27,3,
-29,31,3,
-17,130,4,2,28,3,29,3,
-46,21,2,
-46,31,3,
-52,32,3,
+51,255,255,186,1,3,
+54,241,2,3,
+51,233,2,
+51,238,2,
+28,242,2,
+17,130,4,2,239,2,240,2,
+51,255,255,81,3,
+51,242,2,
+55,243,2,
 17,53,4,
-49,33,3,142,4,3,
-52,34,3,
+51,255,255,142,4,3,
+55,244,2,
 17,128,4,
-46,136,1,3,
-51,35,3,4,
-46,22,3,
-46,27,3,
-46,31,3,
-29,36,3,
-17,130,4,2,32,3,34,3,
-49,37,3,153,4,
-46,36,3,
-52,38,3,
+51,255,255,186,1,3,
+54,245,2,4,
+51,233,2,
+51,238,2,
+51,242,2,
+28,246,2,
+17,130,4,2,243,2,244,2,
+51,255,255,153,4,
+51,246,2,
+55,247,2,
 17,53,4,
-49,39,3,158,4,3,
-52,40,3,
+51,255,255,158,4,3,
+55,248,2,
 17,128,4,
-46,136,1,3,
-52,41,3,
+51,255,255,186,1,3,
+55,249,2,
 17,137,4,
-46,167,0,3,
-51,42,3,5,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-29,43,3,
-17,130,4,3,38,3,40,3,41,3,
-46,21,2,
-46,43,3,
-52,44,3,
+51,255,255,213,0,3,
+54,250,2,5,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+28,251,2,
+17,130,4,3,247,2,248,2,249,2,
+51,255,255,81,3,
+51,251,2,
+55,252,2,
 17,53,4,
-46,39,3,3,
-52,45,3,
+51,255,255,158,4,3,
+55,253,2,
 17,128,4,
-46,136,1,3,
-51,46,3,6,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-29,47,3,
-17,130,4,2,44,3,45,3,
-46,21,2,
-46,47,3,
-52,48,3,
+51,255,255,186,1,3,
+54,254,2,6,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+28,255,2,
+17,130,4,2,252,2,253,2,
+51,255,255,81,3,
+51,255,2,
+55,0,3,
 17,53,4,
-46,16,3,3,
-52,49,3,
+51,255,255,87,4,3,
+55,1,3,
 17,128,4,
-46,136,1,3,
-51,50,3,7,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-29,51,3,
-17,130,4,2,48,3,49,3,
-46,21,2,
-46,51,3,
-52,52,3,
+51,255,255,186,1,3,
+54,2,3,7,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+28,3,3,
+17,130,4,2,0,3,1,3,
+51,255,255,81,3,
+51,3,3,
+55,4,3,
 17,53,4,
-46,16,3,3,
-52,53,3,
+51,255,255,87,4,3,
+55,5,3,
 17,128,4,
-46,177,1,3,
-51,54,3,8,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-46,51,3,
-29,55,3,
-17,130,4,2,52,3,53,3,
-46,21,2,
-46,55,3,
-52,56,3,
+51,255,255,116,2,3,
+54,6,3,8,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+51,3,3,
+28,7,3,
+17,130,4,2,4,3,5,3,
+51,255,255,81,3,
+51,7,3,
+55,8,3,
 17,177,4,
-49,57,3,185,4,3,
-29,58,3,
-17,198,4,1,56,3,
-46,21,2,
-52,59,3,
+51,255,255,185,4,3,
+28,9,3,
+17,198,4,1,8,3,
+51,255,255,81,3,
+55,10,3,
 17,177,4,
-49,60,3,210,4,3,
-52,61,3,
+51,255,255,210,4,3,
+55,11,3,
 17,130,4,
-46,210,0,3,
-51,62,3,2,
-46,58,3,
-29,63,3,
-17,198,4,2,59,3,61,3,
-46,21,2,
-46,63,3,
-52,64,3,
+51,255,255,239,0,3,
+54,12,3,2,
+51,9,3,
+28,13,3,
+17,198,4,2,10,3,11,3,
+51,255,255,81,3,
+51,13,3,
+55,14,3,
 17,53,4,
-46,20,3,3,
-52,65,3,
+51,255,255,118,4,3,
+55,15,3,
 17,128,4,
-46,136,1,3,
-51,66,3,9,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-46,51,3,
-46,55,3,
-29,67,3,
-17,130,4,2,64,3,65,3,
-46,21,2,
-46,67,3,
-52,68,3,
+51,255,255,186,1,3,
+54,16,3,9,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+51,3,3,
+51,7,3,
+28,17,3,
+17,130,4,2,14,3,15,3,
+51,255,255,81,3,
+51,17,3,
+55,18,3,
 17,53,4,
-46,20,3,3,
-52,69,3,
+51,255,255,118,4,3,
+55,19,3,
 17,128,4,
-46,136,1,3,
-52,70,3,
+51,255,255,186,1,3,
+55,20,3,
 17,137,4,
-46,167,0,3,
-51,71,3,10,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-46,51,3,
-46,55,3,
-46,67,3,
-29,72,3,
-17,130,4,3,68,3,69,3,70,3,
-46,21,2,
-46,72,3,
-52,73,3,
+51,255,255,213,0,3,
+54,21,3,10,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+51,3,3,
+51,7,3,
+51,17,3,
+28,22,3,
+17,130,4,3,18,3,19,3,20,3,
+51,255,255,81,3,
+51,22,3,
+55,23,3,
 17,53,4,
-46,14,3,3,
-52,74,3,
+51,255,255,77,4,3,
+55,24,3,
 17,128,4,
-46,177,1,3,
-51,75,3,11,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-46,51,3,
-46,55,3,
-46,67,3,
-46,72,3,
-29,76,3,
-17,130,4,2,73,3,74,3,
-46,21,2,
-46,76,3,
-52,77,3,
+51,255,255,116,2,3,
+54,25,3,11,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+51,3,3,
+51,7,3,
+51,17,3,
+51,22,3,
+28,26,3,
+17,130,4,2,23,3,24,3,
+51,255,255,81,3,
+51,26,3,
+55,27,3,
 17,53,4,
-46,14,3,3,
-52,78,3,
+51,255,255,77,4,3,
+55,28,3,
 17,128,4,
-46,177,1,3,
-52,79,3,
+51,255,255,116,2,3,
+55,29,3,
 17,137,4,
-46,167,0,3,
-51,80,3,12,
-46,22,3,
-46,27,3,
-46,31,3,
-46,36,3,
-46,43,3,
-46,47,3,
-46,51,3,
-46,55,3,
-46,67,3,
-46,72,3,
-46,76,3,
-29,81,3,
-17,130,4,3,77,3,78,3,79,3,
-46,21,2,
-46,81,3,
-52,82,3,
+51,255,255,213,0,3,
+54,30,3,12,
+51,233,2,
+51,238,2,
+51,242,2,
+51,246,2,
+51,251,2,
+51,255,2,
+51,3,3,
+51,7,3,
+51,17,3,
+51,22,3,
+51,26,3,
+28,31,3,
+17,130,4,3,27,3,28,3,29,3,
+51,255,255,81,3,
+51,31,3,
+55,32,3,
 17,254,1,
-46,2,0,3,
-29,83,3,
-17,225,4,1,82,3,
-46,2,0,
-52,84,3,
+51,255,255,10,0,3,
+28,33,3,
+17,225,4,1,32,3,
+51,255,255,10,0,
+55,34,3,
 17,254,1,
-46,2,0,3,
-29,85,3,
-17,230,4,1,84,3,
-46,2,0,
-52,86,3,
+51,255,255,10,0,3,
+28,35,3,
+17,230,4,1,34,3,
+51,255,255,10,0,
+55,36,3,
 17,254,1,
-46,48,0,3,
-51,87,3,2,
-46,83,3,
-29,88,3,
-17,225,4,1,86,3,
-46,48,0,
-46,88,3,
-52,89,3,
+51,255,255,133,0,3,
+54,37,3,2,
+51,33,3,
+28,38,3,
+17,225,4,1,36,3,
+51,255,255,133,0,
+51,38,3,
+55,39,3,
 17,254,1,
-46,48,0,3,
-51,90,3,2,
-46,85,3,
-29,91,3,
-17,230,4,1,89,3,
-46,48,0,
-46,91,3,
-52,92,3,
+51,255,255,133,0,3,
+54,40,3,2,
+51,35,3,
+28,41,3,
+17,230,4,1,39,3,
+51,255,255,133,0,
+51,41,3,
+55,42,3,
 17,254,1,
-46,2,0,3,
-29,93,3,
-17,235,4,1,92,3,
-46,2,0,
-52,94,3,
+51,255,255,10,0,3,
+28,43,3,
+17,235,4,1,42,3,
+51,255,255,10,0,
+55,44,3,
 17,254,1,
-46,48,0,3,
-51,95,3,2,
-46,93,3,
-29,96,3,
-17,235,4,1,94,3,
-46,48,0,
-46,96,3,
-52,97,3,
+51,255,255,133,0,3,
+54,45,3,2,
+51,43,3,
+28,46,3,
+17,235,4,1,44,3,
+51,255,255,133,0,
+51,46,3,
+55,47,3,
 17,242,4,
-46,167,0,3,
-52,98,3,
+51,255,255,213,0,3,
+55,48,3,
 17,130,4,
-46,210,0,3,
-29,99,3,
-17,254,4,2,97,3,98,3,
-46,167,0,
-52,100,3,
+51,255,255,239,0,3,
+28,49,3,
+17,254,4,2,47,3,48,3,
+51,255,255,213,0,
+55,50,3,
 17,242,4,
-46,136,1,3,
-52,101,3,
+51,255,255,186,1,3,
+55,51,3,
 17,130,4,
-46,210,0,3,
-51,102,3,2,
-46,99,3,
-29,103,3,
-17,254,4,2,100,3,101,3,
-46,136,1,
-46,103,3,
-52,104,3,
+51,255,255,239,0,3,
+54,52,3,2,
+51,49,3,
+28,53,3,
+17,254,4,2,50,3,51,3,
+51,255,255,186,1,
+51,53,3,
+55,54,3,
 17,242,4,
-46,177,1,3,
-52,105,3,
+51,255,255,116,2,3,
+55,55,3,
 17,130,4,
-46,210,0,3,
-51,106,3,3,
-46,99,3,
-46,103,3,
-29,107,3,
-17,254,4,2,104,3,105,3,
-46,177,1,
-46,107,3,
-52,108,3,
+51,255,255,239,0,3,
+54,56,3,3,
+51,49,3,
+51,53,3,
+28,57,3,
+17,254,4,2,54,3,55,3,
+51,255,255,116,2,
+51,57,3,
+55,58,3,
 17,242,4,
-46,141,1,3,
-52,109,3,
+51,255,255,221,1,3,
+55,59,3,
 17,130,4,
-46,210,0,3,
-51,110,3,4,
-46,99,3,
-46,103,3,
-46,107,3,
-29,111,3,
-17,254,4,2,108,3,109,3,
-46,141,1,
-46,111,3,
-52,112,3,
+51,255,255,239,0,3,
+54,60,3,4,
+51,49,3,
+51,53,3,
+51,57,3,
+28,61,3,
+17,254,4,2,58,3,59,3,
+51,255,255,221,1,
+51,61,3,
+55,62,3,
 17,242,4,
-46,167,0,3,
-52,113,3,
+51,255,255,213,0,3,
+55,63,3,
 17,18,5,
-46,136,1,3,
-29,114,3,
-17,25,5,2,112,3,113,3,
-46,167,0,
-52,115,3,
+51,255,255,186,1,3,
+28,64,3,
+17,25,5,2,62,3,63,3,
+51,255,255,213,0,
+55,65,3,
 17,242,4,
-46,136,1,3,
-52,116,3,
+51,255,255,186,1,3,
+55,66,3,
 17,18,5,
-46,136,1,3,
-51,117,3,2,
-46,114,3,
-29,118,3,
-17,25,5,2,115,3,116,3,
-46,136,1,
-46,118,3,
-52,119,3,
+51,255,255,186,1,3,
+54,67,3,2,
+51,64,3,
+28,68,3,
+17,25,5,2,65,3,66,3,
+51,255,255,186,1,
+51,68,3,
+55,69,3,
 17,242,4,
-46,177,1,3,
-52,120,3,
+51,255,255,116,2,3,
+55,70,3,
 17,18,5,
-46,136,1,3,
-51,121,3,3,
-46,114,3,
-46,118,3,
-29,122,3,
-17,25,5,2,119,3,120,3,
-46,177,1,
-46,122,3,
-52,123,3,
+51,255,255,186,1,3,
+54,71,3,3,
+51,64,3,
+51,68,3,
+28,72,3,
+17,25,5,2,69,3,70,3,
+51,255,255,116,2,
+51,72,3,
+55,73,3,
 17,242,4,
-46,141,1,3,
-52,124,3,
+51,255,255,221,1,3,
+55,74,3,
 17,18,5,
-46,136,1,3,
-51,125,3,4,
-46,114,3,
-46,118,3,
-46,122,3,
-29,126,3,
-17,25,5,2,123,3,124,3,
-46,141,1,
-46,126,3,
-52,127,3,
+51,255,255,186,1,3,
+54,75,3,4,
+51,64,3,
+51,68,3,
+51,72,3,
+28,76,3,
+17,25,5,2,73,3,74,3,
+51,255,255,221,1,
+51,76,3,
+55,77,3,
 17,45,5,
-46,21,2,3,
-52,128,3,
+51,255,255,81,3,3,
+55,78,3,
 17,49,5,
-46,21,2,3,
-29,129,3,
-17,53,5,2,127,3,128,3,
-46,21,2,
-52,130,3,
+51,255,255,81,3,3,
+28,79,3,
+17,53,5,2,77,3,78,3,
+51,255,255,81,3,
+55,80,3,
 17,45,5,
-46,21,2,3,
-52,131,3,
+51,255,255,81,3,3,
+55,81,3,
 17,49,5,
-46,21,2,3,
-29,132,3,
-17,65,5,2,130,3,131,3,
-46,21,2,
-52,133,3,
+51,255,255,81,3,3,
+28,82,3,
+17,65,5,2,80,3,81,3,
+51,255,255,81,3,
+55,83,3,
 17,45,5,
-46,21,2,3,
-52,134,3,
+51,255,255,81,3,3,
+55,84,3,
 17,49,5,
-46,21,2,3,
-29,135,3,
-17,75,5,2,133,3,134,3,
-46,21,2,
-52,136,3,
+51,255,255,81,3,3,
+28,85,3,
+17,75,5,2,83,3,84,3,
+51,255,255,81,3,
+55,86,3,
 17,45,5,
-46,21,2,3,
-52,137,3,
+51,255,255,81,3,3,
+55,87,3,
 17,49,5,
-46,21,2,3,
-29,138,3,
-17,85,5,2,136,3,137,3,
-46,21,2,
-52,139,3,
+51,255,255,81,3,3,
+28,88,3,
+17,85,5,2,86,3,87,3,
+51,255,255,81,3,
+55,89,3,
 17,45,5,
-46,21,2,3,
-52,140,3,
+51,255,255,81,3,3,
+55,90,3,
 17,49,5,
-46,21,2,3,
-29,141,3,
-17,100,5,2,139,3,140,3,
-46,21,2,
-52,142,3,
+51,255,255,81,3,3,
+28,91,3,
+17,100,5,2,89,3,90,3,
+51,255,255,81,3,
+55,92,3,
 17,45,5,
-46,21,2,3,
-52,143,3,
+51,255,255,81,3,3,
+55,93,3,
 17,49,5,
-46,21,2,3,
-29,144,3,
-17,115,5,2,142,3,143,3,
-46,21,2,
-52,145,3,
+51,255,255,81,3,3,
+28,94,3,
+17,115,5,2,92,3,93,3,
+51,255,255,81,3,
+55,95,3,
 17,45,5,
-46,21,2,3,
-52,146,3,
+51,255,255,81,3,3,
+55,96,3,
 17,49,5,
-46,21,2,3,
-29,147,3,
-17,128,5,2,145,3,146,3,
-46,21,2,
-52,148,3,
+51,255,255,81,3,3,
+28,97,3,
+17,128,5,2,95,3,96,3,
+51,255,255,81,3,
+55,98,3,
 17,45,5,
-46,21,2,3,
-52,149,3,
+51,255,255,81,3,3,
+55,99,3,
 17,49,5,
-46,21,2,3,
-29,150,3,
-17,141,5,2,148,3,149,3,
-46,21,2,
-52,151,3,
+51,255,255,81,3,3,
+28,100,3,
+17,141,5,2,98,3,99,3,
+51,255,255,81,3,
+55,101,3,
 17,45,5,
-46,21,2,3,
-52,152,3,
+51,255,255,81,3,3,
+55,102,3,
 17,49,5,
-46,21,2,3,
-29,153,3,
-17,155,5,2,151,3,152,3,
-46,21,2,
-52,154,3,
+51,255,255,81,3,3,
+28,103,3,
+17,155,5,2,101,3,102,3,
+51,255,255,81,3,
+55,104,3,
 17,45,5,
-46,21,2,3,
-52,155,3,
+51,255,255,81,3,3,
+55,105,3,
 17,49,5,
-46,21,2,3,
-29,156,3,
-17,169,5,2,154,3,155,3,
-46,21,2,
-52,157,3,
+51,255,255,81,3,3,
+28,106,3,
+17,169,5,2,104,3,105,3,
+51,255,255,81,3,
+55,107,3,
 17,45,5,
-46,21,2,3,
-52,158,3,
+51,255,255,81,3,3,
+55,108,3,
 17,49,5,
-46,21,2,3,
-29,159,3,
-17,184,5,2,157,3,158,3,
-46,21,2,
-52,160,3,
+51,255,255,81,3,3,
+28,109,3,
+17,184,5,2,107,3,108,3,
+51,255,255,81,3,
+55,110,3,
 17,45,5,
-46,21,2,3,
-52,161,3,
+51,255,255,81,3,3,
+55,111,3,
 17,49,5,
-46,21,2,3,
-29,162,3,
-17,199,5,2,160,3,161,3,
-46,21,2,
-52,163,3,
+51,255,255,81,3,3,
+28,112,3,
+17,199,5,2,110,3,111,3,
+51,255,255,81,3,
+55,113,3,
 17,45,5,
-46,21,2,3,
-52,164,3,
+51,255,255,81,3,3,
+55,114,3,
 17,49,5,
-46,21,2,3,
-29,165,3,
-17,209,5,2,163,3,164,3,
-46,21,2,
-52,166,3,
+51,255,255,81,3,3,
+28,115,3,
+17,209,5,2,113,3,114,3,
+51,255,255,81,3,
+55,116,3,
 17,45,5,
-46,21,2,3,
-52,167,3,
+51,255,255,81,3,3,
+55,117,3,
 17,49,5,
-46,21,2,3,
-29,168,3,
-17,220,5,2,166,3,167,3,
-46,21,2,
-52,169,3,
+51,255,255,81,3,3,
+28,118,3,
+17,220,5,2,116,3,117,3,
+51,255,255,81,3,
+55,119,3,
 17,45,5,
-46,21,2,3,
-52,170,3,
+51,255,255,81,3,3,
+55,120,3,
 17,49,5,
-46,21,2,3,
-29,171,3,
-17,235,5,2,169,3,170,3,
-46,21,2,
-52,172,3,
+51,255,255,81,3,3,
+28,121,3,
+17,235,5,2,119,3,120,3,
+51,255,255,81,3,
+55,122,3,
 17,53,4,
-46,11,2,3,
-52,173,3,
+51,255,255,59,3,3,
+55,123,3,
 17,248,5,
-46,11,2,3,
-29,174,3,
-17,250,5,2,172,3,173,3,
-46,175,0,
-52,175,3,
+51,255,255,59,3,3,
+28,124,3,
+17,250,5,2,122,3,123,3,
+51,255,255,223,0,
+55,125,3,
 17,45,5,
-46,21,2,3,
-52,176,3,
+51,255,255,81,3,3,
+55,126,3,
 17,49,5,
-46,21,2,3,
-29,177,3,
-17,19,6,2,175,3,176,3,
-46,21,2,
-52,178,3,
+51,255,255,81,3,3,
+28,127,3,
+17,19,6,2,125,3,126,3,
+51,255,255,81,3,
+55,128,3,
 17,45,5,
-46,21,2,3,
-52,179,3,
+51,255,255,81,3,3,
+55,129,3,
 17,49,5,
-46,21,2,3,
-29,180,3,
-17,33,6,2,178,3,179,3,
-46,21,2,
-52,181,3,
+51,255,255,81,3,3,
+28,130,3,
+17,33,6,2,128,3,129,3,
+51,255,255,81,3,
+55,131,3,
 17,45,5,
-46,21,2,3,
-52,182,3,
+51,255,255,81,3,3,
+55,132,3,
 17,49,5,
-46,21,2,3,
-29,183,3,
-17,46,6,2,181,3,182,3,
-46,21,2,
-52,184,3,
+51,255,255,81,3,3,
+28,133,3,
+17,46,6,2,131,3,132,3,
+51,255,255,81,3,
+55,134,3,
 17,60,6,
-46,175,0,3,
-52,185,3,
+51,255,255,223,0,3,
+55,135,3,
 17,248,5,
-46,175,0,3,
-29,186,3,
-17,62,6,2,184,3,185,3,
-46,175,0,
-52,187,3,
+51,255,255,223,0,3,
+28,136,3,
+17,62,6,2,134,3,135,3,
+51,255,255,223,0,
+55,137,3,
 17,60,6,
-46,181,1,3,
-52,188,3,
+51,255,255,129,2,3,
+55,138,3,
 17,248,5,
-46,175,0,3,
-51,189,3,2,
-46,186,3,
-29,190,3,
-17,62,6,2,187,3,188,3,
-46,181,1,
-46,190,3,
-52,191,3,
+51,255,255,223,0,3,
+54,139,3,2,
+51,136,3,
+28,140,3,
+17,62,6,2,137,3,138,3,
+51,255,255,129,2,
+51,140,3,
+55,141,3,
 17,53,4,
-46,11,2,3,
-52,192,3,
+51,255,255,59,3,3,
+55,142,3,
 17,248,5,
-46,11,2,3,
-29,193,3,
-17,78,6,2,191,3,192,3,
-46,175,0,
-52,194,3,
+51,255,255,59,3,3,
+28,143,3,
+17,78,6,2,141,3,142,3,
+51,255,255,223,0,
+55,144,3,
 17,45,5,
-46,21,2,3,
-52,195,3,
+51,255,255,81,3,3,
+55,145,3,
 17,49,5,
-46,21,2,3,
-29,196,3,
-17,101,6,2,194,3,195,3,
-46,21,2,
-52,197,3,
+51,255,255,81,3,3,
+28,146,3,
+17,101,6,2,144,3,145,3,
+51,255,255,81,3,
+55,147,3,
 17,53,4,
-46,11,2,3,
-52,198,3,
+51,255,255,59,3,3,
+55,148,3,
 17,248,5,
-46,11,2,3,
-29,199,3,
-17,119,6,2,197,3,198,3,
-46,175,0,
-52,200,3,
+51,255,255,59,3,3,
+28,149,3,
+17,119,6,2,147,3,148,3,
+51,255,255,223,0,
+55,150,3,
 17,45,5,
-46,21,2,3,
-52,201,3,
+51,255,255,81,3,3,
+55,151,3,
 17,49,5,
-46,21,2,3,
-29,202,3,
-17,141,6,2,200,3,201,3,
-46,21,2,
-52,203,3,
+51,255,255,81,3,3,
+28,152,3,
+17,141,6,2,150,3,151,3,
+51,255,255,81,3,
+55,153,3,
 17,45,5,
-46,21,2,3,
-52,204,3,
+51,255,255,81,3,3,
+55,154,3,
 17,49,5,
-46,21,2,3,
-29,205,3,
-17,158,6,2,203,3,204,3,
-46,21,2,
-52,206,3,
+51,255,255,81,3,3,
+28,155,3,
+17,158,6,2,153,3,154,3,
+51,255,255,81,3,
+55,156,3,
 17,53,4,
-46,11,2,3,
-52,207,3,
+51,255,255,59,3,3,
+55,157,3,
 17,248,5,
-46,11,2,3,
-29,208,3,
-17,175,6,2,206,3,207,3,
-46,175,0,
-52,209,3,
+51,255,255,59,3,3,
+28,158,3,
+17,175,6,2,156,3,157,3,
+51,255,255,223,0,
+55,159,3,
 17,45,5,
-46,21,2,3,
-52,210,3,
+51,255,255,81,3,3,
+55,160,3,
 17,49,5,
-46,21,2,3,
-29,211,3,
-17,197,6,2,209,3,210,3,
-46,21,2,
-52,212,3,
+51,255,255,81,3,3,
+28,161,3,
+17,197,6,2,159,3,160,3,
+51,255,255,81,3,
+55,162,3,
 17,45,5,
-46,21,2,3,
-52,213,3,
+51,255,255,81,3,3,
+55,163,3,
 17,49,5,
-46,21,2,3,
-29,214,3,
-17,214,6,2,212,3,213,3,
-46,21,2,
-52,215,3,
+51,255,255,81,3,3,
+28,164,3,
+17,214,6,2,162,3,163,3,
+51,255,255,81,3,
+55,165,3,
 17,45,5,
-46,21,2,3,
-52,216,3,
+51,255,255,81,3,3,
+55,166,3,
 17,49,5,
-46,21,2,3,
-29,217,3,
-17,231,6,2,215,3,216,3,
-46,21,2,
-52,218,3,
+51,255,255,81,3,3,
+28,167,3,
+17,231,6,2,165,3,166,3,
+51,255,255,81,3,
+55,168,3,
 17,45,5,
-46,21,2,3,
-52,219,3,
+51,255,255,81,3,3,
+55,169,3,
 17,49,5,
-46,21,2,3,
-29,220,3,
-17,247,6,2,218,3,219,3,
-46,21,2,
-52,221,3,
+51,255,255,81,3,3,
+28,170,3,
+17,247,6,2,168,3,169,3,
+51,255,255,81,3,
+55,171,3,
 17,6,7,
-46,181,1,3,
-29,222,3,
-17,12,7,1,221,3,
-46,175,0,
-52,223,3,
+51,255,255,129,2,3,
+28,172,3,
+17,12,7,1,171,3,
+51,255,255,223,0,
+55,173,3,
 17,35,7,
-46,181,1,3,
-52,224,3,
+51,255,255,129,2,3,
+55,174,3,
 17,47,7,
-46,175,0,3,
-52,225,3,
+51,255,255,223,0,3,
+55,175,3,
 17,53,7,
-46,181,1,3,
-29,226,3,
-17,62,7,3,223,3,224,3,225,3,
-46,181,1,
-52,227,3,
+51,255,255,129,2,3,
+28,176,3,
+17,62,7,3,173,3,174,3,175,3,
+51,255,255,129,2,
+55,177,3,
 17,6,7,
-46,181,1,3,
-29,228,3,
-17,89,7,1,227,3,
-46,175,0,
-52,229,3,
+51,255,255,129,2,3,
+28,178,3,
+17,89,7,1,177,3,
+51,255,255,223,0,
+55,179,3,
 17,113,7,
-46,181,1,3,
-52,230,3,
+51,255,255,129,2,3,
+55,180,3,
 17,123,7,
-46,175,0,3,
-29,231,3,
-17,127,7,2,229,3,230,3,
-46,181,1,
-52,232,3,
+51,255,255,223,0,3,
+28,181,3,
+17,127,7,2,179,3,180,3,
+51,255,255,129,2,
+55,182,3,
 17,162,7,
-46,181,1,3,
-52,233,3,
+51,255,255,129,2,3,
+55,183,3,
 17,174,7,
-46,181,1,3,
-29,234,3,
-17,183,7,2,232,3,233,3,
-46,181,1,
-52,235,3,
+51,255,255,129,2,3,
+28,184,3,
+17,183,7,2,182,3,183,3,
+51,255,255,129,2,
+55,185,3,
 17,45,5,
-46,21,2,3,
-52,236,3,
+51,255,255,81,3,3,
+55,186,3,
 17,49,5,
-46,21,2,3,
-29,237,3,
-17,211,7,2,235,3,236,3,
-46,21,2,
-52,238,3,
+51,255,255,81,3,3,
+28,187,3,
+17,211,7,2,185,3,186,3,
+51,255,255,81,3,
+55,188,3,
 17,45,5,
-46,21,2,3,
-52,239,3,
+51,255,255,81,3,3,
+55,189,3,
 17,49,5,
-46,21,2,3,
-29,240,3,
-17,221,7,2,238,3,239,3,
-46,21,2,
-52,241,3,
+51,255,255,81,3,3,
+28,190,3,
+17,221,7,2,188,3,189,3,
+51,255,255,81,3,
+55,191,3,
 17,45,5,
-46,21,2,3,
-52,242,3,
+51,255,255,81,3,3,
+55,192,3,
 17,49,5,
-46,21,2,3,
-29,243,3,
-17,238,7,2,241,3,242,3,
-46,21,2,
-52,244,3,
+51,255,255,81,3,3,
+28,193,3,
+17,238,7,2,191,3,192,3,
+51,255,255,81,3,
+55,194,3,
 17,45,5,
-46,21,2,3,
-52,245,3,
+51,255,255,81,3,3,
+55,195,3,
 17,49,5,
-46,21,2,3,
-29,246,3,
-17,250,7,2,244,3,245,3,
-46,21,2,
-52,247,3,
+51,255,255,81,3,3,
+28,196,3,
+17,250,7,2,194,3,195,3,
+51,255,255,81,3,
+55,197,3,
 17,6,7,
-46,21,2,3,
-29,248,3,
-17,11,8,1,247,3,
-46,21,2,
-52,249,3,
+51,255,255,81,3,3,
+28,198,3,
+17,11,8,1,197,3,
+51,255,255,81,3,
+55,199,3,
 17,6,7,
-46,141,1,3,
-51,250,3,2,
-46,248,3,
-29,251,3,
-17,11,8,1,249,3,
-46,141,1,
-46,251,3,
-52,252,3,
+51,255,255,221,1,3,
+54,200,3,2,
+51,198,3,
+28,201,3,
+17,11,8,1,199,3,
+51,255,255,221,1,
+51,201,3,
+55,202,3,
 17,254,1,
-46,177,1,3,
-29,253,3,
-17,20,8,1,252,3,
-46,136,1,
-52,254,3,
+51,255,255,116,2,3,
+28,203,3,
+17,20,8,1,202,3,
+51,255,255,186,1,
+55,204,3,
 17,35,1,
-46,136,1,3,
-52,255,3,
+51,255,255,186,1,3,
+55,205,3,
 17,164,1,
-46,136,1,3,
-51,0,4,3,
-46,179,1,
-46,184,1,
-29,1,4,
-17,123,2,2,254,3,255,3,
-46,167,0,
-46,1,4,
-52,2,4,
+51,255,255,186,1,3,
+28,206,3,
+17,25,8,2,204,3,205,3,
+51,255,255,213,0,
+55,207,3,
 17,35,1,
-46,11,2,3,
-52,3,4,
+51,255,255,59,3,3,
+55,208,3,
 17,164,1,
-46,11,2,3,
-51,4,4,4,
-46,179,1,
-46,184,1,
-46,1,4,
-29,5,4,
-17,123,2,2,2,4,3,4,
-46,175,0,
-46,5,4,132,0,
+51,255,255,59,3,3,
+54,209,3,2,
+51,206,3,
+28,210,3,
+17,25,8,2,207,3,208,3,
+51,255,255,223,0,
+51,210,3,133,0,
 171,3,
 177,3,
 123,3,
@@ -3602,7 +3597,8 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {173,8,
 10,1,
 55,0,
 77,0,
-209,3,
+169,1,
+208,3,
 36,3,
 39,3,
 49,0,
@@ -3682,1647 +3678,1647 @@ static uint8_t SKSL_INCLUDE_sksl_gpu[] = {173,8,
 138,1,
 199,3,
 20,
-28,129,3,
+29,79,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 13,
-46,21,2,1,
+51,255,255,81,3,1,
 25,
-46,175,0,0,0,0,0,1,
-28,132,3,
+51,255,255,223,0,0,0,0,0,1,
+29,82,3,
 2,
-48,0,0,0,0,1,
-40,
-55,130,3,0,1,
-28,135,3,
+52,1,0,0,0,0,1,
+44,
+57,80,3,0,1,
+29,85,3,
 2,
-48,0,0,0,0,1,
-40,
-55,134,3,0,1,
-28,138,3,
+52,1,0,0,0,0,1,
+44,
+57,84,3,0,1,
+29,88,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,136,3,0,49,
+57,86,3,0,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,136,3,0,1,3,51,
-55,137,3,0,1,
-28,141,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,86,3,0,1,3,51,
+57,87,3,0,1,
+29,91,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,140,3,0,1,3,51,
-55,139,3,0,49,
-55,140,3,0,1,
-28,144,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,90,3,0,1,3,51,
+57,89,3,0,49,
+57,90,3,0,1,
+29,94,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,142,3,0,51,
-45,
-55,143,3,0,1,3,1,
-28,147,3,
+57,92,3,0,51,
+50,
+57,93,3,0,1,3,1,
+29,97,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,146,3,0,51,
-45,
-55,145,3,0,1,3,1,
-28,150,3,
+57,96,3,0,51,
+50,
+57,95,3,0,1,3,1,
+29,100,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,149,3,0,1,3,51,
-55,148,3,0,1,
-28,153,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,99,3,0,1,3,51,
+57,98,3,0,1,
+29,103,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,151,3,0,1,3,51,
-55,152,3,0,1,
-28,156,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,101,3,0,1,3,51,
+57,102,3,0,1,
+29,106,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
-45,
-55,155,3,0,1,3,51,
-55,154,3,0,49,
+50,
+57,105,3,0,1,3,51,
+57,104,3,0,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,154,3,0,1,3,51,
-55,155,3,0,1,
-28,159,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,104,3,0,1,3,51,
+57,105,3,0,1,
+29,109,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,158,3,0,1,3,51,
-55,157,3,0,49,
-1,
-45,
-55,157,3,0,1,3,51,
-55,158,3,0,1,
-28,162,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,108,3,0,1,3,51,
+57,107,3,0,49,
+1,
+50,
+57,107,3,0,1,3,51,
+57,108,3,0,1,
+29,112,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,161,3,0,1,3,51,
-55,160,3,0,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,111,3,0,1,3,51,
+57,110,3,0,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,160,3,0,1,3,51,
-55,161,3,0,1,
-28,165,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,110,3,0,1,3,51,
+57,111,3,0,1,
+29,115,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 27,
-46,21,2,203,0,2,
+51,255,255,81,3,198,0,2,
 1,
-55,163,3,0,49,
-55,164,3,0,
+57,113,3,0,49,
+57,114,3,0,
 25,
-46,175,0,0,0,128,63,1,
-28,168,3,
+51,255,255,223,0,0,0,128,63,1,
+29,118,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,166,3,0,51,
-55,167,3,0,1,
-28,171,3,
+57,116,3,0,51,
+57,117,3,0,1,
+29,121,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,169,3,0,49,
+57,119,3,0,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-55,169,3,0,51,
-55,170,3,0,1,
-28,174,3,
+51,255,255,223,0,0,0,128,63,50,
+57,119,3,0,51,
+57,120,3,0,1,
+29,124,3,
 2,
-48,0,0,0,0,1,
-40,
-50,
+52,1,0,0,0,0,1,
+44,
+53,
 1,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,173,3,0,1,0,72,
-45,
-55,173,3,0,1,1,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,123,3,0,1,0,72,
+50,
+57,123,3,0,1,1,
 1,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,172,3,0,1,0,51,
-45,
-55,173,3,0,1,0,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,122,3,0,1,0,51,
+50,
+57,123,3,0,1,0,
 1,
 1,
-45,
-55,172,3,0,1,1,51,
-45,
-55,173,3,0,1,1,50,
+50,
+57,122,3,0,1,1,51,
+50,
+57,123,3,0,1,1,50,
 1,
 1,
 25,
-46,175,0,0,0,0,64,51,
-1,
-45,
-55,173,3,0,1,1,50,
-45,
-55,173,3,0,1,0,51,
-1,
-45,
-55,172,3,0,1,1,50,
-45,
-55,172,3,0,1,0,1,
-28,177,3,
+51,255,255,223,0,0,0,0,64,51,
+1,
+50,
+57,123,3,0,1,1,50,
+50,
+57,123,3,0,1,0,51,
+1,
+50,
+57,122,3,0,1,1,50,
+50,
+57,122,3,0,1,0,1,
+29,127,3,
 2,
-48,1,0,
-52,6,4,
-17,25,8,
-46,21,2,2,1,0,
+52,1,1,0,
+55,211,3,
+17,41,8,
+51,255,255,81,3,2,1,0,
 0,0,3,
-53,6,4,
-46,21,2,0,
+56,211,3,
+51,255,255,81,3,0,
 8,
-46,21,2,4,
+51,255,255,81,3,4,
 27,
-46,175,0,174,3,2,
-45,
-55,175,3,0,2,0,3,
-45,
-55,176,3,0,2,0,3,
+51,255,255,223,0,124,3,2,
+50,
+57,125,3,0,2,0,3,
+50,
+57,126,3,0,2,0,3,
 27,
-46,175,0,174,3,2,
-45,
-55,175,3,0,2,1,3,
-45,
-55,176,3,0,2,1,3,
+51,255,255,223,0,124,3,2,
+50,
+57,125,3,0,2,1,3,
+50,
+57,126,3,0,2,1,3,
 27,
-46,175,0,174,3,2,
-45,
-55,175,3,0,2,2,3,
-45,
-55,176,3,0,2,2,3,
+51,255,255,223,0,124,3,2,
+50,
+57,125,3,0,2,2,3,
+50,
+57,126,3,0,2,2,3,
 1,
-45,
-55,175,3,0,1,3,49,
+50,
+57,125,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,175,3,0,1,3,51,
-45,
-55,176,3,0,1,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,125,3,0,1,3,51,
+50,
+57,126,3,0,1,3,
 22,
 1,
-45,
-55,6,4,2,3,0,1,2,73,
+50,
+57,211,3,2,3,0,1,2,73,
 1,
 1,
-45,
-55,176,3,0,3,0,1,2,51,
+50,
+57,126,3,0,3,0,1,2,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,175,3,0,1,3,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,125,3,0,1,3,49,
 1,
-45,
-55,175,3,0,3,0,1,2,51,
+50,
+57,125,3,0,3,0,1,2,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,176,3,0,1,3,
-40,
-55,6,4,0,1,
-28,180,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,126,3,0,1,3,
+44,
+57,211,3,0,1,
+29,130,3,
 2,
-48,1,0,
-52,7,4,
-17,25,8,
-46,21,2,2,1,0,
+52,1,1,0,
+55,212,3,
+17,41,8,
+51,255,255,81,3,2,1,0,
 0,0,3,
-53,7,4,
-46,21,2,0,
+56,212,3,
+51,255,255,81,3,0,
 27,
-46,21,2,138,3,2,
-55,178,3,0,
-55,179,3,0,
+51,255,255,81,3,88,3,2,
+57,128,3,0,
+57,129,3,0,
 22,
 1,
-45,
-55,7,4,1,3,0,1,2,66,
+50,
+57,212,3,1,3,0,1,2,66,
 27,
-46,181,1,199,0,2,
-45,
-55,7,4,0,3,0,1,2,
+51,255,255,129,2,194,0,2,
+50,
+57,212,3,0,3,0,1,2,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,179,3,0,1,3,51,
-45,
-55,178,3,0,3,0,1,2,49,
-45,
-55,179,3,0,3,0,1,2,
-40,
-55,7,4,0,1,
-28,183,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,129,3,0,1,3,51,
+50,
+57,128,3,0,3,0,1,2,49,
+50,
+57,129,3,0,3,0,1,2,
+44,
+57,212,3,0,1,
+29,133,3,
 2,
-48,1,0,
-52,8,4,
-17,25,8,
-46,21,2,2,1,0,
+52,1,1,0,
+55,213,3,
+17,41,8,
+51,255,255,81,3,2,1,0,
 0,0,3,
-53,8,4,
-46,21,2,0,
+56,213,3,
+51,255,255,81,3,0,
 27,
-46,21,2,138,3,2,
-55,181,3,0,
-55,182,3,0,
+51,255,255,81,3,88,3,2,
+57,131,3,0,
+57,132,3,0,
 22,
 1,
-45,
-55,8,4,1,3,0,1,2,66,
+50,
+57,213,3,1,3,0,1,2,66,
 27,
-46,181,1,223,0,2,
-45,
-55,8,4,0,3,0,1,2,
+51,255,255,129,2,217,0,2,
+50,
+57,213,3,0,3,0,1,2,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,182,3,0,1,3,51,
-45,
-55,181,3,0,3,0,1,2,49,
-45,
-55,182,3,0,3,0,1,2,
-40,
-55,8,4,0,1,
-28,186,3,
-2,
-48,0,0,0,0,1,
-40,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,132,3,0,1,3,51,
 50,
-41,32,8,
+57,131,3,0,3,0,1,2,49,
+50,
+57,132,3,0,3,0,1,2,
+44,
+57,213,3,0,1,
+29,136,3,
+2,
+52,1,0,0,0,0,1,
+44,
+53,
+45,48,8,
 1,
-55,184,3,0,52,
+57,134,3,0,52,
 1,
-55,185,3,0,49,
+57,135,3,0,49,
 25,
-46,175,0,119,204,43,50,
+51,255,255,223,0,119,204,43,50,
 1,
-55,184,3,0,52,
-55,185,3,0,1,
-28,190,3,
+57,134,3,0,52,
+57,135,3,0,1,
+29,140,3,
 2,
-48,0,0,0,0,1,
-40,
-50,
-41,32,8,
+52,1,0,0,0,0,1,
+44,
+53,
+45,48,8,
 1,
-55,187,3,0,52,
+57,137,3,0,52,
 1,
-55,188,3,0,49,
+57,138,3,0,49,
 25,
-46,175,0,119,204,43,50,
+51,255,255,223,0,119,204,43,50,
 1,
-55,187,3,0,52,
-55,188,3,0,1,
-28,193,3,
+57,137,3,0,52,
+57,138,3,0,1,
+29,143,3,
 2,
-48,0,0,0,0,1,
-30,0,
+52,1,0,0,0,0,1,
+32,0,
 1,
-45,
-55,192,3,0,1,0,67,
+50,
+57,142,3,0,1,0,67,
 25,
-46,175,0,0,0,0,0,
+51,255,255,223,0,0,0,0,0,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-45,
-55,191,3,0,1,0,51,
+50,
+57,141,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,192,3,0,1,1,1,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,142,3,0,1,1,1,
 2,
-48,1,0,
-52,9,4,
-17,76,8,
-46,175,0,2,1,0,
+52,1,1,0,
+55,214,3,
+17,92,8,
+51,255,255,223,0,2,1,0,
 0,0,2,
-53,9,4,
-46,175,0,0,
+56,214,3,
+51,255,255,223,0,0,
 1,
-45,
-55,191,3,0,1,1,50,
-45,
-55,191,3,0,1,0,
-30,0,
+50,
+57,141,3,0,1,1,50,
+50,
+57,141,3,0,1,0,
+32,0,
 1,
-55,9,4,0,67,
+57,214,3,0,67,
 25,
-46,175,0,0,0,0,0,
+51,255,255,223,0,0,0,0,0,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
-45,
-55,191,3,0,1,1,51,
-45,
-55,192,3,0,1,1,49,
+50,
+57,141,3,0,1,1,51,
+50,
+57,142,3,0,1,1,49,
 1,
-45,
-55,191,3,0,1,0,51,
+50,
+57,141,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,192,3,0,1,1,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,142,3,0,1,1,49,
 1,
-45,
-55,192,3,0,1,0,51,
+50,
+57,142,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,191,3,0,1,1,1,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,141,3,0,1,1,1,
 2,
-48,0,0,0,0,2,
+52,1,0,0,0,0,2,
 22,
 1,
-55,9,4,1,66,
+57,214,3,1,66,
 27,
-46,175,0,199,0,2,
-45,
-55,192,3,0,1,1,
+51,255,255,223,0,194,0,2,
+50,
+57,142,3,0,1,1,
 27,
-46,175,0,186,3,2,
+51,255,255,223,0,136,3,2,
 1,
-45,
-55,192,3,0,1,0,51,
-45,
-55,191,3,0,1,1,
-55,9,4,0,
-40,
+50,
+57,142,3,0,1,0,51,
+50,
+57,141,3,0,1,1,
+57,214,3,0,
+44,
 1,
 1,
 1,
-55,9,4,0,51,
-45,
-55,191,3,0,1,1,49,
+57,214,3,0,51,
+50,
+57,141,3,0,1,1,49,
 1,
-45,
-55,191,3,0,1,0,51,
+50,
+57,141,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,192,3,0,1,1,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,142,3,0,1,1,49,
 1,
-45,
-55,192,3,0,1,0,51,
+50,
+57,142,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,191,3,0,1,1,1,1,1,
-28,196,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,141,3,0,1,1,1,1,1,
+29,146,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,4,
+51,255,255,81,3,4,
 27,
-46,175,0,193,3,2,
-45,
-55,194,3,0,2,0,3,
-45,
-55,195,3,0,2,0,3,
+51,255,255,223,0,143,3,2,
+50,
+57,144,3,0,2,0,3,
+50,
+57,145,3,0,2,0,3,
 27,
-46,175,0,193,3,2,
-45,
-55,194,3,0,2,1,3,
-45,
-55,195,3,0,2,1,3,
+51,255,255,223,0,143,3,2,
+50,
+57,144,3,0,2,1,3,
+50,
+57,145,3,0,2,1,3,
 27,
-46,175,0,193,3,2,
-45,
-55,194,3,0,2,2,3,
-45,
-55,195,3,0,2,2,3,
+51,255,255,223,0,143,3,2,
+50,
+57,144,3,0,2,2,3,
+50,
+57,145,3,0,2,2,3,
 1,
-45,
-55,194,3,0,1,3,49,
+50,
+57,144,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,194,3,0,1,3,51,
-45,
-55,195,3,0,1,3,1,
-28,199,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,144,3,0,1,3,51,
+50,
+57,145,3,0,1,3,1,
+29,149,3,
 2,
-48,0,0,0,0,1,
-30,0,
+52,1,0,0,0,0,1,
+32,0,
 1,
-45,
-55,198,3,0,1,1,67,
-45,
-55,198,3,0,1,0,
+50,
+57,148,3,0,1,1,67,
+50,
+57,148,3,0,1,0,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
-45,
-55,197,3,0,1,1,51,
-45,
-55,198,3,0,1,1,49,
+50,
+57,147,3,0,1,1,51,
+50,
+57,148,3,0,1,1,49,
 1,
-45,
-55,197,3,0,1,0,51,
+50,
+57,147,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,198,3,0,1,1,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,148,3,0,1,1,49,
 1,
-45,
-55,198,3,0,1,0,51,
+50,
+57,148,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,197,3,0,1,1,1,
-30,0,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,147,3,0,1,1,1,
+32,0,
 1,
-45,
-55,197,3,0,1,0,67,
+50,
+57,147,3,0,1,0,67,
 25,
-46,175,0,0,0,0,0,
+51,255,255,223,0,0,0,0,0,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-45,
-55,198,3,0,1,0,51,
+50,
+57,148,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,197,3,0,1,1,1,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,147,3,0,1,1,1,
 2,
-48,1,0,
-52,10,4,
-17,76,8,
-46,175,0,2,1,0,
+52,1,1,0,
+55,215,3,
+17,92,8,
+51,255,255,223,0,2,1,0,
 0,0,2,
-53,10,4,
-46,175,0,0,
+56,215,3,
+51,255,255,223,0,0,
 27,
-46,175,0,223,0,2,
+51,255,255,223,0,217,0,2,
 25,
-46,175,0,0,0,0,0,
+51,255,255,223,0,0,0,0,0,
 1,
-45,
-55,198,3,0,1,1,50,
+50,
+57,148,3,0,1,1,50,
 27,
-46,175,0,186,3,2,
+51,255,255,223,0,136,3,2,
 1,
 1,
-45,
-55,198,3,0,1,1,50,
-45,
-55,198,3,0,1,0,51,
-45,
-55,197,3,0,1,1,
-45,
-55,197,3,0,1,0,
-40,
+50,
+57,148,3,0,1,1,50,
+50,
+57,148,3,0,1,0,51,
+50,
+57,147,3,0,1,1,
+50,
+57,147,3,0,1,0,
+44,
 1,
 1,
 1,
-55,10,4,0,51,
-45,
-55,197,3,0,1,1,49,
+57,215,3,0,51,
+50,
+57,147,3,0,1,1,49,
 1,
-45,
-55,197,3,0,1,0,51,
+50,
+57,147,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,198,3,0,1,1,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,148,3,0,1,1,49,
 1,
-45,
-55,198,3,0,1,0,51,
+50,
+57,148,3,0,1,0,51,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,197,3,0,1,1,1,1,
-28,202,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,147,3,0,1,1,1,1,
+29,152,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,4,
+51,255,255,81,3,4,
 27,
-46,175,0,199,3,2,
-45,
-55,200,3,0,2,0,3,
-45,
-55,201,3,0,2,0,3,
+51,255,255,223,0,149,3,2,
+50,
+57,150,3,0,2,0,3,
+50,
+57,151,3,0,2,0,3,
 27,
-46,175,0,199,3,2,
-45,
-55,200,3,0,2,1,3,
-45,
-55,201,3,0,2,1,3,
+51,255,255,223,0,149,3,2,
+50,
+57,150,3,0,2,1,3,
+50,
+57,151,3,0,2,1,3,
 27,
-46,175,0,199,3,2,
-45,
-55,200,3,0,2,2,3,
-45,
-55,201,3,0,2,2,3,
+51,255,255,223,0,149,3,2,
+50,
+57,150,3,0,2,2,3,
+50,
+57,151,3,0,2,2,3,
 1,
-45,
-55,200,3,0,1,3,49,
+50,
+57,150,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,200,3,0,1,3,51,
-45,
-55,201,3,0,1,3,1,
-28,205,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,150,3,0,1,3,51,
+50,
+57,151,3,0,1,3,1,
+29,155,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 27,
-46,21,2,177,3,2,
-55,204,3,0,
-55,203,3,0,1,
-28,208,3,
+51,255,255,81,3,127,3,2,
+57,154,3,0,
+57,153,3,0,1,
+29,158,3,
 2,
-48,0,0,0,0,1,
-30,0,
+52,1,0,0,0,0,1,
+32,0,
 1,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,72,
-45,
-55,206,3,0,1,1,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,72,
+50,
+57,156,3,0,1,1,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 27,
-46,175,0,186,3,2,
+51,255,255,223,0,136,3,2,
 1,
 1,
-45,
-55,207,3,0,1,0,51,
-45,
-55,207,3,0,1,0,51,
+50,
+57,157,3,0,1,0,51,
+50,
+57,157,3,0,1,0,51,
 1,
-45,
-55,206,3,0,1,1,50,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,
-45,
-55,207,3,0,1,1,49,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,
+50,
+57,157,3,0,1,1,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,207,3,0,1,1,51,
-45,
-55,206,3,0,1,0,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,157,3,0,1,1,51,
+50,
+57,156,3,0,1,0,49,
 1,
-45,
-55,207,3,0,1,0,51,
+50,
+57,157,3,0,1,0,51,
 1,
 1,
-39,50,
-45,
-55,206,3,0,1,1,49,
+42,50,
+50,
+57,156,3,0,1,1,49,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,49,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,49,
 25,
-46,175,0,0,0,128,63,1,
-30,0,
+51,255,255,223,0,0,0,128,63,1,
+32,0,
 1,
 1,
 25,
-46,175,0,0,0,128,64,51,
-45,
-55,207,3,0,1,0,72,
-45,
-55,207,3,0,1,1,
+51,255,255,223,0,0,0,128,64,51,
+50,
+57,157,3,0,1,0,72,
+50,
+57,157,3,0,1,1,
 2,
-48,4,0,
-52,11,4,
-17,82,8,
-46,175,0,2,
-52,12,4,
-17,87,8,
-46,175,0,2,
-52,13,4,
-17,92,8,
-46,175,0,2,
-52,14,4,
+52,1,4,0,
+55,216,3,
 17,98,8,
-46,175,0,2,4,0,
+51,255,255,223,0,2,
+55,217,3,
+17,103,8,
+51,255,255,223,0,2,
+55,218,3,
+17,108,8,
+51,255,255,223,0,2,
+55,219,3,
+17,114,8,
+51,255,255,223,0,2,4,0,
 1,0,
 0,0,
 3,0,
 2,0,5,
-53,11,4,
-46,175,0,0,
-1,
-45,
-55,207,3,0,1,0,51,
-45,
-55,207,3,0,1,0,
-53,12,4,
-46,175,0,0,
-1,
-55,11,4,0,51,
-45,
-55,207,3,0,1,0,
-53,13,4,
-46,175,0,0,
-1,
-45,
-55,207,3,0,1,1,51,
-45,
-55,207,3,0,1,1,
-53,14,4,
-46,175,0,0,
-1,
-55,13,4,0,51,
-45,
-55,207,3,0,1,1,
-40,
+56,216,3,
+51,255,255,223,0,0,
+1,
+50,
+57,157,3,0,1,0,51,
+50,
+57,157,3,0,1,0,
+56,217,3,
+51,255,255,223,0,0,
+1,
+57,216,3,0,51,
+50,
+57,157,3,0,1,0,
+56,218,3,
+51,255,255,223,0,0,
+1,
+50,
+57,157,3,0,1,1,51,
+50,
+57,157,3,0,1,1,
+56,219,3,
+51,255,255,223,0,0,
+1,
+57,218,3,0,51,
+50,
+57,157,3,0,1,1,
+44,
 27,
-46,175,0,186,3,2,
+51,255,255,223,0,136,3,2,
 1,
 1,
 1,
 1,
-55,13,4,0,51,
+57,218,3,0,51,
 1,
-45,
-55,206,3,0,1,0,50,
+50,
+57,156,3,0,1,0,50,
 1,
-45,
-55,207,3,0,1,0,51,
+50,
+57,157,3,0,1,0,51,
 1,
 1,
 1,
 25,
-46,175,0,0,0,64,64,51,
-45,
-55,206,3,0,1,1,50,
+51,255,255,223,0,0,0,64,64,51,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,192,64,51,
-45,
-55,206,3,0,1,0,50,
+51,255,255,223,0,0,0,192,64,51,
+50,
+57,156,3,0,1,0,50,
 25,
-46,175,0,0,0,128,63,49,
+51,255,255,223,0,0,0,128,63,49,
 1,
 1,
 1,
 25,
-46,175,0,0,0,64,65,51,
-45,
-55,207,3,0,1,1,51,
-55,11,4,0,51,
+51,255,255,223,0,0,0,64,65,51,
+50,
+57,157,3,0,1,1,51,
+57,216,3,0,51,
 1,
-45,
-55,206,3,0,1,1,50,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,50,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,50,
 1,
 1,
 25,
-46,175,0,0,0,128,65,51,
-55,12,4,0,51,
+51,255,255,223,0,0,0,128,65,51,
+57,217,3,0,51,
 1,
-45,
-55,206,3,0,1,1,50,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,50,
-1,
-55,14,4,0,51,
-45,
-55,206,3,0,1,0,
-55,13,4,0,1,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,50,
+1,
+57,219,3,0,51,
+50,
+57,156,3,0,1,0,
+57,218,3,0,1,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 1,
 1,
 1,
-45,
-55,207,3,0,1,0,51,
+50,
+57,157,3,0,1,0,51,
 1,
 1,
-45,
-55,206,3,0,1,1,50,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,49,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,156,3,0,1,0,49,
 25,
-46,175,0,0,0,128,63,49,
-45,
-55,206,3,0,1,0,50,
+51,255,255,223,0,0,0,128,63,49,
+50,
+57,156,3,0,1,0,50,
 1,
 27,
-46,175,0,112,0,1,
+51,255,255,223,0,110,0,1,
 1,
-45,
-55,207,3,0,1,1,51,
-45,
-55,207,3,0,1,0,51,
+50,
+57,157,3,0,1,1,51,
+50,
+57,157,3,0,1,0,51,
 1,
-45,
-55,206,3,0,1,1,50,
+50,
+57,156,3,0,1,1,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,206,3,0,1,0,50,
-1,
-45,
-55,207,3,0,1,1,51,
-45,
-55,206,3,0,1,0,1,1,
-28,211,3,
-2,
-48,0,0,0,0,1,
-40,
+51,255,255,223,0,0,0,0,64,51,
 50,
+57,156,3,0,1,0,50,
 1,
-45,
-55,210,3,0,1,3,67,
+50,
+57,157,3,0,1,1,51,
+50,
+57,156,3,0,1,0,1,1,
+29,161,3,
+2,
+52,1,0,0,0,0,1,
+44,
+53,
+1,
+50,
+57,160,3,0,1,3,67,
 25,
-46,175,0,0,0,0,0,
-55,209,3,0,
+51,255,255,223,0,0,0,0,0,
+57,159,3,0,
 8,
-46,21,2,4,
+51,255,255,81,3,4,
 27,
-46,175,0,208,3,2,
-45,
-55,209,3,0,2,0,3,
-45,
-55,210,3,0,2,0,3,
+51,255,255,223,0,158,3,2,
+50,
+57,159,3,0,2,0,3,
+50,
+57,160,3,0,2,0,3,
 27,
-46,175,0,208,3,2,
-45,
-55,209,3,0,2,1,3,
-45,
-55,210,3,0,2,1,3,
+51,255,255,223,0,158,3,2,
+50,
+57,159,3,0,2,1,3,
+50,
+57,160,3,0,2,1,3,
 27,
-46,175,0,208,3,2,
-45,
-55,209,3,0,2,2,3,
-45,
-55,210,3,0,2,2,3,
+51,255,255,223,0,158,3,2,
+50,
+57,159,3,0,2,2,3,
+50,
+57,160,3,0,2,2,3,
 1,
-45,
-55,209,3,0,1,3,49,
+50,
+57,159,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,209,3,0,1,3,51,
-45,
-55,210,3,0,1,3,1,
-28,214,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,159,3,0,1,3,51,
+50,
+57,160,3,0,1,3,1,
+29,164,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
-45,
-55,212,3,0,3,0,1,2,49,
-45,
-55,213,3,0,3,0,1,2,50,
+50,
+57,162,3,0,3,0,1,2,49,
+50,
+57,163,3,0,3,0,1,2,50,
 1,
 25,
-46,175,0,0,0,0,64,51,
+51,255,255,223,0,0,0,0,64,51,
 27,
-46,181,1,199,0,2,
+51,255,255,129,2,194,0,2,
 1,
-45,
-55,212,3,0,3,0,1,2,51,
-45,
-55,213,3,0,1,3,
+50,
+57,162,3,0,3,0,1,2,51,
+50,
+57,163,3,0,1,3,
 1,
-45,
-55,213,3,0,3,0,1,2,51,
-45,
-55,212,3,0,1,3,
+50,
+57,163,3,0,3,0,1,2,51,
+50,
+57,162,3,0,1,3,
 1,
-45,
-55,212,3,0,1,3,49,
+50,
+57,162,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,212,3,0,1,3,51,
-45,
-55,213,3,0,1,3,1,
-28,217,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,162,3,0,1,3,51,
+50,
+57,163,3,0,1,3,1,
+29,167,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
-45,
-55,216,3,0,3,0,1,2,49,
-45,
-55,215,3,0,3,0,1,2,50,
+50,
+57,166,3,0,3,0,1,2,49,
+50,
+57,165,3,0,3,0,1,2,50,
 1,
 1,
 25,
-46,175,0,0,0,0,64,51,
-45,
-55,216,3,0,3,0,1,2,51,
-45,
-55,215,3,0,3,0,1,2,
+51,255,255,223,0,0,0,0,64,51,
+50,
+57,166,3,0,3,0,1,2,51,
+50,
+57,165,3,0,3,0,1,2,
 1,
-45,
-55,215,3,0,1,3,49,
+50,
+57,165,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,215,3,0,1,3,51,
-45,
-55,216,3,0,1,3,1,
-28,220,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,165,3,0,1,3,51,
+50,
+57,166,3,0,1,3,1,
+29,170,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,218,3,0,1,3,51,
-45,
-55,219,3,0,3,0,1,2,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,168,3,0,1,3,51,
+50,
+57,169,3,0,3,0,1,2,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,219,3,0,1,3,51,
-45,
-55,218,3,0,3,0,1,2,49,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,169,3,0,1,3,51,
+50,
+57,168,3,0,3,0,1,2,49,
 1,
-45,
-55,218,3,0,3,0,1,2,51,
-45,
-55,219,3,0,3,0,1,2,
+50,
+57,168,3,0,3,0,1,2,51,
+50,
+57,169,3,0,3,0,1,2,
 1,
-45,
-55,218,3,0,1,3,49,
+50,
+57,168,3,0,1,3,49,
 1,
 1,
 25,
-46,175,0,0,0,128,63,50,
-45,
-55,218,3,0,1,3,51,
-45,
-55,219,3,0,1,3,1,
-28,222,3,
+51,255,255,223,0,0,0,128,63,50,
+50,
+57,168,3,0,1,3,51,
+50,
+57,169,3,0,1,3,1,
+29,172,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 27,
-46,175,0,175,1,2,
+51,255,255,223,0,164,1,2,
 8,
-46,181,1,3,
+51,255,255,129,2,3,
 25,
-46,175,0,154,153,153,62,
+51,255,255,223,0,154,153,153,62,
 25,
-46,175,0,61,10,23,63,
+51,255,255,223,0,61,10,23,63,
 25,
-46,175,0,174,71,225,61,
-55,221,3,0,1,
-28,226,3,
+51,255,255,223,0,174,71,225,61,
+57,171,3,0,1,
+29,176,3,
 2,
-48,4,0,
-52,15,4,
-17,104,8,
-46,175,0,2,
-52,16,4,
-17,25,8,
-46,181,1,2,
-52,17,4,
-17,108,8,
-46,175,0,2,
-52,18,4,
-17,116,8,
-46,175,0,2,4,0,
+52,1,4,0,
+55,220,3,
+17,120,8,
+51,255,255,223,0,2,
+55,221,3,
+17,41,8,
+51,255,255,129,2,2,
+55,222,3,
+17,124,8,
+51,255,255,223,0,2,
+55,223,3,
+17,132,8,
+51,255,255,223,0,2,4,0,
 0,0,
 3,0,
 2,0,
 1,0,6,
-53,15,4,
-46,175,0,0,
+56,220,3,
+51,255,255,223,0,0,
 27,
-46,175,0,222,3,1,
-55,225,3,0,
-53,16,4,
-46,181,1,0,
+51,255,255,223,0,172,3,1,
+57,175,3,0,
+56,221,3,
+51,255,255,129,2,0,
 1,
 1,
-55,15,4,0,50,
+57,220,3,0,50,
 27,
-46,175,0,222,3,1,
-55,223,3,0,49,
-55,223,3,0,
-53,17,4,
-46,175,0,0,
+51,255,255,223,0,172,3,1,
+57,173,3,0,49,
+57,173,3,0,
+56,222,3,
+51,255,255,223,0,0,
 27,
-46,175,0,199,0,2,
+51,255,255,223,0,194,0,2,
 27,
-46,175,0,199,0,2,
-45,
-55,16,4,0,1,0,
-45,
-55,16,4,0,1,1,
-45,
-55,16,4,0,1,2,
-53,18,4,
-46,175,0,0,
+51,255,255,223,0,194,0,2,
+50,
+57,221,3,0,1,0,
+50,
+57,221,3,0,1,1,
+50,
+57,221,3,0,1,2,
+56,223,3,
+51,255,255,223,0,0,
 27,
-46,175,0,223,0,2,
+51,255,255,223,0,217,0,2,
 27,
-46,175,0,223,0,2,
-45,
-55,16,4,0,1,0,
-45,
-55,16,4,0,1,1,
-45,
-55,16,4,0,1,2,
-30,0,
+51,255,255,223,0,217,0,2,
+50,
+57,221,3,0,1,0,
+50,
+57,221,3,0,1,1,
+50,
+57,221,3,0,1,2,
+32,0,
 1,
 1,
-55,17,4,0,70,
+57,222,3,0,70,
 25,
-46,175,0,0,0,0,0,62,
+51,255,255,223,0,0,0,0,0,62,
 1,
-55,15,4,0,68,
-55,17,4,0,
+57,220,3,0,68,
+57,222,3,0,
 2,
-48,0,0,0,0,1,
+52,1,0,0,0,0,1,
 22,
 1,
-55,16,4,1,66,
+57,221,3,1,66,
 1,
-55,15,4,0,49,
+57,220,3,0,49,
 1,
 1,
-55,16,4,0,50,
-55,15,4,0,51,
+57,221,3,0,50,
+57,220,3,0,51,
 27,
-46,175,0,186,3,2,
-55,15,4,0,
+51,255,255,223,0,136,3,2,
+57,220,3,0,
 1,
-55,15,4,0,50,
-55,17,4,0,1,
-56,
-30,0,
+57,220,3,0,50,
+57,222,3,0,1,
+58,
+32,0,
 1,
 1,
-55,18,4,0,69,
-55,224,3,0,62,
+57,223,3,0,69,
+57,174,3,0,62,
 1,
-55,18,4,0,68,
-55,15,4,0,
+57,223,3,0,68,
+57,220,3,0,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
-55,15,4,0,49,
+57,220,3,0,49,
 27,
-46,181,1,190,3,2,
+51,255,255,129,2,140,3,2,
 1,
 1,
-55,16,4,0,50,
-55,15,4,0,51,
+57,221,3,0,50,
+57,220,3,0,51,
 1,
-55,224,3,0,50,
-55,15,4,0,
+57,174,3,0,50,
+57,220,3,0,
 1,
-55,18,4,0,50,
-55,15,4,0,1,
+57,223,3,0,50,
+57,220,3,0,1,
 2,
-48,0,0,0,0,1,
-40,
-55,16,4,0,1,1,
-28,228,3,
+52,1,0,0,0,0,1,
+44,
+57,221,3,0,1,1,
+29,178,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 1,
 27,
-46,175,0,223,0,2,
+51,255,255,223,0,217,0,2,
 27,
-46,175,0,223,0,2,
-45,
-55,227,3,0,1,0,
-45,
-55,227,3,0,1,1,
-45,
-55,227,3,0,1,2,50,
+51,255,255,223,0,217,0,2,
+50,
+57,177,3,0,1,0,
+50,
+57,177,3,0,1,1,
+50,
+57,177,3,0,1,2,50,
 27,
-46,175,0,199,0,2,
+51,255,255,223,0,194,0,2,
 27,
-46,175,0,199,0,2,
-45,
-55,227,3,0,1,0,
-45,
-55,227,3,0,1,1,
-45,
-55,227,3,0,1,2,1,
-28,231,3,
+51,255,255,223,0,194,0,2,
+50,
+57,177,3,0,1,0,
+50,
+57,177,3,0,1,1,
+50,
+57,177,3,0,1,2,1,
+29,181,3,
 2,
-48,0,0,0,0,1,
-30,0,
+52,1,0,0,0,0,1,
+32,0,
 1,
-45,
-55,229,3,0,1,0,70,
-45,
-55,229,3,0,1,2,
+50,
+57,179,3,0,1,0,70,
+50,
+57,179,3,0,1,2,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,181,1,3,
+51,255,255,129,2,3,
 25,
-46,175,0,0,0,0,0,
+51,255,255,223,0,0,0,0,0,
 27,
-46,175,0,186,3,2,
+51,255,255,223,0,136,3,2,
 1,
-55,230,3,0,51,
+57,180,3,0,51,
 1,
-45,
-55,229,3,0,1,1,50,
-45,
-55,229,3,0,1,0,
+50,
+57,179,3,0,1,1,50,
+50,
+57,179,3,0,1,0,
 1,
-45,
-55,229,3,0,1,2,50,
-45,
-55,229,3,0,1,0,
-55,230,3,0,1,
+50,
+57,179,3,0,1,2,50,
+50,
+57,179,3,0,1,0,
+57,180,3,0,1,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 13,
-46,181,1,1,
+51,255,255,129,2,1,
 25,
-46,175,0,0,0,0,0,1,1,
-28,234,3,
+51,255,255,223,0,0,0,0,0,1,1,
+29,184,3,
 2,
-48,1,0,
-52,19,4,
+52,1,1,0,
+55,224,3,
 17,123,7,
-46,175,0,2,1,0,
+51,255,255,223,0,2,1,0,
 0,0,2,
-53,19,4,
-46,175,0,0,
+56,224,3,
+51,255,255,223,0,0,
 27,
-46,175,0,228,3,1,
-55,233,3,0,
-30,0,
-1,
-45,
-55,232,3,0,1,0,72,
-45,
-55,232,3,0,1,1,
+51,255,255,223,0,178,3,1,
+57,183,3,0,
+32,0,
+1,
+50,
+57,182,3,0,1,0,72,
+50,
+57,182,3,0,1,1,
 2,
-48,0,0,0,0,1,
-30,0,
+52,1,0,0,0,0,1,
+32,0,
 1,
-45,
-55,232,3,0,1,1,72,
-45,
-55,232,3,0,1,2,
+50,
+57,182,3,0,1,1,72,
+50,
+57,182,3,0,1,2,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 27,
-46,181,1,231,3,2,
-55,232,3,0,
-55,19,4,0,1,
-30,0,
-1,
-45,
-55,232,3,0,1,0,72,
-45,
-55,232,3,0,1,2,
+51,255,255,129,2,181,3,2,
+57,182,3,0,
+57,224,3,0,1,
+32,0,
+1,
+50,
+57,182,3,0,1,0,72,
+50,
+57,182,3,0,1,2,
 2,
-48,0,0,0,0,1,
-40,
-45,
+52,1,0,0,0,0,1,
+44,
+50,
 27,
-46,181,1,231,3,2,
-45,
-55,232,3,0,3,0,2,1,
-55,19,4,0,3,0,2,1,1,
+51,255,255,129,2,181,3,2,
+50,
+57,182,3,0,3,0,2,1,
+57,224,3,0,3,0,2,1,1,
 2,
-48,0,0,0,0,1,
-40,
-45,
+52,1,0,0,0,0,1,
+44,
+50,
 27,
-46,181,1,231,3,2,
-45,
-55,232,3,0,3,2,0,1,
-55,19,4,0,3,1,2,0,1,1,
-30,0,
-1,
-45,
-55,232,3,0,1,0,72,
-45,
-55,232,3,0,1,2,
+51,255,255,129,2,181,3,2,
+50,
+57,182,3,0,3,2,0,1,
+57,224,3,0,3,1,2,0,1,1,
+32,0,
+1,
+50,
+57,182,3,0,1,0,72,
+50,
+57,182,3,0,1,2,
 2,
-48,0,0,0,0,1,
-40,
-45,
+52,1,0,0,0,0,1,
+44,
+50,
 27,
-46,181,1,231,3,2,
-45,
-55,232,3,0,3,1,0,2,
-55,19,4,0,3,1,0,2,1,
-30,0,
-1,
-45,
-55,232,3,0,1,1,72,
-45,
-55,232,3,0,1,2,
+51,255,255,129,2,181,3,2,
+50,
+57,182,3,0,3,1,0,2,
+57,224,3,0,3,1,0,2,1,
+32,0,
+1,
+50,
+57,182,3,0,1,1,72,
+50,
+57,182,3,0,1,2,
 2,
-48,0,0,0,0,1,
-40,
-45,
+52,1,0,0,0,0,1,
+44,
+50,
 27,
-46,181,1,231,3,2,
-45,
-55,232,3,0,3,1,2,0,
-55,19,4,0,3,2,0,1,1,
+51,255,255,129,2,181,3,2,
+50,
+57,182,3,0,3,1,2,0,
+57,224,3,0,3,2,0,1,1,
 2,
-48,0,0,0,0,1,
-40,
-45,
+52,1,0,0,0,0,1,
+44,
+50,
 27,
-46,181,1,231,3,2,
-45,
-55,232,3,0,3,2,1,0,
-55,19,4,0,3,2,1,0,1,1,
-28,237,3,
+51,255,255,129,2,181,3,2,
+50,
+57,182,3,0,3,2,1,0,
+57,224,3,0,3,2,1,0,1,1,
+29,187,3,
 2,
-48,3,0,
-52,20,4,
+52,1,3,0,
+55,225,3,
 17,47,7,
-46,175,0,2,
-52,21,4,
-17,124,8,
-46,181,1,2,
-52,22,4,
-17,128,8,
-46,181,1,2,3,0,
+51,255,255,223,0,2,
+55,226,3,
+17,140,8,
+51,255,255,129,2,2,
+55,227,3,
+17,144,8,
+51,255,255,129,2,2,3,0,
 0,0,
 2,0,
 1,0,4,
-53,20,4,
-46,175,0,0,
-1,
-45,
-55,236,3,0,1,3,51,
-45,
-55,235,3,0,1,3,
-53,21,4,
-46,181,1,0,
-1,
-45,
-55,235,3,0,3,0,1,2,51,
-45,
-55,236,3,0,1,3,
-53,22,4,
-46,181,1,0,
-1,
-45,
-55,236,3,0,3,0,1,2,51,
-45,
-55,235,3,0,1,3,
-40,
+56,225,3,
+51,255,255,223,0,0,
+1,
+50,
+57,186,3,0,1,3,51,
+50,
+57,185,3,0,1,3,
+56,226,3,
+51,255,255,129,2,0,
+1,
+50,
+57,185,3,0,3,0,1,2,51,
+50,
+57,186,3,0,1,3,
+56,227,3,
+51,255,255,129,2,0,
+1,
+50,
+57,186,3,0,3,0,1,2,51,
+50,
+57,185,3,0,1,3,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
 1,
 1,
 27,
-46,181,1,226,3,3,
+51,255,255,129,2,176,3,3,
 27,
-46,181,1,234,3,2,
-55,21,4,0,
-55,22,4,0,
-55,20,4,0,
-55,22,4,0,49,
-45,
-55,236,3,0,3,0,1,2,50,
-55,22,4,0,49,
-45,
-55,235,3,0,3,0,1,2,50,
-55,21,4,0,
-1,
-1,
-45,
-55,235,3,0,1,3,49,
-45,
-55,236,3,0,1,3,50,
-55,20,4,0,1,
-28,240,3,
+51,255,255,129,2,184,3,2,
+57,226,3,0,
+57,227,3,0,
+57,225,3,0,
+57,227,3,0,49,
+50,
+57,186,3,0,3,0,1,2,50,
+57,227,3,0,49,
+50,
+57,185,3,0,3,0,1,2,50,
+57,226,3,0,
+1,
+1,
+50,
+57,185,3,0,1,3,49,
+50,
+57,186,3,0,1,3,50,
+57,225,3,0,1,
+29,190,3,
 2,
-48,3,0,
-52,23,4,
+52,1,3,0,
+55,228,3,
 17,47,7,
-46,175,0,2,
-52,24,4,
-17,124,8,
-46,181,1,2,
-52,25,4,
-17,128,8,
-46,181,1,2,3,0,
+51,255,255,223,0,2,
+55,229,3,
+17,140,8,
+51,255,255,129,2,2,
+55,230,3,
+17,144,8,
+51,255,255,129,2,2,3,0,
 0,0,
 2,0,
 1,0,4,
-53,23,4,
-46,175,0,0,
-1,
-45,
-55,239,3,0,1,3,51,
-45,
-55,238,3,0,1,3,
-53,24,4,
-46,181,1,0,
-1,
-45,
-55,238,3,0,3,0,1,2,51,
-45,
-55,239,3,0,1,3,
-53,25,4,
-46,181,1,0,
-1,
-45,
-55,239,3,0,3,0,1,2,51,
-45,
-55,238,3,0,1,3,
-40,
+56,228,3,
+51,255,255,223,0,0,
+1,
+50,
+57,189,3,0,1,3,51,
+50,
+57,188,3,0,1,3,
+56,229,3,
+51,255,255,129,2,0,
+1,
+50,
+57,188,3,0,3,0,1,2,51,
+50,
+57,189,3,0,1,3,
+56,230,3,
+51,255,255,129,2,0,
+1,
+50,
+57,189,3,0,3,0,1,2,51,
+50,
+57,188,3,0,1,3,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
 1,
 1,
 27,
-46,181,1,226,3,3,
+51,255,255,129,2,176,3,3,
 27,
-46,181,1,234,3,2,
-55,25,4,0,
-55,24,4,0,
-55,23,4,0,
-55,25,4,0,49,
-45,
-55,239,3,0,3,0,1,2,50,
-55,25,4,0,49,
-45,
-55,238,3,0,3,0,1,2,50,
-55,24,4,0,
-1,
-1,
-45,
-55,238,3,0,1,3,49,
-45,
-55,239,3,0,1,3,50,
-55,23,4,0,1,
-28,243,3,
+51,255,255,129,2,184,3,2,
+57,230,3,0,
+57,229,3,0,
+57,228,3,0,
+57,230,3,0,49,
+50,
+57,189,3,0,3,0,1,2,50,
+57,230,3,0,49,
+50,
+57,188,3,0,3,0,1,2,50,
+57,229,3,0,
+1,
+1,
+50,
+57,188,3,0,1,3,49,
+50,
+57,189,3,0,1,3,50,
+57,228,3,0,1,
+29,193,3,
 2,
-48,3,0,
-52,26,4,
+52,1,3,0,
+55,231,3,
 17,47,7,
-46,175,0,2,
-52,27,4,
-17,124,8,
-46,181,1,2,
-52,28,4,
-17,128,8,
-46,181,1,2,3,0,
+51,255,255,223,0,2,
+55,232,3,
+17,140,8,
+51,255,255,129,2,2,
+55,233,3,
+17,144,8,
+51,255,255,129,2,2,3,0,
 0,0,
 2,0,
 1,0,4,
-53,26,4,
-46,175,0,0,
-1,
-45,
-55,242,3,0,1,3,51,
-45,
-55,241,3,0,1,3,
-53,27,4,
-46,181,1,0,
-1,
-45,
-55,241,3,0,3,0,1,2,51,
-45,
-55,242,3,0,1,3,
-53,28,4,
-46,181,1,0,
-1,
-45,
-55,242,3,0,3,0,1,2,51,
-45,
-55,241,3,0,1,3,
-40,
+56,231,3,
+51,255,255,223,0,0,
+1,
+50,
+57,192,3,0,1,3,51,
+50,
+57,191,3,0,1,3,
+56,232,3,
+51,255,255,129,2,0,
+1,
+50,
+57,191,3,0,3,0,1,2,51,
+50,
+57,192,3,0,1,3,
+56,233,3,
+51,255,255,129,2,0,
+1,
+50,
+57,192,3,0,3,0,1,2,51,
+50,
+57,191,3,0,1,3,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
 1,
 1,
 27,
-46,181,1,226,3,3,
-55,27,4,0,
-55,26,4,0,
-55,28,4,0,49,
-45,
-55,242,3,0,3,0,1,2,50,
-55,28,4,0,49,
-45,
-55,241,3,0,3,0,1,2,50,
-55,27,4,0,
-1,
-1,
-45,
-55,241,3,0,1,3,49,
-45,
-55,242,3,0,1,3,50,
-55,26,4,0,1,
-28,246,3,
+51,255,255,129,2,176,3,3,
+57,232,3,0,
+57,231,3,0,
+57,233,3,0,49,
+50,
+57,192,3,0,3,0,1,2,50,
+57,233,3,0,49,
+50,
+57,191,3,0,3,0,1,2,50,
+57,232,3,0,
+1,
+1,
+50,
+57,191,3,0,1,3,49,
+50,
+57,192,3,0,1,3,50,
+57,231,3,0,1,
+29,196,3,
 2,
-48,3,0,
-52,29,4,
+52,1,3,0,
+55,234,3,
 17,47,7,
-46,175,0,2,
-52,30,4,
-17,124,8,
-46,181,1,2,
-52,31,4,
-17,128,8,
-46,181,1,2,3,0,
+51,255,255,223,0,2,
+55,235,3,
+17,140,8,
+51,255,255,129,2,2,
+55,236,3,
+17,144,8,
+51,255,255,129,2,2,3,0,
 0,0,
 2,0,
 1,0,4,
-53,29,4,
-46,175,0,0,
-1,
-45,
-55,245,3,0,1,3,51,
-45,
-55,244,3,0,1,3,
-53,30,4,
-46,181,1,0,
-1,
-45,
-55,244,3,0,3,0,1,2,51,
-45,
-55,245,3,0,1,3,
-53,31,4,
-46,181,1,0,
-1,
-45,
-55,245,3,0,3,0,1,2,51,
-45,
-55,244,3,0,1,3,
-40,
+56,234,3,
+51,255,255,223,0,0,
+1,
+50,
+57,195,3,0,1,3,51,
+50,
+57,194,3,0,1,3,
+56,235,3,
+51,255,255,129,2,0,
+1,
+50,
+57,194,3,0,3,0,1,2,51,
+50,
+57,195,3,0,1,3,
+56,236,3,
+51,255,255,129,2,0,
+1,
+50,
+57,195,3,0,3,0,1,2,51,
+50,
+57,194,3,0,1,3,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
 1,
 1,
 1,
 27,
-46,181,1,226,3,3,
-55,31,4,0,
-55,29,4,0,
-55,30,4,0,49,
-45,
-55,245,3,0,3,0,1,2,50,
-55,31,4,0,49,
-45,
-55,244,3,0,3,0,1,2,50,
-55,30,4,0,
-1,
-1,
-45,
-55,244,3,0,1,3,49,
-45,
-55,245,3,0,1,3,50,
-55,29,4,0,1,
-28,248,3,
+51,255,255,129,2,176,3,3,
+57,236,3,0,
+57,234,3,0,
+57,235,3,0,49,
+50,
+57,195,3,0,3,0,1,2,50,
+57,236,3,0,49,
+50,
+57,194,3,0,3,0,1,2,50,
+57,235,3,0,
+1,
+1,
+50,
+57,194,3,0,1,3,49,
+50,
+57,195,3,0,1,3,50,
+57,234,3,0,1,
+29,198,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,21,2,2,
+51,255,255,81,3,2,
 1,
-45,
-55,247,3,0,3,0,1,2,52,
+50,
+57,197,3,0,3,0,1,2,52,
 27,
-46,175,0,223,0,2,
-45,
-55,247,3,0,1,3,
+51,255,255,223,0,217,0,2,
+50,
+57,197,3,0,1,3,
 25,
-46,175,0,23,183,209,56,
-45,
-55,247,3,0,1,3,1,
-28,251,3,
+51,255,255,223,0,23,183,209,56,
+50,
+57,197,3,0,1,3,1,
+29,201,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,141,1,2,
+51,255,255,221,1,2,
 1,
-45,
-55,249,3,0,3,0,1,2,52,
+50,
+57,199,3,0,3,0,1,2,52,
 27,
-46,167,0,215,0,2,
-45,
-55,249,3,0,1,3,
+51,255,255,213,0,209,0,2,
+50,
+57,199,3,0,1,3,
 25,
-46,167,0,23,183,209,56,
-45,
-55,249,3,0,1,3,1,
-28,253,3,
-2,
-48,0,0,0,0,1,
-40,
-1,
-45,
-55,252,3,0,2,0,1,52,
-45,
-55,252,3,0,1,2,1,
-28,1,4,
+51,255,255,213,0,23,183,209,56,
+50,
+57,199,3,0,1,3,1,
+29,203,3,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
+1,
 50,
-41,132,8,
+57,202,3,0,2,0,1,52,
+50,
+57,202,3,0,1,2,1,
+29,206,3,
+2,
+52,1,0,0,0,0,1,
+44,
+53,
+45,148,8,
 27,
-46,167,0,83,2,1,
+51,255,255,213,0,50,2,1,
 8,
-49,32,4,158,8,2,
-55,254,3,0,
-55,255,3,0,
+51,255,255,174,8,2,
+57,204,3,0,
+57,205,3,0,
 1,
 1,
-45,
-55,254,3,0,1,0,51,
-45,
-55,255,3,0,1,1,50,
+50,
+57,204,3,0,1,0,51,
+50,
+57,205,3,0,1,1,50,
 1,
-45,
-55,254,3,0,1,1,51,
-45,
-55,255,3,0,1,0,1,
-28,5,4,
-2,
-48,0,0,0,0,1,
-40,
 50,
-41,132,8,
+57,204,3,0,1,1,51,
+50,
+57,205,3,0,1,0,1,
+29,210,3,
+2,
+52,1,0,0,0,0,1,
+44,
+53,
+45,148,8,
 27,
-46,175,0,86,2,1,
+51,255,255,223,0,53,2,1,
 8,
-49,33,4,167,8,2,
-55,2,4,0,
-55,3,4,0,
+51,255,255,183,8,2,
+57,207,3,0,
+57,208,3,0,
 1,
 1,
-45,
-55,2,4,0,1,0,51,
-45,
-55,3,4,0,1,1,50,
+50,
+57,207,3,0,1,0,51,
+50,
+57,208,3,0,1,1,50,
 1,
-45,
-55,2,4,0,1,1,51,
-45,
-55,3,4,0,1,0,1,
+50,
+57,207,3,0,1,1,51,
+50,
+57,208,3,0,1,0,1,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_gpu_LENGTH = sizeof(SKSL_INCLUDE_sksl_gpu);
diff --git a/third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl b/third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl
index 0a8b2c971113f..38e4f38fb5a20 100644
--- a/third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl
+++ b/third_party/skia/src/sksl/generated/sksl_public.dehydrated.sksl
@@ -1,4 +1,4 @@
-static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
+static uint8_t SKSL_INCLUDE_sksl_public[] = {8,0,227,3,
 7,100,101,103,114,101,101,115,
 8,36,103,101,110,84,121,112,101,
 7,114,97,100,105,97,110,115,
@@ -47,9 +47,9 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 5,101,100,103,101,48,
 5,101,100,103,101,49,
 10,115,109,111,111,116,104,115,116,101,112,
+9,36,103,101,110,73,84,121,112,101,
 5,118,97,108,117,101,
 14,102,108,111,97,116,66,105,116,115,84,111,73,110,116,
-9,36,103,101,110,73,84,121,112,101,
 15,102,108,111,97,116,66,105,116,115,84,111,85,105,110,116,
 9,36,103,101,110,85,84,121,112,101,
 14,105,110,116,66,105,116,115,84,111,70,108,111,97,116,
@@ -131,6 +131,8 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 6,102,119,105,100,116,104,
 5,99,111,108,111,114,
 8,117,110,112,114,101,109,117,108,
+12,116,111,76,105,110,101,97,114,83,114,103,98,
+14,102,114,111,109,76,105,110,101,97,114,83,114,103,98,
 6,99,111,111,114,100,115,
 1,115,
 6,115,104,97,100,101,114,
@@ -141,2304 +143,2339 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 3,100,115,116,
 1,98,
 7,98,108,101,110,100,101,114,
-48,129,2,
-52,1,0,
+52,1,139,2,
+55,1,0,
 17,2,0,
-49,2,0,10,0,3,
-29,3,0,
+51,255,255,10,0,3,
+28,2,0,
 17,19,0,1,1,0,
-46,2,0,
-52,4,0,
+51,255,255,10,0,
+55,3,0,
 17,2,0,
-49,5,0,27,0,3,
-51,6,0,2,
-46,3,0,
-29,7,0,
-17,19,0,1,4,0,
-46,5,0,
-46,7,0,
-52,8,0,
+51,255,255,27,0,3,
+54,4,0,2,
+51,2,0,
+28,5,0,
+17,19,0,1,3,0,
+51,255,255,27,0,
+51,5,0,
+55,6,0,
 17,19,0,
-46,2,0,3,
-29,9,0,
-17,2,0,1,8,0,
-46,2,0,
-52,10,0,
+51,255,255,10,0,3,
+28,7,0,
+17,2,0,1,6,0,
+51,255,255,10,0,
+55,8,0,
 17,19,0,
-46,5,0,3,
-51,11,0,2,
-46,9,0,
-29,12,0,
-17,2,0,1,10,0,
-46,5,0,
-46,12,0,
-52,13,0,
+51,255,255,27,0,3,
+54,9,0,2,
+51,7,0,
+28,10,0,
+17,2,0,1,8,0,
+51,255,255,27,0,
+51,10,0,
+55,11,0,
 17,37,0,
-46,2,0,3,
-29,14,0,
+51,255,255,10,0,3,
+28,12,0,
+17,43,0,1,11,0,
+51,255,255,10,0,
+55,13,0,
+17,37,0,
+51,255,255,27,0,3,
+54,14,0,2,
+51,12,0,
+28,15,0,
 17,43,0,1,13,0,
-46,2,0,
-52,15,0,
+51,255,255,27,0,
+51,15,0,
+55,16,0,
 17,37,0,
-46,5,0,3,
-51,16,0,2,
-46,14,0,
-29,17,0,
-17,43,0,1,15,0,
-46,5,0,
-46,17,0,
-52,18,0,
+51,255,255,10,0,3,
+28,17,0,
+17,47,0,1,16,0,
+51,255,255,10,0,
+55,18,0,
 17,37,0,
-46,2,0,3,
-29,19,0,
+51,255,255,27,0,3,
+54,19,0,2,
+51,17,0,
+28,20,0,
 17,47,0,1,18,0,
-46,2,0,
-52,20,0,
+51,255,255,27,0,
+51,20,0,
+55,21,0,
 17,37,0,
-46,5,0,3,
-51,21,0,2,
-46,19,0,
-29,22,0,
-17,47,0,1,20,0,
-46,5,0,
-46,22,0,
-52,23,0,
+51,255,255,10,0,3,
+28,22,0,
+17,51,0,1,21,0,
+51,255,255,10,0,
+55,23,0,
 17,37,0,
-46,2,0,3,
-29,24,0,
+51,255,255,27,0,3,
+54,24,0,2,
+51,22,0,
+28,25,0,
 17,51,0,1,23,0,
-46,2,0,
-52,25,0,
-17,37,0,
-46,5,0,3,
-51,26,0,2,
-46,24,0,
-29,27,0,
-17,51,0,1,25,0,
-46,5,0,
-46,27,0,
-52,28,0,
-17,55,0,
-46,2,0,3,
-29,29,0,
+51,255,255,27,0,
+51,25,0,
+55,26,0,
+17,55,0,
+51,255,255,10,0,3,
+28,27,0,
+17,57,0,1,26,0,
+51,255,255,10,0,
+55,28,0,
+17,55,0,
+51,255,255,27,0,3,
+54,29,0,2,
+51,27,0,
+28,30,0,
 17,57,0,1,28,0,
-46,2,0,
-52,30,0,
-17,55,0,
-46,5,0,3,
-51,31,0,2,
-46,29,0,
-29,32,0,
-17,57,0,1,30,0,
-46,5,0,
-46,32,0,
-52,33,0,
-17,55,0,
-46,2,0,3,
-29,34,0,
+51,255,255,27,0,
+51,30,0,
+55,31,0,
+17,55,0,
+51,255,255,10,0,3,
+28,32,0,
+17,62,0,1,31,0,
+51,255,255,10,0,
+55,33,0,
+17,55,0,
+51,255,255,27,0,3,
+54,34,0,2,
+51,32,0,
+28,35,0,
 17,62,0,1,33,0,
-46,2,0,
-52,35,0,
-17,55,0,
-46,5,0,3,
-51,36,0,2,
-46,34,0,
-29,37,0,
-17,62,0,1,35,0,
-46,5,0,
-46,37,0,
-52,38,0,
+51,255,255,27,0,
+51,35,0,
+55,36,0,
 17,67,0,
-46,2,0,3,
-52,39,0,
-17,55,0,
-46,2,0,3,
-29,40,0,
-17,69,0,2,38,0,39,0,
-46,2,0,
-52,41,0,
+51,255,255,10,0,3,
+55,37,0,
+17,55,0,
+51,255,255,10,0,3,
+28,38,0,
+17,69,0,2,36,0,37,0,
+51,255,255,10,0,
+55,39,0,
 17,67,0,
-46,5,0,3,
-52,42,0,
-17,55,0,
-46,5,0,3,
-51,43,0,2,
-46,40,0,
-29,44,0,
-17,69,0,2,41,0,42,0,
-46,5,0,
-46,44,0,
-52,45,0,
+51,255,255,27,0,3,
+55,40,0,
+17,55,0,
+51,255,255,27,0,3,
+54,41,0,2,
+51,38,0,
+28,42,0,
+17,69,0,2,39,0,40,0,
+51,255,255,27,0,
+51,42,0,
+55,43,0,
 17,74,0,
-46,2,0,3,
-51,46,0,3,
-46,40,0,
-46,44,0,
-29,47,0,
-17,69,0,1,45,0,
-46,2,0,
-46,47,0,
-52,48,0,
+51,255,255,10,0,3,
+54,44,0,3,
+51,38,0,
+51,42,0,
+28,45,0,
+17,69,0,1,43,0,
+51,255,255,10,0,
+51,45,0,
+55,46,0,
 17,74,0,
-46,5,0,3,
-51,49,0,4,
-46,40,0,
-46,44,0,
-46,47,0,
-29,50,0,
-17,69,0,1,48,0,
-46,5,0,
-46,50,0,
-52,51,0,
-17,55,0,
-46,2,0,3,
-29,52,0,
-37,
+51,255,255,27,0,3,
+54,47,0,4,
+51,38,0,
+51,42,0,
+51,45,0,
+28,48,0,
+17,69,0,1,46,0,
+51,255,255,27,0,
+51,48,0,
+55,49,0,
+17,55,0,
+51,255,255,10,0,3,
+28,50,0,
+39,
+16,0,2,0,0,83,0,1,49,0,
+51,255,255,10,0,
+55,51,0,
+17,55,0,
+51,255,255,27,0,3,
+54,52,0,2,
+51,50,0,
+28,53,0,
+39,
 16,0,2,0,0,83,0,1,51,0,
-46,2,0,
-52,53,0,
-17,55,0,
-46,5,0,3,
-51,54,0,2,
-46,52,0,
-29,55,0,
-37,
-16,0,2,0,0,83,0,1,53,0,
-46,5,0,
-46,55,0,
-52,56,0,
-17,55,0,
-46,2,0,3,
-29,57,0,
-37,
+51,255,255,27,0,
+51,53,0,
+55,54,0,
+17,55,0,
+51,255,255,10,0,3,
+28,55,0,
+39,
+16,0,2,0,0,88,0,1,54,0,
+51,255,255,10,0,
+55,56,0,
+17,55,0,
+51,255,255,27,0,3,
+54,57,0,2,
+51,55,0,
+28,58,0,
+39,
 16,0,2,0,0,88,0,1,56,0,
-46,2,0,
-52,58,0,
-17,55,0,
-46,5,0,3,
-51,59,0,2,
-46,57,0,
-29,60,0,
-37,
-16,0,2,0,0,88,0,1,58,0,
-46,5,0,
-46,60,0,
-52,61,0,
-17,55,0,
-46,2,0,3,
-29,62,0,
-37,
+51,255,255,27,0,
+51,58,0,
+55,59,0,
+17,55,0,
+51,255,255,10,0,3,
+28,60,0,
+39,
+16,0,2,0,0,93,0,1,59,0,
+51,255,255,10,0,
+55,61,0,
+17,55,0,
+51,255,255,27,0,3,
+54,62,0,2,
+51,60,0,
+28,63,0,
+39,
 16,0,2,0,0,93,0,1,61,0,
-46,2,0,
-52,63,0,
-17,55,0,
-46,5,0,3,
-51,64,0,2,
-46,62,0,
-29,65,0,
-37,
-16,0,2,0,0,93,0,1,63,0,
-46,5,0,
-46,65,0,
-52,66,0,
-17,55,0,
-46,2,0,3,
-29,67,0,
-37,
+51,255,255,27,0,
+51,63,0,
+55,64,0,
+17,55,0,
+51,255,255,10,0,3,
+28,65,0,
+39,
+16,0,2,0,0,98,0,1,64,0,
+51,255,255,10,0,
+55,66,0,
+17,55,0,
+51,255,255,27,0,3,
+54,67,0,2,
+51,65,0,
+28,68,0,
+39,
 16,0,2,0,0,98,0,1,66,0,
-46,2,0,
-52,68,0,
-17,55,0,
-46,5,0,3,
-51,69,0,2,
-46,67,0,
-29,70,0,
-37,
-16,0,2,0,0,98,0,1,68,0,
-46,5,0,
-46,70,0,
-52,71,0,
-17,55,0,
-46,2,0,3,
-29,72,0,
-37,
+51,255,255,27,0,
+51,68,0,
+55,69,0,
+17,55,0,
+51,255,255,10,0,3,
+28,70,0,
+39,
+16,0,2,0,0,104,0,1,69,0,
+51,255,255,10,0,
+55,71,0,
+17,55,0,
+51,255,255,27,0,3,
+54,72,0,2,
+51,70,0,
+28,73,0,
+39,
 16,0,2,0,0,104,0,1,71,0,
-46,2,0,
-52,73,0,
-17,55,0,
-46,5,0,3,
-51,74,0,2,
-46,72,0,
-29,75,0,
-37,
-16,0,2,0,0,104,0,1,73,0,
-46,5,0,
-46,75,0,
-52,76,0,
-17,55,0,
-46,2,0,3,
-29,77,0,
-37,
+51,255,255,27,0,
+51,73,0,
+55,74,0,
+17,55,0,
+51,255,255,10,0,3,
+28,75,0,
+39,
+16,0,2,0,0,110,0,1,74,0,
+51,255,255,10,0,
+55,76,0,
+17,55,0,
+51,255,255,27,0,3,
+54,77,0,2,
+51,75,0,
+28,78,0,
+39,
 16,0,2,0,0,110,0,1,76,0,
-46,2,0,
-52,78,0,
-17,55,0,
-46,5,0,3,
-51,79,0,2,
-46,77,0,
-29,80,0,
-37,
-16,0,2,0,0,110,0,1,78,0,
-46,5,0,
-46,80,0,
-52,81,0,
-17,55,0,
-46,2,0,3,
-52,82,0,
+51,255,255,27,0,
+51,78,0,
+55,79,0,
+17,55,0,
+51,255,255,10,0,3,
+55,80,0,
 17,67,0,
-46,2,0,3,
-29,83,0,
-17,116,0,2,81,0,82,0,
-46,2,0,
-52,84,0,
-17,55,0,
-46,5,0,3,
-52,85,0,
+51,255,255,10,0,3,
+28,81,0,
+17,116,0,2,79,0,80,0,
+51,255,255,10,0,
+55,82,0,
+17,55,0,
+51,255,255,27,0,3,
+55,83,0,
 17,67,0,
-46,5,0,3,
-51,86,0,2,
-46,83,0,
-29,87,0,
-17,116,0,2,84,0,85,0,
-46,5,0,
-46,87,0,
-52,88,0,
-17,55,0,
-46,2,0,3,
-29,89,0,
+51,255,255,27,0,3,
+54,84,0,2,
+51,81,0,
+28,85,0,
+17,116,0,2,82,0,83,0,
+51,255,255,27,0,
+51,85,0,
+55,86,0,
+17,55,0,
+51,255,255,10,0,3,
+28,87,0,
+17,120,0,1,86,0,
+51,255,255,10,0,
+55,88,0,
+17,55,0,
+51,255,255,27,0,3,
+54,89,0,2,
+51,87,0,
+28,90,0,
 17,120,0,1,88,0,
-46,2,0,
-52,90,0,
-17,55,0,
-46,5,0,3,
-51,91,0,2,
-46,89,0,
-29,92,0,
-17,120,0,1,90,0,
-46,5,0,
-46,92,0,
-52,93,0,
-17,55,0,
-46,2,0,3,
-29,94,0,
+51,255,255,27,0,
+51,90,0,
+55,91,0,
+17,55,0,
+51,255,255,10,0,3,
+28,92,0,
+17,124,0,1,91,0,
+51,255,255,10,0,
+55,93,0,
+17,55,0,
+51,255,255,27,0,3,
+54,94,0,2,
+51,92,0,
+28,95,0,
 17,124,0,1,93,0,
-46,2,0,
-52,95,0,
-17,55,0,
-46,5,0,3,
-51,96,0,2,
-46,94,0,
-29,97,0,
-17,124,0,1,95,0,
-46,5,0,
-46,97,0,
-52,98,0,
-17,55,0,
-46,2,0,3,
-29,99,0,
+51,255,255,27,0,
+51,95,0,
+55,96,0,
+17,55,0,
+51,255,255,10,0,3,
+28,97,0,
+17,128,0,1,96,0,
+51,255,255,10,0,
+55,98,0,
+17,55,0,
+51,255,255,27,0,3,
+54,99,0,2,
+51,97,0,
+28,100,0,
 17,128,0,1,98,0,
-46,2,0,
-52,100,0,
-17,55,0,
-46,5,0,3,
-51,101,0,2,
-46,99,0,
-29,102,0,
-17,128,0,1,100,0,
-46,5,0,
-46,102,0,
-52,103,0,
-17,55,0,
-46,2,0,3,
-29,104,0,
+51,255,255,27,0,
+51,100,0,
+55,101,0,
+17,55,0,
+51,255,255,10,0,3,
+28,102,0,
+17,133,0,1,101,0,
+51,255,255,10,0,
+55,103,0,
+17,55,0,
+51,255,255,27,0,3,
+54,104,0,2,
+51,102,0,
+28,105,0,
 17,133,0,1,103,0,
-46,2,0,
-52,105,0,
-17,55,0,
-46,5,0,3,
-51,106,0,2,
-46,104,0,
-29,107,0,
-17,133,0,1,105,0,
-46,5,0,
-46,107,0,
-52,108,0,
-17,55,0,
-46,2,0,3,
-29,109,0,
+51,255,255,27,0,
+51,105,0,
+55,106,0,
+17,55,0,
+51,255,255,10,0,3,
+28,107,0,
+17,138,0,1,106,0,
+51,255,255,10,0,
+55,108,0,
+17,55,0,
+51,255,255,27,0,3,
+54,109,0,2,
+51,107,0,
+28,110,0,
 17,138,0,1,108,0,
-46,2,0,
-52,110,0,
-17,55,0,
-46,5,0,3,
-51,111,0,2,
-46,109,0,
-29,112,0,
-17,138,0,1,110,0,
-46,5,0,
-46,112,0,
-52,113,0,
-17,55,0,
-46,2,0,3,
-29,114,0,
+51,255,255,27,0,
+51,110,0,
+55,111,0,
+17,55,0,
+51,255,255,10,0,3,
+28,112,0,
+17,143,0,1,111,0,
+51,255,255,10,0,
+55,113,0,
+17,55,0,
+51,255,255,27,0,3,
+54,114,0,2,
+51,112,0,
+28,115,0,
 17,143,0,1,113,0,
-46,2,0,
-52,115,0,
-17,55,0,
-46,5,0,3,
-51,116,0,2,
-46,114,0,
-29,117,0,
-17,143,0,1,115,0,
-46,5,0,
-46,117,0,
-52,118,0,
-17,55,0,
-46,2,0,3,
-29,119,0,
+51,255,255,27,0,
+51,115,0,
+55,116,0,
+17,55,0,
+51,255,255,10,0,3,
+28,117,0,
+17,155,0,1,116,0,
+51,255,255,10,0,
+55,118,0,
+17,55,0,
+51,255,255,27,0,3,
+54,119,0,2,
+51,117,0,
+28,120,0,
 17,155,0,1,118,0,
-46,2,0,
-52,120,0,
-17,55,0,
-46,5,0,3,
-51,121,0,2,
-46,119,0,
-29,122,0,
-17,155,0,1,120,0,
-46,5,0,
-46,122,0,
-52,123,0,
-17,55,0,
-46,2,0,3,
-29,124,0,
+51,255,255,27,0,
+51,120,0,
+55,121,0,
+17,55,0,
+51,255,255,10,0,3,
+28,122,0,
+17,159,0,1,121,0,
+51,255,255,10,0,
+55,123,0,
+17,55,0,
+51,255,255,27,0,3,
+54,124,0,2,
+51,122,0,
+28,125,0,
 17,159,0,1,123,0,
-46,2,0,
-52,125,0,
-17,55,0,
-46,5,0,3,
-51,126,0,2,
-46,124,0,
-29,127,0,
-17,159,0,1,125,0,
-46,5,0,
-46,127,0,
-52,128,0,
-17,55,0,
-46,2,0,3,
-29,129,0,
+51,255,255,27,0,
+51,125,0,
+55,126,0,
+17,55,0,
+51,255,255,10,0,3,
+28,127,0,
+17,164,0,1,126,0,
+51,255,255,10,0,
+55,128,0,
+17,55,0,
+51,255,255,27,0,3,
+54,129,0,2,
+51,127,0,
+28,130,0,
 17,164,0,1,128,0,
-46,2,0,
-52,130,0,
-17,55,0,
-46,5,0,3,
-51,131,0,2,
-46,129,0,
-29,132,0,
-17,164,0,1,130,0,
-46,5,0,
-46,132,0,
-52,133,0,
-17,55,0,
-46,2,0,3,
-29,134,0,
+51,255,255,27,0,
+51,130,0,
+55,131,0,
+17,55,0,
+51,255,255,10,0,3,
+28,132,0,
+17,170,0,1,131,0,
+51,255,255,10,0,
+55,133,0,
+17,55,0,
+51,255,255,27,0,3,
+54,134,0,2,
+51,132,0,
+28,135,0,
 17,170,0,1,133,0,
-46,2,0,
-52,135,0,
-17,55,0,
-46,5,0,3,
-51,136,0,2,
-46,134,0,
-29,137,0,
-17,170,0,1,135,0,
-46,5,0,
-46,137,0,
-52,138,0,
-17,55,0,
-46,2,0,3,
-29,139,0,
+51,255,255,27,0,
+51,135,0,
+55,136,0,
+17,55,0,
+51,255,255,10,0,3,
+28,137,0,
+17,175,0,1,136,0,
+51,255,255,10,0,
+55,138,0,
+17,55,0,
+51,255,255,27,0,3,
+54,139,0,2,
+51,137,0,
+28,140,0,
 17,175,0,1,138,0,
-46,2,0,
-52,140,0,
-17,55,0,
-46,5,0,3,
-51,141,0,2,
-46,139,0,
-29,142,0,
-17,175,0,1,140,0,
-46,5,0,
-46,142,0,
-52,143,0,
-17,55,0,
-46,2,0,3,
-52,144,0,
+51,255,255,27,0,
+51,140,0,
+55,141,0,
+17,55,0,
+51,255,255,10,0,3,
+55,142,0,
+17,67,0,
+51,255,255,181,0,3,
+28,143,0,
+17,187,0,2,141,0,142,0,
+51,255,255,10,0,
+55,144,0,
+17,55,0,
+51,255,255,10,0,3,
+55,145,0,
 17,67,0,
-49,145,0,181,0,3,
-29,146,0,
-17,187,0,2,143,0,144,0,
-46,2,0,
-52,147,0,
-17,55,0,
-46,2,0,3,
-52,148,0,
+51,255,255,10,0,3,
+54,146,0,2,
+51,143,0,
+28,147,0,
+17,187,0,2,144,0,145,0,
+51,255,255,10,0,
+51,147,0,
+55,148,0,
+17,55,0,
+51,255,255,27,0,3,
+55,149,0,
 17,67,0,
-46,2,0,3,
-51,149,0,2,
-46,146,0,
-29,150,0,
-17,187,0,2,147,0,148,0,
-46,2,0,
-46,150,0,
-52,151,0,
-17,55,0,
-46,5,0,3,
-52,152,0,
+51,255,255,191,0,3,
+54,150,0,3,
+51,143,0,
+51,147,0,
+28,151,0,
+17,187,0,2,148,0,149,0,
+51,255,255,27,0,
+51,151,0,
+55,152,0,
+17,55,0,
+51,255,255,27,0,3,
+55,153,0,
 17,67,0,
-49,153,0,191,0,3,
-51,154,0,3,
-46,146,0,
-46,150,0,
-29,155,0,
-17,187,0,2,151,0,152,0,
-46,5,0,
-46,155,0,
-52,156,0,
-17,55,0,
-46,5,0,3,
-52,157,0,
+51,255,255,27,0,3,
+54,154,0,4,
+51,143,0,
+51,147,0,
+51,151,0,
+28,155,0,
+17,187,0,2,152,0,153,0,
+51,255,255,27,0,
+51,155,0,
+55,156,0,
+17,55,0,
+51,255,255,10,0,3,
+55,157,0,
 17,67,0,
-46,5,0,3,
-51,158,0,4,
-46,146,0,
-46,150,0,
-46,155,0,
-29,159,0,
-17,187,0,2,156,0,157,0,
-46,5,0,
-46,159,0,
-52,160,0,
-17,55,0,
-46,2,0,3,
-52,161,0,
+51,255,255,10,0,3,
+28,158,0,
+17,196,0,2,156,0,157,0,
+51,255,255,10,0,
+55,159,0,
+17,55,0,
+51,255,255,10,0,3,
+55,160,0,
 17,67,0,
-46,2,0,3,
-29,162,0,
-17,196,0,2,160,0,161,0,
-46,2,0,
-52,163,0,
-17,55,0,
-46,2,0,3,
-52,164,0,
+51,255,255,181,0,3,
+54,161,0,2,
+51,158,0,
+28,162,0,
+17,196,0,2,159,0,160,0,
+51,255,255,10,0,
+51,162,0,
+55,163,0,
+17,55,0,
+51,255,255,27,0,3,
+55,164,0,
 17,67,0,
-46,145,0,3,
-51,165,0,2,
-46,162,0,
-29,166,0,
+51,255,255,27,0,3,
+54,165,0,3,
+51,158,0,
+51,162,0,
+28,166,0,
 17,196,0,2,163,0,164,0,
-46,2,0,
-46,166,0,
-52,167,0,
+51,255,255,27,0,
+51,166,0,
+55,167,0,
 17,55,0,
-46,5,0,3,
-52,168,0,
+51,255,255,27,0,3,
+55,168,0,
 17,67,0,
-46,5,0,3,
-51,169,0,3,
-46,162,0,
-46,166,0,
-29,170,0,
+51,255,255,191,0,3,
+54,169,0,4,
+51,158,0,
+51,162,0,
+51,166,0,
+28,170,0,
 17,196,0,2,167,0,168,0,
-46,5,0,
-46,170,0,
-52,171,0,
+51,255,255,27,0,
+51,170,0,
+55,171,0,
 17,55,0,
-46,5,0,3,
-52,172,0,
+51,255,255,10,0,3,
+55,172,0,
 17,67,0,
-46,153,0,3,
-51,173,0,4,
-46,162,0,
-46,166,0,
-46,170,0,
-29,174,0,
-17,196,0,2,171,0,172,0,
-46,5,0,
-46,174,0,
-52,175,0,
-17,55,0,
-46,2,0,3,
-52,176,0,
+51,255,255,10,0,3,
+28,173,0,
+17,200,0,2,171,0,172,0,
+51,255,255,10,0,
+55,174,0,
+17,55,0,
+51,255,255,10,0,3,
+55,175,0,
 17,67,0,
-46,2,0,3,
-29,177,0,
-17,200,0,2,175,0,176,0,
-46,2,0,
-52,178,0,
-17,55,0,
-46,2,0,3,
-52,179,0,
+51,255,255,181,0,3,
+54,176,0,2,
+51,173,0,
+28,177,0,
+17,200,0,2,174,0,175,0,
+51,255,255,10,0,
+51,177,0,
+55,178,0,
+17,55,0,
+51,255,255,27,0,3,
+55,179,0,
 17,67,0,
-46,145,0,3,
-51,180,0,2,
-46,177,0,
-29,181,0,
+51,255,255,27,0,3,
+54,180,0,3,
+51,173,0,
+51,177,0,
+28,181,0,
 17,200,0,2,178,0,179,0,
-46,2,0,
-46,181,0,
-52,182,0,
+51,255,255,27,0,
+51,181,0,
+55,182,0,
 17,55,0,
-46,5,0,3,
-52,183,0,
+51,255,255,27,0,3,
+55,183,0,
 17,67,0,
-46,5,0,3,
-51,184,0,3,
-46,177,0,
-46,181,0,
-29,185,0,
+51,255,255,191,0,3,
+54,184,0,4,
+51,173,0,
+51,177,0,
+51,181,0,
+28,185,0,
 17,200,0,2,182,0,183,0,
-46,5,0,
-46,185,0,
-52,186,0,
+51,255,255,27,0,
+51,185,0,
+55,186,0,
 17,55,0,
-46,5,0,3,
-52,187,0,
-17,67,0,
-46,153,0,3,
-51,188,0,4,
-46,177,0,
-46,181,0,
-46,185,0,
-29,189,0,
-17,200,0,2,186,0,187,0,
-46,5,0,
-46,189,0,
-52,190,0,
-17,55,0,
-46,2,0,3,
-52,191,0,
+51,255,255,10,0,3,
+55,187,0,
 17,204,0,
-46,2,0,3,
-52,192,0,
+51,255,255,10,0,3,
+55,188,0,
 17,211,0,
-46,2,0,3,
-29,193,0,
-17,218,0,3,190,0,191,0,192,0,
-46,2,0,
-52,194,0,
-17,55,0,
-46,2,0,3,
-52,195,0,
+51,255,255,10,0,3,
+28,189,0,
+17,218,0,3,186,0,187,0,188,0,
+51,255,255,10,0,
+55,190,0,
+17,55,0,
+51,255,255,10,0,3,
+55,191,0,
 17,204,0,
-46,145,0,3,
-52,196,0,
+51,255,255,181,0,3,
+55,192,0,
 17,211,0,
-46,145,0,3,
-51,197,0,2,
-46,193,0,
-29,198,0,
-17,218,0,3,194,0,195,0,196,0,
-46,2,0,
-46,198,0,
-52,199,0,
-17,55,0,
-46,5,0,3,
-52,200,0,
+51,255,255,181,0,3,
+54,193,0,2,
+51,189,0,
+28,194,0,
+17,218,0,3,190,0,191,0,192,0,
+51,255,255,10,0,
+51,194,0,
+55,195,0,
+17,55,0,
+51,255,255,27,0,3,
+55,196,0,
 17,204,0,
-46,5,0,3,
-52,201,0,
+51,255,255,27,0,3,
+55,197,0,
 17,211,0,
-46,5,0,3,
-51,202,0,3,
-46,193,0,
-46,198,0,
-29,203,0,
-17,218,0,3,199,0,200,0,201,0,
-46,5,0,
-46,203,0,
-52,204,0,
-17,55,0,
-46,5,0,3,
-52,205,0,
+51,255,255,27,0,3,
+54,198,0,3,
+51,189,0,
+51,194,0,
+28,199,0,
+17,218,0,3,195,0,196,0,197,0,
+51,255,255,27,0,
+51,199,0,
+55,200,0,
+17,55,0,
+51,255,255,27,0,3,
+55,201,0,
 17,204,0,
-46,153,0,3,
-52,206,0,
+51,255,255,191,0,3,
+55,202,0,
 17,211,0,
-46,153,0,3,
-51,207,0,4,
-46,193,0,
-46,198,0,
-46,203,0,
-29,208,0,
-17,218,0,3,204,0,205,0,206,0,
-46,5,0,
-46,208,0,
-52,209,0,
-17,55,0,
-46,2,0,3,
-29,210,0,
-17,224,0,1,209,0,
-46,2,0,
-52,211,0,
-17,55,0,
-46,5,0,3,
-51,212,0,2,
-46,210,0,
-29,213,0,
-17,224,0,1,211,0,
-46,5,0,
-46,213,0,
-52,214,0,
-17,55,0,
-46,2,0,3,
-52,215,0,
+51,255,255,191,0,3,
+54,203,0,4,
+51,189,0,
+51,194,0,
+51,199,0,
+28,204,0,
+17,218,0,3,200,0,201,0,202,0,
+51,255,255,27,0,
+51,204,0,
+55,205,0,
+17,55,0,
+51,255,255,10,0,3,
+28,206,0,
+17,224,0,1,205,0,
+51,255,255,10,0,
+55,207,0,
+17,55,0,
+51,255,255,27,0,3,
+54,208,0,2,
+51,206,0,
+28,209,0,
+17,224,0,1,207,0,
+51,255,255,27,0,
+51,209,0,
+55,210,0,
+17,55,0,
+51,255,255,10,0,3,
+55,211,0,
 17,67,0,
-46,2,0,3,
-52,216,0,
+51,255,255,10,0,3,
+55,212,0,
 17,233,0,
-46,2,0,3,
-29,217,0,
-17,235,0,3,214,0,215,0,216,0,
-46,2,0,
-52,218,0,
-17,55,0,
-46,2,0,3,
-52,219,0,
+51,255,255,10,0,3,
+28,213,0,
+17,235,0,3,210,0,211,0,212,0,
+51,255,255,10,0,
+55,214,0,
+17,55,0,
+51,255,255,10,0,3,
+55,215,0,
 17,67,0,
-46,2,0,3,
-52,220,0,
+51,255,255,10,0,3,
+55,216,0,
 17,233,0,
-46,145,0,3,
-51,221,0,2,
-46,217,0,
-29,222,0,
-17,235,0,3,218,0,219,0,220,0,
-46,2,0,
-46,222,0,
-52,223,0,
-17,55,0,
-46,5,0,3,
-52,224,0,
+51,255,255,181,0,3,
+54,217,0,2,
+51,213,0,
+28,218,0,
+17,235,0,3,214,0,215,0,216,0,
+51,255,255,10,0,
+51,218,0,
+55,219,0,
+17,55,0,
+51,255,255,27,0,3,
+55,220,0,
 17,67,0,
-46,5,0,3,
-52,225,0,
+51,255,255,27,0,3,
+55,221,0,
 17,233,0,
-46,5,0,3,
-51,226,0,3,
-46,217,0,
-46,222,0,
-29,227,0,
-17,235,0,3,223,0,224,0,225,0,
-46,5,0,
-46,227,0,
-52,228,0,
-17,55,0,
-46,5,0,3,
-52,229,0,
+51,255,255,27,0,3,
+54,222,0,3,
+51,213,0,
+51,218,0,
+28,223,0,
+17,235,0,3,219,0,220,0,221,0,
+51,255,255,27,0,
+51,223,0,
+55,224,0,
+17,55,0,
+51,255,255,27,0,3,
+55,225,0,
 17,67,0,
-46,5,0,3,
-52,230,0,
+51,255,255,27,0,3,
+55,226,0,
 17,233,0,
-46,153,0,3,
-51,231,0,4,
-46,217,0,
-46,222,0,
-46,227,0,
-29,232,0,
-17,235,0,3,228,0,229,0,230,0,
-46,5,0,
-46,232,0,
-52,233,0,
+51,255,255,191,0,3,
+54,227,0,4,
+51,213,0,
+51,218,0,
+51,223,0,
+28,228,0,
+17,235,0,3,224,0,225,0,226,0,
+51,255,255,27,0,
+51,228,0,
+55,229,0,
 17,239,0,
-46,2,0,3,
-52,234,0,
-17,55,0,
-46,2,0,3,
-29,235,0,
-17,244,0,2,233,0,234,0,
-46,2,0,
-52,236,0,
+51,255,255,10,0,3,
+55,230,0,
+17,55,0,
+51,255,255,10,0,3,
+28,231,0,
+17,244,0,2,229,0,230,0,
+51,255,255,10,0,
+55,232,0,
 17,239,0,
-46,145,0,3,
-52,237,0,
-17,55,0,
-46,2,0,3,
-51,238,0,2,
-46,235,0,
-29,239,0,
+51,255,255,181,0,3,
+55,233,0,
+17,55,0,
+51,255,255,10,0,3,
+54,234,0,2,
+51,231,0,
+28,235,0,
+17,244,0,2,232,0,233,0,
+51,255,255,10,0,
+51,235,0,
+55,236,0,
+17,239,0,
+51,255,255,27,0,3,
+55,237,0,
+17,55,0,
+51,255,255,27,0,3,
+54,238,0,3,
+51,231,0,
+51,235,0,
+28,239,0,
 17,244,0,2,236,0,237,0,
-46,2,0,
-46,239,0,
-52,240,0,
+51,255,255,27,0,
+51,239,0,
+55,240,0,
 17,239,0,
-46,5,0,3,
-52,241,0,
-17,55,0,
-46,5,0,3,
-51,242,0,3,
-46,235,0,
-46,239,0,
-29,243,0,
+51,255,255,191,0,3,
+55,241,0,
+17,55,0,
+51,255,255,27,0,3,
+54,242,0,4,
+51,231,0,
+51,235,0,
+51,239,0,
+28,243,0,
 17,244,0,2,240,0,241,0,
-46,5,0,
-46,243,0,
-52,244,0,
-17,239,0,
-46,153,0,3,
-52,245,0,
-17,55,0,
-46,5,0,3,
-51,246,0,4,
-46,235,0,
-46,239,0,
-46,243,0,
-29,247,0,
-17,244,0,2,244,0,245,0,
-46,5,0,
-46,247,0,
-52,248,0,
+51,255,255,27,0,
+51,243,0,
+55,244,0,
 17,249,0,
-46,2,0,3,
-52,249,0,
+51,255,255,10,0,3,
+55,245,0,
 17,255,0,
-46,2,0,3,
-52,250,0,
-17,55,0,
-46,2,0,3,
-29,251,0,
-17,5,1,3,248,0,249,0,250,0,
-46,2,0,
-52,252,0,
+51,255,255,10,0,3,
+55,246,0,
+17,55,0,
+51,255,255,10,0,3,
+28,247,0,
+17,5,1,3,244,0,245,0,246,0,
+51,255,255,10,0,
+55,248,0,
 17,249,0,
-46,145,0,3,
-52,253,0,
+51,255,255,181,0,3,
+55,249,0,
 17,255,0,
-46,145,0,3,
-52,254,0,
-17,55,0,
-46,2,0,3,
-51,255,0,2,
-46,251,0,
-29,0,1,
-17,5,1,3,252,0,253,0,254,0,
-46,2,0,
-46,0,1,
-52,1,1,
+51,255,255,181,0,3,
+55,250,0,
+17,55,0,
+51,255,255,10,0,3,
+54,251,0,2,
+51,247,0,
+28,252,0,
+17,5,1,3,248,0,249,0,250,0,
+51,255,255,10,0,
+51,252,0,
+55,253,0,
 17,249,0,
-46,5,0,3,
-52,2,1,
+51,255,255,27,0,3,
+55,254,0,
 17,255,0,
-46,5,0,3,
-52,3,1,
-17,55,0,
-46,5,0,3,
-51,4,1,3,
-46,251,0,
-46,0,1,
-29,5,1,
-17,5,1,3,1,1,2,1,3,1,
-46,5,0,
-46,5,1,
-52,6,1,
+51,255,255,27,0,3,
+55,255,0,
+17,55,0,
+51,255,255,27,0,3,
+54,0,1,3,
+51,247,0,
+51,252,0,
+28,1,1,
+17,5,1,3,253,0,254,0,255,0,
+51,255,255,27,0,
+51,1,1,
+55,2,1,
 17,249,0,
-46,153,0,3,
-52,7,1,
+51,255,255,191,0,3,
+55,3,1,
 17,255,0,
-46,153,0,3,
-52,8,1,
-17,55,0,
-46,5,0,3,
-51,9,1,4,
-46,251,0,
-46,0,1,
-46,5,1,
-29,10,1,
-17,5,1,3,6,1,7,1,8,1,
-46,5,0,
-46,10,1,
-52,11,1,
-17,16,1,
-46,2,0,3,
-29,12,1,
-37,
-16,0,2,0,0,22,1,1,11,1,
-49,13,1,37,1,
-52,14,1,
-17,16,1,
-46,2,0,3,
-29,15,1,
-37,
-16,0,2,0,0,47,1,1,14,1,
-49,16,1,63,1,
-52,17,1,
-17,16,1,
-46,13,1,3,
-29,18,1,
-37,
+51,255,255,191,0,3,
+55,4,1,
+17,55,0,
+51,255,255,27,0,3,
+54,5,1,4,
+51,247,0,
+51,252,0,
+51,1,1,
+28,6,1,
+17,5,1,3,2,1,3,1,4,1,
+51,255,255,27,0,
+51,6,1,
+55,7,1,
+17,55,0,
+51,255,255,16,1,3,
+54,8,1,3,
+51,117,0,
+51,120,0,
+28,9,1,
+39,
+16,0,2,0,0,155,0,1,7,1,
+51,255,255,16,1,
+51,9,1,
+55,10,1,
+17,55,0,
+51,255,255,16,1,3,
+54,11,1,3,
+51,122,0,
+51,125,0,
+28,12,1,
+39,
+16,0,2,0,0,159,0,1,10,1,
+51,255,255,16,1,
+51,12,1,
+55,13,1,
+17,26,1,
+51,255,255,10,0,3,
+28,14,1,
+39,
+16,0,2,0,0,32,1,1,13,1,
+51,255,255,16,1,
+55,15,1,
+17,26,1,
+51,255,255,10,0,3,
+28,16,1,
+39,
+16,0,2,0,0,47,1,1,15,1,
+51,255,255,63,1,
+55,17,1,
+17,26,1,
+51,255,255,16,1,3,
+28,18,1,
+39,
 16,0,2,0,0,73,1,1,17,1,
-46,2,0,
-52,19,1,
-17,16,1,
-46,16,1,3,
-29,20,1,
-37,
+51,255,255,10,0,
+55,19,1,
+17,26,1,
+51,255,255,63,1,3,
+28,20,1,
+39,
 16,0,2,0,0,88,1,1,19,1,
-46,2,0,
-52,21,1,
+51,255,255,10,0,
+55,21,1,
 17,55,0,
-46,2,0,3,
-29,22,1,
-37,
+51,255,255,10,0,3,
+28,22,1,
+39,
 16,0,2,0,0,104,1,1,21,1,
-46,2,0,
-52,23,1,
-17,55,0,
-46,5,0,3,
-51,24,1,2,
-46,22,1,
-29,25,1,
-37,
+51,255,255,10,0,
+55,23,1,
+17,55,0,
+51,255,255,27,0,3,
+54,24,1,2,
+51,22,1,
+28,25,1,
+39,
 16,0,2,0,0,104,1,1,23,1,
-46,5,0,
-46,25,1,
-52,26,1,
+51,255,255,27,0,
+51,25,1,
+55,26,1,
 17,55,0,
-46,2,0,3,
-29,27,1,
-37,
+51,255,255,10,0,3,
+28,27,1,
+39,
 16,0,2,0,0,110,1,1,26,1,
-46,2,0,
-52,28,1,
-17,55,0,
-46,5,0,3,
-51,29,1,2,
-46,27,1,
-29,30,1,
-37,
+51,255,255,10,0,
+55,28,1,
+17,55,0,
+51,255,255,27,0,3,
+54,29,1,2,
+51,27,1,
+28,30,1,
+39,
 16,0,2,0,0,110,1,1,28,1,
-46,5,0,
-46,30,1,
-52,31,1,
+51,255,255,27,0,
+51,30,1,
+55,31,1,
 17,55,0,
-46,2,0,3,
-29,32,1,
-37,
+51,255,255,10,0,3,
+28,32,1,
+39,
 16,0,2,0,0,116,1,1,31,1,
-46,2,0,
-52,33,1,
-17,55,0,
-46,5,0,3,
-51,34,1,2,
-46,32,1,
-29,35,1,
-37,
+51,255,255,10,0,
+55,33,1,
+17,55,0,
+51,255,255,27,0,3,
+54,34,1,2,
+51,32,1,
+28,35,1,
+39,
 16,0,2,0,0,116,1,1,33,1,
-46,5,0,
-46,35,1,
-52,36,1,
+51,255,255,27,0,
+51,35,1,
+55,36,1,
 17,55,0,
-46,13,1,3,
-52,37,1,
+51,255,255,16,1,3,
+55,37,1,
 17,67,0,
-46,13,1,3,
-51,38,1,5,
-46,162,0,
-46,166,0,
-46,170,0,
-46,174,0,
-29,39,1,
-37,
+51,255,255,16,1,3,
+54,38,1,5,
+51,158,0,
+51,162,0,
+51,166,0,
+51,170,0,
+28,39,1,
+39,
 16,0,2,0,0,196,0,2,36,1,37,1,
-46,13,1,
-46,39,1,
-52,40,1,
+51,255,255,16,1,
+51,39,1,
+55,40,1,
 17,55,0,
-46,13,1,3,
-52,41,1,
+51,255,255,16,1,3,
+55,41,1,
 17,67,0,
-49,42,1,126,1,3,
-51,43,1,6,
-46,162,0,
-46,166,0,
-46,170,0,
-46,174,0,
-46,39,1,
-29,44,1,
-37,
+51,255,255,126,1,3,
+54,42,1,6,
+51,158,0,
+51,162,0,
+51,166,0,
+51,170,0,
+51,39,1,
+28,43,1,
+39,
 16,0,2,0,0,196,0,2,40,1,41,1,
-46,13,1,
-46,44,1,
-52,45,1,
+51,255,255,16,1,
+51,43,1,
+55,44,1,
 17,55,0,
-46,13,1,3,
-52,46,1,
+51,255,255,16,1,3,
+55,45,1,
 17,67,0,
-46,13,1,3,
-51,47,1,5,
-46,177,0,
-46,181,0,
-46,185,0,
-46,189,0,
-29,48,1,
-37,
-16,0,2,0,0,200,0,2,45,1,46,1,
-46,13,1,
-46,48,1,
-52,49,1,
-17,55,0,
-46,13,1,3,
-52,50,1,
+51,255,255,16,1,3,
+54,46,1,5,
+51,173,0,
+51,177,0,
+51,181,0,
+51,185,0,
+28,47,1,
+39,
+16,0,2,0,0,200,0,2,44,1,45,1,
+51,255,255,16,1,
+51,47,1,
+55,48,1,
+17,55,0,
+51,255,255,16,1,3,
+55,49,1,
 17,67,0,
-46,42,1,3,
-51,51,1,6,
-46,177,0,
-46,181,0,
-46,185,0,
-46,189,0,
-46,48,1,
-29,52,1,
-37,
-16,0,2,0,0,200,0,2,49,1,50,1,
-46,13,1,
-46,52,1,
-52,53,1,
-17,55,0,
-46,13,1,3,
-52,54,1,
+51,255,255,126,1,3,
+54,50,1,6,
+51,173,0,
+51,177,0,
+51,181,0,
+51,185,0,
+51,47,1,
+28,51,1,
+39,
+16,0,2,0,0,200,0,2,48,1,49,1,
+51,255,255,16,1,
+51,51,1,
+55,52,1,
+17,55,0,
+51,255,255,16,1,3,
+55,53,1,
 17,204,0,
-46,13,1,3,
-52,55,1,
+51,255,255,16,1,3,
+55,54,1,
 17,211,0,
-46,13,1,3,
-51,56,1,5,
-46,193,0,
-46,198,0,
-46,203,0,
-46,208,0,
-29,57,1,
-37,
-16,0,2,0,0,218,0,3,53,1,54,1,55,1,
-46,13,1,
-46,57,1,
-52,58,1,
-17,55,0,
-46,13,1,3,
-52,59,1,
+51,255,255,16,1,3,
+54,55,1,5,
+51,189,0,
+51,194,0,
+51,199,0,
+51,204,0,
+28,56,1,
+39,
+16,0,2,0,0,218,0,3,52,1,53,1,54,1,
+51,255,255,16,1,
+51,56,1,
+55,57,1,
+17,55,0,
+51,255,255,16,1,3,
+55,58,1,
 17,204,0,
-46,42,1,3,
-52,60,1,
+51,255,255,126,1,3,
+55,59,1,
 17,211,0,
-46,42,1,3,
-51,61,1,6,
-46,193,0,
-46,198,0,
-46,203,0,
-46,208,0,
-46,57,1,
-29,62,1,
-37,
-16,0,2,0,0,218,0,3,58,1,59,1,60,1,
-46,13,1,
-46,62,1,
-52,63,1,
-17,55,0,
-46,16,1,3,
-52,64,1,
+51,255,255,126,1,3,
+54,60,1,6,
+51,189,0,
+51,194,0,
+51,199,0,
+51,204,0,
+51,56,1,
+28,61,1,
+39,
+16,0,2,0,0,218,0,3,57,1,58,1,59,1,
+51,255,255,16,1,
+51,61,1,
+55,62,1,
+17,55,0,
+51,255,255,63,1,3,
+55,63,1,
 17,204,0,
-46,16,1,3,
-52,65,1,
+51,255,255,63,1,3,
+55,64,1,
 17,211,0,
-46,16,1,3,
-51,66,1,7,
-46,193,0,
-46,198,0,
-46,203,0,
-46,208,0,
-46,57,1,
-46,62,1,
-29,67,1,
-37,
-16,0,2,0,0,218,0,3,63,1,64,1,65,1,
-46,16,1,
-46,67,1,
-52,68,1,
-17,55,0,
-46,16,1,3,
-52,69,1,
+51,255,255,63,1,3,
+54,65,1,7,
+51,189,0,
+51,194,0,
+51,199,0,
+51,204,0,
+51,56,1,
+51,61,1,
+28,66,1,
+39,
+16,0,2,0,0,218,0,3,62,1,63,1,64,1,
+51,255,255,63,1,
+51,66,1,
+55,67,1,
+17,55,0,
+51,255,255,63,1,3,
+55,68,1,
 17,204,0,
-49,70,1,130,1,3,
-52,71,1,
+51,255,255,130,1,3,
+55,69,1,
 17,211,0,
-46,70,1,3,
-51,72,1,8,
-46,193,0,
-46,198,0,
-46,203,0,
-46,208,0,
-46,57,1,
-46,62,1,
-46,67,1,
-29,73,1,
-37,
-16,0,2,0,0,218,0,3,68,1,69,1,71,1,
-46,16,1,
-46,73,1,
-52,74,1,
-17,55,0,
-46,2,0,3,
-52,75,1,
+51,255,255,130,1,3,
+54,70,1,8,
+51,189,0,
+51,194,0,
+51,199,0,
+51,204,0,
+51,56,1,
+51,61,1,
+51,66,1,
+28,71,1,
+39,
+16,0,2,0,0,218,0,3,67,1,68,1,69,1,
+51,255,255,63,1,
+51,71,1,
+55,72,1,
+17,55,0,
+51,255,255,10,0,3,
+55,73,1,
 17,67,0,
-46,2,0,3,
-52,76,1,
+51,255,255,10,0,3,
+55,74,1,
 17,233,0,
-49,77,1,135,1,3,
-51,78,1,5,
-46,217,0,
-46,222,0,
-46,227,0,
-46,232,0,
-29,79,1,
-37,
-16,0,2,0,0,235,0,3,74,1,75,1,76,1,
-46,2,0,
-46,79,1,
-52,80,1,
-17,55,0,
-46,5,0,3,
-52,81,1,
+51,255,255,135,1,3,
+54,75,1,5,
+51,213,0,
+51,218,0,
+51,223,0,
+51,228,0,
+28,76,1,
+39,
+16,0,2,0,0,235,0,3,72,1,73,1,74,1,
+51,255,255,10,0,
+51,76,1,
+55,77,1,
+17,55,0,
+51,255,255,27,0,3,
+55,78,1,
 17,67,0,
-46,5,0,3,
-52,82,1,
+51,255,255,27,0,3,
+55,79,1,
 17,233,0,
-46,77,1,3,
-51,83,1,6,
-46,217,0,
-46,222,0,
-46,227,0,
-46,232,0,
-46,79,1,
-29,84,1,
-37,
-16,0,2,0,0,235,0,3,80,1,81,1,82,1,
-46,5,0,
-46,84,1,
-52,85,1,
-17,55,0,
-46,2,0,3,
-29,86,1,
-37,
-16,0,2,0,0,145,1,1,85,1,
-46,77,1,
-52,87,1,
-17,55,0,
-46,5,0,3,
-51,88,1,2,
-46,86,1,
-29,89,1,
-37,
-16,0,2,0,0,145,1,1,87,1,
-46,77,1,
-46,89,1,
-52,90,1,
-17,55,0,
-46,2,0,3,
-29,91,1,
-37,
-16,0,2,0,0,151,1,1,90,1,
-46,77,1,
-52,92,1,
-17,55,0,
-46,5,0,3,
-51,93,1,2,
-46,91,1,
-29,94,1,
-37,
-16,0,2,0,0,151,1,1,92,1,
-46,77,1,
-46,94,1,
-52,95,1,
-17,55,0,
-46,2,0,3,
-52,96,1,
-36,
+51,255,255,135,1,3,
+54,80,1,6,
+51,213,0,
+51,218,0,
+51,223,0,
+51,228,0,
+51,76,1,
+28,81,1,
+39,
+16,0,2,0,0,235,0,3,77,1,78,1,79,1,
+51,255,255,27,0,
+51,81,1,
+55,82,1,
+17,55,0,
+51,255,255,10,0,3,
+28,83,1,
+39,
+16,0,2,0,0,145,1,1,82,1,
+51,255,255,135,1,
+55,84,1,
+17,55,0,
+51,255,255,27,0,3,
+54,85,1,2,
+51,83,1,
+28,86,1,
+39,
+16,0,2,0,0,145,1,1,84,1,
+51,255,255,135,1,
+51,86,1,
+55,87,1,
+17,55,0,
+51,255,255,10,0,3,
+28,88,1,
+39,
+16,0,2,0,0,151,1,1,87,1,
+51,255,255,135,1,
+55,89,1,
+17,55,0,
+51,255,255,27,0,3,
+54,90,1,2,
+51,88,1,
+28,91,1,
+39,
+16,0,2,0,0,151,1,1,89,1,
+51,255,255,135,1,
+51,91,1,
+55,92,1,
+17,55,0,
+51,255,255,10,0,3,
+55,93,1,
+38,
 16,32,157,1,
-46,2,0,3,
-29,97,1,
-37,
-16,0,2,0,0,159,1,2,95,1,96,1,
-46,2,0,
-52,98,1,
-17,55,0,
-46,5,0,3,
-52,99,1,
-36,
+51,255,255,10,0,3,
+28,94,1,
+39,
+16,0,2,0,0,159,1,2,92,1,93,1,
+51,255,255,10,0,
+55,95,1,
+17,55,0,
+51,255,255,27,0,3,
+55,96,1,
+38,
 16,32,157,1,
-46,5,0,3,
-51,100,1,2,
-46,97,1,
-29,101,1,
-37,
-16,0,2,0,0,159,1,2,98,1,99,1,
-46,5,0,
-46,101,1,
-52,102,1,
+51,255,255,27,0,3,
+54,97,1,2,
+51,94,1,
+28,98,1,
+39,
+16,0,2,0,0,159,1,2,95,1,96,1,
+51,255,255,27,0,
+51,98,1,
+55,99,1,
 17,164,1,
-49,103,1,166,1,3,
-29,104,1,
-37,
-16,0,2,0,0,173,1,1,102,1,
-46,70,1,
-52,105,1,
+51,255,255,166,1,3,
+28,100,1,
+39,
+16,0,2,0,0,173,1,1,99,1,
+51,255,255,130,1,
+55,101,1,
 17,187,1,
-46,70,1,3,
-29,106,1,
-37,
-16,0,2,0,0,189,1,1,105,1,
-46,103,1,
-52,107,1,
-17,55,0,
-46,2,0,3,
-29,108,1,
-17,205,1,1,107,1,
-46,145,0,
-52,109,1,
-17,55,0,
-46,5,0,3,
-51,110,1,2,
-46,108,1,
-29,111,1,
-17,205,1,1,109,1,
-46,153,0,
-46,111,1,
-52,112,1,
+51,255,255,130,1,3,
+28,102,1,
+39,
+16,0,2,0,0,189,1,1,101,1,
+51,255,255,166,1,
+55,103,1,
+17,55,0,
+51,255,255,10,0,3,
+28,104,1,
+17,205,1,1,103,1,
+51,255,255,181,0,
+55,105,1,
+17,55,0,
+51,255,255,27,0,3,
+54,106,1,2,
+51,104,1,
+28,107,1,
+17,205,1,1,105,1,
+51,255,255,191,0,
+51,107,1,
+55,108,1,
 17,212,1,
-46,2,0,3,
-52,113,1,
+51,255,255,10,0,3,
+55,109,1,
 17,215,1,
-46,2,0,3,
-29,114,1,
-17,218,1,2,112,1,113,1,
-46,145,0,
-52,115,1,
+51,255,255,10,0,3,
+28,110,1,
+17,218,1,2,108,1,109,1,
+51,255,255,181,0,
+55,111,1,
 17,212,1,
-46,5,0,3,
-52,116,1,
+51,255,255,27,0,3,
+55,112,1,
 17,215,1,
-46,5,0,3,
-51,117,1,2,
-46,114,1,
-29,118,1,
-17,218,1,2,115,1,116,1,
-46,153,0,
-46,118,1,
-52,119,1,
-17,55,0,
-46,2,0,3,
-52,120,1,
+51,255,255,27,0,3,
+54,113,1,2,
+51,110,1,
+28,114,1,
+17,218,1,2,111,1,112,1,
+51,255,255,191,0,
+51,114,1,
+55,115,1,
+17,55,0,
+51,255,255,10,0,3,
+55,116,1,
 17,67,0,
-46,2,0,3,
-29,121,1,
-17,227,1,2,119,1,120,1,
-46,145,0,
-52,122,1,
-17,55,0,
-46,5,0,3,
-52,123,1,
+51,255,255,10,0,3,
+28,117,1,
+17,227,1,2,115,1,116,1,
+51,255,255,181,0,
+55,118,1,
+17,55,0,
+51,255,255,27,0,3,
+55,119,1,
 17,67,0,
-46,5,0,3,
-51,124,1,2,
-46,121,1,
-29,125,1,
-17,227,1,2,122,1,123,1,
-46,153,0,
-46,125,1,
-52,126,1,
-17,55,0,
-49,127,1,231,1,3,
-52,128,1,
+51,255,255,27,0,3,
+54,120,1,2,
+51,117,1,
+28,121,1,
+17,227,1,2,118,1,119,1,
+51,255,255,191,0,
+51,121,1,
+55,122,1,
+17,55,0,
+51,255,255,231,1,3,
+55,123,1,
 17,67,0,
-46,127,1,3,
-29,129,1,
-17,238,1,2,126,1,128,1,
-46,127,1,
-52,130,1,
-17,55,0,
-49,131,1,244,1,3,
-52,132,1,
+51,255,255,231,1,3,
+28,124,1,
+17,238,1,2,122,1,123,1,
+51,255,255,231,1,
+55,125,1,
+17,55,0,
+51,255,255,244,1,3,
+55,126,1,
 17,67,0,
-46,131,1,3,
-51,133,1,2,
-46,129,1,
-29,134,1,
-17,238,1,2,130,1,132,1,
-46,131,1,
-46,134,1,
-52,135,1,
-17,55,0,
-46,2,0,3,
-29,136,1,
-17,250,1,1,135,1,
-46,2,0,
-52,137,1,
-17,55,0,
-46,5,0,3,
-51,138,1,2,
-46,136,1,
-29,139,1,
-17,250,1,1,137,1,
-46,5,0,
-46,139,1,
-52,140,1,
+51,255,255,244,1,3,
+54,127,1,2,
+51,124,1,
+28,128,1,
+17,238,1,2,125,1,126,1,
+51,255,255,244,1,
+51,128,1,
+55,129,1,
+17,55,0,
+51,255,255,10,0,3,
+28,130,1,
+17,250,1,1,129,1,
+51,255,255,10,0,
+55,131,1,
+17,55,0,
+51,255,255,27,0,3,
+54,132,1,2,
+51,130,1,
+28,133,1,
+17,250,1,1,131,1,
+51,255,255,27,0,
+51,133,1,
+55,134,1,
 17,4,2,
-46,2,0,3,
-52,141,1,
+51,255,255,10,0,3,
+55,135,1,
 17,6,2,
-46,2,0,3,
-52,142,1,
+51,255,255,10,0,3,
+55,136,1,
 17,8,2,
-46,2,0,3,
-29,143,1,
-17,13,2,3,140,1,141,1,142,1,
-46,2,0,
-52,144,1,
+51,255,255,10,0,3,
+28,137,1,
+17,13,2,3,134,1,135,1,136,1,
+51,255,255,10,0,
+55,138,1,
 17,4,2,
-46,5,0,3,
-52,145,1,
+51,255,255,27,0,3,
+55,139,1,
 17,6,2,
-46,5,0,3,
-52,146,1,
+51,255,255,27,0,3,
+55,140,1,
 17,8,2,
-46,5,0,3,
-51,147,1,2,
-46,143,1,
-29,148,1,
-17,13,2,3,144,1,145,1,146,1,
-46,5,0,
-46,148,1,
-52,149,1,
+51,255,255,27,0,3,
+54,141,1,2,
+51,137,1,
+28,142,1,
+17,13,2,3,138,1,139,1,140,1,
+51,255,255,27,0,
+51,142,1,
+55,143,1,
 17,6,2,
-46,2,0,3,
-52,150,1,
+51,255,255,10,0,3,
+55,144,1,
 17,4,2,
-46,2,0,3,
-29,151,1,
-17,25,2,2,149,1,150,1,
-46,2,0,
-52,152,1,
+51,255,255,10,0,3,
+28,145,1,
+17,25,2,2,143,1,144,1,
+51,255,255,10,0,
+55,146,1,
 17,6,2,
-46,5,0,3,
-52,153,1,
+51,255,255,27,0,3,
+55,147,1,
 17,4,2,
-46,5,0,3,
-51,154,1,2,
-46,151,1,
-29,155,1,
-17,25,2,2,152,1,153,1,
-46,5,0,
-46,155,1,
-52,156,1,
+51,255,255,27,0,3,
+54,148,1,2,
+51,145,1,
+28,149,1,
+17,25,2,2,146,1,147,1,
+51,255,255,27,0,
+51,149,1,
+55,150,1,
 17,6,2,
-46,2,0,3,
-52,157,1,
+51,255,255,10,0,3,
+55,151,1,
 17,4,2,
-46,2,0,3,
-52,158,1,
+51,255,255,10,0,3,
+55,152,1,
 17,33,2,
-46,145,0,3,
-29,159,1,
-17,37,2,3,156,1,157,1,158,1,
-46,2,0,
-52,160,1,
+51,255,255,181,0,3,
+28,153,1,
+17,37,2,3,150,1,151,1,152,1,
+51,255,255,10,0,
+55,154,1,
 17,6,2,
-46,5,0,3,
-52,161,1,
+51,255,255,27,0,3,
+55,155,1,
 17,4,2,
-46,5,0,3,
-52,162,1,
+51,255,255,27,0,3,
+55,156,1,
 17,33,2,
-46,153,0,3,
-51,163,1,2,
-46,159,1,
-29,164,1,
-17,37,2,3,160,1,161,1,162,1,
-46,5,0,
-46,164,1,
-52,165,1,
-17,55,0,
-49,166,1,45,2,3,
-52,167,1,
+51,255,255,191,0,3,
+54,157,1,2,
+51,153,1,
+28,158,1,
+17,37,2,3,154,1,155,1,156,1,
+51,255,255,27,0,
+51,158,1,
+55,159,1,
+17,55,0,
+51,255,255,45,2,3,
+55,160,1,
 17,67,0,
-46,166,1,3,
-29,168,1,
-17,56,2,2,165,1,167,1,
-46,166,1,
-52,169,1,
-17,55,0,
-49,170,1,71,2,3,
-52,171,1,
+51,255,255,45,2,3,
+28,161,1,
+17,56,2,2,159,1,160,1,
+51,255,255,45,2,
+55,162,1,
+17,55,0,
+51,255,255,71,2,3,
+55,163,1,
 17,67,0,
-46,170,1,3,
-51,172,1,2,
-46,168,1,
-29,173,1,
-17,56,2,2,169,1,171,1,
-46,170,1,
-46,173,1,
-52,174,1,
-17,55,0,
-49,175,1,83,2,3,
-52,176,1,
+51,255,255,71,2,3,
+54,164,1,2,
+51,161,1,
+28,165,1,
+17,56,2,2,162,1,163,1,
+51,255,255,71,2,
+51,165,1,
+55,166,1,
+17,55,0,
+51,255,255,83,2,3,
+55,167,1,
 17,67,0,
-46,175,1,3,
-51,177,1,3,
-46,168,1,
-46,173,1,
-29,178,1,
-37,
-16,0,2,0,0,56,2,2,174,1,176,1,
-46,175,1,
-46,178,1,
-52,179,1,
-17,55,0,
-49,180,1,88,2,3,
-52,181,1,
+51,255,255,83,2,3,
+54,168,1,3,
+51,161,1,
+51,165,1,
+28,169,1,
+39,
+16,0,2,0,0,56,2,2,166,1,167,1,
+51,255,255,83,2,
+51,169,1,
+55,170,1,
+17,55,0,
+51,255,255,88,2,3,
+55,171,1,
 17,67,0,
-46,180,1,3,
-51,182,1,4,
-46,168,1,
-46,173,1,
-46,178,1,
-29,183,1,
-37,
-16,0,2,0,0,56,2,2,179,1,181,1,
-46,180,1,
-46,183,1,
-52,184,1,
+51,255,255,88,2,3,
+54,172,1,4,
+51,161,1,
+51,165,1,
+51,169,1,
+28,173,1,
+39,
+16,0,2,0,0,56,2,2,170,1,171,1,
+51,255,255,88,2,
+51,173,1,
+55,174,1,
 17,94,2,
-46,166,1,3,
-29,185,1,
-17,96,2,1,184,1,
-46,166,1,
-52,186,1,
+51,255,255,45,2,3,
+28,175,1,
+17,96,2,1,174,1,
+51,255,255,45,2,
+55,176,1,
 17,94,2,
-46,170,1,3,
-51,187,1,2,
-46,185,1,
-29,188,1,
-17,96,2,1,186,1,
-46,170,1,
-46,188,1,
-52,189,1,
+51,255,255,71,2,3,
+54,177,1,2,
+51,175,1,
+28,178,1,
+17,96,2,1,176,1,
+51,255,255,71,2,
+51,178,1,
+55,179,1,
 17,94,2,
-46,166,1,3,
-29,190,1,
-37,
-16,0,2,0,0,104,2,1,189,1,
-46,145,0,
-52,191,1,
+51,255,255,45,2,3,
+28,180,1,
+39,
+16,0,2,0,0,104,2,1,179,1,
+51,255,255,181,0,
+55,181,1,
 17,94,2,
-46,170,1,3,
-51,192,1,2,
-46,190,1,
-29,193,1,
-37,
-16,0,2,0,0,104,2,1,191,1,
-46,153,0,
-46,193,1,
-52,194,1,
+51,255,255,71,2,3,
+54,182,1,2,
+51,180,1,
+28,183,1,
+39,
+16,0,2,0,0,104,2,1,181,1,
+51,255,255,191,0,
+51,183,1,
+55,184,1,
 17,94,2,
-46,166,1,3,
-29,195,1,
-37,
-16,0,2,0,0,116,2,1,194,1,
-46,166,1,
-52,196,1,
+51,255,255,45,2,3,
+28,185,1,
+39,
+16,0,2,0,0,116,2,1,184,1,
+51,255,255,45,2,
+55,186,1,
 17,94,2,
-46,170,1,3,
-51,197,1,2,
-46,195,1,
-29,198,1,
-37,
-16,0,2,0,0,116,2,1,196,1,
-46,170,1,
-46,198,1,
-52,199,1,
+51,255,255,71,2,3,
+54,187,1,2,
+51,185,1,
+28,188,1,
+39,
+16,0,2,0,0,116,2,1,186,1,
+51,255,255,71,2,
+51,188,1,
+55,189,1,
 17,94,2,
-49,200,1,126,2,3,
-51,201,1,3,
-46,195,1,
-46,198,1,
-29,202,1,
-37,
-16,0,2,0,0,116,2,1,199,1,
-49,203,1,135,2,
-46,202,1,
-52,204,1,
+51,255,255,126,2,3,
+54,190,1,3,
+51,185,1,
+51,188,1,
+28,191,1,
+39,
+16,0,2,0,0,116,2,1,189,1,
+51,255,255,135,2,
+51,191,1,
+55,192,1,
 17,94,2,
-49,205,1,144,2,3,
-51,206,1,4,
-46,195,1,
-46,198,1,
-46,202,1,
-29,207,1,
-37,
-16,0,2,0,0,116,2,1,204,1,
-49,208,1,152,2,
-46,207,1,
-52,209,1,
+51,255,255,144,2,3,
+54,193,1,4,
+51,185,1,
+51,188,1,
+51,191,1,
+28,194,1,
+39,
+16,0,2,0,0,116,2,1,192,1,
+51,255,255,152,2,
+51,194,1,
+55,195,1,
 17,94,2,
-49,210,1,160,2,3,
-51,211,1,5,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-29,212,1,
-37,
-16,0,2,0,0,116,2,1,209,1,
-49,213,1,169,2,
-46,212,1,
-52,214,1,
+51,255,255,160,2,3,
+54,196,1,5,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+28,197,1,
+39,
+16,0,2,0,0,116,2,1,195,1,
+51,255,255,169,2,
+51,197,1,
+55,198,1,
 17,94,2,
-49,215,1,178,2,3,
-51,216,1,6,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-29,217,1,
-37,
-16,0,2,0,0,116,2,1,214,1,
-49,218,1,186,2,
-46,217,1,
-52,219,1,
+51,255,255,178,2,3,
+54,199,1,6,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+28,200,1,
+39,
+16,0,2,0,0,116,2,1,198,1,
+51,255,255,186,2,
+51,200,1,
+55,201,1,
 17,94,2,
-46,203,1,3,
-51,220,1,7,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-29,221,1,
-37,
-16,0,2,0,0,116,2,1,219,1,
-46,200,1,
-46,221,1,
-52,222,1,
+51,255,255,135,2,3,
+54,202,1,7,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+28,203,1,
+39,
+16,0,2,0,0,116,2,1,201,1,
+51,255,255,126,2,
+51,203,1,
+55,204,1,
 17,94,2,
-46,208,1,3,
-51,223,1,8,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-29,224,1,
-37,
-16,0,2,0,0,116,2,1,222,1,
-46,205,1,
-46,224,1,
-52,225,1,
+51,255,255,152,2,3,
+54,205,1,8,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+28,206,1,
+39,
+16,0,2,0,0,116,2,1,204,1,
+51,255,255,144,2,
+51,206,1,
+55,207,1,
 17,94,2,
-49,226,1,194,2,3,
-51,227,1,9,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-29,228,1,
-37,
-16,0,2,0,0,116,2,1,225,1,
-49,229,1,203,2,
-46,228,1,
-52,230,1,
+51,255,255,194,2,3,
+54,208,1,9,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+28,209,1,
+39,
+16,0,2,0,0,116,2,1,207,1,
+51,255,255,203,2,
+51,209,1,
+55,210,1,
 17,94,2,
-49,231,1,212,2,3,
-51,232,1,10,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-46,228,1,
-29,233,1,
-37,
-16,0,2,0,0,116,2,1,230,1,
-49,234,1,220,2,
-46,233,1,
-52,235,1,
+51,255,255,212,2,3,
+54,211,1,10,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+51,209,1,
+28,212,1,
+39,
+16,0,2,0,0,116,2,1,210,1,
+51,255,255,220,2,
+51,212,1,
+55,213,1,
 17,94,2,
-46,213,1,3,
-51,236,1,11,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-46,228,1,
-46,233,1,
-29,237,1,
-37,
-16,0,2,0,0,116,2,1,235,1,
-46,210,1,
-46,237,1,
-52,238,1,
+51,255,255,169,2,3,
+54,214,1,11,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+51,209,1,
+51,212,1,
+28,215,1,
+39,
+16,0,2,0,0,116,2,1,213,1,
+51,255,255,160,2,
+51,215,1,
+55,216,1,
 17,94,2,
-46,218,1,3,
-51,239,1,12,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-46,228,1,
-46,233,1,
-46,237,1,
-29,240,1,
-37,
-16,0,2,0,0,116,2,1,238,1,
-46,215,1,
-46,240,1,
-52,241,1,
+51,255,255,186,2,3,
+54,217,1,12,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+51,209,1,
+51,212,1,
+51,215,1,
+28,218,1,
+39,
+16,0,2,0,0,116,2,1,216,1,
+51,255,255,178,2,
+51,218,1,
+55,219,1,
 17,94,2,
-46,229,1,3,
-51,242,1,13,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-46,228,1,
-46,233,1,
-46,237,1,
-46,240,1,
-29,243,1,
-37,
-16,0,2,0,0,116,2,1,241,1,
-46,226,1,
-46,243,1,
-52,244,1,
+51,255,255,203,2,3,
+54,220,1,13,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+51,209,1,
+51,212,1,
+51,215,1,
+51,218,1,
+28,221,1,
+39,
+16,0,2,0,0,116,2,1,219,1,
+51,255,255,194,2,
+51,221,1,
+55,222,1,
 17,94,2,
-46,234,1,3,
-51,245,1,14,
-46,195,1,
-46,198,1,
-46,202,1,
-46,207,1,
-46,212,1,
-46,217,1,
-46,221,1,
-46,224,1,
-46,228,1,
-46,233,1,
-46,237,1,
-46,240,1,
-46,243,1,
-29,246,1,
-37,
-16,0,2,0,0,116,2,1,244,1,
-46,231,1,
-46,246,1,
-52,247,1,
+51,255,255,220,2,3,
+54,223,1,14,
+51,185,1,
+51,188,1,
+51,191,1,
+51,194,1,
+51,197,1,
+51,200,1,
+51,203,1,
+51,206,1,
+51,209,1,
+51,212,1,
+51,215,1,
+51,218,1,
+51,221,1,
+28,224,1,
+39,
+16,0,2,0,0,116,2,1,222,1,
+51,255,255,212,2,
+51,224,1,
+55,225,1,
 17,228,2,
-49,248,1,230,2,3,
-52,249,1,
+51,255,255,230,2,3,
+55,226,1,
 17,235,2,
-46,248,1,3,
-29,250,1,
-37,
-16,0,2,0,0,237,2,2,247,1,249,1,
-46,166,1,
-52,251,1,
+51,255,255,230,2,3,
+28,227,1,
+39,
+16,0,2,0,0,237,2,2,225,1,226,1,
+51,255,255,45,2,
+55,228,1,
 17,228,2,
-49,252,1,250,2,3,
-52,253,1,
+51,255,255,250,2,3,
+55,229,1,
 17,235,2,
-46,252,1,3,
-51,254,1,2,
-46,250,1,
-29,255,1,
-37,
-16,0,2,0,0,237,2,2,251,1,253,1,
-46,170,1,
-46,255,1,
-52,0,2,
+51,255,255,250,2,3,
+54,230,1,2,
+51,227,1,
+28,231,1,
+39,
+16,0,2,0,0,237,2,2,228,1,229,1,
+51,255,255,71,2,
+51,231,1,
+55,232,1,
 17,228,2,
-46,127,1,3,
-52,1,2,
+51,255,255,231,1,3,
+55,233,1,
 17,235,2,
-46,103,1,3,
-51,2,2,3,
-46,250,1,
-46,255,1,
-29,3,2,
-37,
-16,0,2,0,0,237,2,2,0,2,1,2,
-46,203,1,
-46,3,2,
-52,4,2,
+51,255,255,166,1,3,
+54,234,1,3,
+51,227,1,
+51,231,1,
+28,235,1,
+39,
+16,0,2,0,0,237,2,2,232,1,233,1,
+51,255,255,135,2,
+51,235,1,
+55,236,1,
 17,228,2,
-46,131,1,3,
-52,5,2,
+51,255,255,244,1,3,
+55,237,1,
 17,235,2,
-49,6,2,0,3,3,
-51,7,2,4,
-46,250,1,
-46,255,1,
-46,3,2,
-29,8,2,
-37,
-16,0,2,0,0,237,2,2,4,2,5,2,
-46,208,1,
-46,8,2,
-52,9,2,
+51,255,255,0,3,3,
+54,238,1,4,
+51,227,1,
+51,231,1,
+51,235,1,
+28,239,1,
+39,
+16,0,2,0,0,237,2,2,236,1,237,1,
+51,255,255,152,2,
+51,239,1,
+55,240,1,
 17,228,2,
-46,103,1,3,
-52,10,2,
+51,255,255,166,1,3,
+55,241,1,
 17,235,2,
-46,127,1,3,
-51,11,2,5,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-29,12,2,
-37,
-16,0,2,0,0,237,2,2,9,2,10,2,
-46,200,1,
-46,12,2,
-52,13,2,
+51,255,255,231,1,3,
+54,242,1,5,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+28,243,1,
+39,
+16,0,2,0,0,237,2,2,240,1,241,1,
+51,255,255,126,2,
+51,243,1,
+55,244,1,
 17,228,2,
-46,6,2,3,
-52,14,2,
+51,255,255,0,3,3,
+55,245,1,
 17,235,2,
-46,131,1,3,
-51,15,2,6,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-29,16,2,
-37,
-16,0,2,0,0,237,2,2,13,2,14,2,
-46,205,1,
-46,16,2,
-52,17,2,
+51,255,255,244,1,3,
+54,246,1,6,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+28,247,1,
+39,
+16,0,2,0,0,237,2,2,244,1,245,1,
+51,255,255,144,2,
+51,247,1,
+55,248,1,
 17,228,2,
-49,18,2,6,3,3,
-52,19,2,
+51,255,255,6,3,3,
+55,249,1,
 17,235,2,
-46,103,1,3,
-51,20,2,7,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-29,21,2,
-37,
-16,0,2,0,0,237,2,2,17,2,19,2,
-46,213,1,
-46,21,2,
-52,22,2,
+51,255,255,166,1,3,
+54,250,1,7,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+28,251,1,
+39,
+16,0,2,0,0,237,2,2,248,1,249,1,
+51,255,255,169,2,
+51,251,1,
+55,252,1,
 17,228,2,
-49,23,2,13,3,3,
-52,24,2,
+51,255,255,13,3,3,
+55,253,1,
 17,235,2,
-46,6,2,3,
-51,25,2,8,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-29,26,2,
-37,
-16,0,2,0,0,237,2,2,22,2,24,2,
-46,218,1,
-46,26,2,
-52,27,2,
+51,255,255,0,3,3,
+54,254,1,8,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+28,255,1,
+39,
+16,0,2,0,0,237,2,2,252,1,253,1,
+51,255,255,186,2,
+51,255,1,
+55,0,2,
 17,228,2,
-46,103,1,3,
-52,28,2,
+51,255,255,166,1,3,
+55,1,2,
 17,235,2,
-46,18,2,3,
-51,29,2,9,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-29,30,2,
-37,
-16,0,2,0,0,237,2,2,27,2,28,2,
-46,210,1,
-46,30,2,
-52,31,2,
+51,255,255,6,3,3,
+54,2,2,9,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+28,3,2,
+39,
+16,0,2,0,0,237,2,2,0,2,1,2,
+51,255,255,160,2,
+51,3,2,
+55,4,2,
 17,228,2,
-46,6,2,3,
-52,32,2,
+51,255,255,0,3,3,
+55,5,2,
 17,235,2,
-46,23,2,3,
-51,33,2,10,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-46,30,2,
-29,34,2,
-37,
-16,0,2,0,0,237,2,2,31,2,32,2,
-46,215,1,
-46,34,2,
-52,35,2,
+51,255,255,13,3,3,
+54,6,2,10,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+28,7,2,
+39,
+16,0,2,0,0,237,2,2,4,2,5,2,
+51,255,255,178,2,
+51,7,2,
+55,8,2,
 17,228,2,
-46,18,2,3,
-52,36,2,
+51,255,255,6,3,3,
+55,9,2,
 17,235,2,
-46,127,1,3,
-51,37,2,11,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-46,30,2,
-46,34,2,
-29,38,2,
-37,
-16,0,2,0,0,237,2,2,35,2,36,2,
-46,229,1,
-46,38,2,
-52,39,2,
+51,255,255,231,1,3,
+54,10,2,11,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+51,7,2,
+28,11,2,
+39,
+16,0,2,0,0,237,2,2,8,2,9,2,
+51,255,255,203,2,
+51,11,2,
+55,12,2,
 17,228,2,
-46,23,2,3,
-52,40,2,
+51,255,255,13,3,3,
+55,13,2,
 17,235,2,
-46,131,1,3,
-51,41,2,12,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-46,30,2,
-46,34,2,
-46,38,2,
-29,42,2,
-37,
-16,0,2,0,0,237,2,2,39,2,40,2,
-46,234,1,
-46,42,2,
-52,43,2,
+51,255,255,244,1,3,
+54,14,2,12,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+51,7,2,
+51,11,2,
+28,15,2,
+39,
+16,0,2,0,0,237,2,2,12,2,13,2,
+51,255,255,220,2,
+51,15,2,
+55,16,2,
 17,228,2,
-46,127,1,3,
-52,44,2,
+51,255,255,231,1,3,
+55,17,2,
 17,235,2,
-46,18,2,3,
-51,45,2,13,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-46,30,2,
-46,34,2,
-46,38,2,
-46,42,2,
-29,46,2,
-37,
-16,0,2,0,0,237,2,2,43,2,44,2,
-46,226,1,
-46,46,2,
-52,47,2,
+51,255,255,6,3,3,
+54,18,2,13,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+51,7,2,
+51,11,2,
+51,15,2,
+28,19,2,
+39,
+16,0,2,0,0,237,2,2,16,2,17,2,
+51,255,255,194,2,
+51,19,2,
+55,20,2,
 17,228,2,
-46,131,1,3,
-52,48,2,
+51,255,255,244,1,3,
+55,21,2,
 17,235,2,
-46,23,2,3,
-51,49,2,14,
-46,250,1,
-46,255,1,
-46,3,2,
-46,8,2,
-46,12,2,
-46,16,2,
-46,21,2,
-46,26,2,
-46,30,2,
-46,34,2,
-46,38,2,
-46,42,2,
-46,46,2,
-29,50,2,
-37,
-16,0,2,0,0,237,2,2,47,2,48,2,
-46,231,1,
-46,50,2,
-52,51,2,
-17,55,0,
-46,248,1,3,
-52,52,2,
+51,255,255,13,3,3,
+54,22,2,14,
+51,227,1,
+51,231,1,
+51,235,1,
+51,239,1,
+51,243,1,
+51,247,1,
+51,251,1,
+51,255,1,
+51,3,2,
+51,7,2,
+51,11,2,
+51,15,2,
+51,19,2,
+28,23,2,
+39,
+16,0,2,0,0,237,2,2,20,2,21,2,
+51,255,255,212,2,
+51,23,2,
+55,24,2,
+17,55,0,
+51,255,255,230,2,3,
+55,25,2,
 17,67,0,
-46,248,1,3,
-29,53,2,
-17,19,3,2,51,2,52,2,
-49,54,2,28,3,
-52,55,2,
-17,55,0,
-46,252,1,3,
-52,56,2,
+51,255,255,230,2,3,
+28,26,2,
+17,19,3,2,24,2,25,2,
+51,255,255,28,3,
+55,27,2,
+17,55,0,
+51,255,255,250,2,3,
+55,28,2,
 17,67,0,
-46,252,1,3,
-51,57,2,2,
-46,53,2,
-29,58,2,
-17,19,3,2,55,2,56,2,
-46,54,2,
-46,58,2,
-52,59,2,
-17,55,0,
-49,60,2,34,3,3,
-52,61,2,
+51,255,255,250,2,3,
+54,29,2,2,
+51,26,2,
+28,30,2,
+17,19,3,2,27,2,28,2,
+51,255,255,28,3,
+51,30,2,
+55,31,2,
+17,55,0,
+51,255,255,34,3,3,
+55,32,2,
 17,67,0,
-46,60,2,3,
-51,62,2,3,
-46,53,2,
-46,58,2,
-29,63,2,
-17,19,3,2,59,2,61,2,
-46,54,2,
-46,63,2,
-52,64,2,
-17,55,0,
-46,248,1,3,
-52,65,2,
+51,255,255,34,3,3,
+54,33,2,3,
+51,26,2,
+51,30,2,
+28,34,2,
+17,19,3,2,31,2,32,2,
+51,255,255,28,3,
+51,34,2,
+55,35,2,
+17,55,0,
+51,255,255,230,2,3,
+55,36,2,
 17,67,0,
-46,248,1,3,
-29,66,2,
-17,40,3,2,64,2,65,2,
-46,54,2,
-52,67,2,
-17,55,0,
-46,252,1,3,
-52,68,2,
+51,255,255,230,2,3,
+28,37,2,
+17,40,3,2,35,2,36,2,
+51,255,255,28,3,
+55,38,2,
+17,55,0,
+51,255,255,250,2,3,
+55,39,2,
 17,67,0,
-46,252,1,3,
-51,69,2,2,
-46,66,2,
-29,70,2,
-17,40,3,2,67,2,68,2,
-46,54,2,
-46,70,2,
-52,71,2,
-17,55,0,
-46,60,2,3,
-52,72,2,
+51,255,255,250,2,3,
+54,40,2,2,
+51,37,2,
+28,41,2,
+17,40,3,2,38,2,39,2,
+51,255,255,28,3,
+51,41,2,
+55,42,2,
+17,55,0,
+51,255,255,34,3,3,
+55,43,2,
 17,67,0,
-46,60,2,3,
-51,73,2,3,
-46,66,2,
-46,70,2,
-29,74,2,
-17,40,3,2,71,2,72,2,
-46,54,2,
-46,74,2,
-52,75,2,
-17,55,0,
-46,248,1,3,
-52,76,2,
+51,255,255,34,3,3,
+54,44,2,3,
+51,37,2,
+51,41,2,
+28,45,2,
+17,40,3,2,42,2,43,2,
+51,255,255,28,3,
+51,45,2,
+55,46,2,
+17,55,0,
+51,255,255,230,2,3,
+55,47,2,
 17,67,0,
-46,248,1,3,
-29,77,2,
-17,54,3,2,75,2,76,2,
-46,54,2,
-52,78,2,
-17,55,0,
-46,252,1,3,
-52,79,2,
+51,255,255,230,2,3,
+28,48,2,
+17,54,3,2,46,2,47,2,
+51,255,255,28,3,
+55,49,2,
+17,55,0,
+51,255,255,250,2,3,
+55,50,2,
 17,67,0,
-46,252,1,3,
-51,80,2,2,
-46,77,2,
-29,81,2,
-17,54,3,2,78,2,79,2,
-46,54,2,
-46,81,2,
-52,82,2,
-17,55,0,
-46,60,2,3,
-52,83,2,
+51,255,255,250,2,3,
+54,51,2,2,
+51,48,2,
+28,52,2,
+17,54,3,2,49,2,50,2,
+51,255,255,28,3,
+51,52,2,
+55,53,2,
+17,55,0,
+51,255,255,34,3,3,
+55,54,2,
 17,67,0,
-46,60,2,3,
-51,84,2,3,
-46,77,2,
-46,81,2,
-29,85,2,
-17,54,3,2,82,2,83,2,
-46,54,2,
-46,85,2,
-52,86,2,
-17,55,0,
-46,248,1,3,
-52,87,2,
+51,255,255,34,3,3,
+54,55,2,3,
+51,48,2,
+51,52,2,
+28,56,2,
+17,54,3,2,53,2,54,2,
+51,255,255,28,3,
+51,56,2,
+55,57,2,
+17,55,0,
+51,255,255,230,2,3,
+55,58,2,
 17,67,0,
-46,248,1,3,
-29,88,2,
-17,66,3,2,86,2,87,2,
-46,54,2,
-52,89,2,
-17,55,0,
-46,252,1,3,
-52,90,2,
+51,255,255,230,2,3,
+28,59,2,
+17,66,3,2,57,2,58,2,
+51,255,255,28,3,
+55,60,2,
+17,55,0,
+51,255,255,250,2,3,
+55,61,2,
 17,67,0,
-46,252,1,3,
-51,91,2,2,
-46,88,2,
-29,92,2,
-17,66,3,2,89,2,90,2,
-46,54,2,
-46,92,2,
-52,93,2,
-17,55,0,
-46,60,2,3,
-52,94,2,
+51,255,255,250,2,3,
+54,62,2,2,
+51,59,2,
+28,63,2,
+17,66,3,2,60,2,61,2,
+51,255,255,28,3,
+51,63,2,
+55,64,2,
+17,55,0,
+51,255,255,34,3,3,
+55,65,2,
 17,67,0,
-46,60,2,3,
-51,95,2,3,
-46,88,2,
-46,92,2,
-29,96,2,
-17,66,3,2,93,2,94,2,
-46,54,2,
-46,96,2,
-52,97,2,
-17,55,0,
-46,248,1,3,
-52,98,2,
+51,255,255,34,3,3,
+54,66,2,3,
+51,59,2,
+51,63,2,
+28,67,2,
+17,66,3,2,64,2,65,2,
+51,255,255,28,3,
+51,67,2,
+55,68,2,
+17,55,0,
+51,255,255,230,2,3,
+55,69,2,
 17,67,0,
-46,248,1,3,
-29,99,2,
-17,83,3,2,97,2,98,2,
-46,54,2,
-52,100,2,
-17,55,0,
-46,252,1,3,
-52,101,2,
+51,255,255,230,2,3,
+28,70,2,
+17,83,3,2,68,2,69,2,
+51,255,255,28,3,
+55,71,2,
+17,55,0,
+51,255,255,250,2,3,
+55,72,2,
 17,67,0,
-46,252,1,3,
-51,102,2,2,
-46,99,2,
-29,103,2,
-17,83,3,2,100,2,101,2,
-46,54,2,
-46,103,2,
-52,104,2,
-17,55,0,
-46,60,2,3,
-52,105,2,
+51,255,255,250,2,3,
+54,73,2,2,
+51,70,2,
+28,74,2,
+17,83,3,2,71,2,72,2,
+51,255,255,28,3,
+51,74,2,
+55,75,2,
+17,55,0,
+51,255,255,34,3,3,
+55,76,2,
 17,67,0,
-46,60,2,3,
-51,106,2,3,
-46,99,2,
-46,103,2,
-29,107,2,
-17,83,3,2,104,2,105,2,
-46,54,2,
-46,107,2,
-52,108,2,
-17,55,0,
-46,54,2,3,
-52,109,2,
+51,255,255,34,3,3,
+54,77,2,3,
+51,70,2,
+51,74,2,
+28,78,2,
+17,83,3,2,75,2,76,2,
+51,255,255,28,3,
+51,78,2,
+55,79,2,
+17,55,0,
+51,255,255,28,3,3,
+55,80,2,
 17,67,0,
-46,54,2,3,
-51,110,2,4,
-46,99,2,
-46,103,2,
-46,107,2,
-29,111,2,
-17,83,3,2,108,2,109,2,
-46,54,2,
-46,111,2,
-52,112,2,
-17,55,0,
-46,248,1,3,
-52,113,2,
+51,255,255,28,3,3,
+54,81,2,4,
+51,70,2,
+51,74,2,
+51,78,2,
+28,82,2,
+17,83,3,2,79,2,80,2,
+51,255,255,28,3,
+51,82,2,
+55,83,2,
+17,55,0,
+51,255,255,230,2,3,
+55,84,2,
 17,67,0,
-46,248,1,3,
-29,114,2,
-17,89,3,2,112,2,113,2,
-46,54,2,
-52,115,2,
-17,55,0,
-46,252,1,3,
-52,116,2,
+51,255,255,230,2,3,
+28,85,2,
+17,89,3,2,83,2,84,2,
+51,255,255,28,3,
+55,86,2,
+17,55,0,
+51,255,255,250,2,3,
+55,87,2,
 17,67,0,
-46,252,1,3,
-51,117,2,2,
-46,114,2,
-29,118,2,
-17,89,3,2,115,2,116,2,
-46,54,2,
-46,118,2,
-52,119,2,
-17,55,0,
-46,60,2,3,
-52,120,2,
+51,255,255,250,2,3,
+54,88,2,2,
+51,85,2,
+28,89,2,
+17,89,3,2,86,2,87,2,
+51,255,255,28,3,
+51,89,2,
+55,90,2,
+17,55,0,
+51,255,255,34,3,3,
+55,91,2,
 17,67,0,
-46,60,2,3,
-51,121,2,3,
-46,114,2,
-46,118,2,
-29,122,2,
-17,89,3,2,119,2,120,2,
-46,54,2,
-46,122,2,
-52,123,2,
-17,55,0,
-46,54,2,3,
-52,124,2,
+51,255,255,34,3,3,
+54,92,2,3,
+51,85,2,
+51,89,2,
+28,93,2,
+17,89,3,2,90,2,91,2,
+51,255,255,28,3,
+51,93,2,
+55,94,2,
+17,55,0,
+51,255,255,28,3,3,
+55,95,2,
 17,67,0,
-46,54,2,3,
-51,125,2,4,
-46,114,2,
-46,118,2,
-46,122,2,
-29,126,2,
-17,89,3,2,123,2,124,2,
-46,54,2,
-46,126,2,
-52,127,2,
-17,55,0,
-46,54,2,3,
-29,128,2,
-17,98,3,1,127,2,
-49,129,2,102,3,
-52,130,2,
-17,55,0,
-46,54,2,3,
-29,131,2,
-17,107,3,1,130,2,
-46,129,2,
-52,132,2,
-17,55,0,
-46,54,2,3,
-29,133,2,
-17,111,3,1,132,2,
-46,54,2,
-52,134,2,
+51,255,255,28,3,3,
+54,96,2,4,
+51,85,2,
+51,89,2,
+51,93,2,
+28,97,2,
+17,89,3,2,94,2,95,2,
+51,255,255,28,3,
+51,97,2,
+55,98,2,
+17,55,0,
+51,255,255,28,3,3,
+28,99,2,
+17,98,3,1,98,2,
+51,255,255,102,3,
+55,100,2,
+17,55,0,
+51,255,255,28,3,3,
+28,101,2,
+17,107,3,1,100,2,
+51,255,255,102,3,
+55,102,2,
+17,55,0,
+51,255,255,28,3,3,
+28,103,2,
+17,111,3,1,102,2,
+51,255,255,28,3,
+55,104,2,
 17,187,1,
-46,2,0,3,
-29,135,2,
-37,
-16,0,2,0,0,115,3,1,134,2,
-46,2,0,
-52,136,2,
+51,255,255,10,0,3,
+28,105,2,
+39,
+16,0,2,0,0,115,3,1,104,2,
+51,255,255,10,0,
+55,106,2,
 17,187,1,
-46,2,0,3,
-29,137,2,
-37,
-16,0,2,0,0,120,3,1,136,2,
-46,2,0,
-52,138,2,
+51,255,255,10,0,3,
+28,107,2,
+39,
+16,0,2,0,0,120,3,1,106,2,
+51,255,255,10,0,
+55,108,2,
 17,187,1,
-46,5,0,3,
-51,139,2,2,
-46,135,2,
-29,140,2,
-37,
-16,0,2,0,0,115,3,1,138,2,
-46,5,0,
-46,140,2,
-52,141,2,
+51,255,255,27,0,3,
+54,109,2,2,
+51,105,2,
+28,110,2,
+39,
+16,0,2,0,0,115,3,1,108,2,
+51,255,255,27,0,
+51,110,2,
+55,111,2,
 17,187,1,
-46,5,0,3,
-51,142,2,2,
-46,137,2,
-29,143,2,
-37,
-16,0,2,0,0,120,3,1,141,2,
-46,5,0,
-46,143,2,
-52,144,2,
+51,255,255,27,0,3,
+54,112,2,2,
+51,107,2,
+28,113,2,
+39,
+16,0,2,0,0,120,3,1,111,2,
+51,255,255,27,0,
+51,113,2,
+55,114,2,
 17,187,1,
-46,2,0,3,
-29,145,2,
-37,
-16,0,2,0,0,125,3,1,144,2,
-46,2,0,
-52,146,2,
+51,255,255,10,0,3,
+28,115,2,
+39,
+16,0,2,0,0,125,3,1,114,2,
+51,255,255,10,0,
+55,116,2,
 17,187,1,
-46,5,0,3,
-51,147,2,2,
-46,145,2,
-29,148,2,
-37,
-16,0,2,0,0,125,3,1,146,2,
-46,5,0,
-46,148,2,
-52,149,2,
+51,255,255,27,0,3,
+54,117,2,2,
+51,115,2,
+28,118,2,
+39,
+16,0,2,0,0,125,3,1,116,2,
+51,255,255,27,0,
+51,118,2,
+55,119,2,
 17,132,3,
-46,23,2,3,
-29,150,2,
-17,138,3,1,149,2,
-46,23,2,
-52,151,2,
+51,255,255,13,3,3,
+28,120,2,
+17,138,3,1,119,2,
+51,255,255,13,3,
+55,121,2,
 17,132,3,
-46,18,2,3,
-51,152,2,2,
-46,150,2,
-29,153,2,
-17,138,3,1,151,2,
-46,18,2,
-46,153,2,
-52,154,2,
-17,147,3,
-46,103,1,3,
-52,155,2,
-17,154,3,
-49,156,2,156,3,3,
-29,157,2,
-17,163,3,2,154,2,155,2,
-46,23,2,
-52,158,2,
+51,255,255,6,3,3,
+54,122,2,2,
+51,120,2,
+28,123,2,
+17,138,3,1,121,2,
+51,255,255,6,3,
+51,123,2,
+55,124,2,
 17,132,3,
-46,23,2,3,
-52,159,2,
-17,169,3,
-49,160,2,171,3,3,
-51,161,2,2,
-46,157,2,
-29,162,2,
-17,163,3,2,158,2,159,2,
-46,23,2,
-46,162,2,
-52,163,2,
-17,183,3,
-46,23,2,3,
-52,164,2,
-17,187,3,
-46,23,2,3,
-52,165,2,
-17,191,3,
-49,166,2,193,3,3,
-51,167,2,3,
-46,157,2,
-46,162,2,
-29,168,2,
-17,163,3,3,163,2,164,2,165,2,
-46,23,2,
-46,168,2,73,0,
-127,2,
-118,0,
+51,255,255,244,1,3,
+28,125,2,
+17,147,3,1,124,2,
+51,255,255,244,1,
+55,126,2,
+17,132,3,
+51,255,255,244,1,3,
+28,127,2,
+17,160,3,1,126,2,
+51,255,255,244,1,
+55,128,2,
+17,175,3,
+51,255,255,166,1,3,
+55,129,2,
+17,182,3,
+51,255,255,184,3,3,
+28,130,2,
+17,191,3,2,128,2,129,2,
+51,255,255,13,3,
+55,131,2,
+17,132,3,
+51,255,255,13,3,3,
+55,132,2,
+17,197,3,
+51,255,255,199,3,3,
+54,133,2,2,
+51,130,2,
+28,134,2,
+17,191,3,2,131,2,132,2,
+51,255,255,13,3,
+51,134,2,
+55,135,2,
+17,211,3,
+51,255,255,13,3,3,
+55,136,2,
+17,215,3,
+51,255,255,13,3,3,
+55,137,2,
+17,219,3,
+51,255,255,221,3,3,
+54,138,2,3,
+51,130,2,
+51,134,2,
+28,139,2,
+17,191,3,3,135,2,136,2,137,2,
+51,255,255,13,3,
+51,139,2,75,0,
+137,2,
+7,1,
 33,0,
 71,0,
-94,2,
-92,2,
+100,2,
+98,2,
 28,0,
 66,0,
 46,0,
 76,0,
 133,0,
-63,1,
+69,1,
 18,0,
 56,0,
-120,1,
-102,2,
-105,2,
+126,1,
+108,2,
+111,2,
 8,0,
-175,1,
-106,1,
-113,1,
-74,2,
+181,1,
+112,1,
+119,1,
+80,2,
 88,0,
 98,0,
-134,1,
-7,1,
-9,1,
+140,1,
+13,1,
+15,1,
 128,0,
 138,0,
-110,2,
-48,2,
-59,2,
-11,1,
-170,1,
+126,2,
+116,2,
+54,2,
+65,2,
+17,1,
+176,1,
 113,0,
-83,1,
-78,1,
-99,1,
-26,2,
-37,2,
+89,1,
+84,1,
+105,1,
+32,2,
+43,2,
 93,0,
 103,0,
-165,1,
-43,1,
-35,1,
-73,1,
+171,1,
+49,1,
+41,1,
+79,1,
 153,0,
-90,1,
-125,1,
-96,2,
-89,2,
-15,2,
-93,1,
+96,1,
+131,1,
+102,2,
+95,2,
+21,2,
+99,1,
 83,0,
 3,0,
-141,1,
-150,1,
-22,1,
-27,1,
+147,1,
+156,1,
+28,1,
+33,1,
 207,0,
-123,0,
+10,1,
 13,0,
 51,0,
 4,1,
@@ -2446,45 +2483,46 @@ static uint8_t SKSL_INCLUDE_sksl_public[] = {199,3,
 241,0,
 23,0,
 61,0,
-216,1,
-17,1,
-13,1,
-95,1,
-115,2,
+124,2,
+222,1,
+23,1,
+19,1,
+101,1,
+121,2,
 20,
-28,150,2,
+29,120,2,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,23,2,2,
+51,255,255,13,3,2,
 1,
-45,
-55,149,2,0,3,0,1,2,52,
+50,
+57,119,2,0,3,0,1,2,52,
 27,
-46,153,0,185,0,2,
-45,
-55,149,2,0,1,3,
+51,255,255,191,0,181,0,2,
+50,
+57,119,2,0,1,3,
 25,
-46,153,0,23,183,209,56,
-45,
-55,149,2,0,1,3,1,
-28,153,2,
+51,255,255,191,0,23,183,209,56,
+50,
+57,119,2,0,1,3,1,
+29,123,2,
 2,
-48,0,0,0,0,1,
-40,
+52,1,0,0,0,0,1,
+44,
 8,
-46,18,2,2,
+51,255,255,6,3,2,
 1,
-45,
-55,151,2,0,3,0,1,2,52,
+50,
+57,121,2,0,3,0,1,2,52,
 27,
-46,145,0,177,0,2,
-45,
-55,151,2,0,1,3,
+51,255,255,181,0,173,0,2,
+50,
+57,121,2,0,1,3,
 25,
-46,145,0,23,183,209,56,
-45,
-55,151,2,0,1,3,1,
+51,255,255,181,0,23,183,209,56,
+50,
+57,121,2,0,1,3,1,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_public_LENGTH = sizeof(SKSL_INCLUDE_sksl_public);
diff --git a/third_party/skia/src/sksl/generated/sksl_rt_shader.dehydrated.sksl b/third_party/skia/src/sksl/generated/sksl_rt_shader.dehydrated.sksl
index 22d213e6b00df..51c07ef9bf7bd 100644
--- a/third_party/skia/src/sksl/generated/sksl_rt_shader.dehydrated.sksl
+++ b/third_party/skia/src/sksl/generated/sksl_rt_shader.dehydrated.sksl
@@ -1,16 +1,16 @@
-static uint8_t SKSL_INCLUDE_sksl_rt_shader[] = {20,0,
+static uint8_t SKSL_INCLUDE_sksl_rt_shader[] = {8,0,20,0,
 12,115,107,95,70,114,97,103,67,111,111,114,100,
 6,102,108,111,97,116,52,
-48,1,0,
-52,1,0,
-36,
-35,0,2,0,0,255,255,255,255,255,15,0,255,0,2,0,
-49,2,0,15,0,0,1,0,
+52,1,1,0,
+55,1,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,15,0,255,0,2,0,
+51,255,255,15,0,0,1,0,
 0,0,
 20,
-54,
-53,1,0,
-46,2,0,0,
-56,
+31,
+56,1,0,
+51,255,255,15,0,0,
+58,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_rt_shader_LENGTH = sizeof(SKSL_INCLUDE_sksl_rt_shader);
diff --git a/third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl b/third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
index 5c57820b11cda..6480297cad6d0 100644
--- a/third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
+++ b/third_party/skia/src/sksl/generated/sksl_vert.dehydrated.sksl
@@ -1,4 +1,4 @@
-static uint8_t SKSL_INCLUDE_sksl_vert[] = {82,0,
+static uint8_t SKSL_INCLUDE_sksl_vert[] = {8,0,82,0,
 12,115,107,95,80,101,114,86,101,114,116,101,120,
 11,115,107,95,80,111,115,105,116,105,111,110,
 6,102,108,111,97,116,52,
@@ -8,42 +8,42 @@ static uint8_t SKSL_INCLUDE_sksl_vert[] = {82,0,
 3,105,110,116,
 13,115,107,95,73,110,115,116,97,110,99,101,73,68,
 0,
-48,6,0,
-43,1,0,2,0,2,
-36,
-35,0,2,0,0,255,255,255,255,255,0,0,255,0,15,0,
-49,2,0,27,0,
-36,
-35,0,2,0,0,255,255,255,255,255,1,0,255,0,34,0,
-49,3,0,47,0,1,
-52,4,0,
-36,
+52,1,6,0,
+48,1,0,2,0,2,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,0,0,255,0,15,0,
+51,255,255,27,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,1,0,255,0,34,0,
+51,255,255,47,0,1,
+55,2,0,
+38,
 16,32,2,0,
-46,1,0,0,
-23,4,0,0,
-23,4,0,1,
-52,5,0,
-36,
-35,0,2,0,0,255,255,255,255,255,42,0,255,16,53,0,
-49,6,0,65,0,0,
-52,7,0,
-36,
-35,0,2,0,0,255,255,255,255,255,43,0,255,16,69,0,
-46,6,0,0,4,0,
+51,1,0,0,
+23,2,0,0,
+23,2,0,1,
+55,3,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,42,0,255,16,53,0,
+51,255,255,65,0,0,
+55,4,0,
+38,
+37,0,2,0,0,255,255,255,255,255,255,255,43,0,255,16,69,0,
+51,255,255,65,0,0,4,0,
 5,0,
 3,0,
 2,0,
 4,0,
 20,
-33,
-46,4,0,2,0,83,0,0,
-54,
-53,5,0,
-46,6,0,0,
-56,
-54,
-53,7,0,
-46,6,0,0,
-56,
+35,
+51,2,0,2,0,83,0,0,
+31,
+56,3,0,
+51,255,255,65,0,0,
+58,
+31,
+56,4,0,
+51,255,255,65,0,0,
+58,
 21,};
 static constexpr size_t SKSL_INCLUDE_sksl_vert_LENGTH = sizeof(SKSL_INCLUDE_sksl_vert);
diff --git a/third_party/skia/src/sksl/ir/BUILD.bazel b/third_party/skia/src/sksl/ir/BUILD.bazel
index b7e3c7cf56db3..7178bb4e249f5 100644
--- a/third_party/skia/src/sksl/ir/BUILD.bazel
+++ b/third_party/skia/src/sksl/ir/BUILD.bazel
@@ -403,7 +403,6 @@ generated_cc_atom(
         ":SkSLType_hdr",
         "//include/private:SkSLStatement_hdr",
         "//include/private:SkTHash_hdr",
-        "//include/private:SkTOptional_hdr",
     ],
 )
 
@@ -582,6 +581,7 @@ generated_cc_atom(
     deps = [
         ":SkSLFunctionDeclaration_hdr",
         ":SkSLUnresolvedFunction_hdr",
+        "//include/private:SkStringView_hdr",
         "//src/sksl:SkSLCompiler_hdr",
     ],
 )
@@ -610,9 +610,9 @@ generated_cc_atom(
         "//include/sksl:DSLCore_hdr",
         "//src/core:SkSafeMath_hdr",
         "//src/sksl:SkSLAnalysis_hdr",
+        "//src/sksl:SkSLBuiltinMap_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/sksl:SkSLContext_hdr",
-        "//src/sksl:SkSLIntrinsicMap_hdr",
         "//src/sksl:SkSLProgramSettings_hdr",
         "//src/sksl:SkSLThreadContext_hdr",
         "//src/sksl/transform:SkSLProgramWriter_hdr",
@@ -715,7 +715,6 @@ generated_cc_atom(
     deps = [
         ":SkSLSymbolTable_hdr",
         ":SkSLVarDeclarations_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/private:SkSLProgramElement_hdr",
     ],
 )
@@ -959,7 +958,6 @@ generated_cc_atom(
         ":SkSLConstructor_hdr",
         ":SkSLLiteral_hdr",
         ":SkSLSwizzle_hdr",
-        "//include/private:SkTOptional_hdr",
         "//include/sksl:SkSLErrorReporter_hdr",
         "//src/sksl:SkSLAnalysis_hdr",
         "//src/sksl:SkSLConstantFolder_hdr",
@@ -967,13 +965,6 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "SkSLSymbolAlias_hdr",
-    hdrs = ["SkSLSymbolAlias.h"],
-    visibility = ["//:__subpackages__"],
-    deps = ["//include/private:SkSLSymbol_hdr"],
-)
-
 generated_cc_atom(
     name = "SkSLSymbolTable_hdr",
     hdrs = ["SkSLSymbolTable.h"],
@@ -992,7 +983,6 @@ generated_cc_atom(
     srcs = ["SkSLSymbolTable.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":SkSLSymbolAlias_hdr",
         ":SkSLSymbolTable_hdr",
         ":SkSLType_hdr",
         ":SkSLUnresolvedFunction_hdr",
@@ -1048,7 +1038,6 @@ generated_cc_atom(
     hdrs = ["SkSLType.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "//include/core:SkStringView_hdr",
         "//include/private:SkSLModifiers_hdr",
         "//include/private:SkSLSymbol_hdr",
         "//src/sksl:SkSLUtil_hdr",
@@ -1068,6 +1057,7 @@ generated_cc_atom(
         ":SkSLProgram_hdr",
         ":SkSLSymbolTable_hdr",
         ":SkSLType_hdr",
+        "//include/private:SkStringView_hdr",
         "//src/sksl:SkSLConstantFolder_hdr",
         "//src/sksl:SkSLContext_hdr",
         "//src/sksl:SkSLProgramSettings_hdr",
@@ -1149,6 +1139,7 @@ generated_cc_atom(
         ":SkSLSymbolTable_hdr",
         ":SkSLVarDeclarations_hdr",
         ":SkSLVariable_hdr",
+        "//include/private:SkStringView_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/sksl:SkSLContext_hdr",
         "//src/sksl:SkSLMangler_hdr",
diff --git a/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp b/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
index b6bdc39ed8234..75f478b5cea8e 100644
--- a/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLBinaryExpression.cpp
@@ -97,7 +97,7 @@ std::unique_ptr<Expression> BinaryExpression::Convert(const Context& context,
     const Type* resultType;
     if (!op.determineBinaryType(context, *rawLeftType, *rawRightType,
                                 &leftType, &rightType, &resultType)) {
-        context.fErrors->error(line, String("type mismatch: '") + op.operatorName() +
+        context.fErrors->error(line, "type mismatch: '" + std::string(op.tightOperatorName()) +
                                      "' cannot operate on '" + left->type().displayName() +
                                      "', '" + right->type().displayName() + "'");
         return nullptr;
@@ -110,7 +110,7 @@ std::unique_ptr<Expression> BinaryExpression::Convert(const Context& context,
     }
     if (context.fConfig->strictES2Mode()) {
         if (!op.isAllowedInStrictES2Mode()) {
-            context.fErrors->error(line, String("operator '") + op.operatorName() +
+            context.fErrors->error(line, "operator '" + std::string(op.tightOperatorName()) +
                                          "' is not allowed");
             return nullptr;
         }
@@ -118,8 +118,9 @@ std::unique_ptr<Expression> BinaryExpression::Convert(const Context& context,
             // Most operators are already rejected on arrays, but GLSL ES 1.0 is very explicit that
             // the *only* operator allowed on arrays is subscripting (and the rules against
             // assignment, comparison, and even sequence apply to structs containing arrays as well)
-            context.fErrors->error(line, String("operator '") + op.operatorName() + "' can not "
-                                         "operate on arrays (or structs containing arrays)");
+            context.fErrors->error(line,
+                                   "operator '" + std::string(op.tightOperatorName()) +
+                                   "' can not operate on arrays (or structs containing arrays)");
             return nullptr;
         }
     }
@@ -241,10 +242,10 @@ std::unique_ptr<Expression> BinaryExpression::clone() const {
                                               &this->type());
 }
 
-String BinaryExpression::description() const {
+std::string BinaryExpression::description() const {
     return "(" + this->left()->description() +
-           " " + this->getOperator().operatorName() +
-           " " + this->right()->description() + ")";
+                 this->getOperator().operatorName() +
+                 this->right()->description() + ")";
 }
 
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h b/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h
index af9d2880b02a9..4616249049ba4 100644
--- a/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLBinaryExpression.h
@@ -92,7 +92,7 @@ class BinaryExpression final : public Expression {
 
     std::unique_ptr<Expression> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     static bool CheckRef(const Expression& expr);
diff --git a/third_party/skia/src/sksl/ir/SkSLBlock.cpp b/third_party/skia/src/sksl/ir/SkSLBlock.cpp
index c1cf06597eb75..f933a1604dd2c 100644
--- a/third_party/skia/src/sksl/ir/SkSLBlock.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLBlock.cpp
@@ -70,8 +70,8 @@ std::unique_ptr<Statement> Block::clone() const {
                                    this->isScope());
 }
 
-String Block::description() const {
-    String result;
+std::string Block::description() const {
+    std::string result;
     if (fIsScope) {
         result += "{";
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLBlock.h b/third_party/skia/src/sksl/ir/SkSLBlock.h
index 02711c23636bb..3f366c7136d83 100644
--- a/third_party/skia/src/sksl/ir/SkSLBlock.h
+++ b/third_party/skia/src/sksl/ir/SkSLBlock.h
@@ -69,7 +69,7 @@ class Block final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     StatementArray fChildren;
diff --git a/third_party/skia/src/sksl/ir/SkSLBreakStatement.h b/third_party/skia/src/sksl/ir/SkSLBreakStatement.h
index 80a13f1a49024..3fe767d357e96 100644
--- a/third_party/skia/src/sksl/ir/SkSLBreakStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLBreakStatement.h
@@ -31,8 +31,8 @@ class BreakStatement final : public Statement {
         return std::make_unique<BreakStatement>(fLine);
     }
 
-    String description() const override {
-        return String("break;");
+    std::string description() const override {
+        return "break;";
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLChildCall.cpp b/third_party/skia/src/sksl/ir/SkSLChildCall.cpp
index c2a3f7fa9a260..3c4537cd1a7ba 100644
--- a/third_party/skia/src/sksl/ir/SkSLChildCall.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLChildCall.cpp
@@ -20,17 +20,13 @@ bool ChildCall::hasProperty(Property property) const {
 }
 
 std::unique_ptr<Expression> ChildCall::clone() const {
-    ExpressionArray cloned;
-    cloned.reserve_back(this->arguments().size());
-    for (const std::unique_ptr<Expression>& arg : this->arguments()) {
-        cloned.push_back(arg->clone());
-    }
-    return std::make_unique<ChildCall>(fLine, &this->type(), &this->child(), std::move(cloned));
+    return std::make_unique<ChildCall>(fLine, &this->type(), &this->child(),
+                                       this->arguments().clone());
 }
 
-String ChildCall::description() const {
-    String result = String(this->child().name()) + ".eval(";
-    String separator;
+std::string ChildCall::description() const {
+    std::string result = std::string(this->child().name()) + ".eval(";
+    std::string separator;
     for (const std::unique_ptr<Expression>& arg : this->arguments()) {
         result += separator;
         result += arg->description();
@@ -60,7 +56,7 @@ String ChildCall::description() const {
         return false;
     }
     for (size_t i = 0; i < arguments.size(); i++) {
-        if (arguments[i]->type() != *params[i]) {
+        if (!arguments[i]->type().matches(*params[i])) {
             return false;
         }
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLChildCall.h b/third_party/skia/src/sksl/ir/SkSLChildCall.h
index cabfd7dbf6445..45b2892ff7a17 100644
--- a/third_party/skia/src/sksl/ir/SkSLChildCall.h
+++ b/third_party/skia/src/sksl/ir/SkSLChildCall.h
@@ -49,7 +49,7 @@ class ChildCall final : public Expression {
 
     std::unique_ptr<Expression> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     const Variable& fChild;
diff --git a/third_party/skia/src/sksl/ir/SkSLCodeStringExpression.h b/third_party/skia/src/sksl/ir/SkSLCodeStringExpression.h
index c82d04310b29f..ac2e13b1d165f 100644
--- a/third_party/skia/src/sksl/ir/SkSLCodeStringExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLCodeStringExpression.h
@@ -22,7 +22,7 @@ class CodeStringExpression final : public Expression {
 public:
     inline static constexpr Kind kExpressionKind = Kind::kCodeString;
 
-    CodeStringExpression(String code, const Type* type)
+    CodeStringExpression(std::string code, const Type* type)
         : INHERITED(/*line=*/-1, kExpressionKind, type)
         , fCode(std::move(code)) {}
 
@@ -34,12 +34,12 @@ class CodeStringExpression final : public Expression {
         return std::make_unique<CodeStringExpression>(fCode, &this->type());
     }
 
-    String description() const override {
+    std::string description() const override {
         return fCode;
     }
 
 private:
-    String fCode;
+    std::string fCode;
 
     using INHERITED = Expression;
 };
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructor.cpp b/third_party/skia/src/sksl/ir/SkSLConstructor.cpp
index 950e981338260..1031a727b1191 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructor.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructor.cpp
@@ -33,7 +33,7 @@ static std::unique_ptr<Expression> convert_compound_constructor(const Context& c
     if (args.size() == 1) {
         std::unique_ptr<Expression>& argument = args.front();
         if (type.isVector() && argument->type().isVector() &&
-            argument->type().componentType() == type.componentType() &&
+            argument->type().componentType().matches(type.componentType()) &&
             argument->type().slotCount() > type.slotCount()) {
             // Casting a vector-type into a smaller matching vector-type is a slice in GLSL.
             // We don't allow those casts in SkSL; recommend a swizzle instead.
@@ -139,8 +139,8 @@ static std::unique_ptr<Expression> convert_compound_constructor(const Context& c
 
     if (actual != expected) {
         context.fErrors->error(line, "invalid arguments to '" + type.displayName() +
-                                     "' constructor (expected " + to_string(expected) +
-                                     " scalars, but found " + to_string(actual) + ")");
+                                     "' constructor (expected " + std::to_string(expected) +
+                                     " scalars, but found " + std::to_string(actual) + ")");
         return nullptr;
     }
 
@@ -151,7 +151,7 @@ std::unique_ptr<Expression> Constructor::Convert(const Context& context,
                                                  int line,
                                                  const Type& type,
                                                  ExpressionArray args) {
-    if (args.size() == 1 && args[0]->type() == type && !type.componentType().isOpaque()) {
+    if (args.size() == 1 && args[0]->type().matches(type) && !type.componentType().isOpaque()) {
         // Don't generate redundant casts; if the expression is already of the correct type, just
         // return it as-is.
         return std::move(args[0]);
@@ -173,7 +173,7 @@ std::unique_ptr<Expression> Constructor::Convert(const Context& context,
     return nullptr;
 }
 
-skstd::optional<double> AnyConstructor::getConstantValue(int n) const {
+std::optional<double> AnyConstructor::getConstantValue(int n) const {
     SkASSERT(n >= 0 && n < (int)this->type().slotCount());
     for (const std::unique_ptr<Expression>& arg : this->argumentSpan()) {
         int argSlots = arg->type().slotCount();
@@ -184,7 +184,7 @@ skstd::optional<double> AnyConstructor::getConstantValue(int n) const {
     }
 
     SkDEBUGFAIL("argument-list slot count doesn't match constructor-type slot count");
-    return skstd::nullopt;
+    return std::nullopt;
 }
 
 Expression::ComparisonResult AnyConstructor::compareConstant(const Expression& other) const {
@@ -197,11 +197,11 @@ Expression::ComparisonResult AnyConstructor::compareConstant(const Expression& o
     int exprs = this->type().slotCount();
     for (int n = 0; n < exprs; ++n) {
         // Get the n'th subexpression from each side. If either one is null, return "unknown."
-        skstd::optional<double> left = this->getConstantValue(n);
+        std::optional<double> left = this->getConstantValue(n);
         if (!left.has_value()) {
             return ComparisonResult::kUnknown;
         }
-        skstd::optional<double> right = other.getConstantValue(n);
+        std::optional<double> right = other.getConstantValue(n);
         if (!right.has_value()) {
             return ComparisonResult::kUnknown;
         }
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructor.h b/third_party/skia/src/sksl/ir/SkSLConstructor.h
index 55fe6a007b0ea..57e268c0d72e8 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructor.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructor.h
@@ -33,8 +33,8 @@ class AnyConstructor : public Expression {
         return false;
     }
 
-    String description() const override {
-        String result = this->type().description() + "(";
+    std::string description() const override {
+        std::string result = this->type().description() + "(";
         const char* separator = "";
         for (const std::unique_ptr<Expression>& arg : this->argumentSpan()) {
             result += separator;
@@ -68,13 +68,11 @@ class AnyConstructor : public Expression {
     }
 
     bool supportsConstantValues() const override { return true; }
-    skstd::optional<double> getConstantValue(int n) const override;
+    std::optional<double> getConstantValue(int n) const override;
 
     ComparisonResult compareConstant(const Expression& other) const override;
 
 private:
-    std::unique_ptr<Expression> fArgument;
-
     using INHERITED = Expression;
 };
 
@@ -127,15 +125,6 @@ class MultiArgumentConstructor : public AnyConstructor {
         return fArguments;
     }
 
-    ExpressionArray cloneArguments() const {
-        ExpressionArray clonedArgs;
-        clonedArgs.reserve_back(this->arguments().size());
-        for (const std::unique_ptr<Expression>& arg: this->arguments()) {
-            clonedArgs.push_back(arg->clone());
-        }
-        return clonedArgs;
-    }
-
     SkSpan<std::unique_ptr<Expression>> argumentSpan() final {
         return {&fArguments.front(), fArguments.size()};
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
index fa80be1e395bf..6bad9e862a4cf 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorArray.cpp
@@ -68,7 +68,7 @@ std::unique_ptr<Expression> ConstructorArray::Make(const Context& context,
     SkASSERT(type.isAllowedInES2(context));
     SkASSERT(type.columns() == args.count());
     SkASSERT(std::all_of(args.begin(), args.end(), [&](const std::unique_ptr<Expression>& arg) {
-        return type.componentType() == arg->type();
+        return type.componentType().matches(arg->type());
     }));
 
     return std::make_unique<ConstructorArray>(line, type, std::move(args));
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorArray.h b/third_party/skia/src/sksl/ir/SkSLConstructorArray.h
index 99f274d8770fb..4ad2195f9b387 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorArray.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorArray.h
@@ -36,7 +36,7 @@ class ConstructorArray final : public MultiArgumentConstructor {
                                             ExpressionArray args);
 
     std::unique_ptr<Expression> clone() const override {
-        return std::make_unique<ConstructorArray>(fLine, this->type(), this->cloneArguments());
+        return std::make_unique<ConstructorArray>(fLine, this->type(), this->arguments().clone());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp
index 7d5111a87829f..bf96bb0440bdb 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorArrayCast.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Expression> ConstructorArrayCast::Make(const Context& context,
     SkASSERT(type.columns() == arg->type().columns());
 
     // If this is a no-op cast, return the expression as-is.
-    if (type == arg->type()) {
+    if (type.matches(arg->type())) {
         return arg;
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
index bfb6f228c55d9..38f898be69384 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorCompound.cpp
@@ -23,7 +23,7 @@ std::unique_ptr<Expression> ConstructorCompound::Make(const Context& context,
     // A scalar "composite" type with a single scalar argument is a no-op and can be eliminated.
     // (Pedantically, this isn't a composite at all, but it's harmless to allow and simplifies
     // call sites which need to narrow a vector and may sometimes end up with a scalar.)
-    if (type.isScalar() && args.size() == 1 && args.front()->type() == type) {
+    if (type.isScalar() && args.size() == 1 && args.front()->type().matches(type)) {
         return std::move(args.front());
     }
 
@@ -32,7 +32,7 @@ std::unique_ptr<Expression> ConstructorCompound::Make(const Context& context,
     SkASSERT(std::all_of(args.begin(), args.end(), [&](const std::unique_ptr<Expression>& arg) {
         const Type& argType = arg->type();
         return (argType.isScalar() || argType.isVector() || argType.isMatrix()) &&
-               (argType.componentType() == type.componentType());
+               (argType.componentType().matches(type.componentType()));
     }));
 
     // The slot count of the combined argument list must match the composite type's slot count.
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h b/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
index 59086b9027aa5..6fc627288f222 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorCompound.h
@@ -37,7 +37,8 @@ class ConstructorCompound final : public MultiArgumentConstructor {
                                             ExpressionArray args);
 
     std::unique_ptr<Expression> clone() const override {
-        return std::make_unique<ConstructorCompound>(fLine, this->type(), this->cloneArguments());
+        return std::make_unique<ConstructorCompound>(fLine, this->type(),
+                                                     this->arguments().clone());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
index 30036f36f0620..6617b588761ce 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorCompoundCast.cpp
@@ -52,7 +52,7 @@ static std::unique_ptr<Expression> cast_constant_composite(const Context& contex
     ExpressionArray typecastArgs;
     typecastArgs.reserve_back(numSlots);
     for (size_t index = 0; index < numSlots; ++index) {
-        skstd::optional<double> slotVal = constCtor->getConstantValue(index);
+        std::optional<double> slotVal = constCtor->getConstantValue(index);
         if (scalarType.checkForOutOfRangeLiteral(context, *slotVal, constCtor->fLine)) {
             // We've reported an error because the literal is out of range for this type. Zero out
             // the value to avoid a cascade of errors.
@@ -78,7 +78,7 @@ std::unique_ptr<Expression> ConstructorCompoundCast::Make(const Context& context
     SkASSERT(type.rows() == arg->type().rows());
 
     // If this is a no-op cast, return the expression as-is.
-    if (type == arg->type()) {
+    if (type.matches(arg->type())) {
         return arg;
     }
     // Look up the value of constant variables. This allows constant-expressions like
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
index 9989cd0d406e7..64f38720e6b5c 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.cpp
@@ -20,7 +20,7 @@ std::unique_ptr<Expression> ConstructorDiagonalMatrix::Make(const Context& conte
     SkASSERT(type.isMatrix());
     SkASSERT(type.isAllowedInES2(context));
     SkASSERT(arg->type().isScalar());
-    SkASSERT(arg->type() == type.componentType());
+    SkASSERT(arg->type().matches(type.componentType()));
 
     // Look up the value of constant variables. This allows constant-expressions like `mat4(five)`
     // to be replaced with `mat4(5.0)`.
@@ -29,7 +29,7 @@ std::unique_ptr<Expression> ConstructorDiagonalMatrix::Make(const Context& conte
     return std::make_unique<ConstructorDiagonalMatrix>(line, type, std::move(arg));
 }
 
-skstd::optional<double> ConstructorDiagonalMatrix::getConstantValue(int n) const {
+std::optional<double> ConstructorDiagonalMatrix::getConstantValue(int n) const {
     int rows = this->type().rows();
     int row = n % rows;
     int col = n / rows;
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h b/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
index c8d38129973a4..f6d5401730613 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorDiagonalMatrix.h
@@ -41,7 +41,7 @@ class ConstructorDiagonalMatrix final : public SingleArgumentConstructor {
     }
 
     bool supportsConstantValues() const override { return true; }
-    skstd::optional<double> getConstantValue(int n) const override;
+    std::optional<double> getConstantValue(int n) const override;
 
 private:
     using INHERITED = SingleArgumentConstructor;
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
index ec2810f73578a..38c2bfa032ed8 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.cpp
@@ -18,7 +18,7 @@ std::unique_ptr<Expression> ConstructorMatrixResize::Make(const Context& context
                                                           std::unique_ptr<Expression> arg) {
     SkASSERT(type.isMatrix());
     SkASSERT(type.isAllowedInES2(context));
-    SkASSERT(arg->type().componentType() == type.componentType());
+    SkASSERT(arg->type().componentType().matches(type.componentType()));
 
     // If the matrix isn't actually changing size, return it as-is.
     if (type.rows() == arg->type().rows() && type.columns() == arg->type().columns()) {
@@ -28,7 +28,7 @@ std::unique_ptr<Expression> ConstructorMatrixResize::Make(const Context& context
     return std::make_unique<ConstructorMatrixResize>(line, type, std::move(arg));
 }
 
-skstd::optional<double> ConstructorMatrixResize::getConstantValue(int n) const {
+std::optional<double> ConstructorMatrixResize::getConstantValue(int n) const {
     int rows = this->type().rows();
     int row = n % rows;
     int col = n / rows;
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h b/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
index 8eb53c2820c51..b2cb3511117a3 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorMatrixResize.h
@@ -41,7 +41,7 @@ class ConstructorMatrixResize final : public SingleArgumentConstructor {
     }
 
     bool supportsConstantValues() const override { return true; }
-    skstd::optional<double> getConstantValue(int n) const override;
+    std::optional<double> getConstantValue(int n) const override;
 
 private:
     using INHERITED = SingleArgumentConstructor;
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
index c56e861ab51f6..8cb00e958485e 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorScalarCast.cpp
@@ -24,7 +24,7 @@ std::unique_ptr<Expression> ConstructorScalarCast::Convert(const Context& contex
     if (args.size() != 1) {
         context.fErrors->error(line, "invalid arguments to '" + type.displayName() +
                                      "' constructor, (expected exactly 1 argument, but found " +
-                                     to_string((uint64_t)args.size()) + ")");
+                                     std::to_string(args.size()) + ")");
         return nullptr;
     }
 
@@ -33,7 +33,7 @@ std::unique_ptr<Expression> ConstructorScalarCast::Convert(const Context& contex
         // Casting a vector-type into its scalar component type is treated as a slice in GLSL.
         // We don't allow those casts in SkSL; recommend a .x swizzle instead.
         const char* swizzleHint = "";
-        if (argType.componentType() == type) {
+        if (argType.componentType().matches(type)) {
             if (argType.isVector()) {
                 swizzleHint = "; use '.x' instead";
             } else if (argType.isMatrix()) {
@@ -62,7 +62,7 @@ std::unique_ptr<Expression> ConstructorScalarCast::Make(const Context& context,
     SkASSERT(arg->type().isScalar());
 
     // No cast required when the types match.
-    if (arg->type() == type) {
+    if (arg->type().matches(type)) {
         return arg;
     }
     // Look up the value of constant variables. This allows constant-expressions like `int(zero)` to
@@ -70,12 +70,15 @@ std::unique_ptr<Expression> ConstructorScalarCast::Make(const Context& context,
     arg = ConstantFolder::MakeConstantValueForVariable(std::move(arg));
 
     // We can cast scalar literals at compile-time when possible. (If the resulting literal would be
-    // out of range for its type, we report an error and return the constructor. This can occur when
-    // code is inlined, so we can't necessarily catch it during Convert. As such, it's not safe to
-    // return null or assert.)
-    if (arg->is<Literal>() &&
-        !type.checkForOutOfRangeLiteral(context, arg->as<Literal>().value(), arg->fLine)) {
-        return Literal::Make(line, arg->as<Literal>().value(), &type);
+    // out of range for its type, we report an error and return zero to minimize error cascading.
+    // This can occur when code is inlined, so we can't necessarily catch it during Convert. As
+    // such, it's not safe to return null or assert.)
+    if (arg->is<Literal>()) {
+        double value = arg->as<Literal>().value();
+        if (type.checkForOutOfRangeLiteral(context, value, arg->fLine)) {
+            value = 0.0;
+        }
+        return Literal::Make(line, value, &type);
     }
     return std::make_unique<ConstructorScalarCast>(line, type, std::move(arg));
 }
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
index 3d272c1cb668d..996e0104e4d98 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorSplat.cpp
@@ -16,7 +16,9 @@ std::unique_ptr<Expression> ConstructorSplat::Make(const Context& context,
                                                    const Type& type,
                                                    std::unique_ptr<Expression> arg) {
     SkASSERT(type.isAllowedInES2(context));
-    SkASSERT(arg->type().scalarTypeForLiteral() == type.componentType().scalarTypeForLiteral());
+    SkASSERT(type.isScalar() || type.isVector());
+    SkASSERT(arg->type().scalarTypeForLiteral().matches(
+            type.componentType().scalarTypeForLiteral()));
     SkASSERT(arg->type().isScalar());
 
     // A "splat" to a scalar type is a no-op and can be eliminated.
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h b/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
index 9ef211d9a9b17..eb19bb54eccc6 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorSplat.h
@@ -28,12 +28,6 @@ class ConstructorSplat final : public SingleArgumentConstructor {
     ConstructorSplat(int line, const Type& type, std::unique_ptr<Expression> arg)
         : INHERITED(line, kExpressionKind, &type, std::move(arg)) {}
 
-    ConstructorSplat(const Expression& scalar, const Type& type)
-            : ConstructorSplat(scalar.fLine, type, scalar.clone()) {
-        SkASSERT(type.isVector());
-        SkASSERT(type.componentType() == scalar.type());
-    }
-
     // The input argument must be scalar. A "splat" to a scalar type will be optimized into a no-op.
     static std::unique_ptr<Expression> Make(const Context& context,
                                             int line,
@@ -48,7 +42,7 @@ class ConstructorSplat final : public SingleArgumentConstructor {
         return true;
     }
 
-    skstd::optional<double> getConstantValue(int n) const override {
+    std::optional<double> getConstantValue(int n) const override {
         SkASSERT(n >= 0 && n < this->type().columns());
         return this->argument()->getConstantValue(0);
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp b/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
index c6db12c5f6561..fd69aaeb42acd 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorStruct.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<Expression> ConstructorStruct::Convert(const Context& context,
     for (int index = 0; index < args.count(); ++index) {
         const std::unique_ptr<Expression>& argument = args[index];
         const Type::Field& field = type.fields()[index];
-        if (argument->type() != *field.fType) {
+        if (!argument->type().matches(*field.fType)) {
             return false;
         }
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h b/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
index 6987fee280cc5..e8163c65a8503 100644
--- a/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
+++ b/third_party/skia/src/sksl/ir/SkSLConstructorStruct.h
@@ -36,7 +36,7 @@ class ConstructorStruct final : public MultiArgumentConstructor {
                                             ExpressionArray args);
 
     std::unique_ptr<Expression> clone() const override {
-        return std::make_unique<ConstructorStruct>(fLine, this->type(), this->cloneArguments());
+        return std::make_unique<ConstructorStruct>(fLine, this->type(), this->arguments().clone());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLContinueStatement.h b/third_party/skia/src/sksl/ir/SkSLContinueStatement.h
index 8e03a31571e98..ef761cbb77aa7 100644
--- a/third_party/skia/src/sksl/ir/SkSLContinueStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLContinueStatement.h
@@ -31,8 +31,8 @@ class ContinueStatement final : public Statement {
         return std::make_unique<ContinueStatement>(fLine);
     }
 
-    String description() const override {
-        return String("continue;");
+    std::string description() const override {
+        return "continue;";
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h b/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h
index adcf014034c8a..6c4f975a04658 100644
--- a/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLDiscardStatement.h
@@ -31,8 +31,8 @@ class DiscardStatement final : public Statement {
         return std::make_unique<DiscardStatement>(fLine);
     }
 
-    String description() const override {
-        return String("discard;");
+    std::string description() const override {
+        return "discard;";
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp b/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
index b0883f0458dbd..4eda86340a70b 100644
--- a/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLDoStatement.cpp
@@ -35,7 +35,7 @@ std::unique_ptr<Statement> DoStatement::Make(const Context& context,
                                              std::unique_ptr<Statement> stmt,
                                              std::unique_ptr<Expression> test) {
     SkASSERT(!context.fConfig->strictES2Mode());
-    SkASSERT(test->type() == *context.fTypes.fBool);
+    SkASSERT(test->type().matches(*context.fTypes.fBool));
     SkASSERT(!Analysis::DetectVarDeclarationWithoutScope(*stmt));
     return std::make_unique<DoStatement>(stmt->fLine, std::move(stmt), std::move(test));
 }
@@ -45,7 +45,7 @@ std::unique_ptr<Statement> DoStatement::clone() const {
                                          this->test()->clone());
 }
 
-String DoStatement::description() const {
+std::string DoStatement::description() const {
     return "do " + this->statement()->description() +
            " while (" + this->test()->description() + ");";
 }
diff --git a/third_party/skia/src/sksl/ir/SkSLDoStatement.h b/third_party/skia/src/sksl/ir/SkSLDoStatement.h
index f33c182841b1d..35f407902e4ae 100644
--- a/third_party/skia/src/sksl/ir/SkSLDoStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLDoStatement.h
@@ -53,7 +53,7 @@ class DoStatement final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     std::unique_ptr<Statement> fStatement;
diff --git a/third_party/skia/src/sksl/ir/SkSLExpression.cpp b/third_party/skia/src/sksl/ir/SkSLExpression.cpp
index 2e7488d9a05f7..e9930f697443d 100644
--- a/third_party/skia/src/sksl/ir/SkSLExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLExpression.cpp
@@ -31,4 +31,13 @@ bool Expression::isIncomplete(const Context& context) const {
     }
 }
 
+ExpressionArray ExpressionArray::clone() const {
+    ExpressionArray cloned;
+    cloned.reserve_back(this->count());
+    for (const std::unique_ptr<Expression>& expr : *this) {
+        cloned.push_back(expr ? expr->clone() : nullptr);
+    }
+    return cloned;
+}
+
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/ir/SkSLExpression.h b/third_party/skia/src/sksl/ir/SkSLExpression.h
index 786e11de9d52e..2d68c32d97c1c 100644
--- a/third_party/skia/src/sksl/ir/SkSLExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLExpression.h
@@ -10,9 +10,9 @@
 
 #include "include/private/SkSLStatement.h"
 #include "include/private/SkTHash.h"
-#include "include/private/SkTOptional.h"
 #include "src/sksl/ir/SkSLType.h"
 
+#include <optional>
 #include <unordered_map>
 
 namespace SkSL {
@@ -199,9 +199,9 @@ class Expression : public IRNode {
      *                                                       0, nullopt)
      * All classes which override this function must also implement `supportsConstantValues`.
      */
-    virtual skstd::optional<double> getConstantValue(int n) const {
+    virtual std::optional<double> getConstantValue(int n) const {
         SkASSERT(!this->supportsConstantValues());
-        return skstd::nullopt;
+        return std::nullopt;
     }
 
     virtual std::unique_ptr<Expression> clone() const = 0;
diff --git a/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h b/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h
index 86606da9419cb..2cb78bd4d1a21 100644
--- a/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLExpressionStatement.h
@@ -41,7 +41,7 @@ class ExpressionStatement final : public Statement {
         return std::make_unique<ExpressionStatement>(this->expression()->clone());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->expression()->description() + ";";
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLExtension.h b/third_party/skia/src/sksl/ir/SkSLExtension.h
index afa2119f6bed8..7a7e03d9b8648 100644
--- a/third_party/skia/src/sksl/ir/SkSLExtension.h
+++ b/third_party/skia/src/sksl/ir/SkSLExtension.h
@@ -19,11 +19,11 @@ class Extension final : public ProgramElement {
 public:
     inline static constexpr Kind kProgramElementKind = Kind::kExtension;
 
-    Extension(int line, skstd::string_view name)
+    Extension(int line, std::string_view name)
         : INHERITED(line, kProgramElementKind)
         , fName(name) {}
 
-    skstd::string_view name() const {
+    std::string_view name() const {
         return fName;
     }
 
@@ -31,12 +31,12 @@ class Extension final : public ProgramElement {
         return std::unique_ptr<ProgramElement>(new Extension(fLine, this->name()));
     }
 
-    String description() const override {
-        return "#extension " + this->name() + " : enable";
+    std::string description() const override {
+        return "#extension " + std::string(this->name()) + " : enable";
     }
 
 private:
-    skstd::string_view fName;
+    std::string_view fName;
 
     using INHERITED = ProgramElement;
 };
diff --git a/third_party/skia/src/sksl/ir/SkSLExternalFunction.h b/third_party/skia/src/sksl/ir/SkSLExternalFunction.h
index 373a78aad72b7..ead71a2f7c9dc 100644
--- a/third_party/skia/src/sksl/ir/SkSLExternalFunction.h
+++ b/third_party/skia/src/sksl/ir/SkSLExternalFunction.h
@@ -13,7 +13,6 @@
 
 namespace SkSL {
 
-class String;
 class Type;
 
 class ExternalFunction : public Symbol {
@@ -36,8 +35,8 @@ class ExternalFunction : public Symbol {
                       skvm::F32* outResult,
                       skvm::I32 mask) const = 0;
 
-    String description() const override {
-        return String("external<") + this->name() + ">";
+    std::string description() const override {
+        return "external<" + std::string(this->name()) + ">";
     }
 
     // Disable IRNode pooling on external function nodes. ExternalFunction node lifetimes are
diff --git a/third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h b/third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h
index e351909cb5fff..51b4ca5490c01 100644
--- a/third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h
+++ b/third_party/skia/src/sksl/ir/SkSLExternalFunctionCall.h
@@ -52,18 +52,13 @@ class ExternalFunctionCall final : public Expression {
     }
 
     std::unique_ptr<Expression> clone() const override {
-        ExpressionArray cloned;
-        cloned.reserve_back(this->arguments().size());
-        for (const auto& arg : this->arguments()) {
-            cloned.push_back(arg->clone());
-        }
         return std::make_unique<ExternalFunctionCall>(fLine, &this->function(),
-                                                      std::move(cloned));
+                                                      this->arguments().clone());
     }
 
-    String description() const override {
-        String result = String(this->function().name()) + "(";
-        String separator;
+    std::string description() const override {
+        std::string result = std::string(this->function().name()) + "(";
+        std::string separator;
         for (const std::unique_ptr<Expression>& arg : this->arguments()) {
             result += separator;
             result += arg->description();
diff --git a/third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h b/third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h
index 84c6f860b01c8..b55a99482eb2e 100644
--- a/third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h
+++ b/third_party/skia/src/sksl/ir/SkSLExternalFunctionReference.h
@@ -34,8 +34,8 @@ class ExternalFunctionReference final : public Expression {
         return property == Property::kSideEffects;
     }
 
-    String description() const override {
-        return String(this->function().name());
+    std::string description() const override {
+        return std::string(this->function().name());
     }
 
     std::unique_ptr<Expression> clone() const override {
diff --git a/third_party/skia/src/sksl/ir/SkSLField.h b/third_party/skia/src/sksl/ir/SkSLField.h
index b6d9e7bd78644..a4825defba559 100644
--- a/third_party/skia/src/sksl/ir/SkSLField.h
+++ b/third_party/skia/src/sksl/ir/SkSLField.h
@@ -38,8 +38,8 @@ class Field final : public Symbol {
         return *fOwner;
     }
 
-    String description() const override {
-        return this->owner().description() + "." + this->name();
+    std::string description() const override {
+        return this->owner().description() + "." + std::string(this->name());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp b/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
index 4210007896141..cecfb98ff65e5 100644
--- a/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLFieldAccess.cpp
@@ -17,11 +17,11 @@ namespace SkSL {
 std::unique_ptr<Expression> FieldAccess::Convert(const Context& context,
                                                  SymbolTable& symbolTable,
                                                  std::unique_ptr<Expression> base,
-                                                 skstd::string_view field) {
+                                                 std::string_view field) {
     const Type& baseType = base->type();
     if (baseType.isEffectChild()) {
         // Turn the field name into a free function name, prefixed with '$':
-        String methodName = String("$") + field;
+        std::string methodName = "$" + std::string(field);
         const Symbol* result = symbolTable[methodName];
         if (result) {
             switch (result->kind()) {
@@ -40,9 +40,8 @@ std::unique_ptr<Expression> FieldAccess::Convert(const Context& context,
                     break;
             }
         }
-        context.fErrors->error(
-                base->fLine,
-                "type '" + baseType.displayName() + "' has no method named '" + field + "'");
+        context.fErrors->error(base->fLine, "type '" + baseType.displayName() + "' has no method "
+                                            "named '" + std::string(field) + "'");
         return nullptr;
     }
     if (baseType.isStruct()) {
@@ -53,12 +52,12 @@ std::unique_ptr<Expression> FieldAccess::Convert(const Context& context,
             }
         }
     }
-    if (baseType == *context.fTypes.fSkCaps) {
+    if (baseType.matches(*context.fTypes.fSkCaps)) {
         return Setting::Convert(context, base->fLine, field);
     }
 
-    context.fErrors->error(base->fLine, "type '" + baseType.displayName() +
-                                          "' does not have a field named '" + field + "'");
+    context.fErrors->error(base->fLine, "type '" + baseType.displayName() + "' does not have a "
+                                        "field named '" + std::string(field) + "'");
     return nullptr;
 }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLFieldAccess.h b/third_party/skia/src/sksl/ir/SkSLFieldAccess.h
index a30bf41af8883..ebff6cd12622a 100644
--- a/third_party/skia/src/sksl/ir/SkSLFieldAccess.h
+++ b/third_party/skia/src/sksl/ir/SkSLFieldAccess.h
@@ -40,7 +40,7 @@ class FieldAccess final : public Expression {
     static std::unique_ptr<Expression> Convert(const Context& context,
                                                SymbolTable& symbolTable,
                                                std::unique_ptr<Expression> base,
-                                               skstd::string_view field);
+                                               std::string_view field);
 
     // Returns a field-access expression; reports errors via ASSERT.
     static std::unique_ptr<Expression> Make(const Context& context,
@@ -74,9 +74,9 @@ class FieldAccess final : public Expression {
                                                            this->ownerKind()));
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->base()->description() + "." +
-               this->base()->type().fields()[this->fieldIndex()].fName;
+               std::string(this->base()->type().fields()[this->fieldIndex()].fName);
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLForStatement.cpp b/third_party/skia/src/sksl/ir/SkSLForStatement.cpp
index b861fcc2c0bcf..717a5bf20d394 100644
--- a/third_party/skia/src/sksl/ir/SkSLForStatement.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLForStatement.cpp
@@ -58,8 +58,8 @@ std::unique_ptr<Statement> ForStatement::clone() const {
             SymbolTable::WrapIfBuiltin(this->symbols()));
 }
 
-String ForStatement::description() const {
-    String result("for (");
+std::string ForStatement::description() const {
+    std::string result("for (");
     if (this->initializer()) {
         result += this->initializer()->description();
     } else {
@@ -135,8 +135,8 @@ std::unique_ptr<Statement> ForStatement::Convert(const Context& context, int lin
         scope.push_back(std::move(initializer));
         scope.push_back(ForStatement::Make(context, line, /*initializer=*/nullptr,
                                            std::move(test), std::move(next), std::move(statement),
-                                           std::move(unrollInfo), std::move(symbolTable)));
-        return Block::Make(line, std::move(scope));
+                                           std::move(unrollInfo), /*symbolTable=*/nullptr));
+        return Block::Make(line, std::move(scope), std::move(symbolTable));
     }
 
     return ForStatement::Make(context, line, std::move(initializer), std::move(test),
@@ -165,7 +165,7 @@ std::unique_ptr<Statement> ForStatement::Make(const Context& context, int line,
                                               std::shared_ptr<SymbolTable> symbolTable) {
     SkASSERT(is_simple_initializer(initializer.get()) ||
              is_vardecl_block_initializer(initializer.get()));
-    SkASSERT(!test || test->type() == *context.fTypes.fBool);
+    SkASSERT(!test || test->type().matches(*context.fTypes.fBool));
     SkASSERT(!Analysis::DetectVarDeclarationWithoutScope(*statement));
     SkASSERT(unrollInfo || !context.fConfig->strictES2Mode());
 
diff --git a/third_party/skia/src/sksl/ir/SkSLForStatement.h b/third_party/skia/src/sksl/ir/SkSLForStatement.h
index 562066a9acd5c..ec66f7a54343b 100644
--- a/third_party/skia/src/sksl/ir/SkSLForStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLForStatement.h
@@ -112,7 +112,7 @@ class ForStatement final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     std::shared_ptr<SymbolTable> fSymbolTable;
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp b/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
index 0639f54e40f88..17a88e9713e4b 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionCall.cpp
@@ -97,18 +97,18 @@ static std::unique_ptr<Expression> coalesce_n_way_vector(const Expression* arg0,
     const Type& vecType =          arg0->type().isVector()  ? arg0->type() :
                           (arg1 && arg1->type().isVector()) ? arg1->type() :
                                                               arg0->type();
-    SkASSERT(         arg0->type().componentType() == vecType.componentType());
-    SkASSERT(!arg1 || arg1->type().componentType() == vecType.componentType());
+    SkASSERT(         arg0->type().componentType().matches(vecType.componentType()));
+    SkASSERT(!arg1 || arg1->type().componentType().matches(vecType.componentType()));
 
     double value = startingState;
     int arg0Index = 0;
     int arg1Index = 0;
     for (int index = 0; index < vecType.columns(); ++index) {
-        skstd::optional<double> arg0Value = arg0->getConstantValue(arg0Index);
+        std::optional<double> arg0Value = arg0->getConstantValue(arg0Index);
         arg0Index += arg0->type().isVector() ? 1 : 0;
         SkASSERT(arg0Value.has_value());
 
-        skstd::optional<double> arg1Value = 0.0;
+        std::optional<double> arg1Value = 0.0;
         if (arg1) {
             arg1Value = arg1->getConstantValue(arg1Index);
             arg1Index += arg1->type().isVector() ? 1 : 0;
@@ -174,13 +174,13 @@ static std::unique_ptr<Expression> optimize_comparison(const Context& context,
     const Type& type = left->type();
     SkASSERT(type.isVector());
     SkASSERT(type.componentType().isScalar());
-    SkASSERT(type == right->type());
+    SkASSERT(type.matches(right->type()));
 
     double array[4];
 
     for (int index = 0; index < type.columns(); ++index) {
-        skstd::optional<double> leftValue = left->getConstantValue(index);
-        skstd::optional<double> rightValue = right->getConstantValue(index);
+        std::optional<double> leftValue = left->getConstantValue(index);
+        std::optional<double> rightValue = right->getConstantValue(index);
         SkASSERT(leftValue.has_value());
         SkASSERT(rightValue.has_value());
         array[index] = compare(*leftValue, *rightValue) ? 1.0 : 0.0;
@@ -216,18 +216,18 @@ static std::unique_ptr<Expression> evaluate_n_way_intrinsic(const Context& conte
     int arg1Index = 0;
     int arg2Index = 0;
     for (int index = 0; index < slots; ++index) {
-        skstd::optional<double> arg0Value = arg0->getConstantValue(arg0Index);
+        std::optional<double> arg0Value = arg0->getConstantValue(arg0Index);
         arg0Index += arg0->type().isScalar() ? 0 : 1;
         SkASSERT(arg0Value.has_value());
 
-        skstd::optional<double> arg1Value = 0.0;
+        std::optional<double> arg1Value = 0.0;
         if (arg1) {
             arg1Value = arg1->getConstantValue(arg1Index);
             arg1Index += arg1->type().isScalar() ? 0 : 1;
             SkASSERT(arg1Value.has_value());
         }
 
-        skstd::optional<double> arg2Value = 0.0;
+        std::optional<double> arg2Value = 0.0;
         if (arg2) {
             arg2Value = arg2->getConstantValue(arg2Index);
             arg2Index += arg2->type().isScalar() ? 0 : 1;
@@ -786,18 +786,13 @@ bool FunctionCall::hasProperty(Property property) const {
 }
 
 std::unique_ptr<Expression> FunctionCall::clone() const {
-    ExpressionArray cloned;
-    cloned.reserve_back(this->arguments().size());
-    for (const std::unique_ptr<Expression>& arg : this->arguments()) {
-        cloned.push_back(arg->clone());
-    }
-    return std::make_unique<FunctionCall>(
-            fLine, &this->type(), &this->function(), std::move(cloned));
+    return std::make_unique<FunctionCall>(fLine, &this->type(), &this->function(),
+                                          this->arguments().clone());
 }
 
-String FunctionCall::description() const {
-    String result = String(this->function().name()) + "(";
-    String separator;
+std::string FunctionCall::description() const {
+    std::string result = std::string(this->function().name()) + "(";
+    std::string separator;
     for (const std::unique_ptr<Expression>& arg : this->arguments()) {
         result += separator;
         result += arg->description();
@@ -867,8 +862,8 @@ std::unique_ptr<Expression> FunctionCall::Convert(const Context& context,
             int count = f.callParameterCount();
             if (count != (int) arguments.size()) {
                 context.fErrors->error(line,
-                        "external function expected " + to_string(count) +
-                        " arguments, but found " + to_string((int)arguments.size()));
+                        "external function expected " + std::to_string(count) +
+                        " arguments, but found " + std::to_string(arguments.size()));
                 return nullptr;
             }
             static constexpr int PARAMETER_MAX = 16;
@@ -891,8 +886,8 @@ std::unique_ptr<Expression> FunctionCall::Convert(const Context& context,
             if (best) {
                 return FunctionCall::Convert(context, line, *best, std::move(arguments));
             }
-            String msg = "no match for " + functions[0]->name() + "(";
-            String separator;
+            std::string msg = "no match for " + std::string(functions[0]->name()) + "(";
+            std::string separator;
             for (size_t i = 0; i < arguments.size(); i++) {
                 msg += separator;
                 separator = ", ";
@@ -912,9 +907,9 @@ std::unique_ptr<Expression> FunctionCall::Convert(const Context& context,
             if (best) {
                 return FunctionCall::Convert(context, line, *best, std::move(arguments));
             }
-            String msg = "no match for " + arguments.back()->type().displayName() +
-                         "::" + functions[0]->name().substr(1) + "(";
-            String separator;
+            std::string msg = "no match for " + arguments.back()->type().displayName() +
+                              "::" + std::string(functions[0]->name().substr(1)) + "(";
+            std::string separator;
             for (size_t i = 0; i < arguments.size() - 1; i++) {
                 msg += separator;
                 separator = ", ";
@@ -944,12 +939,12 @@ std::unique_ptr<Expression> FunctionCall::Convert(const Context& context,
 
     // Reject function calls with the wrong number of arguments.
     if (function.parameters().size() != arguments.size()) {
-        String msg = "call to '" + function.name() + "' expected " +
-                     to_string((int)function.parameters().size()) + " argument";
+        std::string msg = "call to '" + std::string(function.name()) + "' expected " +
+                          std::to_string(function.parameters().size()) + " argument";
         if (function.parameters().size() != 1) {
             msg += "s";
         }
-        msg += ", but found " + to_string(arguments.count());
+        msg += ", but found " + std::to_string(arguments.count());
         context.fErrors->error(line, msg);
         return nullptr;
     }
@@ -958,8 +953,8 @@ std::unique_ptr<Expression> FunctionCall::Convert(const Context& context,
     FunctionDeclaration::ParamTypes types;
     const Type* returnType;
     if (!function.determineFinalTypes(arguments, &types, &returnType)) {
-        String msg = "no match for " + function.name() + "(";
-        String separator;
+        std::string msg = "no match for " + std::string(function.name()) + "(";
+        std::string separator ;
         for (const std::unique_ptr<Expression>& arg : arguments) {
             msg += separator;
             msg += arg->type().displayName();
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionCall.h b/third_party/skia/src/sksl/ir/SkSLFunctionCall.h
index 2b619c49822e7..06f5e9842b060 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionCall.h
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionCall.h
@@ -46,6 +46,11 @@ class FunctionCall final : public Expression {
                                             const FunctionDeclaration& function,
                                             ExpressionArray arguments);
 
+    static const FunctionDeclaration* FindBestFunctionForCall(
+            const Context& context,
+            const std::vector<const FunctionDeclaration*>& functions,
+            const ExpressionArray& arguments);
+
     const FunctionDeclaration& function() const {
         return fFunction;
     }
@@ -62,18 +67,13 @@ class FunctionCall final : public Expression {
 
     std::unique_ptr<Expression> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     static CoercionCost CallCost(const Context& context,
                                  const FunctionDeclaration& function,
                                  const ExpressionArray& arguments);
 
-    static const FunctionDeclaration* FindBestFunctionForCall(
-            const Context& context,
-            const std::vector<const FunctionDeclaration*>& functions,
-            const ExpressionArray& arguments);
-
     const FunctionDeclaration& fFunction;
     ExpressionArray fArguments;
 
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp b/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
index 8b1923259a0f5..184c58a16c3f8 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.cpp
@@ -7,19 +7,20 @@
 
 #include "src/sksl/ir/SkSLFunctionDeclaration.h"
 
+#include "include/private/SkStringView.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/ir/SkSLUnresolvedFunction.h"
 
 namespace SkSL {
 
-static IntrinsicKind identify_intrinsic(skstd::string_view functionName) {
+static IntrinsicKind identify_intrinsic(std::string_view functionName) {
     #define SKSL_INTRINSIC(name) {#name, k_##name##_IntrinsicKind},
-    static const auto* kAllIntrinsics = new std::unordered_map<skstd::string_view, IntrinsicKind>{
+    static const auto* kAllIntrinsics = new std::unordered_map<std::string_view, IntrinsicKind>{
         SKSL_INTRINSIC_LIST
     };
     #undef SKSL_INTRINSIC
 
-    if (functionName.starts_with('$')) {
+    if (skstd::starts_with(functionName, '$')) {
         functionName.remove_prefix(1);
     }
 
@@ -69,7 +70,7 @@ static bool check_parameters(const Context& context,
                              std::vector<std::unique_ptr<Variable>>& parameters,
                              bool isMain) {
     auto typeIsValidForColor = [&](const Type& type) {
-        return type == *context.fTypes.fHalf4 || type == *context.fTypes.fFloat4;
+        return type.matches(*context.fTypes.fHalf4) || type.matches(*context.fTypes.fFloat4);
     };
 
     // The first color parameter passed to main() is the input color; the second is the dest color.
@@ -102,11 +103,13 @@ static bool check_parameters(const Context& context,
         }
 
         if (isMain) {
-            if (ProgramConfig::IsRuntimeEffect(context.fConfig->fKind)) {
+            if (ProgramConfig::IsRuntimeEffect(context.fConfig->fKind) &&
+                context.fConfig->fKind != ProgramKind::kCustomMeshFragment &&
+                context.fConfig->fKind != ProgramKind::kCustomMeshVertex) {
                 // We verify that the signature is fully correct later. For now, if this is a
                 // runtime effect of any flavor, a float2 param is supposed to be the coords, and a
                 // half4/float parameter is supposed to be the input or destination color:
-                if (type == *context.fTypes.fFloat2) {
+                if (type.matches(*context.fTypes.fFloat2)) {
                     m.fLayout.fBuiltin = SK_MAIN_COORDS_BUILTIN;
                     modifiersChanged = true;
                 } else if (typeIsValidForColor(type) &&
@@ -118,7 +121,7 @@ static bool check_parameters(const Context& context,
                 // For testing purposes, we have .sksl inputs that are treated as both runtime
                 // effects and fragment shaders. To make that work, fragment shaders are allowed to
                 // have a coords parameter.
-                if (type == *context.fTypes.fFloat2) {
+                if (type.matches(*context.fTypes.fFloat2)) {
                     m.fLayout.fBuiltin = SK_MAIN_COORDS_BUILTIN;
                     modifiersChanged = true;
                 }
@@ -138,12 +141,20 @@ static bool check_main_signature(const Context& context, int line, const Type& r
     ProgramKind kind = context.fConfig->fKind;
 
     auto typeIsValidForColor = [&](const Type& type) {
-        return type == *context.fTypes.fHalf4 || type == *context.fTypes.fFloat4;
+        return type.matches(*context.fTypes.fHalf4) || type.matches(*context.fTypes.fFloat4);
+    };
+
+    auto typeIsValidForAttributes = [&](const Type& type) {
+        return type.isStruct() && type.name() == "Attributes";
+    };
+
+    auto typeIsValidForVaryings = [&](const Type& type) {
+        return type.isStruct() && type.name() == "Varyings";
     };
 
     auto paramIsCoords = [&](int idx) {
         const Variable& p = *parameters[idx];
-        return p.type() == *context.fTypes.fFloat2 &&
+        return p.type().matches(*context.fTypes.fFloat2) &&
                p.modifiers().fFlags == 0 &&
                p.modifiers().fLayout.fBuiltin == SK_MAIN_COORDS_BUILTIN;
     };
@@ -155,6 +166,26 @@ static bool check_main_signature(const Context& context, int line, const Type& r
                p.modifiers().fLayout.fBuiltin == builtinID;
     };
 
+    auto paramIsInAttributes = [&](int idx) {
+        const Variable& p = *parameters[idx];
+        return typeIsValidForAttributes(p.type()) && p.modifiers().fFlags == 0;
+    };
+
+    auto paramIsOutVaryings = [&](int idx) {
+        const Variable& p = *parameters[idx];
+        return typeIsValidForVaryings(p.type()) && p.modifiers().fFlags == Modifiers::kOut_Flag;
+    };
+
+    auto paramIsInVaryings = [&](int idx) {
+        const Variable& p = *parameters[idx];
+        return typeIsValidForVaryings(p.type()) && p.modifiers().fFlags == 0;
+    };
+
+    auto paramIsOutColor = [&](int idx) {
+        const Variable& p = *parameters[idx];
+        return typeIsValidForColor(p.type()) && p.modifiers().fFlags == Modifiers::kOut_Flag;
+    };
+
     auto paramIsInputColor = [&](int n) { return paramIsBuiltinColor(n, SK_INPUT_COLOR_BUILTIN); };
     auto paramIsDestColor  = [&](int n) { return paramIsBuiltinColor(n, SK_DEST_COLOR_BUILTIN); };
 
@@ -202,6 +233,33 @@ static bool check_main_signature(const Context& context, int line, const Type& r
             }
             break;
         }
+        case ProgramKind::kCustomMeshVertex: {
+            // float2 main(Attributes, out Varyings)
+            if (!returnType.matches(*context.fTypes.fFloat2)) {
+                errors.error(line, "'main' must return: 'vec2' or 'float2'");
+                return false;
+            }
+            if (!(parameters.size() == 2 && paramIsInAttributes(0) && paramIsOutVaryings(1))) {
+                errors.error(line, "'main' parameters must be (Attributes, out Varyings");
+                return false;
+            }
+            break;
+        }
+        case ProgramKind::kCustomMeshFragment: {
+            // float2 main(Varyings) -or- float2 main(Varyings, out half4|float4]) -or-
+            // void main(Varyings) -or- void main(Varyings, out half4|float4])
+            if (!returnType.matches(*context.fTypes.fFloat2) &&
+                !returnType.matches(*context.fTypes.fVoid)) {
+                errors.error(line, "'main' must return: 'vec2', 'float2', 'or' 'void'");
+                return false;
+            }
+            if (!((parameters.size() == 1 && paramIsInVaryings(0)) ||
+                  (parameters.size() == 2 && paramIsInVaryings(0) && paramIsOutColor(1)))) {
+                errors.error(line, "'main' parameters must be (Varyings, (out (half4|float4))?)");
+                return false;
+            }
+            break;
+        }
         case ProgramKind::kGeneric:
             // No rules apply here
             break;
@@ -232,7 +290,7 @@ static bool check_main_signature(const Context& context, int line, const Type& r
 static bool find_existing_declaration(const Context& context,
                                       SymbolTable& symbols,
                                       int line,
-                                      skstd::string_view name,
+                                      std::string_view name,
                                       std::vector<std::unique_ptr<Variable>>& parameters,
                                       const Type* returnType,
                                       const FunctionDeclaration** outExistingDecl) {
@@ -249,7 +307,7 @@ static bool find_existing_declaration(const Context& context,
                 functions.push_back(&entry->as<FunctionDeclaration>());
                 break;
             default:
-                errors.error(line, "symbol '" + name + "' was already defined");
+                errors.error(line, "symbol '" + std::string(name) + "' was already defined");
                 return false;
         }
         for (const FunctionDeclaration* other : functions) {
@@ -259,7 +317,7 @@ static bool find_existing_declaration(const Context& context,
             }
             bool match = true;
             for (size_t i = 0; i < parameters.size(); i++) {
-                if (parameters[i]->type() != other->parameters()[i]->type()) {
+                if (!parameters[i]->type().matches(other->parameters()[i]->type())) {
                     match = false;
                     break;
                 }
@@ -267,7 +325,7 @@ static bool find_existing_declaration(const Context& context,
             if (!match) {
                 continue;
             }
-            if (*returnType != other->returnType()) {
+            if (!returnType->matches(other->returnType())) {
                 std::vector<const Variable*> paramPtrs;
                 paramPtrs.reserve(parameters.size());
                 for (std::unique_ptr<Variable>& param : parameters) {
@@ -286,9 +344,8 @@ static bool find_existing_declaration(const Context& context,
             }
             for (size_t i = 0; i < parameters.size(); i++) {
                 if (parameters[i]->modifiers() != other->parameters()[i]->modifiers()) {
-                    errors.error(line,
-                                 "modifiers on parameter " + to_string((uint64_t)i + 1) +
-                                 " differ between declaration and definition");
+                    errors.error(line, "modifiers on parameter " + std::to_string(i + 1) +
+                                       " differ between declaration and definition");
                     return false;
                 }
             }
@@ -305,7 +362,7 @@ static bool find_existing_declaration(const Context& context,
 
 FunctionDeclaration::FunctionDeclaration(int line,
                                          const Modifiers* modifiers,
-                                         skstd::string_view name,
+                                         std::string_view name,
                                          std::vector<const Variable*> parameters,
                                          const Type* returnType,
                                          bool builtin)
@@ -323,7 +380,7 @@ const FunctionDeclaration* FunctionDeclaration::Convert(
         SymbolTable& symbols,
         int line,
         const Modifiers* modifiers,
-        skstd::string_view name,
+        std::string_view name,
         std::vector<std::unique_ptr<Variable>> parameters,
         const Type* returnType) {
     bool isMain = (name == "main");
@@ -350,24 +407,33 @@ const FunctionDeclaration* FunctionDeclaration::Convert(
     return symbols.add(std::move(result));
 }
 
-String FunctionDeclaration::mangledName() const {
+std::string FunctionDeclaration::mangledName() const {
     if ((this->isBuiltin() && !this->definition()) || this->isMain()) {
         // Builtins without a definition (like `sin` or `sqrt`) must use their real names.
-        return String(this->name());
+        return std::string(this->name());
+    }
+    // Built-in functions can have a $ prefix, which will fail to compile in GLSL/Metal. Remove the
+    // $ and add a unique mangling specifier, so user code can't conflict with the name.
+    std::string_view name = this->name();
+    const char* builtinMarker = "";
+    if (skstd::starts_with(name, '$')) {
+        name.remove_prefix(1);
+        builtinMarker = "Q";  // a unique, otherwise-unused mangle character
     }
     // GLSL forbids two underscores in a row; add an extra character if necessary to avoid this.
-    const char* splitter = this->name().ends_with("_") ? "x_" : "_";
+    const char* splitter = skstd::ends_with(name, '_') ? "x_" : "_";
     // Rename function to `funcname_returntypeparamtypes`.
-    String result = this->name() + splitter + this->returnType().abbreviatedName();
+    std::string result = std::string(name) + splitter + builtinMarker +
+                         this->returnType().abbreviatedName();
     for (const Variable* p : this->parameters()) {
         result += p->type().abbreviatedName();
     }
     return result;
 }
 
-String FunctionDeclaration::description() const {
-    String result = this->returnType().displayName() + " " + this->name() + "(";
-    String separator;
+std::string FunctionDeclaration::description() const {
+    std::string result = this->returnType().displayName() + " " + std::string(this->name()) + "(";
+    std::string separator;
     for (const Variable* p : this->parameters()) {
         result += separator;
         separator = ", ";
@@ -389,7 +455,7 @@ bool FunctionDeclaration::matches(const FunctionDeclaration& f) const {
         return false;
     }
     for (size_t i = 0; i < parameters.size(); i++) {
-        if (parameters[i]->type() != otherParameters[i]->type()) {
+        if (!parameters[i]->type().matches(otherParameters[i]->type())) {
             return false;
         }
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h b/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
index f8e858eb6f7d6..34ce403a19d87 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionDeclaration.h
@@ -39,7 +39,7 @@ class FunctionDeclaration final : public Symbol {
 
     FunctionDeclaration(int line,
                         const Modifiers* modifiers,
-                        skstd::string_view name,
+                        std::string_view name,
                         std::vector<const Variable*> parameters,
                         const Type* returnType,
                         bool builtin);
@@ -48,7 +48,7 @@ class FunctionDeclaration final : public Symbol {
                                               SymbolTable& symbols,
                                               int line,
                                               const Modifiers* modifiers,
-                                              skstd::string_view name,
+                                              std::string_view name,
                                               std::vector<std::unique_ptr<Variable>> parameters,
                                               const Type* returnType);
 
@@ -89,9 +89,9 @@ class FunctionDeclaration final : public Symbol {
         return this->intrinsicKind() != kNotIntrinsic;
     }
 
-    String mangledName() const;
+    std::string mangledName() const;
 
-    String description() const override;
+    std::string description() const override;
 
     bool matches(const FunctionDeclaration& f) const;
 
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp b/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp
index d35afa4101d2e..3c7c3d182ef19 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.cpp
@@ -8,9 +8,9 @@
 #include "include/sksl/DSLCore.h"
 #include "src/core/SkSafeMath.h"
 #include "src/sksl/SkSLAnalysis.h"
+#include "src/sksl/SkSLBuiltinMap.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/SkSLContext.h"
-#include "src/sksl/SkSLIntrinsicMap.h"
 #include "src/sksl/SkSLProgramSettings.h"
 #include "src/sksl/SkSLThreadContext.h"
 #include "src/sksl/ir/SkSLFieldAccess.h"
@@ -36,7 +36,7 @@ static void append_rtadjust_fixup_to_vertex_main(const Context& context,
         // ...append a line to the end of the function body which fixes up sk_Position.
         const Variable* skPerVertex = nullptr;
         if (const ProgramElement* perVertexDecl =
-                context.fIntrinsics->find(Compiler::PERVERTEX_NAME)) {
+                context.fBuiltins->find(Compiler::PERVERTEX_NAME)) {
             SkASSERT(perVertexDecl->is<SkSL::InterfaceBlock>());
             skPerVertex = &perVertexDecl->as<SkSL::InterfaceBlock>().variable();
         }
@@ -77,27 +77,27 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
     class Finalizer : public ProgramWriter {
     public:
         Finalizer(const Context& context, const FunctionDeclaration& function,
-                  IntrinsicSet* referencedIntrinsics)
+                  FunctionSet* referencedBuiltinFunctions)
             : fContext(context)
             , fFunction(function)
-            , fReferencedIntrinsics(referencedIntrinsics) {}
+            , fReferencedBuiltinFunctions(referencedBuiltinFunctions) {}
 
         ~Finalizer() override {
             SkASSERT(fBreakableLevel == 0);
             SkASSERT(fContinuableLevel == std::forward_list<int>{0});
         }
 
-        void copyIntrinsicIfNeeded(const FunctionDeclaration& function) {
+        void copyBuiltinFunctionIfNeeded(const FunctionDeclaration& function) {
             if (const ProgramElement* found =
-                    fContext.fIntrinsics->findAndInclude(function.description())) {
+                        fContext.fBuiltins->findAndInclude(function.description())) {
                 const FunctionDefinition& original = found->as<FunctionDefinition>();
 
-                // Sort the referenced intrinsics into a consistent order; otherwise our output will
-                // become non-deterministic.
-                std::vector<const FunctionDeclaration*> intrinsics(
-                        original.referencedIntrinsics().begin(),
-                        original.referencedIntrinsics().end());
-                std::sort(intrinsics.begin(), intrinsics.end(),
+                // Sort the referenced builtin functions into a consistent order; otherwise our
+                // output will become non-deterministic.
+                std::vector<const FunctionDeclaration*> builtinFunctions(
+                        original.referencedBuiltinFunctions().begin(),
+                        original.referencedBuiltinFunctions().end());
+                std::sort(builtinFunctions.begin(), builtinFunctions.end(),
                           [](const FunctionDeclaration* a, const FunctionDeclaration* b) {
                               if (a->isBuiltin() != b->isBuiltin()) {
                                   return a->isBuiltin() < b->isBuiltin();
@@ -110,8 +110,8 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
                               }
                               return a->description() < b->description();
                           });
-                for (const FunctionDeclaration* f : intrinsics) {
-                    this->copyIntrinsicIfNeeded(*f);
+                for (const FunctionDeclaration* f : builtinFunctions) {
+                    this->copyBuiltinFunctionIfNeeded(*f);
                 }
 
                 ThreadContext::SharedElements().push_back(found);
@@ -130,10 +130,10 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
                         ThreadContext::Inputs().fUseFlipRTUniform = true;
                     }
                     if (func.definition()) {
-                        fReferencedIntrinsics->insert(&func);
+                        fReferencedBuiltinFunctions->insert(&func);
                     }
-                    if (!fContext.fConfig->fIsBuiltinCode && fContext.fIntrinsics) {
-                        this->copyIntrinsicIfNeeded(func);
+                    if (!fContext.fConfig->fIsBuiltinCode && fContext.fBuiltins) {
+                        this->copyBuiltinFunctionIfNeeded(func);
                     }
                 }
 
@@ -154,9 +154,10 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
                     // To avoid overzealous error reporting, only trigger the error at the first
                     // place where the stack limit is exceeded.
                     if (prevSlotsUsed < kVariableSlotLimit && fSlotsUsed >= kVariableSlotLimit) {
-                        fContext.fErrors->error(stmt.fLine, "variable '" +
-                                                            stmt.as<VarDeclaration>().var().name() +
-                                                            "' exceeds the stack size limit");
+                        fContext.fErrors->error(
+                                stmt.fLine,
+                                "variable '" + std::string(stmt.as<VarDeclaration>().var().name()) +
+                                "' exceeds the stack size limit");
                     }
                     break;
                 }
@@ -238,8 +239,8 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
     private:
         const Context& fContext;
         const FunctionDeclaration& fFunction;
-        // which intrinsics have we encountered in this function
-        IntrinsicSet* fReferencedIntrinsics;
+        // which builtin functions have we encountered in this function
+        FunctionSet* fReferencedBuiltinFunctions;
         // how deeply nested we are in breakable constructs (for, do, switch).
         int fBreakableLevel = 0;
         // number of slots consumed by all variables declared in the function
@@ -251,19 +252,22 @@ std::unique_ptr<FunctionDefinition> FunctionDefinition::Convert(const Context& c
         using INHERITED = ProgramWriter;
     };
 
-    IntrinsicSet referencedIntrinsics;
-    Finalizer(context, function, &referencedIntrinsics).visitStatement(*body);
+    FunctionSet referencedBuiltinFunctions;
+    Finalizer(context, function, &referencedBuiltinFunctions).visitStatement(*body);
     if (function.isMain() && context.fConfig->fKind == ProgramKind::kVertex) {
         append_rtadjust_fixup_to_vertex_main(context, function, body->as<Block>());
     }
 
     if (Analysis::CanExitWithoutReturningValue(function, *body)) {
-        context.fErrors->error(function.fLine, "function '" + function.name() +
+        context.fErrors->error(function.fLine, "function '" + std::string(function.name()) +
                                                "' can exit without returning a value");
     }
 
+    SkASSERTF(!function.isIntrinsic(),
+              "Intrinsic %s should not have a definition",
+              std::string(function.name()).c_str());
     return std::make_unique<FunctionDefinition>(line, &function, builtin, std::move(body),
-                                                std::move(referencedIntrinsics));
+                                                std::move(referencedBuiltinFunctions));
 }
 
 }  // namespace SkSL
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h b/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
index d14cdcf24cdab..92e0d9a0b6138 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionDefinition.h
@@ -21,15 +21,15 @@ class FunctionDefinition final : public ProgramElement {
 public:
     inline static constexpr Kind kProgramElementKind = Kind::kFunction;
 
-    using IntrinsicSet = std::unordered_set<const FunctionDeclaration*>;
+    using FunctionSet = std::unordered_set<const FunctionDeclaration*>;
 
     FunctionDefinition(int line, const FunctionDeclaration* declaration, bool builtin,
-                       std::unique_ptr<Statement> body, IntrinsicSet referencedIntrinsics)
+                       std::unique_ptr<Statement> body, FunctionSet referencedBuiltinFunctions)
         : INHERITED(line, kProgramElementKind)
         , fDeclaration(declaration)
         , fBuiltin(builtin)
         , fBody(std::move(body))
-        , fReferencedIntrinsics(std::move(referencedIntrinsics)) {}
+        , fReferencedBuiltinFunctions(std::move(referencedBuiltinFunctions)) {}
 
     /**
      * Coerces `return` statements to the return type of the function, and reports errors in the
@@ -64,17 +64,17 @@ class FunctionDefinition final : public ProgramElement {
         return fBody;
     }
 
-    const std::unordered_set<const FunctionDeclaration*>& referencedIntrinsics() const {
-        return fReferencedIntrinsics;
+    const FunctionSet& referencedBuiltinFunctions() const {
+        return fReferencedBuiltinFunctions;
     }
 
     std::unique_ptr<ProgramElement> clone() const override {
         return std::make_unique<FunctionDefinition>(fLine, &this->declaration(),
                                                     /*builtin=*/false, this->body()->clone(),
-                                                    this->referencedIntrinsics());
+                                                    this->referencedBuiltinFunctions());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->declaration().description() + " " + this->body()->description();
     }
 
@@ -82,9 +82,9 @@ class FunctionDefinition final : public ProgramElement {
     const FunctionDeclaration* fDeclaration;
     bool fBuiltin;
     std::unique_ptr<Statement> fBody;
-    // We track intrinsic functions we reference so that we can ensure that all of them end up
+    // We track the builtin functions we reference so that we can ensure that all of them end up
     // copied into the final output.
-    IntrinsicSet fReferencedIntrinsics;
+    FunctionSet fReferencedBuiltinFunctions;
 
     using INHERITED = ProgramElement;
 };
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h b/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
index 325810a4fe14b..276fba93713ac 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionPrototype.h
@@ -38,7 +38,7 @@ class FunctionPrototype final : public ProgramElement {
         return std::make_unique<FunctionPrototype>(fLine, &this->declaration(), /*builtin=*/false);
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->declaration().description() + ";";
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLFunctionReference.h b/third_party/skia/src/sksl/ir/SkSLFunctionReference.h
index cbcd02bf43dc0..46542e5d015cb 100644
--- a/third_party/skia/src/sksl/ir/SkSLFunctionReference.h
+++ b/third_party/skia/src/sksl/ir/SkSLFunctionReference.h
@@ -40,8 +40,8 @@ class FunctionReference final : public Expression {
                                                                  &this->type()));
     }
 
-    String description() const override {
-        return String("<function>");
+    std::string description() const override {
+        return "<function>";
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp b/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
index 7a6181af911b8..c541a899d1320 100644
--- a/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLIfStatement.cpp
@@ -23,8 +23,8 @@ std::unique_ptr<Statement> IfStatement::clone() const {
                                          this->ifFalse() ? this->ifFalse()->clone() : nullptr);
 }
 
-String IfStatement::description() const {
-    String result;
+std::string IfStatement::description() const {
+    std::string result;
     if (this->isStatic()) {
         result += "@";
     }
@@ -64,7 +64,7 @@ std::unique_ptr<Statement> IfStatement::Make(const Context& context, int line, b
                                              std::unique_ptr<Expression> test,
                                              std::unique_ptr<Statement> ifTrue,
                                              std::unique_ptr<Statement> ifFalse) {
-    SkASSERT(test->type() == *context.fTypes.fBool);
+    SkASSERT(test->type().matches(*context.fTypes.fBool));
     SkASSERT(!Analysis::DetectVarDeclarationWithoutScope(*ifTrue));
     SkASSERT(!ifFalse || !Analysis::DetectVarDeclarationWithoutScope(*ifFalse));
 
diff --git a/third_party/skia/src/sksl/ir/SkSLIfStatement.h b/third_party/skia/src/sksl/ir/SkSLIfStatement.h
index 06e4e5dedfa7e..46b039a86745c 100644
--- a/third_party/skia/src/sksl/ir/SkSLIfStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLIfStatement.h
@@ -73,7 +73,7 @@ class IfStatement final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     std::unique_ptr<Expression> fTest;
diff --git a/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp b/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
index b4ae0c66b5df9..c5f0e2546e7f7 100644
--- a/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLIndexExpression.cpp
@@ -23,21 +23,21 @@ static bool index_out_of_range(const Context& context, SKSL_INT index, const Exp
         return false;
     }
 
-    context.fErrors->error(base.fLine, "index " + to_string(index) + " out of range for '" +
+    context.fErrors->error(base.fLine, "index " + std::to_string(index) + " out of range for '" +
                                        base.type().displayName() + "'");
     return true;
 }
 
 const Type& IndexExpression::IndexType(const Context& context, const Type& type) {
     if (type.isMatrix()) {
-        if (type.componentType() == *context.fTypes.fFloat) {
+        if (type.componentType().matches(*context.fTypes.fFloat)) {
             switch (type.rows()) {
                 case 2: return *context.fTypes.fFloat2;
                 case 3: return *context.fTypes.fFloat3;
                 case 4: return *context.fTypes.fFloat4;
                 default: SkASSERT(false);
             }
-        } else if (type.componentType() == *context.fTypes.fHalf) {
+        } else if (type.componentType().matches(*context.fTypes.fHalf)) {
             switch (type.rows()) {
                 case 2: return *context.fTypes.fHalf2;
                 case 3: return *context.fTypes.fHalf3;
@@ -132,7 +132,7 @@ std::unique_ptr<Expression> IndexExpression::Make(const Context& context,
                 ExpressionArray ctorArgs;
                 ctorArgs.reserve_back(vecWidth);
                 for (int slot = 0; slot < vecWidth; ++slot) {
-                    skstd::optional<double> slotVal = baseExpr->getConstantValue(indexValue + slot);
+                    std::optional<double> slotVal = baseExpr->getConstantValue(indexValue + slot);
                     if (slotVal.has_value()) {
                         ctorArgs.push_back(Literal::Make(baseExpr->fLine, *slotVal, &scalarType));
                     } else {
diff --git a/third_party/skia/src/sksl/ir/SkSLIndexExpression.h b/third_party/skia/src/sksl/ir/SkSLIndexExpression.h
index 287c0d0fe27bf..d9ac8a6666a9a 100644
--- a/third_party/skia/src/sksl/ir/SkSLIndexExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLIndexExpression.h
@@ -68,7 +68,7 @@ struct IndexExpression final : public Expression {
                                                                &this->type()));
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->base()->description() + "[" + this->index()->description() + "]";
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLInlineMarker.h b/third_party/skia/src/sksl/ir/SkSLInlineMarker.h
index f43a3cefbc64d..0f2de6a5c1b67 100644
--- a/third_party/skia/src/sksl/ir/SkSLInlineMarker.h
+++ b/third_party/skia/src/sksl/ir/SkSLInlineMarker.h
@@ -38,8 +38,8 @@ class InlineMarker final : public Statement {
         return true;
     }
 
-    String description() const override {
-        return String("/* inlined: ") + this->function().name() + String(" */");
+    std::string description() const override {
+        return "/* inlined: " + std::string(this->function().name()) + " */";
     }
 
     std::unique_ptr<Statement> clone() const override {
diff --git a/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h b/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
index f5331ad22ee64..f72993ffa887d 100644
--- a/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
+++ b/third_party/skia/src/sksl/ir/SkSLInterfaceBlock.h
@@ -9,8 +9,8 @@
 #define SKSL_INTERFACEBLOCK
 
 #include <memory>
+#include <string_view>
 
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLProgramElement.h"
 #include "src/sksl/ir/SkSLSymbolTable.h"
 #include "src/sksl/ir/SkSLVarDeclarations.h"
@@ -33,8 +33,8 @@ class InterfaceBlock final : public ProgramElement {
 
     InterfaceBlock(int line,
                    const Variable& var,
-                   skstd::string_view typeName,
-                   skstd::string_view instanceName,
+                   std::string_view typeName,
+                   std::string_view instanceName,
                    int arraySize,
                    std::shared_ptr<SymbolTable> typeOwner)
             : INHERITED(line, kProgramElementKind)
@@ -52,11 +52,11 @@ class InterfaceBlock final : public ProgramElement {
         return fVariable;
     }
 
-    skstd::string_view typeName() const {
+    std::string_view typeName() const {
         return fTypeName;
     }
 
-    skstd::string_view instanceName() const {
+    std::string_view instanceName() const {
         return fInstanceName;
     }
 
@@ -74,8 +74,9 @@ class InterfaceBlock final : public ProgramElement {
                                                 SymbolTable::WrapIfBuiltin(this->typeOwner()));
     }
 
-    String description() const override {
-        String result = this->variable().modifiers().description() + this->typeName() + " {\n";
+    std::string description() const override {
+        std::string result = this->variable().modifiers().description() +
+                             std::string(this->typeName()) + " {\n";
         const Type* structType = &this->variable().type();
         if (structType->isArray()) {
             structType = &structType->componentType();
@@ -85,9 +86,9 @@ class InterfaceBlock final : public ProgramElement {
         }
         result += "}";
         if (!this->instanceName().empty()) {
-            result += " " + this->instanceName();
+            result += " " + std::string(this->instanceName());
             if (this->arraySize() > 0) {
-                result.appendf("[%d]", this->arraySize());
+                String::appendf(&result, "[%d]", this->arraySize());
             }
         }
         return result + ";";
@@ -95,8 +96,8 @@ class InterfaceBlock final : public ProgramElement {
 
 private:
     const Variable& fVariable;
-    skstd::string_view fTypeName;
-    skstd::string_view fInstanceName;
+    std::string_view fTypeName;
+    std::string_view fInstanceName;
     int fArraySize;
     std::shared_ptr<SymbolTable> fTypeOwner;
 
diff --git a/third_party/skia/src/sksl/ir/SkSLLiteral.h b/third_party/skia/src/sksl/ir/SkSLLiteral.h
index fbb744f98a977..eeaa7bdc54938 100644
--- a/third_party/skia/src/sksl/ir/SkSLLiteral.h
+++ b/third_party/skia/src/sksl/ir/SkSLLiteral.h
@@ -96,12 +96,12 @@ class Literal : public Expression {
         return fValue;
     }
 
-    String description() const override {
+    std::string description() const override {
         if (this->type().isFloat()) {
-            return to_string(this->floatValue());
+            return skstd::to_string(this->floatValue());
         }
         if (this->type().isInteger()) {
-            return to_string(this->intValue());
+            return std::to_string(this->intValue());
         }
         SkASSERT(this->type().isBoolean());
         return fValue ? "true" : "false";
@@ -132,7 +132,7 @@ class Literal : public Expression {
         return true;
     }
 
-    skstd::optional<double> getConstantValue(int n) const override {
+    std::optional<double> getConstantValue(int n) const override {
         SkASSERT(n == 0);
         return fValue;
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLMethodReference.h b/third_party/skia/src/sksl/ir/SkSLMethodReference.h
index 0776043125743..9994058f6e00d 100644
--- a/third_party/skia/src/sksl/ir/SkSLMethodReference.h
+++ b/third_party/skia/src/sksl/ir/SkSLMethodReference.h
@@ -51,8 +51,8 @@ class MethodReference final : public Expression {
                 fLine, this->self()->clone(), this->functions(), &this->type()));
     }
 
-    String description() const override {
-        return String("<method>");
+    std::string description() const override {
+        return "<method>";
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLModifiers.cpp b/third_party/skia/src/sksl/ir/SkSLModifiers.cpp
index eef6381789b85..573bbad97cb92 100644
--- a/third_party/skia/src/sksl/ir/SkSLModifiers.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLModifiers.cpp
@@ -35,7 +35,7 @@ bool Modifiers::checkPermitted(const Context& context, int line, int permittedMo
     for (const auto& f : kModifierFlags) {
         if (modifierFlags & f.flag) {
             if (!(permittedModifierFlags & f.flag)) {
-                context.fErrors->error(line, "'" + String(f.name) + "' is not permitted here");
+                context.fErrors->error(line, "'" + std::string(f.name) + "' is not permitted here");
                 success = false;
             }
             modifierFlags &= ~f.flag;
@@ -61,8 +61,8 @@ bool Modifiers::checkPermitted(const Context& context, int line, int permittedMo
     for (const auto& lf : kLayoutFlags) {
         if (layoutFlags & lf.flag) {
             if (!(permittedLayoutFlags & lf.flag)) {
-                context.fErrors->error(
-                        line, "layout qualifier '" + String(lf.name) + "' is not permitted here");
+                context.fErrors->error(line, "layout qualifier '" + std::string(lf.name) +
+                                             "' is not permitted here");
                 success = false;
             }
             layoutFlags &= ~lf.flag;
diff --git a/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h b/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
index 0905d331ffc82..f03ae45fb8ec2 100644
--- a/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
+++ b/third_party/skia/src/sksl/ir/SkSLModifiersDeclaration.h
@@ -34,7 +34,7 @@ class ModifiersDeclaration final : public ProgramElement {
         return std::make_unique<ModifiersDeclaration>(&this->modifiers());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->modifiers().description() + ";";
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLNop.h b/third_party/skia/src/sksl/ir/SkSLNop.h
index 2da8533dfa175..2cc59f9032dd4 100644
--- a/third_party/skia/src/sksl/ir/SkSLNop.h
+++ b/third_party/skia/src/sksl/ir/SkSLNop.h
@@ -31,8 +31,8 @@ class Nop final : public Statement {
         return true;
     }
 
-    String description() const override {
-        return String(";");
+    std::string description() const override {
+        return ";";
     }
 
     std::unique_ptr<Statement> clone() const override {
diff --git a/third_party/skia/src/sksl/ir/SkSLPoison.h b/third_party/skia/src/sksl/ir/SkSLPoison.h
index 9a18909385a88..be5d90c10b636 100644
--- a/third_party/skia/src/sksl/ir/SkSLPoison.h
+++ b/third_party/skia/src/sksl/ir/SkSLPoison.h
@@ -29,7 +29,7 @@ class Poison : public Expression {
         return std::make_unique<Poison>(fLine, &this->type());
     }
 
-    String description() const override {
+    std::string description() const override {
         return Compiler::POISON_TAG;
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp b/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
index 98241bda6dbcf..c93130f0d3160 100644
--- a/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLPostfixExpression.cpp
@@ -19,9 +19,8 @@ std::unique_ptr<Expression> PostfixExpression::Convert(const Context& context,
                                                        Operator op) {
     const Type& baseType = base->type();
     if (!baseType.isNumber()) {
-        context.fErrors->error(base->fLine,
-                               "'" + String(op.operatorName()) + "' cannot operate on '" +
-                               baseType.displayName() + "'");
+        context.fErrors->error(base->fLine, "'" + std::string(op.tightOperatorName()) +
+                                            "' cannot operate on '" + baseType.displayName() + "'");
         return nullptr;
     }
     if (!Analysis::UpdateVariableRefKind(base.get(), VariableRefKind::kReadWrite,
diff --git a/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h b/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
index 244043a368775..aea0c5be4db51 100644
--- a/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLPostfixExpression.h
@@ -57,7 +57,7 @@ class PostfixExpression final : public Expression {
         return std::make_unique<PostfixExpression>(this->operand()->clone(), this->getOperator());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->operand()->description() + this->getOperator().operatorName();
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp b/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
index 8298c6d1553e5..05caa1c9a6a72 100644
--- a/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLPrefixExpression.cpp
@@ -170,8 +170,8 @@ std::unique_ptr<Expression> PrefixExpression::Convert(const Context& context,
         case Token::Kind::TK_MINUSMINUS:
             if (!baseType.isNumber()) {
                 context.fErrors->error(base->fLine,
-                                       String("'") + op.operatorName() + "' cannot operate on '" +
-                                       baseType.displayName() + "'");
+                                       "'" + std::string(op.tightOperatorName()) +
+                                       "' cannot operate on '" + baseType.displayName() + "'");
                 return nullptr;
             }
             if (!Analysis::UpdateVariableRefKind(base.get(), VariableReference::RefKind::kReadWrite,
@@ -183,8 +183,8 @@ std::unique_ptr<Expression> PrefixExpression::Convert(const Context& context,
         case Token::Kind::TK_LOGICALNOT:
             if (!baseType.isBoolean()) {
                 context.fErrors->error(base->fLine,
-                                       String("'") + op.operatorName() + "' cannot operate on '" +
-                                       baseType.displayName() + "'");
+                                       "'" + std::string(op.tightOperatorName()) +
+                                       "' cannot operate on '" + baseType.displayName() + "'");
                 return nullptr;
             }
             break;
@@ -194,13 +194,13 @@ std::unique_ptr<Expression> PrefixExpression::Convert(const Context& context,
                 // GLSL ES 1.00, Section 5.1
                 context.fErrors->error(
                         base->fLine,
-                        String("operator '") + op.operatorName() + "' is not allowed");
+                        "operator '" + std::string(op.tightOperatorName()) + "' is not allowed");
                 return nullptr;
             }
             if (baseType.isArray() || !baseType.componentType().isInteger()) {
                 context.fErrors->error(base->fLine,
-                                       String("'") + op.operatorName() + "' cannot operate on '" +
-                                       baseType.displayName() + "'");
+                                       "'" + std::string(op.tightOperatorName()) +
+                                       "' cannot operate on '" + baseType.displayName() + "'");
                 return nullptr;
             }
             if (baseType.isLiteral()) {
diff --git a/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h b/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
index d83e07d015747..a10d2b2729da7 100644
--- a/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLPrefixExpression.h
@@ -62,7 +62,7 @@ class PrefixExpression final : public Expression {
         return std::make_unique<PrefixExpression>(this->getOperator(), this->operand()->clone());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->getOperator().operatorName() + this->operand()->description();
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLProgram.h b/third_party/skia/src/sksl/ir/SkSLProgram.h
index 67ee5924933b7..056a35331b2db 100644
--- a/third_party/skia/src/sksl/ir/SkSLProgram.h
+++ b/third_party/skia/src/sksl/ir/SkSLProgram.h
@@ -73,7 +73,7 @@ struct Program {
         bool operator!=(const Inputs& that) const { return !(*this == that); }
     };
 
-    Program(std::unique_ptr<String> source,
+    Program(std::unique_ptr<std::string> source,
             std::unique_ptr<ProgramConfig> config,
             std::shared_ptr<Context> context,
             std::vector<std::unique_ptr<ProgramElement>> elements,
@@ -171,8 +171,8 @@ struct Program {
     // modify anything (as you might be mutating shared data).
     ElementsCollection elements() const { return ElementsCollection(*this); }
 
-    String description() const {
-        String result;
+    std::string description() const {
+        std::string result;
         for (const ProgramElement* e : this->elements()) {
             result += e->description();
         }
@@ -181,7 +181,7 @@ struct Program {
 
     const ProgramUsage* usage() const { return fUsage.get(); }
 
-    std::unique_ptr<String> fSource;
+    std::unique_ptr<std::string> fSource;
     std::unique_ptr<ProgramConfig> fConfig;
     std::shared_ptr<Context> fContext;
     // it's important to keep fOwnedElements defined after (and thus destroyed before) fSymbols,
diff --git a/third_party/skia/src/sksl/ir/SkSLReturnStatement.h b/third_party/skia/src/sksl/ir/SkSLReturnStatement.h
index 5cdf1e17ca298..9de7f79805114 100644
--- a/third_party/skia/src/sksl/ir/SkSLReturnStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLReturnStatement.h
@@ -41,14 +41,15 @@ class ReturnStatement final : public Statement {
     }
 
     std::unique_ptr<Statement> clone() const override {
-        return std::make_unique<ReturnStatement>(fLine, this->expression()->clone());
+        return std::make_unique<ReturnStatement>(fLine,
+                this->expression() ? this->expression()->clone() : nullptr);
     }
 
-    String description() const override {
+    std::string description() const override {
         if (this->expression()) {
             return "return " + this->expression()->description() + ";";
         } else {
-            return String("return;");
+            return "return;";
         }
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLSetting.cpp b/third_party/skia/src/sksl/ir/SkSLSetting.cpp
index 95ba0450e24bc..5d42380bd4fba 100644
--- a/third_party/skia/src/sksl/ir/SkSLSetting.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLSetting.cpp
@@ -68,13 +68,13 @@ class CapsLookupTable {
         }
     }
 
-    const CapsLookupMethod* lookup(skstd::string_view name) const {
+    const CapsLookupMethod* lookup(std::string_view name) const {
         auto iter = fMap.find(name);
         return (iter != fMap.end()) ? iter->second.get() : nullptr;
     }
 
 private:
-    std::unordered_map<skstd::string_view, std::unique_ptr<CapsLookupMethod>> fMap;
+    std::unordered_map<std::string_view, std::unique_ptr<CapsLookupMethod>> fMap;
 };
 
 static const CapsLookupTable& caps_lookup_table() {
@@ -104,27 +104,27 @@ static const CapsLookupTable& caps_lookup_table() {
 
 }  // namespace
 
-static const Type* get_type(const Context& context, int line, skstd::string_view name) {
+static const Type* get_type(const Context& context, int line, std::string_view name) {
     if (const CapsLookupMethod* caps = caps_lookup_table().lookup(name)) {
         return caps->type(context);
     }
 
-    context.fErrors->error(line, "unknown capability flag '" + name + "'");
+    context.fErrors->error(line, "unknown capability flag '" + std::string(name) + "'");
     return nullptr;
 }
 
 static std::unique_ptr<Expression> get_value(const Context& context, int line,
-                                             const skstd::string_view& name) {
+                                             const std::string_view& name) {
     if (const CapsLookupMethod* caps = caps_lookup_table().lookup(name)) {
         return caps->value(context);
     }
 
-    context.fErrors->error(line, "unknown capability flag '" + name + "'");
+    context.fErrors->error(line, "unknown capability flag '" + std::string(name) + "'");
     return nullptr;
 }
 
 std::unique_ptr<Expression> Setting::Convert(const Context& context, int line,
-                                             const skstd::string_view& name) {
+                                             const std::string_view& name) {
     SkASSERT(context.fConfig);
 
     if (context.fConfig->fSettings.fReplaceSettings) {
diff --git a/third_party/skia/src/sksl/ir/SkSLSetting.h b/third_party/skia/src/sksl/ir/SkSLSetting.h
index cf0b24286661b..a0d42f444291f 100644
--- a/third_party/skia/src/sksl/ir/SkSLSetting.h
+++ b/third_party/skia/src/sksl/ir/SkSLSetting.h
@@ -22,7 +22,7 @@ class Setting final : public Expression {
 public:
     inline static constexpr Kind kExpressionKind = Kind::kSetting;
 
-    Setting(int line, skstd::string_view name, const Type* type)
+    Setting(int line, std::string_view name, const Type* type)
         : INHERITED(line, kExpressionKind, type)
         , fName(std::move(name)) {}
 
@@ -31,18 +31,18 @@ class Setting final : public Expression {
     // (There's no failsafe Make equivalent, because there really isn't a good fallback expression
     // to produce when the `name` lookup fails. We wouldn't even know the expected type.)
     static std::unique_ptr<Expression> Convert(const Context& context, int line,
-                                               const skstd::string_view& name);
+                                               const std::string_view& name);
 
     std::unique_ptr<Expression> clone() const override {
         return std::make_unique<Setting>(fLine, this->name(), &this->type());
     }
 
-    const skstd::string_view& name() const {
+    const std::string_view& name() const {
         return fName;
     }
 
-    String description() const override {
-        return String(this->name());
+    std::string description() const override {
+        return std::string(this->name());
     }
 
     bool hasProperty(Property property) const override {
@@ -50,7 +50,7 @@ class Setting final : public Expression {
     }
 
 private:
-    skstd::string_view fName;
+    std::string_view fName;
 
     using INHERITED = Expression;
 };
diff --git a/third_party/skia/src/sksl/ir/SkSLStructDefinition.h b/third_party/skia/src/sksl/ir/SkSLStructDefinition.h
index 02ad7975be537..5ca75a19b37ac 100644
--- a/third_party/skia/src/sksl/ir/SkSLStructDefinition.h
+++ b/third_party/skia/src/sksl/ir/SkSLStructDefinition.h
@@ -40,8 +40,8 @@ class StructDefinition final : public ProgramElement {
         return std::make_unique<StructDefinition>(fLine, this->type());
     }
 
-    String description() const override {
-        String s = "struct ";
+    std::string description() const override {
+        std::string s = "struct ";
         s += this->type().name();
         s += " { ";
         for (const auto& f : this->type().fields()) {
diff --git a/third_party/skia/src/sksl/ir/SkSLSwitchCase.h b/third_party/skia/src/sksl/ir/SkSLSwitchCase.h
index 5d443ed3fbf54..28f229369b1f1 100644
--- a/third_party/skia/src/sksl/ir/SkSLSwitchCase.h
+++ b/third_party/skia/src/sksl/ir/SkSLSwitchCase.h
@@ -11,6 +11,8 @@
 #include "include/private/SkSLStatement.h"
 #include "src/sksl/ir/SkSLExpression.h"
 
+#include <inttypes.h>
+
 namespace SkSL {
 
 /**
@@ -20,17 +22,23 @@ class SwitchCase final : public Statement {
 public:
     inline static constexpr Kind kStatementKind = Kind::kSwitchCase;
 
-    // null value implies "default" case
-    SwitchCase(int line, std::unique_ptr<Expression> value, std::unique_ptr<Statement> statement)
-        : INHERITED(line, kStatementKind)
-        , fValue(std::move(value))
-        , fStatement(std::move(statement)) {}
+    static std::unique_ptr<SwitchCase> Make(int line, SKSL_INT value,
+            std::unique_ptr<Statement> statement) {
+        return std::unique_ptr<SwitchCase>(new SwitchCase(line, /*isDefault=*/false, value,
+                std::move(statement)));
+    }
 
-    std::unique_ptr<Expression>& value() {
-        return fValue;
+    static std::unique_ptr<SwitchCase> MakeDefault(int line, std::unique_ptr<Statement> statement) {
+        return std::unique_ptr<SwitchCase>(new SwitchCase(line, /*isDefault=*/true, -1,
+                std::move(statement)));
+    }
+
+    bool isDefault() const {
+        return fDefault;
     }
 
-    const std::unique_ptr<Expression>& value() const {
+    SKSL_INT value() const {
+        SkASSERT(!this->isDefault());
         return fValue;
     }
 
@@ -43,23 +51,29 @@ class SwitchCase final : public Statement {
     }
 
     std::unique_ptr<Statement> clone() const override {
-        return std::make_unique<SwitchCase>(fLine,
-                                            this->value() ? this->value()->clone() : nullptr,
-                                            this->statement()->clone());
+        return fDefault ? SwitchCase::MakeDefault(fLine, this->statement()->clone())
+                        : SwitchCase::Make(fLine, this->value(), this->statement()->clone());
     }
 
-    String description() const override {
-        if (this->value()) {
-            return String::printf("case %s:\n%s",
-                                  this->value()->description().c_str(),
-                                  fStatement->description().c_str());
-        } else {
+    std::string description() const override {
+        if (this->isDefault()) {
             return String::printf("default:\n%s", fStatement->description().c_str());
+        } else {
+            return String::printf("case %" PRId64 ":\n%s",
+                                  (int64_t) this->value(),
+                                  fStatement->description().c_str());
         }
     }
 
 private:
-    std::unique_ptr<Expression> fValue;
+    SwitchCase(int line, bool isDefault, SKSL_INT value, std::unique_ptr<Statement> statement)
+        : INHERITED(line, kStatementKind)
+        , fDefault(isDefault)
+        , fValue(std::move(value))
+        , fStatement(std::move(statement)) {}
+
+    bool fDefault;
+    SKSL_INT fValue;
     std::unique_ptr<Statement> fStatement;
 
     using INHERITED = Statement;
diff --git a/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp b/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
index c4fae53a7423a..eae88a2c0a216 100644
--- a/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLSwitchStatement.cpp
@@ -34,8 +34,8 @@ std::unique_ptr<Statement> SwitchStatement::clone() const {
                                              SymbolTable::WrapIfBuiltin(this->symbols()));
 }
 
-String SwitchStatement::description() const {
-    String result;
+std::string SwitchStatement::description() const {
+    std::string result;
     if (this->isStatic()) {
         result += "@";
     }
@@ -55,27 +55,20 @@ static std::forward_list<const SwitchCase*> find_duplicate_case_values(
 
     for (const std::unique_ptr<Statement>& stmt : cases) {
         const SwitchCase* sc = &stmt->as<SwitchCase>();
-        const std::unique_ptr<Expression>& valueExpr = sc->value();
-
-        // A null case-value indicates the `default` switch-case.
-        if (!valueExpr) {
+        if (sc->isDefault()) {
             if (foundDefault) {
                 duplicateCases.push_front(sc);
                 continue;
             }
             foundDefault = true;
-            continue;
-        }
-
-        // GetConstantInt already succeeded when the SwitchCase was first assembled, so it should
-        // succeed this time too.
-        SKSL_INT intValue = 0;
-        SkAssertResult(ConstantFolder::GetConstantInt(*valueExpr, &intValue));
-        if (intValues.contains(intValue)) {
-            duplicateCases.push_front(sc);
-            continue;
+        } else {
+            SKSL_INT value = sc->value();
+            if (intValues.contains(value)) {
+                duplicateCases.push_front(sc);
+                continue;
+            }
+            intValues.add(value);
         }
-        intValues.add(intValue);
     }
 
     return duplicateCases;
@@ -180,28 +173,23 @@ std::unique_ptr<Statement> SwitchStatement::Convert(const Context& context,
 
     StatementArray cases;
     for (int i = 0; i < caseValues.count(); ++i) {
-        int caseLine;
-        std::unique_ptr<Expression> caseValue;
         if (caseValues[i]) {
-            caseLine = caseValues[i]->fLine;
-
-            // Case values must be the same type as the switch value--`int` or a particular enum.
-            caseValue = value->type().coerceExpression(std::move(caseValues[i]), context);
+            int caseLine = caseValues[i]->fLine;
+            // Case values must be constant integers of the same type as the switch value
+            std::unique_ptr<Expression> caseValue = value->type().coerceExpression(
+                    std::move(caseValues[i]), context);
             if (!caseValue) {
                 return nullptr;
             }
-            // Case values must be a literal integer or a `const int` variable reference.
             SKSL_INT intValue;
             if (!ConstantFolder::GetConstantInt(*caseValue, &intValue)) {
                 context.fErrors->error(caseValue->fLine, "case value must be a constant integer");
                 return nullptr;
             }
+            cases.push_back(SwitchCase::Make(caseLine, intValue, std::move(caseStatements[i])));
         } else {
-            // The null case-expression corresponds to `default:`.
-            caseLine = line;
+            cases.push_back(SwitchCase::MakeDefault(line, std::move(caseStatements[i])));
         }
-        cases.push_back(std::make_unique<SwitchCase>(caseLine, std::move(caseValue),
-                                                     std::move(caseStatements[i])));
     }
 
     // Detect duplicate `case` labels and report an error.
@@ -210,11 +198,11 @@ std::unique_ptr<Statement> SwitchStatement::Convert(const Context& context,
     if (!duplicateCases.empty()) {
         duplicateCases.reverse();
         for (const SwitchCase* sc : duplicateCases) {
-            if (sc->value() != nullptr) {
-                context.fErrors->error(sc->fLine,
-                                       "duplicate case value '" + sc->value()->description() + "'");
-            } else {
+            if (sc->isDefault()) {
                 context.fErrors->error(sc->fLine, "duplicate default case");
+            } else {
+                context.fErrors->error(sc->fLine, "duplicate case value '" +
+                                                  std::to_string(sc->value()) + "'");
             }
         }
         return nullptr;
@@ -235,12 +223,6 @@ std::unique_ptr<Statement> SwitchStatement::Make(const Context& context,
         return stmt->is<SwitchCase>();
     }));
 
-    // Confirm that every switch-case has been coerced to the proper type.
-    SkASSERT(std::all_of(cases.begin(), cases.end(), [&](const std::unique_ptr<Statement>& stmt) {
-        return !stmt->as<SwitchCase>().value() ||  // `default` case has a null value
-               value->type() == stmt->as<SwitchCase>().value()->type();
-    }));
-
     // Confirm that every switch-case value is unique.
     SkASSERT(find_duplicate_case_values(cases).empty());
 
@@ -252,14 +234,12 @@ std::unique_ptr<Statement> SwitchStatement::Make(const Context& context,
             SwitchCase* matchingCase = nullptr;
             for (const std::unique_ptr<Statement>& stmt : cases) {
                 SwitchCase& sc = stmt->as<SwitchCase>();
-                if (!sc.value()) {
+                if (sc.isDefault()) {
                     defaultCase = &sc;
                     continue;
                 }
 
-                SKSL_INT caseValue;
-                SkAssertResult(ConstantFolder::GetConstantInt(*sc.value(), &caseValue));
-                if (caseValue == switchValue) {
+                if (sc.value() == switchValue) {
                     matchingCase = &sc;
                     break;
                 }
diff --git a/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h b/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h
index fbca56d6e435e..dcca7f38b8897 100644
--- a/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h
+++ b/third_party/skia/src/sksl/ir/SkSLSwitchStatement.h
@@ -89,7 +89,7 @@ class SwitchStatement final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     bool fIsStatic;
diff --git a/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp b/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
index ec024d1e429fd..918d23810ca28 100644
--- a/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLSwizzle.cpp
@@ -7,7 +7,6 @@
 
 #include "src/sksl/ir/SkSLSwizzle.h"
 
-#include "include/private/SkTOptional.h"
 #include "include/sksl/SkSLErrorReporter.h"
 #include "src/sksl/SkSLAnalysis.h"
 #include "src/sksl/SkSLConstantFolder.h"
@@ -17,6 +16,8 @@
 #include "src/sksl/ir/SkSLConstructorSplat.h"
 #include "src/sksl/ir/SkSLLiteral.h"
 
+#include <optional>
+
 namespace SkSL {
 
 static bool validate_swizzle_domain(const ComponentArray& fields) {
@@ -27,7 +28,7 @@ static bool validate_swizzle_domain(const ComponentArray& fields) {
         kRectangle,
     };
 
-    skstd::optional<SwizzleDomain> domain;
+    std::optional<SwizzleDomain> domain;
 
     for (int8_t field : fields) {
         SwizzleDomain fieldDomain;
@@ -97,8 +98,8 @@ static char mask_char(int8_t component) {
     }
 }
 
-static String mask_string(const ComponentArray& components) {
-    String result;
+static std::string mask_string(const ComponentArray& components) {
+    std::string result;
     for (int8_t component : components) {
         result += mask_char(component);
     }
@@ -225,17 +226,15 @@ static std::unique_ptr<Expression> optimize_constructor_swizzle(const Context& c
     }
 
     // Wrap the new argument list in a constructor.
-    auto ctor = Constructor::Convert(context,
-                                     base.fLine,
-                                     componentType.toCompound(context, swizzleSize, /*rows=*/1),
-                                     std::move(newArgs));
-    SkASSERT(ctor);
-    return ctor;
+    return Constructor::Convert(context,
+                                base.fLine,
+                                componentType.toCompound(context, swizzleSize, /*rows=*/1),
+                                std::move(newArgs));
 }
 
 std::unique_ptr<Expression> Swizzle::Convert(const Context& context,
                                              std::unique_ptr<Expression> base,
-                                             skstd::string_view maskString) {
+                                             std::string_view maskString) {
     ComponentArray components;
     for (char field : maskString) {
         switch (field) {
@@ -259,7 +258,7 @@ std::unique_ptr<Expression> Swizzle::Convert(const Context& context,
             case 'B': components.push_back(SwizzleComponent::UB);   break;
             default:
                 context.fErrors->error(base->fLine,
-                        String::printf("invalid swizzle component '%c'", field));
+                                       String::printf("invalid swizzle component '%c'", field));
                 return nullptr;
         }
     }
@@ -342,9 +341,8 @@ std::unique_ptr<Expression> Swizzle::Convert(const Context& context,
                 [[fallthrough]];
             default:
                 // The swizzle component references a field that doesn't exist in the base type.
-                context.fErrors->error(line,
-                       String::printf("invalid swizzle component '%c'",
-                            mask_char(inComponents[i])));
+                context.fErrors->error(line, String::printf("invalid swizzle component '%c'",
+                                                            mask_char(inComponents[i])));
                 return nullptr;
         }
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLSwizzle.h b/third_party/skia/src/sksl/ir/SkSLSwizzle.h
index 0d0beb83c0831..728595d5e812d 100644
--- a/third_party/skia/src/sksl/ir/SkSLSwizzle.h
+++ b/third_party/skia/src/sksl/ir/SkSLSwizzle.h
@@ -40,7 +40,7 @@ struct Swizzle final : public Expression {
 
     static std::unique_ptr<Expression> Convert(const Context& context,
                                                std::unique_ptr<Expression> base,
-                                               skstd::string_view maskString);
+                                               std::string_view maskString);
 
     // Swizzle::Make does not permit ZERO or ONE in the component array, just X/Y/Z/W; errors are
     // reported via ASSERT.
@@ -69,8 +69,8 @@ struct Swizzle final : public Expression {
                                                        this->components()));
     }
 
-    String description() const override {
-        String result = this->base()->description() + ".";
+    std::string description() const override {
+        std::string result = this->base()->description() + ".";
         for (int x : this->components()) {
             result += "xyzw"[x];
         }
diff --git a/third_party/skia/src/sksl/ir/SkSLSymbolAlias.h b/third_party/skia/src/sksl/ir/SkSLSymbolAlias.h
deleted file mode 100644
index 7438beafc9914..0000000000000
--- a/third_party/skia/src/sksl/ir/SkSLSymbolAlias.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SKSL_SYMBOLALIAS
-#define SKSL_SYMBOLALIAS
-
-#include "include/private/SkSLSymbol.h"
-
-namespace SkSL {
-
-/**
- * A symbol representing a new name for an existing symbol.
- */
-class SymbolAlias final : public Symbol {
-public:
-    inline static constexpr Kind kSymbolKind = Kind::kSymbolAlias;
-
-    SymbolAlias(int line, skstd::string_view name, const Symbol* origSymbol)
-        : INHERITED(line, kSymbolKind, name)
-        , fOrigSymbol(origSymbol) {}
-
-    const Symbol* origSymbol() const {
-        return fOrigSymbol;
-    }
-
-    String description() const override {
-        return String(this->name());
-    }
-
-private:
-    const Symbol* fOrigSymbol;
-
-    using INHERITED = Symbol;
-};
-
-} // namespace SkSL
-
-#endif
diff --git a/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp b/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
index 8009b090a54fd..dc19006beb922 100644
--- a/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLSymbolTable.cpp
@@ -8,7 +8,6 @@
 #include "src/sksl/ir/SkSLSymbolTable.h"
 
 #include "src/sksl/SkSLContext.h"
-#include "src/sksl/ir/SkSLSymbolAlias.h"
 #include "src/sksl/ir/SkSLType.h"
 #include "src/sksl/ir/SkSLUnresolvedFunction.h"
 
@@ -25,7 +24,7 @@ std::vector<const FunctionDeclaration*> SymbolTable::GetFunctions(const Symbol&
     }
 }
 
-const Symbol* SymbolTable::operator[](skstd::string_view name) {
+const Symbol* SymbolTable::operator[](std::string_view name) {
     return this->lookup(fBuiltin ? nullptr : this, MakeSymbolKey(name));
 }
 
@@ -76,24 +75,17 @@ const Symbol* SymbolTable::lookup(SymbolTable* writableSymbolTable, const Symbol
             }
         }
     }
-    while (symbol && symbol->is<SymbolAlias>()) {
-        symbol = symbol->as<SymbolAlias>().origSymbol();
-    }
     return symbol;
 }
 
-const String* SymbolTable::takeOwnershipOfString(String str) {
+const std::string* SymbolTable::takeOwnershipOfString(std::string str) {
     fOwnedStrings.push_front(std::move(str));
     // Because fOwnedStrings is a linked list, pointers to elements are stable.
     return &fOwnedStrings.front();
 }
 
-void SymbolTable::addAlias(skstd::string_view name, const Symbol* symbol) {
-    this->add(std::make_unique<SymbolAlias>(symbol->fLine, name, symbol));
-}
-
 void SymbolTable::addWithoutOwnership(const Symbol* symbol) {
-    const skstd::string_view& name = symbol->name();
+    const std::string_view& name = symbol->name();
 
     const Symbol*& refInSymbolTable = fSymbols[MakeSymbolKey(name)];
     if (refInSymbolTable == nullptr) {
@@ -102,7 +94,8 @@ void SymbolTable::addWithoutOwnership(const Symbol* symbol) {
     }
 
     if (!symbol->is<FunctionDeclaration>()) {
-        fContext.fErrors->error(symbol->fLine, "symbol '" + name + "' was already defined");
+        fContext.fErrors->error(symbol->fLine, "symbol '" + std::string(name) +
+                                               "' was already defined");
         return;
     }
 
@@ -124,7 +117,7 @@ void SymbolTable::addWithoutOwnership(const Symbol* symbol) {
 
 const Type* SymbolTable::addArrayDimension(const Type* type, int arraySize) {
     if (arraySize != 0) {
-        const String* arrayName = this->takeOwnershipOfString(type->getArrayName(arraySize));
+        const std::string* arrayName = this->takeOwnershipOfString(type->getArrayName(arraySize));
         type = this->takeOwnershipOfSymbol(Type::MakeArrayType(*arrayName, *type, arraySize));
     }
     return type;
diff --git a/third_party/skia/src/sksl/ir/SkSLSymbolTable.h b/third_party/skia/src/sksl/ir/SkSLSymbolTable.h
index e5b130695c298..eb889c7382267 100644
--- a/third_party/skia/src/sksl/ir/SkSLSymbolTable.h
+++ b/third_party/skia/src/sksl/ir/SkSLSymbolTable.h
@@ -74,12 +74,7 @@ class SymbolTable {
      * UnresolvedFunction symbol (pointing to all of the candidates) will be added to the symbol
      * table and returned.
      */
-    const Symbol* operator[](skstd::string_view name);
-
-    /**
-     * Creates a new name for a symbol which already exists; does not take ownership of Symbol*.
-     */
-    void addAlias(skstd::string_view name, const Symbol* symbol);
+    const Symbol* operator[](std::string_view name);
 
     void addWithoutOwnership(const Symbol* symbol);
 
@@ -136,7 +131,7 @@ class SymbolTable {
         return this->isBuiltin() ? this : fParent->builtinParent();
     }
 
-    const String* takeOwnershipOfString(String n);
+    const std::string* takeOwnershipOfString(std::string n);
 
     std::shared_ptr<SymbolTable> fParent;
 
@@ -144,7 +139,7 @@ class SymbolTable {
 
 private:
     struct SymbolKey {
-        skstd::string_view fName;
+        std::string_view fName;
         uint32_t       fHash;
 
         bool operator==(const SymbolKey& that) const { return fName == that.fName; }
@@ -154,7 +149,7 @@ class SymbolTable {
         };
     };
 
-    static SymbolKey MakeSymbolKey(skstd::string_view name) {
+    static SymbolKey MakeSymbolKey(std::string_view name) {
         return SymbolKey{name, SkOpts::hash_fn(name.data(), name.size(), 0)};
     }
 
@@ -164,7 +159,7 @@ class SymbolTable {
 
     bool fBuiltin = false;
     std::vector<std::unique_ptr<IRNode>> fOwnedNodes;
-    std::forward_list<String> fOwnedStrings;
+    std::forward_list<std::string> fOwnedStrings;
     SkTHashMap<SymbolKey, const Symbol*, SymbolKey::Hash> fSymbols;
     const Context& fContext;
 
diff --git a/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp b/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
index 1b9fd97b254e8..6360fb6436824 100644
--- a/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLTernaryExpression.cpp
@@ -31,7 +31,7 @@ std::unique_ptr<Expression> TernaryExpression::Convert(const Context& context,
     Operator equalityOp(Token::Kind::TK_EQEQ);
     if (!equalityOp.determineBinaryType(context, ifTrue->type(), ifFalse->type(),
                                         &trueType, &falseType, &resultType) ||
-        (*trueType != *falseType)) {
+        !trueType->matches(*falseType)) {
         context.fErrors->error(line, "ternary operator result mismatch: '" +
                                      ifTrue->type().displayName() + "', '" +
                                      ifFalse->type().displayName() + "'");
@@ -62,7 +62,7 @@ std::unique_ptr<Expression> TernaryExpression::Make(const Context& context,
                                                     std::unique_ptr<Expression> test,
                                                     std::unique_ptr<Expression> ifTrue,
                                                     std::unique_ptr<Expression> ifFalse) {
-    SkASSERT(ifTrue->type() == ifFalse->type());
+    SkASSERT(ifTrue->type().matches(ifFalse->type()));
     SkASSERT(!ifTrue->type().componentType().isOpaque());
     SkASSERT(!context.fConfig->strictES2Mode() || !ifTrue->type().isOrContainsArray());
 
diff --git a/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h b/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
index c7096a37387ef..5c8b3e0dc5b42 100644
--- a/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
+++ b/third_party/skia/src/sksl/ir/SkSLTernaryExpression.h
@@ -25,7 +25,7 @@ class TernaryExpression final : public Expression {
         , fTest(std::move(test))
         , fIfTrue(std::move(ifTrue))
         , fIfFalse(std::move(ifFalse)) {
-        SkASSERT(this->ifTrue()->type() == this->ifFalse()->type());
+        SkASSERT(this->ifTrue()->type().matches(this->ifFalse()->type()));
     }
 
     // Creates a potentially-simplified form of the ternary. Typechecks and coerces input
@@ -81,7 +81,7 @@ class TernaryExpression final : public Expression {
                                                    this->ifFalse()->clone());
     }
 
-    String description() const override {
+    std::string description() const override {
         return "(" + this->test()->description() + " ? " + this->ifTrue()->description() + " : " +
                this->ifFalse()->description() + ")";
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLType.cpp b/third_party/skia/src/sksl/ir/SkSLType.cpp
index 8fc9d4dd08ebb..9c6dcf52c7983 100644
--- a/third_party/skia/src/sksl/ir/SkSLType.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLType.cpp
@@ -7,6 +7,7 @@
 
 #include "src/sksl/ir/SkSLType.h"
 
+#include "include/private/SkStringView.h"
 #include "src/sksl/SkSLConstantFolder.h"
 #include "src/sksl/SkSLContext.h"
 #include "src/sksl/SkSLProgramSettings.h"
@@ -18,15 +19,110 @@
 #include "src/sksl/ir/SkSLSymbolTable.h"
 #include "src/sksl/ir/SkSLType.h"
 
+#include <optional>
+#include <string_view>
+
 namespace SkSL {
 
 static constexpr int kMaxStructDepth = 8;
 
+class AliasType final : public Type {
+public:
+    AliasType(std::string_view name, const Type& targetType)
+        : INHERITED(name, targetType.abbreviatedName(), targetType.typeKind())
+        , fTargetType(targetType) {}
+
+    const Type& resolve() const override {
+        return fTargetType;
+    }
+
+    const Type& componentType() const override {
+        return fTargetType.componentType();
+    }
+
+    NumberKind numberKind() const override {
+        return fTargetType.numberKind();
+    }
+
+    int priority() const override {
+        return fTargetType.priority();
+    }
+
+    int columns() const override {
+        return fTargetType.columns();
+    }
+
+    int rows() const override {
+        return fTargetType.rows();
+    }
+
+    int bitWidth() const override {
+        return fTargetType.bitWidth();
+    }
+
+    bool isPrivate() const override {
+        return fTargetType.isPrivate();
+    }
+
+    bool isAllowedInES2() const override {
+        return fTargetType.isAllowedInES2();
+    }
+
+    size_t slotCount() const override {
+        return fTargetType.slotCount();
+    }
+
+    bool isDepth() const override {
+        return fTargetType.isDepth();
+    }
+
+    bool isArrayedTexture() const override {
+        return fTargetType.isArrayedTexture();
+    }
+
+    bool isScalar() const override {
+        return fTargetType.isScalar();
+    }
+
+    bool isLiteral() const override {
+        return fTargetType.isLiteral();
+    }
+
+    bool isVector() const override {
+        return fTargetType.isVector();
+    }
+
+    bool isMatrix() const override {
+        return fTargetType.isMatrix();
+    }
+
+    bool isArray() const override {
+        return fTargetType.isArray();
+    }
+
+    bool isStruct() const override {
+        return fTargetType.isStruct();
+    }
+
+    bool isInterfaceBlock() const override {
+        return fTargetType.isInterfaceBlock();
+    }
+
+    const std::vector<const Type*>& coercibleTypes() const override {
+        return fTargetType.coercibleTypes();
+    }
+
+private:
+    using INHERITED = Type;
+
+    const Type& fTargetType;
+};
+
 class ArrayType final : public Type {
 public:
     inline static constexpr TypeKind kTypeKind = TypeKind::kArray;
 
-    ArrayType(skstd::string_view name, const char* abbrev, const Type& componentType, int count)
+    ArrayType(std::string_view name, const char* abbrev, const Type& componentType, int count)
         : INHERITED(name, abbrev, kTypeKind)
         , fComponentType(componentType)
         , fCount(count) {
@@ -131,6 +227,10 @@ class LiteralType : public Type {
         return true;
     }
 
+    bool isPrivate() const override {
+        return true;
+    }
+
     size_t slotCount() const override {
         return 1;
     }
@@ -147,7 +247,7 @@ class ScalarType final : public Type {
 public:
     inline static constexpr TypeKind kTypeKind = TypeKind::kScalar;
 
-    ScalarType(skstd::string_view name, const char* abbrev, NumberKind numberKind, int8_t priority,
+    ScalarType(std::string_view name, const char* abbrev, NumberKind numberKind, int8_t priority,
                int8_t bitWidth)
         : INHERITED(name, abbrev, kTypeKind)
         , fNumberKind(numberKind)
@@ -198,7 +298,7 @@ class MatrixType final : public Type {
 public:
     inline static constexpr TypeKind kTypeKind = TypeKind::kMatrix;
 
-    MatrixType(skstd::string_view name, const char* abbrev, const Type& componentType,
+    MatrixType(std::string_view name, const char* abbrev, const Type& componentType,
                int8_t columns, int8_t rows)
         : INHERITED(name, abbrev, kTypeKind)
         , fComponentType(componentType.as<ScalarType>())
@@ -329,7 +429,7 @@ class StructType final : public Type {
 public:
     inline static constexpr TypeKind kTypeKind = TypeKind::kStruct;
 
-    StructType(int line, skstd::string_view name, std::vector<Field> fields, bool interfaceBlock)
+    StructType(int line, std::string_view name, std::vector<Field> fields, bool interfaceBlock)
         : INHERITED(std::move(name), "S", kTypeKind, line)
         , fFields(std::move(fields))
         , fInterfaceBlock(interfaceBlock) {}
@@ -377,7 +477,7 @@ class VectorType final : public Type {
 public:
     inline static constexpr TypeKind kTypeKind = TypeKind::kVector;
 
-    VectorType(skstd::string_view name, const char* abbrev, const Type& componentType,
+    VectorType(std::string_view name, const char* abbrev, const Type& componentType,
                int8_t columns)
         : INHERITED(name, abbrev, kTypeKind)
         , fComponentType(componentType.as<ScalarType>())
@@ -420,12 +520,16 @@ class VectorType final : public Type {
     int8_t fColumns;
 };
 
-String Type::getArrayName(int arraySize) const {
-    skstd::string_view name = this->name();
+std::string Type::getArrayName(int arraySize) const {
+    std::string_view name = this->name();
     return String::printf("%.*s[%d]", (int)name.size(), name.data(), arraySize);
 }
 
-std::unique_ptr<Type> Type::MakeArrayType(skstd::string_view name, const Type& componentType,
+std::unique_ptr<Type> Type::MakeAliasType(std::string_view name, const Type& targetType) {
+    return std::make_unique<AliasType>(std::move(name), targetType);
+}
+
+std::unique_ptr<Type> Type::MakeArrayType(std::string_view name, const Type& componentType,
                                           int columns) {
     return std::make_unique<ArrayType>(std::move(name), componentType.abbreviatedName(),
                                        componentType, columns);
@@ -440,7 +544,7 @@ std::unique_ptr<Type> Type::MakeLiteralType(const char* name, const Type& scalar
     return std::make_unique<LiteralType>(name, scalarType, priority);
 }
 
-std::unique_ptr<Type> Type::MakeMatrixType(skstd::string_view name, const char* abbrev,
+std::unique_ptr<Type> Type::MakeMatrixType(std::string_view name, const char* abbrev,
                                            const Type& componentType, int columns, int8_t rows) {
     return std::make_unique<MatrixType>(name, abbrev, componentType, columns, rows);
 }
@@ -454,14 +558,14 @@ std::unique_ptr<Type> Type::MakeSpecialType(const char* name, const char* abbrev
     return std::unique_ptr<Type>(new Type(name, abbrev, typeKind));
 }
 
-std::unique_ptr<Type> Type::MakeScalarType(skstd::string_view name, const char* abbrev,
+std::unique_ptr<Type> Type::MakeScalarType(std::string_view name, const char* abbrev,
                                            Type::NumberKind numberKind, int8_t priority,
                                            int8_t bitWidth) {
     return std::make_unique<ScalarType>(name, abbrev, numberKind, priority, bitWidth);
 
 }
 
-std::unique_ptr<Type> Type::MakeStructType(int line, skstd::string_view name,
+std::unique_ptr<Type> Type::MakeStructType(int line, std::string_view name,
                                            std::vector<Field> fields, bool interfaceBlock) {
     return std::make_unique<StructType>(line, name, std::move(fields), interfaceBlock);
 }
@@ -473,13 +577,13 @@ std::unique_ptr<Type> Type::MakeTextureType(const char* name, SpvDim_ dimensions
                                          isMultisampled, isSampled);
 }
 
-std::unique_ptr<Type> Type::MakeVectorType(skstd::string_view name, const char* abbrev,
+std::unique_ptr<Type> Type::MakeVectorType(std::string_view name, const char* abbrev,
                                            const Type& componentType, int columns) {
     return std::make_unique<VectorType>(name, abbrev, componentType, columns);
 }
 
 CoercionCost Type::coercionCost(const Type& other) const {
-    if (*this == other) {
+    if (this->matches(other)) {
         return CoercionCost::Free();
     }
     if (this->typeKind() == other.typeKind() &&
@@ -507,7 +611,7 @@ CoercionCost Type::coercionCost(const Type& other) const {
     if (fTypeKind == TypeKind::kGeneric) {
         const std::vector<const Type*>& types = this->coercibleTypes();
         for (size_t i = 0; i < types.size(); i++) {
-            if (*types[i] == other) {
+            if (types[i]->matches(other)) {
                 return CoercionCost::Normal((int) i + 1);
             }
         }
@@ -591,7 +695,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
     if (columns == 1 && rows == 1) {
         return *this;
     }
-    if (*this == *context.fTypes.fFloat || *this == *context.fTypes.fFloatLiteral) {
+    if (this->matches(*context.fTypes.fFloat) || this->matches(*context.fTypes.fFloatLiteral)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -624,7 +728,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fHalf) {
+    } else if (this->matches(*context.fTypes.fHalf)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -657,7 +761,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fInt || *this == *context.fTypes.fIntLiteral) {
+    } else if (this->matches(*context.fTypes.fInt) || this->matches(*context.fTypes.fIntLiteral)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -669,7 +773,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fShort) {
+    } else if (this->matches(*context.fTypes.fShort)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -681,7 +785,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fUInt) {
+    } else if (this->matches(*context.fTypes.fUInt)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -693,7 +797,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fUShort) {
+    } else if (this->matches(*context.fTypes.fUShort)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -705,7 +809,7 @@ const Type& Type::toCompound(const Context& context, int columns, int rows) cons
                 }
             default: SK_ABORT("unsupported row count (%d)", rows);
         }
-    } else if (*this == *context.fTypes.fBool) {
+    } else if (this->matches(*context.fTypes.fBool)) {
         switch (rows) {
             case 1:
                 switch (columns) {
@@ -740,7 +844,7 @@ const Type* Type::clone(SymbolTable* symbolTable) const {
             return symbolTable->addArrayDimension(&this->componentType(), this->columns());
         }
         case TypeKind::kStruct: {
-            const String* name = symbolTable->takeOwnershipOfString(String(this->name()));
+            const std::string* name = symbolTable->takeOwnershipOfString(std::string(this->name()));
             return symbolTable->add(Type::MakeStructType(
                     this->fLine, *name, this->fields(), this->isInterfaceBlock()));
         }
@@ -755,7 +859,7 @@ std::unique_ptr<Expression> Type::coerceExpression(std::unique_ptr<Expression> e
     if (!expr || expr->isIncomplete(context)) {
         return nullptr;
     }
-    if (expr->type() == *this) {
+    if (expr->type().matches(*this)) {
         return expr;
     }
 
@@ -780,6 +884,10 @@ std::unique_ptr<Expression> Type::coerceExpression(std::unique_ptr<Expression> e
     return nullptr;
 }
 
+bool Type::isPrivate() const {
+    return skstd::starts_with(this->name(), '$');
+}
+
 bool Type::isOrContainsArray() const {
     if (this->isStruct()) {
         for (const Field& f : this->fields()) {
@@ -827,7 +935,7 @@ bool Type::checkForOutOfRangeLiteral(const Context& context, const Expression& e
             // Iterate over every constant subexpression in the value.
             int numSlots = valueExpr->type().slotCount();
             for (int slot = 0; slot < numSlots; ++slot) {
-                skstd::optional<double> slotVal = valueExpr->getConstantValue(slot);
+                std::optional<double> slotVal = valueExpr->getConstantValue(slot);
                 // Check for Literal values that are out of range for the base type.
                 if (slotVal.has_value() &&
                     baseType.checkForOutOfRangeLiteral(context, *slotVal, valueExpr->fLine)) {
@@ -846,9 +954,11 @@ bool Type::checkForOutOfRangeLiteral(const Context& context, double value, int l
     if (this->isInteger()) {
         if (value < this->minimumValue() || value > this->maximumValue()) {
             // We found a value that can't fit in the type. Flag it as an error.
-            context.fErrors->error(line, String("integer is out of range for type '") +
-                                         this->displayName().c_str() +
-                                         "': " + to_string((SKSL_INT)value));
+            context.fErrors->error(
+                    line,
+                    SkSL::String::printf("integer is out of range for type '%s': %.0f",
+                                         this->displayName().c_str(),
+                                         std::floor(value)));
             return true;
         }
     }
@@ -869,7 +979,7 @@ SKSL_INT Type::convertArraySize(const Context& context, std::unique_ptr<Expressi
         return 0;
     }
     if (this->isOpaque()) {
-        context.fErrors->error(size->fLine, "opaque type '" + this->name() +
+        context.fErrors->error(size->fLine, "opaque type '" + std::string(this->name()) +
                                             "' may not be used in an array");
         return 0;
     }
diff --git a/third_party/skia/src/sksl/ir/SkSLType.h b/third_party/skia/src/sksl/ir/SkSLType.h
index afd49407c2937..b692c2594ac3b 100644
--- a/third_party/skia/src/sksl/ir/SkSLType.h
+++ b/third_party/skia/src/sksl/ir/SkSLType.h
@@ -8,13 +8,13 @@
 #ifndef SKSL_TYPE
 #define SKSL_TYPE
 
-#include "include/core/SkStringView.h"
 #include "include/private/SkSLModifiers.h"
 #include "include/private/SkSLSymbol.h"
 #include "src/sksl/SkSLUtil.h"
 #include "src/sksl/spirv.h"
 #include <algorithm>
 #include <climits>
+#include <string_view>
 #include <vector>
 #include <memory>
 
@@ -60,17 +60,17 @@ class Type : public Symbol {
     inline static constexpr int kMaxAbbrevLength = 3;
 
     struct Field {
-        Field(Modifiers modifiers, skstd::string_view name, const Type* type)
+        Field(Modifiers modifiers, std::string_view name, const Type* type)
         : fModifiers(modifiers)
         , fName(name)
         , fType(std::move(type)) {}
 
-        String description() const {
-            return fType->displayName() + " " + fName + ";";
+        std::string description() const {
+            return fType->displayName() + " " + std::string(fName) + ";";
         }
 
         Modifiers fModifiers;
-        skstd::string_view fName;
+        std::string_view fName;
         const Type* fType;
     };
 
@@ -105,11 +105,16 @@ class Type : public Symbol {
     Type(const Type& other) = delete;
 
     /** Creates an array type. */
-    static std::unique_ptr<Type> MakeArrayType(skstd::string_view name, const Type& componentType,
+    static std::unique_ptr<Type> MakeArrayType(std::string_view name, const Type& componentType,
                                                int columns);
 
     /** Converts a component type and a size (float, 10) into an array name ("float[10]"). */
-    String getArrayName(int arraySize) const;
+    std::string getArrayName(int arraySize) const;
+
+    /**
+     * Creates an alias which maps to another type.
+     */
+    static std::unique_ptr<Type> MakeAliasType(std::string_view name, const Type& targetType);
 
     /**
      * Create a generic type which maps to the listed types--e.g. $genType is a generic type which
@@ -122,7 +127,7 @@ class Type : public Symbol {
                                                  int8_t priority);
 
     /** Create a matrix type. */
-    static std::unique_ptr<Type> MakeMatrixType(skstd::string_view name, const char* abbrev,
+    static std::unique_ptr<Type> MakeMatrixType(std::string_view name, const char* abbrev,
                                                 const Type& componentType, int columns,
                                                 int8_t rows);
 
@@ -130,7 +135,7 @@ class Type : public Symbol {
     static std::unique_ptr<Type> MakeSamplerType(const char* name, const Type& textureType);
 
     /** Create a scalar type. */
-    static std::unique_ptr<Type> MakeScalarType(skstd::string_view name, const char* abbrev,
+    static std::unique_ptr<Type> MakeScalarType(std::string_view name, const char* abbrev,
                                                 Type::NumberKind numberKind, int8_t priority,
                                                 int8_t bitWidth);
 
@@ -142,7 +147,7 @@ class Type : public Symbol {
 
     /** Creates a struct type with the given fields. */
     static std::unique_ptr<Type> MakeStructType(int line,
-                                                skstd::string_view name,
+                                                std::string_view name,
                                                 std::vector<Field> fields,
                                                 bool interfaceBlock = false);
 
@@ -152,7 +157,7 @@ class Type : public Symbol {
                                                  bool isMultisampled, bool isSampled);
 
     /** Create a vector type. */
-    static std::unique_ptr<Type> MakeVectorType(skstd::string_view name, const char* abbrev,
+    static std::unique_ptr<Type> MakeVectorType(std::string_view name, const char* abbrev,
                                                 const Type& componentType, int columns);
 
     template <typename T>
@@ -185,11 +190,11 @@ class Type : public Symbol {
         return !(this->isArray() || this->isStruct());
     }
 
-    String displayName() const {
-        return String(this->scalarTypeForLiteral().name());
+    std::string displayName() const {
+        return std::string(this->scalarTypeForLiteral().name());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->displayName();
     }
 
@@ -202,16 +207,16 @@ class Type : public Symbol {
     }
 
     /** Returns true if this type is either private, or contains a private field (recursively). */
-    virtual bool isPrivate() const {
-        return this->name().starts_with("$");
-    }
+    virtual bool isPrivate() const;
 
-    bool operator==(const Type& other) const {
-        return this->name() == other.name();
+    /** If this is an alias, returns the underlying type, otherwise returns this. */
+    virtual const Type& resolve() const {
+        return *this;
     }
 
-    bool operator!=(const Type& other) const {
-        return this->name() != other.name();
+    /** Returns true if these types are equal after alias resolution. */
+    bool matches(const Type& other) const {
+        return this->resolve().name() == other.resolve().name();
     }
 
     /**
@@ -526,7 +531,7 @@ class Type : public Symbol {
     SKSL_INT convertArraySize(const Context& context, std::unique_ptr<Expression> size) const;
 
 protected:
-    Type(skstd::string_view name, const char* abbrev, TypeKind kind, int line = -1)
+    Type(std::string_view name, const char* abbrev, TypeKind kind, int line = -1)
         : INHERITED(line, kSymbolKind, name)
         , fTypeKind(kind) {
         SkASSERT(strlen(abbrev) <= kMaxAbbrevLength);
diff --git a/third_party/skia/src/sksl/ir/SkSLTypeReference.h b/third_party/skia/src/sksl/ir/SkSLTypeReference.h
index 8d9644b61be16..3e779810a9637 100644
--- a/third_party/skia/src/sksl/ir/SkSLTypeReference.h
+++ b/third_party/skia/src/sksl/ir/SkSLTypeReference.h
@@ -40,8 +40,8 @@ class TypeReference final : public Expression {
         return false;
     }
 
-    String description() const override {
-        return String(this->value().name());
+    std::string description() const override {
+        return std::string(this->value().name());
     }
 
     std::unique_ptr<Expression> clone() const override {
diff --git a/third_party/skia/src/sksl/ir/SkSLUnresolvedFunction.h b/third_party/skia/src/sksl/ir/SkSLUnresolvedFunction.h
index 42b9b71434917..ed52dd66d0180 100644
--- a/third_party/skia/src/sksl/ir/SkSLUnresolvedFunction.h
+++ b/third_party/skia/src/sksl/ir/SkSLUnresolvedFunction.h
@@ -34,8 +34,8 @@ class UnresolvedFunction final : public Symbol {
         return fFunctions;
     }
 
-    String description() const override {
-        return String(this->name());
+    std::string description() const override {
+        return std::string(this->name());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp b/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
index f61f5213af792..72f3ec54199af 100644
--- a/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLVarDeclarations.cpp
@@ -16,18 +16,40 @@
 
 namespace SkSL {
 
+
 std::unique_ptr<Statement> VarDeclaration::clone() const {
-    return std::make_unique<VarDeclaration>(&this->var(),
-                                            &this->baseType(),
-                                            fArraySize,
-                                            this->value() ? this->value()->clone() : nullptr);
+    // Cloning a VarDeclaration is inherently problematic, as we normally expect a one-to-one
+    // mapping between Variables and VarDeclarations and a straightforward clone would violate this
+    // assumption. We could of course theoretically clone the Variable as well, but that would
+    // require additional context and tracking, since for the whole process to work we would also
+    // have to fixup any subsequent VariableReference clones to point to the newly cloned Variables
+    // instead of the originals.
+    //
+    // Since the only reason we ever clone VarDeclarations is to support tests of clone() and we do
+    // not expect to ever need to do so otherwise, a full solution to this issue is unnecessary at
+    // the moment. We instead just keep track of whether a VarDeclaration is a clone so we can
+    // handle its cleanup properly. This allows clone() to work in the simple case that a
+    // VarDeclaration's clone does not outlive the original, which is adequate for testing. Since
+    // this leaves a sharp  edge in place - destroying the original could cause a use-after-free in
+    // some circumstances - we also disable cloning altogether unless the
+    // fAllowVarDeclarationCloneForTesting ProgramSetting is enabled.
+    if (ThreadContext::Settings().fAllowVarDeclarationCloneForTesting) {
+        return std::make_unique<VarDeclaration>(&this->var(),
+                                                &this->baseType(),
+                                                fArraySize,
+                                                this->value() ? this->value()->clone() : nullptr,
+                                                /*isClone=*/true);
+    } else {
+        SkDEBUGFAIL("VarDeclaration::clone() is unsupported");
+        return nullptr;
+    }
 }
 
-String VarDeclaration::description() const {
-    String result = this->var().modifiers().description() + this->baseType().description() + " " +
-                    this->var().name();
+std::string VarDeclaration::description() const {
+    std::string result = this->var().modifiers().description() + this->baseType().description() +
+                         " " + std::string(this->var().name());
     if (this->arraySize() > 0) {
-        result.appendf("[%d]", this->arraySize());
+        String::appendf(&result, "[%d]", this->arraySize());
     }
     if (this->value()) {
         result += " = " + this->value()->description();
@@ -41,7 +63,7 @@ void VarDeclaration::ErrorCheck(const Context& context,
                                 const Modifiers& modifiers,
                                 const Type* baseType,
                                 Variable::Storage storage) {
-    if (*baseType == *context.fTypes.fInvalid) {
+    if (baseType->matches(*context.fTypes.fInvalid)) {
         context.fErrors->error(line, "invalid type");
         return;
     }
@@ -72,6 +94,11 @@ void VarDeclaration::ErrorCheck(const Context& context,
         context.fErrors->error(line,
                 "variables of type '" + baseType->displayName() + "' must be uniform");
     }
+    if (modifiers.fFlags & SkSL::Modifiers::kUniform_Flag &&
+        (context.fConfig->fKind == ProgramKind::kCustomMeshVertex ||
+         context.fConfig->fKind == ProgramKind::kCustomMeshFragment)) {
+        context.fErrors->error(line, "uniforms are not permitted in custom mesh shaders");
+    }
     if (modifiers.fLayout.fFlags & Layout::kColor_Flag) {
         if (!ProgramConfig::IsRuntimeEffect(context.fConfig->fKind)) {
             context.fErrors->error(line, "'layout(color)' is only permitted in runtime effects");
@@ -124,23 +151,23 @@ bool VarDeclaration::ErrorCheckAndCoerce(const Context& context, const Variable&
     ErrorCheck(context, var.fLine, var.modifiers(), baseType, var.storage());
     if (value) {
         if (var.type().isOpaque()) {
-            context.fErrors->error(value->fLine,
-                    "opaque type '" + var.type().name() + "' cannot use initializer expressions");
+            context.fErrors->error(value->fLine, "opaque type '" + var.type().displayName() +
+                                                 "' cannot use initializer expressions");
             return false;
         }
         if (var.modifiers().fFlags & Modifiers::kIn_Flag) {
             context.fErrors->error(value->fLine,
-                    "'in' variables cannot use initializer expressions");
+                                   "'in' variables cannot use initializer expressions");
             return false;
         }
         if (var.modifiers().fFlags & Modifiers::kUniform_Flag) {
             context.fErrors->error(value->fLine,
-                    "'uniform' variables cannot use initializer expressions");
+                                   "'uniform' variables cannot use initializer expressions");
             return false;
         }
         if (var.storage() == Variable::Storage::kInterfaceBlock) {
             context.fErrors->error(value->fLine,
-                    "initializers are not permitted on interface block fields");
+                                   "initializers are not permitted on interface block fields");
             return false;
         }
         value = var.type().coerceExpression(std::move(value), context);
@@ -155,21 +182,21 @@ bool VarDeclaration::ErrorCheckAndCoerce(const Context& context, const Variable&
         }
         if (!Analysis::IsConstantExpression(*value)) {
             context.fErrors->error(value->fLine,
-                    "'const' variable initializer must be a constant expression");
+                                   "'const' variable initializer must be a constant expression");
             return false;
         }
     }
     if (var.storage() == Variable::Storage::kInterfaceBlock) {
         if (var.type().isOpaque()) {
-            context.fErrors->error(var.fLine, "opaque type '" + var.type().name() +
-                    "' is not permitted in an interface block");
+            context.fErrors->error(var.fLine, "opaque type '" + var.type().displayName() +
+                                              "' is not permitted in an interface block");
             return false;
         }
     }
     if (var.storage() == Variable::Storage::kGlobal) {
         if (value && !Analysis::IsConstantExpression(*value)) {
             context.fErrors->error(value->fLine,
-                    "global variable initializer must be a constant expression");
+                                   "global variable initializer must be a constant expression");
             return false;
         }
     }
@@ -208,7 +235,7 @@ std::unique_ptr<Statement> VarDeclaration::Convert(const Context& context,
             context.fErrors->error(var->fLine, "duplicate definition of 'sk_RTAdjust'");
             return nullptr;
         }
-        if (var->type() != *context.fTypes.fFloat4) {
+        if (!var->type().matches(*context.fTypes.fFloat4)) {
             context.fErrors->error(var->fLine, "sk_RTAdjust must have type 'float4'");
             return nullptr;
         }
diff --git a/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h b/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h
index aeb445e69aded..b2fe8cb09f96e 100644
--- a/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h
+++ b/third_party/skia/src/sksl/ir/SkSLVarDeclarations.h
@@ -31,16 +31,18 @@ class VarDeclaration final : public Statement {
     VarDeclaration(const Variable* var,
                    const Type* baseType,
                    int arraySize,
-                   std::unique_ptr<Expression> value)
+                   std::unique_ptr<Expression> value,
+                   bool isClone = false)
             : INHERITED(var->fLine, kStatementKind)
             , fVar(var)
             , fBaseType(*baseType)
             , fArraySize(arraySize)
-            , fValue(std::move(value)) {}
+            , fValue(std::move(value))
+            , fIsClone(isClone) {}
 
     ~VarDeclaration() override {
         // Unhook this VarDeclaration from its associated Variable, since we're being deleted.
-        if (fVar) {
+        if (fVar && !fIsClone) {
             fVar->detachDeadVarDeclaration();
         }
     }
@@ -89,7 +91,7 @@ class VarDeclaration final : public Statement {
 
     std::unique_ptr<Statement> clone() const override;
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     static bool ErrorCheckAndCoerce(const Context& context, const Variable& var,
@@ -99,6 +101,8 @@ class VarDeclaration final : public Statement {
     const Type& fBaseType;
     int fArraySize;  // zero means "not an array"
     std::unique_ptr<Expression> fValue;
+    // if this VarDeclaration is a clone, it doesn't actually own the associated variable
+    bool fIsClone;
 
     friend class IRGenerator;
 
@@ -131,7 +135,7 @@ class GlobalVarDeclaration final : public ProgramElement {
         return std::make_unique<GlobalVarDeclaration>(this->declaration()->clone());
     }
 
-    String description() const override {
+    std::string description() const override {
         return this->declaration()->description();
     }
 
diff --git a/third_party/skia/src/sksl/ir/SkSLVariable.cpp b/third_party/skia/src/sksl/ir/SkSLVariable.cpp
index 55b4e962724e6..cfbead74a446d 100644
--- a/third_party/skia/src/sksl/ir/SkSLVariable.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLVariable.cpp
@@ -7,6 +7,7 @@
 
 #include "src/sksl/ir/SkSLVariable.h"
 
+#include "include/private/SkStringView.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/SkSLContext.h"
 #include "src/sksl/SkSLMangler.h"
@@ -29,18 +30,22 @@ const Expression* Variable::initialValue() const {
 }
 
 std::unique_ptr<Variable> Variable::Convert(const Context& context, int line,
-        const Modifiers& modifiers, const Type* baseType, skstd::string_view name, bool isArray,
+        const Modifiers& modifiers, const Type* baseType, std::string_view name, bool isArray,
         std::unique_ptr<Expression> arraySize, Variable::Storage storage) {
     if (modifiers.fLayout.fLocation == 0 && modifiers.fLayout.fIndex == 0 &&
         (modifiers.fFlags & Modifiers::kOut_Flag) &&
         context.fConfig->fKind == ProgramKind::kFragment && name != Compiler::FRAGCOLOR_NAME) {
         context.fErrors->error(line, "out location=0, index=0 is reserved for sk_FragColor");
     }
+    if (!context.fConfig->fIsBuiltinCode && skstd::starts_with(name, '$')) {
+        context.fErrors->error(line, "name '" + std::string(name) + "' is reserved");
+    }
+
     return Make(context, line, modifiers, baseType, name, isArray, std::move(arraySize), storage);
 }
 
 std::unique_ptr<Variable> Variable::Make(const Context& context, int line,
-        const Modifiers& modifiers, const Type* baseType, skstd::string_view name, bool isArray,
+        const Modifiers& modifiers, const Type* baseType, std::string_view name, bool isArray,
         std::unique_ptr<Expression> arraySize, Variable::Storage storage) {
     const Type* type = baseType;
     int arraySizeValue = 0;
@@ -57,7 +62,7 @@ std::unique_ptr<Variable> Variable::Make(const Context& context, int line,
 }
 
 Variable::ScratchVariable Variable::MakeScratchVariable(const Context& context,
-                                                        skstd::string_view baseName,
+                                                        std::string_view baseName,
                                                         const Type* type,
                                                         const Modifiers& modifiers,
                                                         SymbolTable* symbolTable,
@@ -74,7 +79,7 @@ Variable::ScratchVariable Variable::MakeScratchVariable(const Context& context,
     SkASSERT(!(modifiers.fFlags & Modifiers::kOut_Flag));
 
     // Provide our new variable with a unique name, and add it to our symbol table.
-    const String* name =
+    const std::string* name =
             symbolTable->takeOwnershipOfString(context.fMangler->uniqueName(baseName, symbolTable));
 
     // Create our new variable and add it to the symbol table.
diff --git a/third_party/skia/src/sksl/ir/SkSLVariable.h b/third_party/skia/src/sksl/ir/SkSLVariable.h
index 4e4cab9fc6b89..c3afa8a20311e 100644
--- a/third_party/skia/src/sksl/ir/SkSLVariable.h
+++ b/third_party/skia/src/sksl/ir/SkSLVariable.h
@@ -42,7 +42,7 @@ class Variable final : public Symbol {
 
     inline static constexpr Kind kSymbolKind = Kind::kVariable;
 
-    Variable(int line, const Modifiers* modifiers, skstd::string_view name, const Type* type,
+    Variable(int line, const Modifiers* modifiers, std::string_view name, const Type* type,
              bool builtin, Storage storage)
     : INHERITED(line, kSymbolKind, name, type)
     , fModifiers(modifiers)
@@ -52,11 +52,11 @@ class Variable final : public Symbol {
     ~Variable() override;
 
     static std::unique_ptr<Variable> Convert(const Context& context, int line,
-            const Modifiers& modifiers, const Type* baseType, skstd::string_view name, bool isArray,
+            const Modifiers& modifiers, const Type* baseType, std::string_view name, bool isArray,
             std::unique_ptr<Expression> arraySize, Variable::Storage storage);
 
     static std::unique_ptr<Variable> Make(const Context& context, int line,
-            const Modifiers& modifiers, const Type* baseType, skstd::string_view name, bool isArray,
+            const Modifiers& modifiers, const Type* baseType, std::string_view name, bool isArray,
             std::unique_ptr<Expression> arraySize, Variable::Storage storage);
 
     /**
@@ -68,7 +68,7 @@ class Variable final : public Symbol {
         std::unique_ptr<Statement> fVarDecl;
     };
     static ScratchVariable MakeScratchVariable(const Context& context,
-                                               skstd::string_view baseName,
+                                               std::string_view baseName,
                                                const Type* type,
                                                const Modifiers& modifiers,
                                                SymbolTable* symbolTable,
@@ -102,8 +102,9 @@ class Variable final : public Symbol {
         const_cast<Variable*>(this)->fDeclaration = nullptr;
     }
 
-    String description() const override {
-        return this->modifiers().description() + this->type().name() + " " + this->name();
+    std::string description() const override {
+        return this->modifiers().description() + this->type().displayName() + " " +
+               std::string(this->name());
     }
 
 private:
diff --git a/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp b/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
index 2fbaa38fa6509..f072689bcc51f 100644
--- a/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
+++ b/third_party/skia/src/sksl/ir/SkSLVariableReference.cpp
@@ -35,8 +35,8 @@ bool VariableReference::isConstantOrUniform() const {
     return (this->variable()->modifiers().fFlags & Modifiers::kUniform_Flag) != 0;
 }
 
-String VariableReference::description() const {
-    return String(this->variable()->name());
+std::string VariableReference::description() const {
+    return std::string(this->variable()->name());
 }
 
 void VariableReference::setRefKind(RefKind refKind) {
diff --git a/third_party/skia/src/sksl/ir/SkSLVariableReference.h b/third_party/skia/src/sksl/ir/SkSLVariableReference.h
index faf4bde0a9c6c..2bddaa47e26db 100644
--- a/third_party/skia/src/sksl/ir/SkSLVariableReference.h
+++ b/third_party/skia/src/sksl/ir/SkSLVariableReference.h
@@ -70,7 +70,7 @@ class VariableReference final : public Expression {
         return std::make_unique<VariableReference>(fLine, this->variable(), this->refKind());
     }
 
-    String description() const override;
+    std::string description() const override;
 
 private:
     const Variable* fVariable;
diff --git a/third_party/skia/src/sksl/lex/BUILD.bazel b/third_party/skia/src/sksl/lex/BUILD.bazel
index 2ebe2a8ae24b0..c0833ed3ff590 100644
--- a/third_party/skia/src/sksl/lex/BUILD.bazel
+++ b/third_party/skia/src/sksl/lex/BUILD.bazel
@@ -8,7 +8,6 @@ cc_binary(
         "//src/sksl/lex:RegexNode_src",
         "//src/sksl/lex:RegexParser_src",
         "//src/sksl/lex:TransitionTable_src",
-        "//third_party:musl_compat",
     ],
 )
 
diff --git a/third_party/skia/src/sksl/lex/Main.cpp b/third_party/skia/src/sksl/lex/Main.cpp
index f8414473a64f9..46f6027d52ca5 100644
--- a/third_party/skia/src/sksl/lex/Main.cpp
+++ b/third_party/skia/src/sksl/lex/Main.cpp
@@ -38,9 +38,9 @@ static void writeH(const DFA& dfa, const char* lexer, const char* token,
     out << HEADER;
     out << "#ifndef SKSL_" << lexer << "\n";
     out << "#define SKSL_" << lexer << "\n";
-    out << "#include \"include/core/SkStringView.h\"\n";
     out << "#include <cstddef>\n";
     out << "#include <cstdint>\n";
+    out << "#include <string_view>\n";
     out << "namespace SkSL {\n";
     out << "\n";
     out << "struct " << token << " {\n";
@@ -68,7 +68,7 @@ static void writeH(const DFA& dfa, const char* lexer, const char* token,
 
 class )" << lexer << R"( {
 public:
-    void start(skstd::string_view text) {
+    void start(std::string_view text) {
         fText = text;
         fOffset = 0;
         fLine = 1;
@@ -91,7 +91,7 @@ class )" << lexer << R"( {
     }
 
 private:
-    skstd::string_view fText;
+    std::string_view fText;
     int32_t fOffset;
     int32_t fLine;
 };
diff --git a/third_party/skia/src/sksl/lex/sksl.lex b/third_party/skia/src/sksl/lex/sksl.lex
index aa9c289ae2b40..31bfb31a5aed5 100644
--- a/third_party/skia/src/sksl/lex/sksl.lex
+++ b/third_party/skia/src/sksl/lex/sksl.lex
@@ -44,9 +44,9 @@ HIGHP          = "highp"
 MEDIUMP        = "mediump"
 LOWP           = "lowp"
 ES3            = "$es3"
-RESERVED       = attribute|varying|precision|invariant|asm|class|union|enum|typedef|template|this|packed|goto|volatile|public|static|extern|external|interface|long|double|fixed|unsigned|superp|input|output|hvec[234]|dvec[234]|fvec[234]|sampler[12]DShadow|sampler3DRect|sampler2DRectShadow|samplerCube|sizeof|cast|namespace|using|gl_[0-9a-zA-Z_$]*
-IDENTIFIER     = [a-zA-Z_$][0-9a-zA-Z_$]*
-DIRECTIVE      = #[a-zA-Z_$][0-9a-zA-Z_$]*
+RESERVED       = attribute|varying|precision|invariant|asm|class|union|enum|typedef|template|this|packed|goto|volatile|public|static|extern|external|interface|long|double|fixed|unsigned|superp|input|output|hvec[234]|dvec[234]|fvec[234]|sampler[12]DShadow|sampler3DRect|sampler2DRectShadow|samplerCube|sizeof|cast|namespace|using|gl_[0-9a-zA-Z_]*
+IDENTIFIER     = [a-zA-Z_$][0-9a-zA-Z_]*
+DIRECTIVE      = #[a-zA-Z_][0-9a-zA-Z_]*
 LPAREN         = "("
 RPAREN         = ")"
 LBRACE         = "{"
@@ -92,7 +92,6 @@ BITWISEOREQ    = "|="
 BITWISEXOREQ   = "^="
 BITWISEANDEQ   = "&="
 SEMICOLON      = ";"
-ARROW          = "->"
 WHITESPACE     = \s+
 LINE_COMMENT   = //.*
 BLOCK_COMMENT  = /\*([^*]|\*[^/])*\*/
diff --git a/third_party/skia/src/sksl/sksl_gpu.sksl b/third_party/skia/src/sksl/sksl_gpu.sksl
index 171eb953bb079..6e97b80afa10a 100644
--- a/third_party/skia/src/sksl/sksl_gpu.sksl
+++ b/third_party/skia/src/sksl/sksl_gpu.sksl
@@ -297,16 +297,16 @@ half4 blend_modulate(half4 src, half4 dst) { return src*dst; }
 
 half4 blend_screen(half4 src, half4 dst) { return src + (1 - src)*dst; }
 
-half _blend_overlay_component(half2 s, half2 d) {
+half $blend_overlay_component(half2 s, half2 d) {
     return (2*d.x <= d.y)
             ? 2*s.x*d.x
             : s.y*d.y - 2*(d.y - d.x)*(s.y - s.x);
 }
 
 half4 blend_overlay(half4 src, half4 dst) {
-    half4 result = half4(_blend_overlay_component(src.ra, dst.ra),
-                         _blend_overlay_component(src.ga, dst.ga),
-                         _blend_overlay_component(src.ba, dst.ba),
+    half4 result = half4($blend_overlay_component(src.ra, dst.ra),
+                         $blend_overlay_component(src.ga, dst.ga),
+                         $blend_overlay_component(src.ba, dst.ba),
                          src.a + (1 - src.a)*dst.a);
     result.rgb += dst.rgb*(1 - src.a) + src.rgb*(1 - dst.a);
     return result;
@@ -324,19 +324,19 @@ half4 blend_lighten(half4 src, half4 dst) {
     return result;
 }
 
-half _guarded_divide(half n, half d) {
+half $guarded_divide(half n, half d) {
     return sk_Caps.mustGuardDivisionEvenAfterExplicitZeroCheck
             ? n/(d + 0.00000001)
             : n/d;
 }
 
-half3 _guarded_divide(half3 n, half d) {
+half3 $guarded_divide(half3 n, half d) {
     return sk_Caps.mustGuardDivisionEvenAfterExplicitZeroCheck
             ? n/(d + 0.00000001)
             : n/d;
 }
 
-half _color_dodge_component(half2 s, half2 d) {
+half $color_dodge_component(half2 s, half2 d) {
     if (d.x == 0) {
         return s.x*(1 - d.y);
     } else {
@@ -344,48 +344,48 @@ half _color_dodge_component(half2 s, half2 d) {
         if (delta == 0) {
              return s.y*d.y + s.x*(1 - d.y) + d.x*(1 - s.y);
         } else {
-            delta = min(d.y, _guarded_divide(d.x*s.y, delta));
+            delta = min(d.y, $guarded_divide(d.x*s.y, delta));
             return delta*s.y + s.x*(1 - d.y) + d.x*(1 - s.y);
         }
     }
 }
 
 half4 blend_color_dodge(half4 src, half4 dst) {
-    return half4(_color_dodge_component(src.ra, dst.ra),
-                 _color_dodge_component(src.ga, dst.ga),
-                 _color_dodge_component(src.ba, dst.ba),
+    return half4($color_dodge_component(src.ra, dst.ra),
+                 $color_dodge_component(src.ga, dst.ga),
+                 $color_dodge_component(src.ba, dst.ba),
                  src.a + (1 - src.a)*dst.a);
 }
 
-half _color_burn_component(half2 s, half2 d) {
+half $color_burn_component(half2 s, half2 d) {
     if (d.y == d.x) {
         return s.y*d.y + s.x*(1 - d.y) + d.x*(1 - s.y);
     } else if (s.x == 0) {
         return d.x*(1 - s.y);
     } else {
-        half delta = max(0, d.y - _guarded_divide((d.y - d.x)*s.y, s.x));
+        half delta = max(0, d.y - $guarded_divide((d.y - d.x)*s.y, s.x));
         return delta*s.y + s.x*(1 - d.y) + d.x*(1 - s.y);
     }
 }
 
 half4 blend_color_burn(half4 src, half4 dst) {
-    return half4(_color_burn_component(src.ra, dst.ra),
-                 _color_burn_component(src.ga, dst.ga),
-                 _color_burn_component(src.ba, dst.ba),
+    return half4($color_burn_component(src.ra, dst.ra),
+                 $color_burn_component(src.ga, dst.ga),
+                 $color_burn_component(src.ba, dst.ba),
                  src.a + (1 - src.a)*dst.a);
 }
 
 half4 blend_hard_light(half4 src, half4 dst) { return blend_overlay(dst, src); }
 
-half _soft_light_component(half2 s, half2 d) {
+half $soft_light_component(half2 s, half2 d) {
     if (2*s.x <= s.y) {
-        return _guarded_divide(d.x*d.x*(s.y - 2*s.x), d.y) + (1 - d.y)*s.x + d.x*(-s.y + 2*s.x + 1);
+        return $guarded_divide(d.x*d.x*(s.y - 2*s.x), d.y) + (1 - d.y)*s.x + d.x*(-s.y + 2*s.x + 1);
     } else if (4.0 * d.x <= d.y) {
         half DSqd = d.x*d.x;
         half DCub = DSqd*d.x;
         half DaSqd = d.y*d.y;
         half DaCub = DaSqd*d.y;
-        return _guarded_divide(DaSqd*(s.x - d.x*(3*s.y - 6*s.x - 1)) + 12*d.y*DSqd*(s.y - 2*s.x)
+        return $guarded_divide(DaSqd*(s.x - d.x*(3*s.y - 6*s.x - 1)) + 12*d.y*DSqd*(s.y - 2*s.x)
                                - 16*DCub * (s.y - 2*s.x) - DaCub*s.x, DaSqd);
     } else {
         return d.x*(s.y - 2*s.x + 1) + s.x - sqrt(d.y*d.x)*(s.y - 2*s.x) - d.y*s.x;
@@ -393,9 +393,9 @@ half _soft_light_component(half2 s, half2 d) {
 }
 
 half4 blend_soft_light(half4 src, half4 dst) {
-    return (dst.a == 0) ? src : half4(_soft_light_component(src.ra, dst.ra),
-                                      _soft_light_component(src.ga, dst.ga),
-                                      _soft_light_component(src.ba, dst.ba),
+    return (dst.a == 0) ? src : half4($soft_light_component(src.ra, dst.ra),
+                                      $soft_light_component(src.ga, dst.ga),
+                                      $soft_light_component(src.ba, dst.ba),
                                       src.a + (1 - src.a)*dst.a);
 }
 
@@ -413,53 +413,53 @@ half4 blend_multiply(half4 src, half4 dst) {
                  src.a + (1 - src.a)*dst.a);
 }
 
-half _blend_color_luminance(half3 color) { return dot(half3(0.3, 0.59, 0.11), color); }
+half $blend_color_luminance(half3 color) { return dot(half3(0.3, 0.59, 0.11), color); }
 
-half3 _blend_set_color_luminance(half3 hueSatColor, half alpha, half3 lumColor) {
-    half lum = _blend_color_luminance(lumColor);
-    half3 result = lum - _blend_color_luminance(hueSatColor) + hueSatColor;
+half3 $blend_set_color_luminance(half3 hueSatColor, half alpha, half3 lumColor) {
+    half lum = $blend_color_luminance(lumColor);
+    half3 result = lum - $blend_color_luminance(hueSatColor) + hueSatColor;
     half minComp = min(min(result.r, result.g), result.b);
     half maxComp = max(max(result.r, result.g), result.b);
     if (minComp < 0 && lum != minComp) {
-        result = lum + (result - lum) * _guarded_divide(lum, (lum - minComp));
+        result = lum + (result - lum) * $guarded_divide(lum, (lum - minComp));
     }
     if (maxComp > alpha && maxComp != lum) {
-        return lum + _guarded_divide((result - lum) * (alpha - lum), (maxComp - lum));
+        return lum + $guarded_divide((result - lum) * (alpha - lum), (maxComp - lum));
     } else {
         return result;
     }
 }
 
-half _blend_color_saturation(half3 color) {
+half $blend_color_saturation(half3 color) {
     return max(max(color.r, color.g), color.b) - min(min(color.r, color.g), color.b);
 }
 
-half3 _blend_set_color_saturation_helper(half3 minMidMax, half sat) {
+half3 $blend_set_color_saturation_helper(half3 minMidMax, half sat) {
     if (minMidMax.r < minMidMax.b) {
         return half3(0,
-                    _guarded_divide(sat*(minMidMax.g - minMidMax.r), (minMidMax.b - minMidMax.r)),
+                    $guarded_divide(sat*(minMidMax.g - minMidMax.r), (minMidMax.b - minMidMax.r)),
                     sat);
     } else {
         return half3(0);
     }
 }
 
-half3 _blend_set_color_saturation(half3 hueLumColor, half3 satColor) {
-    half sat = _blend_color_saturation(satColor);
+half3 $blend_set_color_saturation(half3 hueLumColor, half3 satColor) {
+    half sat = $blend_color_saturation(satColor);
     if (hueLumColor.r <= hueLumColor.g) {
         if (hueLumColor.g <= hueLumColor.b) {
-            return _blend_set_color_saturation_helper(hueLumColor.rgb, sat);
+            return $blend_set_color_saturation_helper(hueLumColor.rgb, sat);
         } else if (hueLumColor.r <= hueLumColor.b) {
-            return _blend_set_color_saturation_helper(hueLumColor.rbg, sat).rbg;
+            return $blend_set_color_saturation_helper(hueLumColor.rbg, sat).rbg;
         } else {
-            return _blend_set_color_saturation_helper(hueLumColor.brg, sat).gbr;
+            return $blend_set_color_saturation_helper(hueLumColor.brg, sat).gbr;
         }
     } else if (hueLumColor.r <= hueLumColor.b) {
-       return _blend_set_color_saturation_helper(hueLumColor.grb, sat).grb;
+       return $blend_set_color_saturation_helper(hueLumColor.grb, sat).grb;
     } else if (hueLumColor.g <= hueLumColor.b) {
-       return _blend_set_color_saturation_helper(hueLumColor.gbr, sat).brg;
+       return $blend_set_color_saturation_helper(hueLumColor.gbr, sat).brg;
     } else {
-       return _blend_set_color_saturation_helper(hueLumColor.bgr, sat).bgr;
+       return $blend_set_color_saturation_helper(hueLumColor.bgr, sat).bgr;
     }
 }
 
@@ -467,7 +467,7 @@ half4 blend_hue(half4 src, half4 dst) {
     half alpha = dst.a*src.a;
     half3 sda = src.rgb*dst.a;
     half3 dsa = dst.rgb*src.a;
-    return half4(_blend_set_color_luminance(_blend_set_color_saturation(sda, dsa), alpha, dsa) +
+    return half4($blend_set_color_luminance($blend_set_color_saturation(sda, dsa), alpha, dsa) +
                  dst.rgb - dsa + src.rgb - sda,
                  src.a + dst.a - alpha);
 }
@@ -476,7 +476,7 @@ half4 blend_saturation(half4 src, half4 dst) {
     half alpha = dst.a*src.a;
     half3 sda = src.rgb*dst.a;
     half3 dsa = dst.rgb*src.a;
-    return half4(_blend_set_color_luminance(_blend_set_color_saturation(dsa, sda), alpha, dsa) +
+    return half4($blend_set_color_luminance($blend_set_color_saturation(dsa, sda), alpha, dsa) +
                  dst.rgb - dsa + src.rgb - sda,
                  src.a + dst.a - alpha);
 }
@@ -485,7 +485,7 @@ half4 blend_color(half4 src, half4 dst)  {
     half alpha = dst.a*src.a;
     half3 sda = src.rgb*dst.a;
     half3 dsa = dst.rgb*src.a;
-    return half4(_blend_set_color_luminance(sda, alpha, dsa) + dst.rgb - dsa + src.rgb - sda,
+    return half4($blend_set_color_luminance(sda, alpha, dsa) + dst.rgb - dsa + src.rgb - sda,
                  src.a + dst.a - alpha);
 }
 
@@ -493,7 +493,7 @@ half4 blend_luminosity(half4 src, half4 dst) {
     half alpha = dst.a*src.a;
     half3 sda = src.rgb*dst.a;
     half3 dsa = dst.rgb*src.a;
-    return half4(_blend_set_color_luminance(dsa, alpha, sda) + dst.rgb - dsa + src.rgb - sda,
+    return half4($blend_set_color_luminance(dsa, alpha, sda) + dst.rgb - dsa + src.rgb - sda,
                  src.a + dst.a - alpha);
 }
 
@@ -505,12 +505,12 @@ float2 proj(float3 p) { return p.xy / p.z; }
 
 // Implement cross() as a determinant to communicate our intent more clearly to the compiler.
 // NOTE: Due to precision issues, it might be the case that cross(a, a) != 0.
-float cross(float2 a, float2 b) {
+float cross_length_2d(float2 a, float2 b) {
     return sk_Caps.builtinDeterminantSupport ? determinant(float2x2(a, b))
                                              : a.x*b.y - a.y*b.x;
 }
 
-half cross(half2 a, half2 b) {
+half cross_length_2d(half2 a, half2 b) {
     return sk_Caps.builtinDeterminantSupport ? determinant(half2x2(a, b))
                                              : a.x*b.y - a.y*b.x;
 }
diff --git a/third_party/skia/src/sksl/sksl_public.sksl b/third_party/skia/src/sksl/sksl_public.sksl
index e8fc9daa01af8..9e4863d0d93d3 100644
--- a/third_party/skia/src/sksl/sksl_public.sksl
+++ b/third_party/skia/src/sksl/sksl_public.sksl
@@ -99,6 +99,8 @@ $genHType smoothstep($genHType edge0, $genHType edge1, $genHType x);
 $genHType smoothstep(half      edge0, half      edge1, $genHType x);
 
 // 8.3 : Common Functions (GLSL ES 3.0)
+$es3 $genIType abs($genIType x);
+$es3 $genIType sign($genIType x);
 $es3 $genIType floatBitsToInt ($genType  value);
 $es3 $genUType floatBitsToUint($genType  value);
 $es3 $genType  intBitsToFloat ($genIType value);
@@ -232,6 +234,10 @@ $es3 $genHType fwidth($genHType p);
 half4  unpremul(half4  color) { return half4 (color.rgb / max(color.a, 0.0001), color.a); }
 float4 unpremul(float4 color) { return float4(color.rgb / max(color.a, 0.0001), color.a); }
 
+// Color space transformation, between the working (destination) space and fixed (known) spaces:
+half3 toLinearSrgb(half3 color);
+half3 fromLinearSrgb(half3 color);
+
 // SkSL intrinsics that reflect Skia's C++ object model:
 half4 $eval(float2 coords, shader s);
 half4 $eval(half4 color, colorFilter f);
diff --git a/third_party/skia/src/sksl/tracing/BUILD.bazel b/third_party/skia/src/sksl/tracing/BUILD.bazel
new file mode 100644
index 0000000000000..5982387f84e22
--- /dev/null
+++ b/third_party/skia/src/sksl/tracing/BUILD.bazel
@@ -0,0 +1,42 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "SkVMDebugTracePlayer_hdr",
+    hdrs = ["SkVMDebugTracePlayer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkVMDebugTrace_hdr",
+        "//src/utils:SkBitSet_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMDebugTracePlayer_src",
+    srcs = ["SkVMDebugTracePlayer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":SkVMDebugTracePlayer_hdr"],
+)
+
+generated_cc_atom(
+    name = "SkVMDebugTrace_hdr",
+    hdrs = ["SkVMDebugTrace.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPoint_hdr",
+        "//include/sksl:SkSLDebugTrace_hdr",
+        "//src/core:SkVM_hdr",
+        "//src/sksl/ir:SkSLType_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMDebugTrace_src",
+    srcs = ["SkVMDebugTrace.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkVMDebugTrace_hdr",
+        "//src/core:SkStreamPriv_hdr",
+        "//src/utils:SkJSONWriter_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
diff --git a/third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp b/third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
similarity index 66%
rename from third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp
rename to third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
index 414369c9da8c3..82cba6e8e525b 100644
--- a/third_party/skia/src/sksl/codegen/SkVMDebugTrace.cpp
+++ b/third_party/skia/src/sksl/tracing/SkVMDebugTrace.cpp
@@ -6,14 +6,77 @@
  */
 
 #include "src/core/SkStreamPriv.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
 #include "src/utils/SkJSON.h"
 #include "src/utils/SkJSONWriter.h"
 
 #include <sstream>
 
+static constexpr char kTraceVersion[] = "20220209";
+
 namespace SkSL {
 
+std::string SkVMDebugTrace::getSlotComponentSuffix(int slotIndex) const {
+    const SkSL::SkVMSlotInfo& slot = fSlotInfo[slotIndex];
+
+    if (slot.rows > 1) {
+        return "["  + std::to_string(slot.componentIndex / slot.rows) +
+               "][" + std::to_string(slot.componentIndex % slot.rows) +
+               "]";
+    }
+    if (slot.columns > 1) {
+        switch (slot.componentIndex) {
+            case 0:  return ".x";
+            case 1:  return ".y";
+            case 2:  return ".z";
+            case 3:  return ".w";
+            default: return "[???]";
+        }
+    }
+    return {};
+}
+
+double SkVMDebugTrace::interpretValueBits(int slotIndex, int32_t valueBits) const {
+    SkASSERT(slotIndex >= 0);
+    SkASSERT((size_t)slotIndex < fSlotInfo.size());
+    switch (fSlotInfo[slotIndex].numberKind) {
+        case SkSL::Type::NumberKind::kUnsigned: {
+            uint32_t uintValue;
+            static_assert(sizeof(uintValue) == sizeof(valueBits));
+            memcpy(&uintValue, &valueBits, sizeof(uintValue));
+            return uintValue;
+        }
+        case SkSL::Type::NumberKind::kFloat: {
+            float floatValue;
+            static_assert(sizeof(floatValue) == sizeof(valueBits));
+            memcpy(&floatValue, &valueBits, sizeof(floatValue));
+            return floatValue;
+        }
+        default: {
+            return valueBits;
+        }
+    }
+}
+
+std::string SkVMDebugTrace::slotValueToString(int slotIndex, double value) const {
+    SkASSERT(slotIndex >= 0);
+    SkASSERT((size_t)slotIndex < fSlotInfo.size());
+    switch (fSlotInfo[slotIndex].numberKind) {
+        case SkSL::Type::NumberKind::kBoolean: {
+            return value ? "true" : "false";
+        }
+        default: {
+            char buffer[32];
+            snprintf(buffer, SK_ARRAY_COUNT(buffer), "%.8g", value);
+            return buffer;
+        }
+    }
+}
+
+std::string SkVMDebugTrace::getSlotValue(int slotIndex, int32_t valueBits) const {
+    return this->slotValueToString(slotIndex, this->interpretValueBits(slotIndex, valueBits));
+}
+
 void SkVMDebugTrace::setTraceCoord(const SkIPoint& coord) {
     fTraceCoord = coord;
 }
@@ -89,39 +152,9 @@ void SkVMDebugTrace::dump(SkWStream* o) const {
                     const SkVMSlotInfo& slot = fSlotInfo[data0];
                     o->writeText(indent.c_str());
                     o->writeText(slot.name.c_str());
-                    if (slot.rows > 1) {
-                        o->writeText("[");
-                        o->writeDecAsText(slot.componentIndex / slot.rows);
-                        o->writeText("][");
-                        o->writeDecAsText(slot.componentIndex % slot.rows);
-                        o->writeText("]");
-                    } else if (slot.columns > 1) {
-                        switch (slot.componentIndex) {
-                            case 0:  o->writeText(".x"); break;
-                            case 1:  o->writeText(".y"); break;
-                            case 2:  o->writeText(".z"); break;
-                            case 3:  o->writeText(".w"); break;
-                            default: o->writeText("[???]"); break;
-                        }
-                    }
+                    o->writeText(this->getSlotComponentSuffix(data0).c_str());
                     o->writeText(" = ");
-                    switch (slot.numberKind) {
-                        case SkSL::Type::NumberKind::kSigned:
-                        case SkSL::Type::NumberKind::kUnsigned:
-                        default:
-                            o->writeDecAsText(data1);
-                            break;
-                        case SkSL::Type::NumberKind::kBoolean:
-                            o->writeText(data1 ? "true" : "false");
-                            break;
-                        case SkSL::Type::NumberKind::kFloat: {
-                            float floatVal;
-                            static_assert(sizeof(floatVal) == sizeof(data1));
-                            memcpy(&floatVal, &data1, sizeof(floatVal));
-                            o->writeScalarAsText(floatVal);
-                            break;
-                        }
-                    }
+                    o->writeText(this->getSlotValue(data0, data1).c_str());
                     break;
                 }
                 case SkSL::SkVMTraceInfo::Op::kEnter:
@@ -137,6 +170,19 @@ void SkVMDebugTrace::dump(SkWStream* o) const {
                     o->writeText("exit ");
                     o->writeText(fFuncInfo[data0].name.c_str());
                     break;
+
+                case SkSL::SkVMTraceInfo::Op::kScope:
+                    for (int delta = data0; delta < 0; ++delta) {
+                        indent.pop_back();
+                    }
+                    o->writeText(indent.c_str());
+                    o->writeText("scope ");
+                    o->writeText((data0 >= 0) ? "+" : "");
+                    o->writeDecAsText(data0);
+                    for (int delta = data0; delta > 0; --delta) {
+                        indent.push_back(' ');
+                    }
+                    break;
             }
             o->newline();
         }
@@ -147,6 +193,7 @@ void SkVMDebugTrace::writeTrace(SkWStream* w) const {
     SkJSONWriter json(w);
 
     json.beginObject(); // root
+    json.appendString("version", kTraceVersion);
     json.beginArray("source");
 
     for (const std::string& line : fSource) {
@@ -160,13 +207,18 @@ void SkVMDebugTrace::writeTrace(SkWStream* w) const {
         const SkVMSlotInfo& info = fSlotInfo[index];
 
         json.beginObject();
-        json.appendS32("slot", index);
         json.appendString("name", info.name.c_str());
         json.appendS32("columns", info.columns);
         json.appendS32("rows", info.rows);
         json.appendS32("index", info.componentIndex);
+        if (info.groupIndex != info.componentIndex) {
+            json.appendS32("groupIdx", info.groupIndex);
+        }
         json.appendS32("kind", (int)info.numberKind);
         json.appendS32("line", info.line);
+        if (info.fnReturnValue >= 0) {
+            json.appendS32("retval", info.fnReturnValue);
+        }
         json.endObject();
     }
 
@@ -177,7 +229,6 @@ void SkVMDebugTrace::writeTrace(SkWStream* w) const {
         const SkVMFunctionInfo& info = fFuncInfo[index];
 
         json.beginObject();
-        json.appendS32("slot", index);
         json.appendString("name", info.name.c_str());
         json.endObject();
     }
@@ -214,6 +265,11 @@ bool SkVMDebugTrace::readTrace(SkStream* r) {
         return false;
     }
 
+    const skjson::StringValue* version = (*root)["version"];
+    if (!version || version->str() != kTraceVersion) {
+        return false;
+    }
+
     const skjson::ArrayValue* source = (*root)["source"];
     if (!source) {
         return false;
@@ -238,22 +294,19 @@ bool SkVMDebugTrace::readTrace(SkStream* r) {
             return false;
         }
 
-        // Grow the slot array to hold this element. (But don't shrink it if we somehow get our
-        // slots out of order!)
-        const skjson::NumberValue* slot = (*element)["slot"];
-        if (!slot) {
-            return false;
-        }
-        fSlotInfo.resize(std::max(fSlotInfo.size(), (size_t)(**slot + 1)));
-        SkVMSlotInfo& info = fSlotInfo[(size_t)(**slot)];
+        // Grow the slot array to hold this element.
+        fSlotInfo.push_back({});
+        SkVMSlotInfo& info = fSlotInfo.back();
 
         // Populate the SlotInfo with our JSON data.
-        const skjson::StringValue* name    = (*element)["name"];
-        const skjson::NumberValue* columns = (*element)["columns"];
-        const skjson::NumberValue* rows    = (*element)["rows"];
-        const skjson::NumberValue* index   = (*element)["index"];
-        const skjson::NumberValue* kind    = (*element)["kind"];
-        const skjson::NumberValue* line    = (*element)["line"];
+        const skjson::StringValue* name     = (*element)["name"];
+        const skjson::NumberValue* columns  = (*element)["columns"];
+        const skjson::NumberValue* rows     = (*element)["rows"];
+        const skjson::NumberValue* index    = (*element)["index"];
+        const skjson::NumberValue* groupIdx = (*element)["groupIdx"];
+        const skjson::NumberValue* kind     = (*element)["kind"];
+        const skjson::NumberValue* line     = (*element)["line"];
+        const skjson::NumberValue* retval   = (*element)["retval"];
         if (!name || !columns || !rows || !index || !kind || !line) {
             return false;
         }
@@ -262,8 +315,10 @@ bool SkVMDebugTrace::readTrace(SkStream* r) {
         info.columns = **columns;
         info.rows = **rows;
         info.componentIndex = **index;
+        info.groupIndex = groupIdx ? **groupIdx : info.componentIndex;
         info.numberKind = (SkSL::Type::NumberKind)(int)**kind;
         info.line = **line;
+        info.fnReturnValue = retval ? **retval : -1;
     }
 
     const skjson::ArrayValue* functions = (*root)["functions"];
@@ -277,14 +332,9 @@ bool SkVMDebugTrace::readTrace(SkStream* r) {
             return false;
         }
 
-        // Grow the function array to hold this element. (But don't shrink it if we somehow get our
-        // functions out of order!)
-        const skjson::NumberValue* slot = (*element)["slot"];
-        if (!slot) {
-            return false;
-        }
-        fFuncInfo.resize(std::max(fFuncInfo.size(), (size_t)(**slot + 1)));
-        SkVMFunctionInfo& info = fFuncInfo[(size_t)(**slot)];
+        // Grow the function array to hold this element.
+        fFuncInfo.push_back({});
+        SkVMFunctionInfo& info = fFuncInfo.back();
 
         // Populate the FunctionInfo with our JSON data.
         const skjson::StringValue* name = (*element)["name"];
diff --git a/third_party/skia/src/sksl/codegen/SkVMDebugTrace.h b/third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
similarity index 74%
rename from third_party/skia/src/sksl/codegen/SkVMDebugTrace.h
rename to third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
index af208a5683b2d..ee74ef88d6f13 100644
--- a/third_party/skia/src/sksl/codegen/SkVMDebugTrace.h
+++ b/third_party/skia/src/sksl/tracing/SkVMDebugTrace.h
@@ -28,10 +28,14 @@ struct SkVMSlotInfo {
     uint8_t                 columns = 1, rows = 1;
     /** Which component of the variable is this slot? (e.g. `vec4.z` is component 2) */
     uint8_t                 componentIndex = 0;
+    /** Complex types (arrays/structs) can be tracked as a "group" of adjacent slots. */
+    int                     groupIndex = 0;
     /** What kind of numbers belong in this slot? */
     SkSL::Type::NumberKind  numberKind = SkSL::Type::NumberKind::kNonnumeric;
     /** Where is this variable located in the program? */
     int                     line;
+    /** If this slot holds a function's return value, its FunctionInfo index; if not, -1. */
+    int                     fnReturnValue;
 };
 
 struct SkVMFunctionInfo {
@@ -45,6 +49,7 @@ struct SkVMTraceInfo {
         kVar,   /** data: slot, value */
         kEnter, /** data: function index, (unused) */
         kExit,  /** data: function index, (unused) */
+        kScope, /** data: scope delta, (unused) */
     };
     Op op;
     int32_t data[2];
@@ -67,6 +72,18 @@ class SkVMDebugTrace : public DebugTrace {
     /** Generates a human-readable dump of the debug trace. */
     void dump(SkWStream* o) const override;
 
+    /** Returns a slot's component as a variable-name suffix, e.g. ".x" or "[2][2]". */
+    std::string getSlotComponentSuffix(int slotIndex) const;
+
+    /** Bit-casts a slot's value, then converts to text, e.g. "3.14" or "true" or "12345". */
+    std::string getSlotValue(int slotIndex, int32_t value) const;
+
+    /** Bit-casts a value for a given slot into a double, honoring the slot's NumberKind. */
+    double interpretValueBits(int slotIndex, int32_t valueBits) const;
+
+    /** Converts a numeric value into text, based on the slot's NumberKind. */
+    std::string slotValueToString(int slotIndex, double value) const;
+
     /** The device-coordinate pixel to trace (controlled by setTraceCoord) */
     SkIPoint fTraceCoord = {};
 
diff --git a/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp b/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp
new file mode 100644
index 0000000000000..10763698f823c
--- /dev/null
+++ b/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.cpp
@@ -0,0 +1,277 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/sksl/tracing/SkVMDebugTracePlayer.h"
+
+namespace SkSL {
+
+void SkVMDebugTracePlayer::reset(sk_sp<SkVMDebugTrace> debugTrace) {
+    size_t nslots = debugTrace ? debugTrace->fSlotInfo.size() : 0;
+    fDebugTrace = debugTrace;
+    fCursor = 0;
+    fScope = 0;
+    fSlots.clear();
+    fSlots.resize(nslots, {/*fValue=*/0,
+                           /*fScope=*/INT_MAX,
+                           /*fWriteTime=*/0});
+    fStack.clear();
+    fStack.push_back({/*fFunction=*/-1,
+                      /*fLine=*/-1,
+                      /*fDisplayMask=*/SkBitSet(nslots)});
+    fDirtyMask.emplace(nslots);
+    fReturnValues.emplace(nslots);
+
+    for (size_t slotIdx = 0; slotIdx < nslots; ++slotIdx) {
+        if (fDebugTrace->fSlotInfo[slotIdx].fnReturnValue >= 0) {
+            fReturnValues->set(slotIdx);
+        }
+    }
+
+    for (const SkVMTraceInfo& trace : fDebugTrace->fTraceInfo) {
+        if (trace.op == SkVMTraceInfo::Op::kLine) {
+            fLineNumbers[trace.data[0]] += 1;
+        }
+    }
+}
+
+void SkVMDebugTracePlayer::step() {
+    this->tidyState();
+    while (!this->traceHasCompleted()) {
+        if (this->execute(fCursor++)) {
+            break;
+        }
+    }
+}
+
+void SkVMDebugTracePlayer::stepOver() {
+    this->tidyState();
+    size_t initialStackDepth = fStack.size();
+    while (!this->traceHasCompleted()) {
+        bool canEscapeFromThisStackDepth = (fStack.size() <= initialStackDepth);
+        if (this->execute(fCursor++)) {
+            if (canEscapeFromThisStackDepth || this->atBreakpoint()) {
+                break;
+            }
+        }
+    }
+}
+
+void SkVMDebugTracePlayer::stepOut() {
+    this->tidyState();
+    size_t initialStackDepth = fStack.size();
+    while (!this->traceHasCompleted()) {
+        if (this->execute(fCursor++)) {
+            bool hasEscapedFromInitialStackDepth = (fStack.size() < initialStackDepth);
+            if (hasEscapedFromInitialStackDepth || this->atBreakpoint()) {
+                break;
+            }
+        }
+    }
+}
+
+void SkVMDebugTracePlayer::run() {
+    this->tidyState();
+    while (!this->traceHasCompleted()) {
+        if (this->execute(fCursor++)) {
+            if (this->atBreakpoint()) {
+                break;
+            }
+        }
+    }
+}
+
+void SkVMDebugTracePlayer::tidyState() {
+    fDirtyMask->reset();
+
+    // Conceptually this is `fStack.back().fDisplayMask &= ~fReturnValues`, but SkBitSet doesn't
+    // support masking one set of bits against another.
+    fReturnValues->forEachSetIndex([&](int slot) {
+        fStack.back().fDisplayMask.reset(slot);
+    });
+}
+
+bool SkVMDebugTracePlayer::traceHasCompleted() const {
+    return !fDebugTrace || fCursor >= fDebugTrace->fTraceInfo.size();
+}
+
+int32_t SkVMDebugTracePlayer::getCurrentLine() const {
+    SkASSERT(!fStack.empty());
+    return fStack.back().fLine;
+}
+
+int32_t SkVMDebugTracePlayer::getCurrentLineInStackFrame(int stackFrameIndex) const {
+    // The first entry on the stack is the "global" frame before we enter main, so offset our index
+    // by one to account for it.
+    ++stackFrameIndex;
+    SkASSERT(stackFrameIndex > 0);
+    SkASSERT((size_t)stackFrameIndex < fStack.size());
+    return fStack[stackFrameIndex].fLine;
+}
+
+bool SkVMDebugTracePlayer::atBreakpoint() const {
+    return fBreakpointLines.count(this->getCurrentLine());
+}
+
+void SkVMDebugTracePlayer::setBreakpoints(std::unordered_set<int> breakpointLines) {
+    fBreakpointLines = std::move(breakpointLines);
+}
+
+void SkVMDebugTracePlayer::addBreakpoint(int line) {
+    fBreakpointLines.insert(line);
+}
+
+void SkVMDebugTracePlayer::removeBreakpoint(int line) {
+    fBreakpointLines.erase(line);
+}
+
+std::vector<int> SkVMDebugTracePlayer::getCallStack() const {
+    SkASSERT(!fStack.empty());
+    std::vector<int> funcs;
+    funcs.reserve(fStack.size() - 1);
+    for (size_t index = 1; index < fStack.size(); ++index) {
+        funcs.push_back(fStack[index].fFunction);
+    }
+    return funcs;
+}
+
+int SkVMDebugTracePlayer::getStackDepth() const {
+    SkASSERT(!fStack.empty());
+    return fStack.size() - 1;
+}
+
+std::vector<SkVMDebugTracePlayer::VariableData> SkVMDebugTracePlayer::getVariablesForDisplayMask(
+        const SkBitSet& displayMask) const {
+    SkASSERT(displayMask.size() == fSlots.size());
+
+    std::vector<VariableData> vars;
+    displayMask.forEachSetIndex([&](int slot) {
+        double typedValue = fDebugTrace->interpretValueBits(slot, fSlots[slot].fValue);
+        vars.push_back({slot, fDirtyMask->test(slot), typedValue});
+    });
+    // Order the variable list so that the most recently-written variables are shown at the top.
+    std::stable_sort(vars.begin(), vars.end(), [&](const VariableData& a, const VariableData& b) {
+        return fSlots[a.fSlotIndex].fWriteTime > fSlots[b.fSlotIndex].fWriteTime;
+    });
+    return vars;
+}
+
+std::vector<SkVMDebugTracePlayer::VariableData> SkVMDebugTracePlayer::getLocalVariables(
+        int stackFrameIndex) const {
+    // The first entry on the stack is the "global" frame before we enter main, so offset our index
+    // by one to account for it.
+    ++stackFrameIndex;
+    if (stackFrameIndex <= 0 || (size_t)stackFrameIndex >= fStack.size()) {
+        SkDEBUGFAILF("stack frame %d doesn't exist", stackFrameIndex - 1);
+        return {};
+    }
+    return this->getVariablesForDisplayMask(fStack[stackFrameIndex].fDisplayMask);
+}
+
+std::vector<SkVMDebugTracePlayer::VariableData> SkVMDebugTracePlayer::getGlobalVariables() const {
+    if (fStack.empty()) {
+        return {};
+    }
+    return this->getVariablesForDisplayMask(fStack.front().fDisplayMask);
+}
+
+void SkVMDebugTracePlayer::updateVariableWriteTime(int slotIdx, size_t cursor) {
+    // The slotIdx could point to any slot within a variable.
+    // We want to update the write time on EVERY slot associated with this variable.
+    // The SlotInfo's groupIndex gives us enough information to find the affected range.
+    const SkSL::SkVMSlotInfo& changedSlot = fDebugTrace->fSlotInfo[slotIdx];
+    slotIdx -= changedSlot.groupIndex;
+    SkASSERT(slotIdx >= 0);
+    SkASSERT(slotIdx < (int)fDebugTrace->fSlotInfo.size());
+
+    for (;;) {
+        fSlots[slotIdx++].fWriteTime = cursor;
+
+        // Stop if we've reached the final slot.
+        if (slotIdx >= (int)fDebugTrace->fSlotInfo.size()) {
+            break;
+        }
+        // Each separate variable-group starts with a groupIndex of 0; stop when we detect this.
+        if (fDebugTrace->fSlotInfo[slotIdx].groupIndex == 0) {
+            break;
+        }
+    }
+}
+
+bool SkVMDebugTracePlayer::execute(size_t position) {
+    if (position >= fDebugTrace->fTraceInfo.size()) {
+        SkDEBUGFAILF("position %zu out of range", position);
+        return true;
+    }
+
+    const SkVMTraceInfo& trace = fDebugTrace->fTraceInfo[position];
+    switch (trace.op) {
+        case SkVMTraceInfo::Op::kLine: { // data: line number, (unused)
+            SkASSERT(!fStack.empty());
+            int lineNumber = trace.data[0];
+            SkASSERT(lineNumber >= 0);
+            SkASSERT((size_t)lineNumber < fDebugTrace->fSource.size());
+            SkASSERT(fLineNumbers[lineNumber] > 0);
+            fStack.back().fLine = lineNumber;
+            fLineNumbers[lineNumber] -= 1;
+            return true;
+        }
+        case SkVMTraceInfo::Op::kVar: {  // data: slot, value
+            int slotIdx = trace.data[0];
+            int value = trace.data[1];
+            SkASSERT(slotIdx >= 0);
+            SkASSERT((size_t)slotIdx < fDebugTrace->fSlotInfo.size());
+            fSlots[slotIdx].fValue = value;
+            fSlots[slotIdx].fScope = std::min<>(fSlots[slotIdx].fScope, fScope);
+            this->updateVariableWriteTime(slotIdx, position);
+            if (fDebugTrace->fSlotInfo[slotIdx].fnReturnValue < 0) {
+                // Normal variables are associated with the current function.
+                SkASSERT(fStack.size() > 0);
+                fStack.rbegin()[0].fDisplayMask.set(slotIdx);
+            } else {
+                // Return values are associated with the parent function (since the current function
+                // is exiting and we won't see them there).
+                SkASSERT(fStack.size() > 1);
+                fStack.rbegin()[1].fDisplayMask.set(slotIdx);
+            }
+            fDirtyMask->set(slotIdx);
+            break;
+        }
+        case SkVMTraceInfo::Op::kEnter: { // data: function index, (unused)
+            int fnIdx = trace.data[0];
+            SkASSERT(fnIdx >= 0);
+            SkASSERT((size_t)fnIdx < fDebugTrace->fFuncInfo.size());
+            fStack.push_back({/*fFunction=*/fnIdx,
+                              /*fLine=*/-1,
+                              /*fDisplayMask=*/SkBitSet(fDebugTrace->fSlotInfo.size())});
+            break;
+        }
+        case SkVMTraceInfo::Op::kExit: { // data: function index, (unused)
+            SkASSERT(!fStack.empty());
+            SkASSERT(fStack.back().fFunction == trace.data[0]);
+            fStack.pop_back();
+            return true;
+        }
+        case SkVMTraceInfo::Op::kScope: { // data: scope delta, (unused)
+            SkASSERT(!fStack.empty());
+            fScope += trace.data[0];
+            if (trace.data[0] < 0) {
+                // If the scope is being reduced, discard variables that are now out of scope.
+                for (size_t slotIdx = 0; slotIdx < fSlots.size(); ++slotIdx) {
+                    if (fScope < fSlots[slotIdx].fScope) {
+                        fSlots[slotIdx].fScope = INT_MAX;
+                        fStack.back().fDisplayMask.reset(slotIdx);
+                    }
+                }
+            }
+            return false;
+        }
+    }
+
+    return false;
+}
+
+}  // namespace SkSL
diff --git a/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h b/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h
new file mode 100644
index 0000000000000..eb335b5e233cf
--- /dev/null
+++ b/third_party/skia/src/sksl/tracing/SkVMDebugTracePlayer.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+#include "src/utils/SkBitSet.h"
+
+#include <optional>
+#include <unordered_map>
+#include <unordered_set>
+
+namespace SkSL {
+
+/**
+ * Plays back a SkVM debug trace, allowing its contents to be viewed like a traditional debugger.
+ */
+class SkVMDebugTracePlayer {
+public:
+    /** Resets playback to the start of the trace. Breakpoints are not cleared. */
+    void reset(sk_sp<SkVMDebugTrace> trace);
+
+    /** Advances the simulation to the next Line op. */
+    void step();
+
+    /**
+     * Advances the simulation to the next Line op, skipping past matched Enter/Exit pairs.
+     * Breakpoints will also stop the simulation even if we haven't reached an Exit.
+     */
+    void stepOver();
+
+    /**
+     * Advances the simulation until we exit from the current stack frame.
+     * Breakpoints will also stop the simulation even if we haven't left the stack frame.
+     */
+    void stepOut();
+
+    /** Advances the simulation until we hit a breakpoint, or the trace completes. */
+    void run();
+
+    /** Breakpoints will force the simulation to stop whenever a desired line is reached. */
+    void setBreakpoints(std::unordered_set<int> breakpointLines);
+    void addBreakpoint(int line);
+    void removeBreakpoint(int line);
+    using BreakpointSet = std::unordered_set<int>;
+    const BreakpointSet& getBreakpoints() { return fBreakpointLines; }
+
+    /** Returns true if we have reached the end of the trace. */
+    bool traceHasCompleted() const;
+
+    /** Returns true if there is a breakpoint set at the current line. */
+    bool atBreakpoint() const;
+
+    /** Retrieves the cursor position. */
+    size_t cursor() { return fCursor; }
+
+    /** Retrieves the current line. */
+    int32_t getCurrentLine() const;
+
+    /** Retrieves the current line for a given stack frame. */
+    int32_t getCurrentLineInStackFrame(int stackFrameIndex) const;
+
+    /** Returns the call stack as an array of FunctionInfo indices. */
+    std::vector<int> getCallStack() const;
+
+    /** Returns the size of the call stack. */
+    int getStackDepth() const;
+
+    /**
+     * Returns every line number reached inside this debug trace, along with the remaining number of
+     * times that this trace will reach it. e.g. {100, 2} means line 100 will be reached twice.
+     */
+    using LineNumberMap = std::unordered_map<int, int>;
+    const LineNumberMap& getLineNumbersReached() const { return fLineNumbers; }
+
+    /** Returns variables from a stack frame, or from global scope. */
+    struct VariableData {
+        int     fSlotIndex;
+        bool    fDirty;  // has this slot been written-to since the last step call?
+        double  fValue;  // value in slot (with type-conversion applied)
+    };
+    std::vector<VariableData> getLocalVariables(int stackFrameIndex) const;
+    std::vector<VariableData> getGlobalVariables() const;
+
+private:
+    /**
+     * Executes the trace op at the passed-in cursor position. Returns true if we've reached a line
+     * or exit trace op, which indicate a stopping point.
+     */
+    bool execute(size_t position);
+
+    /**
+     * Cleans up temporary state between steps, such as the dirty mask and function return values.
+     */
+    void tidyState();
+
+    /** Updates fWriteTime for the entire variable at a given slot. */
+    void updateVariableWriteTime(int slotIdx, size_t writeTime);
+
+    /** Returns a vector of the indices and values of each slot that is enabled in `bits`. */
+    std::vector<VariableData> getVariablesForDisplayMask(const SkBitSet& bits) const;
+
+    struct StackFrame {
+        int32_t   fFunction;     // from fFuncInfo
+        int32_t   fLine;         // our current line number within the function
+        SkBitSet  fDisplayMask;  // the variable slots which have been touched in this function
+    };
+    struct Slot {
+        int32_t   fValue;        // values in each slot
+        int       fScope;        // the scope value of each slot
+        size_t    fWriteTime;    // when was the variable in this slot most recently written?
+                                 // (by cursor position)
+    };
+    sk_sp<SkVMDebugTrace>      fDebugTrace;
+    size_t                     fCursor = 0;      // position of the read head
+    int                        fScope = 0;       // the current scope depth (as tracked by
+                                                 // trace_scope)
+    std::vector<Slot>          fSlots;           // the array of all slots
+    std::vector<StackFrame>    fStack;           // the execution stack
+    std::optional<SkBitSet>    fDirtyMask;       // variable slots touched during the most-recently
+                                                 // executed step
+    std::optional<SkBitSet>    fReturnValues;    // variable slots containing return values
+    LineNumberMap              fLineNumbers;     // holds [line number, the remaining number of
+                                                 // times to reach this line during the trace]
+    BreakpointSet              fBreakpointLines; // all breakpoints set by setBreakpointLines
+};
+
+}  // namespace SkSL
diff --git a/third_party/skia/src/sksl/transform/BUILD.bazel b/third_party/skia/src/sksl/transform/BUILD.bazel
index dfab75c235b99..d4deb48f83d54 100644
--- a/third_party/skia/src/sksl/transform/BUILD.bazel
+++ b/third_party/skia/src/sksl/transform/BUILD.bazel
@@ -7,9 +7,9 @@ generated_cc_atom(
     deps = [
         ":SkSLTransform_hdr",
         "//include/private:SkSLProgramKind_hdr",
+        "//src/sksl:SkSLBuiltinMap_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/sksl:SkSLContext_hdr",
-        "//src/sksl:SkSLIntrinsicMap_hdr",
         "//src/sksl:SkSLThreadContext_hdr",
         "//src/sksl/analysis:SkSLProgramVisitor_hdr",
         "//src/sksl/ir:SkSLFunctionDefinition_hdr",
diff --git a/third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp b/third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp
index 7c40983eadb0e..4d19f238aad49 100644
--- a/third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp
+++ b/third_party/skia/src/sksl/transform/SkSLBuiltinVariableScanner.cpp
@@ -8,9 +8,9 @@
 #include "src/sksl/transform/SkSLTransform.h"
 
 #include "include/private/SkSLProgramKind.h"
+#include "src/sksl/SkSLBuiltinMap.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/SkSLContext.h"
-#include "src/sksl/SkSLIntrinsicMap.h"
 #include "src/sksl/SkSLThreadContext.h"
 #include "src/sksl/analysis/SkSLProgramVisitor.h"
 #include "src/sksl/ir/SkSLFunctionDefinition.h"
@@ -28,11 +28,11 @@ void FindAndDeclareBuiltinVariables(const Context& context,
         BuiltinVariableScanner(const Context& context)
             : fContext(context) {}
 
-        void addDeclaringElement(const String& name) {
+        void addDeclaringElement(const std::string& name) {
             // If this is the *first* time we've seen this builtin, findAndInclude will return
             // the corresponding ProgramElement.
-            IntrinsicMap& intrinsics = *fContext.fIntrinsics;
-            if (const ProgramElement* decl = intrinsics.findAndInclude(name)) {
+            BuiltinMap& builtins = *fContext.fBuiltins;
+            if (const ProgramElement* decl = builtins.findAndInclude(name)) {
                 SkASSERT(decl->is<GlobalVarDeclaration>() || decl->is<InterfaceBlock>());
                 fNewElements.push_back(decl);
             }
@@ -44,7 +44,7 @@ void FindAndDeclareBuiltinVariables(const Context& context,
                 // We synthesize writes to sk_FragColor if main() returns a color, even if it's
                 // otherwise unreferenced. Check main's return type to see if it's half4.
                 if (funcDef.declaration().isMain() &&
-                    funcDef.declaration().returnType() == *fContext.fTypes.fHalf4) {
+                    funcDef.declaration().returnType().matches(*fContext.fTypes.fHalf4)) {
                     fPreserveFragColor = true;
                 }
             }
@@ -53,7 +53,8 @@ void FindAndDeclareBuiltinVariables(const Context& context,
 
         bool visitExpression(const Expression& e) override {
             if (e.is<VariableReference>() && e.as<VariableReference>().variable()->isBuiltin()) {
-                this->addDeclaringElement(String(e.as<VariableReference>().variable()->name()));
+                this->addDeclaringElement(
+                        std::string(e.as<VariableReference>().variable()->name()));
             }
             return INHERITED::visitExpression(e);
         }
diff --git a/third_party/skia/src/sksl/transform/SkSLProgramWriter.h b/third_party/skia/src/sksl/transform/SkSLProgramWriter.h
index d3aa06536c1e6..6e5988aa92729 100644
--- a/third_party/skia/src/sksl/transform/SkSLProgramWriter.h
+++ b/third_party/skia/src/sksl/transform/SkSLProgramWriter.h
@@ -21,15 +21,7 @@ struct ProgramWriterTypes {
     using UniquePtrStatement = std::unique_ptr<SkSL::Statement>;
 };
 
-// Squelch bogus Clang warning about template vtables: https://bugs.llvm.org/show_bug.cgi?id=18733
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wweak-template-vtables"
-#endif
 extern template class TProgramVisitor<ProgramWriterTypes>;
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#endif
 
 class ProgramWriter : public TProgramVisitor<ProgramWriterTypes> {
 public:
diff --git a/third_party/skia/src/svg/SkSVGDevice.cpp b/third_party/skia/src/svg/SkSVGDevice.cpp
index 567cab67a3f8f..ff5ea76c73671 100644
--- a/third_party/skia/src/svg/SkSVGDevice.cpp
+++ b/third_party/skia/src/svg/SkSVGDevice.cpp
@@ -1071,7 +1071,9 @@ class SVGTextBuilder : SkNoncopyable {
              fHasConstY             = true;
 };
 
-void SkSVGDevice::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint)  {
+void SkSVGDevice::onDrawGlyphRunList(SkCanvas* canvas,
+                                     const SkGlyphRunList& glyphRunList,
+                                     const SkPaint& paint)  {
     SkASSERT(!glyphRunList.hasRSXForm());
     const auto draw_as_path = (fFlags & SkSVGCanvas::kConvertTextToPaths_Flag) ||
                                paint.getPathEffect();
@@ -1103,3 +1105,7 @@ void SkSVGDevice::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const S
 void SkSVGDevice::drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) {
     // todo
 }
+
+void SkSVGDevice::drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) {
+    // todo
+}
diff --git a/third_party/skia/src/svg/SkSVGDevice.h b/third_party/skia/src/svg/SkSVGDevice.h
index 17b54fd09f295..48a786b541cd9 100644
--- a/third_party/skia/src/svg/SkSVGDevice.h
+++ b/third_party/skia/src/svg/SkSVGDevice.h
@@ -35,8 +35,9 @@ class SkSVGDevice final : public SkClipStackDevice {
                   const SkPaint& paint,
                   bool pathIsMutable = false) override;
 
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override;
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override;
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override;
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override;
 
 private:
     SkSVGDevice(const SkISize& size, std::unique_ptr<SkXMLWriter>, uint32_t);
diff --git a/third_party/skia/src/utils/BUILD.bazel b/third_party/skia/src/utils/BUILD.bazel
index 72f4e3c64c48f..01c24af68d001 100644
--- a/third_party/skia/src/utils/BUILD.bazel
+++ b/third_party/skia/src/utils/BUILD.bazel
@@ -2,6 +2,7 @@ load("//bazel:macros.bzl", "generated_cc_atom")
 
 cc_library(
     name = "core_srcs",
+    visibility = ["//:__subpackages__"],
     deps = [
         ":SkAnimCodecPlayer_src",
         ":SkBase64_src",
@@ -26,15 +27,18 @@ cc_library(
         ":SkParse_src",
         ":SkPatchUtils_src",
         ":SkPolyUtils_src",
+        ":SkShaderUtils_src",
         ":SkShadowTessellator_src",
         ":SkShadowUtils_src",
         ":SkTextUtils_src",
         ":SkUTF_src",
+        ":SkVMVisualizer_src",
     ],
 )
 
 cc_library(
     name = "json_srcs",
+    visibility = ["//:__subpackages__"],
     deps = [
         ":SkJSONWriter_src",
         ":SkJSON_src",
@@ -79,7 +83,6 @@ generated_cc_atom(
     visibility = ["//:__subpackages__"],
     deps = [
         "//include/private:SkMalloc_hdr",
-        "//include/private:SkTOptional_hdr",
         "//include/private:SkTemplates_hdr",
         "//src/core:SkMathPriv_hdr",
     ],
@@ -476,6 +479,7 @@ generated_cc_atom(
         "//include/private:SkTArray_hdr",
         "//include/private:SkTemplates_hdr",
         "//src/core:SkPointPriv_hdr",
+        "//src/core:SkRectPriv_hdr",
         "//src/core:SkTDPQueue_hdr",
         "//src/core:SkTInternalLList_hdr",
     ],
@@ -507,6 +511,7 @@ generated_cc_atom(
         "//src/core:SkDrawShadowInfo_hdr",
         "//src/core:SkGeometry_hdr",
         "//src/core:SkPointPriv_hdr",
+        "//src/core:SkRectPriv_hdr",
         "//src/gpu/geometry:GrPathUtils_hdr",
     ],
 )
@@ -607,3 +612,51 @@ generated_cc_atom(
         "//include/private:SkTFitsIn_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkShaderUtils_hdr",
+    hdrs = ["SkShaderUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/private:SkSLProgramKind_hdr",
+        "//include/private:SkSLString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkShaderUtils_src",
+    srcs = ["SkShaderUtils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkShaderUtils_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkSLString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMVisualizer_hdr",
+    hdrs = ["SkVMVisualizer.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkBitmaskEnum_hdr",
+        "//include/private:SkChecksum_hdr",
+        "//include/private:SkTHash_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/sksl:SkSLOutputStream_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMVisualizer_src",
+    srcs = ["SkVMVisualizer.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkVMVisualizer_hdr",
+        "//src/core:SkStreamPriv_hdr",
+    ],
+)
diff --git a/third_party/skia/src/utils/SkBitSet.h b/third_party/skia/src/utils/SkBitSet.h
index 8fadfa3107dca..0218db920943d 100644
--- a/third_party/skia/src/utils/SkBitSet.h
+++ b/third_party/skia/src/utils/SkBitSet.h
@@ -9,13 +9,14 @@
 #define SkBitSet_DEFINED
 
 #include "include/private/SkMalloc.h"
-#include "include/private/SkTOptional.h"
 #include "include/private/SkTemplates.h"
 #include "src/core/SkMathPriv.h"
+
 #include <climits>
 #include <cstring>
 #include <limits>
 #include <memory>
+#include <optional>
 
 class SkBitSet {
 public:
@@ -90,7 +91,7 @@ class SkBitSet {
         }
     }
 
-    using OptionalIndex = skstd::optional<size_t>;
+    using OptionalIndex = std::optional<size_t>;
 
     // If any bits are set, returns the index of the first.
     OptionalIndex findFirst() {
diff --git a/third_party/skia/src/utils/SkJSON.h b/third_party/skia/src/utils/SkJSON.h
index a0d77626d3706..3c01a5221faaf 100644
--- a/third_party/skia/src/utils/SkJSON.h
+++ b/third_party/skia/src/utils/SkJSON.h
@@ -14,6 +14,7 @@
 #include "src/core/SkArenaAlloc.h"
 
 #include <cstring>
+#include <string_view>
 
 class SkString;
 class SkWStream;
@@ -314,6 +315,10 @@ class StringValue final : public Value {
             ? strchr(this->cast<char>(), '\0')
             : this->cast<VectorValue<char, Value::Type::kString>>()->end();
     }
+
+    std::string_view str() const {
+        return std::string_view(this->begin(), this->size());
+    }
 };
 
 struct Member {
diff --git a/third_party/skia/src/utils/SkJSONWriter.h b/third_party/skia/src/utils/SkJSONWriter.h
index decb901c13eae..c6ec4d47f12ac 100644
--- a/third_party/skia/src/utils/SkJSONWriter.h
+++ b/third_party/skia/src/utils/SkJSONWriter.h
@@ -266,7 +266,7 @@ class SkJSONWriter : SkNoncopyable {
         kArrayValue,
     };
 
-    void appendf(const char* fmt, ...);
+    void appendf(const char* fmt, ...) SK_PRINTF_LIKE(2, 3);
 
     void beginValue(bool structure = false) {
         SkASSERT(State::kObjectName == fState ||
diff --git a/third_party/skia/src/utils/SkPolyUtils.cpp b/third_party/skia/src/utils/SkPolyUtils.cpp
index fbf6038cab867..da8e6ca095460 100644
--- a/third_party/skia/src/utils/SkPolyUtils.cpp
+++ b/third_party/skia/src/utils/SkPolyUtils.cpp
@@ -13,6 +13,7 @@
 #include "include/private/SkTArray.h"
 #include "include/private/SkTemplates.h"
 #include "src/core/SkPointPriv.h"
+#include "src/core/SkRectPriv.h"
 #include "src/core/SkTDPQueue.h"
 #include "src/core/SkTInternalLList.h"
 
@@ -184,17 +185,15 @@ bool SkIsConvexPolygon(const SkPoint* polygonVerts, int polygonSize) {
         return false;
     }
 
-    SkScalar lastArea = 0;
     SkScalar lastPerpDot = 0;
+    int xSignChangeCount = 0;
+    int ySignChangeCount = 0;
 
     int prevIndex = polygonSize - 1;
     int currIndex = 0;
     int nextIndex = 1;
-    SkPoint origin = polygonVerts[0];
     SkVector v0 = polygonVerts[currIndex] - polygonVerts[prevIndex];
     SkVector v1 = polygonVerts[nextIndex] - polygonVerts[currIndex];
-    SkVector w0 = polygonVerts[currIndex] - origin;
-    SkVector w1 = polygonVerts[nextIndex] - origin;
     for (int i = 0; i < polygonSize; ++i) {
         if (!polygonVerts[i].isFinite()) {
             return false;
@@ -209,23 +208,21 @@ bool SkIsConvexPolygon(const SkPoint* polygonVerts, int polygonSize) {
             lastPerpDot = perpDot;
         }
 
-        // If the signed area ever flips it's concave
-        // TODO: see if we can verify convexity only with signed area
-        SkScalar quadArea = w0.cross(w1);
-        if (quadArea*lastArea < 0) {
-            return false;
+        // Check that the signs of the edge vectors don't change more than twice per coordinate
+        if (v0.fX*v1.fX < 0) {
+            xSignChangeCount++;
         }
-        if (0 != quadArea) {
-            lastArea = quadArea;
+        if (v0.fY*v1.fY < 0) {
+            ySignChangeCount++;
+        }
+        if (xSignChangeCount > 2 || ySignChangeCount > 2) {
+            return false;
         }
-
         prevIndex = currIndex;
         currIndex = nextIndex;
         nextIndex = (currIndex + 1) % polygonSize;
         v0 = v1;
         v1 = polygonVerts[nextIndex] - polygonVerts[currIndex];
-        w0 = w1;
-        w1 = polygonVerts[nextIndex] - origin;
     }
 
     return true;
@@ -1089,6 +1086,10 @@ bool SkIsSimplePolygon(const SkPoint* polygon, int polygonSize) {
         newVertex.fPrevIndex = (i - 1 + polygonSize) % polygonSize;
         newVertex.fNextIndex = (i + 1) % polygonSize;
         newVertex.fFlags = 0;
+        // The two edges adjacent to this vertex are the same, so polygon is not simple
+        if (polygon[newVertex.fPrevIndex] == polygon[newVertex.fNextIndex]) {
+            return false;
+        }
         if (left(polygon[newVertex.fPrevIndex], polygon[i])) {
             newVertex.fFlags |= kPrevLeft_VertexFlag;
         }
@@ -1179,8 +1180,8 @@ bool SkOffsetSimplePolygon(const SkPoint* inputPolygonVerts, int inputPolygonSiz
     }
 
     // can't inset more than the half bounds of the polygon
-    if (offset > std::min(SkTAbs(SK_ScalarHalf*bounds.width()),
-                        SkTAbs(SK_ScalarHalf*bounds.height()))) {
+    if (offset > std::min(SkTAbs(SkRectPriv::HalfWidth(bounds)),
+                          SkTAbs(SkRectPriv::HalfHeight(bounds)))) {
         return false;
     }
 
diff --git a/third_party/skia/src/utils/SkPolyUtils.h b/third_party/skia/src/utils/SkPolyUtils.h
index 6c3403e733c56..255f6b38153d5 100644
--- a/third_party/skia/src/utils/SkPolyUtils.h
+++ b/third_party/skia/src/utils/SkPolyUtils.h
@@ -17,6 +17,7 @@ struct SkRect;
 
 /**
  * Generates a polygon that is inset a constant from the boundary of a given convex polygon.
+ * The input polygon is expected to have values clamped to the nearest 1/16th.
  *
  * @param inputPolygonVerts  Array of points representing the vertices of the original polygon.
  *  It should be convex and have no coincident points.
@@ -31,7 +32,8 @@ bool SkInsetConvexPolygon(const SkPoint* inputPolygonVerts, int inputPolygonSize
 /**
  * Generates a simple polygon (if possible) that is offset a constant distance from the boundary
  * of a given simple polygon.
- * The input polygon must be simple and have no coincident vertices or collinear edges.
+ * The input polygon must be simple, have no coincident vertices or collinear edges, and have
+ * values clamped to the nearest 1/16th.
  *
  * @param inputPolygonVerts  Array of points representing the vertices of the original polygon.
  * @param inputPolygonSize  Number of vertices in the original polygon.
@@ -85,6 +87,7 @@ bool SkIsConvexPolygon(const SkPoint* polygonVerts, int polygonSize);
 /**
  * Determine whether a polygon is simple (i.e., not self-intersecting) or not.
  * The input polygon must have no coincident vertices or the test will fail.
+ * The polygon is also expected to have values clamped to the nearest 1/16th.
  *
  * @param polygonVerts  Array of points representing the vertices of the polygon.
  * @param polygonSize  Number of vertices in the polygon.
diff --git a/third_party/skia/src/gpu/GrShaderUtils.cpp b/third_party/skia/src/utils/SkShaderUtils.cpp
similarity index 83%
rename from third_party/skia/src/gpu/GrShaderUtils.cpp
rename to third_party/skia/src/utils/SkShaderUtils.cpp
index 1e6f61820e662..9a7368c011614 100644
--- a/third_party/skia/src/gpu/GrShaderUtils.cpp
+++ b/third_party/skia/src/utils/SkShaderUtils.cpp
@@ -5,18 +5,18 @@
  * found in the LICENSE file.
  */
 
+#include "src/utils/SkShaderUtils.h"
+
 #include "include/core/SkString.h"
-#include "include/gpu/GrContextOptions.h"
 #include "include/private/SkSLString.h"
-#include "src/gpu/GrShaderUtils.h"
 
-namespace GrShaderUtils {
+namespace SkShaderUtils {
 
 class GLSLPrettyPrint {
 public:
     GLSLPrettyPrint() {}
 
-    SkSL::String prettify(const SkSL::String& string) {
+    std::string prettify(const std::string& string) {
         fTabs = 0;
         fFreshline = true;
 
@@ -97,7 +97,7 @@ class GLSLPrettyPrint {
 private:
     void appendChar(char c) {
         this->tabString();
-        fPretty.appendf("%c", fInput[fIndex++]);
+        SkSL::String::appendf(&fPretty, "%c", fInput[fIndex++]);
         fFreshline = false;
     }
 
@@ -125,7 +125,7 @@ class GLSLPrettyPrint {
                 fInParseUntilNewline = false;
                 break;
             }
-            fPretty.appendf("%c", fInput[fIndex++]);
+            SkSL::String::appendf(&fPretty, "%c", fInput[fIndex++]);
             fInParseUntilNewline = true;
         }
     }
@@ -148,7 +148,7 @@ class GLSLPrettyPrint {
                 break;
             }
             fFreshline = false;
-            fPretty.appendf("%c", fInput[fIndex++]);
+            SkSL::String::appendf(&fPretty, "%c", fInput[fIndex++]);
             fInParseUntil = true;
             fInParseUntilToken = token;
         }
@@ -176,7 +176,7 @@ class GLSLPrettyPrint {
     int fTabs;
     size_t fIndex, fLength;
     const char* fInput;
-    SkSL::String fPretty;
+    std::string fPretty;
 
     // Some helpers for parseUntil when we go over a string length
     bool fInParseUntilNewline;
@@ -184,12 +184,12 @@ class GLSLPrettyPrint {
     const char* fInParseUntilToken;
 };
 
-SkSL::String PrettyPrint(const SkSL::String& string) {
+std::string PrettyPrint(const std::string& string) {
     GLSLPrettyPrint pp;
     return pp.prettify(string);
 }
 
-void VisitLineByLine(const SkSL::String& text,
+void VisitLineByLine(const std::string& text,
                      const std::function<void(int lineNumber, const char* lineText)>& visitFn) {
     SkTArray<SkString> lines;
     SkStrSplit(text.c_str(), "\n", kStrict_SkStrSplitMode, &lines);
@@ -198,32 +198,16 @@ void VisitLineByLine(const SkSL::String& text,
     }
 }
 
-SkSL::String BuildShaderErrorMessage(const char* shader, const char* errors) {
-    SkSL::String abortText{"Shader compilation error\n"
-                           "------------------------\n"};
+std::string BuildShaderErrorMessage(const char* shader, const char* errors) {
+    std::string abortText{"Shader compilation error\n"
+                          "------------------------\n"};
     VisitLineByLine(shader, [&](int lineNumber, const char* lineText) {
-        abortText.appendf("%4i\t%s\n", lineNumber, lineText);
+        SkSL::String::appendf(&abortText, "%4i\t%s\n", lineNumber, lineText);
     });
-    abortText.appendf("Errors:\n%s", errors);
+    SkSL::String::appendf(&abortText, "Errors:\n%s", errors);
     return abortText;
 }
 
-GrContextOptions::ShaderErrorHandler* DefaultShaderErrorHandler() {
-    class GrDefaultShaderErrorHandler : public GrContextOptions::ShaderErrorHandler {
-    public:
-        void compileError(const char* shader, const char* errors) override {
-            SkSL::String message = BuildShaderErrorMessage(shader, errors);
-            VisitLineByLine(message, [](int, const char* lineText) {
-                SkDebugf("%s\n", lineText);
-            });
-            SkDEBUGFAIL("Shader compilation failed!");
-        }
-    };
-
-    static GrDefaultShaderErrorHandler gHandler;
-    return &gHandler;
-}
-
 void PrintShaderBanner(SkSL::ProgramKind programKind) {
     const char* typeName = "Unknown";
     switch (programKind) {
@@ -234,4 +218,4 @@ void PrintShaderBanner(SkSL::ProgramKind programKind) {
     SkDebugf("---- %s shader ----------------------------------------------------\n", typeName);
 }
 
-}  // namespace GrShaderUtils
+}  // namespace SkShaderUtils
diff --git a/third_party/skia/src/gpu/GrShaderUtils.h b/third_party/skia/src/utils/SkShaderUtils.h
similarity index 58%
rename from third_party/skia/src/gpu/GrShaderUtils.h
rename to third_party/skia/src/utils/SkShaderUtils.h
index f93dd12b04545..9c8d69bfc6608 100644
--- a/third_party/skia/src/gpu/GrShaderUtils.h
+++ b/third_party/skia/src/utils/SkShaderUtils.h
@@ -5,35 +5,33 @@
  * found in the LICENSE file.
  */
 
-#ifndef GrShaderUtils_DEFINED
-#define GrShaderUtils_DEFINED
+#ifndef SkShaderUtils_DEFINED
+#define SkShaderUtils_DEFINED
+
+#include <functional>
 
-#include "include/core/SkTypes.h"
-#include "include/gpu/GrContextOptions.h"
 #include "include/private/SkSLProgramKind.h"
 #include "include/private/SkSLString.h"
 
-namespace GrShaderUtils {
+namespace SkShaderUtils {
 
-SkSL::String PrettyPrint(const SkSL::String& string);
+std::string PrettyPrint(const std::string& string);
 
-void VisitLineByLine(const SkSL::String& text,
+void VisitLineByLine(const std::string& text,
                      const std::function<void(int lineNumber, const char* lineText)>&);
 
 // Prints shaders one line at the time. This ensures they don't get truncated by the adb log.
-inline void PrintLineByLine(const SkSL::String& text) {
+inline void PrintLineByLine(const std::string& text) {
     VisitLineByLine(text, [](int lineNumber, const char* lineText) {
         SkDebugf("%4i\t%s\n", lineNumber, lineText);
     });
 }
 
 // Combines raw shader and error text into an easier-to-read error message with line numbers.
-SkSL::String BuildShaderErrorMessage(const char* shader, const char* errors);
-
-GrContextOptions::ShaderErrorHandler* DefaultShaderErrorHandler();
+std::string BuildShaderErrorMessage(const char* shader, const char* errors);
 
 void PrintShaderBanner(SkSL::ProgramKind programKind);
 
-}  // namespace GrShaderUtils
+}  // namespace SkShaderUtils
 
 #endif
diff --git a/third_party/skia/src/utils/SkShadowTessellator.cpp b/third_party/skia/src/utils/SkShadowTessellator.cpp
index 24a1b4fea4317..e0bbc02db9ed8 100644
--- a/third_party/skia/src/utils/SkShadowTessellator.cpp
+++ b/third_party/skia/src/utils/SkShadowTessellator.cpp
@@ -13,6 +13,7 @@
 #include "src/core/SkDrawShadowInfo.h"
 #include "src/core/SkGeometry.h"
 #include "src/core/SkPointPriv.h"
+#include "src/core/SkRectPriv.h"
 #include "src/utils/SkPolyUtils.h"
 #include "src/utils/SkShadowTessellator.h"
 
@@ -555,6 +556,9 @@ bool SkBaseShadowTessellator::computeConcaveShadow(SkScalar inset, SkScalar outs
         return false;
     }
 
+    // shouldn't inset more than the half bounds of the polygon
+    inset = std::min(inset, std::min(SkTAbs(SkRectPriv::HalfWidth(fPathBounds)),
+                                     SkTAbs(SkRectPriv::HalfHeight(fPathBounds))));
     // generate inner ring
     SkTDArray<SkPoint> umbraPolygon;
     SkTDArray<int> umbraIndices;
@@ -722,10 +726,12 @@ void SkBaseShadowTessellator::stitchConcaveRings(const SkTDArray<SkPoint>& umbra
 
 // tesselation tolerance values, in device space pixels
 #if SK_SUPPORT_GPU
-static const SkScalar kQuadTolerance = 0.2f;
-static const SkScalar kCubicTolerance = 0.2f;
+static constexpr SkScalar kQuadTolerance = 0.2f;
+static constexpr SkScalar kCubicTolerance = 0.2f;
+static constexpr SkScalar kQuadToleranceSqd = kQuadTolerance * kQuadTolerance;
+static constexpr SkScalar kCubicToleranceSqd = kCubicTolerance * kCubicTolerance;
 #endif
-static const SkScalar kConicTolerance = 0.25f;
+static constexpr SkScalar kConicTolerance = 0.25f;
 
 // clamps the point to the nearest 16th of a pixel
 static void sanitize_point(const SkPoint& in, SkPoint* out) {
@@ -779,7 +785,7 @@ void SkBaseShadowTessellator::handleQuad(const SkPoint pts[3]) {
     fPointBuffer.setCount(maxCount);
     SkPoint* target = fPointBuffer.begin();
     int count = GrPathUtils::generateQuadraticPoints(pts[0], pts[1], pts[2],
-                                                     kQuadTolerance, &target, maxCount);
+                                                     kQuadToleranceSqd, &target, maxCount);
     fPointBuffer.setCount(count);
     for (int i = 0; i < count; i++) {
         this->handleLine(fPointBuffer[i]);
@@ -804,7 +810,7 @@ void SkBaseShadowTessellator::handleCubic(const SkMatrix& m, SkPoint pts[4]) {
     fPointBuffer.setCount(maxCount);
     SkPoint* target = fPointBuffer.begin();
     int count = GrPathUtils::generateCubicPoints(pts[0], pts[1], pts[2], pts[3],
-                                                 kCubicTolerance, &target, maxCount);
+                                                 kCubicToleranceSqd, &target, maxCount);
     fPointBuffer.setCount(count);
     for (int i = 0; i < count; i++) {
         this->handleLine(fPointBuffer[i]);
@@ -910,8 +916,6 @@ SkAmbientShadowTessellator::SkAmbientShadowTessellator(const SkPath& path,
     // umbraColor is the interior value, penumbraColor the exterior value.
     auto outset = SkDrawShadowMetrics::AmbientBlurRadius(baseZ);
     auto inset = outset * SkDrawShadowMetrics::AmbientRecipAlpha(baseZ) - outset;
-    inset = SkTPin(inset, 0.0f, std::min(path.getBounds().width(),
-                                       path.getBounds().height()));
 
     if (!this->computePathPolygon(path, ctm)) {
         return;
diff --git a/third_party/skia/src/utils/SkShadowUtils.cpp b/third_party/skia/src/utils/SkShadowUtils.cpp
index 7ef3b28e9cdbc..5c4aea956c9f0 100644
--- a/third_party/skia/src/utils/SkShadowUtils.cpp
+++ b/third_party/skia/src/utils/SkShadowUtils.cpp
@@ -145,14 +145,16 @@ struct AmbientVerticesFactory {
 struct SpotVerticesFactory {
     enum class OccluderType {
         // The umbra cannot be dropped out because either the occluder is not opaque,
-        // or the center of the umbra is visible.
-        kTransparent,
-        // The umbra can be dropped where it is occluded.
-        kOpaquePartialUmbra,
-        // It is known that the entire umbra is occluded.
-        kOpaqueNoUmbra,
-        // The light is directional
-        kDirectional
+        // or the center of the umbra is visible. Uses point light.
+        kPointTransparent,
+        // The umbra can be dropped where it is occluded. Uses point light.
+        kPointOpaquePartialUmbra,
+        // It is known that the entire umbra is occluded. Uses point light.
+        kPointOpaqueNoUmbra,
+        // Uses directional light.
+        kDirectional,
+        // The umbra can't be dropped out. Uses directional light.
+        kDirectionalTransparent,
     };
 
     SkVector fOffset;
@@ -168,13 +170,13 @@ struct SpotVerticesFactory {
             return false;
         }
         switch (fOccluderType) {
-            case OccluderType::kTransparent:
-            case OccluderType::kOpaqueNoUmbra:
+            case OccluderType::kPointTransparent:
+            case OccluderType::kPointOpaqueNoUmbra:
                 // 'this' and 'that' will either both have no umbra removed or both have all the
                 // umbra removed.
                 *translate = that.fOffset;
                 return true;
-            case OccluderType::kOpaquePartialUmbra:
+            case OccluderType::kPointOpaquePartialUmbra:
                 // In this case we partially remove the umbra differently for 'this' and 'that'
                 // if the offsets don't match.
                 if (fOffset == that.fOffset) {
@@ -183,6 +185,7 @@ struct SpotVerticesFactory {
                 }
                 return false;
             case OccluderType::kDirectional:
+            case OccluderType::kDirectionalTransparent:
                 *translate = that.fOffset - fOffset;
                 return true;
         }
@@ -191,14 +194,16 @@ struct SpotVerticesFactory {
 
     sk_sp<SkVertices> makeVertices(const SkPath& path, const SkMatrix& ctm,
                                    SkVector* translate) const {
-        bool transparent = OccluderType::kTransparent == fOccluderType;
-        bool directional = OccluderType::kDirectional == fOccluderType;
+        bool transparent = fOccluderType == OccluderType::kPointTransparent ||
+                           fOccluderType == OccluderType::kDirectionalTransparent;
+        bool directional = fOccluderType == OccluderType::kDirectional ||
+                           fOccluderType == OccluderType::kDirectionalTransparent;
         SkPoint3 zParams = SkPoint3::Make(0, 0, fOccluderHeight);
         if (directional) {
             translate->set(0, 0);
             return SkShadowTessellator::MakeSpot(path, ctm, zParams, fDevLightPos, fLightRadius,
                                                  transparent, true);
-        } else if (ctm.hasPerspective() || OccluderType::kOpaquePartialUmbra == fOccluderType) {
+        } else if (ctm.hasPerspective() || OccluderType::kPointOpaquePartialUmbra == fOccluderType) {
             translate->set(0, 0);
             return SkShadowTessellator::MakeSpot(path, ctm, zParams, fDevLightPos, fLightRadius,
                                                  transparent, false);
@@ -659,7 +664,7 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
 
     bool tiltZPlane = tilted(rec.fZPlaneParams);
     bool transparent = SkToBool(rec.fFlags & SkShadowFlags::kTransparentOccluder_ShadowFlag);
-    bool directional = SkToBool(rec.fFlags & kDirectionalLight_ShadowFlag);
+    bool directional = SkToBool(rec.fFlags & SkShadowFlags::kDirectionalLight_ShadowFlag);
     bool uncached = tiltZPlane || path.isVolatile();
 
     SkPoint3 zPlaneParams = rec.fZPlaneParams;
@@ -793,21 +798,26 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
 
             SkRect devBounds;
             viewMatrix.mapRect(&devBounds, path.getBounds());
-            if (directional) {
-                factory.fOccluderType = SpotVerticesFactory::OccluderType::kDirectional;
-            } else if (transparent ||
-                       SkTAbs(factory.fOffset.fX) > 0.5f*devBounds.width() ||
-                       SkTAbs(factory.fOffset.fY) > 0.5f*devBounds.height()) {
+            if (transparent ||
+                SkTAbs(factory.fOffset.fX) > 0.5f*devBounds.width() ||
+                SkTAbs(factory.fOffset.fY) > 0.5f*devBounds.height()) {
                 // if the translation of the shadow is big enough we're going to end up
-                // filling the entire umbra, so we can treat these as all the same
-                factory.fOccluderType = SpotVerticesFactory::OccluderType::kTransparent;
+                // filling the entire umbra, we can treat these as all the same
+                if (directional) {
+                    factory.fOccluderType =
+                            SpotVerticesFactory::OccluderType::kDirectionalTransparent;
+                } else {
+                    factory.fOccluderType = SpotVerticesFactory::OccluderType::kPointTransparent;
+                }
+            } else if (directional) {
+                factory.fOccluderType = SpotVerticesFactory::OccluderType::kDirectional;
             } else if (factory.fOffset.length()*scale + scale < radius) {
                 // if we don't translate more than the blur distance, can assume umbra is covered
-                factory.fOccluderType = SpotVerticesFactory::OccluderType::kOpaqueNoUmbra;
+                factory.fOccluderType = SpotVerticesFactory::OccluderType::kPointOpaqueNoUmbra;
             } else if (path.isConvex()) {
-                factory.fOccluderType = SpotVerticesFactory::OccluderType::kOpaquePartialUmbra;
+                factory.fOccluderType = SpotVerticesFactory::OccluderType::kPointOpaquePartialUmbra;
             } else {
-                factory.fOccluderType = SpotVerticesFactory::OccluderType::kTransparent;
+                factory.fOccluderType = SpotVerticesFactory::OccluderType::kPointTransparent;
             }
             // need to add this after we classify the shadow
             factory.fOffset.fX += viewMatrix.getTranslateX();
@@ -816,16 +826,17 @@ void SkBaseDevice::drawShadow(const SkPath& path, const SkDrawShadowRec& rec) {
             SkColor color = rec.fSpotColor;
 #ifdef DEBUG_SHADOW_CHECKS
             switch (factory.fOccluderType) {
-                case SpotVerticesFactory::OccluderType::kTransparent:
+                case SpotVerticesFactory::OccluderType::kPointTransparent:
                     color = 0xFFD2B48C;  // tan for transparent
                     break;
-                case SpotVerticesFactory::OccluderType::kOpaquePartialUmbra:
+                case SpotVerticesFactory::OccluderType::kPointOpaquePartialUmbra:
                     color = 0xFFFFA500;   // orange for opaque
                     break;
-                case SpotVerticesFactory::OccluderType::kOpaqueNoUmbra:
+                case SpotVerticesFactory::OccluderType::kPointOpaqueNoUmbra:
                     color = 0xFFE5E500;  // corn yellow for covered
                     break;
                 case SpotVerticesFactory::OccluderType::kDirectional:
+                case SpotVerticesFactory::OccluderType::kDirectionalTransparent:
                     color = 0xFF550000;  // dark red for directional
                     break;
             }
diff --git a/third_party/skia/src/utils/SkVMVisualizer.cpp b/third_party/skia/src/utils/SkVMVisualizer.cpp
new file mode 100644
index 0000000000000..4ec8a280363d8
--- /dev/null
+++ b/third_party/skia/src/utils/SkVMVisualizer.cpp
@@ -0,0 +1,505 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "src/utils/SkVMVisualizer.h"
+#include <sstream>
+#include "src/core/SkStreamPriv.h"
+
+namespace {
+
+size_t get_addr(const char* str) {
+    size_t addr;
+    std::istringstream ss(str);
+    ss >> std::hex >> addr;
+    SkASSERT(!ss.fail());
+    return addr;
+}
+
+}
+
+namespace skvm::viz {
+
+bool Instruction::operator == (const Instruction& o) const {
+    return this->kind == o.kind &&
+           this->startCode == o.startCode &&
+           this->endCode == o.endCode &&
+           this->instructionIndex == o.instructionIndex &&
+           this->instruction == o.instruction &&
+           this->duplicates == o.duplicates;
+}
+
+SkString Instruction::classes() const {
+    SkString result((kind & InstructionFlags::kDead) ? "dead" : "normal");
+    if (duplicates > 0) result += " origin";
+    if (duplicates < 0) result += " deduped";
+    return result;
+}
+
+uint32_t InstructionHash::operator()(const Instruction& i) const {
+    uint32_t hash = 0;
+    hash = SkOpts::hash_fn(&i.kind, sizeof(i.kind), hash);
+    hash = SkOpts::hash_fn(&i.instructionIndex, sizeof(i.instructionIndex), hash);
+    hash = SkOpts::hash_fn(&i.instruction, sizeof(i.instruction), hash);
+    return hash;
+}
+
+void Visualizer::parseDisassembler(SkWStream* output, const char* code) {
+    if (code == nullptr) {
+        fAsmLine = 0;
+        return;
+    }
+    // Read the disassembled code from <_skvm_jit> until
+    // the last command that is attached to the byte code
+    // We skip all the prelude (main loop organizing and such)
+    // generate the main loop running on vector values (keeping hoisted commands in place)
+    // and skip the tail loop (which is the same as the main, only on scalar values)
+    // We stop after the last byte code.
+    SkTArray<SkString> commands;
+    SkStrSplit(code, "\n", kStrict_SkStrSplitMode, &commands);
+    for (const SkString& line : commands) {
+        ++fAsmLine;
+        if (line.find("<_skvm_jit>") >= 0) {
+            break;
+        }
+    }
+
+    if (fAsmLine < commands.size()) {
+        const SkString& line = commands[fAsmLine];
+        SkTArray<SkString> tokens;
+        SkStrSplit(line.c_str(), "\t", kStrict_SkStrSplitMode, &tokens);
+        if (tokens.size() >= 2 && tokens[0].size() > 1) {
+            fAsmStart = get_addr(tokens[0].c_str());
+        }
+    }
+
+    fAsmEnd += fAsmStart;
+    for (size_t i = fAsmLine; i < commands.size(); ++i) {
+        const SkString& line = commands[i];
+        SkTArray<SkString> tokens;
+        SkStrSplit(line.c_str(), "\t", kStrict_SkStrSplitMode, &tokens);
+        size_t addr = 0;
+        if (tokens.size() >= 2 && tokens[0].size() > 1) {
+            addr = get_addr(tokens[0].c_str());
+        }
+        if (addr > fAsmEnd) {
+            break;
+        }
+        addr -= fAsmStart;
+        if (!fAsm.empty()) {
+            MachineCommand& prev = fAsm.back();
+            if (prev.command.isEmpty()) {
+                int len = addr - prev.address;
+                prev.command.printf("{ align %d bytes }", len);
+            }
+        }
+        SkString command;
+        for (size_t t = 2; t < tokens.size(); ++t) {
+            command += tokens[t];
+        }
+        fAsm.push_back({addr, tokens[0], command, tokens[1]});
+    }
+    if (!fAsm.empty()) {
+        MachineCommand& prev = fAsm.back();
+        if (prev.command.isEmpty()) {
+            int len = fInstructions.back().endCode - prev.address;
+            prev.command.printf("{ align %d bytes }", len);
+        }
+    }
+    fAsmLine = 0;
+}
+
+void Visualizer::dump(SkWStream* output, const char* code) {
+    SkDebugfStream stream;
+    fOutput = output ? output : &stream;
+    this->parseDisassembler(output, code);
+    this->dumpHead();
+    for (size_t id = 0ul; id < fInstructions.size(); ++id) {
+        this->dumpInstruction(id);
+    }
+    this->dumpTail();
+}
+
+void Visualizer::markAsDeadCode(std::vector<bool>& live, const std::vector<int>& newIds) {
+    for (size_t id = 0ul; id < fInstructions.size(); ++id) {
+        Instruction& instruction = fInstructions[id];
+        if (instruction.instructionIndex < 0) {
+            // We skip commands that are duplicates of some other commands
+            // They either will be dead or alive together with the origin
+            continue;
+        }
+        SkASSERT(instruction.instructionIndex < (int)live.size());
+        if (live[instruction.instructionIndex]) {
+            instruction.instructionIndex = newIds[instruction.instructionIndex];
+            fToDisassembler[instruction.instructionIndex] = id;
+        } else {
+            instruction.kind
+                    = static_cast<InstructionFlags>(instruction.kind | InstructionFlags::kDead);
+            fToDisassembler[instruction.instructionIndex] = -1;
+            // Anything negative meaning the command is duplicate/dead
+            instruction.instructionIndex = -2;
+        }
+    }
+}
+
+void Visualizer::addInstructions(std::vector<skvm::Instruction>& program) {
+    for (Val id = 0; id < (Val)program.size(); id++) {
+        skvm::Instruction& instr = program[id];
+        auto isDuplicate = instr.op == Op::duplicate;
+        if (isDuplicate) {
+            this->markAsDuplicate(instr.immA, id);
+            instr = program[instr.immA];
+        }
+        this->addInstruction({
+            viz::InstructionFlags::kNormal,
+            /*startCode=*/0, /*endCode=0*/0,
+            id,
+            isDuplicate ? -1 : 0,
+            instr
+        });
+    }
+}
+
+void Visualizer::addInstruction(Instruction skvm) {
+    if (!touches_varying_memory(skvm.instruction.op)) {
+        if (auto found = fIndex.find(skvm)) {
+            auto& instruction = fInstructions[*found];
+            ++(instruction.duplicates);
+            return;
+        }
+    }
+    fIndex.set(skvm, fInstructions.size());
+    fToDisassembler.set(skvm.instructionIndex, fInstructions.size());
+    fInstructions.emplace_back(std::move(skvm));
+}
+
+void Visualizer::finalize(const std::vector<skvm::Instruction>& all,
+                              const std::vector<skvm::OptimizedInstruction>& optimized) {
+    for (Val id = 0; id < (Val)all.size(); id++) {
+        if (optimized[id].can_hoist) {
+            size_t found = fToDisassembler[id];
+            Instruction& instruction = fInstructions[found];
+            instruction.kind =
+                    static_cast<InstructionFlags>(instruction.kind | InstructionFlags::kHoisted);
+        }
+    }
+}
+
+void Visualizer::addMachineCommands(int id, size_t start, size_t end) {
+    size_t found = fToDisassembler[id];
+    Instruction& instruction = fInstructions[found];
+    instruction.startCode = start;
+    instruction.endCode = end;
+    fAsmEnd = std::max(fAsmEnd, end);
+}
+
+SkString Visualizer::V(int reg) const {
+    if (reg == -1) {
+        return SkString("{optimized}");
+    } else if (reg == -2) {
+        return SkString("{dead code}");
+    } else {
+        return SkStringPrintf("v%d", reg);
+    }
+}
+
+void Visualizer::formatVV(const char* op, int v1, int v2) const {
+    this->writeText("%s %s, %s", op, V(v1).c_str(), V(v2).c_str());
+}
+void Visualizer::formatPV(const char* op, int imm, int v1) const {
+    this->writeText("%s Ptr%d, %s", op, imm, V(v1).c_str());
+}
+void Visualizer::formatPVV(const char* op, int imm, int v1, int v2) const {
+    this->writeText("%s Ptr%d, %s, %s", op, imm, V(v1).c_str(), V(v2).c_str());
+}
+void Visualizer::formatPVVVV(const char* op, int imm, int v1, int v2, int v3, int v4) const {
+    this->writeText("%s Ptr%d, %s, %s, %s, %s",
+              op, imm, V(v1).c_str(), V(v2).c_str(), V(v3).c_str(), V(v4).c_str());
+}
+void Visualizer::formatA_(int id, const char* op) const {
+    writeText("%s = %s", V(id).c_str(), op);
+}
+void Visualizer::formatA_P(int id, const char* op, int imm) const {
+    this->writeText("%s = %s Ptr%d", V(id).c_str(), op, imm);
+}
+void Visualizer::formatA_PH(int id, const char* op, int immA, int immB) const {
+    this->writeText("%s = %s Ptr%d, %x", V(id).c_str(), op, immA, immB);
+}
+void Visualizer::formatA_PHH(int id, const char* op, int immA, int immB, int immC) const {
+    this->writeText("%s = %s Ptr%d, %x, %x", V(id).c_str(), op, immA, immB, immC);
+}
+void Visualizer::formatA_PHV(int id, const char* op, int immA, int immB, int v) const {
+    this->writeText("%s = %s Ptr%d, %x, %s", V(id).c_str(), op, immA, immB, V(v).c_str());
+}
+void Visualizer::formatA_S(int id, const char* op, int imm) const {
+    float f;
+    memcpy(&f, &imm, 4);
+    char buffer[kSkStrAppendScalar_MaxSize];
+    char* stop = SkStrAppendScalar(buffer, f);
+    this->writeText("%s = %s %x (", V(id).c_str(), op, imm);
+    fOutput->write(buffer, stop - buffer);
+    this->writeText(")");
+}
+void Visualizer::formatA_V(int id, const char* op, int v) const {
+    this->writeText("%s = %s %s", V(id).c_str(), op, V(v).c_str());
+}
+void Visualizer::formatA_VV(int id, const char* op, int v1, int v2) const {
+    this->writeText("%s = %s %s, %s", V(id).c_str(), op, V(v1).c_str(), V(v2).c_str());
+}
+void Visualizer::formatA_VVV(int id, const char* op,  int v1, int v2, int v3) const {
+    this->writeText(
+            "%s = %s %s, %s, %s", V(id).c_str(), op, V(v1).c_str(), V(v2).c_str(), V(v3).c_str());
+}
+void Visualizer::formatA_VC(int id, const char* op,  int v, int imm) const {
+    this->writeText("%s = %s %s, %d", V(id).c_str(), op, V(v).c_str(), imm);
+}
+
+void Visualizer::writeText(const char* format, ...) const {
+    SkString message;
+    va_list argp;
+    va_start(argp, format);
+    message.appendVAList(format, argp);
+    va_end(argp);
+    fOutput->writeText(message.c_str());
+}
+
+void Visualizer::dumpInstruction(int id0) const {
+    const Instruction& instruction = fInstructions[id0];
+    const int id = instruction.instructionIndex;
+    const int x = instruction.instruction.x,
+              y = instruction.instruction.y,
+              z = instruction.instruction.z,
+              w = instruction.instruction.w;
+    const int immA = instruction.instruction.immA,
+              immB = instruction.instruction.immB,
+              immC = instruction.instruction.immC;
+    if (instruction.instruction.op == skvm::Op::trace_line) {
+        SkASSERT(fDebugInfo != nullptr);
+        SkASSERT(immA >= 0 && immB <= (int)fDebugInfo->fSource.size());
+        this->writeText("<tr class='source'><td class='mask'></td><td colspan=2>// %s</td></tr>\n",
+                        fDebugInfo->fSource[immB].c_str());
+        return;
+    } else if (instruction.instruction.op == skvm::Op::trace_var ||
+               instruction.instruction.op == skvm::Op::trace_scope) {
+        // TODO: We can add some visualization here
+        return;
+    } else if (instruction.instruction.op == skvm::Op::trace_enter) {
+        SkASSERT(fDebugInfo != nullptr);
+        SkASSERT(immA >= 0 && immA <= (int)fDebugInfo->fFuncInfo.size());
+        std::string& func = fDebugInfo->fFuncInfo[immA].name;
+        SkString mask;
+        mask.printf(immC == 1 ? "%s(-1)" : "%s", V(x).c_str());
+        this->writeText(
+                "<tr class='source'><td class='mask'>&#8618;%s</td><td colspan=2>%s</td></tr>\n",
+                mask.c_str(),
+                func.c_str());
+        return;
+    } else if (instruction.instruction.op == skvm::Op::trace_exit) {
+        SkASSERT(fDebugInfo != nullptr);
+        SkASSERT(immA >= 0 && immA <= (int)fDebugInfo->fFuncInfo.size());
+        std::string& func = fDebugInfo->fFuncInfo[immA].name;
+        SkString mask;
+        mask.printf(immC == 1 ? "%s(-1)" : "%s", V(x).c_str());
+        this->writeText(
+                "<tr class='source'><td class='mask'>&#8617;%s</td><td colspan=2>%s</td></tr>\n",
+                mask.c_str(),
+                func.c_str());
+        return;
+    }
+    // No label, to the operation
+    SkString label;
+    if ((instruction.kind & InstructionFlags::kHoisted) != 0) {
+        label.set("&#8593;&#8593;&#8593; ");
+    }
+    if (instruction.duplicates > 0) {
+        label.appendf("*%d", instruction.duplicates + 1);
+    }
+    SkString classes = instruction.classes();
+    this->writeText("<tr class='%s'><td>%s</td><td>", classes.c_str(), label.c_str());
+    // Operation
+    switch (instruction.instruction.op) {
+        case skvm::Op::assert_true:   formatVV("assert_true", x, y);                  break;
+        case skvm::Op::store8:        formatPV("store8", immA, x);                    break;
+        case skvm::Op::store16:       formatPV("store16", immA, x);                   break;
+        case skvm::Op::store32:       formatPV("store32", immA, x);                   break;
+        case skvm::Op::store64:       formatPVV("store64", immA, x, y);               break;
+        case skvm::Op::store128:      formatPVVVV("store128", immA, x, y, z, w);      break;
+        case skvm::Op::index:         formatA_(id, "index");                          break;
+        case skvm::Op::load8:         formatA_P(id, "load8", immA);                   break;
+        case skvm::Op::load16:        formatA_P(id, "load16", immA);                  break;
+        case skvm::Op::load32:        formatA_P(id, "load32", immA);                  break;
+        case skvm::Op::load64:        formatA_PH(id, "load64", immA, immB);           break;
+        case skvm::Op::load128:       formatA_PH(id, "load128", immA, immB);          break;
+        case skvm::Op::gather8:       formatA_PHV(id, "gather8", immA, immB, x);      break;
+        case skvm::Op::gather16:      formatA_PHV(id, "gather16", immA, immB, x);     break;
+        case skvm::Op::gather32:      formatA_PHV(id, "gather32", immA, immB, x);     break;
+        case skvm::Op::uniform32:     formatA_PH(id, "uniform32", immA, immB);        break;
+        case skvm::Op::array32:       formatA_PHH(id, "array32", immA, immB, immC);   break;
+        case skvm::Op::splat:         formatA_S(id, "splat", immA);                   break;
+        case skvm::Op:: add_f32:      formatA_VV(id, "add_f32", x, y);                break;
+        case skvm::Op:: sub_f32:      formatA_VV(id, "sub_f32", x, y);                break;
+        case skvm::Op:: mul_f32:      formatA_VV(id, "mul_f32", x, y);                break;
+        case skvm::Op:: div_f32:      formatA_VV(id, "div_f32", x, y);                break;
+        case skvm::Op:: min_f32:      formatA_VV(id, "min_f32", x, y);                break;
+        case skvm::Op:: max_f32:      formatA_VV(id, "max_f32", x, y);                break;
+        case skvm::Op:: fma_f32:      formatA_VVV(id, "fma_f32", x, y, z);            break;
+        case skvm::Op:: fms_f32:      formatA_VVV(id, "fms_f32", x, y, z);            break;
+        case skvm::Op::fnma_f32:      formatA_VVV(id, "fnma_f32", x, y, z);           break;
+        case skvm::Op::sqrt_f32:      formatA_V(id, "sqrt_f32", x);                   break;
+        case skvm::Op:: eq_f32:       formatA_VV(id, "eq_f32", x, y);                 break;
+        case skvm::Op::neq_f32:       formatA_VV(id, "neq_f32", x, y);                break;
+        case skvm::Op:: gt_f32:       formatA_VV(id, "gt_f32", x, y);                 break;
+        case skvm::Op::gte_f32:       formatA_VV(id, "gte_f32", x, y);                break;
+        case skvm::Op::add_i32:       formatA_VV(id, "add_i32", x, y);                break;
+        case skvm::Op::sub_i32:       formatA_VV(id, "sub_i32", x, y);                break;
+        case skvm::Op::mul_i32:       formatA_VV(id, "mul_i32", x, y);                break;
+        case skvm::Op::shl_i32:       formatA_VC(id, "shl_i32", x, immA);             break;
+        case skvm::Op::shr_i32:       formatA_VC(id, "shr_i32", x, immA);             break;
+        case skvm::Op::sra_i32:       formatA_VC(id, "sra_i32", x, immA);             break;
+        case skvm::Op::eq_i32:        formatA_VV(id, "eq_i32", x, y);                 break;
+        case skvm::Op::gt_i32:        formatA_VV(id, "gt_i32", x, y);                 break;
+        case skvm::Op::bit_and:       formatA_VV(id, "bit_and", x, y);                break;
+        case skvm::Op::bit_or:        formatA_VV(id, "bit_or", x, y);                 break;
+        case skvm::Op::bit_xor:       formatA_VV(id, "bit_xor", x, y);                break;
+        case skvm::Op::bit_clear:     formatA_VV(id, "bit_clear", x, y);              break;
+        case skvm::Op::select:        formatA_VVV(id, "select", x, y, z);             break;
+        case skvm::Op::ceil:          formatA_V(id, "ceil", x);                       break;
+        case skvm::Op::floor:         formatA_V(id, "floor", x);                      break;
+        case skvm::Op::to_f32:        formatA_V(id, "to_f32", x);                     break;
+        case skvm::Op::to_fp16:       formatA_V(id, "to_fp16", x);                    break;
+        case skvm::Op::from_fp16:     formatA_V(id, "from_fp16", x);                  break;
+        case skvm::Op::trunc:         formatA_V(id, "trunc", x);                      break;
+        case skvm::Op::round:         formatA_V(id, "round", x);                      break;
+        default: SkASSERT(false);
+    }
+    // Generation
+    if ((instruction.kind & InstructionFlags::kDead) == 0) {
+        struct Compare
+        {
+            bool operator() (const MachineCommand& c, std::pair<size_t, size_t> p) const
+                            { return c.address < p.first; }
+            bool operator() (std::pair<size_t, size_t> p, const MachineCommand& c) const
+                            { return p.second <= c.address; }
+        };
+
+        std::pair<size_t, size_t> range(instruction.startCode, instruction.endCode);
+        auto commands = std::equal_range(fAsm.begin(), fAsm.end(), range, Compare{ });
+        for (const MachineCommand* line = commands.first; line != commands.second; ++line) {
+            this->writeText("</td></tr>\n<tr class='machine'><td>%s</td><td colspan='2'>%s",
+                            line->label.c_str(),
+                            line->command.c_str());
+        }
+        fAsmLine = commands.second - fAsm.begin();
+    }
+    this->writeText("</td></tr>\n");
+}
+
+void Visualizer::dumpHead() const {
+    this->writeText("%s",
+    "<html>\n"
+    "<head>\n"
+    "   <title>SkVM Disassembler Output</title>\n"
+    "   <style>\n"
+    "   button { border-style: none; font-size: 10px; background-color: lightpink; }\n"
+    "   table { text-align: left; }\n"
+    "   table th { background-color: lightgray; }\n"
+    "   .dead, .dead1 { color: lightgray; text-decoration: line-through; }\n"
+    "   .normal, .normal1 { }\n"
+    "   .origin, .origin1 { font-weight: bold; }\n"
+    "   .source, .source1 { color: darkblue; }\n"
+    "   .mask, .mask1 { color: green; }\n"
+    "   .comments, .comments1 { }\n"
+    "   .machine, .machine1 { color: lightblue; }\n"
+    "   </style>\n"
+    "    <script>\n"
+    "    function initializeButton(className) {\n"
+    "      var btn = document.getElementById(className);\n"
+    "      var elems = document.getElementsByClassName(className);\n"
+    "      if (elems == undefined || elems.length == 0) {\n"
+    "        btn.disabled = true;\n"
+    "        btn.innerText = \"None\";\n"
+    "        btn.style.background = \"lightgray\";\n"
+    "        return;\n"
+    "      }\n"
+    "    };\n"
+    "    function initialize() {\n"
+    "      initializeButton('normal');\n"
+    "      initializeButton('source');\n"
+    "      initializeButton('dead');\n"
+    "      initializeButton('machine');\n"
+    "    };\n"
+    "  </script>\n"
+    "</head>\n"
+    "<body onload='initialize();'>\n"
+    "    <script>\n"
+    "    function toggle(btn, className) {\n"
+    "      var elems = document.getElementsByClassName(className);\n"
+    "      for (var i = 0; i < elems.length; i++) {\n"
+    "        var elem = elems.item(i);\n"
+    "        if (elem.style.display === \"\") {\n"
+    "            elem.style.display = \"none\";\n"
+    "            btn.innerText = \"Show\";\n"
+    "            btn.style.background = \"lightcyan\";\n"
+    "        } else {\n"
+    "            elem.style.display = \"\";\n"
+    "            btn.innerText = \"Hide\";\n"
+    "            btn.style.background = \"lightpink\";\n"
+    "        }\n"
+    "      }\n"
+    "    };\n"
+    "    </script>"
+    "    <table border=\"0\" style='font-family:\"monospace\"; font-size: 10px;'>\n"
+    "     <caption style='font-family:Roboto; font-size:15px; text-align:left;'>Legend</caption>\n"
+    "     <tr>\n"
+    "        <th style=\"min-width:100px;\"><u>Kind</u></th>\n"
+    "        <th style=\"width:35%;\"><u>Example</u></th>\n"
+    "        <th style=\"width: 5%; min-width:50px;\"><u></u></th>\n"
+    "        <th style=\"width:60%;\"><u>Description</u></th>\n"
+    "     </tr>\n"
+    "      <tr class='normal1'>"
+            "<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>"
+            "<td>v1 = load32 Ptr1</td>"
+            "<td><button id='normal' onclick=\"toggle(this, 'normal')\">Hide</button></td>"
+            "<td>A regular SkVM command</td></tr>\n"
+    "      <tr class='normal1 origin1'><td>*{N}</td>"
+            "<td>v9 = gt_f32 v0, v1</td>"
+            "<td><button id='dead' onclick=\"toggle(this, 'deduped')\">Hide</button></td>"
+            "<td>A {N} times deduped SkVM command</td></tr>\n"
+    "      <tr class='normal1'><td>&#8593;&#8593;&#8593; &nbsp;&nbsp;&nbsp;</td>"
+            "<td>v22 = splat 3f800000 (1)</td><td></td>"
+            "<td>A hoisted SkVM command</td></tr>\n"
+    "      <tr class='source1'><td class='mask'>mask&#8618;v{N}(-1)</td>"
+            "<td>// C++ source line</td><td></td>"
+            "<td>Enter into the procedure with mask v{N} (which has a constant value -1)"
+            "</td></tr>\n"
+    "      <tr class='source1'><td class='mask'>mask&#8617;v{N}</td>"
+            "<td>// C++ source line</td><td>"
+            "</td><td>Exit the procedure with mask v{N}</td></tr>\n"
+    "      <tr class='source1'><td class='mask'></td><td>// C++ source line</td>"
+            "<td><button id='source' onclick=\"toggle(this, 'source')\">Hide</button></td>"
+            "<td>Line trace back to C++ code</td></tr>\n"
+    "      <tr class='dead1'><td></td><td>{dead code} = mul_f32 v1, v18</td>"
+            "<td><button id='dead' onclick=\"toggle(this, 'dead')\">Hide</button></td>"
+            "<td>An eliminated \"dead code\" SkVM command</td></tr>\n"
+    "      <tr class='machine1'><td>{address}</td><td>vmovups (%rsi),%ymm0</td>"
+            "<td><button id='machine' onclick=\"toggle(this, 'machine')\">Hide</button></td>"
+            "<td>A disassembled machine command generated by SkVM command</td></tr>\n"
+    "    </table>\n"
+    "    <table border = \"0\"style='font-family:\"monospace\"; font-size: 10px;'>\n"
+    "     <caption style='font-family:Roboto;font-size:15px;text-align:left;'>SkVM Code</caption>\n"
+    "     <tr>\n"
+    "        <th style=\"min-width:100px;\"><u>Kind</u></th>\n"
+    "        <th style=\"width:40%;min-width:100px;\"><u>Command</u></th>\n"
+    "        <th style=\"width:60%;\"><u>Comments</u></th>\n"
+    "     </tr>");
+}
+void Visualizer::dumpTail() const {
+    this->writeText(
+    "      </table>\n"
+            "</body>\n"
+            "</html>"
+    );
+}
+} // namespace skvm::viz
diff --git a/third_party/skia/src/utils/SkVMVisualizer.h b/third_party/skia/src/utils/SkVMVisualizer.h
new file mode 100644
index 0000000000000..0f821e2f68ea6
--- /dev/null
+++ b/third_party/skia/src/utils/SkVMVisualizer.h
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#ifndef SkVMVisualizer_DEFINED
+#define SkVMVisualizer_DEFINED
+#include <unordered_map>
+#include <vector>
+#include "include/core/SkSpan.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/private/SkBitmaskEnum.h"
+#include "include/private/SkChecksum.h"
+#include "include/private/SkTHash.h"
+#include "src/core/SkOpts.h"
+#include "src/sksl/SkSLOutputStream.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+
+namespace skvm::viz {
+    enum InstructionFlags : uint8_t {
+        kNormal = 0x00,
+        kHoisted = 0x01,
+        kDead = 0x02,
+    };
+
+    struct MachineCommand {
+        size_t address;
+        SkString label;
+        SkString command;
+        SkString extra;
+    };
+
+    struct Instruction {
+        InstructionFlags kind = InstructionFlags::kNormal;
+        // Machine commands range (for disassembling):
+        size_t startCode = 0;
+        size_t endCode = 0;
+        int instructionIndex; // index in the actual instructions list
+        int duplicates = 0;   // number of duplicates;
+                              // -1 means it's a duplicate itself; 0 - it does not have dups
+        skvm::Instruction instruction;
+        bool operator == (const Instruction& o) const;
+        SkString classes() const;
+    };
+
+    struct InstructionHash {
+        uint32_t operator()(const Instruction& i) const;
+    };
+
+    class Visualizer {
+    public:
+        explicit Visualizer(SkSL::SkVMDebugTrace* debugInfo)
+                : fDebugInfo(debugInfo), fOutput(nullptr) {}
+        ~Visualizer() = default;
+        void dump(SkWStream* output, const char* code);
+        void markAsDeadCode(std::vector<bool>& live, const std::vector<int>& newIds);
+        void finalize(const std::vector<skvm::Instruction>& all,
+                      const std::vector<skvm::OptimizedInstruction>& optimized);
+        void addInstructions(std::vector<skvm::Instruction>& program);
+        void markAsDuplicate(int origin, int id) {
+            ++fInstructions[origin].duplicates;
+        }
+        void addInstruction(Instruction skvm);
+        void addMachineCommands(int id, size_t start, size_t end);
+        SkString V(int reg) const;
+    private:
+        void parseDisassembler(SkWStream* output, const char* code);
+        void dumpInstruction(int id) const;
+        void dumpHead() const;
+        void dumpTail() const;
+        void formatVV(const char* op, int v1, int v2) const;
+        void formatPV(const char* op, int imm, int v1) const;
+        void formatPVV(const char* op, int imm, int v1, int v2) const;
+        void formatPVVVV(const char* op, int imm, int v1, int v2, int v3, int v4) const;
+        void formatA_(int id, const char* op) const;
+        void formatA_P(int id, const char* op, int imm) const;
+        void formatA_PH(int id, const char* op, int immA, int immB) const;
+        void formatA_PHH(int id, const char* op, int immA, int immB, int immC) const;
+        void formatA_PHV(int id, const char* op, int immA, int immB, int v) const;
+        void formatA_S(int id, const char* op, int imm) const;
+        void formatA_V(int id, const char* op, int v) const;
+        void formatA_VV(int id, const char* op, int v1, int v2) const;
+        void formatA_VVV(int id, const char* op,  int v1, int v2, int v3) const;
+        void formatA_VC(int id, const char* op,  int v, int imm) const;
+
+        void writeText(const char* format, ...) const SK_PRINTF_LIKE(2, 3);
+
+        SkSL::SkVMDebugTrace* fDebugInfo;
+        SkTHashMap<Instruction, size_t, InstructionHash> fIndex;
+        SkTArray<Instruction> fInstructions;
+        SkWStream* fOutput;
+        SkTHashMap<int, size_t> fToDisassembler;
+        SkTArray<MachineCommand> fAsm;
+        mutable size_t fAsmLine = 0;
+        size_t fAsmStart = 0;
+        size_t fAsmEnd = 0;
+    };
+} // namespace skvm::viz
+
+namespace sknonstd {
+template <> struct is_bitmask_enum<skvm::viz::InstructionFlags> : std::true_type {};
+}  // namespace sknonstd
+
+#endif // SkVMVisualizer_DEFINED
diff --git a/third_party/skia/src/xps/SkXPSDevice.cpp b/third_party/skia/src/xps/SkXPSDevice.cpp
index a1cbc55bc4dc6..c5080ace0448b 100644
--- a/third_party/skia/src/xps/SkXPSDevice.cpp
+++ b/third_party/skia/src/xps/SkXPSDevice.cpp
@@ -1146,6 +1146,10 @@ void SkXPSDevice::drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPain
     //TODO
 }
 
+void SkXPSDevice::drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) {
+    // TODO
+}
+
 void SkXPSDevice::drawPaint(const SkPaint& origPaint) {
     const SkRect r = SkRect::MakeSize(this->fCurrentCanvasSize);
 
@@ -1586,7 +1590,7 @@ void SkXPSDevice::drawPath(const SkPath& platonicPath,
         SkMask rasteredMask;
         if (SkDraw::DrawToMask(
                         *pixelPath,
-                        &clipIRect,
+                        clipIRect,
                         filter,  //just to compute how much to draw.
                         &matrix,
                         &rasteredMask,
@@ -1730,7 +1734,7 @@ HRESULT SkXPSDevice::CreateTypefaceUse(const SkFont& font,
     SkTypeface* typeface = font.getTypefaceOrDefault();
 
     //Check cache.
-    const SkFontID typefaceID = typeface->uniqueID();
+    const SkTypefaceID typefaceID = typeface->uniqueID();
     for (TypefaceUse& current : *this->fTopTypefaces) {
         if (current.typefaceId == typefaceID) {
             *typefaceUse = &current;
@@ -1892,7 +1896,9 @@ static bool text_must_be_pathed(const SkPaint& paint, const SkMatrix& matrix) {
     ;
 }
 
-void SkXPSDevice::onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) {
+void SkXPSDevice::onDrawGlyphRunList(SkCanvas*,
+                                     const SkGlyphRunList& glyphRunList,
+                                     const SkPaint& paint) {
     SkASSERT(!glyphRunList.hasRSXForm());
 
     for (const auto& run : glyphRunList) {
diff --git a/third_party/skia/src/xps/SkXPSDevice.h b/third_party/skia/src/xps/SkXPSDevice.h
index 5d748692783ec..07049a91143ed 100644
--- a/third_party/skia/src/xps/SkXPSDevice.h
+++ b/third_party/skia/src/xps/SkXPSDevice.h
@@ -67,10 +67,10 @@ class SkXPSDevice : public SkClipStackDevice {
         const SkVector& unitsPerMeter,
         const SkVector& pixelsPerMeter,
         const SkSize& trimSize,
-        const SkRect* mediaBox = NULL,
-        const SkRect* bleedBox = NULL,
-        const SkRect* artBox = NULL,
-        const SkRect* cropBox = NULL);
+        const SkRect* mediaBox = nullptr,
+        const SkRect* bleedBox = nullptr,
+        const SkRect* artBox = nullptr,
+        const SkRect* cropBox = nullptr);
 
     bool endSheet();
     bool endPortfolio();
@@ -92,18 +92,19 @@ class SkXPSDevice : public SkClipStackDevice {
                        const SkRect* srcOrNull, const SkRect& dst,
                        const SkSamplingOptions&, const SkPaint& paint,
                        SkCanvas::SrcRectConstraint) override;
-    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override;
+    void onDrawGlyphRunList(SkCanvas*, const SkGlyphRunList&, const SkPaint&) override;
     void drawVertices(const SkVertices*, sk_sp<SkBlender>, const SkPaint&) override;
+    void drawCustomMesh(SkCustomMesh, sk_sp<SkBlender>, const SkPaint&) override;
     void drawDevice(SkBaseDevice*, const SkSamplingOptions&, const SkPaint&) override;
 
 private:
     class TypefaceUse {
     public:
-        TypefaceUse(SkFontID id, int index, std::unique_ptr<SkStream> data,
+        TypefaceUse(SkTypefaceID id, int index, std::unique_ptr<SkStream> data,
                     SkTScopedComPtr<IXpsOMFontResource> xps, size_t numGlyphs)
             : typefaceId(id), ttcIndex(index), fontData(std::move(data))
             , xpsFont(std::move(xps)), glyphsUsed(numGlyphs) {}
-        const SkFontID typefaceId;
+        const SkTypefaceID typefaceId;
         const int ttcIndex;
         const std::unique_ptr<SkStream> fontData;
         const SkTScopedComPtr<IXpsOMFontResource> xpsFont;
@@ -156,7 +157,7 @@ class SkXPSDevice : public SkClipStackDevice {
     HRESULT createXpsBrush(
         const SkPaint& skPaint,
         IXpsOMBrush** xpsBrush,
-        const SkMatrix* parentTransform = NULL);
+        const SkMatrix* parentTransform = nullptr);
 
     HRESULT createXpsSolidColorBrush(
         const SkColor skColor, const SkAlpha alpha,
diff --git a/third_party/skia/tests/AnimatedImageTest.cpp b/third_party/skia/tests/AnimatedImageTest.cpp
index 91c6606f182ab..707e0e754afef 100644
--- a/third_party/skia/tests/AnimatedImageTest.cpp
+++ b/third_party/skia/tests/AnimatedImageTest.cpp
@@ -76,7 +76,7 @@ DEF_TEST(AnimatedImage_rotation, r) {
 
             auto bounds = animatedImage->getBounds();
             if (bounds != expectedBounds) {
-                ERRORF(r, "Mismatched bounds for %", file);
+                ERRORF(r, "Mismatched bounds for %s", file);
                 bounds.dump();
             }
         }
diff --git a/third_party/skia/tests/BUILD.bazel b/third_party/skia/tests/BUILD.bazel
index 7bb01c64859bd..1c4add0709b08 100644
--- a/third_party/skia/tests/BUILD.bazel
+++ b/third_party/skia/tests/BUILD.bazel
@@ -1,17 +1,7033 @@
-package(default_visibility = ["//:__subpackages__"])
+load("//bazel:macros.bzl", "generated_cc_atom")
 
-filegroup(
-    name = "hdrs",
-    srcs = [
-        "Test.h",
-        "TestUtils.h",
+cc_library(
+    name = "tests",
+    testonly = True,
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_src",
+        ":TestUtils_src",
+
+        # These are the deps of the tests
+        ":CodecPriv_hdr",
+        "//src/codec:SkStreamBuffer_src",
+        "//src/lazy:SkDiscardableMemoryPool_src",
+        "//src/svg:SkSVGCanvas_src",
+        "//tools/fonts:TestEmptyTypeface_hdr",
+        "//tools/gpu/gl/command_buffer:GLTestContext_command_buffer_src",
+        "//tools/gpu/gl:GLTestContext_src",
+        "//tools/gpu:gpu_tool_utils",
+        "//tools:RuntimeBlendUtils_src",
+        "//tools:SkSharingProc_src",
+        "//tools:ToolUtils_src",
+        "//tools/debugger",
     ],
 )
 
+CORE_TESTS = [
+    "AAClipTest.cpp",
+    "AdvancedBlendTest.cpp",
+    "AndroidCodecTest.cpp",
+    "AnimatedImageTest.cpp",
+    "ApplyGammaTest.cpp",
+    "ArenaAllocTest.cpp",
+    "AsADashTest.cpp",
+    "BRDTest.cpp",
+    "BackendAllocationTest.cpp",
+    "BadIcoTest.cpp",
+    "BitSetTest.cpp",
+    "BitmapCopyTest.cpp",
+    "BitmapGetColorTest.cpp",
+    "BitmapTest.cpp",
+    "BlendTest.cpp",
+    "BlitMaskClip.cpp",
+    "BlurTest.cpp",
+    "CachedDataTest.cpp",
+    "CachedDecodingPixelRefTest.cpp",
+    "CanvasStateHelpers.cpp",
+    "CanvasStateHelpers.h",
+    "CanvasStateTest.cpp",
+    "CanvasTest.cpp",
+    "ChecksumTest.cpp",
+    "ClipCubicTest.cpp",
+    "ClipStackTest.cpp",
+    "ClipperTest.cpp",
+    "CodecAnimTest.cpp",
+    "CodecExactReadTest.cpp",
+    "CodecPartialTest.cpp",
+    "CodecRecommendedTypeTest.cpp",
+    "CodecTest.cpp",
+    "ColorFilterTest.cpp",
+    "ColorMatrixTest.cpp",
+    "ColorPrivTest.cpp",
+    "ColorSpaceTest.cpp",
+    "ColorTest.cpp",
+    "CompressedBackendAllocationTest.cpp",
+    "CopySurfaceTest.cpp",
+    "CubicMapTest.cpp",
+    "CullTestTest.cpp",
+    "CustomMeshTest.cpp",
+    "DashPathEffectTest.cpp",
+    "DataRefTest.cpp",
+    "DebugLayerManagerTest.cpp",
+    "DeferredDisplayListTest.cpp",
+    "DequeTest.cpp",
+    "DescriptorTest.cpp",
+    "DeviceTest.cpp",
+    "DiscardableMemoryPoolTest.cpp",
+    "DiscardableMemoryTest.cpp",
+    "DrawBitmapRectTest.cpp",
+    "DrawPathTest.cpp",
+    "DrawTextTest.cpp",
+    "EmptyPathTest.cpp",
+    "EncodeTest.cpp",
+    "EncodedInfoTest.cpp",
+    "ExifTest.cpp",
+    "ExtendedSkColorTypeTests.cpp",
+    "F16StagesTest.cpp",
+    "FakeStreams.h",
+    "FillPathTest.cpp",
+    "FindCubicConvex180ChopsTest.cpp",
+    "FitsInTest.cpp",
+    "FlattenDrawableTest.cpp",
+    "FlattenableFactoryToName.cpp",
+    "FlattenableNameToFactory.cpp",
+    "Float16Test.cpp",
+    "FloatingPointTextureTest.cpp",
+    "FontHostStreamTest.cpp",
+    "FontHostTest.cpp",
+    "FontMgrTest.cpp",
+    "FontNamesTest.cpp",
+    "FontTest.cpp",
+    "FrontBufferedStreamTest.cpp",
+    "GLBackendSurfaceTest.cpp",
+    "GeometryTest.cpp",
+    "GifTest.cpp",
+    "GlyphRunTest.cpp",
+    "GradientTest.cpp",
+    "HSVRoundTripTest.cpp",
+    "HashTest.cpp",
+    "HighContrastFilterTest.cpp",
+    "ICCTest.cpp",
+    "ImageBitmapTest.cpp",
+    "ImageCacheTest.cpp",
+    "ImageFilterCacheTest.cpp",
+    "ImageFilterTest.cpp",
+    "ImageFrom565Bitmap.cpp",
+    "ImageGeneratorTest.cpp",
+    "ImageIsOpaqueTest.cpp",
+    "ImageNewShaderTest.cpp",
+    "ImageTest.cpp",
+    "IncrTopoSortTest.cpp",
+    "IndexedPngOverflowTest.cpp",
+    "InfRectTest.cpp",
+    "InsetConvexPolyTest.cpp",
+    "InvalidIndexedPngTest.cpp",
+    "IsClosedSingleContourTest.cpp",
+    "JSONTest.cpp",
+    "LListTest.cpp",
+    "LRUCacheTest.cpp",
+    "LazyStencilAttachmentTest.cpp",
+    "M44Test.cpp",
+    "MD5Test.cpp",
+    "MallocPixelRefTest.cpp",
+    "MaskCacheTest.cpp",
+    "MathTest.cpp",
+    "MatrixClipCollapseTest.cpp",
+    "MatrixColorFilterTest.cpp",
+    "MatrixTest.cpp",
+    "MemoryTest.cpp",
+    "MemsetTest.cpp",
+    "MessageBusTest.cpp",
+    "MetaDataTest.cpp",
+    "MipMapTest.cpp",
+    "MultiPictureDocumentTest.cpp",
+    "NdkDecodeTest.cpp",
+    "NdkEncodeTest.cpp",
+    "NonlinearBlendingTest.cpp",
+    "OSPathTest.cpp",
+    "OffsetSimplePolyTest.cpp",
+    "OnceTest.cpp",
+    "OverAlignedTest.cpp",
+    "PaintTest.cpp",
+    "ParametricStageTest.cpp",
+    "ParseColorTest.cpp",
+    "ParsePathTest.cpp",
+    "PathBuilderTest.cpp",
+    "PathCoverageTest.cpp",
+    "PathMeasureTest.cpp",
+    "PathOpsAngleIdeas.cpp",
+    "PathOpsAngleTest.cpp",
+    "PathOpsAsWindingTest.cpp",
+    "PathOpsBattles.cpp",
+    "PathOpsBoundsTest.cpp",
+    "PathOpsBuildUseTest.cpp",
+    "PathOpsBuilderConicTest.cpp",
+    "PathOpsBuilderTest.cpp",
+    "PathOpsChalkboardTest.cpp",
+    "PathOpsConicIntersectionTest.cpp",
+    "PathOpsConicLineIntersectionTest.cpp",
+    "PathOpsConicQuadIntersectionTest.cpp",
+    "PathOpsCubicConicIntersectionTest.cpp",
+    "PathOpsCubicIntersectionTest.cpp",
+    "PathOpsCubicIntersectionTestData.cpp",
+    "PathOpsCubicIntersectionTestData.h",
+    "PathOpsCubicLineIntersectionIdeas.cpp",
+    "PathOpsCubicLineIntersectionTest.cpp",
+    "PathOpsCubicQuadIntersectionTest.cpp",
+    "PathOpsCubicReduceOrderTest.cpp",
+    "PathOpsDCubicTest.cpp",
+    "PathOpsDLineTest.cpp",
+    "PathOpsDPointTest.cpp",
+    "PathOpsDRectTest.cpp",
+    "PathOpsDVectorTest.cpp",
+    "PathOpsDebug.cpp",
+    "PathOpsDebug.h",
+    "PathOpsExtendedTest.cpp",
+    "PathOpsExtendedTest.h",
+    "PathOpsFuzz763Test.cpp",
+    "PathOpsInverseTest.cpp",
+    "PathOpsIssue3651.cpp",
+    "PathOpsLineIntersectionTest.cpp",
+    "PathOpsLineParametetersTest.cpp",
+    "PathOpsOpCircleThreadedTest.cpp",
+    "PathOpsOpCubicThreadedTest.cpp",
+    "PathOpsOpLoopThreadedTest.cpp",
+    "PathOpsOpRectThreadedTest.cpp",
+    "PathOpsOpTest.cpp",
+    "PathOpsQuadIntersectionTest.cpp",
+    "PathOpsQuadIntersectionTestData.cpp",
+    "PathOpsQuadIntersectionTestData.h",
+    "PathOpsQuadLineIntersectionTest.cpp",
+    "PathOpsQuadLineIntersectionThreadedTest.cpp",
+    "PathOpsQuadReduceOrderTest.cpp",
+    "PathOpsSimplifyDegenerateThreadedTest.cpp",
+    "PathOpsSimplifyFailTest.cpp",
+    "PathOpsSimplifyQuadThreadedTest.cpp",
+    "PathOpsSimplifyQuadralateralsThreadedTest.cpp",
+    "PathOpsSimplifyRectThreadedTest.cpp",
+    "PathOpsSimplifyTest.cpp",
+    "PathOpsSimplifyTrianglesThreadedTest.cpp",
+    "PathOpsSkpTest.cpp",
+    "PathOpsTSectDebug.h",
+    "PathOpsTestCommon.cpp",
+    "PathOpsTestCommon.h",
+    "PathOpsThreadedCommon.cpp",
+    "PathOpsThreadedCommon.h",
+    "PathOpsThreeWayTest.cpp",
+    "PathOpsTigerTest.cpp",
+    "PathOpsTightBoundsTest.cpp",
+    "PathOpsTypesTest.cpp",
+    "PathTest.cpp",
+    "PictureBBHTest.cpp",
+    "PictureShaderTest.cpp",
+    "PictureTest.cpp",
+    "PinnedImageTest.cpp",
+    "PixelRefTest.cpp",
+    "Point3Test.cpp",
+    "PointTest.cpp",
+    "PolyUtilsTest.cpp",
+    "PreChopPathCurvesTest.cpp",
+    "PremulAlphaRoundTripTest.cpp",
+    "PromiseImageTest.cpp",
+    "ProxyConversionTest.cpp",
+    "ProxyRefTest.cpp",
+    "ProxyTest.cpp",
+    "QuickRejectTest.cpp",
+    "RRectInPathTest.cpp",
+    "RTreeTest.cpp",
+    "RandomTest.cpp",
+    "ReadPixelsTest.cpp",
+    "RecordDrawTest.cpp",
+    "RecordOptsTest.cpp",
+    "RecordPatternTest.cpp",
+    "RecordTest.cpp",
+    "RecordTestUtils.h",
+    "RecorderTest.cpp",
+    "RecordingXfermodeTest.cpp",
+    "RectTest.cpp",
+    "RefCntTest.cpp",
+    "RegionTest.cpp",
+    "RepeatedClippedBlurTest.cpp",
+    "ResourceAllocatorTest.cpp",
+    "ResourceCacheTest.cpp",
+    "RoundRectTest.cpp",
+    "RuntimeBlendTest.cpp",
+    "SRGBReadWritePixelsTest.cpp",
+    "SRGBTest.cpp",
+    "SVGDeviceTest.cpp",
+    "SafeMathTest.cpp",
+    "SamplingTest.cpp",
+    "ScalarTest.cpp",
+    "ScaleToSidesTest.cpp",
+    "SerialProcsTest.cpp",
+    "SerializationTest.cpp",
+    "ShaderImageFilterTest.cpp",
+    "ShaderOpacityTest.cpp",
+    "ShaderTest.cpp",
+    "ShadowTest.cpp",
+    "ShaperTest.cpp",
+    "SizeTest.cpp",
+    "SkBase64Test.cpp",
+    "SkBlockAllocatorTest.cpp",
+    "SkColor4fTest.cpp",
+    "SkColorSpaceXformStepsTest.cpp",
+    "SkDOMTest.cpp",
+    "SkDSLRuntimeEffectTest.cpp",
+    "SkGaussFilterTest.cpp",
+    "SkGlyphBufferTest.cpp",
+    "SkGlyphTest.cpp",
+    "SkImageTest.cpp",
+    "SkNxTest.cpp",
+    "SkPathRangeIterTest.cpp",
+    "SkRasterPipelineTest.cpp",
+    "SkRemoteGlyphCacheTest.cpp",
+    "SkResourceCacheTest.cpp",
+    "SkRuntimeEffectTest.cpp",
+    "SkScalerCacheTest.cpp",
+    "SkShaperJSONWriterTest.cpp",
+    "SkSharedMutexTest.cpp",
+    "SkStrikeCacheTest.cpp",
+    "SkStringViewTest.cpp",
+    "SkTBlockListTest.cpp",
+    "SkUTFTest.cpp",
+    "SkVMDebugTracePlayerTest.cpp",
+    "SkVMDebugTraceTest.cpp",
+    "SkVMTest.cpp",
+    "SkVxTest.cpp",
+    "Skbug12214.cpp",
+    "Skbug5221.cpp",
+    "Skbug6389.cpp",
+    "Skbug6653.cpp",
+    "SortTest.cpp",
+    "SpecialImageTest.cpp",
+    "SpecialSurfaceTest.cpp",
+    "SrcOverTest.cpp",
+    "SrcSrcOverBatchTest.cpp",
+    "StreamBufferTest.cpp",
+    "StreamTest.cpp",
+    "StringTest.cpp",
+    "StrokeTest.cpp",
+    "StrokerTest.cpp",
+    "SubsetPath.cpp",
+    "SubsetPath.h",
+    "SurfaceSemaphoreTest.cpp",
+    "SurfaceTest.cpp",
+    "SwizzlerTest.cpp",
+    "TArrayTest.cpp",
+    "TDPQueueTest.cpp",
+    "TLazyTest.cpp",
+    "TemplatesTest.cpp",
+    "TestTest.cpp",
+    "TextBlobCacheTest.cpp",
+    "TextBlobTest.cpp",
+    "TextureProxyTest.cpp",
+    "TextureStripAtlasManagerTest.cpp",
+    "Time.cpp",
+    "TopoSortTest.cpp",
+    "TraceMemoryDumpTest.cpp",
+    "TracingTest.cpp",
+    "TransferPixelsTest.cpp",
+    "TriangulatingPathRendererTests.cpp",
+    "TypefaceTest.cpp",
+    "UnicodeTest.cpp",
+    "UtilsTest.cpp",
+    "VerticesTest.cpp",
+    "WangsFormulaTest.cpp",
+    "WebpTest.cpp",
+    "WindowRectanglesTest.cpp",
+    "WrappedSurfaceCopyOnWriteTest.cpp",
+    "WritePixelsTest.cpp",
+    "Writer32Test.cpp",
+    "YUVCacheTest.cpp",
+    "YUVTest.cpp",
+]
+
+GPU_TESTS = [
+    "GpuDrawPathTest.cpp",
+    "GpuRectanizerTest.cpp",
+    "GrAHardwareBufferTest.cpp",
+    "GrContextAbandonTest.cpp",
+    "GrContextFactoryTest.cpp",
+    "GrContextOOM.cpp",
+    "GrDDLImageTest.cpp",
+    "GrFinishedFlushTest.cpp",
+    "GrMemoryPoolTest.cpp",
+    "GrOpListFlushTest.cpp",
+    "GrPorterDuffTest.cpp",
+    "GrQuadBufferTest.cpp",
+    "GrQuadCropTest.cpp",
+    "GrRenderTaskClusterTest.cpp",
+    "GrSlugTest.cpp",
+    "GrStyledShapeTest.cpp",
+    "GrSubmittedFlushTest.cpp",
+    "GrSurfaceResolveTest.cpp",
+    "GrSurfaceTest.cpp",
+    "GrTextBlobTest.cpp",
+    "GrTextureMipMapInvalidationTest.cpp",
+    "GrVxTest.cpp",
+    "ReadWritePixelsGpuTest.cpp",
+    "SkSLDSLErrorLineNumbers.cpp",
+    "SkSLDSLOnlyTest.cpp",
+    "SkSLDSLTest.cpp",
+    "SkSLES2ConformanceTest.cpp",
+    "SkSLGLSLTestbed.cpp",
+    "SkSLInterpreterTest.cpp",
+    "SkSLMemoryLayoutTest.cpp",
+    "SkSLMetalTestbed.cpp",
+    "SkSLSPIRVTestbed.cpp",
+    "SkSLTest.cpp",
+    "SkSLTypeTest.cpp",
+]
+
+V1_GPU_TESTS = [
+    "BulkRectTest.cpp",
+    "ClearTest.cpp",
+    "DMSAATest.cpp",
+    "DefaultPathRendererTest.cpp",
+    "DrawOpAtlasTest.cpp",
+    "GrClipStackTest.cpp",
+    "GrMeshTest.cpp",
+    "GrMipMappedTest.cpp",
+    "GrPipelineDynamicStateTest.cpp",
+    "GrThreadSafeCacheTest.cpp",
+    "LazyProxyTest.cpp",
+    "OpChainTest.cpp",
+    "PathRendererCacheTests.cpp",
+    "PrimitiveProcessorTest.cpp",
+    "ProcessorTest.cpp",
+    "ProgramsTest.cpp",
+    "SkSLCross.cpp",
+    "SurfaceDrawContextTest.cpp",
+    "TextureOpTest.cpp",
+]
+
+GL_TESTS = [
+    "EGLImageTest.cpp",
+    "GrGLExtensionsTest.cpp",
+    "RectangleTextureTest.cpp",
+    "TextureBindingsResetTest.cpp",
+]
+
+PDF_TESTS = [
+    "AnnotationTest.cpp",
+    "PDFDeflateWStreamTest.cpp",
+    "PDFDocumentTest.cpp",
+    "PDFGlyphsToUnicodeTest.cpp",
+    "PDFJpegEmbedTest.cpp",
+    "PDFMetadataAttributeTest.cpp",
+    "PDFOpaqueSrcModeToSrcOverTest.cpp",
+    "PDFPrimitivesTest.cpp",
+    "PDFTaggedLinkTest.cpp",
+    "PDFTaggedPruningTest.cpp",
+    "PDFTaggedTableTest.cpp",
+    "PDFTaggedTest.cpp",
+]
+
+VK_TESTS = [
+    "BackendSurfaceMutableStateTest.cpp",
+    "VkBackendSurfaceTest.cpp",
+    "VkDrawableTest.cpp",
+    "VkHardwareBufferTest.cpp",
+    "VkPriorityExtensionTest.cpp",
+    "VkProtectedContextTest.cpp",
+    "VkWrapTests.cpp",
+    "VkYcbcrSamplerTest.cpp",
+]
+
+MAC_TESTS = [
+    "TypefaceMacTest.cpp",
+]
+
+FONTCONFIG_TESTS = [
+    "FontMgrFontConfigTest.cpp",
+]
+
+ANDROID_TESTS = [
+    "FontMgrAndroidParserTest.cpp",
+]
+
+C_API_TESTS = [
+    "CTest.cpp",
+]
+
+# In order for the registry to work, all the gms must be compiled as one large blob.
 filegroup(
-    name = "srcs",
-    srcs = [
-        "Test.cpp",
-        "TestUtils.cpp",
+    name = "test_list",
+    testonly = True,
+    srcs = CORE_TESTS + GPU_TESTS + V1_GPU_TESTS + GL_TESTS,  # TODO(kjlubick) make this selectable
+    visibility = ["//:__subpackages__"],
+)
+
+generated_cc_atom(
+    name = "AAClipTest_src",
+    srcs = ["AAClipTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAAClip_hdr",
+        "//src/core:SkMask_hdr",
+        "//src/core:SkRasterClip_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "AdvancedBlendTest_src",
+    srcs = ["AdvancedBlendTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/gpu:GrBlend_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:GrProcessorAnalysis_hdr",
+        "//src/gpu:GrProcessorSet_hdr",
+        "//src/gpu:GrUserStencilSettings_hdr",
+        "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu/effects:GrCustomXfermode_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "AndroidCodecTest_src",
+    srcs = ["AndroidCodecTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//src/codec:SkCodecImageGenerator_hdr",
+        "//src/core:SkPixmapPriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "AnimatedImageTest_src",
+    srcs = ["AnimatedImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":Test_hdr",
+        "//include/android:SkAnimatedImage_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkUnPreMultiply_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "AnnotationTest_src",
+    srcs = ["AnnotationTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkAnnotation_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkDocument_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+        "//include/svg:SkSVGCanvas_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ApplyGammaTest_src",
+    srcs = ["ApplyGammaTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ArenaAllocTest_src",
+    srcs = ["ArenaAllocTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "AsADashTest_src",
+    srcs = ["AsADashTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/effects:SkCornerPathEffect_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BRDTest_src",
+    srcs = ["BRDTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//client_utils/android:BitmapRegionDecoder_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BackendAllocationTest_src",
+    srcs = ["BackendAllocationTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurfaceCharacterization_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/mtl:GrMtlTypes_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrBlendFragmentProcessor_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/gl:GrGLCaps_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//src/gpu/mtl:GrMtlCppUtil_hdr",
+        "//src/gpu/vk:GrVkCaps_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BackendSurfaceMutableStateTest_src",
+    srcs = ["BackendSurfaceMutableStateTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkTypes_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/vk:GrVkGpu_hdr",
+        "//src/gpu/vk:GrVkTexture_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BadIcoTest_src",
+    srcs = ["BadIcoTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BitSetTest_src",
+    srcs = ["BitSetTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/utils:SkBitSet_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BitmapCopyTest_src",
+    srcs = ["BitmapCopyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/core:SkUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BitmapGetColorTest_src",
+    srcs = ["BitmapGetColorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BitmapTest_src",
+    srcs = ["BitmapTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMallocPixelRef_hdr",
+        "//include/core:SkPixelRef_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkFloatingPoint_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BlendTest_src",
+    srcs = ["BlendTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BlitMaskClip_src",
+    srcs = ["BlitMaskClip.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkBlitter_hdr",
+        "//src/core:SkMask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BlurTest_src",
+    srcs = ["BlurTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkBlurTypes_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkMath_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//include/private:SkTPin_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//src/core:SkGpuBlurUtils_hdr",
+        "//src/core:SkMaskFilterBase_hdr",
+        "//src/core:SkMask_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/effects:SkEmbossMaskFilter_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "BulkRectTest_src",
+    srcs = ["BulkRectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkBlendModePriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrOpsTypes_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu/ops:FillRectOp_hdr",
+        "//src/gpu/ops:TextureOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CTest_src",
+    srcs = ["CTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/c:sk_canvas_hdr",
+        "//include/c:sk_imageinfo_hdr",
+        "//include/c:sk_paint_hdr",
+        "//include/c:sk_shader_hdr",
+        "//include/c:sk_surface_hdr",
+        "//include/c:sk_types_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CachedDataTest_src",
+    srcs = ["CachedDataTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//src/core:SkCachedData_hdr",
+        "//src/lazy:SkDiscardableMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CachedDecodingPixelRefTest_src",
+    srcs = ["CachedDecodingPixelRefTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkOpts_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CanvasStateHelpers_hdr",
+    hdrs = ["CanvasStateHelpers.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//include/core:SkTypes_hdr"],
+)
+
+generated_cc_atom(
+    name = "CanvasStateHelpers_src",
+    srcs = ["CanvasStateHelpers.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CanvasStateHelpers_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkCanvasStateUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CanvasStateTest_src",
+    srcs = ["CanvasStateTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CanvasStateHelpers_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/utils:SkCanvasStateUtils_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/ports:SkOSLibrary_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CanvasTest_src",
+    srcs = ["CanvasTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkDocument_hdr",
+        "//include/core:SkFlattenable_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/utils:SkNWayCanvas_hdr",
+        "//include/utils:SkPaintFilterCanvas_hdr",
+        "//src/core:SkBigPicture_hdr",
+        "//src/core:SkImageFilter_Base_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/utils:SkCanvasStack_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ChecksumTest_src",
+    srcs = ["ChecksumTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkChecksum_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ClearTest_src",
+    srcs = ["ClearTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/gpu:GrColor_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu/ops:ClearOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ClipCubicTest_src",
+    srcs = ["ClipCubicTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkFloatBits_hdr",
+        "//src/core:SkCubicClipper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ClipStackTest_src",
+    srcs = ["ClipStackTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkClipStack_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ClipperTest_src",
+    srcs = ["ClipperTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkEdgeClipper_hdr",
+        "//src/core:SkLineClipper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecAnimTest_src",
+    srcs = ["CodecAnimTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":Test_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodecAnimation_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkAnimCodecPlayer_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecExactReadTest_src",
+    srcs = ["CodecExactReadTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecPartialTest_src",
+    srcs = ["CodecPartialTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":FakeStreams_hdr",
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecPriv_hdr",
+    hdrs = ["CodecPriv.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecRecommendedTypeTest_src",
+    srcs = ["CodecRecommendedTypeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkStream_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CodecTest_src",
+    srcs = ["CodecTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":FakeStreams_hdr",
+        ":Test_hdr",
+        "//client_utils/android:FrontBufferedStream_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkPngChunkReader_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkUnPreMultiply_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/encode:SkWebpEncoder_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/codec:SkCodecImageGenerator_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//src/core:SkMD5_hdr",
+        "//src/core:SkStreamPriv_hdr",
+        "//third_party:libpng",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ColorFilterTest_src",
+    srcs = ["ColorFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBlendMode_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkColorFilterPriv_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ColorMatrixTest_src",
+    srcs = ["ColorMatrixTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ColorPrivTest_src",
+    srcs = ["ColorPrivTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkColorData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ColorSpaceTest_src",
+    srcs = ["ColorSpaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//third_party:libpng",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ColorTest_src",
+    srcs = ["ColorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/core:SkUnPreMultiply_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CompressedBackendAllocationTest_src",
+    srcs = ["CompressedBackendAllocationTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkCompressedDataUtils_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//src/core:SkPaintPriv_hdr",
+        "//src/gpu:GrBackendUtils_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CopySurfaceTest_src",
+    srcs = ["CopySurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CubicMapTest_src",
+    srcs = ["CubicMapTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCubicMap_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkNx_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CullTestTest_src",
+    srcs = ["CullTestTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu/tessellate:CullTest_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CustomMeshTest_src",
+    srcs = ["CustomMeshTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkCustomMesh_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DMSAATest_src",
+    srcs = ["DMSAATest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkVertices_hdr",
+        "//src/core:SkBlendModePriv_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/core:SkSurfacePriv_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DashPathEffectTest_src",
+    srcs = ["DashPathEffectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//src/core:SkPathEffectBase_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DataRefTest_src",
+    srcs = ["DataRefTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkDataTable_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkTaskGroup_hdr",
+        "//src/utils:SkOSPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DebugLayerManagerTest_src",
+    srcs = ["DebugLayerManagerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRect_hdr",
+        "//tools/debugger:DebugLayerManager_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DefaultPathRendererTest_src",
+    srcs = ["DefaultPathRendererTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrPaint_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DeferredDisplayListTest_src",
+    srcs = ["DeferredDisplayListTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkDeferredDisplayListRecorder_hdr",
+        "//include/core:SkDeferredDisplayList_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPromiseImageTexture_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSurfaceCharacterization_hdr",
+        "//include/core:SkSurfaceProps_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrContextThreadSafeProxy_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//include/gpu/gl:GrGLTypes_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkDeferredDisplayListPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrRenderTargetProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/vk:GrVkCaps_hdr",
+        "//src/gpu/vk:GrVkSecondaryCBDrawContext_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//src/image:SkSurface_Gpu_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DequeTest_src",
+    srcs = ["DequeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkDeque_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DescriptorTest_src",
+    srcs = ["DescriptorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
+        "//src/core:SkDescriptor_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkScalerContext_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DeviceTest_src",
+    srcs = ["DeviceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//src/core:SkDevice_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DiscardableMemoryPoolTest_src",
+    srcs = ["DiscardableMemoryPoolTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/core:SkDiscardableMemory_hdr",
+        "//src/lazy:SkDiscardableMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DiscardableMemoryTest_src",
+    srcs = ["DiscardableMemoryTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/core:SkDiscardableMemory_hdr",
+        "//src/lazy:SkDiscardableMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawBitmapRectTest_src",
+    srcs = ["DrawBitmapRectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkTileMode_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMatrixUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawOpAtlasTest_src",
+    srcs = ["DrawOpAtlasTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:GrTypesPriv_hdr",
+        "//src/core:SkIPoint16_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDeferredUpload_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawOpAtlas_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOnFlushResourceProvider_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu/ops:AtlasTextOp_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/text:GrAtlasManager_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawPathTest_src",
+    srcs = ["DrawPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "DrawTextTest_src",
+    srcs = ["DrawTextTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPathEffect_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "EGLImageTest_src",
+    srcs = ["EGLImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/gpu:GrTextureProxyPriv_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu/gl:GLTestContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "EmptyPathTest_src",
+    srcs = ["EmptyPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "EncodeTest_src",
+    srcs = ["EncodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/encode:SkJpegEncoder_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/encode:SkWebpEncoder_hdr",
+        "//include/private:SkImageInfoPriv_hdr",
+        "//third_party:libpng",
+        "//third_party:libwebp",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "EncodedInfoTest_src",
+    srcs = ["EncodedInfoTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkEncodedImageFormat_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ExifTest_src",
+    srcs = ["ExifTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ExtendedSkColorTypeTests_src",
+    srcs = ["ExtendedSkColorTypeTests.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/gpu:GrPixmap_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "F16StagesTest_src",
+    srcs = ["F16StagesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkRasterPipeline_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FakeStreams_hdr",
+    hdrs = ["FakeStreams.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FillPathTest_src",
+    srcs = ["FillPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRegion_hdr",
+        "//src/core:SkBlitter_hdr",
+        "//src/core:SkScan_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FindCubicConvex180ChopsTest_src",
+    srcs = ["FindCubicConvex180ChopsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/gpu/tessellate:Tessellation_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FitsInTest_src",
+    srcs = ["FitsInTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTFitsIn_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FlattenDrawableTest_src",
+    srcs = ["FlattenDrawableTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkDrawable_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/core:SkPathEffectBase_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FlattenableFactoryToName_src",
+    srcs = ["FlattenableFactoryToName.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/effects:SkImageFilters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FlattenableNameToFactory_src",
+    srcs = ["FlattenableNameToFactory.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFlattenable_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Float16Test_src",
+    srcs = ["Float16Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/private:SkHalf_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FloatingPointTextureTest_src",
+    srcs = ["FloatingPointTextureTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkHalf_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontHostStreamTest_src",
+    srcs = ["FontHostStreamTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkFontDescriptor_hdr",
+        "//src/core:SkFontPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontHostTest_src",
+    srcs = ["FontHostTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkEndian_hdr",
+        "//src/core:SkFontStream_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontMgrAndroidParserTest_src",
+    srcs = ["FontMgrAndroidParserTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/ports:SkFontMgr_android_hdr",
+        "//include/private:SkFixed_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/ports:SkFontMgr_android_parser_hdr",
+        "//tools:Resources_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontMgrFontConfigTest_src",
+    srcs = ["FontMgrFontConfigTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/ports:SkFontMgr_FontConfigInterface_hdr",
+        "//include/ports:SkFontMgr_fontconfig_hdr",
+        "//src/ports:SkFontConfigInterface_direct_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontMgrTest_src",
+    srcs = ["FontMgrTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkAdvancedTypefaceMetrics_hdr",
+        "//src/core:SkScalerContext_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontNamesTest_src",
+    srcs = ["FontNamesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/sfnt:SkOTTable_name_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FontTest_src",
+    srcs = ["FontTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/utils:SkCustomTypeface_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//src/core:SkPtrRecorder_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "FrontBufferedStreamTest_src",
+    srcs = ["FrontBufferedStreamTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//client_utils/android:FrontBufferedStream_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GLBackendSurfaceTest_src",
+    srcs = ["GLBackendSurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/gl:GrGLTypes_hdr",
+        "//include/private:GrGLTypesPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/gl:GrGLCaps_hdr",
+        "//src/gpu/gl:GrGLTexture_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GeometryTest_src",
+    srcs = ["GeometryTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/core:SkPointPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GifTest_src",
+    srcs = ["GifTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":Test_hdr",
+        "//include/codec:SkAndroidCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GlyphRunTest_src",
+    srcs = ["GlyphRunTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//src/core:SkGlyphRun_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GpuDrawPathTest_src",
+    srcs = ["GpuDrawPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu/geometry:GrStyledShape_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GpuRectanizerTest_src",
+    srcs = ["GpuRectanizerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu:GrRectanizerPow2_hdr",
+        "//src/gpu:GrRectanizerSkyline_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrAHardwareBufferTest_src",
+    srcs = ["GrAHardwareBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrAHardwareBufferImageGenerator_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrClipStackTest_src",
+    srcs = ["GrClipStackTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/core:SkRRectPriv_hdr",
+        "//src/core:SkRectPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:ClipStack_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrContextAbandonTest_src",
+    srcs = ["GrContextAbandonTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrContextFactoryTest_src",
+    srcs = ["GrContextFactoryTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkExecutor_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrContextOOM_src",
+    srcs = ["GrContextOOM.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrDDLImageTest_src",
+    srcs = ["GrDDLImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurfaceCharacterization_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrFinishedFlushTest_src",
+    srcs = ["GrFinishedFlushTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrGLExtensionsTest_src",
+    srcs = ["GrGLExtensionsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu/gl:GrGLExtensions_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrMemoryPoolTest_src",
+    srcs = ["GrMemoryPoolTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrMeshTest_src",
+    srcs = ["GrMeshTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu:ResourceKey_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrMipMappedTest_src",
+    srcs = ["GrMipMappedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/d3d:GrD3DTypes_hdr",
+        "//src/gpu:BaseDevice_hdr",
+        "//src/gpu:GrBackendTextureImageGenerator_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrSemaphore_hdr",
+        "//src/gpu:GrSurfaceProxyPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkSurface_Gpu_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:BackendTextureImageFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrOpListFlushTest_src",
+    srcs = ["GrOpListFlushTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrPipelineDynamicStateTest_src",
+    srcs = ["GrPipelineDynamicStateTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/gpu:GrColor_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrOpsRenderPass_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrPorterDuffTest_src",
+    srcs = ["GrPorterDuffTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrContextOptions_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrQuadBufferTest_src",
+    srcs = ["GrQuadBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/gpu/geometry:GrQuadBuffer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrQuadCropTest_src",
+    srcs = ["GrQuadCropTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkScalar_hdr",
+        "//src/gpu/geometry:GrQuadUtils_hdr",
+        "//src/gpu/geometry:GrQuad_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrRenderTaskClusterTest_src",
+    srcs = ["GrRenderTaskClusterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/gpu:GrRenderTaskCluster_hdr",
+        "//src/gpu/mock:GrMockRenderTask_hdr",
+        "//src/gpu/mock:GrMockSurfaceProxy_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrSlugTest_src",
+    srcs = ["GrSlugTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/private/chromium:GrSlug_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrStyledShapeTest_src",
+    srcs = ["GrStyledShapeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//src/core:SkPathEffectBase_hdr",
+        "//src/core:SkRectPriv_hdr",
+        "//src/gpu/geometry:GrStyledShape_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrSubmittedFlushTest_src",
+    srcs = ["GrSubmittedFlushTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrSurfaceResolveTest_src",
+    srcs = ["GrSurfaceResolveTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrPixmap_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrSurfaceTest_src",
+    srcs = ["GrSurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkCompressedDataUtils_hdr",
+        "//src/gpu:GrBackendUtils_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+        "//tools/gpu:BackendTextureImageFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrTextBlobTest_src",
+    srcs = ["GrTextBlobTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//src/core:SkSurfacePriv_hdr",
+        "//src/gpu/text:GrTextBlob_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrTextureMipMapInvalidationTest_src",
+    srcs = ["GrTextureMipMapInvalidationTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrThreadSafeCacheTest_src",
+    srcs = ["GrThreadSafeCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkDeferredDisplayListRecorder_hdr",
+        "//include/core:SkSurfaceCharacterization_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkMessageBus_hdr",
+        "//src/gpu:GrDefaultGeoProcFactory_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu:GrThreadSafeCache_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrVxTest_src",
+    srcs = ["GrVxTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/gpu:GrVx_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GradientTest_src",
+    srcs = ["GradientTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkMatrixProvider_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/gpu:GrColorInfo_hdr",
+        "//src/shaders:SkColorShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "HSVRoundTripTest_src",
+    srcs = ["HSVRoundTripTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "HashTest_src",
+    srcs = ["HashTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkChecksum_hdr",
+        "//include/private:SkTHash_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "HighContrastFilterTest_src",
+    srcs = ["HighContrastFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/effects:SkHighContrastFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ICCTest_src",
+    srcs = ["ICCTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkICC_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageBitmapTest_src",
+    srcs = ["ImageBitmapTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageCacheTest_src",
+    srcs = ["ImageCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkDiscardableMemory_hdr",
+        "//src/core:SkResourceCache_hdr",
+        "//src/lazy:SkDiscardableMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageFilterCacheTest_src",
+    srcs = ["ImageFilterCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkImageFilter_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkImageFilterCache_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxyPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageFilterTest_src",
+    srcs = ["ImageFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkColorMatrixFilter_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkColorFilterBase_hdr",
+        "//src/core:SkImageFilter_Base_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/core:SkSpecialSurface_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageFrom565Bitmap_src",
+    srcs = ["ImageFrom565Bitmap.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkImage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageGeneratorTest_src",
+    srcs = ["ImageGeneratorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/ports:SkImageGeneratorCG_hdr",
+        "//include/ports:SkImageGeneratorWIC_hdr",
+        "//include/private:SkImageInfoPriv_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageIsOpaqueTest_src",
+    srcs = ["ImageIsOpaqueTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageNewShaderTest_src",
+    srcs = ["ImageNewShaderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ImageTest_src",
+    srcs = ["ImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkSerialProcs_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrContextThreadSafeProxy_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkBitmapCache_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//src/core:SkImagePriv_hdr",
+        "//src/core:SkOpts_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrImageContextPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceCache_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuYUVA_hdr",
+        "//src/shaders:SkImageShader_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IncrTopoSortTest_src",
+    srcs = ["IncrTopoSortTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//src/core:SkTSort_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IndexedPngOverflowTest_src",
+    srcs = ["IndexedPngOverflowTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkSurface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "InfRectTest_src",
+    srcs = ["InfRectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/private:SkFloatingPoint_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "InsetConvexPolyTest_src",
+    srcs = ["InsetConvexPolyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/utils:SkPolyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "InvalidIndexedPngTest_src",
+    srcs = ["InvalidIndexedPngTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":CodecPriv_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IsClosedSingleContourTest_src",
+    srcs = ["IsClosedSingleContourTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "JSONTest_src",
+    srcs = ["JSONTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LListTest_src",
+    srcs = ["LListTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkTInternalLList_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LRUCacheTest_src",
+    srcs = ["LRUCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkLRUCache_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LazyProxyTest_src",
+    srcs = ["LazyProxyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu/mock:GrMockTypes_hdr",
+        "//src/core:SkRectPriv_hdr",
+        "//src/gpu:GrClip_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOnFlushResourceProvider_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxyPriv_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxyPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/mock:GrMockGpu_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "LazyStencilAttachmentTest_src",
+    srcs = ["LazyStencilAttachmentTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "M44Test_src",
+    srcs = ["M44Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkM44_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMatrixPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MD5Test_src",
+    srcs = ["MD5Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkMD5_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MallocPixelRefTest_src",
+    srcs = ["MallocPixelRefTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkMallocPixelRef_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkPixelRefPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MaskCacheTest_src",
+    srcs = ["MaskCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkCachedData_hdr",
+        "//src/core:SkMaskCache_hdr",
+        "//src/core:SkResourceCache_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MathTest_src",
+    srcs = ["MathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/private:SkFixed_hdr",
+        "//include/private:SkHalf_hdr",
+        "//include/private:SkTPin_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkEndian_hdr",
+        "//src/core:SkFDot6_hdr",
+        "//src/core:SkMathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MatrixClipCollapseTest_src",
+    srcs = ["MatrixClipCollapseTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPicture_hdr",
+        "//src/core:SkPictureFlat_hdr",
+        "//src/core:SkPictureRecord_hdr",
+        "//tools/debugger:DebugCanvas_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MatrixColorFilterTest_src",
+    srcs = ["MatrixColorFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MatrixTest_src",
+    srcs = ["MatrixTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkMath_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMatrixPriv_hdr",
+        "//src/core:SkMatrixUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MemoryTest_src",
+    srcs = ["MemoryTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":Test_hdr"],
+)
+
+generated_cc_atom(
+    name = "MemsetTest_src",
+    srcs = ["MemsetTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MessageBusTest_src",
+    srcs = ["MessageBusTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkMessageBus_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MetaDataTest_src",
+    srcs = ["MetaDataTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//tools:SkMetaData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MipMapTest_src",
+    srcs = ["MipMapTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkMipmapBuilder_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MultiPictureDocumentTest_src",
+    srcs = ["MultiPictureDocumentTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/core:SkDocument_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrAHardwareBufferUtils_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/utils:SkMultiPictureDocument_hdr",
+        "//tools:SkSharingProc_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "NdkDecodeTest_src",
+    srcs = ["NdkDecodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/ports:SkImageGeneratorNDK_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "NdkEncodeTest_src",
+    srcs = ["NdkEncodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkMalloc_hdr",
+        "//src/images:SkImageEncoderPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "NonlinearBlendingTest_src",
+    srcs = ["NonlinearBlendingTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//include/third_party/skcms:skcms_hdr",
+        "//src/core:SkColorSpaceXformSteps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OSPathTest_src",
+    srcs = ["OSPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkString_hdr",
+        "//src/utils:SkOSPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OffsetSimplePolyTest_src",
+    srcs = ["OffsetSimplePolyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/utils:SkPolyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OnceTest_src",
+    srcs = ["OnceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkOnce_hdr",
+        "//src/core:SkTaskGroup_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OpChainTest_src",
+    srcs = ["OpChainTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/ops:GrOp_hdr",
+        "//src/gpu/ops:OpsTask_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "OverAlignedTest_src",
+    srcs = ["OverAlignedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFDeflateWStreamTest_src",
+    srcs = ["PDFDeflateWStreamTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/pdf:SkDeflate_hdr",
+        "//third_party:zlib",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFDocumentTest_src",
+    srcs = ["PDFDocumentTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkExecutor_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFGlyphsToUnicodeTest_src",
+    srcs = ["PDFGlyphsToUnicodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/pdf:SkPDFMakeToUnicodeCmap_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFJpegEmbedTest_src",
+    srcs = ["PDFJpegEmbedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageGenerator_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+        "//src/pdf:SkJpegInfo_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFMetadataAttributeTest_src",
+    srcs = ["PDFMetadataAttributeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFOpaqueSrcModeToSrcOverTest_src",
+    srcs = ["PDFOpaqueSrcModeToSrcOverTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFPrimitivesTest_src",
+    srcs = ["PDFPrimitivesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/core:SkGlyphRun_hdr",
+        "//src/core:SkImageFilter_Base_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/pdf:SkClusterator_hdr",
+        "//src/pdf:SkDeflate_hdr",
+        "//src/pdf:SkPDFDevice_hdr",
+        "//src/pdf:SkPDFDocumentPriv_hdr",
+        "//src/pdf:SkPDFFont_hdr",
+        "//src/pdf:SkPDFTypes_hdr",
+        "//src/pdf:SkPDFUnion_hdr",
+        "//src/pdf:SkPDFUtils_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFTaggedLinkTest_src",
+    srcs = ["PDFTaggedLinkTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkAnnotation_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFTaggedPruningTest_src",
+    srcs = ["PDFTaggedPruningTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFTaggedTableTest_src",
+    srcs = ["PDFTaggedTableTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PDFTaggedTest_src",
+    srcs = ["PDFTaggedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/docs:SkPDFDocument_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PaintTest_src",
+    srcs = ["PaintTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkColorMatrixFilter_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkBlurMask_hdr",
+        "//src/core:SkPaintPriv_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ParametricStageTest_src",
+    srcs = ["ParametricStageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColorSpace_hdr",
+        "//src/core:SkRasterPipeline_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ParseColorTest_src",
+    srcs = ["ParseColorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkParse_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ParsePathTest_src",
+    srcs = ["ParsePathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools:random_parse_path_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathBuilderTest_src",
+    srcs = ["PathBuilderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPathBuilder_hdr",
+        "//include/core:SkPathTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathCoverageTest_src",
+    srcs = ["PathCoverageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkScalar_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/core:SkPointPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathMeasureTest_src",
+    srcs = ["PathMeasureTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkContourMeasure_hdr",
+        "//include/core:SkPathMeasure_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsAngleIdeas_src",
+    srcs = ["PathOpsAngleIdeas.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkTSort_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkOpContour_hdr",
+        "//src/pathops:SkOpSegment_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsAngleTest_src",
+    srcs = ["PathOpsAngleTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkOpContour_hdr",
+        "//src/pathops:SkOpSegment_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsAsWindingTest_src",
+    srcs = ["PathOpsAsWindingTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        ":Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsBattles_src",
+    srcs = ["PathOpsBattles.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsBoundsTest_src",
+    srcs = ["PathOpsBoundsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsBounds_hdr",
+        "//src/pathops:SkPathOpsCurve_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsBuildUseTest_src",
+    srcs = ["PathOpsBuildUseTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsBuilderConicTest_src",
+    srcs = ["PathOpsBuilderConicTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":SubsetPath_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsBuilderTest_src",
+    srcs = ["PathOpsBuilderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsChalkboardTest_src",
+    srcs = ["PathOpsChalkboardTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsConicIntersectionTest_src",
+    srcs = ["PathOpsConicIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImageEncoder_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkString_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsConicLineIntersectionTest_src",
+    srcs = ["PathOpsConicLineIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsConic_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsConicQuadIntersectionTest_src",
+    srcs = ["PathOpsConicQuadIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsConic_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicConicIntersectionTest_src",
+    srcs = ["PathOpsCubicConicIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsConic_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicIntersectionTestData_hdr",
+    hdrs = ["PathOpsCubicIntersectionTestData.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsTestCommon_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicIntersectionTestData_src",
+    srcs = ["PathOpsCubicIntersectionTestData.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsCubicIntersectionTestData_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicIntersectionTest_src",
+    srcs = ["PathOpsCubicIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsCubicIntersectionTestData_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicLineIntersectionIdeas_src",
+    srcs = ["PathOpsCubicLineIntersectionIdeas.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicLineIntersectionTest_src",
+    srcs = ["PathOpsCubicLineIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicQuadIntersectionTest_src",
+    srcs = ["PathOpsCubicQuadIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsCubicReduceOrderTest_src",
+    srcs = ["PathOpsCubicReduceOrderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsCubicIntersectionTestData_hdr",
+        ":PathOpsQuadIntersectionTestData_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDCubicTest_src",
+    srcs = ["PathOpsDCubicTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDLineTest_src",
+    srcs = ["PathOpsDLineTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDPointTest_src",
+    srcs = ["PathOpsDPointTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsPoint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDRectTest_src",
+    srcs = ["PathOpsDRectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDVectorTest_src",
+    srcs = ["PathOpsDVectorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkPathOpsPoint_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsDebug_hdr",
+    hdrs = ["PathOpsDebug.h"],
+    visibility = ["//:__subpackages__"],
+)
+
+generated_cc_atom(
+    name = "PathOpsDebug_src",
+    srcs = ["PathOpsDebug.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsTSectDebug_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkMutex_hdr",
+        "//src/pathops:SkIntersectionHelper_hdr",
+        "//src/pathops:SkOpCoincidence_hdr",
+        "//src/pathops:SkOpContour_hdr",
+        "//src/pathops:SkOpSegment_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsExtendedTest_hdr",
+    hdrs = ["PathOpsExtendedTest.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/pathops:SkPathOpsTypes_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsExtendedTest_src",
+    srcs = ["PathOpsExtendedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/private:SkMutex_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsFuzz763Test_src",
+    srcs = ["PathOpsFuzz763Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsInverseTest_src",
+    srcs = ["PathOpsInverseTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsExtendedTest_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsIssue3651_src",
+    srcs = ["PathOpsIssue3651.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsLineIntersectionTest_src",
+    srcs = ["PathOpsLineIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsLineParametetersTest_src",
+    srcs = ["PathOpsLineParametetersTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkLineParameters_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsOpCircleThreadedTest_src",
+    srcs = ["PathOpsOpCircleThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsOpCubicThreadedTest_src",
+    srcs = ["PathOpsOpCubicThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsOpLoopThreadedTest_src",
+    srcs = ["PathOpsOpLoopThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsOpRectThreadedTest_src",
+    srcs = ["PathOpsOpRectThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsOpTest_src",
+    srcs = ["PathOpsOpTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadIntersectionTestData_hdr",
+    hdrs = ["PathOpsQuadIntersectionTestData.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsTestCommon_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadIntersectionTestData_src",
+    srcs = ["PathOpsQuadIntersectionTestData.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsQuadIntersectionTestData_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadIntersectionTest_src",
+    srcs = ["PathOpsQuadIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsQuadIntersectionTestData_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadLineIntersectionTest_src",
+    srcs = ["PathOpsQuadLineIntersectionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadLineIntersectionThreadedTest_src",
+    srcs = ["PathOpsQuadLineIntersectionThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsTestCommon_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsQuadReduceOrderTest_src",
+    srcs = ["PathOpsQuadReduceOrderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsQuadIntersectionTestData_hdr",
+        ":Test_hdr",
+        "//src/pathops:SkIntersections_hdr",
+        "//src/pathops:SkPathOpsRect_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyDegenerateThreadedTest_src",
+    srcs = ["PathOpsSimplifyDegenerateThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyFailTest_src",
+    srcs = ["PathOpsSimplifyFailTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/pathops:SkPathOps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyQuadThreadedTest_src",
+    srcs = ["PathOpsSimplifyQuadThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyQuadralateralsThreadedTest_src",
+    srcs = ["PathOpsSimplifyQuadralateralsThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyRectThreadedTest_src",
+    srcs = ["PathOpsSimplifyRectThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+        "//include/private:SkMacros_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyTest_src",
+    srcs = ["PathOpsSimplifyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsExtendedTest_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsSimplifyTrianglesThreadedTest_src",
+    srcs = ["PathOpsSimplifyTrianglesThreadedTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/core:SkString_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsSkpTest_src",
+    srcs = ["PathOpsSkpTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [":PathOpsExtendedTest_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsTSectDebug_hdr",
+    hdrs = ["PathOpsTSectDebug.h"],
+    visibility = ["//:__subpackages__"],
+    deps = ["//src/pathops:SkPathOpsTSect_hdr"],
+)
+
+generated_cc_atom(
+    name = "PathOpsTestCommon_hdr",
+    hdrs = ["PathOpsTestCommon.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/private:SkTArray_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsTestCommon_src",
+    srcs = ["PathOpsTestCommon.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        "//src/core:SkPathPriv_hdr",
+        "//src/core:SkTSort_hdr",
+        "//src/pathops:SkPathOpsBounds_hdr",
+        "//src/pathops:SkPathOpsConic_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//src/pathops:SkPathOpsLine_hdr",
+        "//src/pathops:SkPathOpsQuad_hdr",
+        "//src/pathops:SkPathOpsTSect_hdr",
+        "//src/pathops:SkReduceOrder_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsThreadedCommon_hdr",
+    hdrs = ["PathOpsThreadedCommon.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//include/private:SkTDArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsThreadedCommon_src",
+    srcs = ["PathOpsThreadedCommon.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//src/core:SkTaskGroup_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsThreeWayTest_src",
+    srcs = ["PathOpsThreeWayTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+        "//include/private:SkTDArray_hdr",
+        "//src/pathops:SkIntersections_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsTigerTest_src",
+    srcs = ["PathOpsTigerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsDebug_hdr",
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsTightBoundsTest_src",
+    srcs = ["PathOpsTightBoundsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsExtendedTest_hdr",
+        ":PathOpsThreadedCommon_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathOpsTypesTest_src",
+    srcs = ["PathOpsTypesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsTestCommon_hdr",
+        ":Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathRendererCacheTests_src",
+    srcs = ["PathRendererCacheTests.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceCache_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu:GrUserStencilSettings_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/geometry:GrStyledShape_hdr",
+        "//src/gpu/ops:SoftwarePathRenderer_hdr",
+        "//src/gpu/ops:TriangulatingPathRenderer_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PathTest_src",
+    srcs = ["PathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//include/private:SkIDChangeListener_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkNullCanvas_hdr",
+        "//include/utils:SkParsePath_hdr",
+        "//include/utils:SkParse_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/core:SkPathPriv_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PictureBBHTest_src",
+    srcs = ["PictureBBHTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//src/core:SkRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PictureShaderTest_src",
+    srcs = ["PictureShaderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/core:SkPicturePriv_hdr",
+        "//src/core:SkResourceCache_hdr",
+        "//src/shaders:SkPictureShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PictureTest_src",
+    srcs = ["PictureTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBBHFactory_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkClipOp_hdr",
+        "//include/core:SkColor_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFontStyle_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPixelRef_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkScalar_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkBigPicture_hdr",
+        "//src/core:SkMiniRecorder_hdr",
+        "//src/core:SkPicturePriv_hdr",
+        "//src/core:SkRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PinnedImageTest_src",
+    srcs = ["PinnedImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkImagePriv_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PixelRefTest_src",
+    srcs = ["PixelRefTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkMallocPixelRef_hdr",
+        "//include/core:SkPixelRef_hdr",
+        "//include/private:SkIDChangeListener_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Point3Test_src",
+    srcs = ["Point3Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PointTest_src",
+    srcs = ["PointTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRect_hdr",
+        "//src/core:SkPointPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PolyUtilsTest_src",
+    srcs = ["PolyUtilsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/utils:SkPolyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PreChopPathCurvesTest_src",
+    srcs = ["PreChopPathCurvesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/gpu/tessellate:Tessellation_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PremulAlphaRoundTripTest_src",
+    srcs = ["PremulAlphaRoundTripTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkConvertPixels_hdr",
+        "//src/gpu:GrDataUtils_hdr",
+        "//src/gpu:GrPixmap_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PrimitiveProcessorTest_src",
+    srcs = ["PrimitiveProcessorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkPointPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGeometryProcessor_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrOpFlushState_hdr",
+        "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLVarying_hdr",
+        "//src/gpu/ops:GrMeshDrawOp_hdr",
+        "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProcessorTest_src",
+    srcs = ["ProcessorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrClip_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrGpuResource_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrMemoryPool_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/ops:GrMeshDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProgramsTest_src",
+    srcs = ["ProgramsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkChecksum_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu:GrAutoLocaleSetter_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawOpTest_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrPipeline_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrXferProcessor_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu/effects:GrBlendFragmentProcessor_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/glsl:GrGLSLProgramBuilder_hdr",
+        "//src/gpu/ops:GrDrawOp_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "PromiseImageTest_src",
+    srcs = ["PromiseImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkPromiseImageTexture_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/image:SkImage_Gpu_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProxyConversionTest_src",
+    srcs = ["ProxyConversionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRenderTargetProxy_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProxyRefTest_src",
+    srcs = ["ProxyRefTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrRenderTargetProxy_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ProxyTest_src",
+    srcs = ["ProxyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRenderTargetProxy_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxyPriv_hdr",
+        "//src/gpu:GrSurface_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "QuickRejectTest_src",
+    srcs = ["QuickRejectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPoint3_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkArenaAlloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RRectInPathTest_src",
+    srcs = ["RRectInPathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RTreeTest_src",
+    srcs = ["RTreeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkRTree_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RandomTest_src",
+    srcs = ["RandomTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkTSort_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ReadPixelsTest_src",
+    srcs = ["ReadPixelsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/private:SkHalf_hdr",
+        "//include/private:SkImageInfoPriv_hdr",
+        "//include/utils:SkNWayCanvas_hdr",
+        "//src/core:SkMathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ReadWritePixelsGpuTest_src",
+    srcs = ["ReadWritePixelsGpuTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkConvertPixels_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:BackendTextureImageFactory_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordDrawTest_src",
+    srcs = ["RecordDrawTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RecordTestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkImagePriv_hdr",
+        "//src/core:SkRecordDraw_hdr",
+        "//src/core:SkRecordOpts_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecorder_hdr",
+        "//src/core:SkRecords_hdr",
+        "//tools/debugger:DebugCanvas_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordOptsTest_src",
+    srcs = ["RecordOptsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RecordTestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//src/core:SkRecordOpts_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecorder_hdr",
+        "//src/core:SkRecords_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordPatternTest_src",
+    srcs = ["RecordPatternTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkRecordPattern_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecorder_hdr",
+        "//src/core:SkRecords_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordTestUtils_hdr",
+    hdrs = ["RecordTestUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecords_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordTest_src",
+    srcs = ["RecordTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":RecordTestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkShader_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecords_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecorderTest_src",
+    srcs = ["RecorderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/core:SkRecord_hdr",
+        "//src/core:SkRecorder_hdr",
+        "//src/core:SkRecords_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecordingXfermodeTest_src",
+    srcs = ["RecordingXfermodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/core:SkBlendModePriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RectTest_src",
+    srcs = ["RectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/core:SkRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RectangleTextureTest_src",
+    srcs = ["RectangleTextureTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrTextureEffect_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RefCntTest_src",
+    srcs = ["RefCntTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkWeakRefCnt_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RegionTest_src",
+    srcs = ["RegionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RepeatedClippedBlurTest_src",
+    srcs = ["RepeatedClippedBlurTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrResourceCache_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceAllocatorTest_src",
+    srcs = ["ResourceAllocatorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrResourceAllocator_hdr",
+        "//src/gpu:GrResourceProviderPriv_hdr",
+        "//src/gpu:GrSurfaceProxyPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ResourceCacheTest_src",
+    srcs = ["ResourceCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkMessageBus_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpuResourceCacheAccess_hdr",
+        "//src/gpu:GrGpuResourcePriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrResourceCache_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RoundRectTest_src",
+    srcs = ["RoundRectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkMatrix_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/pathops:SkPathOps_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkPointPriv_hdr",
+        "//src/core:SkRRectPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RuntimeBlendTest_src",
+    srcs = ["RuntimeBlendTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//gm:gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:RuntimeBlendUtils_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SRGBReadWritePixelsTest_src",
+    srcs = ["SRGBReadWritePixelsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SRGBTest_src",
+    srcs = ["SRGBTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkColorSpaceXformSteps_hdr",
+        "//src/core:SkRasterPipeline_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SVGDeviceTest_src",
+    srcs = ["SVGDeviceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/svg:SkSVGCanvas_hdr",
+        "//include/utils:SkParse_hdr",
+        "//src/shaders:SkImageShader_hdr",
+        "//src/svg:SkSVGDevice_hdr",
+        "//src/xml:SkDOM_hdr",
+        "//src/xml:SkXMLWriter_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SafeMathTest_src",
+    srcs = ["SafeMathTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkSafeMath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SamplingTest_src",
+    srcs = ["SamplingTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkSamplingPriv_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ScalarTest_src",
+    srcs = ["ScalarTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkMath_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/private:SkFloatingPoint_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ScaleToSidesTest_src",
+    srcs = ["ScaleToSidesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkScaleToSides_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SerialProcsTest_src",
+    srcs = ["SerialProcsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkSerialProcs_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SerializationTest_src",
+    srcs = ["SerializationTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkAnnotation_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontMetrics_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkMallocPixelRef_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/effects:SkDashPathEffect_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/private:SkFixed_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkAnnotationKeys_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkMatrixPriv_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkPicturePriv_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//src/shaders:SkShaderBase_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShaderImageFilterTest_src",
+    srcs = ["ShaderImageFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/effects/imagefilters:SkRuntimeImageFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShaderOpacityTest_src",
+    srcs = ["ShaderOpacityTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//src/shaders:SkColorShader_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShaderTest_src",
+    srcs = ["ShaderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkPerlinNoiseShader_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShadowTest_src",
+    srcs = ["ShadowTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkVertices_hdr",
+        "//include/utils:SkShadowUtils_hdr",
+        "//src/core:SkDrawShadowInfo_hdr",
+        "//src/core:SkVerticesPriv_hdr",
+        "//src/utils:SkShadowTessellator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShaperTest_src",
+    srcs = ["ShaperTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTo_hdr",
+        "//modules/skshaper/include:SkShaper_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SizeTest_src",
+    srcs = ["SizeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkSize_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkBase64Test_src",
+    srcs = ["SkBase64Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkBase64_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkBlockAllocatorTest_src",
+    srcs = ["SkBlockAllocatorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkBlockAllocator_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkColor4fTest_src",
+    srcs = ["SkColor4fTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColor_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkColorSpaceXformStepsTest_src",
+    srcs = ["SkColorSpaceXformStepsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//src/core:SkColorSpaceXformSteps_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkDOMTest_src",
+    srcs = ["SkDOMTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/xml:SkDOM_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkDSLRuntimeEffectTest_src",
+    srcs = ["SkDSLRuntimeEffectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/sksl:DSLRuntimeEffects_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/gpu:GrColor_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkGaussFilterTest_src",
+    srcs = ["SkGaussFilterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkGaussFilter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkGlyphBufferTest_src",
+    srcs = ["SkGlyphBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkEnumerate_hdr",
+        "//src/core:SkGlyphBuffer_hdr",
+        "//src/core:SkGlyphRunPainter_hdr",
+        "//src/core:SkScalerContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkGlyphTest_src",
+    srcs = ["SkGlyphTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkGlyph_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkImageTest_src",
+    srcs = ["SkImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//src/core:SkImagePriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkNxTest_src",
+    srcs = ["SkNxTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkNx_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:Sk4px_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkPathRangeIterTest_src",
+    srcs = ["SkPathRangeIterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkRasterPipelineTest_src",
+    srcs = ["SkRasterPipelineTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkHalf_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/core:SkRasterPipeline_hdr",
+        "//src/gpu:GrSwizzle_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkRemoteGlyphCacheTest_src",
+    srcs = ["SkRemoteGlyphCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkMutex_hdr",
+        "//include/private/chromium:GrSlug_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
+        "//src/core:SkDraw_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//src/core:SkScalerCache_hdr",
+        "//src/core:SkStrikeCache_hdr",
+        "//src/core:SkStrikeSpec_hdr",
+        "//src/core:SkSurfacePriv_hdr",
+        "//src/core:SkTypeface_remote_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/text:GrSDFTControl_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/fonts:TestEmptyTypeface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkResourceCacheTest_src",
+    srcs = ["SkResourceCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPictureRecorder_hdr",
+        "//include/core:SkPicture_hdr",
+        "//include/core:SkSurface_hdr",
+        "//src/core:SkBitmapCache_hdr",
+        "//src/core:SkMipmap_hdr",
+        "//src/core:SkResourceCache_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/lazy:SkDiscardableMemoryPool_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkRuntimeEffectTest_src",
+    srcs = ["SkRuntimeEffectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkBlender_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkColorFilter_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkBlenders_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/sksl:SkSLDebugTrace_hdr",
+        "//src/core:SkColorSpacePriv_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/core:SkTLazy_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrColor_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:KeyBuilder_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/gpu/effects:GrSkSLFP_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLCross_src",
+    srcs = ["SkSLCross.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/gpu:GrFragmentProcessor_hdr",
+        "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLDSLErrorLineNumbers_src",
+    srcs = ["SkSLDSLErrorLineNumbers.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkSLIRNode_hdr",
+        "//include/sksl:DSL_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLThreadContext_hdr",
+        "//src/sksl/dsl/priv:DSLWriter_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLDSLOnlyTest_src",
+    srcs = ["SkSLDSLOnlyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/sksl:DSL_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLDSLTest_src",
+    srcs = ["SkSLDSLTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkSLIRNode_hdr",
+        "//include/sksl:DSLRuntimeEffects_hdr",
+        "//include/sksl:DSL_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLThreadContext_hdr",
+        "//src/sksl/dsl/priv:DSLWriter_hdr",
+        "//src/sksl/ir:SkSLBlock_hdr",
+        "//src/sksl/ir:SkSLVariable_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLES2ConformanceTest_src",
+    srcs = ["SkSLES2ConformanceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//gm:gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLGLSLTestbed_src",
+    srcs = ["SkSLGLSLTestbed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLInterpreterTest_src",
+    srcs = ["SkSLInterpreterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkM44_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
+        "//src/sksl/ir:SkSLExternalFunction_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+        "//src/utils:SkJSON_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLMemoryLayoutTest_src",
+    srcs = ["SkSLMemoryLayoutTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/sksl:SkSLErrorReporter_hdr",
+        "//src/sksl:SkSLContext_hdr",
+        "//src/sksl:SkSLMangler_hdr",
+        "//src/sksl:SkSLMemoryLayout_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLMetalTestbed_src",
+    srcs = ["SkSLMetalTestbed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLSPIRVTestbed_src",
+    srcs = ["SkSLSPIRVTestbed.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLTest_src",
+    srcs = ["SkSLTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//gm:gm_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSize_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//include/private:SkSLDefines_hdr",
+        "//include/sksl:DSLCore_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl:SkSLDehydrator_hdr",
+        "//src/sksl:SkSLRehydrator_hdr",
+        "//src/sksl:SkSLThreadContext_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLTypeTest_src",
+    srcs = ["SkSLTypeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/sksl:SkSLErrorReporter_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/sksl:SkSLContext_hdr",
+        "//src/sksl:SkSLMangler_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkScalerCacheTest_src",
+    srcs = ["SkScalerCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//src/core:SkScalerCache_hdr",
+        "//src/core:SkStrikeSpec_hdr",
+        "//src/core:SkTaskGroup_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkShaperJSONWriterTest_src",
+    srcs = ["SkShaperJSONWriterTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkSpan_hdr",
+        "//src/utils:SkJSONWriter_hdr",
+        "//src/utils:SkShaperJSONWriter_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSharedMutexTest_src",
+    srcs = ["SkSharedMutexTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkSharedMutex_hdr",
+        "//src/core:SkTaskGroup_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkStrikeCacheTest_src",
+    srcs = ["SkStrikeCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkStrikeCache_hdr",
+        "//src/core:SkStrikeSpec_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkStringViewTest_src",
+    srcs = ["SkStringViewTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkStringView_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkTBlockListTest_src",
+    srcs = ["SkTBlockListTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkTBlockList_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkUTFTest_src",
+    srcs = ["SkUTFTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMDebugTracePlayerTest_src",
+    srcs = ["SkVMDebugTracePlayerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkM44_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
+        "//src/sksl/tracing:SkVMDebugTracePlayer_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMDebugTraceTest_src",
+    srcs = ["SkVMDebugTraceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVMTest_src",
+    srcs = ["SkVMTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkColorPriv_hdr",
+        "//include/private:SkColorData_hdr",
+        "//src/core:SkCpu_hdr",
+        "//src/core:SkMSAN_hdr",
+        "//src/core:SkVM_hdr",
+        "//src/gpu:GrShaderCaps_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/sksl/codegen:SkSLVMCodeGenerator_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+        "//src/utils:SkVMVisualizer_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkVxTest_src",
+    srcs = ["SkVxTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkVx_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skbug12214_src",
+    srcs = ["Skbug12214.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skbug5221_src",
+    srcs = ["Skbug5221.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skbug6389_src",
+    srcs = ["Skbug6389.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkImageFilters_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Skbug6653_src",
+    srcs = ["Skbug6653.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SortTest_src",
+    srcs = ["SortTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkTSort_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SpecialImageTest_src",
+    srcs = ["SpecialImageTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/core:SkSpecialSurface_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:SkGr_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SpecialSurfaceTest_src",
+    srcs = ["SpecialSurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkSpecialImage_hdr",
+        "//src/core:SkSpecialSurface_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:SkGr_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SrcOverTest_src",
+    srcs = ["SrcOverTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkColorData_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SrcSrcOverBatchTest_src",
+    srcs = ["SrcSrcOverBatchTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkShader_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "StreamBufferTest_src",
+    srcs = ["StreamBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":FakeStreams_hdr",
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+        "//src/codec:SkStreamBuffer_hdr",
+        "//src/utils:SkOSPath_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "StreamTest_src",
+    srcs = ["StreamTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//client_utils/android:FrontBufferedStream_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/private:SkTo_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkBuffer_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkStreamPriv_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "StringTest_src",
+    srcs = ["StringTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkString_hdr",
+        "//src/core:SkStringUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "StrokeTest_src",
+    srcs = ["StrokeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/core:SkStrokeRec_hdr",
+        "//src/core:SkPathPriv_hdr",
+        "//src/core:SkStroke_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "StrokerTest_src",
+    srcs = ["StrokerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":PathOpsCubicIntersectionTestData_hdr",
+        ":PathOpsQuadIntersectionTestData_hdr",
+        ":Test_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkTime_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkPointPriv_hdr",
+        "//src/core:SkStrokerPriv_hdr",
+        "//src/pathops:SkPathOpsCubic_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SubsetPath_hdr",
+    hdrs = ["SubsetPath.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkPath_hdr",
+        "//include/private:SkTDArray_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SubsetPath_src",
+    srcs = ["SubsetPath.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SubsetPath_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/core:SkPathPriv_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SurfaceDrawContextTest_src",
+    srcs = ["SurfaceDrawContextTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SurfaceSemaphoreTest_src",
+    srcs = ["SurfaceSemaphoreTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrBackendSemaphore_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkTypes_hdr",
+        "//include/gpu/vk:GrVkVulkan_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//src/gpu/vk:GrVkCommandPool_hdr",
+        "//src/gpu/vk:GrVkGpu_hdr",
+        "//src/gpu/vk:GrVkUtil_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SurfaceTest_src",
+    srcs = ["SurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkOverdrawCanvas_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRRect_hdr",
+        "//include/core:SkRegion_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/core:SkDevice_hdr",
+        "//src/core:SkUtils_hdr",
+        "//src/gpu:BaseDevice_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpuResourcePriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_Gpu_hdr",
+        "//src/image:SkSurface_Gpu_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SwizzlerTest_src",
+    srcs = ["SwizzlerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkSwizzle_hdr",
+        "//include/private:SkImageInfoPriv_hdr",
+        "//src/codec:SkSwizzler_hdr",
+        "//src/core:SkOpts_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TArrayTest_src",
+    srcs = ["TArrayTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/utils:SkRandom_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TDPQueueTest_src",
+    srcs = ["TDPQueueTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkTDPQueue_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TLazyTest_src",
+    srcs = ["TLazyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkTLazy_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TemplatesTest_src",
+    srcs = ["TemplatesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/private:SkTemplates_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TestTest_src",
+    srcs = ["TestTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools/gpu/gl:GLTestContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TestUtils_hdr",
+    hdrs = ["TestUtils.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//src/gpu:GrDataUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TestUtils_src",
+    srcs = ["TestUtils.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        "//include/encode:SkPngEncoder_hdr",
+        "//include/utils:SkBase64_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkUtils_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrDrawingManager_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu:SurfaceContext_hdr",
+        "//src/utils:SkCharToGlyphCache_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Test_hdr",
+    hdrs = ["Test.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkString_hdr",
+        "//include/core:SkTypes_hdr",
+        "//src/core:SkTraceEvent_hdr",
+        "//tools:Registry_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Test_src",
+    srcs = ["Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkString_hdr",
+        "//include/core:SkTime_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextBlobCacheTest_src",
+    srcs = ["TextBlobCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkGraphics_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTextBlob_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/ports:SkTypeface_win_hdr",
+        "//src/core:SkGlyphRun_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu/text:GrAtlasManager_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/fonts:RandomScalerContext_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextBlobTest_src",
+    srcs = ["TextBlobTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkSerialProcs_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/private:SkTArray_hdr",
+        "//include/private:SkTo_hdr",
+        "//src/core:SkTextBlobPriv_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureBindingsResetTest_src",
+    srcs = ["TextureBindingsResetTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureOpTest_src",
+    srcs = ["TextureOpTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrRecordingContext_hdr",
+        "//src/gpu:GrColorSpaceXform_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu/geometry:GrQuad_hdr",
+        "//src/gpu/ops:OpsTask_hdr",
+        "//src/gpu/ops:TextureOp_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureProxyTest_src",
+    srcs = ["TextureProxyTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrRecordingContextPriv_hdr",
+        "//src/gpu:GrResourceCache_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/dawn:GrDawnGpu_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TextureStripAtlasManagerTest_src",
+    srcs = ["TextureStripAtlasManagerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/effects:SkTableColorFilter_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Time_src",
+    srcs = ["Time.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTime_hdr",
+        "//include/private:SkTo_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TopoSortTest_src",
+    srcs = ["TopoSortTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/gpu:GrTTopoSort_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TraceMemoryDumpTest_src",
+    srcs = ["TraceMemoryDumpTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTraceMemoryDump_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/gl:GrGLBuffer_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/gl:GrGLGpu_hdr",
+        "//src/gpu/gl:GrGLTextureRenderTarget_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TracingTest_src",
+    srcs = ["TracingTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/core:SkPoint_hdr",
+        "//include/core:SkRect_hdr",
+        "//src/core:SkLeanWindows_hdr",
+        "//src/core:SkTraceEvent_hdr",
+        "//tools/flags:CommandLineFlags_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TransferPixelsTest_src",
+    srcs = ["TransferPixelsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrImageInfo_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TriangulatingPathRendererTests_src",
+    srcs = ["TriangulatingPathRendererTests.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkPath_hdr",
+        "//include/core:SkRect_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrEagerVertexAllocator_hdr",
+        "//src/gpu:GrStyle_hdr",
+        "//src/gpu:GrUserStencilSettings_hdr",
+        "//src/gpu/effects:GrPorterDuffXferProcessor_hdr",
+        "//src/gpu/geometry:GrAATriangulator_hdr",
+        "//src/gpu/geometry:GrInnerFanTriangulator_hdr",
+        "//src/gpu/geometry:GrStyledShape_hdr",
+        "//src/gpu/ops:TriangulatingPathRenderer_hdr",
+        "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
+        "//src/shaders:SkShaderBase_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TypefaceMacTest_src",
+    srcs = ["TypefaceMacTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/ports:SkTypeface_mac_hdr",
+        "//src/core:SkZip_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TypefaceTest_src",
+    srcs = ["TypefaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkData_hdr",
+        "//include/core:SkFontMgr_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/core:SkTypeface_hdr",
+        "//include/ports:SkTypeface_win_hdr",
+        "//include/private:SkFixed_hdr",
+        "//src/core:SkAdvancedTypefaceMetrics_hdr",
+        "//src/core:SkFontDescriptor_hdr",
+        "//src/core:SkFontMgrPriv_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//src/core:SkTypefaceCache_hdr",
+        "//src/sfnt:SkOTTable_OS_2_hdr",
+        "//src/sfnt:SkSFNTHeader_hdr",
+        "//src/utils:SkUTF_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+        "//tools/fonts:TestEmptyTypeface_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UnicodeTest_src",
+    srcs = ["UnicodeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkFont_hdr",
+        "//include/core:SkPaint_hdr",
+        "//src/core:SkFontPriv_hdr",
+        "//src/utils:SkUTF_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UtilsTest_src",
+    srcs = ["UtilsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkRefCnt_hdr",
+        "//include/core:SkSpan_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkEnumerate_hdr",
+        "//src/core:SkTSearch_hdr",
+        "//src/core:SkTSort_hdr",
+        "//src/core:SkZip_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VerticesTest_src",
+    srcs = ["VerticesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkVertices_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkVerticesPriv_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkBackendSurfaceTest_src",
+    srcs = ["VkBackendSurfaceTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkTypes_hdr",
+        "//include/gpu/vk:GrVkVulkan_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrTextureProxy_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/vk:GrVkGpu_hdr",
+        "//src/gpu/vk:GrVkImageLayout_hdr",
+        "//src/gpu/vk:GrVkTexture_hdr",
+        "//src/image:SkImage_Base_hdr",
+        "//src/image:SkImage_GpuBase_hdr",
+        "//src/image:SkImage_Gpu_hdr",
+        "//src/image:SkSurface_Gpu_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkDrawableTest_src",
+    srcs = ["VkDrawableTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkDrawable_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendDrawableInfo_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkVulkan_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu/vk:GrVkGpu_hdr",
+        "//src/gpu/vk:GrVkInterface_hdr",
+        "//src/gpu/vk:GrVkMemory_hdr",
+        "//src/gpu/vk:GrVkSecondaryCBDrawContext_hdr",
+        "//src/gpu/vk:GrVkUtil_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkHardwareBufferTest_src",
+    srcs = ["VkHardwareBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSemaphore_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkBackendContext_hdr",
+        "//include/gpu/vk:GrVkExtensions_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:SkGr_hdr",
+        "//src/gpu/gl:GrGLDefines_hdr",
+        "//src/gpu/gl:GrGLUtil_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu/vk:VkTestUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkPriorityExtensionTest_src",
+    srcs = ["VkPriorityExtensionTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu/vk:GrVkTypes_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//tools/gpu/vk:VkTestUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkProtectedContextTest_src",
+    srcs = ["VkProtectedContextTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMaskFilter_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu/vk:GrVkBackendContext_hdr",
+        "//include/gpu/vk:GrVkExtensions_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu/vk:VkTestHelper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkWrapTests_src",
+    srcs = ["VkWrapTests.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu/vk:GrVkTypes_hdr",
+        "//include/gpu/vk:GrVkVulkan_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrRenderTarget_hdr",
+        "//src/gpu:GrTexture_hdr",
+        "//src/gpu/vk:GrVkCaps_hdr",
+        "//src/gpu/vk:GrVkGpu_hdr",
+        "//src/gpu/vk:GrVkMemory_hdr",
+        "//tools/gpu:GrContextFactory_hdr",
+        "//tools/gpu:ManagedBackendTexture_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "VkYcbcrSamplerTest_src",
+    srcs = ["VkYcbcrSamplerTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkImage_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//tools/gpu/vk:VkTestHelper_hdr",
+        "//tools/gpu/vk:VkYcbcrSamplerHelper_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "WangsFormulaTest_src",
+    srcs = ["WangsFormulaTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkGeometry_hdr",
+        "//src/gpu/tessellate:WangsFormula_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "WebpTest_src",
+    srcs = ["WebpTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "WindowRectanglesTest_src",
+    srcs = ["WindowRectanglesTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkTypes_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkRectPriv_hdr",
+        "//src/gpu:GrWindowRectangles_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "WrappedSurfaceCopyOnWriteTest_src",
+    srcs = ["WrappedSurfaceCopyOnWriteTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestUtils_hdr",
+        ":Test_hdr",
+        "//include/core:SkDeferredDisplayListRecorder_hdr",
+        "//include/core:SkImageInfo_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/gpu:GrTypes_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
+        "//src/core:SkCanvasPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//src/gpu:GrSurfaceProxy_hdr",
+        "//src/gpu:SurfaceFillContext_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+        "//tools/gpu:ProxyUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "WritePixelsTest_src",
+    srcs = ["WritePixelsTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkBitmap_hdr",
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkMallocPixelRef_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/gpu:GrBackendSurface_hdr",
+        "//include/gpu:GrDirectContext_hdr",
+        "//include/private:SkColorData_hdr",
+        "//include/private:SkImageInfoPriv_hdr",
+        "//src/core:SkMathPriv_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/gpu:GrGpu_hdr",
+        "//src/gpu:GrProxyProvider_hdr",
+        "//tools/gpu:BackendSurfaceFactory_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "Writer32Test_src",
+    srcs = ["Writer32Test.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkWriter32_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "YUVCacheTest_src",
+    srcs = ["YUVCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/core:SkYUVAInfo_hdr",
+        "//include/core:SkYUVAPixmaps_hdr",
+        "//src/core:SkCachedData_hdr",
+        "//src/core:SkResourceCache_hdr",
+        "//src/core:SkYUVPlanesCache_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "YUVTest_src",
+    srcs = ["YUVTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//include/codec:SkCodec_hdr",
+        "//include/core:SkPixmap_hdr",
+        "//include/core:SkStream_hdr",
+        "//include/effects:SkColorMatrix_hdr",
+        "//include/private:SkTemplates_hdr",
+        "//src/core:SkAutoMalloc_hdr",
+        "//src/core:SkYUVMath_hdr",
+        "//tools:Resources_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLErrorTest_src",
+    srcs = ["SkSLErrorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//gm:gm_hdr",
+        "//include/effects:SkRuntimeEffect_hdr",
+        "//src/core:SkOSFile_hdr",
+        "//src/core:SkRuntimeEffectPriv_hdr",
+        "//src/gpu:GrCaps_hdr",
+        "//src/gpu:GrDirectContextPriv_hdr",
+        "//src/sksl:SkSLCompiler_hdr",
+        "//src/utils:SkOSPath_hdr",
+        "//tools:Resources_hdr",
+        "//tools:ToolUtils_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "GrGlyphVectorTest_src",
+    srcs = ["GrGlyphVectorTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Test_hdr",
+        "//src/core:SkGlyphBuffer_hdr",
+        "//src/core:SkGlyph_hdr",
+        "//src/core:SkReadBuffer_hdr",
+        "//src/core:SkStrikeCache_hdr",
+        "//src/core:SkStrikeSpec_hdr",
+        "//src/core:SkWriteBuffer_hdr",
+        "//src/gpu:GrResourceProvider_hdr",
+        "//src/gpu:GrSubRunAllocator_hdr",
+        "//src/gpu/text:GrGlyphVector_hdr",
     ],
 )
diff --git a/third_party/skia/tests/BackendAllocationTest.cpp b/third_party/skia/tests/BackendAllocationTest.cpp
index 6c883a4391cc9..65cb201598c76 100644
--- a/third_party/skia/tests/BackendAllocationTest.cpp
+++ b/third_party/skia/tests/BackendAllocationTest.cpp
@@ -52,7 +52,7 @@ void test_wrapping(GrDirectContext* dContext,
     sk_sp<ManagedBackendTexture> mbet = create(dContext, mipMapped, renderable);
     if (!mbet) {
         ERRORF(reporter, "Couldn't create backendTexture for grColorType %d renderable %s\n",
-               grColorType,
+               (int)grColorType,
                GrRenderable::kYes == renderable ? "yes" : "no");
         return;
     }
@@ -285,7 +285,8 @@ static void check_base_readbacks(GrDirectContext* dContext,
         GrColorInfo info(colorType, kUnpremul_SkAlphaType, nullptr);
         auto surfaceContext = dContext->priv().makeSC(readView, info);
         if (!surfaceContext) {
-            ERRORF(reporter, "Could not create surface context for colorType: %d\n", colorType);
+            ERRORF(reporter, "Could not create surface context for colorType: %d\n",
+                   (int)colorType);
         }
 
         if (!surfaceContext->readPixels(dContext, actual, {0, 0})) {
@@ -293,7 +294,7 @@ static void check_base_readbacks(GrDirectContext* dContext,
             // arbitrary colorType
 #if 0
             ERRORF(reporter, "Couldn't readback from SurfaceContext for colorType: %d\n",
-                   colorType);
+                   (int)colorType);
 #endif
         } else {
             auto name = SkStringPrintf("%s::readPixels",
@@ -593,6 +594,7 @@ void color_type_backend_allocation_test(const sk_gpu_test::ContextInfo& ctxInfo,
         { kA16_float_SkColorType,         kTransCol                },
         { kR16G16_float_SkColorType,      { .25f, .75f, 0, 1 }     },
         { kR16G16B16A16_unorm_SkColorType,{ .25f, .5f, .75f, 1 }   },
+        { kR8_unorm_SkColorType,          { .25f, 0, 0, 1 }        },
     };
 
     static_assert(kLastEnum_SkColorType == SK_ARRAY_COUNT(combinations));
@@ -765,6 +767,7 @@ DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(GLBackendAllocationTest, reporter, ctxInfo) {
 
         { GrColorType::kRGB_888x,         GR_GL_RGBA8,                SkColors::kYellow    },
         { GrColorType::kRGB_888x,         GR_GL_RGB8,                 SkColors::kCyan      },
+        { GrColorType::kRGB_888x,         GR_GL_RGBX8,                SkColors::kCyan      },
 
         { GrColorType::kBGRA_8888,        GR_GL_RGBA8,                SkColors::kBlue      },
         { GrColorType::kBGRA_8888,        GR_GL_BGRA8,                SkColors::kBlue      },
@@ -855,16 +858,16 @@ DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(GLBackendAllocationTest, reporter, ctxInfo) {
                         // update our validation code to use a "raw" read that doesn't impose a
                         // color type but for now we just munge the data we upload to match the
                         // expectation.
-                        GrSwizzle swizzle;
+                        skgpu::Swizzle swizzle;
                         switch (combo.fColorType) {
                             case GrColorType::kAlpha_8:
-                                swizzle = GrSwizzle("aaaa");
+                                swizzle = skgpu::Swizzle("aaaa");
                                 break;
                             case GrColorType::kAlpha_16:
-                                swizzle = GrSwizzle("aaaa");
+                                swizzle = skgpu::Swizzle("aaaa");
                                 break;
                             case GrColorType::kAlpha_F16:
-                                swizzle = GrSwizzle("aaaa");
+                                swizzle = skgpu::Swizzle("aaaa");
                                 break;
                             default:
                                 break;
@@ -1000,27 +1003,27 @@ DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkBackendAllocationTest, reporter, ctxInfo) {
                     // Ideally we'd update our validation code to use a "raw" read that doesn't
                     // impose a color type but for now we just munge the data we upload to match the
                     // expectation.
-                    GrSwizzle swizzle;
+                    skgpu::Swizzle swizzle;
                     switch (combo.fColorType) {
                         case GrColorType::kAlpha_8:
                             SkASSERT(combo.fFormat == VK_FORMAT_R8_UNORM);
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         case GrColorType::kAlpha_16:
                             SkASSERT(combo.fFormat == VK_FORMAT_R16_UNORM);
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         case GrColorType::kAlpha_F16:
                             SkASSERT(combo.fFormat == VK_FORMAT_R16_SFLOAT);
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         case GrColorType::kABGR_4444:
                             if (combo.fFormat == VK_FORMAT_B4G4R4A4_UNORM_PACK16) {
-                                swizzle = GrSwizzle("bgra");
+                                swizzle = skgpu::Swizzle("bgra");
                             }
                             break;
                         default:
-                            swizzle = GrSwizzle("rgba");
+                            swizzle = skgpu::Swizzle("rgba");
                             break;
                     }
 
diff --git a/third_party/skia/tests/BulkRectTest.cpp b/third_party/skia/tests/BulkRectTest.cpp
index 84f680667f8a6..5bef96b73f246 100644
--- a/third_party/skia/tests/BulkRectTest.cpp
+++ b/third_party/skia/tests/BulkRectTest.cpp
@@ -109,10 +109,10 @@ static void textureop_creation_test(skiatest::Reporter* reporter, GrDirectContex
         sk_sp<GrSurfaceProxy> proxyB = create_proxy(dContext);
         proxyViewA = GrSurfaceProxyView(std::move(proxyA),
                                         kTopLeft_GrSurfaceOrigin,
-                                        GrSwizzle::RGBA());
+                                        skgpu::Swizzle::RGBA());
         proxyViewB = GrSurfaceProxyView(std::move(proxyB),
                                         kTopLeft_GrSurfaceOrigin,
-                                        GrSwizzle::RGBA());
+                                        skgpu::Swizzle::RGBA());
     }
 
     auto set = new GrTextureSetEntry[requestedTotNumQuads];
@@ -127,7 +127,7 @@ static void textureop_creation_test(skiatest::Reporter* reporter, GrDirectContex
             sk_sp<GrSurfaceProxy> proxyA = create_proxy(dContext);
             set[i].fProxyView = GrSurfaceProxyView(std::move(proxyA),
                                                    kTopLeft_GrSurfaceOrigin,
-                                                   GrSwizzle::RGBA());
+                                                   skgpu::Swizzle::RGBA());
         }
 
         set[i].fSrcAlphaType = kPremul_SkAlphaType;
diff --git a/third_party/skia/tests/CanvasStateTest.cpp b/third_party/skia/tests/CanvasStateTest.cpp
index 17fb88e1e420d..55948779c6be1 100644
--- a/third_party/skia/tests/CanvasStateTest.cpp
+++ b/third_party/skia/tests/CanvasStateTest.cpp
@@ -86,7 +86,7 @@ static void write_image(const SkImage* img, const char path[]) {
 }
 
 static void compare(skiatest::Reporter* reporter, SkImage* img0, SkImage* img1) {
-    if (false) {
+    if ((false)) {
         static int counter;
 
         SkDebugf("---- counter %d\n", counter);
diff --git a/third_party/skia/tests/CanvasTest.cpp b/third_party/skia/tests/CanvasTest.cpp
index 53911175efa9e..b39eb8a987990 100644
--- a/third_party/skia/tests/CanvasTest.cpp
+++ b/third_party/skia/tests/CanvasTest.cpp
@@ -31,7 +31,6 @@
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
 #include "include/core/SkVertices.h"
-#include "include/docs/SkPDFDocument.h"
 #include "include/effects/SkImageFilters.h"
 #include "include/private/SkMalloc.h"
 #include "include/private/SkTemplates.h"
@@ -49,6 +48,10 @@
 #include "include/private/SkColorData.h"
 #endif
 
+#ifdef SK_SUPPORT_PDF
+#include "include/docs/SkPDFDocument.h"
+#endif
+
 #include <memory>
 #include <utility>
 
@@ -127,6 +130,8 @@ DEF_TEST(canvas_clipbounds, reporter) {
     }
 }
 
+#ifdef SK_SUPPORT_PDF
+
 // Will call proc with multiple styles of canvas (recording, raster, pdf)
 template <typename F> static void multi_canvas_driver(int w, int h, F proc) {
     proc(SkPictureRecorder().beginRecording(SkRect::MakeIWH(w, h)));
@@ -176,6 +181,8 @@ DEF_TEST(canvas_empty_clip, reporter) {
     });
 }
 
+#endif // SK_SUPPORT_PDF
+
 DEF_TEST(CanvasNewRasterTest, reporter) {
     SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
     const size_t minRowBytes = info.minRowBytes();
@@ -410,6 +417,7 @@ DEF_TEST(Canvas_bitmap, reporter) {
     }
 }
 
+#ifdef SK_SUPPORT_PDF
 DEF_TEST(Canvas_pdf, reporter) {
     for (const CanvasTest& test : kCanvasTests) {
         SkNullWStream outStream;
@@ -421,6 +429,7 @@ DEF_TEST(Canvas_pdf, reporter) {
         }
     }
 }
+#endif
 
 DEF_TEST(Canvas_SaveState, reporter) {
     SkCanvas canvas(10, 10);
@@ -587,11 +596,13 @@ DEF_TEST(CanvasClipType, r) {
     // test rasterclip backend
     test_cliptype(SkSurface::MakeRasterN32Premul(10, 10)->getCanvas(), r);
 
+#ifdef SK_SUPPORT_PDF
     // test clipstack backend
     SkDynamicMemoryWStream stream;
     if (auto doc = SkPDF::MakeDocument(&stream)) {
         test_cliptype(doc->beginPage(100, 100), r);
     }
+#endif
 }
 
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
diff --git a/third_party/skia/tests/ClipStackTest.cpp b/third_party/skia/tests/ClipStackTest.cpp
index 794c18d041714..0fd648079b067 100644
--- a/third_party/skia/tests/ClipStackTest.cpp
+++ b/third_party/skia/tests/ClipStackTest.cpp
@@ -21,7 +21,6 @@
 #include "include/core/SkSurface.h"
 #include "include/core/SkTypes.h"
 #include "include/effects/SkGradientShader.h"
-#include "include/private/GrResourceKey.h"
 #include "include/private/SkTemplates.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkClipStack.h"
diff --git a/third_party/skia/tests/CodecTest.cpp b/third_party/skia/tests/CodecTest.cpp
index b4e65381784c1..cd55b14754c8a 100644
--- a/third_party/skia/tests/CodecTest.cpp
+++ b/third_party/skia/tests/CodecTest.cpp
@@ -1368,6 +1368,45 @@ DEF_TEST(Codec_fallBack, r) {
     }
 }
 
+static void seek_and_decode(const char* file, std::unique_ptr<SkStream> stream,
+                            skiatest::Reporter* r) {
+    if (!stream) {
+        SkDebugf("Missing resources (%s). Set --resourcePath.\n", file);
+        return;
+    }
+
+    std::unique_ptr<SkCodec> codec(SkCodec::MakeFromStream(std::move(stream)));
+    if (!codec) {
+        ERRORF(r, "Failed to create codec for %s,", file);
+        return;
+    }
+
+    // Trigger reading through the stream, so that decoding the first frame will
+    // require a rewind.
+    (void) codec->getFrameCount();
+
+    SkImageInfo info = codec->getInfo().makeColorType(kN32_SkColorType);
+    SkBitmap bm;
+    bm.allocPixels(info);
+    auto result = codec->getPixels(bm.pixmap());
+    if (result != SkCodec::kSuccess) {
+        ERRORF(r, "Failed to decode %s with error %s", file, SkCodec::ResultToString(result));
+    }
+}
+
+DEF_TEST(Wuffs_seek_and_decode, r) {
+    const char* file = "images/flightAnim.gif";
+    auto stream = LimitedRewindingStream::Make(file, SkCodec::MinBufferedBytesNeeded());
+    seek_and_decode(file, std::move(stream), r);
+
+#if defined(SK_ENABLE_ANDROID_UTILS)
+    // Test using FrontBufferedStream, as Android does
+    auto bufferedStream = android::skia::FrontBufferedStream::Make(
+            GetResourceAsStream(file), SkCodec::MinBufferedBytesNeeded());
+    seek_and_decode(file, std::move(bufferedStream), r);
+#endif
+}
+
 // This test verifies that we fixed an assert statement that fired when reusing a png codec
 // after scaling.
 DEF_TEST(Codec_reusePng, r) {
@@ -1644,7 +1683,7 @@ DEF_TEST(Codec_webp_rowsDecoded, r) {
     sk_sp<SkData> subset = SkData::MakeSubset(data.get(), 0, truncatedSize);
     std::unique_ptr<SkCodec> codec = SkCodec::MakeFromData(std::move(subset));
     if (!codec) {
-        ERRORF(r, "Failed to create a codec for %s truncated to only %lu bytes",
+        ERRORF(r, "Failed to create a codec for %s truncated to only %zu bytes",
                path, truncatedSize);
         return;
     }
@@ -1706,8 +1745,7 @@ DEF_TEST(Codec_ossfuzz6274, r) {
         ERRORF(r, "Invalid data gave non-nullptr image");
     }
     return;
-#endif
-
+#else
     if (!image) {
         ERRORF(r, "Missing %s", file);
         return;
@@ -1734,6 +1772,7 @@ DEF_TEST(Codec_ossfuzz6274, r) {
             ERRORF(r, "did not initialize pixels! %i, %i is %x", i, j, actual);
         }
     }
+#endif
 }
 
 DEF_TEST(Codec_78329453, r) {
diff --git a/third_party/skia/tests/ColorTest.cpp b/third_party/skia/tests/ColorTest.cpp
index c41e3bd62124a..ad8eab7502829 100644
--- a/third_party/skia/tests/ColorTest.cpp
+++ b/third_party/skia/tests/ColorTest.cpp
@@ -50,7 +50,7 @@ DEF_TEST(ColorInterp, reporter) {
         SkPMColor src = SkPreMultiplyColor(colorSrc);
         SkPMColor dst = SkPreMultiplyColor(colorDst);
 
-        if (false) {
+        if ((false)) {
             REPORTER_ASSERT(reporter, SkFourByteInterp(src, dst, a0) == dst);
             REPORTER_ASSERT(reporter, SkFourByteInterp(src, dst, a255) == src);
         }
diff --git a/third_party/skia/tests/CustomMeshTest.cpp b/third_party/skia/tests/CustomMeshTest.cpp
new file mode 100644
index 0000000000000..afaeadad7a20a
--- /dev/null
+++ b/third_party/skia/tests/CustomMeshTest.cpp
@@ -0,0 +1,538 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/core/SkCanvas.h"
+#include "include/core/SkCustomMesh.h"
+#include "tests/Test.h"
+
+using Attribute = SkCustomMeshSpecification::Attribute;
+using Varying   = SkCustomMeshSpecification::Varying;
+
+static const char* attr_type_str(const Attribute::Type type) {
+    switch (type) {
+        case Attribute::Type::kFloat:           return "float";
+        case Attribute::Type::kFloat2:          return "float2";
+        case Attribute::Type::kFloat3:          return "float3";
+        case Attribute::Type::kFloat4:          return "float4";
+        case Attribute::Type::kUByte4_unorm:    return "ubyte4_unorm";
+    }
+    SkUNREACHABLE;
+}
+
+static const char* var_type_str(const Varying::Type type) {
+    switch (type) {
+        case Varying::Type::kFloat:  return "float";
+        case Varying::Type::kFloat2: return "float2";
+        case Varying::Type::kFloat3: return "float3";
+        case Varying::Type::kFloat4: return "float4";
+        case Varying::Type::kHalf:   return "half";
+        case Varying::Type::kHalf2:  return "half2";
+        case Varying::Type::kHalf3:  return "half3";
+        case Varying::Type::kHalf4:  return "half4";
+    }
+    SkUNREACHABLE;
+}
+
+static SkString make_description(SkSpan<const Attribute> attributes,
+                                 size_t                  stride,
+                                 SkSpan<const Varying>   varyings,
+                                 const SkString&         vs,
+                                 const SkString&         fs) {
+    static constexpr size_t kMax = 10;
+    SkString result;
+    result.appendf("Attributes (count=%zu, stride=%zu):\n", attributes.size(), stride);
+    for (size_t i = 0; i < std::min(kMax, attributes.size()); ++i) {
+        const auto& a = attributes[i];
+        result.appendf(" {%-10s, %3zu, \"%s\"}\n",
+                       attr_type_str(a.type),
+                       a.offset,
+                       a.name.c_str());
+    }
+    if (kMax < attributes.size()) {
+        result.append(" ...\n");
+    }
+
+    result.appendf("Varyings (count=%zu):\n", varyings.size());
+    for (size_t i = 0; i < std::min(kMax, varyings.size()); ++i) {
+        const auto& v = varyings[i];
+        result.appendf(" {%5s, \"%s\"}\n", var_type_str(v.type), v.name.c_str());
+    }
+    if (kMax < varyings.size()) {
+        result.append(" ...\n");
+    }
+
+    result.appendf("\n--VS--\n%s\n------\n", vs.c_str());
+    result.appendf("\n--FS--\n%s\n------\n", fs.c_str());
+    return result;
+}
+
+static bool check_for_failure(skiatest::Reporter*     r,
+                              SkSpan<const Attribute> attributes,
+                              size_t                  stride,
+                              SkSpan<const Varying>   varyings,
+                              const SkString&         vs,
+                              const SkString&         fs) {
+    auto [spec, error] = SkCustomMeshSpecification::Make(attributes, stride, varyings, vs, fs);
+    SkString description;
+    if (!spec) {
+        return true;
+    }
+    ERRORF(r,
+           "Expected to fail but succeeded:\n%s",
+           make_description(attributes, stride, varyings, vs, fs).c_str());
+    return false;
+}
+
+static bool check_for_success(skiatest::Reporter*     r,
+                              SkSpan<const Attribute> attributes,
+                              size_t                  stride,
+                              SkSpan<const Varying>   varyings,
+                              const SkString&         vs,
+                              const SkString&         fs) {
+    auto [spec, error] = SkCustomMeshSpecification::Make(attributes, stride, varyings, vs, fs);
+    if (spec) {
+        REPORTER_ASSERT(r, error.isEmpty());
+        return true;
+    }
+    ERRORF(r,
+           "Expected to succeed but failed:\n%sError:\n%s",
+           make_description(attributes, stride, varyings, vs, fs).c_str(),
+           error.c_str());
+    return false;
+}
+
+// Simple valid strings to make specifications
+static const SkString kValidVS
+        {"float2 main(Attributes attrs, out Varyings v) { return float2(10); }"};
+// There are multiple valid VS signatures.
+static const SkString kValidFSes[] {
+        SkString{"void main(Varyings varyings) {}"},
+        SkString{"float2 main(Varyings varyings) { return float2(10); }"},
+        SkString{"void main(Varyings varyings, out half4 color) { color = half4(.2); }"},
+        SkString{R"(
+            float2 main(Varyings varyings, out half4 color) {
+                color = half4(.2);
+                return float2(10);
+            }
+        )"},
+};
+
+// Simple valid attributes, stride, and varyings to make specifications
+static const Attribute kValidAttrs[] = {
+        {Attribute::Type::kFloat4, 0, SkString{"pos"}},
+};
+static constexpr size_t kValidStride = 4*4;
+static const Varying kValidVaryings[] = {
+        {Varying::Type::kFloat2, SkString{"uv"}},
+};
+
+static void test_good(skiatest::Reporter* r) {
+    for (const auto& validFS : kValidFSes) {
+        if (!check_for_success(r,
+                               SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                               kValidStride,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               validFS)) {
+            return;
+        }
+    }
+}
+
+static void test_bad_sig(skiatest::Reporter* r) {
+    static constexpr const char* kVSBody = "{ return float2(10); }";
+
+    static constexpr const char* kInvalidVSSigs[] {
+            "float3 main(Attributes attrs, out Varyings v)",         // bad return
+            "float2 main(inout Attributes attrs, out Varyings v)",   // inout Attributes
+            "float2 main(Attributes attrs, inout Varyings v)",       // inout Varyings
+            "float2 main(Attributes attrs)",                         // no Varyings
+            "float2 main(out Varyings)",                             // no Attributes
+            "float2 main(out Varyings, in Attributes)",              // wrong param order
+            "float2 main(Attributes attrs, out Varyings v, float2)"  // extra arg
+    };
+
+    static constexpr const char* kNoColorFSBody = "{ return float2(10); }";
+
+    static constexpr const char* kInvalidNoColorFSSigs[] {
+            "half2 main(Varyings v)",               // bad return
+            "float2 main(in Attributes v)",         // wrong param type
+            "float2 main(out Varyings attrs)",      // out Varyings
+            "float2 main()",                        // no args
+            "float2 main(Attributes attrs, float)"  // extra arg
+    };
+
+    static constexpr const char* kColorFSBody = "{ color = half4(.2); return float2(10); }";
+
+    static constexpr const char* kInvalidColorFSSigs[] {
+            "half2 main(Varyings v, out half4 color)",               // bad return
+            "float2 main(in Attributes v, out half4 color)",         // wrong first param type
+            "float2 main(in Varyings v, out half3 color)",           // wrong second param type
+            "float2 main(out Varyings attrs, out half4 color)",      // out Varyings
+            "float2 main(Varyings attrs, half4 color)",              // in color
+            "float2 main(Attributes attrs, out half4 color, float)"  // extra arg
+    };
+
+    for (const char* vsSig : kInvalidVSSigs) {
+        SkString invalidVS;
+        invalidVS.appendf("%s %s", vsSig, kVSBody);
+        for (const auto& validFS : kValidFSes) {
+            if (!check_for_failure(r,
+                                   SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                                   kValidStride,
+                                   SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                                   invalidVS,
+                                   validFS)) {
+                return;
+            }
+        }
+    }
+
+    for (const char* noColorFSSig : kInvalidNoColorFSSigs) {
+        SkString invalidFS;
+        invalidFS.appendf("%s %s", noColorFSSig, kNoColorFSBody);
+        if (!check_for_failure(r,
+                               SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                               kValidStride,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               invalidFS)) {
+            return;
+        }
+    }
+
+    for (const char* colorFSSig : kInvalidColorFSSigs) {
+        SkString invalidFS;
+        invalidFS.appendf("%s %s", colorFSSig, kColorFSBody);
+        if (!check_for_failure(r,
+                               SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                               kValidStride,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               invalidFS)) {
+            return;
+        }
+    }
+}
+
+// We allow the optional out color from the FS to either be float4 or half4
+static void test_float4_color(skiatest::Reporter* r) {
+    static const SkString kFloat4FS {
+        R"(
+            float2 main(Varyings varyings, out float4 color) {
+                color = float4(.2); return float2(10);
+            }
+        )"
+    };
+    check_for_success(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kFloat4FS);
+}
+
+// We don't allow value or child uniforms in custom meshes currently.
+static void test_bad_globals(skiatest::Reporter* r) {
+    static constexpr const char* kBadGlobals[] {
+        "uniform float3 uni;"
+        "uniform shader myshader;"
+    };
+    for (const auto& global : kBadGlobals) {
+        SkString badVS = kValidVS;
+        badVS.prepend(global);
+        if (!check_for_failure(r,
+                               SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                               kValidStride,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               badVS,
+                               kValidFSes[0])) {
+            return;
+        }
+    }
+    for (const auto& global : kBadGlobals) {
+        SkString badFS = kValidFSes[0];
+        badFS.prepend(global);
+        if (!check_for_failure(r,
+                               SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                               kValidStride,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               badFS)) {
+            return;
+        }
+    }
+}
+
+static void test_no_main(skiatest::Reporter* r) {
+    static const SkString kHelper{"float2 swiz(float2 x) { return z.yx; }"};
+
+    // Empty VS
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           kValidStride,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           SkString{},
+                           kValidFSes[0])) {
+        return;
+    }
+
+    // VS with helper function but no main
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           kValidStride,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kHelper,
+                           kValidFSes[0])) {
+        return;
+    }
+
+    // Empty FS
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           kValidStride,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kValidVS,
+                           SkString{})) {
+        return;
+    }
+
+    // VS with helper function but no main
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           kValidStride,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kValidVS,
+                           kHelper)) {
+        return;
+    }
+}
+
+static void test_zero_attrs(skiatest::Reporter* r) {
+    // We require at least one attribute
+    check_for_failure(r,
+                      SkSpan<Attribute>(),
+                      kValidStride,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_zero_varyings(skiatest::Reporter* r) {
+    // Varyings are not required.
+    check_for_success(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkSpan<Varying>(),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_bad_strides(skiatest::Reporter* r) {
+    // Zero stride
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           0,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kValidVS,
+                           kValidFSes[0])) {
+        return;
+    }
+
+    // Unaligned
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           kValidStride + 1,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kValidVS,
+                           kValidFSes[0])) {
+        return;
+    }
+
+    // Too large
+    if (!check_for_failure(r,
+                           SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                           1 << 20,
+                           SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                           kValidVS,
+                           kValidFSes[0])) {
+        return;
+    }
+}
+
+static void test_bad_offsets(skiatest::Reporter* r) {
+    {  // offset isn't aligned
+        static const Attribute kAttributes[] {
+                {Attribute::Type::kFloat4,  1, SkString{"var"}},
+        };
+        if (!check_for_failure(r,
+                               SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                               32,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               kValidFSes[0])) {
+            return;
+        }
+    }
+    {  // straddles stride boundary
+        static const Attribute kAttributes[] {
+                {Attribute::Type::kFloat4,   0, SkString{"var"}},
+                {Attribute::Type::kFloat2,  16, SkString{"var"}},
+        };
+        if (!check_for_failure(r,
+                               SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                               20,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               kValidFSes[0])) {
+            return;
+        }
+    }
+    {  // straddles stride boundary with attempt to overflow
+        static const Attribute kAttributes[] {
+                {Attribute::Type::kFloat, std::numeric_limits<size_t>::max() - 3, SkString{"var"}},
+        };
+        if (!check_for_failure(r,
+                               SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                               4,
+                               SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                               kValidVS,
+                               kValidFSes[0])) {
+            return;
+        }
+    }
+}
+
+static void test_too_many_attrs(skiatest::Reporter* r) {
+    static constexpr size_t kN = 500;
+    std::vector<Attribute> attrs;
+    attrs.reserve(kN);
+    for (size_t i = 0; i < kN; ++i) {
+        attrs.push_back({Attribute::Type::kFloat4, 0, SkStringPrintf("attr%zu", i)});
+    }
+    check_for_failure(r,
+                      SkMakeSpan(attrs),
+                      4*4,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_too_many_varyings(skiatest::Reporter* r) {
+    static constexpr size_t kN = 500;
+    std::vector<Varying> varyings;
+    varyings.reserve(kN);
+    for (size_t i = 0; i < kN; ++i) {
+        varyings.push_back({Varying::Type::kFloat4, SkStringPrintf("varying%zu", i)});
+    }
+    check_for_failure(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkMakeSpan(varyings),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_duplicate_attribute_names(skiatest::Reporter* r) {
+    static const Attribute kAttributes[] {
+            {Attribute::Type::kFloat4,  0, SkString{"var"}},
+            {Attribute::Type::kFloat2, 16, SkString{"var"}}
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                      24,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_duplicate_varying_names(skiatest::Reporter* r) {
+    static const Varying kVaryings[] {
+        {Varying::Type::kFloat4, SkString{"var"}},
+        {Varying::Type::kFloat3, SkString{"var"}}
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static constexpr const char* kSneakyName = "name; float3 sneaky";
+
+static void test_sneaky_attribute_name(skiatest::Reporter* r) {
+    static const Attribute kAttributes[] {
+            {Attribute::Type::kFloat4, 0, SkString{kSneakyName}},
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                      16,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_sneaky_varying_name(skiatest::Reporter* r) {
+    static const Varying kVaryings[] {
+            {Varying::Type::kFloat4, SkString{kSneakyName}},
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_empty_attribute_name(skiatest::Reporter* r) {
+    static const Attribute kAttributes[] {
+            {Attribute::Type::kFloat4, 0, SkString{}},
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kAttributes, SK_ARRAY_COUNT(kAttributes)),
+                      16,
+                      SkMakeSpan(kValidVaryings, SK_ARRAY_COUNT(kValidVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+static void test_empty_varying_name(skiatest::Reporter* r) {
+    static const Varying kVaryings[] {
+            {Varying::Type::kFloat4, SkString{}},
+    };
+    check_for_failure(r,
+                      SkMakeSpan(kValidAttrs, SK_ARRAY_COUNT(kValidAttrs)),
+                      kValidStride,
+                      SkMakeSpan(kVaryings, SK_ARRAY_COUNT(kVaryings)),
+                      kValidVS,
+                      kValidFSes[0]);
+}
+
+DEF_TEST(CustomMeshSpec, reporter) {
+    struct X {};
+    test_good(reporter);
+    test_bad_sig(reporter);
+    test_float4_color(reporter);
+    test_bad_globals(reporter);
+    test_no_main(reporter);
+    test_zero_attrs(reporter);
+    test_zero_varyings(reporter);
+    test_bad_strides(reporter);
+    test_bad_offsets(reporter);
+    test_too_many_attrs(reporter);
+    test_too_many_varyings(reporter);
+    // skbug.com/12712
+    if ((false)) {
+        test_duplicate_attribute_names(reporter);
+        test_duplicate_varying_names(reporter);
+    }
+    test_sneaky_attribute_name(reporter);
+    test_sneaky_varying_name(reporter);
+    test_empty_attribute_name(reporter);
+    test_empty_varying_name(reporter);
+}
diff --git a/third_party/skia/tests/DescriptorTest.cpp b/third_party/skia/tests/DescriptorTest.cpp
index 53bf67b0adcae..3f234b7d4aa23 100644
--- a/third_party/skia/tests/DescriptorTest.cpp
+++ b/third_party/skia/tests/DescriptorTest.cpp
@@ -6,8 +6,13 @@
  */
 
 #include "include/core/SkTypes.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkDescriptor.h"
+#include "src/core/SkFontPriv.h"
+#include "src/core/SkReadBuffer.h"
 #include "src/core/SkScalerContext.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/gpu/GrResourceProvider.h"
 #include "tests/Test.h"
 
 #include <memory>
@@ -128,3 +133,64 @@ DEF_TEST(Descriptor_entry_over_end, r) {
     SkDescriptorTestHelper::SetCount(desc.get(), 2);
     REPORTER_ASSERT(r, !desc->isValid());
 }
+
+DEF_TEST(Descriptor_flatten_unflatten, r) {
+    {
+        SkBinaryWriteBuffer writer;
+        auto desc = SkDescriptor::Alloc(sizeof(SkDescriptor));
+        desc->computeChecksum();
+        desc->flatten(writer);
+        auto data = writer.snapshotAsData();
+        SkReadBuffer reader{data->data(), data->size()};
+        auto ad = SkAutoDescriptor::MakeFromBuffer(reader);
+        REPORTER_ASSERT(r, ad.has_value());
+        REPORTER_ASSERT(r, ad->getDesc()->isValid());
+    }
+
+    {  // broken header
+        SkBinaryWriteBuffer writer;
+        writer.writeInt(0);  // fChecksum
+        auto data = writer.snapshotAsData();
+        SkReadBuffer reader{data->data(), data->size()};
+        auto ad = SkAutoDescriptor::MakeFromBuffer(reader);
+        REPORTER_ASSERT(r, !ad.has_value());
+    }
+
+    {  // length too big
+        SkBinaryWriteBuffer writer;
+        // Simulate a broken header
+        writer.writeInt(0);    // fChecksum
+        writer.writeInt(4000); // fLength
+        writer.writeInt(0);    // fCount
+        auto data = writer.snapshotAsData();
+        SkReadBuffer reader{data->data(), data->size()};
+        auto ad = SkAutoDescriptor::MakeFromBuffer(reader);
+        REPORTER_ASSERT(r, !ad.has_value());
+    }
+
+    {  // length too small
+        SkBinaryWriteBuffer writer;
+        // Simulate a broken header
+        writer.writeInt(0);    // fChecksum
+        writer.writeInt(3);    // fLength
+        writer.writeInt(0);    // fCount
+        auto data = writer.snapshotAsData();
+        SkReadBuffer reader{data->data(), data->size()};
+        auto ad = SkAutoDescriptor::MakeFromBuffer(reader);
+        REPORTER_ASSERT(r, !ad.has_value());
+    }
+
+    {  // garbage in count
+        SkBinaryWriteBuffer writer;
+        // Simulate a broken header
+        writer.writeInt(0);    // fChecksum
+        writer.writeInt(20);   // fLength
+        writer.writeInt(10);   // fCount
+        writer.writeInt(0);
+        writer.writeInt(0);
+        auto data = writer.snapshotAsData();
+        SkReadBuffer reader{data->data(), data->size()};
+        auto ad = SkAutoDescriptor::MakeFromBuffer(reader);
+        REPORTER_ASSERT(r, !ad.has_value());
+    }
+}
diff --git a/third_party/skia/tests/DrawPathTest.cpp b/third_party/skia/tests/DrawPathTest.cpp
index f33bfddb299df..3f572df9287b9 100644
--- a/third_party/skia/tests/DrawPathTest.cpp
+++ b/third_party/skia/tests/DrawPathTest.cpp
@@ -411,7 +411,7 @@ DEF_TEST(DrawPath, reporter) {
     test_crbug_140803();
     test_inversepathwithclip();
     // why?
-    if (false) test_crbug131181();
+    if ((false)) test_crbug131181();
     test_infinite_dash(reporter);
     test_crbug_165432(reporter);
     test_crbug_472147_simple(reporter);
diff --git a/third_party/skia/tests/EGLImageTest.cpp b/third_party/skia/tests/EGLImageTest.cpp
index c645139135d01..70bfdcf2d91d2 100644
--- a/third_party/skia/tests/EGLImageTest.cpp
+++ b/third_party/skia/tests/EGLImageTest.cpp
@@ -162,8 +162,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) {
         cleanup(glCtx0, externalTexture.fID, glCtx1.get(), context1, image);
         return;
     }
-    GrSwizzle swizzle = context0->priv().caps()->getReadSwizzle(texProxy->backendFormat(),
-                                                                colorInfo.colorType());
+    skgpu::Swizzle swizzle = context0->priv().caps()->getReadSwizzle(texProxy->backendFormat(),
+                                                                     colorInfo.colorType());
     GrSurfaceProxyView view(std::move(texProxy), origin, swizzle);
     auto surfaceContext = context0->priv().makeSC(std::move(view), colorInfo);
 
diff --git a/third_party/skia/tests/EmptyPathTest.cpp b/third_party/skia/tests/EmptyPathTest.cpp
index 06c3cea7523f7..38b819b357de2 100644
--- a/third_party/skia/tests/EmptyPathTest.cpp
+++ b/third_party/skia/tests/EmptyPathTest.cpp
@@ -49,7 +49,7 @@ static void drawAndTest(skiatest::Reporter* reporter, const SkPath& path,
         ERRORF(reporter, "%s style[%d] cap[%d] join[%d] antialias[%d]"
                " filltype[%d] ptcount[%d]", str, paint.getStyle(),
                paint.getStrokeCap(), paint.getStrokeJoin(),
-               paint.isAntiAlias(), path.getFillType(), path.countPoints());
+               paint.isAntiAlias(), (int)path.getFillType(), path.countPoints());
 // uncomment this if you want to step in to see the failure
 //        canvas.drawPath(path, p);
     }
diff --git a/third_party/skia/tests/FontHostTest.cpp b/third_party/skia/tests/FontHostTest.cpp
index 02ef9d83f29f7..0b7346d81c8df 100644
--- a/third_party/skia/tests/FontHostTest.cpp
+++ b/third_party/skia/tests/FontHostTest.cpp
@@ -125,9 +125,9 @@ static void test_symbolfont(skiatest::Reporter* reporter) {
 }
 
 static void test_tables(skiatest::Reporter* reporter, const sk_sp<SkTypeface>& face) {
-    if (false) { // avoid bit rot, suppress warning
-        SkFontID fontID = face->uniqueID();
-        REPORTER_ASSERT(reporter, fontID);
+    if ((false)) { // avoid bit rot, suppress warning
+        SkTypefaceID typefaceID = face->uniqueID();
+        REPORTER_ASSERT(reporter, typefaceID);
     }
 
     int count = face->countTables();
diff --git a/third_party/skia/tests/FontMgrFontConfigTest.cpp b/third_party/skia/tests/FontMgrFontConfigTest.cpp
index d41596f4b4f71..bed4dbc2ceb88 100644
--- a/third_party/skia/tests/FontMgrFontConfigTest.cpp
+++ b/third_party/skia/tests/FontMgrFontConfigTest.cpp
@@ -10,13 +10,17 @@
 #include "include/core/SkFont.h"
 #include "include/core/SkFontMgr.h"
 #include "include/core/SkTypeface.h"
+#include "include/ports/SkFontMgr_FontConfigInterface.h"
 #include "include/ports/SkFontMgr_fontconfig.h"
+#include "src/ports/SkFontConfigInterface_direct.h"
 #include "tests/Test.h"
 #include "tools/Resources.h"
 
 #include <fontconfig/fontconfig.h>
 
-static bool bitmap_compare(const SkBitmap& ref, const SkBitmap& test) {
+namespace {
+
+bool bitmap_compare(const SkBitmap& ref, const SkBitmap& test) {
     for (int y = 0; y < test.height(); ++y) {
         for (int x = 0; x < test.width(); ++x) {
             SkColor testColor = test.getColor(x, y);
@@ -29,17 +33,38 @@ static bool bitmap_compare(const SkBitmap& ref, const SkBitmap& test) {
     return true;
 }
 
-DEF_TEST(FontMgrFontConfig, reporter) {
+FcConfig* build_fontconfig_with_fontfile(const char* fontFilename) {
     FcConfig* config = FcConfigCreate();
 
     // FontConfig may modify the passed path (make absolute or other).
     FcConfigSetSysRoot(config, reinterpret_cast<const FcChar8*>(GetResourcePath("").c_str()));
     // FontConfig will lexically compare paths against its version of the sysroot.
-    SkString distortablePath(reinterpret_cast<const char*>(FcConfigGetSysRoot(config)));
-    distortablePath += "/fonts/Distortable.ttf";
-    FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(distortablePath.c_str()));
+    SkString fontFilePath(reinterpret_cast<const char*>(FcConfigGetSysRoot(config)));
+    fontFilePath += fontFilename;
+    FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(fontFilePath.c_str()));
 
     FcConfigBuildFonts(config);
+    return config;
+}
+
+bool fontmgr_understands_ft_named_instance_bits() {
+    std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("fonts/Distortable.ttf"));
+    if (!distortable) {
+        return false;
+    }
+
+    sk_sp<SkFontMgr> fm = SkFontMgr::RefDefault();
+    SkFontArguments params;
+    // The first named variation position in Distortable is 'Thin'.
+    params.setCollectionIndex(0x00010000);
+    sk_sp<SkTypeface> typeface = fm->makeFromStream(std::move(distortable), params);
+    return !!typeface;
+}
+
+}  // namespace
+
+DEF_TEST(FontMgrFontConfig, reporter) {
+    FcConfig* config = build_fontconfig_with_fontfile("/fonts/Distortable.ttf");
 
     sk_sp<SkFontMgr> fontMgr(SkFontMgr_New_FontConfig(config));
     sk_sp<SkTypeface> typeface(fontMgr->legacyMakeTypeface("Distortable", SkFontStyle()));
@@ -102,3 +127,95 @@ DEF_TEST(FontMgrFontConfig, reporter) {
         REPORTER_ASSERT(reporter, success);
     }
 }
+
+DEF_TEST(FontConfigInterface_MatchStyleNamedInstance, reporter) {
+    if (!fontmgr_understands_ft_named_instance_bits()) {
+        return;
+    }
+
+    FcConfig* config = build_fontconfig_with_fontfile("/fonts/NotoSansCJK-VF-subset.otf.ttc");
+    sk_sp<SkFontConfigInterfaceDirect> fciDirect(new SkFontConfigInterfaceDirect(config));
+
+    static constexpr const char* family_names[]{"Noto Sans CJK JP",
+                                                "Noto Sans CJK HK",
+                                                "Noto Sans CJK SC",
+                                                "Noto Sans CJK TC",
+                                                "Noto Sans CJK KR"};
+    static constexpr const struct Test {
+        int weight;
+        bool highBitsExpectation;
+    } tests[] {
+        {100, false},
+        {300, true },
+        {350, true },
+        {400, true },
+        {500, true },
+        {700, true },
+        {900, true },
+    };
+
+    for (auto&& font_name : family_names) {
+        for (auto&& [weight, highBitsExpectation] : tests) {
+            SkFontStyle fontStyle(weight, SkFontStyle::kNormal_Width, SkFontStyle::kUpright_Slant);
+
+            SkFontConfigInterface::FontIdentity resultIdentity;
+            SkFontStyle resultStyle;
+            SkString resultFamily;
+            const bool r = fciDirect->matchFamilyName(
+                    font_name, fontStyle, &resultIdentity, &resultFamily, &resultStyle);
+
+            REPORTER_ASSERT(reporter, r, "Expecting to find a match result.");
+            REPORTER_ASSERT(
+                    reporter,
+                    (resultIdentity.fTTCIndex >> 16 > 0) == highBitsExpectation,
+                    "Expected to have the ttcIndex' upper 16 bits refer to a named instance.");
+
+            // Intentionally go through manually creating the typeface so that SkFontStyle is
+            // derived from data inside the font, not from the FcPattern that is the FontConfig
+            // match result, see https://crbug.com/skia/12881
+            sk_sp<SkTypeface> typeface(fciDirect->makeTypeface(resultIdentity).release());
+
+            if (!typeface) {
+                ERRORF(reporter, "Could not instantiate typeface, FcVersion: %d", FcGetVersion());
+                return;
+            }
+
+            SkString family_from_typeface;
+            typeface->getFamilyName(&family_from_typeface);
+
+            REPORTER_ASSERT(reporter,
+                            family_from_typeface == SkString(font_name),
+                            "Matched font's family name should match the request.");
+
+            SkFontStyle intrinsic_style = typeface->fontStyle();
+            REPORTER_ASSERT(reporter,
+                            intrinsic_style.weight() == weight,
+                            "Matched font's weight should match request.");
+            if (intrinsic_style.weight() != weight) {
+                ERRORF(reporter,
+                       "Matched font had weight: %d, expected %d, family: %s",
+                       intrinsic_style.weight(),
+                       weight,
+                       family_from_typeface.c_str());
+            }
+
+            int numAxes = typeface->getVariationDesignPosition(nullptr, 0);
+            std::vector<SkFontArguments::VariationPosition::Coordinate> coords;
+            coords.resize(numAxes);
+            typeface->getVariationDesignPosition(coords.data(), numAxes);
+
+            REPORTER_ASSERT(reporter,
+                            coords.size() == 1,
+                            "The font must only have one axis, the weight axis.");
+
+            REPORTER_ASSERT(reporter,
+                            coords[0].axis == SkSetFourByteTag('w', 'g', 'h', 't'),
+                            "The weight axis must be present and configured.");
+
+            REPORTER_ASSERT(reporter,
+                            static_cast<int>(coords[0].value) == weight,
+                            "The weight axis must match the weight from the request.");
+        }
+  }
+
+}
diff --git a/third_party/skia/tests/GeometryTest.cpp b/third_party/skia/tests/GeometryTest.cpp
index 00e061123c943..ee7f648d8fd2e 100644
--- a/third_party/skia/tests/GeometryTest.cpp
+++ b/third_party/skia/tests/GeometryTest.cpp
@@ -33,7 +33,7 @@ static void testChopCubic(skiatest::Reporter* reporter) {
     SkScalar tValues[3];
     // make sure we don't assert internally
     int count = SkChopCubicAtMaxCurvature(src, dst, tValues);
-    if (false) { // avoid bit rot, suppress warning
+    if ((false)) { // avoid bit rot, suppress warning
         REPORTER_ASSERT(reporter, count);
     }
     // Make sure src and dst can be the same pointer.
diff --git a/third_party/skia/tests/GrAHardwareBufferTest.cpp b/third_party/skia/tests/GrAHardwareBufferTest.cpp
index d61c712eacfd3..e7daaf603f9cb 100644
--- a/third_party/skia/tests/GrAHardwareBufferTest.cpp
+++ b/third_party/skia/tests/GrAHardwareBufferTest.cpp
@@ -194,10 +194,15 @@ static void basic_draw_test_helper(skiatest::Reporter* reporter,
     REPORTER_ASSERT(reporter, surface->readPixels(readbackBitmap, 0, 0));
     REPORTER_ASSERT(reporter, check_read(reporter, srcBitmap, readbackBitmap));
 
+    // Draw the image a second time to make sure we get the correct origin when we get the cached
+    // proxy from the generator.
+    surface->getCanvas()->drawImage(image, 0, 0);
+    REPORTER_ASSERT(reporter, surface->readPixels(readbackBitmap, 0, 0));
+    REPORTER_ASSERT(reporter, check_read(reporter, srcBitmap, readbackBitmap));
+
     image.reset();
 
     cleanup_resources(buffer);
-
 }
 
 // Basic test to make sure we can import an AHardwareBuffer into an SkImage and draw it into a
diff --git a/third_party/skia/tests/GrClipStackTest.cpp b/third_party/skia/tests/GrClipStackTest.cpp
index af3cb7b20b7c0..0acfd5103bed7 100644
--- a/third_party/skia/tests/GrClipStackTest.cpp
+++ b/third_party/skia/tests/GrClipStackTest.cpp
@@ -379,7 +379,7 @@ void TestCase::run(const std::vector<int>& order,
         matchedElements += found ? 1 : 0;
     }
     REPORTER_ASSERT(reporter, matchedElements == fExpectedElements.size(),
-                    "%s, did not match all expected elements: expected %d but matched only %d",
+                    "%s, did not match all expected elements: expected %zu but matched only %zu",
                     name.c_str(), fExpectedElements.size(), matchedElements);
 
     // Validate restoration behavior
@@ -388,7 +388,8 @@ void TestCase::run(const std::vector<int>& order,
         cs.restore();
         REPORTER_ASSERT(reporter, cs.clipState() == oldState,
                         "%s, restoring an empty save record should not change clip state: "
-                        "expected %d but got %d", (int) oldState, (int) cs.clipState());
+                        "expected %d but got %d",
+                        name.c_str(), (int) oldState, (int) cs.clipState());
     } else if (policy != SavePolicy::kNever) {
         int restoreCount = policy == SavePolicy::kAtStart ? 1 : (int) order.size();
         for (int i = 0; i < restoreCount; ++i) {
@@ -397,7 +398,7 @@ void TestCase::run(const std::vector<int>& order,
         // Should be wide open if everything is restored to base state
         REPORTER_ASSERT(reporter, cs.clipState() == ClipStack::ClipState::kWideOpen,
                         "%s, restore should make stack become wide-open, not %d",
-                        (int) cs.clipState());
+                        name.c_str(), (int) cs.clipState());
     }
 }
 
@@ -2085,15 +2086,15 @@ DEF_GPUTEST_FOR_CONTEXTS(ClipStack_SWMask,
     };
 
     auto generateMask = [&](SkRect drawBounds) {
-        GrUniqueKey priorKey = cs->testingOnly_getLastSWMaskKey();
+        skgpu::UniqueKey priorKey = cs->testingOnly_getLastSWMaskKey();
         drawRect(drawBounds);
-        GrUniqueKey newKey = cs->testingOnly_getLastSWMaskKey();
+        skgpu::UniqueKey newKey = cs->testingOnly_getLastSWMaskKey();
         REPORTER_ASSERT(r, priorKey != newKey, "Did not generate a new SW mask key as expected");
         return newKey;
     };
 
-    auto verifyKeys = [&](const std::vector<GrUniqueKey>& expectedKeys,
-                          const std::vector<GrUniqueKey>& releasedKeys) {
+    auto verifyKeys = [&](const std::vector<skgpu::UniqueKey>& expectedKeys,
+                          const std::vector<skgpu::UniqueKey>& releasedKeys) {
         context->flush();
         GrProxyProvider* proxyProvider = context->priv().proxyProvider();
 
@@ -2122,20 +2123,20 @@ DEF_GPUTEST_FOR_CONTEXTS(ClipStack_SWMask,
     // Creates a mask for a complex clip
     cs->save();
     addMaskRequiringClip(5.f, 5.f, 20.f);
-    GrUniqueKey keyADepth1 = generateMask({0.f, 0.f, 20.f, 20.f});
-    GrUniqueKey keyBDepth1 = generateMask({10.f, 10.f, 30.f, 30.f});
+    skgpu::UniqueKey keyADepth1 = generateMask({0.f, 0.f, 20.f, 20.f});
+    skgpu::UniqueKey keyBDepth1 = generateMask({10.f, 10.f, 30.f, 30.f});
     verifyKeys({keyADepth1, keyBDepth1}, {});
 
     // Creates a new mask for a new save record, but doesn't delete the old records
     cs->save();
     addMaskRequiringClip(6.f, 6.f, 15.f);
-    GrUniqueKey keyADepth2 = generateMask({0.f, 0.f, 20.f, 20.f});
-    GrUniqueKey keyBDepth2 = generateMask({10.f, 10.f, 30.f, 30.f});
+    skgpu::UniqueKey keyADepth2 = generateMask({0.f, 0.f, 20.f, 20.f});
+    skgpu::UniqueKey keyBDepth2 = generateMask({10.f, 10.f, 30.f, 30.f});
     verifyKeys({keyADepth1, keyBDepth1, keyADepth2, keyBDepth2}, {});
 
     // Release after modifying the current record (even if we don't draw anything)
     addMaskRequiringClip(4.f, 4.f, 15.f);
-    GrUniqueKey keyCDepth2 = generateMask({4.f, 4.f, 16.f, 20.f});
+    skgpu::UniqueKey keyCDepth2 = generateMask({4.f, 4.f, 16.f, 20.f});
     verifyKeys({keyADepth1, keyBDepth1, keyCDepth2}, {keyADepth2, keyBDepth2});
 
     // Release after restoring an older record
diff --git a/third_party/skia/tests/GrGlyphVectorTest.cpp b/third_party/skia/tests/GrGlyphVectorTest.cpp
new file mode 100644
index 0000000000000..4300aefe75378
--- /dev/null
+++ b/third_party/skia/tests/GrGlyphVectorTest.cpp
@@ -0,0 +1,113 @@
+/*
+* Copyright 2022 Google LLC
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+ */
+
+#include "src/core/SkGlyph.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/text/GrGlyphVector.h"
+
+#include "src/core/SkGlyphBuffer.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkStrikeCache.h"
+#include "src/core/SkStrikeSpec.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/gpu/GrSubRunAllocator.h"
+#include "tests/Test.h"
+
+class TestingPeer {
+public:
+    static const SkDescriptor& GetDescriptor(const GrGlyphVector& v) {
+        return v.fStrike->getDescriptor();
+    }
+    static SkSpan<GrGlyphVector::Variant> GetGlyphs(const GrGlyphVector& v) {
+        return v.fGlyphs;
+    }
+};
+
+DEF_TEST(GrGlyphVector_Serialization, r) {
+    SkFont font;
+    auto [strikeSpec, _] = SkStrikeSpec::MakeCanonicalized(font);
+
+    GrSubRunAllocator alloc;
+
+    SkBulkGlyphMetricsAndImages glyphFinder{strikeSpec};
+    const int N = 10;
+    SkGlyphVariant* glyphs = alloc.makePODArray<SkGlyphVariant>(N);
+    for (int i = 0; i < N; i++) {
+        glyphs[i] = glyphFinder.glyph(SkPackedGlyphID(SkTo<SkGlyphID>(i + 1)));
+    }
+
+    GrGlyphVector src = GrGlyphVector::Make(
+            strikeSpec.findOrCreateStrike(), SkMakeSpan(glyphs, N), &alloc);
+
+    SkBinaryWriteBuffer wBuffer;
+    src.flatten(wBuffer);
+
+    auto data = wBuffer.snapshotAsData();
+    SkReadBuffer rBuffer{data->data(), data->size()};
+    auto dst = GrGlyphVector::MakeFromBuffer(rBuffer, &alloc);
+    REPORTER_ASSERT(r, dst.has_value());
+    REPORTER_ASSERT(r, TestingPeer::GetDescriptor(src) == TestingPeer::GetDescriptor(*dst));
+
+    auto srcGlyphs = TestingPeer::GetGlyphs(src);
+    auto dstGlyphs = TestingPeer::GetGlyphs(*dst);
+    for (auto [srcGlyphID, dstGlyphID] : SkMakeZip(srcGlyphs, dstGlyphs)) {
+        REPORTER_ASSERT(r, srcGlyphID.packedGlyphID == dstGlyphID.packedGlyphID);
+    }
+}
+
+DEF_TEST(GrGlyphVector_BadLengths, r) {
+    {
+        SkFont font;
+        auto [strikeSpec, _] = SkStrikeSpec::MakeCanonicalized(font);
+
+        // Make broken stream by hand - zero length
+        SkBinaryWriteBuffer wBuffer;
+        strikeSpec.descriptor().flatten(wBuffer);
+        wBuffer.write32(0);  // length
+        auto data = wBuffer.snapshotAsData();
+        SkReadBuffer rBuffer{data->data(), data->size()};
+        GrSubRunAllocator alloc;
+        auto dst = GrGlyphVector::MakeFromBuffer(rBuffer, &alloc);
+        REPORTER_ASSERT(r, !dst.has_value());
+    }
+
+    {
+        SkFont font;
+        auto [strikeSpec, _] = SkStrikeSpec::MakeCanonicalized(font);
+
+        // Make broken stream by hand - stream is too short
+        SkBinaryWriteBuffer wBuffer;
+        strikeSpec.descriptor().flatten(wBuffer);
+        wBuffer.write32(5);  // length
+        wBuffer.writeUInt(12);  // random data
+        wBuffer.writeUInt(12);  // random data
+        wBuffer.writeUInt(12);  // random data
+        auto data = wBuffer.snapshotAsData();
+        SkReadBuffer rBuffer{data->data(), data->size()};
+        GrSubRunAllocator alloc;
+        auto dst = GrGlyphVector::MakeFromBuffer(rBuffer, &alloc);
+        REPORTER_ASSERT(r, !dst.has_value());
+    }
+
+    {
+        SkFont font;
+        auto [strikeSpec, _] = SkStrikeSpec::MakeCanonicalized(font);
+
+        // Make broken stream by hand - length out of range of safe calculations
+        SkBinaryWriteBuffer wBuffer;
+        strikeSpec.descriptor().flatten(wBuffer);
+        wBuffer.write32(INT_MAX - 10);  // length
+        wBuffer.writeUInt(12);  // random data
+        wBuffer.writeUInt(12);  // random data
+        wBuffer.writeUInt(12);  // random data
+        auto data = wBuffer.snapshotAsData();
+        SkReadBuffer rBuffer{data->data(), data->size()};
+        GrSubRunAllocator alloc;
+        auto dst = GrGlyphVector::MakeFromBuffer(rBuffer, &alloc);
+        REPORTER_ASSERT(r, !dst.has_value());
+    }
+}
diff --git a/third_party/skia/tests/GrMeshTest.cpp b/third_party/skia/tests/GrMeshTest.cpp
index 47e6d48183ced..c205dc4056f3f 100644
--- a/third_party/skia/tests/GrMeshTest.cpp
+++ b/third_party/skia/tests/GrMeshTest.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 #include "include/core/SkBitmap.h"
 #include "include/gpu/GrDirectContext.h"
-#include "include/private/GrResourceKey.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrGeometryProcessor.h"
@@ -22,6 +21,8 @@
 #include "src/gpu/GrOpsRenderPass.h"
 #include "src/gpu/GrProgramInfo.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/KeyBuilder.h"
+#include "src/gpu/ResourceKey.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
@@ -33,7 +34,7 @@
 #define WRITE_PNG_CONTEXT_TYPE kANGLE_D3D11_ES3_ContextType
 #endif
 
-GR_DECLARE_STATIC_UNIQUE_KEY(gIndexBufferKey);
+SKGPU_DECLARE_STATIC_UNIQUE_KEY(gIndexBufferKey);
 
 static constexpr int kBoxSize = 2;
 static constexpr int kBoxCountY = 8;
@@ -450,7 +451,7 @@ class MeshTestProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "GrMeshTestProcessor"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const final {
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const final {
         b->add32(fInstanceLocation.isInitialized());
         b->add32(fVertexPosition.isInitialized());
     }
@@ -467,17 +468,17 @@ class MeshTestProcessor : public GrGeometryProcessor {
     MeshTestProcessor(bool instanced, bool hasVertexBuffer)
             : INHERITED(kGrMeshTestProcessor_ClassID) {
         if (instanced) {
-            fInstanceLocation = {"location", kFloat2_GrVertexAttribType, kHalf2_GrSLType};
-            fInstanceColor = {"color", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
-            this->setInstanceAttributes(&fInstanceLocation, 2);
+            fInstanceLocation = {"location", kFloat2_GrVertexAttribType, SkSLType::kHalf2};
+            fInstanceColor = {"color", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4};
+            this->setInstanceAttributesWithImplicitOffsets(&fInstanceLocation, 2);
             if (hasVertexBuffer) {
-                fVertexPosition = {"vertex", kFloat2_GrVertexAttribType, kHalf2_GrSLType};
-                this->setVertexAttributes(&fVertexPosition, 1);
+                fVertexPosition = {"vertex", kFloat2_GrVertexAttribType, SkSLType::kHalf2};
+                this->setVertexAttributesWithImplicitOffsets(&fVertexPosition, 1);
             }
         } else {
-            fVertexPosition = {"vertex", kFloat2_GrVertexAttribType, kHalf2_GrSLType};
-            fVertexColor = {"color", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType};
-            this->setVertexAttributes(&fVertexPosition, 2);
+            fVertexPosition = {"vertex", kFloat2_GrVertexAttribType, SkSLType::kHalf2};
+            fVertexColor = {"color", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4};
+            this->setVertexAttributesWithImplicitOffsets(&fVertexPosition, 2);
         }
     }
 
@@ -521,7 +522,7 @@ std::unique_ptr<GrGeometryProcessor::ProgramImpl> MeshTestProcessor::makeProgram
                 v->codeAppendf("float2 vertex = %s + offset * %i;", mp.fInstanceLocation.name(),
                                kBoxSize);
             }
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertex");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertex");
 
             f->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
         }
@@ -544,7 +545,7 @@ sk_sp<const GrBuffer> DrawMeshHelper::makeVertexBuffer(const T* data, int count)
 }
 
 sk_sp<const GrBuffer> DrawMeshHelper::getIndexBuffer() {
-    GR_DEFINE_STATIC_UNIQUE_KEY(gIndexBufferKey);
+    SKGPU_DEFINE_STATIC_UNIQUE_KEY(gIndexBufferKey);
     return fState->resourceProvider()->findOrCreatePatternedIndexBuffer(
             kIndexPattern, 6, kIndexPatternRepeatCount, 4, gIndexBufferKey);
 }
diff --git a/third_party/skia/tests/GrMipMappedTest.cpp b/third_party/skia/tests/GrMipMappedTest.cpp
index 23fdd57a5116f..97c913560c489 100644
--- a/third_party/skia/tests/GrMipMappedTest.cpp
+++ b/third_party/skia/tests/GrMipMappedTest.cpp
@@ -461,7 +461,7 @@ DEF_GPUTEST(GrManyDependentsMipMappedTest, reporter, /* options */) {
         // Mipmaps don't get marked dirty until makeClosed().
         REPORTER_ASSERT(reporter, !mipmapProxy->mipmapsAreDirty());
 
-        GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(format, colorType);
+        skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(format, colorType);
         GrSurfaceProxyView mipmapView(mipmapProxy, kTopLeft_GrSurfaceOrigin, swizzle);
 
         // Draw the dirty mipmap texture into a render target.
diff --git a/third_party/skia/tests/GrPipelineDynamicStateTest.cpp b/third_party/skia/tests/GrPipelineDynamicStateTest.cpp
index fbc952a31fcc8..52198a6865aec 100644
--- a/third_party/skia/tests/GrPipelineDynamicStateTest.cpp
+++ b/third_party/skia/tests/GrPipelineDynamicStateTest.cpp
@@ -66,21 +66,21 @@ class PipelineDynamicStateTestProcessor : public GrGeometryProcessor {
 
     const char* name() const override { return "GrPipelineDynamicStateTest Processor"; }
 
-    void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const final {}
+    void addToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const final {}
 
     std::unique_ptr<ProgramImpl> makeProgramImpl(const GrShaderCaps&) const final;
 
 private:
     PipelineDynamicStateTestProcessor() : INHERITED(kGrPipelineDynamicStateTestProcessor_ClassID) {
-        this->setVertexAttributes(kAttributes, SK_ARRAY_COUNT(kAttributes));
+        this->setVertexAttributesWithImplicitOffsets(kAttributes, SK_ARRAY_COUNT(kAttributes));
     }
 
     const Attribute& inVertex() const { return kAttributes[0]; }
     const Attribute& inColor() const { return kAttributes[1]; }
 
     inline static constexpr Attribute kAttributes[] = {
-            {"vertex", kFloat2_GrVertexAttribType, kHalf2_GrSLType},
-            {"color", kUByte4_norm_GrVertexAttribType, kHalf4_GrSLType},
+            {"vertex", kFloat2_GrVertexAttribType, SkSLType::kHalf2},
+            {"color", kUByte4_norm_GrVertexAttribType, SkSLType::kHalf4},
     };
 
     friend class GLSLPipelineDynamicStateTestProcessor;
@@ -108,7 +108,7 @@ PipelineDynamicStateTestProcessor::makeProgramImpl(const GrShaderCaps&) const {
             varyingHandler->addPassThroughAttribute(mp.inColor().asShaderVar(), args.fOutputColor);
 
             v->codeAppendf("float2 vertex = %s;", mp.inVertex().name());
-            gpArgs->fPositionVar.set(kFloat2_GrSLType, "vertex");
+            gpArgs->fPositionVar.set(SkSLType::kFloat2, "vertex");
             f->codeAppendf("const half4 %s = half4(1);", args.fOutputCoverage);
         }
     };
diff --git a/third_party/skia/tests/GrPorterDuffTest.cpp b/third_party/skia/tests/GrPorterDuffTest.cpp
index c3553ad541d7f..8369f929b3362 100644
--- a/third_party/skia/tests/GrPorterDuffTest.cpp
+++ b/third_party/skia/tests/GrPorterDuffTest.cpp
@@ -1083,7 +1083,7 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, options) {
         sk_sp<GrTextureProxy> proxy = proxyProvider->wrapBackendTexture(
                 mbet->texture(), kBorrow_GrWrapOwnership, GrWrapCacheable::kNo, kRead_GrIOType,
                 mbet->refCountedCallback());
-        GrSwizzle swizzle =
+        skgpu::Swizzle swizzle =
                 caps.getReadSwizzle(mbet->texture().getBackendFormat(), GrColorType::kRGBA_8888);
         fakeDstProxyView.setProxyView({std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle});
     }
diff --git a/third_party/skia/tests/GrSurfaceResolveTest.cpp b/third_party/skia/tests/GrSurfaceResolveTest.cpp
new file mode 100644
index 0000000000000..4dc49e60983d5
--- /dev/null
+++ b/third_party/skia/tests/GrSurfaceResolveTest.cpp
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2022 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "tests/Test.h"
+
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrDirectContextPriv.h"
+#include "src/gpu/GrPixmap.h"
+#include "tests/TestUtils.h"
+#include "tools/gpu/ManagedBackendTexture.h"
+
+using namespace sk_gpu_test;
+
+bool check_pixels(skiatest::Reporter* reporter,
+                  GrDirectContext* dContext,
+                  const GrBackendTexture& tex,
+                  const SkImageInfo& info,
+                  SkColor expectedColor) {
+    // We have to do the readback of the backend texture wrapped in a different Skia surface than
+    // the one used in the main body of the test or else the readPixels call will trigger resolves
+    // itself.
+    sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(dContext,
+                                                                 tex,
+                                                                 kTopLeft_GrSurfaceOrigin,
+                                                                 /*sampleCnt=*/4,
+                                                                 kRGBA_8888_SkColorType,
+                                                                 nullptr, nullptr);
+    SkBitmap actual;
+    actual.allocPixels(info);
+    if (!surface->readPixels(actual, 0, 0)) {
+        return false;
+    }
+
+    SkBitmap expected;
+    expected.allocPixels(info);
+    SkCanvas tmp(expected);
+    tmp.clear(expectedColor);
+    expected.setImmutable();
+
+    const float tols[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
+
+    auto error = std::function<ComparePixmapsErrorReporter>(
+        [reporter](int x, int y, const float diffs[4]) {
+            SkASSERT(x >= 0 && y >= 0);
+            ERRORF(reporter, "mismatch at %d, %d (%f, %f, %f %f)",
+                   x, y, diffs[0], diffs[1], diffs[2], diffs[3]);
+        });
+
+    return ComparePixels(expected.pixmap(), actual.pixmap(), tols, error);
+}
+
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceResolveTest, reporter, ctxInfo) {
+    auto dContext = ctxInfo.directContext();
+
+    SkImageInfo info = SkImageInfo::Make(8, 8, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+
+    auto managedTex = ManagedBackendTexture::MakeFromInfo(dContext,
+                                                          info,
+                                                          GrMipmapped::kNo,
+                                                          GrRenderable::kYes);
+    if (!managedTex) {
+        return;
+    }
+    auto tex = managedTex->texture();
+    // Wrap the backend surface but tell it rendering with MSAA so that the wrapped texture is the
+    // resolve.
+    sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(dContext,
+                                                                 tex,
+                                                                 kTopLeft_GrSurfaceOrigin,
+                                                                 /*sampleCnt=*/4,
+                                                                 kRGBA_8888_SkColorType,
+                                                                 nullptr, nullptr);
+
+    if (!surface) {
+        return;
+    }
+
+    const GrCaps* caps = dContext->priv().caps();
+    // In metal and vulkan if we prefer discardable msaa attachments we will also auto resolve. The
+    // GrBackendTexture and SkSurface are set up in a way that is compatible with discardable msaa
+    // for both backends.
+    bool autoResolves = caps->msaaResolvesAutomatically() ||
+                        caps->preferDiscardableMSAAAttachment();
+
+    // First do a simple test where we clear the surface than flush with SkSurface::flush. This
+    // should trigger the resolve and the texture should have the correct data.
+    surface->getCanvas()->clear(SK_ColorRED);
+    surface->flush();
+    dContext->submit();
+    REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorRED));
+
+    // Next try doing a GrDirectContext::flush which will not trigger a resolve on gpus without
+    // automatic msaa resolves.
+    surface->getCanvas()->clear(SK_ColorBLUE);
+    dContext->flush();
+    dContext->submit();
+    if (autoResolves) {
+        REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorBLUE));
+    } else {
+        REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorRED));
+    }
+
+    // Now doing a surface flush (even without any queued up normal work) should still resolve the
+    // surface.
+    surface->flush();
+    dContext->submit();
+    REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorBLUE));
+
+    // Test using SkSurface::resolve with a GrDirectContext::flush
+    surface->getCanvas()->clear(SK_ColorRED);
+    surface->resolveMSAA();
+    dContext->flush();
+    dContext->submit();
+    REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorRED));
+
+    // Calling resolve again should cause no issues as it is a no-op (there is an assert in the
+    // resolve op that the surface's msaa is dirty, we shouldn't hit that assert).
+    surface->resolveMSAA();
+    dContext->flush();
+    dContext->submit();
+    REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorRED));
+
+    // Try resolving in the middle of draw calls. Non automatic resolve gpus should only see the
+    // results of the first draw.
+    surface->getCanvas()->clear(SK_ColorGREEN);
+    surface->resolveMSAA();
+    surface->getCanvas()->clear(SK_ColorBLUE);
+    dContext->flush();
+    dContext->submit();
+    if (autoResolves) {
+        REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorBLUE));
+    } else {
+        REPORTER_ASSERT(reporter, check_pixels(reporter, dContext, tex, info, SK_ColorGREEN));
+    }
+
+    // Test that a resolve between draws to a different surface doesn't cause the OpsTasks for that
+    // surface to be split. Fails if we hit validation asserts in GrDrawingManager.
+    // First clear out dirty msaa from previous test
+    surface->flush();
+
+    auto otherSurface = SkSurface::MakeRenderTarget(dContext, SkBudgeted::kYes, info);
+    REPORTER_ASSERT(reporter, otherSurface);
+    otherSurface->getCanvas()->clear(SK_ColorRED);
+    surface->resolveMSAA();
+    otherSurface->getCanvas()->clear(SK_ColorBLUE);
+    dContext->flush();
+    dContext->submit();
+
+    // Make sure resolving a non-msaa surface doesn't trigger a resolve call. We'll hit an assert
+    // that the msaa is not dirty if it does.
+    REPORTER_ASSERT(reporter, otherSurface);
+    otherSurface->getCanvas()->clear(SK_ColorRED);
+    otherSurface->resolveMSAA();
+    dContext->flush();
+    dContext->submit();
+}
+
diff --git a/third_party/skia/tests/GrSurfaceTest.cpp b/third_party/skia/tests/GrSurfaceTest.cpp
index ab375c48cf96d..e6375178fdc92 100644
--- a/third_party/skia/tests/GrSurfaceTest.cpp
+++ b/third_party/skia/tests/GrSurfaceTest.cpp
@@ -264,8 +264,8 @@ DEF_GPUTEST(InitialTextureClear, reporter, baseOptions) {
                                 {kSize, kSize}, combo.fFormat, renderable, 1, fit, SkBudgeted::kYes,
                                 GrProtected::kNo);
                         if (proxy) {
-                            GrSwizzle swizzle = caps->getReadSwizzle(combo.fFormat,
-                                                                     combo.fColorType);
+                            skgpu::Swizzle swizzle = caps->getReadSwizzle(combo.fFormat,
+                                                                          combo.fColorType);
                             GrSurfaceProxyView view(std::move(proxy), kTopLeft_GrSurfaceOrigin,
                                                     swizzle);
                             GrColorInfo info(combo.fColorType, kPremul_SkAlphaType, nullptr);
@@ -364,8 +364,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadOnlyTexture, reporter, context_info) {
         auto proxy = proxyProvider->wrapBackendTexture(mbet->texture(), kBorrow_GrWrapOwnership,
                                                        GrWrapCacheable::kNo, ioType,
                                                        mbet->refCountedCallback());
-        GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(proxy->backendFormat(),
-                                                                    GrColorType::kRGBA_8888);
+        skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(proxy->backendFormat(),
+                                                                         GrColorType::kRGBA_8888);
         GrSurfaceProxyView view(proxy, kTopLeft_GrSurfaceOrigin, swizzle);
         auto surfContext = dContext->priv().makeSC(std::move(view), ii.colorInfo());
         // Read pixels should work with a read-only texture.
diff --git a/third_party/skia/tests/GrThreadSafeCacheTest.cpp b/third_party/skia/tests/GrThreadSafeCacheTest.cpp
index b5e47f0b57ab7..31de07707f165 100644
--- a/third_party/skia/tests/GrThreadSafeCacheTest.cpp
+++ b/third_party/skia/tests/GrThreadSafeCacheTest.cpp
@@ -53,9 +53,9 @@ static std::unique_ptr<skgpu::v1::SurfaceDrawContext> new_SDC(GrRecordingContext
                                                SkBudgeted::kYes);
 }
 
-static void create_view_key(GrUniqueKey* key, int wh, int id) {
-    static const GrUniqueKey::Domain kViewDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey::Builder builder(key, kViewDomain, 1);
+static void create_view_key(skgpu::UniqueKey* key, int wh, int id) {
+    static const skgpu::UniqueKey::Domain kViewDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey::Builder builder(key, kViewDomain, 1);
     builder[0] = wh;
     builder.finish();
 
@@ -64,9 +64,9 @@ static void create_view_key(GrUniqueKey* key, int wh, int id) {
     }
 }
 
-static void create_vert_key(GrUniqueKey* key, int wh, int id) {
-    static const GrUniqueKey::Domain kVertDomain = GrUniqueKey::GenerateDomain();
-    GrUniqueKey::Builder builder(key, kVertDomain, 1);
+static void create_vert_key(skgpu::UniqueKey* key, int wh, int id) {
+    static const skgpu::UniqueKey::Domain kVertDomain = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey::Builder builder(key, kVertDomain, 1);
     builder[0] = wh;
     builder.finish();
 
@@ -215,7 +215,7 @@ class TestHelper {
             return false;
         }
 
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         create_view_key(&key, wh, kNoID);
 
         auto threadSafeCache = this->threadSafeCache();
@@ -301,7 +301,7 @@ class TestHelper {
             return false;
         }
 
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         create_vert_key(&key, wh, kNoID);
 
         auto threadSafeCache = this->threadSafeCache();
@@ -500,7 +500,7 @@ class GrThreadSafeVertexTestOp : public GrDrawOp {
                 ++fStats->fNumLazyCreations;
             }
 
-            GrUniqueKey key;
+            skgpu::UniqueKey key;
             create_vert_key(&key, fWH, fID);
 
             // We can "fail the lookup" to simulate a threaded race condition
@@ -639,8 +639,8 @@ GrSurfaceProxyView TestHelper::CreateViewOnCpu(GrRecordingContext* rContext,
         return {};
     }
 
-    GrSwizzle swizzle = rContext->priv().caps()->getReadSwizzle(proxy->backendFormat(),
-                                                                GrColorType::kRGBA_8888);
+    skgpu::Swizzle swizzle = rContext->priv().caps()->getReadSwizzle(proxy->backendFormat(),
+                                                                     GrColorType::kRGBA_8888);
     ++stats->fNumSWCreations;
     return {std::move(proxy), kImageOrigin, swizzle};
 }
@@ -673,7 +673,7 @@ GrSurfaceProxyView TestHelper::AccessCachedView(GrRecordingContext* rContext,
                                                 int wh,
                                                 bool failLookup, bool failFillingIn, int id,
                                                 Stats* stats) {
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     create_view_key(&key, wh, id);
 
     if (GrDirectContext* dContext = rContext->asDirectContext()) {
@@ -1422,7 +1422,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrThreadSafeCache14, reporter, ctxInfo) {
 static void test_15(GrDirectContext* dContext, skiatest::Reporter* reporter,
                     TestHelper::addAccessFP addAccess,
                     TestHelper::checkFP check,
-                    void (*create_key)(GrUniqueKey*, int wh, int id)) {
+                    void (*create_key)(skgpu::UniqueKey*, int wh, int id)) {
 
     TestHelper helper(dContext);
 
@@ -1433,13 +1433,13 @@ static void test_15(GrDirectContext* dContext, skiatest::Reporter* reporter,
 
     REPORTER_ASSERT(reporter, helper.numCacheEntries() == 1);
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     (*create_key)(&key, kImageWH, kNoID);
 
-    GrUniqueKeyInvalidatedMessage msg(key, dContext->priv().contextID(),
+    skgpu::UniqueKeyInvalidatedMessage msg(key, dContext->priv().contextID(),
                                       /* inThreadSafeCache */ true);
 
-    SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(msg);
+    SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Post(msg);
 
     // This purge call is needed to process the invalidation messages
     dContext->purgeUnlockedResources(/* scratchResourcesOnly */ true);
@@ -1478,7 +1478,7 @@ static bool newer_is_always_better(SkData* /* incumbent */, SkData* /* challenge
 };
 
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrThreadSafeCache16Verts, reporter, ctxInfo) {
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     create_vert_key(&key, kImageWH, kNoID);
 
     TestHelper helper(ctxInfo.directContext(), newer_is_always_better);
diff --git a/third_party/skia/tests/ImageFilterTest.cpp b/third_party/skia/tests/ImageFilterTest.cpp
index d58a00497fb6f..39a93e77107b5 100644
--- a/third_party/skia/tests/ImageFilterTest.cpp
+++ b/third_party/skia/tests/ImageFilterTest.cpp
@@ -26,6 +26,7 @@
 #include "src/core/SkSpecialSurface.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrRecordingContextPriv.h"
+#include "src/image/SkImage_Base.h"
 #include "tests/Test.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
@@ -34,6 +35,8 @@ static const int kBitmapSize = 4;
 
 namespace {
 
+static constexpr GrSurfaceOrigin kTestSurfaceOrigin = kTopLeft_GrSurfaceOrigin;
+
 class MatrixTestImageFilter : public SkImageFilter_Base {
 public:
     static sk_sp<SkImageFilter> Make(skiatest::Reporter* reporter,
@@ -337,7 +340,8 @@ static sk_sp<SkSpecialSurface> create_empty_special_surface(GrRecordingContext*
                                              kPremul_SkAlphaType);
 
     if (rContext) {
-        return SkSpecialSurface::MakeRenderTarget(rContext, ii, SkSurfaceProps());
+        return SkSpecialSurface::MakeRenderTarget(rContext, ii, SkSurfaceProps(),
+                                                  kTestSurfaceOrigin);
     } else {
         return SkSpecialSurface::MakeRaster(ii, SkSurfaceProps());
     }
@@ -346,7 +350,8 @@ static sk_sp<SkSpecialSurface> create_empty_special_surface(GrRecordingContext*
 static sk_sp<SkSurface> create_surface(GrRecordingContext* rContext, int width, int height) {
     const SkImageInfo info = SkImageInfo::MakeN32(width, height, kOpaque_SkAlphaType);
     if (rContext) {
-        return SkSurface::MakeRenderTarget(rContext, SkBudgeted::kNo, info);
+        return SkSurface::MakeRenderTarget(rContext, SkBudgeted::kNo, info,
+                                           0, kTestSurfaceOrigin, nullptr);
     } else {
         return SkSurface::MakeRaster(info);
     }
@@ -490,8 +495,8 @@ static void test_cropRects(skiatest::Reporter* reporter, GrRecordingContext* rCo
         SkImageFilter_Base::Context ctx(SkMatrix::I(), SkIRect::MakeWH(100, 100), nullptr,
                                         kN32_SkColorType, nullptr, srcImg.get());
         sk_sp<SkSpecialImage> resultImg(as_IFB(filter)->filterImage(ctx).imageAndOffset(&offset));
-        REPORTER_ASSERT(reporter, resultImg, filters.getName(i));
-        REPORTER_ASSERT(reporter, offset.fX == 20 && offset.fY == 30, filters.getName(i));
+        REPORTER_ASSERT(reporter, resultImg, "%s", filters.getName(i));
+        REPORTER_ASSERT(reporter, offset.fX == 20 && offset.fY == 30, "%s", filters.getName(i));
     }
 }
 
@@ -809,7 +814,7 @@ DEF_TEST(ImageFilterDrawTiled, reporter) {
             }
 
             if (!ToolUtils::equal_pixels(untiledResult, tiledResult)) {
-                REPORTER_ASSERT(reporter, false, filters.getName(i));
+                ERRORF(reporter, "%s", filters.getName(i));
                 break;
             }
         }
@@ -1738,6 +1743,13 @@ static void test_make_with_filter(skiatest::Reporter* reporter, GrRecordingConte
         result = sourceImage->makeWithFilter(rContext, filter.get(), subset, clipBounds,
                                              &outSubset, &offset);
         REPORTER_ASSERT(reporter, result);
+
+        // In GPU-mode, we want the result image (and all intermediate steps) to have used the same
+        // origin as the original surface.
+        if (rContext) {
+            auto [proxyView, _] = as_IB(result)->asView(rContext, GrMipmapped::kNo);
+            REPORTER_ASSERT(reporter, proxyView && proxyView.origin() == kTestSurfaceOrigin);
+        }
     }
 }
 
diff --git a/third_party/skia/tests/ImageGeneratorTest.cpp b/third_party/skia/tests/ImageGeneratorTest.cpp
index 8e6d5ae7ad357..7411e6f22b0c2 100644
--- a/third_party/skia/tests/ImageGeneratorTest.cpp
+++ b/third_party/skia/tests/ImageGeneratorTest.cpp
@@ -76,7 +76,7 @@ DEF_TEST(ImageGenerator, reporter) {
     ig.getYUVAPlanes(yuvaPixmaps);
 
     // Suppressed due to https://code.google.com/p/skia/issues/detail?id=4339
-    if (false) {
+    if ((false)) {
         test_imagegenerator_factory(reporter);
     }
 }
diff --git a/third_party/skia/tests/JSONTest.cpp b/third_party/skia/tests/JSONTest.cpp
index 66b801db6ee82..610a9e80c043e 100644
--- a/third_party/skia/tests/JSONTest.cpp
+++ b/third_party/skia/tests/JSONTest.cpp
@@ -179,19 +179,21 @@ static void check_vector(skiatest::Reporter* reporter, const Value& v, size_t ex
 static void check_string(skiatest::Reporter* reporter, const Value& v, const char* s) {
     check_vector<StringValue>(reporter, v, s ? strlen(s) : 0, !!s);
     if (s) {
+        REPORTER_ASSERT(reporter, v.as<StringValue>().str() == s);
         REPORTER_ASSERT(reporter, !strcmp(v.as<StringValue>().begin(), s));
     }
 }
 
 DEF_TEST(JSON_DOM_visit, reporter) {
-    static constexpr char json[] = "{ \n\
-        \"k1\": null,                \n\
-        \"k2\": false,               \n\
-        \"k3\": true,                \n\
-        \"k4\": 42,                  \n\
-        \"k5\": .75,                 \n\
-        \"k6\": \"foo\",             \n\
-        \"k7\": [ 1, true, \"bar\" ], \n\
+    static constexpr char json[] = "{     \n\
+        \"k1\": null,                     \n\
+        \"k2\": false,                    \n\
+        \"k3\": true,                     \n\
+        \"k4\": 42,                       \n\
+        \"k5\": .75,                      \n\
+        \"k6\": \"foo\",                  \n\
+        \"k6b\": \"this string is long\", \n\
+        \"k7\": [ 1, true, \"bar\" ],     \n\
         \"k8\": { \"kk1\": 2, \"kk2\": false, \"kk1\": \"baz\" } \n\
     }";
 
@@ -272,6 +274,18 @@ DEF_TEST(JSON_DOM_visit, reporter) {
         check_vector<ObjectValue>(reporter, v, 0, false);
     }
 
+    {
+        const auto& v = jroot["k6b"];
+        REPORTER_ASSERT(reporter, !v.is<NullValue>());
+
+        check_primitive<bool, BoolValue>(reporter, v, false, false);
+        check_primitive<float, NumberValue>(reporter, v, 0, false);
+
+        check_string(reporter, v, "this string is long");
+        check_vector<ArrayValue >(reporter, v, 0, false);
+        check_vector<ObjectValue>(reporter, v, 0, false);
+    }
+
     {
         const auto& v = jroot["k7"];
         REPORTER_ASSERT(reporter, !v.is<NullValue>());
diff --git a/third_party/skia/tests/LazyProxyTest.cpp b/third_party/skia/tests/LazyProxyTest.cpp
index 99ac10fa53f61..be6ef56ffbbf6 100644
--- a/third_party/skia/tests/LazyProxyTest.cpp
+++ b/third_party/skia/tests/LazyProxyTest.cpp
@@ -143,7 +143,7 @@ class LazyProxyTest final : public GrOnFlushCallbackObject {
             static const GrSurfaceOrigin kOrigin = kBottomLeft_GrSurfaceOrigin;
             const GrBackendFormat format =
                 ctx->priv().caps()->getDefaultBackendFormat(kColorType, GrRenderable::kYes);
-            GrSwizzle readSwizzle = ctx->priv().caps()->getReadSwizzle(format, kColorType);
+            skgpu::Swizzle readSwizzle = ctx->priv().caps()->getReadSwizzle(format, kColorType);
             fLazyProxy = GrProxyProvider::MakeFullyLazyProxy(
                     [this](GrResourceProvider* rp, const GrSurfaceProxy::LazySurfaceDesc&)
                             -> GrSurfaceProxy::LazyCallbackResult {
@@ -167,7 +167,7 @@ class LazyProxyTest final : public GrOnFlushCallbackObject {
         std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override {
             return nullptr;
         }
-        void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+        void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
         bool onIsEqual(const GrFragmentProcessor&) const override { return false; }
 
         GrRecordingContext* const fContext;
diff --git a/third_party/skia/tests/MathTest.cpp b/third_party/skia/tests/MathTest.cpp
index fbdc97b837d51..4a88be6515a6d 100644
--- a/third_party/skia/tests/MathTest.cpp
+++ b/third_party/skia/tests/MathTest.cpp
@@ -133,7 +133,7 @@ static int (*blend_functions[])(int, int, int) = {
 static void test_blend31() {
     int failed = 0;
     int death = 0;
-    if (false) { // avoid bit rot, suppress warning
+    if ((false)) { // avoid bit rot, suppress warning
         failed = (*blend_functions[0])(0,0,0);
     }
     for (int src = 0; src <= 255; src++) {
@@ -507,10 +507,10 @@ DEF_TEST(Math, reporter) {
         REPORTER_ASSERT(reporter, result == (int32_t)check);
     }
 
-    if (false) test_floor(reporter);
+    if ((false)) test_floor(reporter);
 
     // disable for now
-    if (false) test_blend31();  // avoid bit rot, suppress warning
+    if ((false)) test_blend31();  // avoid bit rot, suppress warning
 
     test_clz(reporter);
     test_ctz(reporter);
diff --git a/third_party/skia/tests/MtlBackendAllocationTest.mm b/third_party/skia/tests/MtlBackendAllocationTest.mm
index 5f55f962a94e7..904d44fca5601 100644
--- a/third_party/skia/tests/MtlBackendAllocationTest.mm
+++ b/third_party/skia/tests/MtlBackendAllocationTest.mm
@@ -139,16 +139,16 @@ void test_color_init(GrDirectContext*,
                     // Ideally we'd update our validation code to use a "raw" read that doesn't
                     // impose a color type but for now we just munge the data we upload to match the
                     // expectation.
-                    GrSwizzle swizzle;
+                    skgpu::Swizzle swizzle;
                     switch (combo.fColorType) {
                         case GrColorType::kAlpha_8:
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         case GrColorType::kAlpha_16:
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         case GrColorType::kAlpha_F16:
-                            swizzle = GrSwizzle("aaaa");
+                            swizzle = skgpu::Swizzle("aaaa");
                             break;
                         default:
                             break;
diff --git a/third_party/skia/tests/OpChainTest.cpp b/third_party/skia/tests/OpChainTest.cpp
index a7b0db7ee35c0..521f13ff41e10 100644
--- a/third_party/skia/tests/OpChainTest.cpp
+++ b/third_party/skia/tests/OpChainTest.cpp
@@ -187,7 +187,7 @@ DEF_GPUTEST(OpChainTest, reporter, /*ctxInfo*/) {
     SkASSERT(proxy);
     proxy->instantiate(dContext->priv().resourceProvider());
 
-    GrSwizzle writeSwizzle = caps->getWriteSwizzle(format, GrColorType::kRGBA_8888);
+    skgpu::Swizzle writeSwizzle = caps->getWriteSwizzle(format, GrColorType::kRGBA_8888);
 
     int result[result_width()];
     int validResult[result_width()];
diff --git a/third_party/skia/tests/PathCoverageTest.cpp b/third_party/skia/tests/PathCoverageTest.cpp
index 291dd0fa9f74e..877591e3ec87c 100644
--- a/third_party/skia/tests/PathCoverageTest.cpp
+++ b/third_party/skia/tests/PathCoverageTest.cpp
@@ -124,11 +124,9 @@ static bool one_d_pe(const int* array, const unsigned int count,
         uint32_t estimatedCount =
             quadraticPointCount_EE(path);
 
-        if (false) { // avoid bit rot, suppress warning
-            computedCount =
-                    quadraticPointCount_EC(path, SkIntToScalar(1));
-            estimatedCount =
-                    quadraticPointCount_CE(path);
+        if ((false)) { // avoid bit rot, suppress warning
+            computedCount = quadraticPointCount_EC(path, SkIntToScalar(1));
+            estimatedCount = quadraticPointCount_CE(path);
         }
         // Allow estimated to be high by a factor of two, but no less than
         // the computed value.
diff --git a/third_party/skia/tests/PathOpsBuilderConicTest.cpp b/third_party/skia/tests/PathOpsBuilderConicTest.cpp
index dd6a61e9db526..a8a9ba77ffe34 100644
--- a/third_party/skia/tests/PathOpsBuilderConicTest.cpp
+++ b/third_party/skia/tests/PathOpsBuilderConicTest.cpp
@@ -626,17 +626,19 @@ const char ovalsAsQuads[] = "M 146.4187316894531 136.5"
 #include "include/utils/SkParsePath.h"
 
 DEF_TEST(PathOpsOvalsAsQuads, reporter) {
-    return; // don't execute this for now
-    SkPath path;
-    SkParsePath::FromSVGString(ovalsAsQuads, &path);
-    Simplify(path, &path);
+    if ((false)) { // don't execute this for now
+        SkPath path;
+        SkParsePath::FromSVGString(ovalsAsQuads, &path);
+        Simplify(path, &path);
+    }
 }
 
 DEF_TEST(PathOps64OvalsAsQuads, reporter) {
-    return; // don't execute this for now
-    SkPath path, result;
-    SkOpBuilder builder;
-    SkParsePath::FromSVGString(ovalsAsQuads, &path);
-    OvalSet set = {{0, 0, 0, 0}, 2, 3, 9, 100, 100};
-    testOvalSet(set, path, &builder, nullptr, &result);
+    if ((false)) { // don't execute this for now
+        SkPath path, result;
+        SkOpBuilder builder;
+        SkParsePath::FromSVGString(ovalsAsQuads, &path);
+        OvalSet set = {{0, 0, 0, 0}, 2, 3, 9, 100, 100};
+        testOvalSet(set, path, &builder, nullptr, &result);
+    }
 }
diff --git a/third_party/skia/tests/PathOpsCubicIntersectionTest.cpp b/third_party/skia/tests/PathOpsCubicIntersectionTest.cpp
index 0248f41658c96..cc06e2a9bed94 100644
--- a/third_party/skia/tests/PathOpsCubicIntersectionTest.cpp
+++ b/third_party/skia/tests/PathOpsCubicIntersectionTest.cpp
@@ -730,6 +730,6 @@ DEF_TEST(PathOpsCubicIntersection, reporter) {
     cubicIntersectionSelfTest(reporter);
     cubicIntersectionCoinTest(reporter);
     standardTestCases(reporter);
-    if (false) CubicIntersection_IntersectionFinder();
-    if (false) CubicIntersection_RandTest(reporter);
+    if ((false)) CubicIntersection_IntersectionFinder();
+    if ((false)) CubicIntersection_RandTest(reporter);
 }
diff --git a/third_party/skia/tests/PathOpsCubicLineIntersectionIdeas.cpp b/third_party/skia/tests/PathOpsCubicLineIntersectionIdeas.cpp
index 8977992c56ade..9b17f8293524a 100644
--- a/third_party/skia/tests/PathOpsCubicLineIntersectionIdeas.cpp
+++ b/third_party/skia/tests/PathOpsCubicLineIntersectionIdeas.cpp
@@ -271,17 +271,19 @@ static double testOneFailure(const CubicLineFailures& failure) {
 }
 
 DEF_TEST(PathOpsCubicLineFailures, reporter) {
-    return;  // disable for now
-    for (int index = 0; index < cubicLineFailuresCount; ++index) {
-        const CubicLineFailures& failure = cubicLineFailures[index];
-        double newT = testOneFailure(failure);
-        SkASSERT_RELEASE(newT >= 0);
+    if ((false)) {  // disable for now
+        for (int index = 0; index < cubicLineFailuresCount; ++index) {
+            const CubicLineFailures& failure = cubicLineFailures[index];
+            double newT = testOneFailure(failure);
+            SkASSERT_RELEASE(newT >= 0);
+        }
     }
 }
 
 DEF_TEST(PathOpsCubicLineOneFailure, reporter) {
-    return;  // disable for now
-    const CubicLineFailures& failure = cubicLineFailures[1];
-    double newT = testOneFailure(failure);
-    SkASSERT_RELEASE(newT >= 0);
+    if ((false)) {  // disable for now
+        const CubicLineFailures& failure = cubicLineFailures[1];
+        double newT = testOneFailure(failure);
+        SkASSERT_RELEASE(newT >= 0);
+    }
 }
diff --git a/third_party/skia/tests/PathOpsQuadIntersectionTest.cpp b/third_party/skia/tests/PathOpsQuadIntersectionTest.cpp
index e126c63c17041..dc6113b3e352a 100644
--- a/third_party/skia/tests/PathOpsQuadIntersectionTest.cpp
+++ b/third_party/skia/tests/PathOpsQuadIntersectionTest.cpp
@@ -524,7 +524,7 @@ DEF_TEST(PathOpsQuadIntersection, reporter) {
     oneOffTests(reporter);
     coincidentTest(reporter);
     standardTestCases(reporter);
-    if (false) QuadraticIntersection_IntersectionFinder();
+    if ((false)) QuadraticIntersection_IntersectionFinder();
 }
 
 DEF_TEST(PathOpsQuadBinaryProfile, reporter) {
diff --git a/third_party/skia/tests/PathRendererCacheTests.cpp b/third_party/skia/tests/PathRendererCacheTests.cpp
index c3966abbb03b5..81acded4b4e55 100644
--- a/third_party/skia/tests/PathRendererCacheTests.cpp
+++ b/third_party/skia/tests/PathRendererCacheTests.cpp
@@ -14,6 +14,7 @@
 #include "src/gpu/GrRecordingContextPriv.h"
 #include "src/gpu/GrResourceCache.h"
 #include "src/gpu/GrStyle.h"
+#include "src/gpu/GrUserStencilSettings.h"
 #include "src/gpu/effects/GrPorterDuffXferProcessor.h"
 #include "src/gpu/geometry/GrStyledShape.h"
 #include "src/gpu/ops/SoftwarePathRenderer.h"
diff --git a/third_party/skia/tests/PathTest.cpp b/third_party/skia/tests/PathTest.cpp
index ab12551a6c0ae..19ee68e050eb8 100644
--- a/third_party/skia/tests/PathTest.cpp
+++ b/third_party/skia/tests/PathTest.cpp
@@ -5486,7 +5486,7 @@ DEF_TEST(Path_shrinkToFit, reporter) {
         REPORTER_ASSERT(reporter, after == after2);
 #endif
     }
-    if (false) {
+    if ((false)) {
         SkDebugf("max_free %zu\n", max_free);
     }
 }
diff --git a/third_party/skia/tests/PolyUtilsTest.cpp b/third_party/skia/tests/PolyUtilsTest.cpp
index 8535157d538ef..7c1d6dcf374f2 100644
--- a/third_party/skia/tests/PolyUtilsTest.cpp
+++ b/third_party/skia/tests/PolyUtilsTest.cpp
@@ -252,6 +252,165 @@ DEF_TEST(PolyUtils, reporter) {
     // running this just to make sure it doesn't crash
     REPORTER_ASSERT(reporter, !SkTriangulateSimplePolygon(poly.begin(), indexMap, poly.count(),
                                                           &triangleIndices));
+
+    // self-intersecting polygon with two equal edges
+    poly.rewind();
+    *poly.push() = SkPoint::Make(0.0f, 0.0f);
+    *poly.push() = SkPoint::Make(10, 0);
+    *poly.push() = SkPoint::Make(0, 10);
+    *poly.push() = SkPoint::Make(10, 10);
+    *poly.push() = SkPoint::Make(10, 0);
+    *poly.push() = SkPoint::Make(0, 10);
+    REPORTER_ASSERT(reporter, SkGetPolygonWinding(poly.begin(), poly.count()) == 0);
+    REPORTER_ASSERT(reporter, !SkIsConvexPolygon(poly.begin(), poly.count()));
+    REPORTER_ASSERT(reporter, !SkIsSimplePolygon(poly.begin(), poly.count()));
+    triangleIndices.rewind();
+    // running this just to make sure it doesn't crash
+    REPORTER_ASSERT(reporter, !SkTriangulateSimplePolygon(poly.begin(), indexMap, poly.count(),
+                                                          &triangleIndices));
+
+    // absurd self-intersecting polygon
+    poly.rewind();
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, -10411310938997512334153865557442560.0000f);
+    *poly.push() = SkPoint::Make(-32768.7500f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3172.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -2147485952.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 170.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(137.0000f, 4105.6875f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3283.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 821.1250f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -30897.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.5625f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3526523879424.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.9375f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(129.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 859832320.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 129.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-33554468.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 219.0000f);
+    *poly.push() = SkPoint::Make(3220.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-35840.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -41625560509365411790244566154608640.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 215282736.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-41625560509365411790244566154608640.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(215282736.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3156.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 129.0000f);
+    *poly.push() = SkPoint::Make(7433.6875f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(59324728941049917997056.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-35840.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(137.0000f, 4105.6875f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3283.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.5625f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-44882437151680690189392273689542656.0000f, 134217728.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 217055232.0000f);
+    *poly.push() = SkPoint::Make(138.3125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.5625f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(2152988672.0000f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    *poly.push() = SkPoint::Make(138.0000f, 3284.8125f);
+    *poly.push() = SkPoint::Make(0.0000f, -32768.0625f);
+    *poly.push() = SkPoint::Make(0.0000f, 138.0000f);
+    *poly.push() = SkPoint::Make(3284.8125f, 0.0000f);
+    *poly.push() = SkPoint::Make(-32768.0625f, 0.0000f);
+    REPORTER_ASSERT(reporter, SkGetPolygonWinding(poly.begin(), poly.count()) < 0);
+    REPORTER_ASSERT(reporter, !SkIsConvexPolygon(poly.begin(), poly.count()));
+    REPORTER_ASSERT(reporter, !SkIsSimplePolygon(poly.begin(), poly.count()));
+    triangleIndices.rewind();
+    // running this just to make sure it doesn't crash
+    REPORTER_ASSERT(reporter, SkTriangulateSimplePolygon(poly.begin(), indexMap, poly.count(),
+                                                          &triangleIndices));
 }
 
 struct PtSet {
diff --git a/third_party/skia/tests/PremulAlphaRoundTripTest.cpp b/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
index 61542f527fe0a..099b95d8abd6c 100644
--- a/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
+++ b/third_party/skia/tests/PremulAlphaRoundTripTest.cpp
@@ -10,6 +10,7 @@
 #include "include/core/SkSurface.h"
 #include "include/gpu/GrDirectContext.h"
 #include "src/core/SkConvertPixels.h"
+#include "src/gpu/GrDataUtils.h"
 #include "src/gpu/GrPixmap.h"
 #include "tests/Test.h"
 #include "tools/ToolUtils.h"
diff --git a/third_party/skia/tests/PrimitiveProcessorTest.cpp b/third_party/skia/tests/PrimitiveProcessorTest.cpp
index c3b64d0d46ec6..03b7a936ab990 100644
--- a/third_party/skia/tests/PrimitiveProcessorTest.cpp
+++ b/third_party/skia/tests/PrimitiveProcessorTest.cpp
@@ -21,6 +21,7 @@
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/ops/GrMeshDrawOp.h"
@@ -94,7 +95,7 @@ class Op : public GrMeshDrawOp {
 
                 return std::make_unique<Impl>();
             }
-            void addToKey(const GrShaderCaps&, GrProcessorKeyBuilder* builder) const override {
+            void addToKey(const GrShaderCaps&, skgpu::KeyBuilder* builder) const override {
                 builder->add32(fNumAttribs);
             }
 
@@ -109,13 +110,13 @@ class Op : public GrMeshDrawOp {
                     // component count to fit within the limits for iOS Metal.
                     if (i & 0x1) {
                         fAttributes[i] = {fAttribNames[i].c_str(), kFloat_GrVertexAttribType,
-                                                                   kFloat_GrSLType};
+                                                                   SkSLType::kFloat};
                     } else {
                         fAttributes[i] = {fAttribNames[i].c_str(), kFloat2_GrVertexAttribType,
-                                                                   kFloat2_GrSLType};
+                                                                   SkSLType::kFloat2};
                     }
                 }
-                this->setVertexAttributes(fAttributes.get(), numAttribs);
+                this->setVertexAttributesWithImplicitOffsets(fAttributes.get(), numAttribs);
             }
 
             int fNumAttribs;
diff --git a/third_party/skia/tests/ProcessorTest.cpp b/third_party/skia/tests/ProcessorTest.cpp
index c5d96c6327445..05f5528ed11d5 100644
--- a/third_party/skia/tests/ProcessorTest.cpp
+++ b/third_party/skia/tests/ProcessorTest.cpp
@@ -16,6 +16,7 @@
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/effects/GrTextureEffect.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -98,7 +99,7 @@ class TestFP : public GrFragmentProcessor {
 
     const char* name() const override { return "test"; }
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder* b) const override {
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder* b) const override {
         static std::atomic<int32_t> nextKey{0};
         b->add32(nextKey++);
     }
@@ -149,7 +150,8 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ProcessorRefTest, reporter, ctxInfo) {
     const GrBackendFormat format =
         dContext->priv().caps()->getDefaultBackendFormat(GrColorType::kRGBA_8888,
                                                          GrRenderable::kNo);
-    GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(format, GrColorType::kRGBA_8888);
+    skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(format,
+                                                                     GrColorType::kRGBA_8888);
 
     for (bool makeClone : {false, true}) {
         for (int parentCnt = 0; parentCnt < 2; parentCnt++) {
@@ -477,36 +479,38 @@ static bool legal_modulation(const GrColor inGr[3], const GrColor outGr[3]) {
                                   fuzzy_color_equals(outf[2], expectedForAlphaModulation[2]);
 
     // This can be enabled to print the values that caused this check to fail.
-    if (0 && !isLegalColorModulation && !isLegalAlphaModulation) {
-        SkDebugf("Color modulation test\n\timplied mod color: (%.03f, %.03f, %.03f, %.03f)\n",
-                 fpPreColorModulation[0],
-                 fpPreColorModulation[1],
-                 fpPreColorModulation[2],
-                 fpPreColorModulation[3]);
-        for (int i = 0; i < 3; ++i) {
-            SkDebugf("\t(%.03f, %.03f, %.03f, %.03f) -> "
-                     "(%.03f, %.03f, %.03f, %.03f) | "
-                     "(%.03f, %.03f, %.03f, %.03f), ok: %d\n",
-                     inf[i].fR, inf[i].fG, inf[i].fB, inf[i].fA,
-                     outf[i].fR, outf[i].fG, outf[i].fB, outf[i].fA,
-                     expectedForColorModulation[i].fR, expectedForColorModulation[i].fG,
-                     expectedForColorModulation[i].fB, expectedForColorModulation[i].fA,
-                     fuzzy_color_equals(outf[i], expectedForColorModulation[i]));
-        }
-        SkDebugf("Alpha modulation test\n\timplied mod color: (%.03f, %.03f, %.03f, %.03f)\n",
-                 fpPreAlphaModulation[0],
-                 fpPreAlphaModulation[1],
-                 fpPreAlphaModulation[2],
-                 fpPreAlphaModulation[3]);
-        for (int i = 0; i < 3; ++i) {
-            SkDebugf("\t(%.03f, %.03f, %.03f, %.03f) -> "
-                     "(%.03f, %.03f, %.03f, %.03f) | "
-                     "(%.03f, %.03f, %.03f, %.03f), ok: %d\n",
-                     inf[i].fR, inf[i].fG, inf[i].fB, inf[i].fA,
-                     outf[i].fR, outf[i].fG, outf[i].fB, outf[i].fA,
-                     expectedForAlphaModulation[i].fR, expectedForAlphaModulation[i].fG,
-                     expectedForAlphaModulation[i].fB, expectedForAlphaModulation[i].fA,
-                     fuzzy_color_equals(outf[i], expectedForAlphaModulation[i]));
+    if ((false)) {
+        if (!isLegalColorModulation && !isLegalAlphaModulation) {
+            SkDebugf("Color modulation test\n\timplied mod color: (%.03f, %.03f, %.03f, %.03f)\n",
+                     fpPreColorModulation[0],
+                     fpPreColorModulation[1],
+                     fpPreColorModulation[2],
+                     fpPreColorModulation[3]);
+            for (int i = 0; i < 3; ++i) {
+                SkDebugf("\t(%.03f, %.03f, %.03f, %.03f) -> "
+                         "(%.03f, %.03f, %.03f, %.03f) | "
+                         "(%.03f, %.03f, %.03f, %.03f), ok: %d\n",
+                         inf[i].fR, inf[i].fG, inf[i].fB, inf[i].fA,
+                         outf[i].fR, outf[i].fG, outf[i].fB, outf[i].fA,
+                         expectedForColorModulation[i].fR, expectedForColorModulation[i].fG,
+                         expectedForColorModulation[i].fB, expectedForColorModulation[i].fA,
+                         fuzzy_color_equals(outf[i], expectedForColorModulation[i]));
+            }
+            SkDebugf("Alpha modulation test\n\timplied mod color: (%.03f, %.03f, %.03f, %.03f)\n",
+                     fpPreAlphaModulation[0],
+                     fpPreAlphaModulation[1],
+                     fpPreAlphaModulation[2],
+                     fpPreAlphaModulation[3]);
+            for (int i = 0; i < 3; ++i) {
+                SkDebugf("\t(%.03f, %.03f, %.03f, %.03f) -> "
+                         "(%.03f, %.03f, %.03f, %.03f) | "
+                         "(%.03f, %.03f, %.03f, %.03f), ok: %d\n",
+                         inf[i].fR, inf[i].fG, inf[i].fB, inf[i].fA,
+                         outf[i].fR, outf[i].fG, outf[i].fB, outf[i].fA,
+                         expectedForAlphaModulation[i].fR, expectedForAlphaModulation[i].fG,
+                         expectedForAlphaModulation[i].fB, expectedForAlphaModulation[i].fA,
+                         fuzzy_color_equals(outf[i], expectedForAlphaModulation[i]));
+            }
         }
     }
     return isLegalColorModulation || isLegalAlphaModulation;
@@ -737,13 +741,13 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ProcessorOptimizationValidationTest, repor
 
                 // Print first failing pixel's details.
                 if (!coverageMessage.isEmpty()) {
-                    ERRORF(reporter, coverageMessage.c_str());
+                    ERRORF(reporter, "%s", coverageMessage.c_str());
                 }
                 if (!constMessage.isEmpty()) {
-                    ERRORF(reporter, constMessage.c_str());
+                    ERRORF(reporter, "%s", constMessage.c_str());
                 }
                 if (!opaqueMessage.isEmpty()) {
-                    ERRORF(reporter, opaqueMessage.c_str());
+                    ERRORF(reporter, "%s", opaqueMessage.c_str());
                 }
 
                 if (!loggedFirstFailure) {
diff --git a/third_party/skia/tests/ProgramsTest.cpp b/third_party/skia/tests/ProgramsTest.cpp
index a23e0ea45fbf8..2abd3801c9d0e 100644
--- a/third_party/skia/tests/ProgramsTest.cpp
+++ b/third_party/skia/tests/ProgramsTest.cpp
@@ -20,6 +20,7 @@
 #include "src/gpu/GrPipeline.h"
 #include "src/gpu/GrProxyProvider.h"
 #include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/effects/GrBlendFragmentProcessor.h"
 #include "src/gpu/effects/GrPorterDuffXferProcessor.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
@@ -63,7 +64,7 @@ class BigKeyProcessor : public GrFragmentProcessor {
 
 private:
     BigKeyProcessor() : INHERITED(kBigKeyProcessor_ClassID, kNone_OptimizationFlags) {}
-    void onAddToKey(const GrShaderCaps& caps, GrProcessorKeyBuilder* b) const override {
+    void onAddToKey(const GrShaderCaps& caps, skgpu::KeyBuilder* b) const override {
         for (uint32_t i = 0; i < kMaxKeySize; i++) {
             b->add32(i);
         }
@@ -119,7 +120,7 @@ class BlockInputFragmentProcessor : public GrFragmentProcessor {
         this->registerChild(std::move(child));
     }
 
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
 
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
@@ -253,7 +254,7 @@ bool GrDrawingManager::ProgramUnitTest(GrDirectContext* direct, int maxStages, i
         auto proxy = proxyProvider->createProxy(format, kDims, GrRenderable::kYes, 1,
                                                 mipMapped, SkBackingFit::kExact, SkBudgeted::kNo,
                                                 GrProtected::kNo, GrInternalSurfaceFlags::kNone);
-        GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kRGBA_8888);
+        skgpu::Swizzle swizzle = caps->getReadSwizzle(format, GrColorType::kRGBA_8888);
         views[0] = {{std::move(proxy), kBottomLeft_GrSurfaceOrigin, swizzle},
                     GrColorType::kRGBA_8888, kPremul_SkAlphaType};
     }
@@ -264,7 +265,7 @@ bool GrDrawingManager::ProgramUnitTest(GrDirectContext* direct, int maxStages, i
         auto proxy = proxyProvider->createProxy(format, kDims, GrRenderable::kNo, 1, mipMapped,
                                                 SkBackingFit::kExact, SkBudgeted::kNo,
                                                 GrProtected::kNo, GrInternalSurfaceFlags::kNone);
-        GrSwizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
+        skgpu::Swizzle swizzle = caps->getReadSwizzle(format, GrColorType::kAlpha_8);
         views[1] = {{std::move(proxy), kTopLeft_GrSurfaceOrigin, swizzle},
                       GrColorType::kAlpha_8, kPremul_SkAlphaType};
     }
diff --git a/third_party/skia/tests/PromiseImageTest.cpp b/third_party/skia/tests/PromiseImageTest.cpp
index 5f8c7c6b0f8c3..3622b4be21e82 100644
--- a/third_party/skia/tests/PromiseImageTest.cpp
+++ b/third_party/skia/tests/PromiseImageTest.cpp
@@ -33,16 +33,6 @@ struct PromiseTextureChecker {
     int fFulfillCount = 0;
     int fReleaseCount = 0;
 
-    /**
-     * Releases the SkPromiseImageTexture. Used to test that cached GrTexture representations
-     * in the cache are freed.
-     */
-    void releaseTexture() { fTexture.reset(); }
-
-    SkTArray<GrUniqueKey> uniqueKeys() const {
-        return fTexture->testingOnly_uniqueKeysToInvalidate();
-    }
-
     static sk_sp<SkPromiseImageTexture> Fulfill(void* self) {
         auto checker = static_cast<PromiseTextureChecker*>(self);
         checker->fFulfillCount++;
diff --git a/third_party/skia/tests/RRectInPathTest.cpp b/third_party/skia/tests/RRectInPathTest.cpp
index 45aa0a2047b15..62dda15b56dfc 100644
--- a/third_party/skia/tests/RRectInPathTest.cpp
+++ b/third_party/skia/tests/RRectInPathTest.cpp
@@ -484,7 +484,7 @@ DEF_TEST(RRect_fragile, reporter) {
 
     SkRRect rr;
     // please don't assert
-    if (false) {    // disable until we fix this
+    if ((false)) {    // disable until we fix this
         SkDebugf("%g 0x%08X\n", rect.fLeft, SkFloat2Bits(rect.fLeft));
         rr.setRectRadii(rect, radii);
     }
diff --git a/third_party/skia/tests/ReadWritePixelsGpuTest.cpp b/third_party/skia/tests/ReadWritePixelsGpuTest.cpp
index 8fd263aa2f27c..46c9bd44aa2e2 100644
--- a/third_party/skia/tests/ReadWritePixelsGpuTest.cpp
+++ b/third_party/skia/tests/ReadWritePixelsGpuTest.cpp
@@ -51,6 +51,7 @@ static constexpr int min_rgb_channel_bits(SkColorType ct) {
         case kRGBA_F16_SkColorType:           return 10;  // just counting the mantissa
         case kRGBA_F32_SkColorType:           return 23;  // just counting the mantissa
         case kR16G16B16A16_unorm_SkColorType: return 16;
+        case kR8_unorm_SkColorType:           return 8;
     }
     SkUNREACHABLE;
 }
@@ -79,6 +80,7 @@ static constexpr int alpha_channel_bits(SkColorType ct) {
         case kRGBA_F16_SkColorType:           return 10;  // just counting the mantissa
         case kRGBA_F32_SkColorType:           return 23;  // just counting the mantissa
         case kR16G16B16A16_unorm_SkColorType: return 16;
+        case kR8_unorm_SkColorType:           return 0;
     }
     SkUNREACHABLE;
 }
diff --git a/third_party/skia/tests/RecordingXfermodeTest.cpp b/third_party/skia/tests/RecordingXfermodeTest.cpp
index 9dad24e0d1ac0..ecd59a26670f7 100644
--- a/third_party/skia/tests/RecordingXfermodeTest.cpp
+++ b/third_party/skia/tests/RecordingXfermodeTest.cpp
@@ -171,6 +171,6 @@ DEF_TEST(SkRecordingAccuracyXfermode, reporter) {
     }
 
 #if !FINEGRAIN
-    REPORTER_ASSERT(reporter, 0 == numErrors, errors.c_str());
+    REPORTER_ASSERT(reporter, 0 == numErrors, "%s", errors.c_str());
 #endif
 }
diff --git a/third_party/skia/tests/RectangleTextureTest.cpp b/third_party/skia/tests/RectangleTextureTest.cpp
index ef88be83092d4..267f057973db6 100644
--- a/third_party/skia/tests/RectangleTextureTest.cpp
+++ b/third_party/skia/tests/RectangleTextureTest.cpp
@@ -172,8 +172,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) {
         SkASSERT(rectProxy->peekTexture()->hasRestrictedSampling());
 
         GrImageInfo grII = ii;
-        GrSwizzle swizzle = dContext->priv().caps()->getReadSwizzle(rectangleTex.getBackendFormat(),
-                                                                    grII.colorType());
+        skgpu::Swizzle swizzle = dContext->priv().caps()->getReadSwizzle(
+                rectangleTex.getBackendFormat(), grII.colorType());
         GrSurfaceProxyView view(rectProxy, origin, swizzle);
 
         test_basic_draw_as_src(reporter, dContext, view, grII.colorType(), kPremul_SkAlphaType,
diff --git a/third_party/skia/tests/ResourceAllocatorTest.cpp b/third_party/skia/tests/ResourceAllocatorTest.cpp
index 5e4349d5989bc..2661aacb9cc1c 100644
--- a/third_party/skia/tests/ResourceAllocatorTest.cpp
+++ b/third_party/skia/tests/ResourceAllocatorTest.cpp
@@ -36,7 +36,7 @@ struct ProxyParams {
         kInstantiated
     };
     Kind            fKind;
-    GrUniqueKey     fUniqueKey = GrUniqueKey();
+    skgpu::UniqueKey     fUniqueKey = skgpu::UniqueKey();
     // TODO: do we care about mipmapping
 };
 
diff --git a/third_party/skia/tests/ResourceCacheTest.cpp b/third_party/skia/tests/ResourceCacheTest.cpp
index b56c0e208bc8f..53c3e811a0f5c 100644
--- a/third_party/skia/tests/ResourceCacheTest.cpp
+++ b/third_party/skia/tests/ResourceCacheTest.cpp
@@ -270,16 +270,16 @@ class TestResource : public GrGpuResource {
         fToDelete = std::move(resource);
     }
 
-    static void ComputeScratchKey(SimulatedProperty property, GrScratchKey* key) {
-        static GrScratchKey::ResourceType t = GrScratchKey::GenerateResourceType();
-        GrScratchKey::Builder builder(key, t, kScratchKeyFieldCnt);
+    static void ComputeScratchKey(SimulatedProperty property, skgpu::ScratchKey* key) {
+        static skgpu::ScratchKey::ResourceType t = skgpu::ScratchKey::GenerateResourceType();
+        skgpu::ScratchKey::Builder builder(key, t, kScratchKeyFieldCnt);
         for (int i = 0; i < kScratchKeyFieldCnt; ++i) {
             builder[i] = static_cast<uint32_t>(i + property);
         }
     }
 
     static size_t ExpectedScratchKeySize() {
-        return sizeof(uint32_t) * (kScratchKeyFieldCnt + GrScratchKey::kMetaDataCnt);
+        return sizeof(uint32_t) * (kScratchKeyFieldCnt + skgpu::ScratchKey::kMetaDataCnt);
     }
 private:
     static const int kScratchKeyFieldCnt = 6;
@@ -306,7 +306,7 @@ class TestResource : public GrGpuResource {
         this->registerWithCacheWrapped(cacheable);
     }
 
-    void computeScratchKey(GrScratchKey* key) const override {
+    void computeScratchKey(skgpu::ScratchKey* key) const override {
         if (fIsScratch) {
             ComputeScratchKey(fProperty, key);
         }
@@ -394,9 +394,9 @@ static void test_no_key(skiatest::Reporter* reporter) {
 
 // Each integer passed as a template param creates a new domain.
 template <int>
-static void make_unique_key(GrUniqueKey* key, int data, const char* tag = nullptr) {
-    static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain();
-    GrUniqueKey::Builder builder(key, d, 1, tag);
+static void make_unique_key(skgpu::UniqueKey* key, int data, const char* tag = nullptr) {
+    static skgpu::UniqueKey::Domain d = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey::Builder builder(key, d, 1, tag);
     builder[0] = data;
 }
 
@@ -409,7 +409,7 @@ static void test_purge_unlocked(skiatest::Reporter* reporter) {
     TestResource* a = TestResource::CreateScratch(gpu, SkBudgeted::kYes,
                                                   TestResource::kA_SimulatedProperty, 11);
 
-    GrUniqueKey uniqueKey;
+    skgpu::UniqueKey uniqueKey;
     make_unique_key<0>(&uniqueKey, 0);
 
     TestResource* b = TestResource::CreateScratch(gpu, SkBudgeted::kYes,
@@ -419,7 +419,7 @@ static void test_purge_unlocked(skiatest::Reporter* reporter) {
     TestResource* c = TestResource::CreateScratch(gpu, SkBudgeted::kYes,
                                                   TestResource::kA_SimulatedProperty, 13);
 
-    GrUniqueKey uniqueKey2;
+    skgpu::UniqueKey uniqueKey2;
     make_unique_key<0>(&uniqueKey2, 1);
 
     TestResource* d = TestResource::CreateScratch(gpu, SkBudgeted::kYes,
@@ -536,7 +536,7 @@ static void test_budgeting(skiatest::Reporter* reporter) {
     GrResourceCache* cache = mock.cache();
     GrGpu* gpu = mock.gpu();
 
-    GrUniqueKey uniqueKey;
+    skgpu::UniqueKey uniqueKey;
     make_unique_key<0>(&uniqueKey, 0);
 
     // Create a scratch, a unique, and a wrapped resource
@@ -550,9 +550,9 @@ static void test_budgeting(skiatest::Reporter* reporter) {
     TestResource* unbudgeted = new TestResource(gpu, SkBudgeted::kNo, 14);
 
     // Make sure we can add a unique key to the wrapped resources
-    GrUniqueKey uniqueKey2;
+    skgpu::UniqueKey uniqueKey2;
     make_unique_key<0>(&uniqueKey2, 1);
-    GrUniqueKey uniqueKey3;
+    skgpu::UniqueKey uniqueKey3;
     make_unique_key<0>(&uniqueKey3, 2);
     wrappedCacheable->resourcePriv().setUniqueKey(uniqueKey2);
     wrappedUncacheable->resourcePriv().setUniqueKey(uniqueKey3);
@@ -662,7 +662,7 @@ static void test_unbudgeted(skiatest::Reporter* reporter) {
     GrResourceCache* cache = mock.cache();
     GrGpu* gpu = mock.gpu();
 
-    GrUniqueKey uniqueKey;
+    skgpu::UniqueKey uniqueKey;
     make_unique_key<0>(&uniqueKey, 0);
 
     TestResource* scratch;
@@ -736,7 +736,7 @@ void test_unbudgeted_to_scratch(skiatest::Reporter* reporter);
 
     TestResource* resource =
         TestResource::CreateScratch(gpu, SkBudgeted::kNo, TestResource::kA_SimulatedProperty);
-    GrScratchKey key;
+    skgpu::ScratchKey key;
     TestResource::ComputeScratchKey(TestResource::kA_SimulatedProperty, &key);
 
     size_t size = resource->gpuMemorySize();
@@ -807,12 +807,12 @@ static void test_duplicate_scratch_key(skiatest::Reporter* reporter) {
     TestResource* b = TestResource::CreateScratch(gpu,
                                                   SkBudgeted::kYes,
                                                   TestResource::kB_SimulatedProperty, 12);
-    GrScratchKey scratchKey1;
+    skgpu::ScratchKey scratchKey1;
     TestResource::ComputeScratchKey(TestResource::kA_SimulatedProperty, &scratchKey1);
     // Check for negative case consistency. (leaks upon test failure.)
     REPORTER_ASSERT(reporter, !cache->findAndRefScratchResource(scratchKey1));
 
-    GrScratchKey scratchKey;
+    skgpu::ScratchKey scratchKey;
     TestResource::ComputeScratchKey(TestResource::kB_SimulatedProperty, &scratchKey);
 
     // Scratch resources are registered with GrResourceCache just by existing. There are 2.
@@ -855,7 +855,7 @@ static void test_remove_scratch_key(skiatest::Reporter* reporter) {
     a->unref();
     b->unref();
 
-    GrScratchKey scratchKey;
+    skgpu::ScratchKey scratchKey;
     // Ensure that scratch key lookup is correct for negative case.
     TestResource::ComputeScratchKey(TestResource::kA_SimulatedProperty, &scratchKey);
     // (following leaks upon test failure).
@@ -913,11 +913,11 @@ static void test_scratch_key_consistency(skiatest::Reporter* reporter) {
     a->unref();
     b->unref();
 
-    GrScratchKey scratchKey;
+    skgpu::ScratchKey scratchKey;
     // Ensure that scratch key comparison and assignment is consistent.
-    GrScratchKey scratchKey1;
+    skgpu::ScratchKey scratchKey1;
     TestResource::ComputeScratchKey(TestResource::kA_SimulatedProperty, &scratchKey1);
-    GrScratchKey scratchKey2;
+    skgpu::ScratchKey scratchKey2;
     TestResource::ComputeScratchKey(TestResource::kB_SimulatedProperty, &scratchKey2);
     REPORTER_ASSERT(reporter, scratchKey1.size() == TestResource::ExpectedScratchKeySize());
     REPORTER_ASSERT(reporter, scratchKey1 != scratchKey2);
@@ -964,7 +964,7 @@ static void test_duplicate_unique_key(skiatest::Reporter* reporter) {
     GrResourceCache* cache = mock.cache();
     GrGpu* gpu = mock.gpu();
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     make_unique_key<0>(&key, 0);
 
     // Create two resources that we will attempt to register with the same unique key.
@@ -1004,7 +1004,7 @@ static void test_duplicate_unique_key(skiatest::Reporter* reporter) {
     // Also make b be unreffed when replacement occurs.
     b->unref();
     TestResource* c = new TestResource(gpu, SkBudgeted::kYes, 13);
-    GrUniqueKey differentKey;
+    skgpu::UniqueKey differentKey;
     make_unique_key<0>(&differentKey, 1);
     c->resourcePriv().setUniqueKey(differentKey);
     REPORTER_ASSERT(reporter, 2 == cache->getResourceCount());
@@ -1037,7 +1037,7 @@ static void test_duplicate_unique_key(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, 0 == TestResource::NumAlive());
 
     {
-        GrUniqueKey key2;
+        skgpu::UniqueKey key2;
         make_unique_key<0>(&key2, 0);
         sk_sp<TestResource> d(new TestResource(gpu));
         int foo = 4132;
@@ -1045,7 +1045,7 @@ static void test_duplicate_unique_key(skiatest::Reporter* reporter) {
         d->resourcePriv().setUniqueKey(key2);
     }
 
-    GrUniqueKey key3;
+    skgpu::UniqueKey key3;
     make_unique_key<0>(&key3, 0);
     sk_sp<GrGpuResource> d2(cache->findAndRefUniqueResource(key3));
     REPORTER_ASSERT(reporter, *(int*) d2->getUniqueKey().getCustomData()->data() == 4132);
@@ -1057,7 +1057,7 @@ static void test_purge_invalidated(skiatest::Reporter* reporter) {
     GrResourceCache* cache = mock.cache();
     GrGpu* gpu = mock.gpu();
 
-    GrUniqueKey key1, key2, key3;
+    skgpu::UniqueKey key1, key2, key3;
     make_unique_key<0>(&key1, 1);
     make_unique_key<0>(&key2, 2);
     make_unique_key<0>(&key3, 3);
@@ -1079,8 +1079,8 @@ static void test_purge_invalidated(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, cache->hasUniqueKey(key3));
     REPORTER_ASSERT(reporter, 3 == TestResource::NumAlive());
 
-    typedef GrUniqueKeyInvalidatedMessage Msg;
-    typedef SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t> Bus;
+    typedef skgpu::UniqueKeyInvalidatedMessage Msg;
+    typedef SkMessageBus<Msg, uint32_t> Bus;
 
     // Invalidate two of the three, they should be purged and no longer accessible via their keys.
     Bus::Post(Msg(key1, dContext->priv().contextID()));
@@ -1104,7 +1104,7 @@ static void test_purge_invalidated(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, 1 == TestResource::NumAlive());
 
     // Make sure we actually get to c via it's scratch key, before we say goodbye.
-    GrScratchKey scratchKey;
+    skgpu::ScratchKey scratchKey;
     TestResource::ComputeScratchKey(TestResource::kA_SimulatedProperty, &scratchKey);
     GrGpuResource* scratch = cache->findAndRefScratchResource(scratchKey);
     REPORTER_ASSERT(reporter, scratch == c);
@@ -1125,7 +1125,7 @@ static void test_cache_chained_purge(skiatest::Reporter* reporter) {
     GrResourceCache* cache = mock.cache();
     GrGpu* gpu = mock.gpu();
 
-    GrUniqueKey key1, key2;
+    skgpu::UniqueKey key1, key2;
     make_unique_key<0>(&key1, 1);
     make_unique_key<0>(&key2, 2);
 
@@ -1182,7 +1182,7 @@ static void test_timestamp_wrap(skiatest::Reporter* reporter) {
         // Add kCount resources, holding onto resources at random so we have a mix of purgeable and
         // unpurgeable resources.
         for (int j = 0; j < kCount; ++j) {
-            GrUniqueKey key;
+            skgpu::UniqueKey key;
             make_unique_key<0>(&key, j);
 
             TestResource* r = new TestResource(gpu);
@@ -1202,7 +1202,7 @@ static void test_timestamp_wrap(skiatest::Reporter* reporter) {
         // Verify that the correct resources were purged.
         int currShouldPurgeIdx = 0;
         for (int j = 0; j < kCount; ++j) {
-            GrUniqueKey key;
+            skgpu::UniqueKey key;
             make_unique_key<0>(&key, j);
             GrGpuResource* res = cache->findAndRefUniqueResource(key);
             if (currShouldPurgeIdx < shouldPurgeIdxs.count() &&
@@ -1245,7 +1245,7 @@ static void test_time_purge(skiatest::Reporter* reporter) {
             // Insert resources and get time points between each addition.
             for (int i = 0; i < cnt; ++i) {
                 TestResource* r = new TestResource(gpu);
-                GrUniqueKey k;
+                skgpu::UniqueKey k;
                 make_unique_key<1>(&k, i);
                 r->resourcePriv().setUniqueKey(k);
                 r->unref();
@@ -1258,7 +1258,7 @@ static void test_time_purge(skiatest::Reporter* reporter) {
                 cache->purgeResourcesNotUsedSince(timeStamps[i]);
                 REPORTER_ASSERT(reporter, cnt - i - 1 == cache->getResourceCount());
                 for (int j = 0; j < i; ++j) {
-                    GrUniqueKey k;
+                    skgpu::UniqueKey k;
                     make_unique_key<1>(&k, j);
                     GrGpuResource* r = cache->findAndRefUniqueResource(k);
                     REPORTER_ASSERT(reporter, !SkToBool(r));
@@ -1276,7 +1276,7 @@ static void test_time_purge(skiatest::Reporter* reporter) {
             std::unique_ptr<GrGpuResource* []> refedResources(new GrGpuResource*[cnt / 2]);
             for (int i = 0; i < cnt; ++i) {
                 TestResource* r = new TestResource(gpu);
-                GrUniqueKey k;
+                skgpu::UniqueKey k;
                 make_unique_key<1>(&k, i);
                 r->resourcePriv().setUniqueKey(k);
                 // Leave a ref on every other resource, beginning with the first.
@@ -1316,7 +1316,7 @@ static void test_time_purge(skiatest::Reporter* reporter) {
                 TestResource* r = isScratch ? TestResource::CreateScratch(gpu, budgeted, property)
                                             : new TestResource(gpu, budgeted, property);
                 if (!isScratch) {
-                    GrUniqueKey k;
+                    skgpu::UniqueKey k;
                     make_unique_key<1>(&k, i);
                     r->resourcePriv().setUniqueKey(k);
                 }
@@ -1341,7 +1341,7 @@ static void test_time_purge(skiatest::Reporter* reporter) {
         dContext->flushAndSubmit();
         for (int i = 0; i < 10; ++i) {
             TestResource* r = new TestResource(gpu);
-            GrUniqueKey k;
+            skgpu::UniqueKey k;
             make_unique_key<1>(&k, i);
             r->resourcePriv().setUniqueKey(k);
             r->unref();
@@ -1372,7 +1372,7 @@ static void test_partial_purge(skiatest::Reporter* reporter) {
 
     for (int testCase = 0; testCase < kEndTests_TestCase; testCase++) {
 
-        GrUniqueKey key1, key2, key3;
+        skgpu::UniqueKey key1, key2, key3;
         make_unique_key<0>(&key1, 1);
         make_unique_key<0>(&key2, 2);
         make_unique_key<0>(&key3, 3);
@@ -1459,7 +1459,7 @@ static void test_partial_purge(skiatest::Reporter* reporter) {
 }
 
 static void test_custom_data(skiatest::Reporter* reporter) {
-    GrUniqueKey key1, key2;
+    skgpu::UniqueKey key1, key2;
     make_unique_key<0>(&key1, 1);
     make_unique_key<0>(&key2, 2);
     int foo = 4132;
@@ -1468,7 +1468,7 @@ static void test_custom_data(skiatest::Reporter* reporter) {
     REPORTER_ASSERT(reporter, key2.getCustomData() == nullptr);
 
     // Test that copying a key also takes a ref on its custom data.
-    GrUniqueKey key3 = key1;
+    skgpu::UniqueKey key3 = key1;
     REPORTER_ASSERT(reporter, *(int*) key3.getCustomData()->data() == 4132);
 }
 
@@ -1495,7 +1495,7 @@ static void test_abandoned(skiatest::Reporter* reporter) {
     resource->resourcePriv().makeBudgeted();
     resource->resourcePriv().makeUnbudgeted();
     resource->resourcePriv().removeScratchKey();
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     make_unique_key<0>(&key, 1);
     resource->resourcePriv().setUniqueKey(key);
     resource->resourcePriv().removeUniqueKey();
@@ -1521,7 +1521,7 @@ static void test_tags(skiatest::Reporter* reporter) {
     for (int i = 0; i < kNumResources; ++i, ++currTagCnt) {
 
         sk_sp<GrGpuResource> resource(new TestResource(gpu));
-        GrUniqueKey key;
+        skgpu::UniqueKey key;
         if (currTagCnt == tagIdx) {
             tagIdx += 1;
             currTagCnt = 0;
diff --git a/third_party/skia/tests/SaveLayerOriginTest.cpp b/third_party/skia/tests/SaveLayerOriginTest.cpp
new file mode 100644
index 0000000000000..67769cf13959b
--- /dev/null
+++ b/third_party/skia/tests/SaveLayerOriginTest.cpp
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrDirectContext.h"
+#include "tests/Test.h"
+#include "tests/TestUtils.h"
+
+static void check_pixels(skiatest::Reporter* reporter, const SkBitmap& bitmap,
+                         GrSurfaceOrigin origin) {
+    const uint32_t* canvasPixels = static_cast<const uint32_t*>(bitmap.getPixels());
+
+    bool failureFound = false;
+    bool foundNonBlue = false;
+
+    for (int cy = 0; cy < 8 && !failureFound; ++cy) {
+        int cx = 4; // Just need to check one column;
+        SkPMColor canvasPixel = canvasPixels[cy * 8 + cx];
+        // We don't know which way the GPU will snap so the non-blue line could either be at row
+        // 3 or 4 since we drew the line at a y value of 4. We check that one of those two values
+        // is green and all the rest are blue. The key thing is that we should not get any red
+        // values since the green line in the saveLayer should snap the same way and overwrite the
+        // red line.
+        if (cy == 3) {
+            if (canvasPixel != 0xFFFF0000 && canvasPixel != 0xFF00FF00) {
+                failureFound = true;
+                ERRORF(reporter, "Wrong color at %d, %d. Got 0x%08x when we expected Blue or Green."
+                       " Origin is: %s",
+                       cx, cy, canvasPixel, GrSurfaceOriginToStr(origin));
+            }
+            if (canvasPixel != 0XFFFF0000) {
+                foundNonBlue = true;
+            }
+        } else {
+            SkPMColor expectedPixel;
+            if (cy == 4 && !foundNonBlue) {
+                expectedPixel = 0xFF00FF00; // Green
+            } else {
+                expectedPixel = 0xFFFF0000; // Blue
+            }
+            if (canvasPixel != expectedPixel) {
+                failureFound = true;
+                ERRORF(reporter,
+                       "Wrong color at %d, %d. Got 0x%08x when we expected 0x%08x. Origin is: %s",
+                       cx, cy, canvasPixel, expectedPixel, GrSurfaceOriginToStr(origin));
+            }
+        }
+    }
+}
+
+static void run_test(skiatest::Reporter* reporter,
+                     GrDirectContext* context,
+                     GrSurfaceOrigin origin) {
+    auto beTexture = context->createBackendTexture(8, 8, kRGBA_8888_SkColorType, GrMipMapped::kNo,
+                                                   GrRenderable::kYes, GrProtected::kNo);
+    REPORTER_ASSERT(reporter, beTexture.isValid());
+    if (!beTexture.isValid()) {
+        return;
+    }
+
+    auto surface = SkSurface::MakeFromBackendTexture(context, beTexture, origin, 0,
+                                                     kRGBA_8888_SkColorType, nullptr, nullptr);
+    REPORTER_ASSERT(reporter, surface);
+    if (!surface) {
+        return;
+    }
+
+    SkCanvas* canvas = surface->getCanvas();
+
+    canvas->clear(SK_ColorBLUE);
+
+    SkPaint paint;
+    paint.setColor(SK_ColorRED);
+    canvas->drawLine({ 0,4 }, { 8,4 }, paint);
+
+    SkRect bounds = SkRect::MakeWH(8, 8);
+    SkPaint layerPaint;
+    canvas->saveLayer(bounds, &paint);
+    paint.setColor(SK_ColorGREEN);
+    canvas->drawLine({ 0,4 }, { 8,4 }, paint);
+    canvas->restore();
+
+    SkBitmap bitmap;
+    bitmap.allocPixels(SkImageInfo::Make(8, 8, kRGBA_8888_SkColorType, kPremul_SkAlphaType));
+    surface->readPixels(bitmap, 0, 0);
+
+    check_pixels(reporter, bitmap, origin);
+
+    context->deleteBackendTexture(beTexture);
+}
+
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SaveLayerOrigin, reporter, context_info) {
+    GrDirectContext* context = context_info.directContext();
+    run_test(reporter, context, kBottomLeft_GrSurfaceOrigin);
+    run_test(reporter, context, kTopLeft_GrSurfaceOrigin);
+}
diff --git a/third_party/skia/tests/SerializationTest.cpp b/third_party/skia/tests/SerializationTest.cpp
index 97616b334f471..7c69db79af2e4 100644
--- a/third_party/skia/tests/SerializationTest.cpp
+++ b/third_party/skia/tests/SerializationTest.cpp
@@ -354,7 +354,7 @@ static sk_sp<SkTypeface> deserialize_typeface_proc(const void* data, size_t leng
     }
     memcpy(&stream, data, sizeof(stream));
 
-    SkFontID id;
+    SkTypefaceID id;
     if (!stream->read(&id, sizeof(id))) {
         return nullptr;
     }
diff --git a/third_party/skia/tests/ShaperTest.cpp b/third_party/skia/tests/ShaperTest.cpp
index 8d12de9d0576a..b8e3558674cfe 100644
--- a/third_party/skia/tests/ShaperTest.cpp
+++ b/third_party/skia/tests/ShaperTest.cpp
@@ -3,7 +3,7 @@
 
 #include "tests/Test.h"
 
-#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_GOOGLE3)
+#if defined(SKSHAPER_IMPLEMENTATION) && !defined(SK_BUILD_FOR_GOOGLE3)
 
 #include "include/core/SkData.h"
 #include "include/core/SkFont.h"
@@ -134,4 +134,4 @@ SHAPER_TEST(vai)
 //SHAPER_TEST(tamil)
 #undef SHAPER_TEST
 
-#endif  // !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) && !defined(SK_BUILD_FOR_GOOGLE3)
+#endif  // defined(SKSHAPER_IMPLEMENTATION) && !defined(SK_BUILD_FOR_GOOGLE3)
diff --git a/third_party/skia/tests/SkDSLRuntimeEffectTest.cpp b/third_party/skia/tests/SkDSLRuntimeEffectTest.cpp
index c2a138b4fa518..36ee04ac9a6e3 100644
--- a/third_party/skia/tests/SkDSLRuntimeEffectTest.cpp
+++ b/third_party/skia/tests/SkDSLRuntimeEffectTest.cpp
@@ -47,11 +47,11 @@ class DSLTestEffect {
         }
     }
 
-    SkRuntimeShaderBuilder::BuilderUniform uniform(skstd::string_view name) {
+    SkRuntimeShaderBuilder::BuilderUniform uniform(std::string_view name) {
         return fBuilder->uniform(SkString(name).c_str());
     }
 
-    SkRuntimeShaderBuilder::BuilderChild child(skstd::string_view name) {
+    SkRuntimeShaderBuilder::BuilderChild child(std::string_view name) {
         return fBuilder->child(SkString(name).c_str());
     }
 
@@ -59,7 +59,7 @@ class DSLTestEffect {
 
     void test(GrColor TL, GrColor TR, GrColor BL, GrColor BR,
               PreTestFn preTestCallback = nullptr) {
-        auto shader = fBuilder->makeShader(nullptr, false);
+        auto shader = fBuilder->makeShader();
         if (!shader) {
             REPORT_FAILURE(fReporter, "shader", SkString("Effect didn't produce a shader"));
             return;
@@ -202,12 +202,14 @@ static void test_RuntimeEffect_Shaders(skiatest::Reporter* r, GrRecordingContext
     {
         class SimpleErrorReporter : public SkSL::ErrorReporter {
         public:
-            void handleError(skstd::string_view msg, SkSL::PositionInfo pos) override {
+            void handleError(std::string_view msg, SkSL::PositionInfo pos) override {
                 fMsg += msg;
             }
 
-            SkSL::String fMsg;
+            std::string fMsg;
         } errorReporter;
+
+        // Test errors that occur while constructing DSL nodes
         effect.start();
         SetErrorReporter(&errorReporter);
         Parameter p(kFloat2_Type, "p");
@@ -216,6 +218,14 @@ static void test_RuntimeEffect_Shaders(skiatest::Reporter* r, GrRecordingContext
         );
         effect.end(false);
         REPORTER_ASSERT(r, errorReporter.fMsg == "expected 'half4', but found 'int'");
+        errorReporter.fMsg = "";
+        errorReporter.resetErrorCount();
+
+        // Test errors that occur while finalizing the runtime effect
+        effect.start();
+        SetErrorReporter(&errorReporter);
+        effect.end(false);
+        REPORTER_ASSERT(r, errorReporter.fMsg == "missing 'main' function");
     }
 
     // Mutating coords should work. (skbug.com/10918)
diff --git a/third_party/skia/tests/SkFixed15Test.cpp b/third_party/skia/tests/SkFixed15Test.cpp
deleted file mode 100644
index f5a57c9ede693..0000000000000
--- a/third_party/skia/tests/SkFixed15Test.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "src/core/SkFixed15.h"
-#include "tests/Test.h"
-
-DEF_TEST(SkFixed15, r) {
-    // For all v, v*0 == 0, v*1 == v.
-    for (uint16_t bits = 0; bits <= 32768; bits++) {
-        auto v = SkFixed15::Load(bits);
-        REPORTER_ASSERT(r, v * 0.0f == 0.0f);
-        REPORTER_ASSERT(r, v * 1.0f == v);
-    }
-
-    // Division and multiplication by powers of 2 is exact.
-    SkFixed15 v = 1.0f;
-    REPORTER_ASSERT(r, (v>>1)    == 0.50f);
-    REPORTER_ASSERT(r, (v>>2)    == 0.25f);
-    REPORTER_ASSERT(r, (v>>2<<1) == 0.50f);
-
-    // FromU8() should be just as good as going through float.
-    for (int x = 0; x < 256; x++) {
-        REPORTER_ASSERT(r, SkFixed15::FromU8(x) == SkFixed15(x * (1/255.0f)));
-    }
-
-    // to_u8() and FromU8() should roundtrip all bytes.
-    for (int x = 0; x < 256; x++) {
-        REPORTER_ASSERT(r, x == SkFixed15::FromU8(x).to_u8());
-    }
-}
diff --git a/third_party/skia/tests/SkGlyphBufferTest.cpp b/third_party/skia/tests/SkGlyphBufferTest.cpp
index d7b78044af3a1..11b431a71d4a2 100644
--- a/third_party/skia/tests/SkGlyphBufferTest.cpp
+++ b/third_party/skia/tests/SkGlyphBufferTest.cpp
@@ -111,7 +111,7 @@ DEF_TEST(SkSourceGlyphBufferBasic, reporter) {
     rejects.reject(1);
     rejects.reject(2, 100);
     rejects.flipRejectsToSource();
-    REPORTER_ASSERT(reporter, rejects.rejectedMaxDimension() == 100);
+    REPORTER_ASSERT(reporter, std::get<1>(rejects.maxDimensionHint()) == 100);
     for (auto [i, glyphID, pos] : SkMakeEnumerate(rejects.source())) {
         // This will index 1 and 2 from the original source.
         size_t j = i + 1;
@@ -122,7 +122,7 @@ DEF_TEST(SkSourceGlyphBufferBasic, reporter) {
     // Reject an additional glyph
     rejects.reject(0, 10);
     rejects.flipRejectsToSource();
-    REPORTER_ASSERT(reporter, rejects.rejectedMaxDimension() == 10);
+    REPORTER_ASSERT(reporter, std::get<1>(rejects.maxDimensionHint()) == 10);
     for (auto [i, glyphID, pos] : SkMakeEnumerate(rejects.source())) {
         // This will index 1 from the original source.
         size_t j = i + 1;
@@ -141,7 +141,7 @@ DEF_TEST(SkSourceGlyphBufferBasic, reporter) {
     rejects.reject(1);
     rejects.reject(2, 100);
     rejects.flipRejectsToSource();
-    REPORTER_ASSERT(reporter, rejects.rejectedMaxDimension() == 100);
+    REPORTER_ASSERT(reporter, std::get<1>(rejects.maxDimensionHint()) == 100);
     for (auto [i, glyphID, pos] : SkMakeEnumerate(rejects.source())) {
         // This will index 1 and 2 from the original source.
         size_t j = i + 1;
@@ -158,22 +158,22 @@ DEF_TEST(SkDrawableGlyphBufferBasic, reporter) {
     auto source = SkMakeZip(glyphIDs, positions);
 
     {
-        SkDrawableGlyphBuffer drawable;
-        drawable.ensureSize(100);
-        drawable.startSource(source);
-        for (auto [i, packedID, pos] : SkMakeEnumerate(drawable.input())) {
+        SkDrawableGlyphBuffer accepted;
+        accepted.ensureSize(100);
+        accepted.startSource(source);
+        for (auto [i, packedID, pos] : SkMakeEnumerate(accepted.input())) {
             REPORTER_ASSERT(reporter, packedID.packedID().glyphID() == glyphIDs[i]);
             REPORTER_ASSERT(reporter, pos == positions[i]);
         }
     }
 
     {
-        SkDrawableGlyphBuffer drawable;
-        drawable.ensureSize(100);
+        SkDrawableGlyphBuffer accepted;
+        accepted.ensureSize(100);
         SkMatrix matrix = SkMatrix::Scale(0.5, 0.5);
         SkGlyphPositionRoundingSpec rounding{true, kX_SkAxisAlignment};
-        drawable.startBitmapDevice(source, {100, 100}, matrix, rounding);
-        for (auto [i, packedID, pos] : SkMakeEnumerate(drawable.input())) {
+        accepted.startBitmapDevice(source, {100, 100}, matrix, rounding);
+        for (auto [i, packedID, pos] : SkMakeEnumerate(accepted.input())) {
             REPORTER_ASSERT(reporter, glyphIDs[i] == packedID.packedID().glyphID());
             REPORTER_ASSERT(reporter,
                     pos.x() == positions[i].x() * 0.5 + 50 + SkPackedGlyphID::kSubpixelRound);
@@ -182,13 +182,13 @@ DEF_TEST(SkDrawableGlyphBufferBasic, reporter) {
     }
 
     {
-        SkDrawableGlyphBuffer drawable;
-        drawable.ensureSize(100);
-        drawable.startSource(source);
-        for (auto [i, packedID, pos] : SkMakeEnumerate(drawable.input())) {
-            drawable.push_back(&glyphs[i], i);
+        SkDrawableGlyphBuffer accepted;
+        accepted.ensureSize(100);
+        accepted.startSource(source);
+        for (auto [i, packedID, pos] : SkMakeEnumerate(accepted.input())) {
+            accepted.accept(&glyphs[i], i);
         }
-        for (auto [i, glyph, pos] : SkMakeEnumerate(drawable.drawable())) {
+        for (auto [i, glyph, pos] : SkMakeEnumerate(accepted.accepted())) {
             REPORTER_ASSERT(reporter, glyph.glyph() == &glyphs[i]);
         }
     }
diff --git a/third_party/skia/tests/SkRasterPipelineTest.cpp b/third_party/skia/tests/SkRasterPipelineTest.cpp
index 98bac64587b63..57d84d94276d3 100644
--- a/third_party/skia/tests/SkRasterPipelineTest.cpp
+++ b/third_party/skia/tests/SkRasterPipelineTest.cpp
@@ -8,7 +8,7 @@
 #include "include/private/SkHalf.h"
 #include "include/private/SkTo.h"
 #include "src/core/SkRasterPipeline.h"
-#include "src/gpu/GrSwizzle.h"
+#include "src/gpu/Swizzle.h"
 #include "tests/Test.h"
 
 DEF_TEST(SkRasterPipeline, r) {
@@ -504,7 +504,7 @@ DEF_TEST(SkRasterPipeline_swizzle, r) {
                   | (4*i+1) << 8;
         }
 
-        GrSwizzle swizzle("g1b1");
+        skgpu::Swizzle swizzle("g1b1");
 
         SkRasterPipeline_MemoryCtx ptr = { rg, 0 };
         SkRasterPipeline_<256> p;
@@ -529,7 +529,7 @@ DEF_TEST(SkRasterPipeline_swizzle, r) {
             rg[i][1] = 2 * i + 1;
         }
 
-        GrSwizzle swizzle("0gra");
+        skgpu::Swizzle swizzle("0gra");
 
         uint16_t buffer[64][4];
         SkRasterPipeline_MemoryCtx src = { rg,     0 },
diff --git a/third_party/skia/tests/SkRemoteGlyphCacheTest.cpp b/third_party/skia/tests/SkRemoteGlyphCacheTest.cpp
index 0df0193277866..3171c72137036 100644
--- a/third_party/skia/tests/SkRemoteGlyphCacheTest.cpp
+++ b/third_party/skia/tests/SkRemoteGlyphCacheTest.cpp
@@ -11,8 +11,11 @@
 #include "include/core/SkTextBlob.h"
 #include "include/gpu/GrDirectContext.h"
 #include "include/private/SkMutex.h"
+#include "include/private/chromium/GrSlug.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkDraw.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "src/core/SkFontPriv.h"
+#include "src/core/SkReadBuffer.h"
 #include "src/core/SkScalerCache.h"
 #include "src/core/SkStrikeCache.h"
 #include "src/core/SkStrikeSpec.h"
@@ -175,7 +178,9 @@ SkBitmap RasterBlob(sk_sp<SkTextBlob> blob, int width, int height, const SkPaint
                     GrRecordingContext* rContext, const SkMatrix* matrix = nullptr,
                     SkScalar x = 0) {
     auto surface = MakeSurface(width, height, rContext);
-    if (matrix) surface->getCanvas()->concat(*matrix);
+    if (matrix) {
+        surface->getCanvas()->concat(*matrix);
+    }
     surface->getCanvas()->drawTextBlob(blob.get(), x, height/2, paint);
     SkBitmap bitmap;
     bitmap.allocN32Pixels(width, height);
@@ -183,6 +188,37 @@ SkBitmap RasterBlob(sk_sp<SkTextBlob> blob, int width, int height, const SkPaint
     return bitmap;
 }
 
+SkBitmap RasterBlobThroughSlug(sk_sp<SkTextBlob> blob, int width, int height, const SkPaint& paint,
+                               GrRecordingContext* rContext, const SkMatrix* matrix = nullptr,
+                               SkScalar x = 0) {
+    auto surface = MakeSurface(width, height, rContext);
+    if (matrix) {
+        surface->getCanvas()->concat(*matrix);
+    }
+    auto canvas = surface->getCanvas();
+    auto slug = GrSlug::ConvertBlob(canvas, *blob, {x, height/2.0f}, paint);
+    slug->draw(canvas);
+    SkBitmap bitmap;
+    bitmap.allocN32Pixels(width, height);
+    surface->readPixels(bitmap, 0, 0);
+    return bitmap;
+}
+
+SkBitmap RasterSlug(sk_sp<GrSlug> slug, int width, int height, const SkPaint& paint,
+                    GrRecordingContext* rContext, const SkMatrix* matrix = nullptr,
+                    SkScalar x = 0) {
+    auto surface = MakeSurface(width, height, rContext);
+    if (matrix) {
+        surface->getCanvas()->concat(*matrix);
+    }
+    auto canvas = surface->getCanvas();
+    slug->draw(canvas);
+    SkBitmap bitmap;
+    bitmap.allocN32Pixels(width, height);
+    surface->readPixels(bitmap, 0, 0);
+    return bitmap;
+}
+
 DEF_TEST(SkRemoteGlyphCache_TypefaceSerialization, reporter) {
     sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
     SkStrikeServer server(discardableManager.get());
@@ -236,6 +272,96 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_StrikeSerialization, repor
     discardableManager->unlockAndDeleteAll();
 }
 
+static void use_padding_options(GrContextOptions* options) {
+    options->fSupportBilerpFromGlyphAtlas = true;
+}
+
+DEF_GPUTEST_FOR_CONTEXTS(SkRemoteGlyphCache_StrikeSerializationSlug,
+                         sk_gpu_test::GrContextFactory::IsRenderingContext,
+                         reporter, ctxInfo, use_padding_options) {
+    auto dContext = ctxInfo.directContext();
+    sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
+    SkStrikeServer server(discardableManager.get());
+    SkStrikeClient client(discardableManager, false);
+    const SkPaint paint;
+
+    // Server.
+    auto serverTf = SkTypeface::MakeFromName("monospace", SkFontStyle());
+    auto serverTfData = server.serializeTypeface(serverTf.get());
+
+    int glyphCount = 10;
+    auto serverBlob = buildTextBlob(serverTf, glyphCount);
+    auto props = FindSurfaceProps(dContext);
+    std::unique_ptr<SkCanvas> analysisCanvas = server.makeAnalysisCanvas(
+            10, 10, props, nullptr, dContext->supportsDistanceFieldText());
+
+    // Generate strike updates.
+    (void)GrSlug::ConvertBlob(analysisCanvas.get(), *serverBlob, {0, 0}, paint);
+
+    std::vector<uint8_t> serverStrikeData;
+    server.writeStrikeData(&serverStrikeData);
+
+    // Client.
+    auto clientTf = client.deserializeTypeface(serverTfData->data(), serverTfData->size());
+    REPORTER_ASSERT(reporter,
+                    client.readStrikeData(serverStrikeData.data(), serverStrikeData.size()));
+    auto clientBlob = buildTextBlob(clientTf, glyphCount);
+
+    SkBitmap expected = RasterBlobThroughSlug(serverBlob, 10, 10, paint, dContext);
+    SkBitmap actual = RasterBlobThroughSlug(clientBlob, 10, 10, paint, dContext);
+    compare_blobs(expected, actual, reporter);
+    REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+
+    // Must unlock everything on termination, otherwise valgrind complains about memory leaks.
+    discardableManager->unlockAndDeleteAll();
+}
+
+DEF_GPUTEST_FOR_CONTEXTS(SkRemoteGlyphCache_SlugSerialization,
+                         sk_gpu_test::GrContextFactory::IsRenderingContext,
+                         reporter, ctxInfo, use_padding_options) {
+    auto dContext = ctxInfo.directContext();
+    sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
+    SkStrikeServer server(discardableManager.get());
+    SkStrikeClient client(discardableManager, false);
+    const SkPaint paint;
+
+    // Server.
+    auto serverTf = SkTypeface::MakeFromName("monospace", SkFontStyle());
+    auto serverTfData = server.serializeTypeface(serverTf.get());
+
+    int glyphCount = 10;
+    auto serverBlob = buildTextBlob(serverTf, glyphCount);
+    auto props = FindSurfaceProps(dContext);
+    std::unique_ptr<SkCanvas> analysisCanvas = server.makeAnalysisCanvas(
+            10, 10, props, nullptr, dContext->supportsDistanceFieldText());
+
+    // Generate strike updates.
+    auto srcSlug = GrSlug::ConvertBlob(analysisCanvas.get(), *serverBlob, {0, 0}, paint);
+    SkBinaryWriteBuffer writeBuffer;
+    srcSlug->flatten(writeBuffer);
+
+    auto data = writeBuffer.snapshotAsData();
+    SkReadBuffer readBuffer(data->data(), data->size());
+
+    auto dstSlug = client.makeSlugFromBuffer(readBuffer);
+    REPORTER_ASSERT(reporter, dstSlug != nullptr);
+
+    std::vector<uint8_t> serverStrikeData;
+    server.writeStrikeData(&serverStrikeData);
+
+    // Client.
+    REPORTER_ASSERT(reporter,
+                    client.readStrikeData(serverStrikeData.data(), serverStrikeData.size()));
+
+    SkBitmap expected = RasterSlug(srcSlug, 10, 10, paint, dContext);
+    SkBitmap actual = RasterSlug(dstSlug, 10, 10, paint, dContext);
+    compare_blobs(expected, actual, reporter);
+    REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+
+    // Must unlock everything on termination, otherwise valgrind complains about memory leaks.
+    discardableManager->unlockAndDeleteAll();
+}
+
 DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_ReleaseTypeFace, reporter, ctxInfo) {
     sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
     SkStrikeServer server(discardableManager.get());
@@ -694,7 +820,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_DrawTextAsDFT, reporter, c
     // A scale transform forces fallback to dft.
     SkMatrix matrix = SkMatrix::Scale(16, 16);
     GrSDFTControl control = direct->priv().asRecordingContext()->priv().getSDFTControl(true);
-    REPORTER_ASSERT(reporter, control.drawingType(font, paint, matrix) == GrSDFTControl::kSDFT);
+    SkScalar approximateDeviceTextSize = SkFontPriv::ApproximateTransformedTextSize(font, matrix);
+    REPORTER_ASSERT(reporter, control.isSDFT(approximateDeviceTextSize, paint));
 
     // Server.
     auto serverTf = SkTypeface::MakeFromName("monospace", SkFontStyle());
@@ -763,7 +890,6 @@ sk_sp<SkTextBlob> MakeEmojiBlob(sk_sp<SkTypeface> serverTf, SkScalar textSize,
     font.setSize(textSize);
 
     const char* text = ToolUtils::emoji_sample_text();
-    SkFont serverFont = font;
     auto blob = SkTextBlob::MakeFromText(text, strlen(text), font);
     if (clientTf == nullptr) return blob;
 
@@ -818,3 +944,144 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_TypefaceWithNoPaths, repor
     // Must unlock everything on termination, otherwise valgrind complains about memory leaks.
     discardableManager->unlockAndDeleteAll();
 }
+
+class SkRemoteGlyphCacheTest {
+    public:
+    static sk_sp<SkTextBlob> MakeNormalBlob(SkPaint* paint,
+                                            sk_sp<SkTypeface> serverTf, bool asPaths, SkScalar textSize,
+                                            sk_sp<SkTypeface> clientTf = nullptr) {
+        SkFont font;
+        font.setTypeface(serverTf);
+        font.setSize(textSize);
+
+        const char* text = "Hel lo";
+        if (asPaths) {
+            font.setupForAsPaths(paint);
+        } else {
+            SkFont font2(font);
+            font2.setupForAsPaths(paint);
+        }
+        auto blob = SkTextBlob::MakeFromText(text, strlen(text), font);
+        if (clientTf == nullptr) return blob;
+
+        SkSerialProcs s_procs;
+        s_procs.fTypefaceProc = [](SkTypeface*, void* ctx) -> sk_sp<SkData> {
+            return SkData::MakeUninitialized(1u);
+        };
+        auto serialized = blob->serialize(s_procs);
+
+        SkDeserialProcs d_procs;
+        d_procs.fTypefaceCtx = &clientTf;
+        d_procs.fTypefaceProc = [](const void* data, size_t length, void* ctx) -> sk_sp<SkTypeface> {
+            return *(static_cast<sk_sp<SkTypeface>*>(ctx));
+        };
+        return SkTextBlob::Deserialize(serialized->data(), serialized->size(), d_procs);
+    }
+};
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_TypefaceWithPaths_MaskThenPath,
+                                   reporter, ctxInfo) {
+    auto direct = ctxInfo.directContext();
+    sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
+    SkStrikeServer server(discardableManager.get());
+    SkStrikeClient client(discardableManager, true);
+
+    auto serverTf = ToolUtils::create_portable_typeface();
+    auto serverTfData = server.serializeTypeface(serverTf.get());
+    auto clientTf = client.deserializeTypeface(serverTfData->data(), serverTfData->size());
+
+    auto props = FindSurfaceProps(direct);
+    std::unique_ptr<SkCanvas> cache_diff_canvas = server.makeAnalysisCanvas(
+            500, 500, props, nullptr, direct->supportsDistanceFieldText());
+    SkPaint paint;
+    using Rgct = SkRemoteGlyphCacheTest;
+
+    // Draw from mask out of the strike which provides paths.
+    {
+        auto serverBlob = Rgct::MakeNormalBlob(&paint, serverTf, true, 64);
+        cache_diff_canvas->drawTextBlob(serverBlob.get(), 100, 100, paint);
+    }
+    // Draw from path out of the strike which provides paths.
+    {
+        auto serverBlob = Rgct::MakeNormalBlob(&paint, serverTf, false, 440);
+        cache_diff_canvas->drawTextBlob(serverBlob.get(), 100, 100, paint);
+    }
+    std::vector<uint8_t> serverStrikeData;
+    server.writeStrikeData(&serverStrikeData);
+    if (!serverStrikeData.empty()) {
+        REPORTER_ASSERT(reporter,
+                        client.readStrikeData(serverStrikeData.data(),
+                                              serverStrikeData.size()));
+    }
+    {
+        auto clientBlob = Rgct::MakeNormalBlob(&paint, serverTf, true, 64, clientTf);
+        REPORTER_ASSERT(reporter, clientBlob);
+
+        RasterBlob(clientBlob, 100, 100, paint, direct);
+        REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+        discardableManager->resetCacheMissCounts();
+    }
+    {
+        auto clientBlob = Rgct::MakeNormalBlob(&paint, serverTf, false, 440, clientTf);
+        REPORTER_ASSERT(reporter, clientBlob);
+
+        RasterBlob(clientBlob, 100, 100, paint, direct);
+        REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+        discardableManager->resetCacheMissCounts();
+    }
+    // Must unlock everything on termination, otherwise valgrind complains about memory leaks.
+    discardableManager->unlockAndDeleteAll();
+}
+
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRemoteGlyphCache_TypefaceWithPaths_PathThenMask,
+                                   reporter, ctxInfo) {
+    auto direct = ctxInfo.directContext();
+    sk_sp<DiscardableManager> discardableManager = sk_make_sp<DiscardableManager>();
+    SkStrikeServer server(discardableManager.get());
+    SkStrikeClient client(discardableManager, true);
+
+    auto serverTf = ToolUtils::create_portable_typeface();
+    auto serverTfData = server.serializeTypeface(serverTf.get());
+    auto clientTf = client.deserializeTypeface(serverTfData->data(), serverTfData->size());
+
+    auto props = FindSurfaceProps(direct);
+    std::unique_ptr<SkCanvas> cache_diff_canvas = server.makeAnalysisCanvas(
+            500, 500, props, nullptr, direct->supportsDistanceFieldText());
+    SkPaint paint;
+    using Rgct = SkRemoteGlyphCacheTest;
+
+    // Draw from path out of the strike which provides paths.
+    {
+        auto serverBlob = Rgct::MakeNormalBlob(&paint, serverTf, false, 440);
+        cache_diff_canvas->drawTextBlob(serverBlob.get(), 100, 100, paint);
+    }
+    // Draw from mask out of the strike which provides paths.
+    {
+        auto serverBlob = Rgct::MakeNormalBlob(&paint, serverTf, true, 64);
+        cache_diff_canvas->drawTextBlob(serverBlob.get(), 100, 100, paint);
+    }
+    std::vector<uint8_t> serverStrikeData;
+    server.writeStrikeData(&serverStrikeData);
+    if (!serverStrikeData.empty()) {
+        REPORTER_ASSERT(reporter,
+                        client.readStrikeData(serverStrikeData.data(),
+                                              serverStrikeData.size()));
+    }
+    {
+        auto clientBlob = Rgct::MakeNormalBlob(&paint, serverTf, true, 64, clientTf);
+        REPORTER_ASSERT(reporter, clientBlob);
+
+        RasterBlob(clientBlob, 100, 100, paint, direct);
+        REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+        discardableManager->resetCacheMissCounts();
+    }
+    {
+        auto clientBlob = Rgct::MakeNormalBlob(&paint, serverTf, false, 440, clientTf);
+        REPORTER_ASSERT(reporter, clientBlob);
+
+        RasterBlob(clientBlob, 100, 100, paint, direct);
+        REPORTER_ASSERT(reporter, !discardableManager->hasCacheMiss());
+        discardableManager->resetCacheMissCounts();
+    }
+    // Must unlock everything on termination, otherwise valgrind complains about memory leaks.
+    discardableManager->unlockAndDeleteAll();
+}
diff --git a/third_party/skia/tests/SkRuntimeEffectTest.cpp b/third_party/skia/tests/SkRuntimeEffectTest.cpp
index df4e616f383aa..ba38f38625bbd 100644
--- a/third_party/skia/tests/SkRuntimeEffectTest.cpp
+++ b/third_party/skia/tests/SkRuntimeEffectTest.cpp
@@ -24,6 +24,7 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrFragmentProcessor.h"
 #include "src/gpu/GrImageInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/SurfaceFillContext.h"
 #include "src/gpu/effects/GrSkSLFP.h"
 #include "tests/Test.h"
@@ -332,7 +333,7 @@ class TestEffect {
     }
 
     void test(std::array<GrColor, 4> expected, PreTestFn preTestCallback = nullptr) {
-        auto shader = fBuilder->makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false);
+        auto shader = fBuilder->makeShader();
         if (!shader) {
             REPORT_FAILURE(fReporter, "shader", SkString("Effect didn't produce a shader"));
             return;
@@ -349,7 +350,7 @@ class TestEffect {
     }
 
     std::string trace(const SkIPoint& traceCoord) {
-        sk_sp<SkShader> shader = fBuilder->makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false);
+        sk_sp<SkShader> shader = fBuilder->makeShader();
         if (!shader) {
             REPORT_FAILURE(fReporter, "shader", SkString("Effect didn't produce a shader"));
             return {};
@@ -549,42 +550,153 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SkRuntimeEffectSimple_GPU, r, ctxInfo) {
 }
 
 DEF_TEST(SkRuntimeEffectTraceShader, r) {
+    for (int imageSize : {2, 80}) {
+        SkImageInfo info = SkImageInfo::Make(imageSize, imageSize, kRGBA_8888_SkColorType,
+                                             kPremul_SkAlphaType);
+        sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
+        REPORTER_ASSERT(r, surface);
+        TestEffect effect(r, surface);
+
+        effect.build(R"(
+            half4 main(float2 p) {
+                float2 val = p - 0.5;
+                return val.0y01;
+            }
+        )");
+        int center = imageSize / 2;
+        std::string dump = effect.trace({center, 1});
+        auto expectation = SkSL::String::printf(R"($0 = [main].result (float4 : slot 1/4, L2)
+$1 = [main].result (float4 : slot 2/4, L2)
+$2 = [main].result (float4 : slot 3/4, L2)
+$3 = [main].result (float4 : slot 4/4, L2)
+$4 = p (float2 : slot 1/2, L2)
+$5 = p (float2 : slot 2/2, L2)
+$6 = val (float2 : slot 1/2, L3)
+$7 = val (float2 : slot 2/2, L3)
+F0 = half4 main(float2 p)
+
+enter half4 main(float2 p)
+  p.x = %d.5
+  p.y = 1.5
+  scope +1
+   line 3
+   val.x = %d
+   val.y = 1
+   line 4
+   [main].result.x = 0
+   [main].result.y = 1
+   [main].result.z = 0
+   [main].result.w = 1
+  scope -1
+exit half4 main(float2 p)
+)", center, center);
+        REPORTER_ASSERT(r, dump == expectation,
+                        "Trace output does not match expectation for %dx%d:\n%.*s\n",
+                        imageSize, imageSize, (int)dump.size(), dump.data());
+    }
+}
+
+DEF_TEST(SkRuntimeEffectTracesAreUnoptimized, r) {
     SkImageInfo info = SkImageInfo::Make(2, 2, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
     sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
     REPORTER_ASSERT(r, surface);
     TestEffect effect(r, surface);
-    std::string dump;
 
     effect.build(R"(
+        int globalUnreferencedVar = 7;
+        half inlinableFunction() {
+            return 1;
+        }
         half4 main(float2 p) {
-            float2 val = p - 0.5;
-            return half4(val, 0, 1);
+            if (true) {
+                int localUnreferencedVar = 7;
+            }
+            return inlinableFunction().xxxx;
         }
     )");
-    dump = effect.trace({0, 1});
-    REPORTER_ASSERT(r, dump == R"($0 = [main].result (float4 : slot 1/4, L2)
+    std::string dump = effect.trace({1, 1});
+    constexpr char kExpectation[] = R"($0 = globalUnreferencedVar (int, L2)
+$1 = [main].result (float4 : slot 1/4, L6)
+$2 = [main].result (float4 : slot 2/4, L6)
+$3 = [main].result (float4 : slot 3/4, L6)
+$4 = [main].result (float4 : slot 4/4, L6)
+$5 = p (float2 : slot 1/2, L6)
+$6 = p (float2 : slot 2/2, L6)
+$7 = localUnreferencedVar (int, L8)
+$8 = [inlinableFunction].result (float, L3)
+F0 = half4 main(float2 p)
+F1 = half inlinableFunction()
+
+globalUnreferencedVar = 7
+enter half4 main(float2 p)
+  p.x = 1.5
+  p.y = 1.5
+  scope +1
+   line 7
+   scope +1
+    line 8
+    localUnreferencedVar = 7
+   scope -1
+   line 10
+   enter half inlinableFunction()
+     scope +1
+      line 4
+      [inlinableFunction].result = 1
+     scope -1
+   exit half inlinableFunction()
+   [main].result.x = 1
+   [main].result.y = 1
+   [main].result.z = 1
+   [main].result.w = 1
+  scope -1
+exit half4 main(float2 p)
+)";
+    REPORTER_ASSERT(r, dump == kExpectation,
+                    "Trace output does not match expectation:\n%.*s\n",
+                    (int)dump.size(), dump.data());
+}
+
+DEF_TEST(SkRuntimeEffectTraceCodeThatCannotBeUnoptimized, r) {
+    SkImageInfo info = SkImageInfo::Make(2, 2, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+    sk_sp<SkSurface> surface = SkSurface::MakeRaster(info);
+    REPORTER_ASSERT(r, surface);
+    TestEffect effect(r, surface);
+
+    effect.build(R"(
+        half4 main(float2 p) {
+            int variableThatGetsOptimizedAway = 7;
+            if (true) {
+                return half4(1);
+            }
+            // This (unreachable) path doesn't return a value.
+            // Without optimization, SkSL thinks this code doesn't return a value on every path.
+        }
+    )");
+    std::string dump = effect.trace({1, 1});
+    constexpr char kExpectation[] = R"($0 = [main].result (float4 : slot 1/4, L2)
 $1 = [main].result (float4 : slot 2/4, L2)
 $2 = [main].result (float4 : slot 3/4, L2)
 $3 = [main].result (float4 : slot 4/4, L2)
 $4 = p (float2 : slot 1/2, L2)
 $5 = p (float2 : slot 2/2, L2)
-$6 = val (float2 : slot 1/2, L3)
-$7 = val (float2 : slot 2/2, L3)
 F0 = half4 main(float2 p)
 
 enter half4 main(float2 p)
-  p.x = 0.5
+  p.x = 1.5
   p.y = 1.5
-  line 3
-  val.x = 0
-  val.y = 1
-  line 4
+  scope +1
+   line 4
+   scope +1
+    line 5
+    [main].result.x = 1
+    [main].result.y = 1
+    [main].result.z = 1
+    [main].result.w = 1
+   scope -1
+  scope -1
 exit half4 main(float2 p)
-[main].result.x = 0
-[main].result.y = 1
-[main].result.z = 0
-[main].result.w = 1
-)",
+)";
+    REPORTER_ASSERT(r, dump == kExpectation,
                     "Trace output does not match expectation:\n%.*s\n",
                     (int)dump.size(), dump.data());
 }
@@ -732,10 +844,10 @@ DEF_TEST(SkRuntimeShaderBuilderReuse, r) {
     // Test passes if this sequence doesn't assert.  skbug.com/10667
     SkRuntimeShaderBuilder b(std::move(effect));
     b.uniform("x") = 0.0f;
-    auto shader_0 = b.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false);
+    auto shader_0 = b.makeShader();
 
     b.uniform("x") = 1.0f;
-    auto shader_1 = b.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
+    auto shader_1 = b.makeShader();
 }
 
 DEF_TEST(SkRuntimeBlendBuilderReuse, r) {
@@ -780,7 +892,7 @@ DEF_TEST(SkRuntimeShaderBuilderSetUniforms, r) {
     REPORTER_ASSERT(r, !b.uniform("offset").set<float>(origin, 3));
 #endif
 
-    auto shader = b.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/false);
+    auto shader = b.makeShader();
 }
 
 DEF_TEST(SkRuntimeEffectThreaded, r) {
@@ -833,9 +945,9 @@ static void test_RuntimeEffectStructNameReuse(skiatest::Reporter* r, GrRecording
     ));
     REPORTER_ASSERT(r, childEffect, "%s\n", err.c_str());
     sk_sp<SkShader> nullChild = nullptr;
-    sk_sp<SkShader> child = childEffect->makeShader(/*uniforms=*/nullptr, &nullChild,
-                                                    /*childCount=*/1, /*localMatrix=*/nullptr,
-                                                    /*isOpaque=*/false);
+    sk_sp<SkShader> child = childEffect->makeShader(/*uniforms=*/nullptr,
+                                                    &nullChild,
+                                                    /*childCount=*/1);
 
     SkImageInfo info = SkImageInfo::Make(2, 2, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
     sk_sp<SkSurface> surface = rContext
@@ -936,6 +1048,91 @@ DEF_TEST(SkRuntimeShaderSampleCoords, r) {
          "half4 main(float2 xy) { return helper(xy); }", true, true);
 }
 
+DEF_TEST(SkRuntimeShaderIsOpaque, r) {
+    // This test verifies that we detect certain simple patterns in runtime shaders, and can deduce
+    // (via code in SkSL::Analysis::ReturnsOpaqueColor) that the resulting shader is always opaque.
+    // That logic is conservative, and the tests below reflect this.
+
+    auto test = [&](const char* body, bool expectOpaque) {
+        auto [effect, err] = SkRuntimeEffect::MakeForShader(SkStringPrintf(R"(
+            uniform shader cOnes;
+            uniform shader cZeros;
+            uniform float4 uOnes;
+            uniform float4 uZeros;
+            half4 main(float2 xy) {
+                %s
+            })", body));
+        REPORTER_ASSERT(r, effect);
+
+        auto cOnes = SkShaders::Color(SK_ColorWHITE);
+        auto cZeros = SkShaders::Color(SK_ColorTRANSPARENT);
+        SkASSERT(cOnes->isOpaque());
+        SkASSERT(!cZeros->isOpaque());
+
+        SkRuntimeShaderBuilder builder(effect);
+        builder.child("cOnes") = std::move(cOnes);
+        builder.child("cZeros") = std::move(cZeros);
+        builder.uniform("uOnes") = SkColors::kWhite;
+        builder.uniform("uZeros") = SkColors::kTransparent;
+
+        auto shader = builder.makeShader();
+        REPORTER_ASSERT(r, shader->isOpaque() == expectOpaque);
+    };
+
+    // Cases where our optimization is valid, and works:
+
+    // Returning opaque literals
+    test("return half4(1);",          true);
+    test("return half4(0, 1, 0, 1);", true);
+    test("return half4(0, 0, 0, 1);", true);
+
+    // Simple expressions involving uniforms
+    test("return uZeros.rgb1;",          true);
+    test("return uZeros.bgra.rgb1;",     true);
+    test("return half4(uZeros.rgb, 1);", true);
+
+    // Simple expressions involving child.eval
+    test("return cZeros.eval(xy).rgb1;",          true);
+    test("return cZeros.eval(xy).bgra.rgb1;",     true);
+    test("return half4(cZeros.eval(xy).rgb, 1);", true);
+
+    // Multiple returns
+    test("if (xy.x < 100) { return uZeros.rgb1; } else { return cZeros.eval(xy).rgb1; }", true);
+
+    // More expression cases:
+    test("return (cZeros.eval(xy) * uZeros).rgb1;", true);
+    test("return half4(1, 1, 1, 0.5 + 0.5);",       true);
+
+    // Constant variable propagation
+    test("const half4 kWhite = half4(1); return kWhite;", true);
+
+    // Cases where our optimization is not valid, and does not happen:
+
+    // Returning non-opaque literals
+    test("return half4(0);",          false);
+    test("return half4(1, 1, 1, 0);", false);
+
+    // Returning non-opaque uniforms or children
+    test("return uZeros;",          false);
+    test("return cZeros.eval(xy);", false);
+
+    // Multiple returns
+    test("if (xy.x < 100) { return uZeros; } else { return cZeros.eval(xy).rgb1; }", false);
+    test("if (xy.x < 100) { return uZeros.rgb1; } else { return cZeros.eval(xy); }", false);
+
+    // There should (must) not be any false-positive cases. There are false-negatives.
+    // In these cases, our optimization would be valid, but does not happen:
+
+    // More complex expressions that can't be simplified
+    test("return xy.x < 100 ? uZeros.rgb1 : cZeros.eval(xy).rgb1;", false);
+
+    // Finally, there are cases that are conditional on the uniforms and children. These *could*
+    // determine dynamically if the uniform and/or child being referenced is opaque, and use that
+    // information. Today, we don't do this, so we pessimistically assume they're transparent:
+    test("return uOnes;",          false);
+    test("return cOnes.eval(xy);", false);
+}
+
 DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSkSLFP_Specialized, r, ctxInfo) {
     struct FpAndKey {
         std::unique_ptr<GrFragmentProcessor> fp;
@@ -953,7 +1150,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSkSLFP_Specialized, r, ctxInfo) {
         result.fp = GrSkSLFP::Make(std::move(effect), "color_fp", /*inputFP=*/nullptr,
                                    GrSkSLFP::OptFlags::kNone,
                                    "color", GrSkSLFP::SpecializeIf(specialize, color));
-        GrProcessorKeyBuilder builder(&result.key);
+        skgpu::KeyBuilder builder(&result.key);
         result.fp->addToKey(*ctxInfo.directContext()->priv().caps()->shaderCaps(), &builder);
         builder.flush();
         return result;
diff --git a/third_party/skia/tests/SkSLCross.cpp b/third_party/skia/tests/SkSLCross.cpp
index d285a0d97a9bd..6902fc91b8497 100644
--- a/third_party/skia/tests/SkSLCross.cpp
+++ b/third_party/skia/tests/SkSLCross.cpp
@@ -51,7 +51,7 @@ class VisualizeCrossProductSignFP : public GrFragmentProcessor {
     }
 
 private:
-    void onAddToKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
+    void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
     bool onIsEqual(const GrFragmentProcessor&) const override { return true; }
 
     std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override {
@@ -61,11 +61,11 @@ class VisualizeCrossProductSignFP : public GrFragmentProcessor {
                 auto& fp = args.fFp.cast<VisualizeCrossProductSignFP>();
                 const char *a, *b;
                 fAUniform = args.fUniformHandler->addUniform(&fp, kFragment_GrShaderFlag,
-                                                             GrSLType::kFloat2_GrSLType, "a", &a);
+                                                             SkSLType::kFloat2, "a", &a);
                 fBUniform = args.fUniformHandler->addUniform(&fp, kFragment_GrShaderFlag,
-                                                             GrSLType::kFloat2_GrSLType, "b", &b);
+                                                             SkSLType::kFloat2, "b", &b);
                 args.fFragBuilder->codeAppendf(R"(
-                    float crossProduct = cross(%s, %s);
+                    float crossProduct = cross_length_2d(%s, %s);
                     float2 visualization = clamp(float2(-sign(crossProduct), sign(crossProduct)),
                                                  float2(0), float2(1));
                 return half2(visualization).xy01;)", a, b);
diff --git a/third_party/skia/tests/SkSLDSLErrorLineNumbers.cpp b/third_party/skia/tests/SkSLDSLErrorLineNumbers.cpp
index 847f0426d3609..309cb930400b9 100644
--- a/third_party/skia/tests/SkSLDSLErrorLineNumbers.cpp
+++ b/third_party/skia/tests/SkSLDSLErrorLineNumbers.cpp
@@ -36,7 +36,7 @@ class ExpectErrorLineNumber : public SkSL::ErrorReporter {
         SetErrorReporter(fOldReporter);
     }
 
-    void handleError(skstd::string_view msg, SkSL::PositionInfo pos) override {
+    void handleError(std::string_view msg, SkSL::PositionInfo pos) override {
         REPORTER_ASSERT(fReporter, msg == fMsg,
                 "Error mismatch: expected:\n%sbut received:\n%.*s", fMsg, (int)msg.length(),
                 msg.data());
diff --git a/third_party/skia/tests/SkSLDSLTest.cpp b/third_party/skia/tests/SkSLDSLTest.cpp
index c263c161829b3..02a36ee27face 100644
--- a/third_party/skia/tests/SkSLDSLTest.cpp
+++ b/third_party/skia/tests/SkSLDSLTest.cpp
@@ -69,7 +69,7 @@ class ExpectError : public SkSL::ErrorReporter {
         SetErrorReporter(fOldReporter);
     }
 
-    void handleError(skstd::string_view msg, SkSL::PositionInfo pos) override {
+    void handleError(std::string_view msg, SkSL::PositionInfo pos) override {
         REPORTER_ASSERT(fReporter, fMsg, "Received unexpected extra error: %.*s\n",
                 (int)msg.length(), msg.data());
         REPORTER_ASSERT(fReporter, !fMsg || msg == fMsg,
@@ -130,17 +130,17 @@ DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLStartup, r, ctxInfo) {
     REPORTER_ASSERT(r, !whitespace_insensitive_compare("a b c  d", "\n\n\nabc"));
 }
 
-static SkSL::String stringize(DSLStatement& stmt)          { return stmt.release()->description(); }
-static SkSL::String stringize(DSLPossibleStatement& stmt)  { return stmt.release()->description(); }
-static SkSL::String stringize(DSLExpression& expr)         { return expr.release()->description(); }
-static SkSL::String stringize(DSLPossibleExpression& expr) { return expr.release()->description(); }
-static SkSL::String stringize(DSLBlock& blck)              { return blck.release()->description(); }
-static SkSL::String stringize(SkSL::IRNode& node)          { return node.description(); }
-static SkSL::String stringize(SkSL::Program& program)      { return program.description(); }
+static std::string stringize(DSLStatement& stmt)          { return stmt.release()->description(); }
+static std::string stringize(DSLPossibleStatement& stmt)  { return stmt.release()->description(); }
+static std::string stringize(DSLExpression& expr)         { return expr.release()->description(); }
+static std::string stringize(DSLPossibleExpression& expr) { return expr.release()->description(); }
+static std::string stringize(DSLBlock& blck)              { return blck.release()->description(); }
+static std::string stringize(SkSL::IRNode& node)          { return node.description(); }
+static std::string stringize(SkSL::Program& program)      { return program.description(); }
 
 template <typename T>
 static void expect_equal(skiatest::Reporter* r, int lineNumber, T& input, const char* expected) {
-    SkSL::String actual = stringize(input);
+    std::string actual = stringize(input);
     if (!whitespace_insensitive_compare(expected, actual.c_str())) {
         ERRORF(r, "(Failed on line %d)\nExpected: %s\n  Actual: %s\n",
                   lineNumber, expected, actual.c_str());
@@ -2081,7 +2081,7 @@ DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLInlining, r, ctxInfo) {
         sk_FragColor() = (sqr(2), Half4(sqr(3)))
     );
     const char* source = "source test";
-    std::unique_ptr<SkSL::Program> program = ReleaseProgram(std::make_unique<SkSL::String>(source));
+    std::unique_ptr<SkSL::Program> program = ReleaseProgram(std::make_unique<std::string>(source));
     EXPECT_EQUAL(*program,
                  "layout(location = 0, index = 0, builtin = 10001) out half4 sk_FragColor;"
                  "layout(builtin = 17)in bool sk_Clockwise;"
@@ -2135,7 +2135,7 @@ DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLPrototypes, r, ctxInfo) {
                 "float sqr(float x) { return (x * x); }");
 
         const char* source = "source test";
-        std::unique_ptr<SkSL::Program> p = ReleaseProgram(std::make_unique<SkSL::String>(source));
+        std::unique_ptr<SkSL::Program> p = ReleaseProgram(std::make_unique<std::string>(source));
         EXPECT_EQUAL(*p,
             "layout (builtin = 17) in bool sk_Clockwise;"
             "float sqr(float x);"
diff --git a/third_party/skia/tests/SkSLES2ConformanceTest.cpp b/third_party/skia/tests/SkSLES2ConformanceTest.cpp
index 7d38f1a0dda10..5b2379030d70b 100644
--- a/third_party/skia/tests/SkSLES2ConformanceTest.cpp
+++ b/third_party/skia/tests/SkSLES2ConformanceTest.cpp
@@ -20,7 +20,6 @@
 #include "include/core/SkPaint.h"
 #include "include/core/SkSize.h"
 #include "include/core/SkString.h"
-#include "include/core/SkStringView.h"
 #include "include/core/SkSurface.h"
 #include "include/effects/SkGradientShader.h"
 #include "include/effects/SkImageFilters.h"
@@ -35,6 +34,8 @@
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
 
+#include <string_view>
+
 static void test_expect_fail(skiatest::Reporter* r, const char* testFile) {
     SkRuntimeEffect::Options options{};
     sk_sp<SkData> shaderData = GetResourceAsData(testFile);
@@ -68,7 +69,7 @@ static void test_expect_pass(skiatest::Reporter* r, SkSurface* surface, const ch
     }
 
     SkRuntimeShaderBuilder builder(result.effect);
-    sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
+    sk_sp<SkShader> shader = builder.makeShader();
     if (!shader) {
         ERRORF(r, "%s: Unable to build shader", testFile);
         return;
diff --git a/third_party/skia/tests/SkSLErrorTest.cpp b/third_party/skia/tests/SkSLErrorTest.cpp
new file mode 100644
index 0000000000000..f1b937763fed8
--- /dev/null
+++ b/third_party/skia/tests/SkSLErrorTest.cpp
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "gm/gm.h"
+#include "include/effects/SkRuntimeEffect.h"
+#include "src/core/SkOSFile.h"
+#include "src/core/SkRuntimeEffectPriv.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrDirectContextPriv.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/utils/SkOSPath.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
+
+#include <sstream>
+#include <string_view>
+
+static void test_expect_fail(skiatest::Reporter* r, const char* testFile, SkSL::ProgramKind kind) {
+    sk_sp<SkData> shaderData = GetResourceAsData(testFile);
+    if (!shaderData) {
+        ERRORF(r, "%s: Unable to load file", SkOSPath::Basename(testFile).c_str());
+        return;
+    }
+
+    std::string shaderString{reinterpret_cast<const char*>(shaderData->bytes()),
+                             shaderData->size()};
+
+    // Error expectations are embedded in the source with a special *%%* marker, like so:
+    //
+    //     /*%%*
+    //     expected 'foo', but found 'bar'
+    //     'baz' is not a valid identifier
+    //     *%%*/
+    //
+    // Extract them from the shader text.
+    std::vector<std::string> expectedErrors;
+    constexpr char kExpectedErrorsStart[] = "/*%%*";
+    constexpr char kExpectedErrorsEnd[] = "*%%*/";
+    if (const char* startPtr = strstr(shaderString.c_str(), kExpectedErrorsStart)) {
+        startPtr += strlen(kExpectedErrorsStart);
+        if (const char* endPtr = strstr(startPtr, kExpectedErrorsEnd)) {
+            // Store the text between these delimiters in an array of expected errors.
+            std::stringstream stream{std::string{startPtr, endPtr}};
+            while (stream.good()) {
+                expectedErrors.push_back({});
+                std::getline(stream, expectedErrors.back(), '\n');
+                if (expectedErrors.back().empty()) {
+                    expectedErrors.pop_back();
+                }
+            }
+        }
+    }
+
+    // Compile the code.
+    std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Standalone();
+    SkSL::Compiler compiler(caps.get());
+    SkSL::Program::Settings settings;
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, std::move(shaderString),
+                                                                     settings);
+
+    // If the code actually generated a working program, we've already failed.
+    if (program) {
+        ERRORF(r, "%s: Expected failure, but compiled successfully",
+                  SkOSPath::Basename(testFile).c_str());
+        return;
+    }
+
+    // Verify that the SkSL compiler actually emitted the expected error messages.
+    // The list of expectations isn't necessarily exhaustive, though.
+    std::string reportedErrors = compiler.errorText();
+    std::string originalErrors = reportedErrors;
+    bool reportOriginalErrors = false;
+    for (const std::string& expectedError : expectedErrors) {
+        // If this error wasn't reported, trigger an error.
+        size_t pos = reportedErrors.find(expectedError.c_str());
+        if (pos == std::string::npos) {
+            ERRORF(r, "%s: Expected an error that wasn't reported:\n%s\n",
+                   SkOSPath::Basename(testFile).c_str(), expectedError.c_str());
+            reportOriginalErrors = true;
+        } else {
+            // We found the error that we expected to have. Remove that error from our report, and
+            // everything preceding it as well. This ensures that we don't match the same error
+            // twice, and that errors are reported in the order we expect.
+            reportedErrors.erase(0, pos + expectedError.size());
+        }
+    }
+
+    if (reportOriginalErrors) {
+        ERRORF(r, "%s: The following errors were reported:\n%s\n",
+               SkOSPath::Basename(testFile).c_str(), originalErrors.c_str());
+    }
+}
+
+static void iterate_dir(const char* directory,
+                        const char* extension,
+                        const std::function<void(const char*)>& run) {
+    SkString resourceDirectory = GetResourcePath(directory);
+    SkOSFile::Iter iter(resourceDirectory.c_str(), extension);
+    SkString name;
+
+    while (iter.next(&name, /*getDir=*/false)) {
+        SkString path(SkOSPath::Join(directory, name.c_str()));
+        run(path.c_str());
+    }
+}
+
+DEF_TEST(SkSLErrorTest, r) {
+    iterate_dir("sksl/errors/", ".sksl", [&](const char* path) {
+        test_expect_fail(r, path, SkSL::ProgramKind::kFragment);
+    });
+}
+
+DEF_TEST(SkSLRuntimeShaderErrorTest, r) {
+    iterate_dir("sksl/runtime_errors/", ".rts", [&](const char* path) {
+        test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeShader);
+    });
+}
+
+DEF_TEST(SkSLRuntimeColorFilterErrorTest, r) {
+    iterate_dir("sksl/runtime_errors/", ".rtcf", [&](const char* path) {
+        test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeColorFilter);
+    });
+}
+
+DEF_TEST(SkSLRuntimeBlenderErrorTest, r) {
+    iterate_dir("sksl/runtime_errors/", ".rtb", [&](const char* path) {
+        test_expect_fail(r, path, SkSL::ProgramKind::kRuntimeBlender);
+    });
+}
diff --git a/third_party/skia/tests/SkSLGLSLTestbed.cpp b/third_party/skia/tests/SkSLGLSLTestbed.cpp
index 261eac7b56de0..b637da9f87d90 100644
--- a/third_party/skia/tests/SkSLGLSLTestbed.cpp
+++ b/third_party/skia/tests/SkSLGLSLTestbed.cpp
@@ -15,13 +15,13 @@ static void test(skiatest::Reporter* r,
                  SkSL::ProgramKind kind = SkSL::ProgramKind::kFragment) {
     SkSL::Compiler compiler(&caps);
     SkSL::Program::Settings settings;
-    SkSL::String output;
-    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, SkSL::String(src),
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, std::string(src),
                                                                      settings);
     if (!program) {
         SkDebugf("Unexpected error compiling %s\n%s", src, compiler.errorText().c_str());
         REPORTER_ASSERT(r, program);
     } else {
+        std::string output;
         REPORTER_ASSERT(r, compiler.toGLSL(*program, &output));
         REPORTER_ASSERT(r, output != "");
         //SkDebugf("GLSL output:\n\n%s", output.c_str());
diff --git a/third_party/skia/tests/SkSLInterpreterTest.cpp b/third_party/skia/tests/SkSLInterpreterTest.cpp
index a048c987171aa..2bb832746fc8b 100644
--- a/third_party/skia/tests/SkSLInterpreterTest.cpp
+++ b/third_party/skia/tests/SkSLInterpreterTest.cpp
@@ -8,8 +8,8 @@
 #include "include/core/SkM44.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/sksl/codegen/SkSLVMCodeGenerator.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
 #include "src/sksl/ir/SkSLExternalFunction.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
 #include "src/utils/SkJSON.h"
 
 #include "tests/Test.h"
@@ -24,14 +24,14 @@ struct ProgramBuilder {
         // For convenience, so we can test functions other than (and not called by) main.
         settings.fRemoveDeadFunctions = false;
 
-        fProgram = fCompiler.convertProgram(SkSL::ProgramKind::kGeneric, SkSL::String(src),
+        fProgram = fCompiler.convertProgram(SkSL::ProgramKind::kGeneric, std::string(src),
                                             settings);
         if (!fProgram) {
             ERRORF(r, "Program failed to compile:\n%s\n%s\n", src, fCompiler.errorText().c_str());
         }
     }
 
-    operator bool() const { return fProgram != nullptr; }
+    explicit operator bool() const { return fProgram != nullptr; }
     SkSL::Program& operator*() { return *fProgram; }
 
     SkSL::ShaderCaps fCaps;
@@ -628,7 +628,7 @@ static void expect_failure(skiatest::Reporter* r, const char* src) {
     SkSL::Compiler compiler(&caps);
     SkSL::Program::Settings settings;
     auto program = compiler.convertProgram(SkSL::ProgramKind::kGeneric,
-                                           SkSL::String(src), settings);
+                                           std::string(src), settings);
     REPORTER_ASSERT(r, !program);
 }
 
@@ -900,7 +900,7 @@ DEF_TEST(SkSLInterpreterExternalFunction, r) {
     externalFunctions.push_back(std::make_unique<ExternalSqrt>("externalSqrt", compiler));
     settings.fExternalFunctions = &externalFunctions;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
-            SkSL::ProgramKind::kGeneric, SkSL::String(src), settings);
+            SkSL::ProgramKind::kGeneric, std::string(src), settings);
     REPORTER_ASSERT(r, program);
 
     const SkSL::FunctionDefinition* main = SkSL::Program_GetFunction(*program, "main");
@@ -959,7 +959,7 @@ DEF_TEST(SkSLInterpreterExternalTable, r) {
     externalFunctions.push_back(std::make_unique<ExternalTable>("table", compiler, &u));
     settings.fExternalFunctions = &externalFunctions;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
-            SkSL::ProgramKind::kGeneric, SkSL::String(src), settings);
+            SkSL::ProgramKind::kGeneric, std::string(src), settings);
     REPORTER_ASSERT(r, program);
 
     const SkSL::FunctionDefinition* main = SkSL::Program_GetFunction(*program, "main");
@@ -1004,7 +1004,7 @@ int main() {
 )";
     skvm::Builder b;
     std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::ProgramKind::kGeneric,
-                                                                     SkSL::String(kSrc), settings);
+                                                                     std::string(kSrc), settings);
     REPORTER_ASSERT(r, program);
 
     const SkSL::FunctionDefinition* main = SkSL::Program_GetFunction(*program, "main");
@@ -1020,7 +1020,7 @@ int main() {
     debugTrace.dump(&streamDump);
 
     sk_sp<SkData> dataDump = streamDump.detachAsData();
-    skstd::string_view trace{static_cast<const char*>(dataDump->data()), dataDump->size()};
+    std::string_view trace{static_cast<const char*>(dataDump->data()), dataDump->size()};
 
     REPORTER_ASSERT(r, result == 40);
     REPORTER_ASSERT(r, trace ==
@@ -1047,101 +1047,123 @@ F0 = int main()
 F1 = bool less_than(float left, int right)
 
 enter int main()
-  line 11
-  a[0].x = 0
-  a[0].y = 0
-  a[1].x = 0
-  a[1].y = 0
-  line 12
-  loop = 10
-  line 13
-  v.x = 10
-  v.y = 11
-  v.z = 12
-  v.w = 13
-  line 14
-  m[0][0] = 10
-  m[0][1] = 11
-  m[1][0] = 12
-  m[1][1] = 13
-  line 15
-  a[0].x = 10
-  a[0].y = 11
-  line 15
-  a[1].x = 12
-  a[1].y = 13
-  line 16
-  enter bool less_than(float left, int right)
-    left = 10
-    right = 20
-    line 2
-    comparison = true
-    line 3
-    line 4
-  exit bool less_than(float left, int right)
-  [less_than].result = true
-  function_result = true
-  line 12
-  loop = 20
-  line 13
-  v.x = 20
-  v.y = 21
-  v.z = 22
-  v.w = 23
-  line 14
-  m[0][0] = 20
-  m[0][1] = 21
-  m[1][0] = 22
-  m[1][1] = 23
-  line 15
-  a[0].x = 20
-  a[0].y = 21
-  line 15
-  a[1].x = 22
-  a[1].y = 23
-  line 16
-  enter bool less_than(float left, int right)
-    left = 20
-    right = 20
-    line 2
-    comparison = false
-    line 3
-    line 6
-  exit bool less_than(float left, int right)
-  [less_than].result = false
-  function_result = false
-  line 12
-  loop = 30
-  line 13
-  v.x = 30
-  v.y = 31
-  v.z = 32
-  v.w = 33
-  line 14
-  m[0][0] = 30
-  m[0][1] = 31
-  m[1][0] = 32
-  m[1][1] = 33
-  line 15
-  a[0].x = 30
-  a[0].y = 31
-  line 15
-  a[1].x = 32
-  a[1].y = 33
-  line 16
-  enter bool less_than(float left, int right)
-    left = 30
-    right = 20
-    line 2
-    comparison = false
-    line 3
-    line 6
-  exit bool less_than(float left, int right)
-  [less_than].result = false
-  function_result = false
-  line 12
-  line 18
+  scope +1
+   line 11
+   a[0].x = 0
+   a[0].y = 0
+   a[1].x = 0
+   a[1].y = 0
+   line 12
+   scope +1
+    loop = 10
+    scope +1
+     line 13
+     v.x = 10
+     v.y = 11
+     v.z = 12
+     v.w = 13
+     line 14
+     m[0][0] = 10
+     m[0][1] = 11
+     m[1][0] = 12
+     m[1][1] = 13
+     line 15
+     a[0].x = 10
+     a[0].y = 11
+     line 15
+     a[1].x = 12
+     a[1].y = 13
+     line 16
+     enter bool less_than(float left, int right)
+       left = 10
+       right = 20
+       scope +1
+        line 2
+        comparison = true
+        line 3
+        scope +1
+         line 4
+         [less_than].result = true
+        scope -1
+       scope -1
+     exit bool less_than(float left, int right)
+     function_result = true
+    scope -1
+    line 12
+    loop = 20
+    scope +1
+     line 13
+     v.x = 20
+     v.y = 21
+     v.z = 22
+     v.w = 23
+     line 14
+     m[0][0] = 20
+     m[0][1] = 21
+     m[1][0] = 22
+     m[1][1] = 23
+     line 15
+     a[0].x = 20
+     a[0].y = 21
+     line 15
+     a[1].x = 22
+     a[1].y = 23
+     line 16
+     enter bool less_than(float left, int right)
+       left = 20
+       right = 20
+       scope +1
+        line 2
+        comparison = false
+        line 3
+        scope +1
+         line 6
+         [less_than].result = false
+        scope -1
+       scope -1
+     exit bool less_than(float left, int right)
+     function_result = false
+    scope -1
+    line 12
+    loop = 30
+    scope +1
+     line 13
+     v.x = 30
+     v.y = 31
+     v.z = 32
+     v.w = 33
+     line 14
+     m[0][0] = 30
+     m[0][1] = 31
+     m[1][0] = 32
+     m[1][1] = 33
+     line 15
+     a[0].x = 30
+     a[0].y = 31
+     line 15
+     a[1].x = 32
+     a[1].y = 33
+     line 16
+     enter bool less_than(float left, int right)
+       left = 30
+       right = 20
+       scope +1
+        line 2
+        comparison = false
+        line 3
+        scope +1
+         line 6
+         [less_than].result = false
+        scope -1
+       scope -1
+     exit bool less_than(float left, int right)
+     function_result = false
+    scope -1
+    line 12
+   scope -1
+   line 18
+   [main].result = 40
+  scope -1
 exit int main()
-[main].result = 40
 )", "Trace output does not match expectation:\n%.*s\n", (int)trace.size(), trace.data());
 }
diff --git a/third_party/skia/tests/SkSLMemoryLayoutTest.cpp b/third_party/skia/tests/SkSLMemoryLayoutTest.cpp
index b70d2041f4143..5973d512f38d2 100644
--- a/third_party/skia/tests/SkSLMemoryLayoutTest.cpp
+++ b/third_party/skia/tests/SkSLMemoryLayoutTest.cpp
@@ -57,44 +57,44 @@ DEF_TEST(SkSLMemoryLayout140Test, r) {
 
     // struct 1
     std::vector<SkSL::Type::Field> fields1;
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("a"),
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"),
                          context.fTypes.fFloat3.get());
-    std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, SkSL::String("s1"), fields1);
+    std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, std::string("s1"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(*s1));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
 
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("b"), context.fTypes.fFloat.get());
-    std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, SkSL::String("s2"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
+    std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, std::string("s2"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(*s2));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
 
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("c"), context.fTypes.fBool.get());
-    std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, SkSL::String("s3"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
+    std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, std::string("s3"), fields1);
     REPORTER_ASSERT(r, 32 == layout.size(*s3));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
 
     // struct 2
     std::vector<SkSL::Type::Field> fields2;
-    fields2.emplace_back(SkSL::Modifiers(), skstd::string_view("a"), context.fTypes.fInt.get());
-    std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, SkSL::String("s4"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
+    std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, std::string("s4"), fields2);
     REPORTER_ASSERT(r, 16 == layout.size(*s4));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s4));
 
-    fields2.emplace_back(SkSL::Modifiers(), skstd::string_view("b"),
+    fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"),
                          context.fTypes.fFloat3.get());
-    std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, SkSL::String("s5"), fields2);
+    std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, std::string("s5"), fields2);
     REPORTER_ASSERT(r, 32 == layout.size(*s5));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
 
     // arrays
     std::unique_ptr<SkSL::Type> array1 =
-            SkSL::Type::MakeArrayType(SkSL::String("float[4]"), *context.fTypes.fFloat, 4);
+            SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
     REPORTER_ASSERT(r, 64 == layout.size(*array1));
     REPORTER_ASSERT(r, 16 == layout.alignment(*array1));
     REPORTER_ASSERT(r, 16 == layout.stride(*array1));
 
     std::unique_ptr<SkSL::Type> array2 =
-            SkSL::Type::MakeArrayType(SkSL::String("float4[4]"), *context.fTypes.fFloat4, 4);
+            SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
     REPORTER_ASSERT(r, 64 == layout.size(*array2));
     REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
     REPORTER_ASSERT(r, 16 == layout.stride(*array2));
@@ -145,44 +145,44 @@ DEF_TEST(SkSLMemoryLayout430Test, r) {
 
     // struct 1
     std::vector<SkSL::Type::Field> fields1;
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("a"),
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("a"),
                          context.fTypes.fFloat3.get());
-    std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, SkSL::String("s1"), fields1);
+    std::unique_ptr<SkSL::Type> s1 = SkSL::Type::MakeStructType(-1, std::string("s1"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(*s1));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s1));
 
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("b"), context.fTypes.fFloat.get());
-    std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, SkSL::String("s2"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("b"), context.fTypes.fFloat.get());
+    std::unique_ptr<SkSL::Type> s2 = SkSL::Type::MakeStructType(-1, std::string("s2"), fields1);
     REPORTER_ASSERT(r, 16 == layout.size(*s2));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s2));
 
-    fields1.emplace_back(SkSL::Modifiers(), skstd::string_view("c"), context.fTypes.fBool.get());
-    std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, SkSL::String("s3"), fields1);
+    fields1.emplace_back(SkSL::Modifiers(), std::string_view("c"), context.fTypes.fBool.get());
+    std::unique_ptr<SkSL::Type> s3 = SkSL::Type::MakeStructType(-1, std::string("s3"), fields1);
     REPORTER_ASSERT(r, 32 == layout.size(*s3));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s3));
 
     // struct 2
     std::vector<SkSL::Type::Field> fields2;
-    fields2.emplace_back(SkSL::Modifiers(), skstd::string_view("a"), context.fTypes.fInt.get());
-    std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, SkSL::String("s4"), fields2);
+    fields2.emplace_back(SkSL::Modifiers(), std::string_view("a"), context.fTypes.fInt.get());
+    std::unique_ptr<SkSL::Type> s4 = SkSL::Type::MakeStructType(-1, std::string("s4"), fields2);
     REPORTER_ASSERT(r, 4 == layout.size(*s4));
     REPORTER_ASSERT(r, 4 == layout.alignment(*s4));
 
-    fields2.emplace_back(SkSL::Modifiers(), skstd::string_view("b"),
+    fields2.emplace_back(SkSL::Modifiers(), std::string_view("b"),
                          context.fTypes.fFloat3.get());
-    std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, SkSL::String("s5"), fields2);
+    std::unique_ptr<SkSL::Type> s5 = SkSL::Type::MakeStructType(-1, std::string("s5"), fields2);
     REPORTER_ASSERT(r, 32 == layout.size(*s5));
     REPORTER_ASSERT(r, 16 == layout.alignment(*s5));
 
     // arrays
     std::unique_ptr<SkSL::Type> array1 =
-            SkSL::Type::MakeArrayType(SkSL::String("float[4]"), *context.fTypes.fFloat, 4);
+            SkSL::Type::MakeArrayType(std::string("float[4]"), *context.fTypes.fFloat, 4);
     REPORTER_ASSERT(r, 16 == layout.size(*array1));
     REPORTER_ASSERT(r, 4 == layout.alignment(*array1));
     REPORTER_ASSERT(r, 4 == layout.stride(*array1));
 
     std::unique_ptr<SkSL::Type> array2 =
-            SkSL::Type::MakeArrayType(SkSL::String("float4[4]"), *context.fTypes.fFloat4, 4);
+            SkSL::Type::MakeArrayType(std::string("float4[4]"), *context.fTypes.fFloat4, 4);
     REPORTER_ASSERT(r, 64 == layout.size(*array2));
     REPORTER_ASSERT(r, 16 == layout.alignment(*array2));
     REPORTER_ASSERT(r, 16 == layout.stride(*array2));
diff --git a/third_party/skia/tests/SkSLMetalTestbed.cpp b/third_party/skia/tests/SkSLMetalTestbed.cpp
index bb817df778cf7..3aabe262fba03 100644
--- a/third_party/skia/tests/SkSLMetalTestbed.cpp
+++ b/third_party/skia/tests/SkSLMetalTestbed.cpp
@@ -15,13 +15,13 @@ static void test(skiatest::Reporter* r,
                  SkSL::ProgramKind kind = SkSL::ProgramKind::kFragment) {
     SkSL::Compiler compiler(&caps);
     SkSL::Program::Settings settings;
-    SkSL::String output;
-    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, SkSL::String(src),
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, std::string(src),
                                                                      settings);
     if (!program) {
         SkDebugf("Unexpected error compiling %s\n%s", src, compiler.errorText().c_str());
         REPORTER_ASSERT(r, program);
     } else {
+        std::string output;
         REPORTER_ASSERT(r, compiler.toMetal(*program, &output));
         REPORTER_ASSERT(r, output != "");
         //SkDebugf("Metal output:\n\n%s", output.c_str());
diff --git a/third_party/skia/tests/SkSLSPIRVTestbed.cpp b/third_party/skia/tests/SkSLSPIRVTestbed.cpp
index 23017a94e96f2..9ba699ef176c5 100644
--- a/third_party/skia/tests/SkSLSPIRVTestbed.cpp
+++ b/third_party/skia/tests/SkSLSPIRVTestbed.cpp
@@ -15,13 +15,13 @@ static void test(skiatest::Reporter* r,
                  SkSL::ProgramKind kind = SkSL::ProgramKind::kFragment) {
     SkSL::Compiler compiler(&caps);
     SkSL::Program::Settings settings;
-    SkSL::String output;
-    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, SkSL::String(src),
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(kind, std::string(src),
                                                                      settings);
     if (!program) {
         SkDebugf("Unexpected error compiling %s\n%s", src, compiler.errorText().c_str());
         REPORTER_ASSERT(r, program);
     } else {
+        std::string output;
         REPORTER_ASSERT(r, compiler.toSPIRV(*program, &output));
     }
 }
diff --git a/third_party/skia/tests/SkSLTest.cpp b/third_party/skia/tests/SkSLTest.cpp
index 43f1846ff1dfc..efbad131e17e4 100644
--- a/third_party/skia/tests/SkSLTest.cpp
+++ b/third_party/skia/tests/SkSLTest.cpp
@@ -18,10 +18,15 @@
 #include "include/effects/SkImageFilters.h"
 #include "include/effects/SkRuntimeEffect.h"
 #include "include/private/SkSLDefines.h"  // for kDefaultInlineThreshold
+#include "include/sksl/DSLCore.h"
 #include "include/utils/SkRandom.h"
 #include "src/core/SkRuntimeEffectPriv.h"
 #include "src/gpu/GrCaps.h"
 #include "src/gpu/GrDirectContextPriv.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLDehydrator.h"
+#include "src/sksl/SkSLRehydrator.h"
+#include "src/sksl/SkSLThreadContext.h"
 #include "tests/Test.h"
 #include "tools/Resources.h"
 #include "tools/ToolUtils.h"
@@ -45,19 +50,27 @@ static void set_uniform_array(SkRuntimeShaderBuilder* builder, const char* name,
     }
 }
 
+static SkString load_source(skiatest::Reporter* r,
+                            const char* testFile,
+                            const char* permutationSuffix) {
+    SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
+    sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
+    if (!shaderData) {
+        ERRORF(r, "%s%s: Unable to load file", testFile, permutationSuffix);
+        return SkString("");
+    }
+    return SkString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
+}
+
 static void test_one_permutation(skiatest::Reporter* r,
                                  SkSurface* surface,
                                  const char* testFile,
                                  const char* permutationSuffix,
                                  const SkRuntimeEffect::Options& options) {
-    SkString resourcePath = SkStringPrintf("sksl/%s", testFile);
-    sk_sp<SkData> shaderData = GetResourceAsData(resourcePath.c_str());
-    if (!shaderData) {
-        ERRORF(r, "%s%s: Unable to load file", testFile, permutationSuffix);
+    SkString shaderString = load_source(r, testFile, permutationSuffix);
+    if (shaderString.isEmpty()) {
         return;
     }
-
-    SkString shaderString{reinterpret_cast<const char*>(shaderData->bytes()), shaderData->size()};
     SkRuntimeEffect::Result result = SkRuntimeEffect::MakeForShader(shaderString, options);
     if (!result.effect) {
         ERRORF(r, "%s%s: %s", testFile, permutationSuffix, result.errorText.c_str());
@@ -86,7 +99,7 @@ static void test_one_permutation(skiatest::Reporter* r,
                                                                   7, 8, 9});
     set_uniform_array(&builder, "testArray",  SkMakeSpan(kArray));
 
-    sk_sp<SkShader> shader = builder.makeShader(/*localMatrix=*/nullptr, /*isOpaque=*/true);
+    sk_sp<SkShader> shader = builder.makeShader();
     if (!shader) {
         ERRORF(r, "%s%s: Unable to build shader", testFile, permutationSuffix);
         return;
@@ -171,6 +184,66 @@ static void test_es3(skiatest::Reporter* r, GrDirectContext* ctx, const char* te
     test_permutations(r, surface.get(), testFile, /*worksInES2=*/false);
 }
 
+static void test_clone(skiatest::Reporter* r, const char* testFile) {
+    SkString shaderString = load_source(r, testFile, "");
+    if (shaderString.isEmpty()) {
+        return;
+    }
+    std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Standalone();
+    SkSL::Program::Settings settings;
+    settings.fAllowVarDeclarationCloneForTesting = true;
+    SkSL::Compiler compiler(caps.get());
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
+            SkSL::ProgramKind::kRuntimeShader, shaderString.c_str(), settings);
+    if (!program) {
+        ERRORF(r, "%s", compiler.errorText().c_str());
+        return;
+    }
+    // Starting DSL allows us to get access to the ThreadContext::Settings
+    SkSL::dsl::Start(&compiler, SkSL::ProgramKind::kFragment, settings);
+    for (const std::unique_ptr<SkSL::ProgramElement>& element : program->fOwnedElements) {
+        std::string original = element->description();
+        std::string cloned = element->clone()->description();
+        REPORTER_ASSERT(r, original == cloned,
+                "Mismatch after clone!\nOriginal: %s\nCloned: %s\n", original.c_str(),
+                cloned.c_str());
+    }
+    SkSL::dsl::End();
+}
+
+static void test_rehydrate(skiatest::Reporter* r, const char* testFile) {
+    SkString shaderString = load_source(r, testFile, "");
+    if (shaderString.isEmpty()) {
+        return;
+    }
+    std::unique_ptr<SkSL::ShaderCaps> caps = SkSL::ShaderCapsFactory::Default();
+    SkSL::Compiler compiler(caps.get());
+    SkSL::Program::Settings settings;
+    // Inlining causes problems because it can create expressions like bool(1) that can't be
+    // directly instantiated. After a dehydrate/recycle pass, that expression simply becomes "true"
+    // due to optimization - which is fine, but would cause us to fail an equality comparison. We
+    // disable inlining to avoid this issue.
+    settings.fInlineThreshold = 0;
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(
+            SkSL::ProgramKind::kRuntimeShader, shaderString.c_str(), settings);
+    if (!program) {
+        ERRORF(r, "%s", compiler.errorText().c_str());
+        return;
+    }
+    SkSL::Dehydrator dehydrator;
+    dehydrator.write(*program);
+    SkSL::StringStream stream;
+    dehydrator.finish(stream);
+
+    SkSL::Rehydrator rehydrator(compiler, (const uint8_t*) stream.str().data(),
+            stream.str().length());
+    std::unique_ptr<SkSL::Program> rehydrated = rehydrator.program();
+    REPORTER_ASSERT(r, rehydrated->description() == program->description(),
+            "Mismatch between original and dehydrated/rehydrated:\n-- Original:\n%s\n"
+            "-- Rehydrated:\n%s", program->description().c_str(),
+            rehydrated->description().c_str());
+}
+
 #define SKSL_TEST_CPU(name, path)                                   \
     DEF_TEST(name ## _CPU, r) {                                     \
         test_cpu(r, path, true);                                    \
@@ -189,8 +262,18 @@ static void test_es3(skiatest::Reporter* r, GrDirectContext* ctx, const char* te
     DEF_GPUTEST_FOR_RENDERING_CONTEXTS(name ## _GPU, r, ctxInfo) {  \
         test_es3(r, ctxInfo.directContext(), path);                 \
     }
+#define SKSL_TEST_REHYDRATE(name, path)                             \
+    DEF_TEST(name ## _REHYDRATE, r) {                               \
+        test_rehydrate(r, path);                                    \
+    }
+
+#define SKSL_TEST_CLONE(name, path)                                 \
+    DEF_TEST(name ## _CLONE, r) {                                   \
+        test_clone(r, path);                                        \
+    }
 
-#define SKSL_TEST(name, path) SKSL_TEST_CPU(name, path) SKSL_TEST_GPU(name, path)
+#define SKSL_TEST(name, path) SKSL_TEST_CPU(name, path) SKSL_TEST_GPU(name, path) \
+        SKSL_TEST_CLONE(name, path) SKSL_TEST_REHYDRATE(name, path)
 
 SKSL_TEST(SkSLArraySizeFolding,                "folding/ArraySizeFolding.sksl")
 SKSL_TEST(SkSLAssignmentOps,                   "folding/AssignmentOps.sksl")
@@ -199,11 +282,11 @@ SKSL_TEST(SkSLCastFolding,                     "folding/CastFolding.sksl")
 SKSL_TEST(SkSLIntFoldingES2,                   "folding/IntFoldingES2.sksl")
 SKSL_TEST_ES3(SkSLIntFoldingES3,               "folding/IntFoldingES3.sksl")
 SKSL_TEST(SkSLFloatFolding,                    "folding/FloatFolding.sksl")
-// skbug.com/11919: Fails on Nexus5/7, and Intel GPUs
-SKSL_TEST_CPU(SkSLMatrixFoldingES2,            "folding/MatrixFoldingES2.sksl")
+SKSL_TEST(SkSLMatrixFoldingES2,                "folding/MatrixFoldingES2.sksl")
 SKSL_TEST_ES3(SkSLMatrixFoldingES3,            "folding/MatrixFoldingES3.sksl")
 SKSL_TEST(SkSLSelfAssignment,                  "folding/SelfAssignment.sksl")
 SKSL_TEST(SkSLShortCircuitBoolFolding,         "folding/ShortCircuitBoolFolding.sksl")
+SKSL_TEST(SkSLSwitchCaseFolding,               "folding/SwitchCaseFolding.sksl")
 SKSL_TEST(SkSLSwizzleFolding,                  "folding/SwizzleFolding.sksl")
 SKSL_TEST(SkSLVectorScalarFolding,             "folding/VectorScalarFolding.sksl")
 SKSL_TEST(SkSLVectorVectorFolding,             "folding/VectorVectorFolding.sksl")
@@ -230,8 +313,6 @@ SKSL_TEST(SkSLInlinerUsesTempVarForMultipleReturns,
 SKSL_TEST(SkSLInlinerUsesTempVarForReturnsInsideBlockWithVar,
      "inliner/InlinerUsesTempVarForReturnsInsideBlockWithVar.sksl")
 SKSL_TEST(SkSLInlineThreshold,                    "inliner/InlineThreshold.sksl")
-// skbug.com/11919: Fails on Adreno + Vulkan
-SKSL_TEST_CPU(SkSLInlineWithInoutArgument,        "inliner/InlineWithInoutArgument.sksl")
 SKSL_TEST(SkSLInlineWithModifiedArgument,         "inliner/InlineWithModifiedArgument.sksl")
 SKSL_TEST(SkSLInlineWithNestedBigCalls,           "inliner/InlineWithNestedBigCalls.sksl")
 SKSL_TEST(SkSLInlineWithUnmodifiedArgument,       "inliner/InlineWithUnmodifiedArgument.sksl")
@@ -249,11 +330,8 @@ SKSL_TEST_ES3(SkSLWhileBodyMustBeInlinedIntoAScope,
          "inliner/WhileBodyMustBeInlinedIntoAScope.sksl")
 SKSL_TEST_ES3(SkSLWhileTestCannotBeInlined,       "inliner/WhileTestCannotBeInlined.sksl")
 
-// TODO(skia:11052): SPIR-V does not yet honor `out` param semantics correctly
-SKSL_TEST_CPU(SkSLInlinerHonorsGLSLOutParamSemantics,
-         "inliner/InlinerHonorsGLSLOutParamSemantics.sksl")
-
 SKSL_TEST(SkSLIntrinsicAbsFloat,               "intrinsics/AbsFloat.sksl")
+SKSL_TEST_ES3(SkSLIntrinsicAbsInt,             "intrinsics/AbsInt.sksl")
 SKSL_TEST(SkSLIntrinsicCeil,                   "intrinsics/Ceil.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicDeterminant,        "intrinsics/Determinant.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicDFdx,               "intrinsics/DFdx.sksl")
@@ -265,14 +343,14 @@ SKSL_TEST_ES3(SkSLIntrinsicIntBitsToFloat,     "intrinsics/IntBitsToFloat.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicIsInf,              "intrinsics/IsInf.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicClampInt,           "intrinsics/ClampInt.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicClampUInt,          "intrinsics/ClampUInt.sksl")
-// Fails on Adreno 6xx + Vulkan
-SKSL_TEST_CPU(SkSLIntrinsicClampFloat,         "intrinsics/ClampFloat.sksl")
+SKSL_TEST(SkSLIntrinsicClampFloat,             "intrinsics/ClampFloat.sksl")
 SKSL_TEST(SkSLIntrinsicMatrixCompMultES2,      "intrinsics/MatrixCompMultES2.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicMatrixCompMultES3,  "intrinsics/MatrixCompMultES3.sksl")
 SKSL_TEST(SkSLIntrinsicMaxFloat,               "intrinsics/MaxFloat.sksl")
+SKSL_TEST_ES3(SkSLIntrinsicMaxInt,             "intrinsics/MaxInt.sksl")
 SKSL_TEST(SkSLIntrinsicMinFloat,               "intrinsics/MinFloat.sksl")
-// Fails on Adreno + Vulkan (skia:11919)
-SKSL_TEST_CPU(SkSLIntrinsicMixFloat,           "intrinsics/MixFloat.sksl")
+SKSL_TEST_ES3(SkSLIntrinsicMinInt,             "intrinsics/MinInt.sksl")
+SKSL_TEST(SkSLIntrinsicMixFloat,               "intrinsics/MixFloat.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicModf,               "intrinsics/Modf.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicOuterProduct,       "intrinsics/OuterProduct.sksl")
 // Fails on Mac OpenGL + Radeon 5300M (skia:12434)
@@ -280,6 +358,7 @@ SKSL_TEST_ES3(SkSLIntrinsicOuterProduct,       "intrinsics/OuterProduct.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicRound,              "intrinsics/Round.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicRoundEven,          "intrinsics/RoundEven.sksl")
 SKSL_TEST(SkSLIntrinsicSignFloat,              "intrinsics/SignFloat.sksl")
+SKSL_TEST_ES3(SkSLIntrinsicSignInt,            "intrinsics/SignInt.sksl")
 SKSL_TEST(SkSLIntrinsicStep,                   "intrinsics/Step.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicTrunc,              "intrinsics/Trunc.sksl")
 SKSL_TEST_ES3(SkSLIntrinsicTranspose,          "intrinsics/Transpose.sksl")
@@ -291,9 +370,9 @@ SKSL_TEST(SkSLLoopInt,                         "runtime/LoopInt.rts")
 SKSL_TEST(SkSLQualifierOrder,                  "runtime/QualifierOrder.rts")
 SKSL_TEST(SkSLPrecisionQualifiers,             "runtime/PrecisionQualifiers.rts")
 SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Arrays,  "runtime/RecursiveComparison_Arrays.rts")
-SKSL_TEST_CPU(SkSLRecursiveComparison_Structs,     "runtime/RecursiveComparison_Structs.rts")
+SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Structs, "runtime/RecursiveComparison_Structs.rts")
 SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Types,   "runtime/RecursiveComparison_Types.rts")
-SKSL_TEST_CPU(SkSLRecursiveComparison_Vectors,     "runtime/RecursiveComparison_Vectors.rts")
+SKSL_TEST_CPU_ES3(SkSLRecursiveComparison_Vectors, "runtime/RecursiveComparison_Vectors.rts")
 
 SKSL_TEST_ES3(SkSLArrayComparison,             "shared/ArrayComparison.sksl")
 SKSL_TEST_ES3(SkSLArrayConstructors,           "shared/ArrayConstructors.sksl")
@@ -303,9 +382,7 @@ SKSL_TEST(SkSLArrayTypes,                      "shared/ArrayTypes.sksl")
 SKSL_TEST(SkSLAssignment,                      "shared/Assignment.sksl")
 SKSL_TEST(SkSLCastsRoundTowardZero,            "shared/CastsRoundTowardZero.sksl")
 SKSL_TEST(SkSLCommaMixedTypes,                 "shared/CommaMixedTypes.sksl")
-// This test causes the Adreno 330 driver to crash, and does not pass on Quadro P400 in wasm.
-// The CPU test confirms that we can get it right, even if not all drivers do.
-SKSL_TEST_CPU(SkSLCommaSideEffects,            "shared/CommaSideEffects.sksl")
+SKSL_TEST(SkSLCommaSideEffects,                "shared/CommaSideEffects.sksl")
 SKSL_TEST(SkSLConstantIf,                      "shared/ConstantIf.sksl")
 SKSL_TEST_ES3(SkSLConstArray,                  "shared/ConstArray.sksl")
 SKSL_TEST(SkSLConstVariableComparison,         "shared/ConstVariableComparison.sksl")
@@ -320,6 +397,7 @@ SKSL_TEST_ES3(SkSLDoWhileControlFlow,          "shared/DoWhileControlFlow.sksl")
 SKSL_TEST(SkSLEmptyBlocksES2,                  "shared/EmptyBlocksES2.sksl")
 SKSL_TEST_ES3(SkSLEmptyBlocksES3,              "shared/EmptyBlocksES3.sksl")
 SKSL_TEST(SkSLForLoopControlFlow,              "shared/ForLoopControlFlow.sksl")
+SKSL_TEST(SkSLFunctionAnonymousParameters,     "shared/FunctionAnonymousParameters.sksl")
 SKSL_TEST(SkSLFunctionArgTypeMatch,            "shared/FunctionArgTypeMatch.sksl")
 SKSL_TEST(SkSLFunctionReturnTypeMatch,         "shared/FunctionReturnTypeMatch.sksl")
 SKSL_TEST(SkSLFunctions,                       "shared/Functions.sksl")
@@ -328,14 +406,15 @@ SKSL_TEST(SkSLGeometricIntrinsics,             "shared/GeometricIntrinsics.sksl"
 SKSL_TEST(SkSLHelloWorld,                      "shared/HelloWorld.sksl")
 SKSL_TEST(SkSLHex,                             "shared/Hex.sksl")
 SKSL_TEST_ES3(SkSLHexUnsigned,                 "shared/HexUnsigned.sksl")
+SKSL_TEST(SkSLInoutParameters,                 "shared/InoutParameters.sksl")
 SKSL_TEST(SkSLMatrices,                        "shared/Matrices.sksl")
 SKSL_TEST_ES3(SkSLMatricesNonsquare,           "shared/MatricesNonsquare.sksl")
 // TODO(skia:12443) These tests actually don't work on MANY devices. The GLSL conformance suite
-// does a terrible job of enforcing this rule. We still test them on CPU.
-SKSL_TEST_CPU(SkSLMatrixConstructorsES2,       "shared/MatrixConstructorsES2.sksl")
+// does a terrible job of enforcing this rule. We still test them on newer (ES3) devices, and CPU.
+SKSL_TEST_CPU_ES3(SkSLMatrixConstructorsES2,   "shared/MatrixConstructorsES2.sksl")
 SKSL_TEST_CPU_ES3(SkSLMatrixConstructorsES3,   "shared/MatrixConstructorsES3.sksl")
 SKSL_TEST(SkSLMatrixEquality,                  "shared/MatrixEquality.sksl")
-SKSL_TEST(SkSLMatrixScalarSplat,               "shared/MatrixScalarSplat.sksl")
+SKSL_TEST(SkSLMatrixScalarMath,                "shared/MatrixScalarMath.sksl")
 SKSL_TEST(SkSLMatrixToVectorCast,              "shared/MatrixToVectorCast.sksl")
 SKSL_TEST(SkSLMultipleAssignments,             "shared/MultipleAssignments.sksl")
 SKSL_TEST(SkSLNegation,                        "shared/Negation.sksl")
@@ -343,12 +422,9 @@ SKSL_TEST(SkSLNumberCasts,                     "shared/NumberCasts.sksl")
 SKSL_TEST(SkSLOperatorsES2,                    "shared/OperatorsES2.sksl")
 SKSL_TEST_ES3(SkSLOperatorsES3,                "shared/OperatorsES3.sksl")
 SKSL_TEST(SkSLOssfuzz36852,                    "shared/Ossfuzz36852.sksl")
-
-// skbug.com/11919: Fails on Adreno + Vulkan
-SKSL_TEST_CPU(SkSLOutParams,                   "shared/OutParams.sksl")
-SKSL_TEST_CPU(SkSLOutParamsNoInline,           "shared/OutParamsNoInline.sksl")
-SKSL_TEST_CPU(SkSLOutParamsTricky,             "shared/OutParamsTricky.sksl")
-
+SKSL_TEST(SkSLOutParams,                       "shared/OutParams.sksl")
+SKSL_TEST(SkSLOutParamsAreDistinct,            "shared/OutParamsAreDistinct.sksl")
+SKSL_TEST(SkSLOutParamsTricky,                 "shared/OutParamsTricky.sksl")
 SKSL_TEST(SkSLResizeMatrix,                    "shared/ResizeMatrix.sksl")
 SKSL_TEST_ES3(SkSLResizeMatrixNonsquare,       "shared/ResizeMatrixNonsquare.sksl")
 SKSL_TEST(SkSLReturnsValueOnEveryPathES2,      "shared/ReturnsValueOnEveryPathES2.sksl")
@@ -382,16 +458,5 @@ SKSL_TEST(SkSLUniformArray,                    "shared/UniformArray.sksl")
 SKSL_TEST(SkSLUnusedVariables,                 "shared/UnusedVariables.sksl")
 SKSL_TEST(SkSLVectorConstructors,              "shared/VectorConstructors.sksl")
 SKSL_TEST(SkSLVectorToMatrixCast,              "shared/VectorToMatrixCast.sksl")
-// skbug.com/11919: Fails on Nexus5/7, and Intel GPUs
-SKSL_TEST_CPU(SkSLVectorScalarMath,            "shared/VectorScalarMath.sksl")
+SKSL_TEST(SkSLVectorScalarMath,                "shared/VectorScalarMath.sksl")
 SKSL_TEST_ES3(SkSLWhileLoopControlFlow,        "shared/WhileLoopControlFlow.sksl")
-
-/*
-TODO(skia:11209): enable these tests when Runtime Effects have support for ES3
-
-SKSL_TEST(SkSLIntrinsicAbsInt,                 "intrinsics/AbsInt.sksl")
-SKSL_TEST(SkSLIntrinsicMaxInt,                 "intrinsics/MaxInt.sksl")
-SKSL_TEST(SkSLIntrinsicMinInt,                 "intrinsics/MinInt.sksl")
-SKSL_TEST(SkSLIntrinsicMixBool,                "intrinsics/MixBool.sksl")
-SKSL_TEST(SkSLIntrinsicSignInt,                "intrinsics/SignInt.sksl")
-*/
diff --git a/third_party/skia/tests/SkScalerCacheTest.cpp b/third_party/skia/tests/SkScalerCacheTest.cpp
index 32d706519a7cc..e69e0942f1aea 100644
--- a/third_party/skia/tests/SkScalerCacheTest.cpp
+++ b/third_party/skia/tests/SkScalerCacheTest.cpp
@@ -63,17 +63,17 @@ DEF_TEST(SkScalerCacheMultiThread, Reporter) {
 
             auto local = data.subspan(threadIndex * 2, data.size() - kThreadCount * 2);
             for (int i = 0; i < 100; i++) {
-                SkDrawableGlyphBuffer drawable;
-                SkSourceGlyphBuffer rejects;
+                SkDrawableGlyphBuffer accepted;
+                SkSourceGlyphBuffer rejected;
 
-                drawable.ensureSize(glyphCount);
-                rejects.setSource(local);
+                accepted.ensureSize(glyphCount);
+                rejected.setSource(local);
 
-                drawable.startBitmapDevice(rejects.source(), {0, 0}, SkMatrix::I(),
+                accepted.startBitmapDevice(rejected.source(), {0, 0}, SkMatrix::I(),
                                            scalerCache.roundingSpec());
-                scalerCache.prepareForMaskDrawing(&drawable, &rejects);
-                rejects.flipRejectsToSource();
-                drawable.reset();
+                scalerCache.prepareForMaskDrawing(&accepted, &rejected);
+                rejected.flipRejectsToSource();
+                accepted.reset();
             }
         };
 
diff --git a/third_party/skia/tests/SkStringViewTest.cpp b/third_party/skia/tests/SkStringViewTest.cpp
index c96918548fad1..6e6b2044903ff 100644
--- a/third_party/skia/tests/SkStringViewTest.cpp
+++ b/third_party/skia/tests/SkStringViewTest.cpp
@@ -5,189 +5,64 @@
  * found in the LICENSE file.
  */
 
-#include "include/core/SkStringView.h"
+#include <string_view>
 
+#include "include/private/SkStringView.h"
 #include "tests/Test.h"
 
-DEF_TEST(SkStringViewConstructors, r) {
-    skstd::string_view empty;
-    REPORTER_ASSERT(r, empty.data() == nullptr);
-    REPORTER_ASSERT(r, empty.length() == 0);
-
-    const char* str = "Hello, World!";
-    skstd::string_view helloWorld(str);
-    REPORTER_ASSERT(r, helloWorld.data() == str);
-    REPORTER_ASSERT(r, helloWorld.length() == strlen(str));
-
-    skstd::string_view hello(str, 5);
-    REPORTER_ASSERT(r, hello.data() == str);
-    REPORTER_ASSERT(r, hello.length() == 5);
-
-    skstd::string_view copy(hello);
-    REPORTER_ASSERT(r, copy.data() == str);
-    REPORTER_ASSERT(r, copy.length() == 5);
-
-    copy = helloWorld;
-    REPORTER_ASSERT(r, copy.data() == str);
-    REPORTER_ASSERT(r, copy.length() == strlen(str));
-}
-
-DEF_TEST(SkStringViewBasics, r) {
-    skstd::string_view empty("");
+DEF_TEST(SkStringViewStartsAndEnds, r) {
+    std::string_view empty("");
     REPORTER_ASSERT(r, empty.empty());
-    REPORTER_ASSERT(r, !empty.starts_with('x'));
-    REPORTER_ASSERT(r, !empty.ends_with('x'));
-    REPORTER_ASSERT(r, !empty.starts_with("x"));
-    REPORTER_ASSERT(r, !empty.ends_with("x"));
-    REPORTER_ASSERT(r, empty.starts_with(""));
-    REPORTER_ASSERT(r, empty.ends_with(""));
-
-    skstd::string_view xyz("xyz");
+    REPORTER_ASSERT(r, !skstd::starts_with(empty, 'x'));
+    REPORTER_ASSERT(r, !skstd::ends_with(empty, 'x'));
+    REPORTER_ASSERT(r, !skstd::starts_with(empty, "x"));
+    REPORTER_ASSERT(r, !skstd::ends_with(empty, "x"));
+    REPORTER_ASSERT(r, skstd::starts_with(empty, ""));
+    REPORTER_ASSERT(r, skstd::ends_with(empty, ""));
+
+    std::string_view xyz("xyz");
     REPORTER_ASSERT(r, !xyz.empty());
     REPORTER_ASSERT(r, xyz.front() == 'x');
     REPORTER_ASSERT(r, xyz.back() == 'z');
     REPORTER_ASSERT(r, xyz.length() == 3);
 
-    REPORTER_ASSERT(r, xyz.starts_with('x'));
-    REPORTER_ASSERT(r, !xyz.starts_with('y'));
-    REPORTER_ASSERT(r, xyz.ends_with('z'));
-    REPORTER_ASSERT(r, !xyz.ends_with('y'));
-
-    REPORTER_ASSERT(r, xyz.starts_with(""));
-    REPORTER_ASSERT(r, xyz.ends_with(""));
-    REPORTER_ASSERT(r, xyz.starts_with("x"));
-    REPORTER_ASSERT(r, xyz.ends_with("z"));
-    REPORTER_ASSERT(r, !xyz.starts_with("xa"));
-    REPORTER_ASSERT(r, !xyz.ends_with("az"));
-    REPORTER_ASSERT(r, xyz.starts_with("xy"));
-    REPORTER_ASSERT(r, xyz.ends_with("yz"));
-    REPORTER_ASSERT(r, xyz.starts_with("xyz"));
-    REPORTER_ASSERT(r, xyz.ends_with("xyz"));
-    REPORTER_ASSERT(r, !xyz.starts_with("wxyz"));
-    REPORTER_ASSERT(r, !xyz.ends_with("wxyz"));
+    REPORTER_ASSERT(r, skstd::starts_with(xyz, 'x'));
+    REPORTER_ASSERT(r, !skstd::starts_with(xyz, 'y'));
+    REPORTER_ASSERT(r, skstd::ends_with(xyz, 'z'));
+    REPORTER_ASSERT(r, !skstd::ends_with(xyz, 'y'));
+
+    REPORTER_ASSERT(r, skstd::starts_with(xyz, ""));
+    REPORTER_ASSERT(r, skstd::ends_with(xyz, ""));
+    REPORTER_ASSERT(r, skstd::starts_with(xyz, "x"));
+    REPORTER_ASSERT(r, skstd::ends_with(xyz, "z"));
+    REPORTER_ASSERT(r, !skstd::starts_with(xyz, "xa"));
+    REPORTER_ASSERT(r, !skstd::ends_with(xyz, "az"));
+    REPORTER_ASSERT(r, skstd::starts_with(xyz, "xy"));
+    REPORTER_ASSERT(r, skstd::ends_with(xyz, "yz"));
+    REPORTER_ASSERT(r, skstd::starts_with(xyz, "xyz"));
+    REPORTER_ASSERT(r, skstd::ends_with(xyz, "xyz"));
+    REPORTER_ASSERT(r, !skstd::starts_with(xyz, "wxyz"));
+    REPORTER_ASSERT(r, !skstd::ends_with(xyz, "wxyz"));
 
     xyz.swap(empty);
     REPORTER_ASSERT(r, xyz == "");
     REPORTER_ASSERT(r, empty == "xyz");
 }
 
-DEF_TEST(SkStringViewIterator, r) {
-    skstd::string_view str("abc");
-    skstd::string_view::iterator iter = str.begin();
-    REPORTER_ASSERT(r, *(iter++) == 'a');
-    REPORTER_ASSERT(r, *(iter++) == 'b');
-    REPORTER_ASSERT(r, *(iter++) == 'c');
-    REPORTER_ASSERT(r, iter == str.end());
-    REPORTER_ASSERT(r, *(--iter) == 'c');
-    REPORTER_ASSERT(r, *(--iter) == 'b');
-    REPORTER_ASSERT(r, *(--iter) == 'a');
-    REPORTER_ASSERT(r, iter == str.begin());
-
-    skstd::string_view empty;
-    REPORTER_ASSERT(r, empty.begin() == empty.end());
-}
-
-DEF_TEST(SkStringViewOperators, r) {
-    skstd::string_view empty;
-    REPORTER_ASSERT(r, empty == empty);
-    REPORTER_ASSERT(r, empty == "");
-    REPORTER_ASSERT(r, "" == empty);
-    REPORTER_ASSERT(r, !(empty != ""));
-
-    skstd::string_view str("abc");
-    REPORTER_ASSERT(r, str == str);
-    REPORTER_ASSERT(r, str == "abc");
-    REPORTER_ASSERT(r, "abc" == str);
-    REPORTER_ASSERT(r, str != "");
-    REPORTER_ASSERT(r, "" != str);
-    REPORTER_ASSERT(r, str != "abcd");
-    REPORTER_ASSERT(r, "abcd" != str);
-
-    skstd::string_view str2("abcd");
-    REPORTER_ASSERT(r, str < str2);
-    REPORTER_ASSERT(r, str <= str2);
-    REPORTER_ASSERT(r, str <= str);
-    REPORTER_ASSERT(r, str2 > str);
-    REPORTER_ASSERT(r, str2 >= str);
-    REPORTER_ASSERT(r, str >= str);
-    REPORTER_ASSERT(r, !(str2 < str));
-    REPORTER_ASSERT(r, !(str < str));
-    REPORTER_ASSERT(r, !(str2 <= str));
-    REPORTER_ASSERT(r, !(str > str2));
-    REPORTER_ASSERT(r, !(str > str));
-    REPORTER_ASSERT(r, !(str >= str2));
-
-    REPORTER_ASSERT(r, str < "b");
-    REPORTER_ASSERT(r, str <= "b");
-    REPORTER_ASSERT(r, str <= str);
-    REPORTER_ASSERT(r, "b" > str);
-    REPORTER_ASSERT(r, "b" >= str);
-    REPORTER_ASSERT(r, str >= str);
-    REPORTER_ASSERT(r, !("b" < str));
-    REPORTER_ASSERT(r, !(str < str));
-    REPORTER_ASSERT(r, !("b" <= str));
-    REPORTER_ASSERT(r, !(str > "b"));
-    REPORTER_ASSERT(r, !(str > str));
-    REPORTER_ASSERT(r, !(str >= "b"));
-}
-
-DEF_TEST(SkStringViewSubstr, r) {
-    skstd::string_view xyz("xyz");
-    REPORTER_ASSERT(r, xyz.substr() == xyz);
-    REPORTER_ASSERT(r, xyz.substr(0, 1) == "x");
-    REPORTER_ASSERT(r, xyz.substr(0, 2) == "xy");
-    REPORTER_ASSERT(r, xyz.substr(0, 3) == "xyz");
-    REPORTER_ASSERT(r, xyz.substr(0, 4) == "xyz");
-
-    REPORTER_ASSERT(r, xyz.substr(1) == "yz");
-    REPORTER_ASSERT(r, xyz.substr(1, 1) == "y");
-    REPORTER_ASSERT(r, xyz.substr(1, 2) == "yz");
-    REPORTER_ASSERT(r, xyz.substr(1, 3) == "yz");
-
-    REPORTER_ASSERT(r, xyz.substr(2) == "z");
-    REPORTER_ASSERT(r, xyz.substr(2, 1) == "z");
-    REPORTER_ASSERT(r, xyz.substr(2, 2) == "z");
-
-    REPORTER_ASSERT(r, xyz.substr(0, 0).empty());
-    REPORTER_ASSERT(r, xyz.substr(1, 0).empty());
-    REPORTER_ASSERT(r, xyz.substr(2, 0).empty());
-    REPORTER_ASSERT(r, xyz.substr(3, 0).empty());
-
-    REPORTER_ASSERT(r, xyz.substr(3).empty());
-    REPORTER_ASSERT(r, xyz.substr(4).empty());
-}
-
-DEF_TEST(SkStringViewFind, r) {
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("abcdef") == 0);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("abcdefg") == skstd::string_view::npos);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("") == 0);
-    REPORTER_ASSERT(r, skstd::string_view("").find("") == 0);
-    REPORTER_ASSERT(r, skstd::string_view("").find("a") == skstd::string_view::npos);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("b") == 1);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("f") == 5);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("q") == skstd::string_view::npos);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("bcd") == 1);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("bcd", 2) == skstd::string_view::npos);
-    REPORTER_ASSERT(r, skstd::string_view("abcdef").find("bce") == skstd::string_view::npos);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test") == 3);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test", 1) == 3);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test", 3) == 3);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test", 4) == 10);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test2") == 10);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").find("test3") == 17);
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").contains("test"));
-    REPORTER_ASSERT(r, skstd::string_view("ttttest1tttest2tttest3").contains("test3"));
-    REPORTER_ASSERT(r, !skstd::string_view("ttttest1tttest2tttest3").contains("test4"));
-    REPORTER_ASSERT(r, skstd::string_view("").contains(""));
-    REPORTER_ASSERT(r, !skstd::string_view("").contains("a"));
-    REPORTER_ASSERT(r, skstd::string_view("abcabcd").contains("abcd"));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains(""));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains("a"));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains("b"));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains("c"));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains("ab"));
-    REPORTER_ASSERT(r, skstd::string_view("abc").contains("bc"));
-    REPORTER_ASSERT(r, !skstd::string_view("abc").contains("ac"));
-    REPORTER_ASSERT(r, !skstd::string_view("abc").contains("cb"));
-    REPORTER_ASSERT(r, !skstd::string_view("abc").contains("abcd"));
+DEF_TEST(SkStringViewContains, r) {
+    REPORTER_ASSERT(r, skstd::contains("ttttest1tttest2tttest3", "test"));
+    REPORTER_ASSERT(r, skstd::contains("ttttest1tttest2tttest3", "test3"));
+    REPORTER_ASSERT(r, !skstd::contains("ttttest1tttest2tttest3", "test4"));
+    REPORTER_ASSERT(r, skstd::contains("", ""));
+    REPORTER_ASSERT(r, !skstd::contains("", "a"));
+    REPORTER_ASSERT(r, skstd::contains("abcabcd", "abcd"));
+    REPORTER_ASSERT(r, skstd::contains("abc", ""));
+    REPORTER_ASSERT(r, skstd::contains("abc", "a"));
+    REPORTER_ASSERT(r, skstd::contains("abc", "b"));
+    REPORTER_ASSERT(r, skstd::contains("abc", "c"));
+    REPORTER_ASSERT(r, skstd::contains("abc", "ab"));
+    REPORTER_ASSERT(r, skstd::contains("abc", "bc"));
+    REPORTER_ASSERT(r, !skstd::contains("abc", "ac"));
+    REPORTER_ASSERT(r, !skstd::contains("abc", "cb"));
+    REPORTER_ASSERT(r, !skstd::contains("abc", "abcd"));
 }
diff --git a/third_party/skia/tests/SkTOptionalTest.cpp b/third_party/skia/tests/SkTOptionalTest.cpp
deleted file mode 100644
index f0ffc077b18b6..0000000000000
--- a/third_party/skia/tests/SkTOptionalTest.cpp
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright 2021 Google LLC.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "include/private/SkTArray.h"
-#include "include/private/SkTOptional.h"
-
-#include "tests/Test.h"
-
-DEF_TEST(SkTOptionalEmpty, r) {
-    skstd::optional<int> o;
-    REPORTER_ASSERT(r, !o);
-    REPORTER_ASSERT(r, !o.has_value());
-}
-
-DEF_TEST(SkTOptionalNulloptCtor, r) {
-    skstd::optional<int> o(skstd::nullopt);
-    REPORTER_ASSERT(r, !o);
-    REPORTER_ASSERT(r, !o.has_value());
-}
-
-DEF_TEST(SkTOptionalValueOr, r) {
-    {
-        skstd::optional<const char*> o;
-        REPORTER_ASSERT(r, !strcmp(o.value_or("Hello"), "Hello"));
-    }
-    {
-        skstd::optional<const char*> o("Bye");
-        REPORTER_ASSERT(r, !strcmp(o.value_or("Hello"), "Bye"));
-    }
-    {
-        skstd::optional<std::unique_ptr<int>> o;
-        std::unique_ptr<int> a = std::move(o).value_or(std::make_unique<int>(5));
-        REPORTER_ASSERT(r, *a == 5);
-    }
-    {
-        skstd::optional<std::unique_ptr<int>> o(std::make_unique<int>(3));
-        std::unique_ptr<int> a = std::move(o).value_or(std::make_unique<int>(5));
-        REPORTER_ASSERT(r, *a == 3);
-    }
-}
-
-DEF_TEST(SkTOptionalValue, r) {
-    skstd::optional<const char*> o("test");
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o.has_value());
-    REPORTER_ASSERT(r, !strcmp(*o, "test"));
-    REPORTER_ASSERT(r, !strcmp(o.value(), "test"));
-    o.reset();
-    REPORTER_ASSERT(r, !o);
-    REPORTER_ASSERT(r, !o.has_value());
-}
-
-DEF_TEST(SkTOptionalNulloptAssignment, r) {
-    skstd::optional<const char*> o("test");
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o.has_value());
-    o = skstd::nullopt;
-    REPORTER_ASSERT(r, !o);
-    REPORTER_ASSERT(r, !o.has_value());
-}
-
-DEF_TEST(SkTOptionalNulloptReturn, r) {
-    auto fn = []() -> skstd::optional<float> { return skstd::nullopt; };
-
-    skstd::optional<float> o = fn();
-    REPORTER_ASSERT(r, !o);
-    REPORTER_ASSERT(r, !o.has_value());
-}
-
-DEF_TEST(SkTOptionalComparisons, r) {
-    int v[] = { 1, 2, 3, 4, 5 };
-    skstd::optional<int> o[] = {1, 2, skstd::nullopt, 4, 5};
-    skstd::optional<int> five = 5;
-    skstd::optional<int> six = 6;
-
-    for (int index = 0; index < (int)SK_ARRAY_COUNT(v); ++index) {
-        REPORTER_ASSERT(r, v[index] < six);
-        REPORTER_ASSERT(r, o[index] < six);
-        REPORTER_ASSERT(r, six > v[index]);
-        REPORTER_ASSERT(r, six > o[index]);
-
-        REPORTER_ASSERT(r, v[index] < 6);
-        REPORTER_ASSERT(r, o[index] < 6);
-        REPORTER_ASSERT(r, 6 > v[index]);
-        REPORTER_ASSERT(r, 6 > o[index]);
-
-        REPORTER_ASSERT(r, !(six < v[index]));
-        REPORTER_ASSERT(r, !(six < o[index]));
-        REPORTER_ASSERT(r, !(v[index] > six));
-        REPORTER_ASSERT(r, !(o[index] > six));
-
-        REPORTER_ASSERT(r, !(6 < v[index]));
-        REPORTER_ASSERT(r, !(6 < o[index]));
-        REPORTER_ASSERT(r, !(v[index] > 6));
-        REPORTER_ASSERT(r, !(o[index] > 6));
-
-        REPORTER_ASSERT(r, v[index] <= five);
-        REPORTER_ASSERT(r, o[index] <= five);
-        REPORTER_ASSERT(r, five >= v[index]);
-        REPORTER_ASSERT(r, five >= o[index]);
-
-        REPORTER_ASSERT(r, v[index] <= 5);
-        REPORTER_ASSERT(r, o[index] <= 5);
-        REPORTER_ASSERT(r, 5 >= v[index]);
-        REPORTER_ASSERT(r, 5 >= o[index]);
-
-        REPORTER_ASSERT(r, skstd::nullopt <= o[index]);
-        REPORTER_ASSERT(r, !(skstd::nullopt > o[index]));
-        REPORTER_ASSERT(r, o[index] >= skstd::nullopt);
-        REPORTER_ASSERT(r, !(o[index] < skstd::nullopt));
-
-        if (o[index].has_value()) {
-            REPORTER_ASSERT(r, o[index] != skstd::nullopt);
-            REPORTER_ASSERT(r, skstd::nullopt != o[index]);
-
-            REPORTER_ASSERT(r, o[index] == o[index]);
-            REPORTER_ASSERT(r, o[index] != six);
-            REPORTER_ASSERT(r, o[index] == v[index]);
-            REPORTER_ASSERT(r, v[index] == o[index]);
-            REPORTER_ASSERT(r, o[index] > 0);
-            REPORTER_ASSERT(r, o[index] >= 1);
-            REPORTER_ASSERT(r, o[index] <= 5);
-            REPORTER_ASSERT(r, o[index] < 6);
-            REPORTER_ASSERT(r, 0 < o[index]);
-            REPORTER_ASSERT(r, 1 <= o[index]);
-            REPORTER_ASSERT(r, 5 >= o[index]);
-            REPORTER_ASSERT(r, 6 > o[index]);
-        } else {
-            REPORTER_ASSERT(r, o[index] == skstd::nullopt);
-            REPORTER_ASSERT(r, skstd::nullopt == o[index]);
-
-            REPORTER_ASSERT(r, o[index] == o[index]);
-            REPORTER_ASSERT(r, o[index] != five);
-            REPORTER_ASSERT(r, o[index] != v[index]);
-            REPORTER_ASSERT(r, v[index] != o[index]);
-            REPORTER_ASSERT(r, o[index] < 0);
-            REPORTER_ASSERT(r, o[index] <= 0);
-            REPORTER_ASSERT(r, 0 > o[index]);
-            REPORTER_ASSERT(r, 0 >= o[index]);
-            REPORTER_ASSERT(r, !(o[index] > 0));
-            REPORTER_ASSERT(r, !(o[index] >= 0));
-            REPORTER_ASSERT(r, !(0 < o[index]));
-            REPORTER_ASSERT(r, !(0 <= o[index]));
-        }
-    }
-}
-
-class SkTOptionalTestPayload {
-public:
-    enum State {
-        kConstructed,
-        kCopyConstructed,
-        kCopyAssigned,
-        kMoveConstructed,
-        kMoveAssigned,
-        kMovedFrom
-    };
-
-    SkTOptionalTestPayload(int payload)
-        : fState(kConstructed)
-        , fPayload(payload) {}
-
-    SkTOptionalTestPayload(const SkTOptionalTestPayload& other)
-        : fState(kCopyConstructed)
-        , fPayload(other.fPayload) {}
-
-    SkTOptionalTestPayload(SkTOptionalTestPayload&& other)
-        : fState(kMoveConstructed)
-        , fPayload(other.fPayload) {
-            other.fState = kMovedFrom;
-        }
-
-    SkTOptionalTestPayload& operator=(const SkTOptionalTestPayload& other) {
-        fState = kCopyAssigned;
-        fPayload = other.fPayload;
-        return *this;
-    }
-
-    SkTOptionalTestPayload& operator=(SkTOptionalTestPayload&& other) {
-        fState = kMoveAssigned;
-        fPayload = other.fPayload;
-        other.fState = kMovedFrom;
-        return *this;
-    }
-    State fState;
-    int fPayload;
-};
-
-DEF_TEST(SkTOptionalConstruction, r) {
-    skstd::optional<SkTOptionalTestPayload> o(1);
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kConstructed);
-    REPORTER_ASSERT(r, o->fPayload == 1);
-
-    skstd::optional<SkTOptionalTestPayload> copy(o);
-    REPORTER_ASSERT(r, copy);
-    REPORTER_ASSERT(r, copy->fState == SkTOptionalTestPayload::kCopyConstructed);
-    REPORTER_ASSERT(r, copy->fPayload == 1);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kConstructed);
-
-    skstd::optional<SkTOptionalTestPayload> move(std::move(o));
-    REPORTER_ASSERT(r, move);
-    REPORTER_ASSERT(r, move->fState == SkTOptionalTestPayload::kMoveConstructed);
-    REPORTER_ASSERT(r, move->fPayload == 1);
-    // NOLINTNEXTLINE(bugprone-use-after-move)
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kMovedFrom);
-}
-
-DEF_TEST(SkTOptionalMoveAssignment, r) {
-    skstd::optional<SkTOptionalTestPayload> o;
-    REPORTER_ASSERT(r, !o);
-
-    // assign to an empty optional from an empty optional
-    o = skstd::optional<SkTOptionalTestPayload>();
-    REPORTER_ASSERT(r, !o);
-
-    // assign to an empty optional from a full optional
-    skstd::optional<SkTOptionalTestPayload> full(1);
-    o = std::move(full);
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kMoveConstructed);
-    REPORTER_ASSERT(r, o->fPayload == 1);
-    // NOLINTNEXTLINE(bugprone-use-after-move)
-    REPORTER_ASSERT(r, full->fState == SkTOptionalTestPayload::kMovedFrom);
-
-    // assign to a full optional from a full optional
-    full = skstd::optional<SkTOptionalTestPayload>(2);
-    o = std::move(full);
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kMoveAssigned);
-    REPORTER_ASSERT(r, o->fPayload == 2);
-    // NOLINTNEXTLINE(bugprone-use-after-move)
-    REPORTER_ASSERT(r, full->fState == SkTOptionalTestPayload::kMovedFrom);
-
-    // assign to a full optional from an empty optional
-    o = skstd::optional<SkTOptionalTestPayload>();
-    REPORTER_ASSERT(r, !o);
-}
-
-DEF_TEST(SkTOptionalCopyAssignment, r) {
-    skstd::optional<SkTOptionalTestPayload> o;
-    REPORTER_ASSERT(r, !o);
-
-    skstd::optional<SkTOptionalTestPayload> empty;
-    skstd::optional<SkTOptionalTestPayload> full(1);
-
-    // assign to an empty optional from an empty optional
-    o = empty;
-    REPORTER_ASSERT(r, !o);
-
-    // assign to an empty optional from a full optional
-    o = full;
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kCopyConstructed);
-    REPORTER_ASSERT(r, o->fPayload == 1);
-
-    // assign to a full optional from a full optional
-    o = full;
-    REPORTER_ASSERT(r, o);
-    REPORTER_ASSERT(r, o->fState == SkTOptionalTestPayload::kCopyAssigned);
-    REPORTER_ASSERT(r, o->fPayload == 1);
-
-    // assign to a full optional from an empty optional
-    o = empty;
-    REPORTER_ASSERT(r, !o);
-}
-
-DEF_TEST(SkTOptionalEmplace, r) {
-    skstd::optional<std::vector<int>> o;
-    REPORTER_ASSERT(r, !o);
-
-    // Emplace with the no-argument constructor
-    o.emplace();
-    REPORTER_ASSERT(r, o.has_value());
-    REPORTER_ASSERT(r, o->empty());
-
-    // Emplace with the initializer-list constructor
-    o.emplace({1, 2, 3});
-    REPORTER_ASSERT(r, o.has_value());
-    REPORTER_ASSERT(r, (*o == std::vector<int>{1, 2, 3}));
-
-    // Emplace with a normal constructor
-    std::vector<int> otherVec = {4, 5, 6};
-    o.emplace(otherVec.begin(), otherVec.end());
-    REPORTER_ASSERT(r, o.has_value());
-    REPORTER_ASSERT(r, (*o == std::vector<int>{4, 5, 6}));
-}
-
-DEF_TEST(SkTOptionalNoDefaultConstructor, r) {
-    class NoDefaultConstructor {
-    public:
-        NoDefaultConstructor(int value)
-            : fValue(value) {}
-
-        int fValue;
-    };
-
-    skstd::optional<NoDefaultConstructor> o1;
-    REPORTER_ASSERT(r, !o1);
-    skstd::optional<NoDefaultConstructor> o2(5);
-    REPORTER_ASSERT(r, o2);
-    REPORTER_ASSERT(r, o2->fValue == 5);
-    o1 = std::move(o2);
-    REPORTER_ASSERT(r, o1);
-    REPORTER_ASSERT(r, o1->fValue == 5);
-}
-
-DEF_TEST(SkTOptionalDestroyed, r) {
-    bool destroyed = false;
-    struct NotifyWhenDestroyed {
-        NotifyWhenDestroyed(bool* e) : fE(e) {}
-        ~NotifyWhenDestroyed() { *fE = true; }
-        bool* fE;
-    };
-    {
-        skstd::optional<NotifyWhenDestroyed> notify(&destroyed);
-    }
-    REPORTER_ASSERT(r, destroyed);
-}
-
-DEF_TEST(SkTOptionalSelfAssignment, r) {
-    skstd::optional<SkString> empty;
-    skstd::optional<SkString>& emptyRef = empty;
-    empty = emptyRef;
-    REPORTER_ASSERT(r, !empty);
-    empty = std::move(emptyRef);
-    REPORTER_ASSERT(r, !empty);
-
-    skstd::optional<SkString> full("full");
-    skstd::optional<SkString>& fullRef = full;
-    full = fullRef;
-    REPORTER_ASSERT(r, full);
-    REPORTER_ASSERT(r, *full == SkString("full"));
-    full = std::move(fullRef);
-    REPORTER_ASSERT(r, full);
-    REPORTER_ASSERT(r, *full == SkString("full"));
-}
diff --git a/third_party/skia/tests/SkVMDebugTracePlayerTest.cpp b/third_party/skia/tests/SkVMDebugTracePlayerTest.cpp
new file mode 100644
index 0000000000000..c5ec95f87d8ad
--- /dev/null
+++ b/third_party/skia/tests/SkVMDebugTracePlayerTest.cpp
@@ -0,0 +1,770 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/core/SkM44.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/codegen/SkSLVMCodeGenerator.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+#include "src/sksl/tracing/SkVMDebugTracePlayer.h"
+
+#include "tests/Test.h"
+
+using LineNumberMap = SkSL::SkVMDebugTracePlayer::LineNumberMap;
+
+static sk_sp<SkSL::SkVMDebugTrace> make_trace(skiatest::Reporter* r, std::string src) {
+    SkSL::ShaderCaps caps;
+    SkSL::Compiler compiler(&caps);
+    SkSL::Program::Settings settings;
+    settings.fOptimize = false;
+
+    skvm::Builder b;
+    std::unique_ptr<SkSL::Program> program = compiler.convertProgram(SkSL::ProgramKind::kGeneric,
+                                                                     src, settings);
+    REPORTER_ASSERT(r, program);
+
+    const SkSL::FunctionDefinition* main = SkSL::Program_GetFunction(*program, "main");
+    auto debugTrace = sk_make_sp<SkSL::SkVMDebugTrace>();
+    SkSL::ProgramToSkVM(*program, *main, &b, debugTrace.get(), /*uniforms=*/{});
+    skvm::Program p = b.done();
+    REPORTER_ASSERT(r, p.nargs() == 1);
+
+    int result;
+    p.eval(1, &result);
+
+    return debugTrace;
+}
+
+static std::string make_stack_string(const SkSL::SkVMDebugTrace& trace,
+                                     const SkSL::SkVMDebugTracePlayer& player) {
+    std::vector<int> callStack = player.getCallStack();
+    std::string text;
+    const char* separator = "";
+    for (int frame : callStack) {
+        text += separator;
+        separator = " -> ";
+
+        if (frame >= 0 && (size_t)frame < trace.fFuncInfo.size()) {
+            text += trace.fFuncInfo[frame].name;
+        } else {
+            text += "???";
+        }
+    }
+
+    return text;
+}
+
+static std::string make_vars_string(
+        const SkSL::SkVMDebugTrace& trace,
+        const std::vector<SkSL::SkVMDebugTracePlayer::VariableData>& vars) {
+    std::string text;
+    const char* separator = "";
+    for (const SkSL::SkVMDebugTracePlayer::VariableData& var : vars) {
+        text += separator;
+        separator = ", ";
+
+        if (var.fSlotIndex < 0 || (size_t)var.fSlotIndex >= trace.fSlotInfo.size()) {
+            text += "???";
+            continue;
+        }
+
+        const SkSL::SkVMSlotInfo& slot = trace.fSlotInfo[var.fSlotIndex];
+        text += var.fDirty ? "##": "";
+        text += slot.name;
+        text += trace.getSlotComponentSuffix(var.fSlotIndex);
+        text += " = ";
+        text += trace.slotValueToString(var.fSlotIndex, var.fValue);
+    }
+
+    return text;
+}
+
+static std::string make_local_vars_string(const SkSL::SkVMDebugTrace& trace,
+                                          const SkSL::SkVMDebugTracePlayer& player) {
+    int frame = player.getStackDepth() - 1;
+    return make_vars_string(trace, player.getLocalVariables(frame));
+}
+
+static std::string make_global_vars_string(const SkSL::SkVMDebugTrace& trace,
+                                           const SkSL::SkVMDebugTracePlayer& player) {
+    return make_vars_string(trace, player.getGlobalVariables());
+}
+
+DEF_TEST(SkSLTracePlayerHelloWorld, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                // Line 1
+int main() {       // Line 2
+    return 2 + 2;  // Line 3
+}                  // Line 4
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    // We have not started tracing yet.
+    REPORTER_ASSERT(r, player.cursor() == 0);
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}}));
+
+    player.step();
+
+    // We should now be inside main.
+    REPORTER_ASSERT(r, player.cursor() > 0);
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+    REPORTER_ASSERT(r, player.getLocalVariables(0).empty());
+
+    player.step();
+
+    // We have now completed the trace.
+    REPORTER_ASSERT(r, player.cursor() > 0);
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 4");
+}
+
+DEF_TEST(SkSLTracePlayerReset, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                // Line 1
+int main() {       // Line 2
+    return 2 + 2;  // Line 3
+}                  // Line 4
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    // We have not started tracing yet.
+    REPORTER_ASSERT(r, player.cursor() == 0);
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+
+    player.step();
+
+    // We should now be inside main.
+    REPORTER_ASSERT(r, player.cursor() > 0);
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+    REPORTER_ASSERT(r, player.getLocalVariables(0).empty());
+
+    player.reset(trace);
+
+    // We should be back to square one.
+    REPORTER_ASSERT(r, player.cursor() == 0);
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+}
+
+DEF_TEST(SkSLTracePlayerFunctions, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                             // Line 1
+int fnB() {                     // Line 2
+    return 2 + 2;               // Line 3
+}                               // Line 4
+int fnA() {                     // Line 5
+    return fnB();               // Line 6
+}                               // Line 7
+int main() {                    // Line 8
+    return fnA();               // Line 9
+}                               // Line 10
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    // We have not started tracing yet.
+    REPORTER_ASSERT(r, player.cursor() == 0);
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}, {6, 1}, {9, 1}}));
+
+    player.step();
+
+    // We should now be inside main.
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, player.getGlobalVariables().empty());
+    REPORTER_ASSERT(r, player.getLocalVariables(0).empty());
+
+    player.stepOver();
+
+    // We should now have completed execution.
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, player.getCurrentLine() == -1);
+    REPORTER_ASSERT(r, player.getCallStack().empty());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 4");
+
+    // Watch the stack grow and shrink as single-step.
+    player.reset(trace);
+    player.step();
+
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(0) == 9);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fnA()");
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(0) == 9);
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(1) == 6);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fnA() -> int fnB()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "");
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(0) == 9);
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(1) == 6);
+    REPORTER_ASSERT(r, player.getCurrentLineInStackFrame(2) == 3);
+    player.step();
+
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fnA()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##[fnB].result = 4");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##[fnA].result = 4");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "");
+
+    player.step();
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 4");
+}
+
+DEF_TEST(SkSLTracePlayerVariables, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                                   // Line 1
+float func() {                        // Line 2
+    float x = 4, y = 5, z = 6;        // Line 3
+    return z;                         // Line 4
+}                                     // Line 5
+int main() {                          // Line 6
+    int a = 123;                      // Line 7
+    bool b = true;                    // Line 8
+    func();                           // Line 9
+    float4 c = float4(0, 0.5, 1, -1); // Line 10
+    float3x3 d = float3x3(2);         // Line 11
+    return a;                         // Line 12
+}                                     // Line 13
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 3}, {4, 1}, {7, 1},
+                                                                        {8, 1}, {9, 1}, {10, 1},
+                                                                        {11, 1}, {12, 1}}));
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##a = 123");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##b = true, a = 123");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> float func()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> float func()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##x = 4");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> float func()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##y = 5, x = 4");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> float func()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##z = 6, y = 5, x = 4");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "##[func].result = 6, b = true, a = 123");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 10);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "b = true, a = 123");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 11);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "##c.x = 0, ##c.y = 0.5, ##c.z = 1, ##c.w = -1, b = true, a = 123");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 12);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "##d[0][0] = 2, ##d[0][1] = 0, ##d[0][2] = 0, "
+                       "##d[1][0] = 0, ##d[1][1] = 2, ##d[1][2] = 0, "
+                       "##d[2][0] = 0, ##d[2][1] = 0, ##d[2][2] = 2, "
+                       "c.x = 0, c.y = 0.5, c.z = 1, c.w = -1, b = true, a = 123");
+
+
+    player.step();
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "");
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 123");
+}
+
+DEF_TEST(SkSLTracePlayerVariableGroups, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                                   // Line 1
+struct S { int x, y, z; };            // Line 2
+int main() {                          // Line 3
+    S s;                              // Line 4
+    int arr[3];                       // Line 5
+    s.y = 1;                          // Line 6
+    arr[1] = 2;                       // Line 7
+    s.x = 3;                          // Line 8
+    arr[2] = 4;                       // Line 9
+    return 0;                         // Line 10
+}                                     // Line 11
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##s.x = 0, ##s.y = 0, ##s.z = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 6);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "##arr[0] = 0, ##arr[1] = 0, ##arr[2] = 0, s.x = 0, s.y = 0, s.z = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "s.x = 0, ##s.y = 1, s.z = 0, arr[0] = 0, arr[1] = 0, arr[2] = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "arr[0] = 0, ##arr[1] = 2, arr[2] = 0, s.x = 0, s.y = 1, s.z = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "##s.x = 3, s.y = 1, s.z = 0, arr[0] = 0, arr[1] = 2, arr[2] = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 10);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) ==
+                       "arr[0] = 0, arr[1] = 2, ##arr[2] = 4, s.x = 3, s.y = 1, s.z = 0");
+}
+
+
+DEF_TEST(SkSLTracePlayerIfStatement, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                   // Line 1
+int main() {          // Line 2
+    int val;          // Line 3
+    if (true) {       // Line 4
+        int temp = 1; // Line 5
+        val = temp;   // Line 6
+    } else {          // Line 7
+        val = 2;      // Line 8
+    }                 // Line 9
+    if (false) {      // Line 10
+        int temp = 3; // Line 11
+        val = temp;   // Line 12
+    } else {          // Line 13
+        val = 4;      // Line 14
+    }                 // Line 15
+    return val;       // Line 16
+}                     // Line 17
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}, {4, 1}, {5, 1},
+                                                                        {6, 1}, {10, 1}, {14, 1},
+                                                                        {16, 1}}));
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "val = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 6);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##temp = 1, val = 0");
+    player.step();
+
+    // We skip over the false-branch.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 10);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 1");
+    player.step();
+
+    // We skip over the true-branch.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 14);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "val = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 16);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 4");
+    player.step();
+
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 4");
+}
+
+DEF_TEST(SkSLTracePlayerForLoop, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                                // Line 1
+int main() {                       // Line 2
+    int val = 0;                   // Line 3
+    for (int x = 1; x < 3; ++x) {  // Line 4
+        val = x;                   // Line 5
+    }                              // Line 6
+    return val;                    // Line 7
+}                                  // Line 8
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}, {4, 3}, {5, 2},
+                                                                        {7, 1}}));
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 3}, {5, 2},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 2}, {5, 2},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 2}, {5, 1},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##x = 1, val = 0");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 1}, {5, 1},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 1, x = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 1}, {5, 0},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##x = 2, val = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 0}, {5, 0},
+                                                                        {7, 1}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##val = 2, x = 2");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 0}, {4, 0}, {5, 0},
+                                                                        {7, 0}}));
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "val = 2");
+    player.step();
+
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 2");
+}
+
+DEF_TEST(SkSLTracePlayerStepOut, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(               // Line 1
+int fn() {        // Line 2
+    int a = 11;   // Line 3
+    int b = 22;   // Line 4
+    int c = 33;   // Line 5
+    int d = 44;   // Line 6
+    return d;     // Line 7
+}                 // Line 8
+int main() {      // Line 9
+    return fn();  // Line 10
+}                 // Line 11
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}, {4, 1}, {5, 1},
+                                                                        {6, 1}, {7, 1}, {10, 1}}));
+    player.step();
+
+    // We should now be inside main.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 10);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    player.step();
+
+    // We should now be inside fn.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fn()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fn()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##a = 11");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main() -> int fn()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##b = 22, a = 11");
+    player.stepOut();
+
+    // We should now be back inside main(), right where we left off.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 10);
+    REPORTER_ASSERT(r, make_stack_string(*trace, player) == "int main()");
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##[fn].result = 44");
+    player.stepOut();
+
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+    REPORTER_ASSERT(r, make_global_vars_string(*trace, player) == "##[main].result = 44");
+}
+
+
+DEF_TEST(SkSLTracePlayerVariableScope, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                         // Line 1
+int main() {                // Line 2
+    int a = 1;              // Line 3
+    {                       // Line 4
+        int b = 2;          // Line 5
+        {                   // Line 6
+            int c = 3;      // Line 7
+        }                   // Line 8
+        int d = 4;          // Line 9
+    }                       // Line 10
+    int e = 5;              // Line 11
+    {                       // Line 12
+        int f = 6;          // Line 13
+        {                   // Line 14
+            int g = 7;      // Line 15
+        }                   // Line 16
+        int h = 8;          // Line 17
+    }                       // Line 18
+    int i = 9;              // Line 19
+    return 0;               // Line 20
+}
+)");
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    REPORTER_ASSERT(r, player.getLineNumbersReached() == LineNumberMap({{3, 1}, {5, 1}, {7, 1},
+                                                                        {9, 1}, {11, 1}, {13, 1},
+                                                                        {15, 1}, {17, 1}, {19, 1},
+                                                                        {20, 1}}));
+    player.step();
+
+    // We should now be inside main.
+    REPORTER_ASSERT(r, player.getCurrentLine() == 3);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 5);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##b = 2, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "b = 2, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 11);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 13);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##e = 5, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 15);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##f = 6, e = 5, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 17);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "f = 6, e = 5, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 19);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "e = 5, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.getCurrentLine() == 20);
+    REPORTER_ASSERT(r, make_local_vars_string(*trace, player) == "##i = 9, e = 5, a = 1");
+    player.step();
+
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+}
+
+DEF_TEST(SkSLTracePlayerBreakpoint, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                                // Line 1
+int counter = 0;                   // Line 2
+void func() {                      // Line 3
+    --counter;                     // Line 4   BREAKPOINT 4 5
+}                                  // Line 5
+int main() {                       // Line 6
+    for (int x = 1; x <= 3; ++x) { // Line 7
+        ++counter;                 // Line 8   BREAKPOINT 1 2 3
+    }                              // Line 9
+    func();                        // Line 10
+    func();                        // Line 11
+    ++counter;                     // Line 12  BREAKPOINT 6
+    return counter;                // Line 13
+}                                  // Line 14
+)");
+    // Run the simulation with a variety of breakpoints set.
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    player.setBreakpoints(std::unordered_set<int>{8, 13, 20});
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+
+    player.setBreakpoints(std::unordered_set<int>{1, 4, 8});
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+
+    player.setBreakpoints(std::unordered_set<int>{4, 12, 14});
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+
+    player.run();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 12);
+
+    player.run();
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+
+    // Run the simulation again with no breakpoints set. We should reach the end of the trace
+    // instantly.
+    player.reset(trace);
+    player.setBreakpoints(std::unordered_set<int>{});
+    REPORTER_ASSERT(r, !player.traceHasCompleted());
+
+    player.run();
+    REPORTER_ASSERT(r, player.traceHasCompleted());
+}
+
+DEF_TEST(SkSLTracePlayerStepOverWithBreakpoint, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                   // Line 1
+int counter = 0;      // Line 2
+void func() {         // Line 3
+    ++counter;        // Line 4   BREAKPOINT
+}                     // Line 5
+int main() {          // Line 6
+    func();           // Line 7
+    return counter;   // Line 8
+}                     // Line 9
+)");
+    // Try stepping over with no breakpoint set; we will step over.
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+
+    player.stepOver();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 8);
+
+    // Try stepping over with a breakpoint set; we will stop at the breakpoint.
+    player.reset(trace);
+    player.setBreakpoints(std::unordered_set<int>{4});
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 7);
+
+    player.stepOver();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+}
+
+DEF_TEST(SkSLTracePlayerStepOutWithBreakpoint, r) {
+    sk_sp<SkSL::SkVMDebugTrace> trace = make_trace(r,
+R"(                   // Line 1
+int counter = 0;      // Line 2
+void func() {         // Line 3
+    ++counter;        // Line 4
+    ++counter;        // Line 5
+    ++counter;        // Line 6   BREAKPOINT
+}                     // Line 7
+int main() {          // Line 8
+    func();           // Line 9
+    return counter;   // Line 10
+}                     // Line 11
+)");
+    // Try stepping out with no breakpoint set; we will step out.
+    SkSL::SkVMDebugTracePlayer player;
+    player.reset(trace);
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+
+    player.stepOut();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+
+    // Try stepping out with a breakpoint set; we will stop at the breakpoint.
+    player.reset(trace);
+    player.setBreakpoints(std::unordered_set<int>{6});
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 9);
+
+    player.step();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 4);
+
+    player.stepOut();
+    REPORTER_ASSERT(r, player.getCurrentLine() == 6);
+}
diff --git a/third_party/skia/tests/SkVMDebugTraceTest.cpp b/third_party/skia/tests/SkVMDebugTraceTest.cpp
index 5e932691275a7..3943f10d9963f 100644
--- a/third_party/skia/tests/SkVMDebugTraceTest.cpp
+++ b/third_party/skia/tests/SkVMDebugTraceTest.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "include/core/SkStream.h"
-#include "src/sksl/codegen/SkVMDebugTrace.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
 #include "tests/Test.h"
 
 DEF_TEST(SkVMDebugTraceSetSource, r) {
@@ -41,8 +41,8 @@ DEF_TEST(SkVMDebugTraceWrite, r) {
         "//\\\\//\\\\ third line",
     };
     i.fSlotInfo = {
-        {"SkVM_DebugTrace", 1, 2, 3, (SkSL::Type::NumberKind)4, 5},
-        {"Unit_Test",       6, 7, 8, (SkSL::Type::NumberKind)9, 10},
+        {"SkVM_DebugTrace", 1, 2, 3, 4, (SkSL::Type::NumberKind)5,  6, -1},
+        {"Unit_Test",       6, 7, 8, 8, (SkSL::Type::NumberKind)10, 11, 12},
     };
     i.fFuncInfo = {
         {"void testFunc();"},
@@ -58,13 +58,13 @@ DEF_TEST(SkVMDebugTraceWrite, r) {
     sk_sp<SkData> trace = wstream.detachAsData();
 
     static constexpr char kExpected[] =
-            R"({"source":["\t// first line","// \"second line\"","//\\\\//\\\\ third line"],"s)"
-            R"(lots":[{"slot":0,"name":"SkVM_DebugTrace","columns":1,"rows":2,"index":3,"kind")"
-            R"(:4,"line":5},{"slot":1,"name":"Unit_Test","columns":6,"rows":7,"index":8,"kind")"
-            R"(:9,"line":10}],"functions":[{"slot":0,"name":"void testFunc();"}],"trace":[[2],)"
-            R"([0,5],[1,10,15],[3,20]]})";
+            R"({"version":"20220209","source":["\t// first line","// \"second line\"","//\\\\//\\)"
+            R"(\\ third line"],"slots":[{"name":"SkVM_DebugTrace","columns":1,"rows":2,"index":3,)"
+            R"("groupIdx":4,"kind":5,"line":6},{"name":"Unit_Test","columns":6,"rows":7,"index":8)"
+            R"(,"kind":10,"line":11,"retval":12}],"functions":[{"name":"void testFunc();"}],"trac)"
+            R"(e":[[2],[0,5],[1,10,15],[3,20]]})";
 
-    skstd::string_view actual{reinterpret_cast<const char*>(trace->bytes()), trace->size()};
+    std::string_view actual{reinterpret_cast<const char*>(trace->bytes()), trace->size()};
 
     REPORTER_ASSERT(r, actual == kExpected,
                     "Expected:\n    %s\n\n  Actual:\n    %.*s\n",
@@ -72,12 +72,12 @@ DEF_TEST(SkVMDebugTraceWrite, r) {
 }
 
 DEF_TEST(SkVMDebugTraceRead, r) {
-    const skstd::string_view kJSONTrace =
-            R"({"source":["\t// first line","// \"second line\"","//\\\\//\\\\ third line"],"s)"
-            R"(lots":[{"slot":0,"name":"SkVM_DebugTrace","columns":1,"rows":2,"index":3,"kind")"
-            R"(:4,"line":5},{"slot":1,"name":"Unit_Test","columns":6,"rows":7,"index":8,"kind")"
-            R"(:9,"line":10}],"functions":[{"slot":0,"name":"void testFunc();"}],"trace":[[2],)"
-            R"([0,5],[1,10,15],[3,20]]})";
+    const std::string_view kJSONTrace =
+            R"({"version":"20220209","source":["\t// first line","// \"second line\"","//\\\\//\\)"
+            R"(\\ third line"],"slots":[{"name":"SkVM_DebugTrace","columns":1,"rows":2,"index":3,)"
+            R"("groupIdx":4,"kind":5,"line":6},{"name":"Unit_Test","columns":6,"rows":7,"index":8)"
+            R"(,"kind":10,"line":11,"retval":12}],"functions":[{"name":"void testFunc();"}],"trac)"
+            R"(e":[[2],[0,5],[1,10,15],[3,20]]})";
 
     SkMemoryStream stream(kJSONTrace.data(), kJSONTrace.size(), /*copyData=*/false);
     SkSL::SkVMDebugTrace i;
@@ -96,15 +96,19 @@ DEF_TEST(SkVMDebugTraceRead, r) {
     REPORTER_ASSERT(r, i.fSlotInfo[0].columns == 1);
     REPORTER_ASSERT(r, i.fSlotInfo[0].rows == 2);
     REPORTER_ASSERT(r, i.fSlotInfo[0].componentIndex == 3);
-    REPORTER_ASSERT(r, i.fSlotInfo[0].numberKind == (SkSL::Type::NumberKind)4);
-    REPORTER_ASSERT(r, i.fSlotInfo[0].line == 5);
+    REPORTER_ASSERT(r, i.fSlotInfo[0].groupIndex == 4);
+    REPORTER_ASSERT(r, i.fSlotInfo[0].numberKind == (SkSL::Type::NumberKind)5);
+    REPORTER_ASSERT(r, i.fSlotInfo[0].line == 6);
+    REPORTER_ASSERT(r, i.fSlotInfo[0].fnReturnValue == -1);
 
     REPORTER_ASSERT(r, i.fSlotInfo[1].name == "Unit_Test");
     REPORTER_ASSERT(r, i.fSlotInfo[1].columns == 6);
     REPORTER_ASSERT(r, i.fSlotInfo[1].rows == 7);
     REPORTER_ASSERT(r, i.fSlotInfo[1].componentIndex == 8);
-    REPORTER_ASSERT(r, i.fSlotInfo[1].numberKind == (SkSL::Type::NumberKind)9);
-    REPORTER_ASSERT(r, i.fSlotInfo[1].line == 10);
+    REPORTER_ASSERT(r, i.fSlotInfo[1].groupIndex == 8);
+    REPORTER_ASSERT(r, i.fSlotInfo[1].numberKind == (SkSL::Type::NumberKind)10);
+    REPORTER_ASSERT(r, i.fSlotInfo[1].line == 11);
+    REPORTER_ASSERT(r, i.fSlotInfo[1].fnReturnValue == 12);
 
     REPORTER_ASSERT(r, i.fFuncInfo[0].name == "void testFunc();");
 
@@ -124,3 +128,49 @@ DEF_TEST(SkVMDebugTraceRead, r) {
     REPORTER_ASSERT(r, i.fTraceInfo[3].data[0] == 20);
     REPORTER_ASSERT(r, i.fTraceInfo[3].data[1] == 0);
 }
+
+DEF_TEST(SkVMDebugTraceGetSlotComponentSuffix, r) {
+    // SkVMSlotInfo fields:
+    // - name
+    // - columns
+    // - rows
+    // - componentIndex
+    // - numberKind
+    // - line
+    // - fnReturnValue
+
+    SkSL::SkVMDebugTrace i;
+    i.fSlotInfo = {{"s", 1, 1, 0,  0,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"v", 4, 1, 0,  0,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"v", 4, 1, 1,  1,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"v", 4, 1, 2,  2,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"v", 4, 1, 3,  3,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 0,  0,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 1,  1,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 2,  2,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 3,  3,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 4,  4,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 5,  5,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 6,  6,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 7,  7,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 8,  8,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 9,  9,  SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 10, 10, SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 11, 11, SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 12, 12, SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 13, 13, SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 14, 14, SkSL::Type::NumberKind::kFloat, 0, -1},
+                   {"m", 4, 4, 15, 15, SkSL::Type::NumberKind::kFloat, 0, -1}};
+
+    const std::string kExpected[] = {"",
+                                     ".x",     ".y",     ".z",     ".w",
+                                     "[0][0]", "[0][1]", "[0][2]", "[0][3]",
+                                     "[1][0]", "[1][1]", "[1][2]", "[1][3]",
+                                     "[2][0]", "[2][1]", "[2][2]", "[2][3]",
+                                     "[3][0]", "[3][1]", "[3][2]", "[3][3]"};
+
+    REPORTER_ASSERT(r, i.fSlotInfo.size() == SK_ARRAY_COUNT(kExpected));
+    for (size_t index = 0; index < SK_ARRAY_COUNT(kExpected); ++index) {
+        REPORTER_ASSERT(r, kExpected[index] == i.getSlotComponentSuffix(index));
+    }
+}
diff --git a/third_party/skia/tests/SkVMTest.cpp b/third_party/skia/tests/SkVMTest.cpp
index d06e549f75974..f3b52751f3119 100644
--- a/third_party/skia/tests/SkVMTest.cpp
+++ b/third_party/skia/tests/SkVMTest.cpp
@@ -10,6 +10,11 @@
 #include "src/core/SkCpu.h"
 #include "src/core/SkMSAN.h"
 #include "src/core/SkVM.h"
+#include "src/gpu/GrShaderCaps.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/codegen/SkSLVMCodeGenerator.h"
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+#include "src/utils/SkVMVisualizer.h"
 #include "tests/Test.h"
 
 template <typename Fn>
@@ -886,6 +891,7 @@ DEF_TEST(SkVM_trace_line, r) {
         void var(int, int32_t) override { fBuffer.push_back(-9999999); }
         void enter(int) override        { fBuffer.push_back(-9999999); }
         void exit(int) override         { fBuffer.push_back(-9999999); }
+        void scope(int) override        { fBuffer.push_back(-9999999); }
         void line(int lineNum) override { fBuffer.push_back(lineNum); }
 
         std::vector<int> fBuffer;
@@ -911,6 +917,7 @@ DEF_TEST(SkVM_trace_var, r) {
         void line(int) override                  { fBuffer.push_back(-9999999); }
         void enter(int) override                 { fBuffer.push_back(-9999999); }
         void exit(int) override                  { fBuffer.push_back(-9999999); }
+        void scope(int) override                 { fBuffer.push_back(-9999999); }
         void var(int slot, int32_t val) override {
             fBuffer.push_back(slot);
             fBuffer.push_back(val);
@@ -938,6 +945,7 @@ DEF_TEST(SkVM_trace_enter_exit, r) {
     public:
         void line(int) override                   { fBuffer.push_back(-9999999); }
         void var(int, int32_t) override           { fBuffer.push_back(-9999999); }
+        void scope(int) override                  { fBuffer.push_back(-9999999); }
         void enter(int fnIdx) override {
             fBuffer.push_back(fnIdx);
             fBuffer.push_back(1);
@@ -965,12 +973,39 @@ DEF_TEST(SkVM_trace_enter_exit, r) {
     REPORTER_ASSERT(r, (testTrace.fBuffer == std::vector<int>{12, 1, 56, 0}));
 }
 
+DEF_TEST(SkVM_trace_scope, r) {
+    class TestTraceHook : public skvm::TraceHook {
+    public:
+        void var(int, int32_t) override { fBuffer.push_back(-9999999); }
+        void enter(int) override        { fBuffer.push_back(-9999999); }
+        void exit(int) override         { fBuffer.push_back(-9999999); }
+        void line(int) override         { fBuffer.push_back(-9999999); }
+        void scope(int delta) override  { fBuffer.push_back(delta); }
+
+        std::vector<int> fBuffer;
+    };
+
+    skvm::Builder b;
+    TestTraceHook testTrace;
+    int traceHookID = b.attachTraceHook(&testTrace);
+    b.trace_scope(traceHookID, b.splat(0xFFFFFFFF), b.splat(0xFFFFFFFF), 1);
+    b.trace_scope(traceHookID, b.splat(0xFFFFFFFF), b.splat(0x00000000), -2);
+    b.trace_scope(traceHookID, b.splat(0x00000000), b.splat(0x00000000), 3);
+    b.trace_scope(traceHookID, b.splat(0x00000000), b.splat(0xFFFFFFFF), 4);
+    b.trace_scope(traceHookID, b.splat(0xFFFFFFFF), b.splat(0xFFFFFFFF), -5);
+    skvm::Program p = b.done();
+    p.eval(1);
+
+    REPORTER_ASSERT(r, (testTrace.fBuffer == std::vector<int>{1, -5}));
+}
+
 DEF_TEST(SkVM_trace_multiple_hooks, r) {
     class TestTraceHook : public skvm::TraceHook {
     public:
         void var(int, int32_t) override { fBuffer.push_back(-9999999); }
         void enter(int) override        { fBuffer.push_back(-9999999); }
         void exit(int) override         { fBuffer.push_back(-9999999); }
+        void scope(int) override        { fBuffer.push_back(-9999999); }
         void line(int lineNum) override { fBuffer.push_back(lineNum); }
 
         std::vector<int> fBuffer;
@@ -2099,7 +2134,9 @@ DEF_TEST(SkVM_approx_math, r) {
 
     auto compare = [r](int N, const float values[], const float expected[]) {
         for (int i = 0; i < N; ++i) {
-            REPORTER_ASSERT(r, SkScalarNearlyEqual(values[i], expected[i], 0.001f));
+            REPORTER_ASSERT(r, (values[i] == expected[i]) ||
+                               SkScalarNearlyEqual(values[i], expected[i], 0.001f),
+                               "evaluated to %g, but expected %g", values[i], expected[i]);
         }
     };
 
@@ -2116,24 +2153,33 @@ DEF_TEST(SkVM_approx_math, r) {
 
     // pow2
     {
-        float values[] = {-2, -1, 0, 1, 2, 3};
+        float values[] = {-80, -5, -2, -1, 0, 1, 2, 3, 5, 160};
         constexpr int N = SK_ARRAY_COUNT(values);
         eval(N, values, [](skvm::Builder* b, skvm::F32 v) {
             return b->approx_pow2(v);
         });
-        const float expected[] = {0.25f, 0.5f, 1, 2, 4, 8};
+        const float expected[] = {0, 0.03125f, 0.25f, 0.5f, 1, 2, 4, 8, 32, INFINITY};
         compare(N, values, expected);
     }
-
-    // powf -- x^0.5
+    // powf -- 1^x
     {
-        float bases[] = {0, 1, 4, 9, 16};
-        constexpr int N = SK_ARRAY_COUNT(bases);
-        eval(N, bases, [](skvm::Builder* b, skvm::F32 base) {
-            return b->approx_powf(base, b->splat(0.5f));
+        float exps[] = {-2, -1, 0, 1, 2};
+        constexpr int N = SK_ARRAY_COUNT(exps);
+        eval(N, exps, [](skvm::Builder* b, skvm::F32 exp) {
+            return b->approx_powf(b->splat(1.0f), exp);
         });
-        const float expected[] = {0, 1, 2, 3, 4};
-        compare(N, bases, expected);
+        const float expected[] = {1, 1, 1, 1, 1};
+        compare(N, exps, expected);
+    }
+    // powf -- 2^x
+    {
+        float exps[] = {-80, -5, -2, -1, 0, 1, 2, 3, 5, 160};
+        constexpr int N = SK_ARRAY_COUNT(exps);
+        eval(N, exps, [](skvm::Builder* b, skvm::F32 exp) {
+            return b->approx_powf(2.0, exp);
+        });
+        const float expected[] = {0, 0.03125f, 0.25f, 0.5f, 1, 2, 4, 8, 32, INFINITY};
+        compare(N, exps, expected);
     }
     // powf -- 3^x
     {
@@ -2145,6 +2191,36 @@ DEF_TEST(SkVM_approx_math, r) {
         const float expected[] = {1/9.0f, 1/3.0f, 1, 3, 9};
         compare(N, exps, expected);
     }
+    // powf -- x^0.5
+    {
+        float bases[] = {0, 1, 4, 9, 16};
+        constexpr int N = SK_ARRAY_COUNT(bases);
+        eval(N, bases, [](skvm::Builder* b, skvm::F32 base) {
+            return b->approx_powf(base, b->splat(0.5f));
+        });
+        const float expected[] = {0, 1, 2, 3, 4};
+        compare(N, bases, expected);
+    }
+    // powf -- x^1
+    {
+        float bases[] = {0, 1, 2, 3, 4};
+        constexpr int N = SK_ARRAY_COUNT(bases);
+        eval(N, bases, [](skvm::Builder* b, skvm::F32 base) {
+            return b->approx_powf(base, b->splat(1.0f));
+        });
+        const float expected[] = {0, 1, 2, 3, 4};
+        compare(N, bases, expected);
+    }
+    // powf -- x^2
+    {
+        float bases[] = {0, 1, 2, 3, 4};
+        constexpr int N = SK_ARRAY_COUNT(bases);
+        eval(N, bases, [](skvm::Builder* b, skvm::F32 base) {
+            return b->approx_powf(base, b->splat(2.0f));
+        });
+        const float expected[] = {0, 1, 4, 9, 16};
+        compare(N, bases, expected);
+    }
 
     auto test = [r](float arg, float expected, float tolerance, auto prog) {
         skvm::Builder b;
@@ -2209,7 +2285,7 @@ DEF_TEST(SkVM_approx_math, r) {
                 return approx_tan(x - 3*P);
             });
         }
-        if (0) { SkDebugf("tan error %g\n", err); }
+        if ((false)) { SkDebugf("tan error %g\n", err); }
     }
 
     // asin, acos, atan
@@ -2224,7 +2300,7 @@ DEF_TEST(SkVM_approx_math, r) {
                 return approx_acos(x);
             });
         }
-        if (0) { SkDebugf("asin error %g\n", err); }
+        if ((false)) { SkDebugf("asin error %g\n", err); }
 
         err = 0;
         for (float x = -10; x <= 10; x += 1.0f/16) {
@@ -2232,7 +2308,7 @@ DEF_TEST(SkVM_approx_math, r) {
                 return approx_atan(x);
             });
         }
-        if (0) { SkDebugf("atan error %g\n", err); }
+        if ((false)) { SkDebugf("atan error %g\n", err); }
 
         for (float y = -3; y <= 3; y += 1) {
             for (float x = -3; x <= 3; x += 1) {
@@ -2241,7 +2317,7 @@ DEF_TEST(SkVM_approx_math, r) {
                 });
             }
         }
-        if (0) { SkDebugf("atan2 error %g\n", err); }
+        if ((false)) { SkDebugf("atan2 error %g\n", err); }
     }
 }
 
@@ -2714,3 +2790,108 @@ DEF_TEST(SkVM_fast_mul, r) {
         }
     });
 }
+
+DEF_TEST(SkVM_duplicates, reporter) {
+    {
+        skvm::Builder p(true);
+        auto rptr = p.varying<int>();
+
+        skvm::F32 r = p.loadF(rptr),
+                  g = p.splat(0.0f),
+                  b = p.splat(0.0f),
+                  a = p.splat(1.0f);
+
+        p.unpremul(&r, &g, &b, a);
+        p.storeF(rptr, r);
+
+        std::vector<skvm::Instruction> program = b->program();
+
+        auto withDuplicates = skvm::finalize(program);
+        int duplicates = 0;
+        for (const auto& instr : withDuplicates) {
+            if (instr.op == skvm::Op::duplicate) {
+                ++duplicates;
+            }
+        }
+        REPORTER_ASSERT(reporter, duplicates > 0);
+
+        auto eliminatedAsDeadCode = skvm::eliminate_dead_code(program);
+        for (const auto& instr : eliminatedAsDeadCode) {
+            REPORTER_ASSERT(reporter, instr.op != skvm::Op::duplicate);
+        }
+    }
+
+    {
+        skvm::Builder p(false);
+        auto rptr = p.varying<int>();
+
+        skvm::F32 r = p.loadF(rptr),
+                  g = p.splat(0.0f),
+                  b = p.splat(0.0f),
+                  a = p.splat(1.0f);
+
+        p.unpremul(&r, &g, &b, a);
+        p.storeF(rptr, r);
+
+        auto withoutDuplicates = p.done().instructions();
+        for (const auto& instr : withoutDuplicates) {
+            REPORTER_ASSERT(reporter, instr.op != skvm::Op::duplicate);
+        }
+    }
+}
+
+DEF_TEST(SkVM_Visualizer, r) {
+    const char* src =
+            "int main(int x, int y) {\n"
+            "   int a = 99;\n"
+            "   if (x > 0) a += 100;\n"
+            "   if (y > 0) a += 101;\n"
+            "   a = 102;\n"
+            "   return a;\n"
+            "}";
+    GrShaderCaps caps;
+    SkSL::Compiler compiler(&caps);
+    SkSL::Program::Settings settings;
+    auto program = compiler.convertProgram(SkSL::ProgramKind::kGeneric,
+                                           std::string(src), settings);
+    const SkSL::FunctionDefinition* main = SkSL::Program_GetFunction(*program, "main");
+    SkSL::SkVMDebugTrace d;
+    d.setSource(src);
+    auto v = std::make_unique<skvm::viz::Visualizer>(&d);
+    skvm::Builder b(skvm::Features{}, /*createDuplicates=*/true);
+    SkSL::ProgramToSkVM(*program, *main, &b, &d, /*uniforms=*/{});
+
+    skvm::Program p = b.done(nullptr, true, std::move(v));
+#if defined(SKVM_JIT)
+    SkDynamicMemoryWStream asmFile;
+    p.disassemble(&asmFile);
+    auto dumpData = asmFile.detachAsData();
+    std::string dumpString((const char*)dumpData->data(), dumpData->size());
+#else
+    std::string dumpString;
+#endif
+    SkDynamicMemoryWStream vizFile;
+    p.visualizer()->dump(&vizFile, dumpString.c_str());
+    auto vizData = vizFile.detachAsData();
+    std::string html((const char*)vizData->data(), vizData->size());
+    //b.dump();
+    //std::printf(html.c_str());
+    // Check that html contains all types of information:
+    if (!dumpString.empty() && !std::strstr(dumpString.c_str(), "Program not JIT'd.")) {
+        REPORTER_ASSERT(r, std::strstr(html.c_str(), "<tr class='machine'>"));  // machine commands
+    }
+    REPORTER_ASSERT(r, std::strstr(html.c_str(), "<tr class='normal'>"));       // SkVM byte code
+    REPORTER_ASSERT(r, std::strstr(html.c_str(), "<tr class='source'>"));       // C++ source
+    REPORTER_ASSERT(r, std::strstr(html.c_str(), "<tr class='dead'>"));         // dead code
+    REPORTER_ASSERT(r, std::strstr(html.c_str(), "<tr class='dead deduped'>")); // deduped removed
+    REPORTER_ASSERT(r, std::strstr(html.c_str(),                                // deduped origins
+                       "<tr class='normal origin'>"
+                       "<td>&#8593;&#8593;&#8593; *13</td>"
+                       "<td>v2 = splat 0 (0)</td></tr>"));
+    REPORTER_ASSERT(r, std::strstr(html.c_str(),                                // trace enter
+                       "<tr class='source'><td class='mask'>&#8618;v9</td>"
+                                   "<td colspan=2>int main(int x, int y)</td></tr>"));
+    REPORTER_ASSERT(r, std::strstr(html.c_str(),                                // trace exit
+                       "<tr class='source'><td class='mask'>&#8617;v9</td>"
+                       "<td colspan=2>int main(int x, int y)</td></tr>"));
+}
diff --git a/third_party/skia/tests/Skbug6653.cpp b/third_party/skia/tests/Skbug6653.cpp
index 769c177524c12..388463481c929 100644
--- a/third_party/skia/tests/Skbug6653.cpp
+++ b/third_party/skia/tests/Skbug6653.cpp
@@ -90,7 +90,7 @@ static void test_bug_6653(GrDirectContext* dContext,
             }
         }
 
-        REPORTER_ASSERT(reporter, match, label);
+        REPORTER_ASSERT(reporter, match, "%s", label);
     }
 }
 
diff --git a/third_party/skia/tests/SpecialSurfaceTest.cpp b/third_party/skia/tests/SpecialSurfaceTest.cpp
index b309a5ac83306..35a1a0aea5141 100644
--- a/third_party/skia/tests/SpecialSurfaceTest.cpp
+++ b/third_party/skia/tests/SpecialSurfaceTest.cpp
@@ -87,7 +87,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialSurface_Gpu1, reporter, ctxInfo) {
         SkImageInfo ii = SkImageInfo::Make({ kSmallerSize, kSmallerSize }, colorType,
                                            kPremul_SkAlphaType);
 
-        auto surf(SkSpecialSurface::MakeRenderTarget(dContext, ii, SkSurfaceProps()));
+        auto surf(SkSpecialSurface::MakeRenderTarget(dContext, ii, SkSurfaceProps(),
+                                                     kTopLeft_GrSurfaceOrigin));
         test_surface(surf, reporter, 0);
     }
 }
diff --git a/third_party/skia/tests/StreamTest.cpp b/third_party/skia/tests/StreamTest.cpp
index 49d2005287a42..cd821aff59ecc 100644
--- a/third_party/skia/tests/StreamTest.cpp
+++ b/third_party/skia/tests/StreamTest.cpp
@@ -506,7 +506,7 @@ DEF_TEST(FILEStreamWithOffset, r) {
     const size_t size = stream1.getLength();
     const size_t middle = size / 2;
     if (!stream1.seek(middle)) {
-        ERRORF(r, "Could not seek SkFILEStream to %lu out of %lu", middle, size);
+        ERRORF(r, "Could not seek SkFILEStream to %zu out of %zu", middle, size);
         return;
     }
     REPORTER_ASSERT(r, stream1.getPosition() == middle);
@@ -518,7 +518,7 @@ DEF_TEST(FILEStreamWithOffset, r) {
     }
 
     if (fseek(file, (long) middle, SEEK_SET) != 0) {
-        ERRORF(r, "Could not fseek FILE to %lu out of %lu", middle, size);
+        ERRORF(r, "Could not fseek FILE to %zu out of %zu", middle, size);
         return;
     }
     SkFILEStream stream2(file);
diff --git a/third_party/skia/tests/StringTest.cpp b/third_party/skia/tests/StringTest.cpp
index a09f72193283b..4bf7ca1bb812f 100644
--- a/third_party/skia/tests/StringTest.cpp
+++ b/third_party/skia/tests/StringTest.cpp
@@ -296,15 +296,17 @@ DEF_TEST(String_huge, r) {
     // See where we crash, and manually check that its at the right point.
     //
     //  To test, change the false to true
-    while (false) {
-        // On a 64bit build, this should crash when size == 1 << 32, since we can't store
-        // that length in the string's header (which has a u32 slot for the length).
-        //
-        // On a 32bit build, this should crash the first time around, since we can't allocate
-        // anywhere near this amount.
-        //
-        SkString str(size);
-        size += 1;
+    if ((false)) {
+        for (;;) {
+            // On a 64bit build, this should crash when size == 1 << 32, since we can't store
+            // that length in the string's header (which has a u32 slot for the length).
+            //
+            // On a 32bit build, this should crash the first time around, since we can't allocate
+            // anywhere near this amount.
+            //
+            SkString str(size);
+            size += 1;
+        }
     }
 }
 
@@ -327,6 +329,9 @@ DEF_TEST(String_fromUTF16, r) {
     REPORTER_ASSERT(r, SkStringFromUTF16(test3, SK_ARRAY_COUNT(test3)).equals("αβγδε ζηθικ"));
 }
 
+static void test_va_list_print(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_print(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -338,6 +343,9 @@ static void test_va_list_print(skiatest::Reporter* r, const char format[], ...)
     va_end(args);
 }
 
+static void test_va_list_append(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_append(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -349,6 +357,9 @@ static void test_va_list_append(skiatest::Reporter* r, const char format[], ...)
     va_end(args);
 }
 
+static void test_va_list_prepend(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_prepend(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -366,6 +377,9 @@ DEF_TEST(String_VAList, r) {
     test_va_list_prepend(r, "%s %c%c%c%c%c", "hello", 'w', 'o', 'r', 'l', 'd');
 }
 
+static void test_va_list_overflow_print(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_overflow_print(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -377,6 +391,9 @@ static void test_va_list_overflow_print(skiatest::Reporter* r, const char format
     va_end(args);
 }
 
+static void test_va_list_overflow_append(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_overflow_append(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
@@ -390,6 +407,9 @@ static void test_va_list_overflow_append(skiatest::Reporter* r, const char forma
     va_end(args);
 }
 
+static void test_va_list_overflow_prepend(skiatest::Reporter* r, const char format[], ...)
+        SK_PRINTF_LIKE(2, 3);
+
 static void test_va_list_overflow_prepend(skiatest::Reporter* r, const char format[], ...) {
     va_list args;
     va_start(args, format);
diff --git a/third_party/skia/tests/SurfaceTest.cpp b/third_party/skia/tests/SurfaceTest.cpp
index ba4b29f68e122..bd04fb3d240a7 100644
--- a/third_party/skia/tests/SurfaceTest.cpp
+++ b/third_party/skia/tests/SurfaceTest.cpp
@@ -1156,13 +1156,15 @@ DEF_TEST(surface_image_unity, reporter) {
         auto surf = SkSurface::MakeRaster(info, rowBytes, nullptr);
         if (surf) {
             auto img = surf->makeImageSnapshot();
-            if (!img && false) {    // change to true to document the differences
-                SkDebugf("image failed: [%08X %08X] %14s %s\n",
-                         info.width(),
-                         info.height(),
-                         ToolUtils::colortype_name(info.colorType()),
-                         ToolUtils::alphatype_name(info.alphaType()));
-                return;
+            if ((false)) { // change to true to document the differences
+                if (!img) {
+                    SkDebugf("image failed: [%08X %08X] %14s %s\n",
+                             info.width(),
+                             info.height(),
+                             ToolUtils::colortype_name(info.colorType()),
+                             ToolUtils::alphatype_name(info.alphaType()));
+                    return;
+                }
             }
             REPORTER_ASSERT(reporter, img != nullptr);
 
diff --git a/third_party/skia/tests/Test.h b/third_party/skia/tests/Test.h
index 4a732f117c158..87b3372938301 100644
--- a/third_party/skia/tests/Test.h
+++ b/third_party/skia/tests/Test.h
@@ -165,24 +165,16 @@ class Timer {
 
 }  // namespace skiatest
 
-static inline SkString reporter_string() { return {}; }
-/// Prevent security warnings when using a non-literal string i.e. not a format string.
-static inline SkString reporter_string(const char* s) { return SkString(s); }
-template<typename... Args>
-static inline SkString reporter_string(const char* fmt, Args... args)  {
-    return SkStringPrintf(fmt, std::forward<Args>(args)...);
-}
-
-#define REPORTER_ASSERT(r, cond, ...)                               \
-    do {                                                            \
-        if (!(cond)) {                                              \
-            REPORT_FAILURE(r, #cond, reporter_string(__VA_ARGS__)); \
-        }                                                           \
+#define REPORTER_ASSERT(r, cond, ...)                              \
+    do {                                                           \
+        if (!(cond)) {                                             \
+            REPORT_FAILURE(r, #cond, SkStringPrintf(__VA_ARGS__)); \
+        }                                                          \
     } while (0)
 
-#define ERRORF(r, ...)                                       \
-    do {                                                     \
-        REPORT_FAILURE(r, "", reporter_string(__VA_ARGS__)); \
+#define ERRORF(r, ...)                                      \
+    do {                                                    \
+        REPORT_FAILURE(r, "", SkStringPrintf(__VA_ARGS__)); \
     } while (0)
 
 #define INFOF(REPORTER, ...)         \
diff --git a/third_party/skia/tests/TextBlobCacheTest.cpp b/third_party/skia/tests/TextBlobCacheTest.cpp
index 7912194c2ccc1..24e502a1427c4 100644
--- a/third_party/skia/tests/TextBlobCacheTest.cpp
+++ b/third_party/skia/tests/TextBlobCacheTest.cpp
@@ -31,7 +31,7 @@
 
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/text/GrAtlasManager.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 
 static void draw(SkCanvas* canvas, int redraw, const SkTArray<sk_sp<SkTextBlob>>& blobs) {
     int yOffset = 0;
@@ -55,7 +55,7 @@ static void setup_always_evict_atlas(GrDirectContext* dContext) {
 
 class GrTextBlobTestingPeer {
 public:
-    static void SetBudget(GrTextBlobCache* cache, size_t budget) {
+    static void SetBudget(GrTextBlobRedrawCoordinator* cache, size_t budget) {
         SkAutoSpinlock lock{cache->fSpinLock};
         cache->fSizeBudget = budget;
         cache->internalCheckPurge();
diff --git a/third_party/skia/tests/TextureOpTest.cpp b/third_party/skia/tests/TextureOpTest.cpp
index 7d74484c1cfb9..5ce9fa341f741 100644
--- a/third_party/skia/tests/TextureOpTest.cpp
+++ b/third_party/skia/tests/TextureOpTest.cpp
@@ -87,13 +87,13 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(TextureOpTest, reporter, ctxInfo) {
 
     GrSurfaceProxyView proxyViewA(create_proxy(dContext),
                                   kTopLeft_GrSurfaceOrigin,
-                                  GrSwizzle::RGBA());
+                                  skgpu::Swizzle::RGBA());
     GrSurfaceProxyView proxyViewB(create_proxy(dContext),
                                   kTopLeft_GrSurfaceOrigin,
-                                  GrSwizzle::RGBA());
+                                  skgpu::Swizzle::RGBA());
     GrSurfaceProxyView proxyViewC(create_proxy(dContext),
                                   kTopLeft_GrSurfaceOrigin,
-                                  GrSwizzle::RGBA());
+                                  skgpu::Swizzle::RGBA());
 
     static const SkRect kOpARect{  0,  0, 16, 16 };
     static const SkRect kOpBRect{ 32,  0, 48, 16 };
diff --git a/third_party/skia/tests/TextureProxyTest.cpp b/third_party/skia/tests/TextureProxyTest.cpp
index 1fc3734645a0e..dfb4d91e546d1 100644
--- a/third_party/skia/tests/TextureProxyTest.cpp
+++ b/third_party/skia/tests/TextureProxyTest.cpp
@@ -80,12 +80,12 @@ static sk_sp<GrTextureProxy> wrapped(skiatest::Reporter* reporter, GrRecordingCo
 
 static sk_sp<GrTextureProxy> wrapped_with_key(skiatest::Reporter* reporter, GrRecordingContext*,
                                               GrProxyProvider* proxyProvider, SkBackingFit fit) {
-    static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain();
+    static skgpu::UniqueKey::Domain d = skgpu::UniqueKey::GenerateDomain();
     static int kUniqueKeyData = 0;
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
 
-    GrUniqueKey::Builder builder(&key, d, 1, nullptr);
+    skgpu::UniqueKey::Builder builder(&key, d, 1, nullptr);
     builder[0] = kUniqueKeyData++;
     builder.finish();
 
@@ -131,7 +131,7 @@ static void basic_test(GrDirectContext* dContext,
 
     int startCacheCount = cache->getResourceCount();
 
-    GrUniqueKey key;
+    skgpu::UniqueKey key;
     if (proxy->getUniqueKey().isValid()) {
         key = proxy->getUniqueKey();
     } else {
@@ -157,7 +157,7 @@ static void basic_test(GrDirectContext* dContext,
 
     // Once instantiated, the backing resource should have the same key
     SkAssertResult(proxy->instantiate(resourceProvider));
-    const GrUniqueKey texKey = proxy->peekSurface()->getUniqueKey();
+    const skgpu::UniqueKey texKey = proxy->peekSurface()->getUniqueKey();
     REPORTER_ASSERT(reporter, texKey.isValid());
     REPORTER_ASSERT(reporter, key == texKey);
 
@@ -202,8 +202,8 @@ static void basic_test(GrDirectContext* dContext,
 
     if (expectResourceToOutliveProxy) {
         proxy.reset();
-        GrUniqueKeyInvalidatedMessage msg(texKey, dContext->priv().contextID());
-        SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(msg);
+        skgpu::UniqueKeyInvalidatedMessage msg(texKey, dContext->priv().contextID());
+        SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Post(msg);
         cache->purgeAsNeeded();
         expectedCacheCount -= cacheEntriesPerProxy;
         proxy = proxyProvider->findOrCreateProxyByUniqueKey(key);
@@ -291,9 +291,9 @@ static void invalidation_and_instantiation_test(GrDirectContext* dContext,
     GrResourceCache* cache = dContext->priv().getResourceCache();
     REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
 
-    static GrUniqueKey::Domain d = GrUniqueKey::GenerateDomain();
-    GrUniqueKey key;
-    GrUniqueKey::Builder builder(&key, d, 1, nullptr);
+    static skgpu::UniqueKey::Domain d = skgpu::UniqueKey::GenerateDomain();
+    skgpu::UniqueKey key;
+    skgpu::UniqueKey::Builder builder(&key, d, 1, nullptr);
     builder[0] = 0;
     builder.finish();
 
@@ -303,8 +303,8 @@ static void invalidation_and_instantiation_test(GrDirectContext* dContext,
     SkAssertResult(proxyProvider->assignUniqueKeyToProxy(key, proxy.get()));
 
     // Send an invalidation message, which will be sitting in the cache's inbox
-    SkMessageBus<GrUniqueKeyInvalidatedMessage, uint32_t>::Post(
-            GrUniqueKeyInvalidatedMessage(key, dContext->priv().contextID()));
+    SkMessageBus<skgpu::UniqueKeyInvalidatedMessage, uint32_t>::Post(
+            skgpu::UniqueKeyInvalidatedMessage(key, dContext->priv().contextID()));
 
     REPORTER_ASSERT(reporter, 1 == proxyProvider->numUniqueKeyProxies_TestOnly());
     REPORTER_ASSERT(reporter, 0 == cache->getResourceCount());
diff --git a/third_party/skia/tests/TriangulatingPathRendererTests.cpp b/third_party/skia/tests/TriangulatingPathRendererTests.cpp
index 6cc3d68518bc7..8f4febd08da79 100644
--- a/third_party/skia/tests/TriangulatingPathRendererTests.cpp
+++ b/third_party/skia/tests/TriangulatingPathRendererTests.cpp
@@ -14,6 +14,7 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrEagerVertexAllocator.h"
 #include "src/gpu/GrStyle.h"
+#include "src/gpu/GrUserStencilSettings.h"
 #include "src/gpu/effects/GrPorterDuffXferProcessor.h"
 #include "src/gpu/geometry/GrAATriangulator.h"
 #include "src/gpu/geometry/GrInnerFanTriangulator.h"
@@ -699,6 +700,85 @@ static SkPath create_path_46() {
     return path;
 }
 
+// Reduction from crbug.com/1245359
+static SkPath create_path_47() {
+    SkPath path;
+    path.setFillType(SkPathFillType::kWinding);
+    path.moveTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cb9b4a5)); // -2.65172e+19f,  9.73632e+07f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0xe396b530)); // -2.65172e+19f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0xe396b530)); //  2.65172e+19f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0x6396b530)); //  2.65172e+19f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0x6396b530)); //  1.00908e+08f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x6396b530)); // -2.65172e+19f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0xe396b530)); // -2.65172e+19f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0xe396b530)); //  1.00908e+08f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0xe396b530)); //  1.00913e+08f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0x4cb9b4a5)); //  1.00913e+08f,  9.73632e+07f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cb9b4a5)); // -2.65172e+19f,  9.73632e+07f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cb74d74)); // -2.65172e+19f,  9.61033e+07f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0x4cb74d74)); //  1.00913e+08f,  9.61033e+07f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0x6396b530)); //  1.00913e+08f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0x6396b530)); //  1.00908e+08f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0x4cb74d74)); //  1.00908e+08f,  9.61033e+07f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0x4cb74d74)); //  2.65172e+19f,  9.61033e+07f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0x6396b530)); //  2.65172e+19f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x6396b530)); // -2.65172e+19f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cb9b4a5)); // -2.65172e+19f,  9.73632e+07f
+    path.close();
+
+    path.moveTo(SkBits2Float(0xdfb39e51), SkBits2Float(0xe282c5bd)); // -2.58857e+19f, -1.20616e+21f
+    path.lineTo(SkBits2Float(0xdf8a47ec), SkBits2Float(0xe3b90de5)); // -1.99284e+19f, -6.8273e+21f
+    path.lineTo(SkBits2Float(0x5eb8b548), SkBits2Float(0xe391e278)); //  6.65481e+18f, -5.38219e+21f
+    path.quadTo(SkBits2Float(0x5eaa9855), SkBits2Float(0xe392a246),  //  6.14633e+18f, -5.40984e+21f
+                SkBits2Float(0x5e9c5925), SkBits2Float(0xe39344a0)); //  5.63304e+18f, -5.43323e+21f
+    path.quadTo(SkBits2Float(0x5e89eefd), SkBits2Float(0xe3941678),  //  4.96958e+18f, -5.46347e+21f
+                SkBits2Float(0x5e6ead5a), SkBits2Float(0xe394b6a4)); //  4.29963e+18f, -5.48656e+21f
+    path.quadTo(SkBits2Float(0x5e6c0307), SkBits2Float(0xe394c21f),  //  4.25161e+18f, -5.48821e+21f
+                SkBits2Float(0x5e694ef2), SkBits2Float(0xe394cd7f)); //  4.20291e+18f, -5.48985e+21f
+    path.quadTo(SkBits2Float(0x5e67eeaa), SkBits2Float(0xe394d349),  //  4.17812e+18f, -5.49069e+21f
+                SkBits2Float(0x5e669614), SkBits2Float(0xe394d8e2)); //  4.15387e+18f, -5.49149e+21f
+    path.quadTo(SkBits2Float(0x5e6534d4), SkBits2Float(0xe394de9e),  //  4.12901e+18f, -5.49232e+21f
+                SkBits2Float(0x5e63d6a7), SkBits2Float(0xe394e43c)); //  4.10437e+18f, -5.49313e+21f
+    path.quadTo(SkBits2Float(0x5e610d59), SkBits2Float(0xe394efad),  //  4.05418e+18f, -5.49478e+21f
+                SkBits2Float(0x5e5e43cb), SkBits2Float(0xe394fad6)); //  4.00397e+18f, -5.49639e+21f
+    path.quadTo(SkBits2Float(0x5e5b6ac0), SkBits2Float(0xe395063d),  //  3.95267e+18f, -5.49803e+21f
+                SkBits2Float(0x5e5895ab), SkBits2Float(0xe3951148)); //  3.90164e+18f, -5.49962e+21f
+    path.quadTo(SkBits2Float(0x5e55b52e), SkBits2Float(0xe3951c7f),  //  3.84982e+18f, -5.50124e+21f
+                SkBits2Float(0x5e52cb8e), SkBits2Float(0xe395278b)); //  3.79735e+18f, -5.50283e+21f
+    path.quadTo(SkBits2Float(0x5e514f61), SkBits2Float(0xe3952d2d),  //  3.7706e+18f,  -5.50364e+21f
+                SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0x5e4fdbc5), SkBits2Float(0xe395329a)); //  3.74445e+18f, -5.50442e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0xe396b530)); // -2.65172e+19f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0xe396b530)); //  2.65172e+19f, -5.56014e+21f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0x4cc8d35d)); //  2.65172e+19f,  1.0529e+08f
+    path.lineTo(SkBits2Float(0xdfe2ba48), SkBits2Float(0x63512f2f)); // -3.26749e+19f,  3.85877e+21f
+    path.lineTo(SkBits2Float(0xdf7f64f6), SkBits2Float(0xe3b9b457)); // -1.84031e+19f, -6.85129e+21f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cc8d35d)); // -2.65172e+19f,  1.0529e+08f
+    path.lineTo(SkBits2Float(0xdfb80000), SkBits2Float(0x4cbbf2a2)); // -2.65172e+19f,  9.85388e+07f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0x4cbbf2a2)); //  1.00913e+08f,  9.85388e+07f
+    path.lineTo(SkBits2Float(0x4cc079c8), SkBits2Float(0x6396b530)); //  1.00913e+08f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0x6396b530)); //  1.00908e+08f,  5.56014e+21f
+    path.lineTo(SkBits2Float(0x4cc07742), SkBits2Float(0x4cbbf2a2)); //  1.00908e+08f,  9.85388e+07f
+    path.lineTo(SkBits2Float(0x5fb80000), SkBits2Float(0x4cbbf2a2)); //  2.65172e+19f,  9.85388e+07f
+    path.lineTo(SkBits2Float(0xdeb8b548), SkBits2Float(0x6391e278)); // -6.65481e+18f,  5.38219e+21f
+    path.lineTo(SkBits2Float(0x4cc07488), SkBits2Float(0x4ccb2302)); //  1.00902e+08f,  1.06502e+08f
+    path.lineTo(SkBits2Float(0x5fb39e51), SkBits2Float(0x6282c5bd)); //  2.58857e+19f,  1.20616e+21f
+    path.lineTo(SkBits2Float(0x5fb39e51), SkBits2Float(0x6282c5bd)); //  2.58857e+19f,  1.20616e+21f
+    path.lineTo(SkBits2Float(0x5f8bb406), SkBits2Float(0x63b3cfe4)); //  2.01334e+19f,  6.63389e+21f
+    path.lineTo(SkBits2Float(0xdfdb889b), SkBits2Float(0x6364da0b)); // -3.16381e+19f,  4.22157e+21f
+    path.lineTo(SkBits2Float(0xdfb39e51), SkBits2Float(0xe282c5bd)); // -2.58857e+19f, -1.20616e+21f
+    path.close();
+    return path;
+}
+
 static std::unique_ptr<GrFragmentProcessor> create_linear_gradient_processor(
             GrRecordingContext* rContext) {
 
@@ -775,6 +855,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(TriangulatingPathRendererTests, reporter, ctxInfo)
     test_path(ctx, sdc.get(), create_path_44(), SkMatrix(), GrAAType::kCoverage);
     test_path(ctx, sdc.get(), create_path_45(), SkMatrix(), GrAAType::kCoverage);
     test_path(ctx, sdc.get(), create_path_46(), SkMatrix(), GrAAType::kCoverage);
+    test_path(ctx, sdc.get(), create_path_47(), SkMatrix(), GrAAType::kCoverage);
 }
 
 #endif // SK_GPU_V1
diff --git a/third_party/skia/tests/TypefaceTest.cpp b/third_party/skia/tests/TypefaceTest.cpp
index f1be7b42b6e50..e4598a89fc6d9 100644
--- a/third_party/skia/tests/TypefaceTest.cpp
+++ b/third_party/skia/tests/TypefaceTest.cpp
@@ -25,6 +25,7 @@
 #include "tools/ToolUtils.h"
 #include "tools/fonts/TestEmptyTypeface.h"
 
+#include <algorithm>
 #include <memory>
 
 static void TypefaceStyle_test(skiatest::Reporter* reporter,
@@ -538,6 +539,9 @@ DEF_TEST(Typeface_glyph_to_char, reporter) {
     SkASSERT(font.getTypeface());
     char const * text = ToolUtils::emoji_sample_text();
     size_t const textLen = strlen(text);
+    SkString familyName;
+    font.getTypeface()->getFamilyName(&familyName);
+
     size_t const codepointCount = SkUTF::CountUTF8(text, textLen);
     char const * const textEnd = text + textLen;
     std::unique_ptr<SkUnichar[]> originalCodepoints(new SkUnichar[codepointCount]);
@@ -546,12 +550,15 @@ DEF_TEST(Typeface_glyph_to_char, reporter) {
     }
     std::unique_ptr<SkGlyphID[]> glyphs(new SkGlyphID[codepointCount]);
     font.unicharsToGlyphs(originalCodepoints.get(), codepointCount, glyphs.get());
+    if (std::any_of(glyphs.get(), glyphs.get()+codepointCount, [](SkGlyphID g){ return g == 0;})) {
+        ERRORF(reporter, "Unexpected typeface \"%s\". Expected full support for emoji_sample_text.",
+               familyName.c_str());
+        return;
+    }
 
     std::unique_ptr<SkUnichar[]> newCodepoints(new SkUnichar[codepointCount]);
     SkFontPriv::GlyphsToUnichars(font, glyphs.get(), codepointCount, newCodepoints.get());
 
-    SkString familyName;
-    font.getTypeface()->getFamilyName(&familyName);
     for (size_t i = 0; i < codepointCount; ++i) {
 #if defined(SK_BUILD_FOR_WIN)
         // GDI does not support character to glyph mapping outside BMP.
diff --git a/third_party/skia/tests/VkHardwareBufferTest.cpp b/third_party/skia/tests/VkHardwareBufferTest.cpp
index 95a319297a304..9372c2cb1ebb9 100644
--- a/third_party/skia/tests/VkHardwareBufferTest.cpp
+++ b/third_party/skia/tests/VkHardwareBufferTest.cpp
@@ -508,17 +508,9 @@ class VulkanTestHelper : public BaseTestHelper {
 
 bool VulkanTestHelper::init(skiatest::Reporter* reporter) {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return false;
     }
-    auto getProc = [&instProc, &devProc](const char* proc_name,
-                                         VkInstance instance, VkDevice device) {
-        if (device != VK_NULL_HANDLE) {
-            return devProc(device, proc_name);
-        }
-        return instProc(instance, proc_name);
-    };
 
     fExtensions = new GrVkExtensions();
     fFeatures = new VkPhysicalDeviceFeatures2;
@@ -529,11 +521,12 @@ bool VulkanTestHelper::init(skiatest::Reporter* reporter) {
     fBackendContext.fInstance = VK_NULL_HANDLE;
     fBackendContext.fDevice = VK_NULL_HANDLE;
 
-    if (!sk_gpu_test::CreateVkBackendContext(getProc, &fBackendContext, fExtensions,
+    if (!sk_gpu_test::CreateVkBackendContext(instProc, &fBackendContext, fExtensions,
                                              fFeatures, &fDebugCallback)) {
         return false;
     }
     fDevice = fBackendContext.fDevice;
+    auto getProc = fBackendContext.fGetProc;
 
     if (fDebugCallback != VK_NULL_HANDLE) {
         fDestroyDebugCallback = (PFN_vkDestroyDebugReportCallbackEXT) instProc(
diff --git a/third_party/skia/tests/VkPriorityExtensionTest.cpp b/third_party/skia/tests/VkPriorityExtensionTest.cpp
index 1f4f13c72e805..c844468b147b1 100644
--- a/third_party/skia/tests/VkPriorityExtensionTest.cpp
+++ b/third_party/skia/tests/VkPriorityExtensionTest.cpp
@@ -14,34 +14,35 @@
 #include "tests/Test.h"
 #include "tools/gpu/vk/VkTestUtils.h"
 
-#define ACQUIRE_VK_PROC_NOCHECK(name, instance, device) \
-    PFN_vk##name grVk##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device))
-
-#define ACQUIRE_VK_PROC(name, instance, device)                                    \
-    PFN_vk##name grVk##name =                                                      \
-            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device)); \
-    do {                                                                           \
-        if (grVk##name == nullptr) {                                               \
-            if (device != VK_NULL_HANDLE) {                                        \
-                destroy_instance(getProc, inst);                                   \
-            }                                                                      \
-            return;                                                                \
-        }                                                                          \
+#define ACQUIRE_VK_PROC_NOCHECK(name, instance) \
+    PFN_vk##name grVk##name =                                                              \
+            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, VK_NULL_HANDLE))
+
+#define ACQUIRE_VK_PROC(name, instance)                                                    \
+    PFN_vk##name grVk##name =                                                              \
+            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, VK_NULL_HANDLE)); \
+    do {                                                                                   \
+        if (grVk##name == nullptr) {                                                       \
+            if (instance != VK_NULL_HANDLE) {                                              \
+                destroy_instance(getProc, instance);                                       \
+            }                                                                              \
+            return;                                                                        \
+        }                                                                                  \
     } while (0)
 
-#define ACQUIRE_VK_PROC_LOCAL(name, instance, device)                              \
-    PFN_vk##name grVk##name =                                                      \
-            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device)); \
-    do {                                                                           \
-        if (grVk##name == nullptr) {                                               \
-            return;                                                                \
-        }                                                                          \
+#define ACQUIRE_VK_PROC_LOCAL(name, instance)                                              \
+    PFN_vk##name grVk##name =                                                              \
+            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, VK_NULL_HANDLE)); \
+    do {                                                                                   \
+        if (grVk##name == nullptr) {                                                       \
+            return;                                                                        \
+        }                                                                                  \
     } while (0)
 
-#define GET_PROC_LOCAL(F, inst, device) PFN_vk ## F F = (PFN_vk ## F) getProc("vk" #F, inst, device)
+#define GET_PROC_LOCAL(F, inst) PFN_vk ## F F = (PFN_vk ## F) getProc("vk" #F, inst, VK_NULL_HANDLE)
 
 static void destroy_instance(GrVkGetProc getProc, VkInstance inst) {
-    ACQUIRE_VK_PROC_LOCAL(DestroyInstance, inst, VK_NULL_HANDLE);
+    ACQUIRE_VK_PROC_LOCAL(DestroyInstance, inst);
     grVkDestroyInstance(inst, nullptr);
 }
 
@@ -50,21 +51,17 @@ static void destroy_instance(GrVkGetProc getProc, VkInstance inst) {
 // doesn't crash.
 DEF_GPUTEST(VulkanPriorityExtension, reporter, options) {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return;
     }
-    auto getProc = [instProc, devProc](const char* proc_name,
-                                       VkInstance instance, VkDevice device) {
-        if (device != VK_NULL_HANDLE) {
-            return devProc(device, proc_name);
-        }
+    // This isn't the most effecient but we just use the instProc to get all ptrs.
+    auto getProc = [instProc](const char* proc_name, VkInstance instance, VkDevice) {
         return instProc(instance, proc_name);
     };
 
     VkResult err;
 
-    ACQUIRE_VK_PROC_NOCHECK(EnumerateInstanceVersion, VK_NULL_HANDLE, VK_NULL_HANDLE);
+    ACQUIRE_VK_PROC_NOCHECK(EnumerateInstanceVersion, VK_NULL_HANDLE);
     uint32_t instanceVersion = 0;
     if (!grVkEnumerateInstanceVersion) {
         instanceVersion = VK_MAKE_VERSION(1, 0, 0);
@@ -112,21 +109,21 @@ DEF_GPUTEST(VulkanPriorityExtension, reporter, options) {
         nullptr,                                   // ppEnabledExtensionNames
     };
 
-    ACQUIRE_VK_PROC(CreateInstance, VK_NULL_HANDLE, VK_NULL_HANDLE);
+    ACQUIRE_VK_PROC(CreateInstance, VK_NULL_HANDLE);
     err = grVkCreateInstance(&instance_create, nullptr, &inst);
     if (err < 0) {
         ERRORF(reporter, "Failed to create VkInstance");
         return;
     }
 
-    ACQUIRE_VK_PROC(EnumeratePhysicalDevices, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(GetPhysicalDeviceProperties, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(GetPhysicalDeviceQueueFamilyProperties, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(GetPhysicalDeviceFeatures, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(CreateDevice, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(GetDeviceQueue, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(DeviceWaitIdle, inst, VK_NULL_HANDLE);
-    ACQUIRE_VK_PROC(DestroyDevice, inst, VK_NULL_HANDLE);
+    ACQUIRE_VK_PROC(EnumeratePhysicalDevices, inst);
+    ACQUIRE_VK_PROC(GetPhysicalDeviceProperties, inst);
+    ACQUIRE_VK_PROC(GetPhysicalDeviceQueueFamilyProperties, inst);
+    ACQUIRE_VK_PROC(GetPhysicalDeviceFeatures, inst);
+    ACQUIRE_VK_PROC(CreateDevice, inst);
+    ACQUIRE_VK_PROC(GetDeviceQueue, inst);
+    ACQUIRE_VK_PROC(DeviceWaitIdle, inst);
+    ACQUIRE_VK_PROC(DestroyDevice, inst);
 
     uint32_t gpuCount;
     err = grVkEnumeratePhysicalDevices(inst, &gpuCount, nullptr);
@@ -180,8 +177,8 @@ DEF_GPUTEST(VulkanPriorityExtension, reporter, options) {
         return;
     }
 
-    GET_PROC_LOCAL(EnumerateDeviceExtensionProperties, inst, VK_NULL_HANDLE);
-    GET_PROC_LOCAL(EnumerateDeviceLayerProperties, inst, VK_NULL_HANDLE);
+    GET_PROC_LOCAL(EnumerateDeviceExtensionProperties, inst);
+    GET_PROC_LOCAL(EnumerateDeviceLayerProperties, inst);
 
     if (!EnumerateDeviceExtensionProperties ||
         !EnumerateDeviceLayerProperties) {
diff --git a/third_party/skia/tests/VkYcbcrSamplerTest.cpp b/third_party/skia/tests/VkYcbcrSamplerTest.cpp
index cb14e8d87309d..998446b92d90e 100644
--- a/third_party/skia/tests/VkYcbcrSamplerTest.cpp
+++ b/third_party/skia/tests/VkYcbcrSamplerTest.cpp
@@ -99,17 +99,17 @@ DEF_GPUTEST(VkYCbcrSampler_DrawImageWithYcbcrSampler, reporter, options) {
 
             int r = readbackData[(y * kImageWidth + x) * 4];
             if (abs(r - expectedR) > kColorTolerance) {
-                ERRORF(reporter, "R should be %d, but is %d at (%d, %d)", expectedR, r, x, y);
+                ERRORF(reporter, "R should be %d, but is %d at (%zu, %zu)", expectedR, r, x, y);
             }
 
             int g = readbackData[(y * kImageWidth + x) * 4 + 1];
             if (abs(g - expectedG) > kColorTolerance) {
-                ERRORF(reporter, "G should be %d, but is %d at (%d, %d)", expectedG, g, x, y);
+                ERRORF(reporter, "G should be %d, but is %d at (%zu, %zu)", expectedG, g, x, y);
             }
 
             int b = readbackData[(y * kImageWidth + x) * 4 + 2];
             if (abs(b - expectedB) > kColorTolerance) {
-                ERRORF(reporter, "B should be %d, but is %d at (%d, %d)", expectedB, b, x, y);
+                ERRORF(reporter, "B should be %d, but is %d at (%zu, %zu)", expectedB, b, x, y);
             }
         }
     }
diff --git a/third_party/skia/tests/VptrTest.cpp b/third_party/skia/tests/VptrTest.cpp
deleted file mode 100644
index 899a39ff872ef..0000000000000
--- a/third_party/skia/tests/VptrTest.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2017 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "src/core/SkVptr.h"
-#include "tests/Test.h"
-
-namespace {
-
-    struct Base {
-        virtual ~Base() = default;
-        virtual size_t val() const = 0;
-    };
-
-    struct SubclassA : public Base {
-        SubclassA(size_t val) : fVal(val) {}
-
-        size_t val() const override { return fVal; }
-
-        size_t fVal;
-    };
-
-    struct SubclassB : public Base {
-        SubclassB() {}
-
-        size_t val() const override { return 42; }
-    };
-
-}  // namespace
-
-DEF_TEST(Vptr, r) {
-    std::unique_ptr<Base> a = std::make_unique<SubclassA>(21),
-                          b = std::make_unique<SubclassB>(),
-                          c = std::make_unique<SubclassA>(22),
-                          d = std::make_unique<SubclassB>();
-
-    // These 4 objects all have unique identities.
-    REPORTER_ASSERT(r, a != b);
-    REPORTER_ASSERT(r, a != c);
-    REPORTER_ASSERT(r, a != d);
-    REPORTER_ASSERT(r, b != c);
-    REPORTER_ASSERT(r, b != d);
-    REPORTER_ASSERT(r, c != d);
-
-    // Only b and d have the same val().
-    REPORTER_ASSERT(r, a->val() != b->val());
-    REPORTER_ASSERT(r, a->val() != c->val());
-    REPORTER_ASSERT(r, a->val() != d->val());
-    REPORTER_ASSERT(r, b->val() != c->val());
-    REPORTER_ASSERT(r, b->val() == d->val());
-    REPORTER_ASSERT(r, c->val() != d->val());
-
-    // SkVptr() returns the same value for objects of the same concrete type.
-    REPORTER_ASSERT(r, SkVptr(*a) == SkVptr(*c));
-    REPORTER_ASSERT(r, SkVptr(*b) == SkVptr(*d));
-    REPORTER_ASSERT(r, SkVptr(*a) != SkVptr(*b));
-}
diff --git a/third_party/skia/tests/graphite/BUILD.bazel b/third_party/skia/tests/graphite/BUILD.bazel
new file mode 100644
index 0000000000000..86f7e12e9a477
--- /dev/null
+++ b/third_party/skia/tests/graphite/BUILD.bazel
@@ -0,0 +1,167 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "BackendTextureTest_src",
+    srcs = ["BackendTextureTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:BackendTexture_hdr",
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include:SkStuff_hdr",
+        "//experimental/graphite/src:Caps_hdr",
+        "//experimental/graphite/src:ContextPriv_hdr",
+        "//experimental/graphite/src:Gpu_hdr",
+        "//experimental/graphite/src:ResourceTypes_hdr",
+        "//include/core:SkSurface_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ComboTest_src",
+    srcs = ["ComboTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//include/core:SkCanvas_hdr",
+        "//include/core:SkSurface_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//src/core:SkPaintParamsKey_hdr",
+        "//src/core:SkPaintPriv_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "CommandBufferTest_src",
+    srcs = ["CommandBufferTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/include/mtl:MtlTypes_hdr",
+        "//experimental/graphite/src:Buffer_hdr",
+        "//experimental/graphite/src:Caps_hdr",
+        "//experimental/graphite/src:CommandBuffer_hdr",
+        "//experimental/graphite/src:ContextPriv_hdr",
+        "//experimental/graphite/src:DrawBufferManager_hdr",
+        "//experimental/graphite/src:DrawWriter_hdr",
+        "//experimental/graphite/src:GlobalCache_hdr",
+        "//experimental/graphite/src:Gpu_hdr",
+        "//experimental/graphite/src:GraphicsPipeline_hdr",
+        "//experimental/graphite/src:RecorderPriv_hdr",
+        "//experimental/graphite/src:Renderer_hdr",
+        "//experimental/graphite/src:ResourceProvider_hdr",
+        "//experimental/graphite/src:Sampler_hdr",
+        "//experimental/graphite/src:TextureProxy_hdr",
+        "//experimental/graphite/src:Texture_hdr",
+        "//experimental/graphite/src:UniformManager_hdr",
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//experimental/graphite/src/geom:Transform_graphite_hdr",
+        "//src/core:SkKeyHelpers_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "IntersectionTreeTest_src",
+    srcs = ["IntersectionTreeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src/geom:IntersectionTree_hdr",
+        "//include/utils:SkRandom_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "MaskTest_src",
+    srcs = ["MaskTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src:EnumBitMask_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RecorderTest_src",
+    srcs = ["RecorderTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/src:Device_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "RectTest_src",
+    srcs = ["RectTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src/geom:Rect_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "ShapeTest_src",
+    srcs = ["ShapeTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src/geom:Shape_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "TransformTest_src",
+    srcs = ["TransformTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/src/geom:Transform_graphite_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UniformCacheTest_src",
+    srcs = ["UniformCacheTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/src:RecorderPriv_hdr",
+        "//experimental/graphite/src:UniformCache_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//src/core:SkUniform_hdr",
+        "//tests:Test_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "UniformTest_src",
+    srcs = ["UniformTest.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "//experimental/graphite/include:Recorder_hdr",
+        "//experimental/graphite/src:ContextPriv_hdr",
+        "//experimental/graphite/src:ContextUtils_hdr",
+        "//experimental/graphite/src:GlobalCache_hdr",
+        "//experimental/graphite/src:PaintParams_hdr",
+        "//experimental/graphite/src:RecorderPriv_hdr",
+        "//experimental/graphite/src:ResourceProvider_hdr",
+        "//include/core:SkPaint_hdr",
+        "//include/effects:SkGradientShader_hdr",
+        "//include/private:SkUniquePaintParamsID_hdr",
+        "//src/core:SkKeyHelpers_hdr",
+        "//src/core:SkShaderCodeDictionary_hdr",
+        "//src/core:SkUniformData_hdr",
+        "//tests:Test_hdr",
+    ],
+)
diff --git a/third_party/skia/tests/graphite/BackendTextureTest.cpp b/third_party/skia/tests/graphite/BackendTextureTest.cpp
index 6aea980111b1c..ca1b2f60a2a6c 100644
--- a/third_party/skia/tests/graphite/BackendTextureTest.cpp
+++ b/third_party/skia/tests/graphite/BackendTextureTest.cpp
@@ -9,11 +9,15 @@
 
 #include "experimental/graphite/include/BackendTexture.h"
 #include "experimental/graphite/include/Context.h"
+#include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/include/SkStuff.h"
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/Gpu.h"
 #include "experimental/graphite/src/ResourceTypes.h"
 
+#include "include/core/SkSurface.h"
+
 using namespace skgpu;
 
 namespace {
@@ -61,3 +65,59 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(BackendTextureTest, reporter, context) {
     context->deleteBackendTexture(texture1);
     context->deleteBackendTexture(texture2);
 }
+
+// Tests the wrapping of a BackendTexture in an SkSurface
+DEF_GRAPHITE_TEST_FOR_CONTEXTS(SurfaceBackendTextureTest, reporter, context) {
+    // TODO: Right now this just tests very basic combinations of surfaces. This should be expanded
+    // to conver a much broader set of things once we add more support in Graphite for different
+    // formats, color types, etc.
+
+    auto caps = context->priv().gpu()->caps();
+    std::unique_ptr<Recorder> recorder = context->makeRecorder();
+
+    TextureInfo info = caps->getDefaultSampledTextureInfo(kRGBA_8888_SkColorType,
+                                                          /*levelCount=*/1,
+                                                          Protected::kNo,
+                                                          Renderable::kYes);
+
+    auto texture = context->createBackendTexture(kSize, info);
+    REPORTER_ASSERT(reporter, texture.isValid());
+
+    sk_sp<SkSurface> surface = MakeGraphiteFromBackendTexture(recorder.get(),
+                                                              texture,
+                                                              kRGBA_8888_SkColorType,
+                                                              /*colorSpace=*/nullptr,
+                                                              /*props=*/nullptr);
+    REPORTER_ASSERT(reporter, surface);
+
+    surface.reset();
+
+    // We should fail when trying to wrap the same texture in a surface with a non compatible
+    // color type.
+    surface = MakeGraphiteFromBackendTexture(recorder.get(),
+                                             texture,
+                                             kAlpha_8_SkColorType,
+                                             /*colorSpace=*/nullptr,
+                                             /*props=*/nullptr);
+    REPORTER_ASSERT(reporter, !surface);
+
+    context->deleteBackendTexture(texture);
+
+    // We should fail to make a wrap non renderable texture in a surface.
+    info = caps->getDefaultSampledTextureInfo(kRGBA_8888_SkColorType,
+                                              /*levelCount=*/1,
+                                              Protected::kNo,
+                                              Renderable::kNo);
+    texture = context->createBackendTexture(kSize, info);
+    REPORTER_ASSERT(reporter, texture.isValid());
+
+    surface = MakeGraphiteFromBackendTexture(recorder.get(),
+                                             texture,
+                                             kRGBA_8888_SkColorType,
+                                             /*colorSpace=*/nullptr,
+                                             /*props=*/nullptr);
+
+    REPORTER_ASSERT(reporter, !surface);
+    context->deleteBackendTexture(texture);
+}
+
diff --git a/third_party/skia/tests/graphite/ComboTest.cpp b/third_party/skia/tests/graphite/ComboTest.cpp
new file mode 100644
index 0000000000000..f2b6b93e35191
--- /dev/null
+++ b/third_party/skia/tests/graphite/ComboTest.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkGradientShader.h"
+#include "src/core/SkPaintParamsKey.h"
+#include "src/core/SkPaintPriv.h"
+#include "src/core/SkShaderCodeDictionary.h"
+#include "tests/Test.h"
+
+namespace {
+
+sk_sp<SkShader> make_image_shader(int imageWidth, int imageHeight,
+                                  SkTileMode xTileMode, SkTileMode yTileMode,
+                                  SkColor color) {
+    auto surface = SkSurface::MakeRasterN32Premul(imageWidth, imageHeight);
+    SkCanvas *canvas = surface->getCanvas();
+    canvas->clear(color);
+    return surface->makeImageSnapshot()->makeShader(xTileMode, yTileMode, SkSamplingOptions());
+}
+
+sk_sp<SkShader> make_linear_gradient_shader(SkTileMode tileMode) {
+    SkPoint pts[2];
+    SkColor colors[2] = {SK_ColorRED, SK_ColorBLUE};
+
+    pts[0].set(0, 0);
+    pts[1].set(SkIntToScalar(100), 0);
+    return SkGradientShader::MakeLinear(pts, colors, nullptr, 2, tileMode);
+}
+
+sk_sp<SkShader> make_blend_shader(sk_sp<SkShader> shaderA,
+                                  sk_sp<SkShader> shaderB,
+                                  SkBlendMode mode) {
+    return SkShaders::Blend(mode, std::move(shaderA), std::move(shaderB));
+}
+
+void dump_keys(SkShaderCodeDictionary *dict, const SkPaint &paint) {
+#ifdef SK_DEBUG
+    auto keys = SkPaintPriv::ToKeys(paint, dict, SkBackend::kGraphite);
+
+    for (const auto& k : keys) {
+        // TODO: we need a better way to assess that key creation succeeded
+        k->dump();
+    }
+#endif
+}
+
+} // anonymous namespace
+
+DEF_GRAPHITE_TEST(ComboTest, r) {
+    SkShaderCodeDictionary dict;
+
+    {
+        SkPaint paint;
+        paint.setBlendMode(SkBlendMode::kLighten);
+        dump_keys(&dict, paint);
+    }
+
+    {
+        SkPaint paint;
+        paint.setShader(make_image_shader(16, 16, SkTileMode::kClamp,
+                                          SkTileMode::kRepeat, SK_ColorRED));
+        dump_keys(&dict, paint);
+    }
+
+    {
+        SkPaint paint;
+        paint.setShader(make_linear_gradient_shader(SkTileMode::kClamp));
+        dump_keys(&dict, paint);
+    }
+
+    {
+        SkPaint paint;
+        auto shaderA = make_image_shader(16, 16, SkTileMode::kDecal,
+                                         SkTileMode::kRepeat, SK_ColorBLUE);
+        auto shaderB = make_linear_gradient_shader(SkTileMode::kClamp);
+        paint.setShader(make_blend_shader(std::move(shaderA), std::move(shaderB),
+                                          SkBlendMode::kDstIn));
+        dump_keys(&dict, paint);
+    }
+}
diff --git a/third_party/skia/tests/graphite/CommandBufferTest.cpp b/third_party/skia/tests/graphite/CommandBufferTest.cpp
index da0f91b99363b..969907dbe439e 100644
--- a/third_party/skia/tests/graphite/CommandBufferTest.cpp
+++ b/third_party/skia/tests/graphite/CommandBufferTest.cpp
@@ -8,24 +8,29 @@
 #include "tests/Test.h"
 
 #include "experimental/graphite/include/Context.h"
-#include "experimental/graphite/src/ContextPriv.h"
-
+#include "experimental/graphite/include/Recorder.h"
 #include "experimental/graphite/include/mtl/MtlTypes.h"
 #include "experimental/graphite/src/Buffer.h"
 #include "experimental/graphite/src/Caps.h"
 #include "experimental/graphite/src/CommandBuffer.h"
-#include "experimental/graphite/src/ContextUtils.h"
+#include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/DrawBufferManager.h"
 #include "experimental/graphite/src/DrawWriter.h"
+#include "experimental/graphite/src/GlobalCache.h"
 #include "experimental/graphite/src/Gpu.h"
 #include "experimental/graphite/src/GraphicsPipeline.h"
+#include "experimental/graphite/src/RecorderPriv.h"
 #include "experimental/graphite/src/Renderer.h"
 #include "experimental/graphite/src/ResourceProvider.h"
+#include "experimental/graphite/src/Sampler.h"
 #include "experimental/graphite/src/Texture.h"
 #include "experimental/graphite/src/TextureProxy.h"
 #include "experimental/graphite/src/UniformManager.h"
 #include "experimental/graphite/src/geom/Shape.h"
 #include "experimental/graphite/src/geom/Transform_graphite.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkShaderCodeDictionary.h"
+#include "src/core/SkUniformData.h"
 
 #if GRAPHITE_TEST_UTILS
 // set to 1 if you want to do GPU capture of the commandBuffer
@@ -37,11 +42,13 @@ using namespace skgpu;
 namespace {
 
 const DepthStencilSettings kTestDepthStencilSettings = {
+    // stencil
     {},
     {},
     0,
-    CompareOp::kAlways,
     true,
+    // depth
+    CompareOp::kAlways,
     true,
     false,
 };
@@ -62,19 +69,22 @@ class UniformRectDraw final : public RenderStep {
                "float4 devPosition = float4(tmpPosition * scale + translate, 0.0, 1.0);\n";
     }
 
-    void writeVertices(DrawWriter* writer, const Transform&, const Shape&) const override {
+    void writeVertices(DrawWriter* writer,
+                       const SkIRect&,
+                       const Transform&,
+                       const Shape&) const override {
         // The shape is upload via uniforms, so this just needs to record 4 data-less vertices
-        writer->draw({}, {}, 4);
+        writer->draw({}, 4);
     }
 
-    sk_sp<UniformData> writeUniforms(Layout layout,
-                                     const Transform&,
-                                     const Shape& shape) const override {
+    sk_sp<SkUniformData> writeUniforms(Layout layout,
+                                       const SkIRect&,
+                                       const Transform&,
+                                       const Shape& shape) const override {
         SkASSERT(shape.isRect());
         // TODO: A << API for uniforms would be nice, particularly if it could take pre-computed
         // offsets for each uniform.
-        auto uniforms = UniformData::Make(this->numUniforms(), this->uniforms().data(),
-                                          sizeof(float) * 4);
+        auto uniforms = SkUniformData::Make(this->uniforms(), sizeof(float) * 4);
         float2 scale = shape.rect().size();
         float2 translate = shape.rect().topLeft();
         memcpy(uniforms->data(), &scale, sizeof(float2));
@@ -84,10 +94,16 @@ class UniformRectDraw final : public RenderStep {
 
 private:
     UniformRectDraw() : RenderStep(Flags::kPerformsShading,
-                                   /*uniforms=*/{{"scale",     SLType::kFloat2},
-                                                 {"translate", SLType::kFloat2}},
+                                   /*uniforms=*/{{"scale",     SkSLType::kFloat2},
+                                                 {"translate", SkSLType::kFloat2}},
                                    PrimitiveType::kTriangleStrip,
-                                   kTestDepthStencilSettings,
+                                   {{},
+                                    {},
+                                    0,
+                                    true,
+                                    CompareOp::kAlways,
+                                    false,
+                                    false},
                                    /*vertexAttrs=*/{},
                                    /*instanceAttrs=*/{}) {}
 };
@@ -107,7 +123,10 @@ class TriangleRectDraw final : public RenderStep {
         return "float4 devPosition = float4(position * scale + translate, 0.0, 1.0);\n";
     }
 
-    void writeVertices(DrawWriter* writer, const Transform&, const Shape& shape) const override {
+    void writeVertices(DrawWriter* writer,
+                       const SkIRect&,
+                       const Transform&,
+                       const Shape& shape) const override {
         DrawBufferManager* bufferMgr = writer->bufferManager();
         auto [vertexWriter, vertices] = bufferMgr->getVertexWriter(4 * this->vertexStride());
         vertexWriter << 0.5f * (shape.rect().left() + 1.f)  << 0.5f * (shape.rect().top() + 1.f)
@@ -120,12 +139,14 @@ class TriangleRectDraw final : public RenderStep {
         indexWriter << 0 << 1 << 2
                     << 2 << 1 << 3;
 
-        writer->draw(vertices, indices, 6);
+        writer->drawIndexed(vertices, indices, 6);
     }
 
-    sk_sp<UniformData> writeUniforms(Layout layout, const Transform&, const Shape&) const override {
-        auto uniforms = UniformData::Make(this->numUniforms(), this->uniforms().data(),
-                                          sizeof(float) * 4);
+    sk_sp<SkUniformData> writeUniforms(Layout layout,
+                                       const SkIRect&,
+                                       const Transform&,
+                                       const Shape&) const override {
+        auto uniforms = SkUniformData::Make(this->uniforms(), sizeof(float) * 4);
         float data[4] = {2.f, 2.f, -1.f, -1.f};
         memcpy(uniforms->data(), data, 4 * sizeof(float));
         return uniforms;
@@ -134,11 +155,13 @@ class TriangleRectDraw final : public RenderStep {
 private:
     TriangleRectDraw()
             : RenderStep(Flags::kPerformsShading,
-                         /*uniforms=*/{{"scale",     SLType::kFloat2},
-                                       {"translate", SLType::kFloat2}},
+                         /*uniforms=*/{{"scale",     SkSLType::kFloat2},
+                                       {"translate", SkSLType::kFloat2}},
                          PrimitiveType::kTriangles,
                          kTestDepthStencilSettings,
-                         /*vertexAttrs=*/{{"position", VertexAttribType::kFloat2, SLType::kFloat2}},
+                         /*vertexAttrs=*/{{"position",
+                                           VertexAttribType::kFloat2,
+                                           SkSLType::kFloat2}},
                          /*instanceAttrs=*/{}) {}
 };
 
@@ -158,7 +181,10 @@ class InstanceRectDraw final : public RenderStep {
                "float4 devPosition = float4(tmpPosition * dims + position, 0.0, 1.0);\n";
     }
 
-    void writeVertices(DrawWriter* writer, const Transform&, const Shape& shape) const override {
+    void writeVertices(DrawWriter* writer,
+                       const SkIRect&,
+                       const Transform&,
+                       const Shape& shape) const override {
         SkASSERT(shape.isRect());
 
         DrawBufferManager* bufferMgr = writer->bufferManager();
@@ -169,12 +195,14 @@ class InstanceRectDraw final : public RenderStep {
         indexWriter << 0 << 1 << 2
                     << 2 << 1 << 3;
 
-        writer->setInstanceTemplate({}, indices, 6);
-        auto instanceWriter = writer->appendInstances(1);
-        instanceWriter << shape.rect().topLeft() << shape.rect().size();
+        DrawWriter::Instances instances{*writer, {}, indices, 6};
+        instances.append(1) << shape.rect().topLeft() << shape.rect().size();
     }
 
-    sk_sp<UniformData> writeUniforms(Layout, const Transform&, const Shape&) const override {
+    sk_sp<SkUniformData> writeUniforms(Layout,
+                                       const SkIRect&,
+                                       const Transform&,
+                                       const Shape&) const override {
         return nullptr;
     }
 
@@ -186,8 +214,8 @@ class InstanceRectDraw final : public RenderStep {
                          kTestDepthStencilSettings,
                          /*vertexAttrs=*/{},
                          /*instanceAttrs=*/ {
-                                { "position", VertexAttribType::kFloat2, SLType::kFloat2 },
-                                { "dims",     VertexAttribType::kFloat2, SLType::kFloat2 }
+                                { "position", VertexAttribType::kFloat2, SkSLType::kFloat2 },
+                                { "dims",     VertexAttribType::kFloat2, SkSLType::kFloat2 }
                          }) {}
 };
 
@@ -206,7 +234,10 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
 #if GRAPHITE_TEST_UTILS && CAPTURE_COMMANDBUFFER
     gpu->testingOnly_startCapture();
 #endif
-    auto commandBuffer = gpu->resourceProvider()->createCommandBuffer();
+    auto recorder = context->makeRecorder();
+    auto resourceProvider = recorder->priv().resourceProvider();
+    auto dict = resourceProvider->shaderCodeDictionary();
+    auto commandBuffer = resourceProvider->createCommandBuffer();
 
     SkISize textureSize = { kTextureWidth, kTextureHeight };
 #ifdef SK_METAL
@@ -223,6 +254,14 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
     TextureInfo textureInfo;
 #endif
 
+    std::unique_ptr<SkPaintParamsKey> key = CreateKey(dict,
+                                                      SkBackend::kGraphite,
+                                                      ShaderCombo::ShaderType::kSolidColor,
+                                                      SkTileMode::kClamp,
+                                                      SkBlendMode::kSrc);
+
+    auto entry = dict->findOrCreate(std::move(key));
+
     auto target = sk_sp<TextureProxy>(new TextureProxy(textureSize, textureInfo));
     REPORTER_ASSERT(reporter, target);
 
@@ -232,8 +271,8 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
     renderPassDesc.fColorAttachment.fStoreOp = StoreOp::kStore;
     renderPassDesc.fClearColor = { 1, 0, 0, 1 }; // red
 
-    target->instantiate(gpu->resourceProvider());
-    DrawBufferManager bufferMgr(gpu->resourceProvider(), 4);
+    target->instantiate(resourceProvider);
+    DrawBufferManager bufferMgr(resourceProvider, 4);
 
     TextureInfo depthStencilInfo =
             gpu->caps()->getDefaultDepthStencilTextureInfo(DepthStencilFlags::kDepthStencil,
@@ -243,7 +282,12 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
     renderPassDesc.fDepthStencilAttachment.fLoadOp = LoadOp::kDiscard;
     renderPassDesc.fDepthStencilAttachment.fStoreOp = StoreOp::kDiscard;
     sk_sp<Texture> depthStencilTexture =
-            gpu->resourceProvider()->findOrCreateTexture(textureSize, depthStencilInfo);
+            resourceProvider->findOrCreateTexture(textureSize, depthStencilInfo);
+
+    // Create Sampler -- for now, just to test creation
+    sk_sp<Sampler> sampler = resourceProvider->findOrCreateCompatibleSampler(
+            SkSamplingOptions(SkFilterMode::kLinear), SkTileMode::kClamp, SkTileMode::kDecal);
+    REPORTER_ASSERT(reporter, sampler);
 
     commandBuffer->beginRenderPass(renderPassDesc, target->refTexture(), nullptr,
                                    depthStencilTexture);
@@ -258,23 +302,26 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
     };
 
     auto draw = [&](const RenderStep* step, std::vector<RectAndColor> draws) {
-        Combination shader{ShaderCombo::ShaderType::kSolidColor};
         GraphicsPipelineDesc pipelineDesc;
-        pipelineDesc.setProgram(step, shader);
+        pipelineDesc.setProgram(step, entry->uniqueID());
         drawWriter.newPipelineState(step->primitiveType(),
                                     step->vertexStride(),
                                     step->instanceStride());
-        auto pipeline = gpu->resourceProvider()->findOrCreateGraphicsPipeline(pipelineDesc);
+        auto pipeline = resourceProvider->findOrCreateGraphicsPipeline(pipelineDesc,
+                                                                       renderPassDesc);
         commandBuffer->bindGraphicsPipeline(std::move(pipeline));
 
         // All of the test RenderSteps ignore the transform, so just use the identity
         static const Transform kIdentity{SkM44()};
+        // No set scissor, so use entire render target dimensions
+        static const SkIRect kBounds = SkIRect::MakeWH(kTextureWidth, kTextureHeight);
 
         for (auto d : draws) {
             drawWriter.newDynamicState();
             Shape shape(d.fRect);
 
-            auto renderStepUniforms = step->writeUniforms(Layout::kMetal, kIdentity, shape);
+            auto renderStepUniforms =
+                    step->writeUniforms(Layout::kMetal, kBounds, kIdentity, shape);
             if (renderStepUniforms) {
                 auto [writer, bindInfo] =
                         bufferMgr.getUniformWriter(renderStepUniforms->dataSize());
@@ -291,7 +338,7 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
                                              sk_ref_sp(bindInfo.fBuffer),
                                              bindInfo.fOffset);
 
-            step->writeVertices(&drawWriter, kIdentity, shape);
+            step->writeVertices(&drawWriter, kBounds, kIdentity, shape);
         }
     };
 
@@ -324,7 +371,7 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(CommandBufferTest, reporter, context) {
     //       add bpp to Caps
     size_t rowBytes = 4*kTextureWidth;
     size_t bufferSize = rowBytes*kTextureHeight;
-    sk_sp<Buffer> copyBuffer = gpu->resourceProvider()->findOrCreateBuffer(
+    sk_sp<Buffer> copyBuffer = resourceProvider->findOrCreateBuffer(
             bufferSize, BufferType::kXferGpuToCpu, PrioritizeGpuReads::kNo);
     REPORTER_ASSERT(reporter, copyBuffer);
     SkIRect srcRect = { 0, 0, kTextureWidth, kTextureHeight };
diff --git a/third_party/skia/tests/graphite/KeyTest.cpp b/third_party/skia/tests/graphite/KeyTest.cpp
new file mode 100644
index 0000000000000..e163166a121ec
--- /dev/null
+++ b/third_party/skia/tests/graphite/KeyTest.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "tests/Test.h"
+
+#include "src/core/SkPaintParamsKey.h"
+#include "src/core/SkShaderCodeDictionary.h"
+
+#include "experimental/graphite/src/ContextPriv.h"
+
+namespace {
+
+std::unique_ptr<SkPaintParamsKey> create_key(SkShaderCodeDictionary* dict,
+                                             int dummySnippetID,
+                                             int size) {
+
+    SkPaintParamsKeyBuilder builder(dict);
+
+    builder.beginBlock(dummySnippetID);
+
+    for (int i = 0; i < size; ++i) {
+        builder.addByte(i % 256);
+    }
+
+    builder.endBlock();
+
+    return builder.snap();
+}
+
+} // anonymous namespace
+
+DEF_GRAPHITE_TEST_FOR_CONTEXTS(KeyTest, reporter, context) {
+
+    auto dict = context->priv().shaderCodeDictionary();
+
+    static const int kMaxBlockDataSize = SkPaintParamsKey::kMaxBlockSize -
+                                         SkPaintParamsKey::kBlockHeaderSizeInBytes;
+
+    std::unique_ptr<SkPaintParamsKey> key;
+
+    // invalid code snippet ID
+    key = create_key(dict, kBuiltInCodeSnippetIDCount, kMaxBlockDataSize);
+    REPORTER_ASSERT(reporter, key->sizeInBytes() == SkPaintParamsKey::kBlockHeaderSizeInBytes);
+
+    int dummySnippetID = dict->addUserDefinedSnippet();
+
+    // _Just_ on the edge of being too big
+    key = create_key(dict, dummySnippetID, kMaxBlockDataSize);
+    REPORTER_ASSERT(reporter, key->sizeInBytes() == SkPaintParamsKey::kMaxBlockSize);
+
+    // Too big
+    key = create_key(dict, dummySnippetID, 1024);
+    REPORTER_ASSERT(reporter, key->sizeInBytes() == SkPaintParamsKey::kBlockHeaderSizeInBytes);
+}
diff --git a/third_party/skia/tests/graphite/RecorderTest.cpp b/third_party/skia/tests/graphite/RecorderTest.cpp
new file mode 100644
index 0000000000000..5f66a750c4c5f
--- /dev/null
+++ b/third_party/skia/tests/graphite/RecorderTest.cpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2022 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "tests/Test.h"
+
+#include "experimental/graphite/include/Context.h"
+#include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/src/Device.h"
+
+using namespace skgpu;
+
+// Tests to make sure the managing of back pointers between Recorder and Device all work properly.
+DEF_GRAPHITE_TEST_FOR_CONTEXTS(RecorderDevicePtrTest, reporter, context) {
+    std::unique_ptr<Recorder> recorder = context->makeRecorder();
+
+    SkImageInfo info = SkImageInfo::Make({16, 16}, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
+
+    sk_sp<Device> device1 = Device::Make(recorder.get(), info);
+
+    REPORTER_ASSERT(reporter, device1->recorder() == recorder.get());
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device1.get()));
+
+    Device* devPtr = device1.get();
+    device1.reset();
+    REPORTER_ASSERT(reporter, !recorder->deviceIsRegistered(devPtr));
+
+    // Test adding multiple devices
+    device1 = Device::Make(recorder.get(), info);
+    sk_sp<Device> device2 = Device::Make(recorder.get(), info);
+    sk_sp<Device> device3 = Device::Make(recorder.get(), info);
+    REPORTER_ASSERT(reporter, device1->recorder() == recorder.get());
+    REPORTER_ASSERT(reporter, device2->recorder() == recorder.get());
+    REPORTER_ASSERT(reporter, device3->recorder() == recorder.get());
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device1.get()));
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device2.get()));
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device3.get()));
+
+    // Test freeing a device in the middle.
+    devPtr = device2.get();
+    device2.reset();
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device1.get()));
+    REPORTER_ASSERT(reporter, !recorder->deviceIsRegistered(devPtr));
+    REPORTER_ASSERT(reporter, recorder->deviceIsRegistered(device3.get()));
+
+    // Delete the recorder and make sure remaining devices not longer have a valid recorder.
+    recorder.reset();
+    REPORTER_ASSERT(reporter, device1->recorder() == nullptr);
+    REPORTER_ASSERT(reporter, device3->recorder() == nullptr);
+
+    // Make sure freeing Devices after recorder doesn't cause any crash. This would get checked
+    // naturually when these devices go out of scope, but manually reseting will give us a better
+    // stack trace if something does go wrong.
+    device1.reset();
+    device3.reset();
+}
diff --git a/third_party/skia/tests/graphite/UniformCacheTest.cpp b/third_party/skia/tests/graphite/UniformCacheTest.cpp
index f101b59d1b8a1..3cac52a872318 100644
--- a/third_party/skia/tests/graphite/UniformCacheTest.cpp
+++ b/third_party/skia/tests/graphite/UniformCacheTest.cpp
@@ -9,25 +9,27 @@
 
 #include "experimental/graphite/include/Context.h"
 #include "experimental/graphite/include/Recorder.h"
-#include "experimental/graphite/src/ContextUtils.h"
-#include "experimental/graphite/src/Uniform.h"
+#include "experimental/graphite/src/RecorderPriv.h"
 #include "experimental/graphite/src/UniformCache.h"
+#include "src/core/SkUniform.h"
+#include "src/core/SkUniformData.h"
 
 using namespace skgpu;
 
 namespace {
 
-sk_sp<UniformData> make_ud(int numUniforms, int dataSize) {
+std::unique_ptr<SkUniformBlock> make_ub(int numUniforms, int dataSize) {
     static constexpr int kMaxUniforms = 3;
-    static constexpr Uniform kUniforms[kMaxUniforms] {
-        {"point0",   SLType::kFloat2 },
-        {"point1",   SLType::kFloat2 },
-        {"point2",   SLType::kFloat2 },
+    static constexpr SkUniform kUniforms[kMaxUniforms] {
+        {"point0",   SkSLType::kFloat2 },
+        {"point1",   SkSLType::kFloat2 },
+        {"point2",   SkSLType::kFloat2 },
     };
 
     SkASSERT(numUniforms <= kMaxUniforms);
 
-    sk_sp<UniformData> ud = UniformData::Make(numUniforms, kUniforms, dataSize);
+    sk_sp<SkUniformData> ud = SkUniformData::Make(SkSpan<const SkUniform>(kUniforms, numUniforms),
+                                                  dataSize);
     for (int i = 0; i < numUniforms; ++i) {
         ud->offsets()[i] = i;
     }
@@ -35,15 +37,15 @@ sk_sp<UniformData> make_ud(int numUniforms, int dataSize) {
         ud->data()[i] = i % 255;
     }
 
-    return ud;
+    return std::make_unique<SkUniformBlock>(std::move(ud));
 }
 
 } // anonymous namespace
 
 DEF_GRAPHITE_TEST_FOR_CONTEXTS(UniformCacheTest, reporter, context) {
-    sk_sp<Recorder> recorder = context->createRecorder();
+    std::unique_ptr<Recorder> recorder = context->makeRecorder();
 
-    auto cache = recorder->uniformCache();
+    auto cache = recorder->priv().uniformCache();
 
     REPORTER_ASSERT(reporter, cache->count() == 0);
 
@@ -54,41 +56,44 @@ DEF_GRAPHITE_TEST_FOR_CONTEXTS(UniformCacheTest, reporter, context) {
         REPORTER_ASSERT(reporter, cache->count() == 0);
     }
 
-    // Add a new unique UD
-    sk_sp<UniformData> ud1;
+    // Add a new unique UB
+    SkUniformBlock* danglingUB1 = nullptr;
     uint32_t result1;
     {
-        ud1 = make_ud(2, 16);
-        result1 = cache->insert(ud1);
+        std::unique_ptr<SkUniformBlock> ub1 = make_ub(2, 16);
+        danglingUB1 = ub1.get();
+        result1 = cache->insert(std::move(ub1));
         REPORTER_ASSERT(reporter, result1 != UniformCache::kInvalidUniformID);
-        sk_sp<UniformData> lookup = cache->lookup(result1);
-        REPORTER_ASSERT(reporter, lookup.get() == ud1.get());
+        SkUniformBlock* lookup = cache->lookup(result1);
+        REPORTER_ASSERT(reporter, lookup == danglingUB1);
 
         REPORTER_ASSERT(reporter, cache->count() == 1);
     }
 
-    // Try to add a duplicate UD
+    // Try to add a duplicate UB
     {
-        sk_sp<UniformData> ud2 = make_ud(2, 16);
-        uint32_t result2 = cache->insert(ud2);
+        std::unique_ptr<SkUniformBlock> ub2 = make_ub(2, 16);
+        SkUniformBlock* danglingUB2 = ub2.get();
+        uint32_t result2 = cache->insert(std::move(ub2));
         REPORTER_ASSERT(reporter, result2 != UniformCache::kInvalidUniformID);
         REPORTER_ASSERT(reporter, result2 == result1);
-        sk_sp<UniformData> lookup = cache->lookup(result2);
-        REPORTER_ASSERT(reporter, lookup.get() != ud2.get());
-        REPORTER_ASSERT(reporter, lookup.get() == ud1.get());
+        SkUniformBlock* lookup = cache->lookup(result2);
+        REPORTER_ASSERT(reporter, lookup != danglingUB2);
+        REPORTER_ASSERT(reporter, lookup == danglingUB1);
 
         REPORTER_ASSERT(reporter, cache->count() == 1);
     }
 
-    // Add a second new unique UD
+    // Add a second new unique UB
     {
-        sk_sp<UniformData> ud3 = make_ud(3, 16);
-        uint32_t result3 = cache->insert(ud3);
+        std::unique_ptr<SkUniformBlock> ub3 = make_ub(3, 16);
+        SkUniformBlock* danglingUB3 = ub3.get();
+        uint32_t result3 = cache->insert(std::move(ub3));
         REPORTER_ASSERT(reporter, result3 != UniformCache::kInvalidUniformID);
         REPORTER_ASSERT(reporter, result3 != result1);
-        sk_sp<UniformData> lookup = cache->lookup(result3);
-        REPORTER_ASSERT(reporter, lookup.get() == ud3.get());
-        REPORTER_ASSERT(reporter, lookup.get() != ud1.get());
+        SkUniformBlock* lookup = cache->lookup(result3);
+        REPORTER_ASSERT(reporter, lookup == danglingUB3);
+        REPORTER_ASSERT(reporter, lookup != danglingUB1);
 
         REPORTER_ASSERT(reporter, cache->count() == 2);
     }
diff --git a/third_party/skia/tests/graphite/UniformTest.cpp b/third_party/skia/tests/graphite/UniformTest.cpp
index d566a20815a65..36e55a1e122b9 100644
--- a/third_party/skia/tests/graphite/UniformTest.cpp
+++ b/third_party/skia/tests/graphite/UniformTest.cpp
@@ -7,14 +7,25 @@
 
 #include "tests/Test.h"
 
+#include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/src/ContextPriv.h"
 #include "experimental/graphite/src/ContextUtils.h"
-#include "experimental/graphite/src/DrawList.h" // TODO: split PaintParams out into their own header
+#include "experimental/graphite/src/GlobalCache.h"
+#include "experimental/graphite/src/PaintParams.h"
+#include "experimental/graphite/src/RecorderPriv.h"
+#include "experimental/graphite/src/ResourceProvider.h"
 #include "include/core/SkPaint.h"
 #include "include/effects/SkGradientShader.h"
+#include "include/private/SkUniquePaintParamsID.h"
+#include "src/core/SkKeyHelpers.h"
+#include "src/core/SkShaderCodeDictionary.h"
+#include "src/core/SkUniformData.h"
 
 namespace {
 
-std::tuple<SkPaint, int> create_paint(skgpu::Combination combo) {
+std::tuple<SkPaint, int> create_paint(skgpu::ShaderCombo::ShaderType shaderType,
+                                      SkTileMode tm,
+                                      SkBlendMode bm) {
     SkPoint pts[2] = {{-100, -100},
                       {100,  100}};
     SkColor colors[2] = {SK_ColorRED, SK_ColorGREEN};
@@ -22,7 +33,7 @@ std::tuple<SkPaint, int> create_paint(skgpu::Combination combo) {
 
     sk_sp<SkShader> s;
     int numUniforms = 0;
-    switch (combo.fShaderType) {
+    switch (shaderType) {
         case skgpu::ShaderCombo::ShaderType::kNone:
             SkDEBUGFAIL("kNone cannot be represented as an SkPaint");
             break;
@@ -30,37 +41,40 @@ std::tuple<SkPaint, int> create_paint(skgpu::Combination combo) {
             numUniforms += 1;
             break;
         case skgpu::ShaderCombo::ShaderType::kLinearGradient:
-            s = SkGradientShader::MakeLinear(pts, colors, offsets, 2, combo.fTileMode);
-            numUniforms += 6;
+            s = SkGradientShader::MakeLinear(pts, colors, offsets, 2, tm);
+            numUniforms += 7;
             break;
         case skgpu::ShaderCombo::ShaderType::kRadialGradient:
-            s = SkGradientShader::MakeRadial({0, 0}, 100, colors, offsets, 2, combo.fTileMode);
-            numUniforms += 6;
+            s = SkGradientShader::MakeRadial({0, 0}, 100, colors, offsets, 2, tm);
+            numUniforms += 7;
             break;
         case skgpu::ShaderCombo::ShaderType::kSweepGradient:
-            s = SkGradientShader::MakeSweep(0, 0, colors, offsets, 2, combo.fTileMode,
+            s = SkGradientShader::MakeSweep(0, 0, colors, offsets, 2, tm,
                                             0, 359, 0, nullptr);
-            numUniforms += 6;
+            numUniforms += 7;
             break;
         case skgpu::ShaderCombo::ShaderType::kConicalGradient:
             s = SkGradientShader::MakeTwoPointConical({100, 100}, 100,
                                                       {-100, -100}, 100,
-                                                      colors, offsets, 2, combo.fTileMode);
-            numUniforms += 6;
+                                                      colors, offsets, 2, tm);
+            numUniforms += 7;
             break;
     }
     SkPaint p;
     p.setColor(SK_ColorRED);
     p.setShader(std::move(s));
-    p.setBlendMode(combo.fBlendMode);
+    p.setBlendMode(bm);
     return { p, numUniforms };
 }
 
 } // anonymous namespace
 
-DEF_GRAPHITE_TEST(UniformTest, reporter) {
+DEF_GRAPHITE_TEST_FOR_CONTEXTS(UniformTest, reporter, context) {
     using namespace skgpu;
 
+    auto recorder = context->makeRecorder();
+    auto dict = recorder->priv().resourceProvider()->shaderCodeDictionary();
+
     // Intentionally does not include ShaderType::kNone, which represents no fragment shading stage
     // and is thus not relevant to uniform extraction/caching.
     for (auto s : { ShaderCombo::ShaderType::kSolidColor,
@@ -77,18 +91,23 @@ DEF_GRAPHITE_TEST(UniformTest, reporter) {
             }
 
             for (auto bm : { SkBlendMode::kSrc, SkBlendMode::kSrcOver }) {
-                Combination expected;
+                std::unique_ptr<SkPaintParamsKey> expected = CreateKey(dict, SkBackend::kGraphite,
+                                                                       s, tm, bm);
+
+                auto [ p, expectedNumUniforms ] = create_paint(s, tm, bm);
+                auto [ actualID, uniformBlock] = ExtractPaintData(dict, PaintParams(p));
+                int actualNumUniforms = uniformBlock->count();
+
+                auto entry = dict->lookup(actualID);
 
-                expected.fShaderType = s;
-                expected.fTileMode = tm;
-                expected.fBlendMode = bm;
 
-                auto [ p, expectedNumUniforms ] = create_paint(expected);
-                auto [ actual, ud] = ExtractCombo(PaintParams(p));
-                REPORTER_ASSERT(reporter, expected == actual);
-                REPORTER_ASSERT(reporter, expectedNumUniforms == ud->count());
-                for (int i = 0; i < ud->count(); ++i) {
-                    REPORTER_ASSERT(reporter, ud->offset(i) >= 0 && ud->offset(i) < ud->dataSize());
+                REPORTER_ASSERT(reporter, *expected == *entry->paintParamsKey());
+                REPORTER_ASSERT(reporter, expectedNumUniforms == actualNumUniforms);
+                for (auto& u : *uniformBlock) {
+                    for (int i = 0; i < u->count(); ++i) {
+                        REPORTER_ASSERT(reporter,
+                                        u->offset(i) >= 0 && u->offset(i) < u->dataSize());
+                    }
                 }
             }
         }
diff --git a/third_party/skia/tests/skia_test.cpp b/third_party/skia/tests/skia_test.cpp
deleted file mode 100644
index f6aa20b7557c1..0000000000000
--- a/third_party/skia/tests/skia_test.cpp
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include <atomic>
-#include "include/core/SkGraphics.h"
-#include "include/core/SkTime.h"
-#include "include/private/SkTArray.h"
-#include "include/private/SkTemplates.h"
-#include "src/core/SkOSFile.h"
-#include "src/core/SkTaskGroup.h"
-#include "src/pathops/SkPathOpsDebug.h"
-#include "tests/PathOpsDebug.h"
-#include "tests/Test.h"
-#include "tools/CrashHandler.h"
-#include "tools/OverwriteLine.h"
-#include "tools/Resources.h"
-#include "tools/flags/CommandLineFlags.h"
-#include "tools/gpu/GrContextFactory.h"
-
-using namespace skiatest;
-using namespace sk_gpu_test;
-
-static DEFINE_bool2(dumpOp, d, false, "dump the pathOps to a file to recover mid-crash.");
-static DEFINE_bool2(extendedTest, x, false, "run extended tests for pathOps.");
-static DEFINE_bool2(runFail, f, false, "check for success on tests known to fail.");
-static DEFINE_bool2(verifyOp, y, false, "compare the pathOps result against a region.");
-static DEFINE_string2(json, J, "", "write json version of tests.");
-static DEFINE_bool2(verbose, v, false, "enable verbose output from the test driver.");
-static DEFINE_bool2(veryVerbose, V, false, "tell individual tests to be verbose.");
-static DEFINE_bool(cpu, true, "Run CPU-bound work?");
-static DEFINE_bool(gpu, true, "Run GPU-bound work?");
-static DEFINE_bool(graphite, true, "Run Graphite work?");
-
-static DEFINE_string2(match, m, nullptr,
-               "[~][^]substring[$] [...] of name to run.\n"
-               "Multiple matches may be separated by spaces.\n"
-               "~ causes a matching name to always be skipped\n"
-               "^ requires the start of the name to match\n"
-               "$ requires the end of the name to match\n"
-               "^ and $ requires an exact match\n"
-               "If a name does not match any list entry,\n"
-               "it is skipped unless some list entry starts with ~");
-
-static DEFINE_int_2(threads, j, -1,
-               "Run threadsafe tests on a threadpool with this many extra threads, "
-               "defaulting to one extra thread per core.");
-
-#if DEBUG_COIN
-static DEFINE_bool2(coinTest, c, false, "detect unused coincidence algorithms.");
-#endif
-
-// need to explicitly declare this, or we get some weird infinite loop llist
-template TestRegistry* TestRegistry::gHead;
-void (*gVerboseFinalize)() = nullptr;
-
-// The threads report back to this object when they are done.
-class Status {
-public:
-    explicit Status(int total)
-        : fDone(0), fTestCount(0), fFailCount(0), fTotal(total) {}
-    // Threadsafe.
-    void endTest(const char* testName,
-                 bool success,
-                 SkMSec elapsed,
-                 int testCount) {
-        const int done = ++fDone;
-        fTestCount += testCount;
-        if (!success) {
-            SkDebugf("\n---- %s FAILED", testName);
-        }
-
-        SkString prefix(kSkOverwriteLine);
-        SkString time;
-        if (FLAGS_verbose) {
-            prefix.printf("\n");
-            time.printf("%5dms ", elapsed);
-        }
-        SkDebugf("%s[%3d/%3d] %s%s", prefix.c_str(), done, fTotal, time.c_str(),
-                 testName);
-    }
-
-    void reportFailure() { fFailCount++; }
-
-    int32_t testCount() { return fTestCount; }
-    int32_t failCount() { return fFailCount; }
-
-private:
-    std::atomic<int32_t> fDone;
-    std::atomic<int32_t> fTestCount;
-    std::atomic<int32_t> fFailCount;
-    const int fTotal;
-};
-
-class SkTestRunnable {
-public:
-    SkTestRunnable(const Test& test, Status* status) : fTest(test), fStatus(status) {}
-
-    void operator()() {
-        struct TestReporter : public skiatest::Reporter {
-        public:
-            TestReporter() : fStats(nullptr), fError(false), fTestCount(0) {}
-            void bumpTestCount() override { ++fTestCount; }
-            bool allowExtendedTest() const override { return FLAGS_extendedTest; }
-            bool verbose() const override { return FLAGS_veryVerbose; }
-            void reportFailed(const skiatest::Failure& failure) override {
-                SkDebugf("\nFAILED: %s", failure.toString().c_str());
-                fError = true;
-            }
-            void* stats() const override { return fStats; }
-            void* fStats;
-            bool fError;
-            int fTestCount;
-        } reporter;
-
-        const Timer timer;
-        fTest.fProc(&reporter, GrContextOptions());
-        SkMSec elapsed = timer.elapsedMsInt();
-        if (reporter.fError) {
-            fStatus->reportFailure();
-        }
-        fStatus->endTest(fTest.fName, !reporter.fError, elapsed, reporter.fTestCount);
-  }
-
-private:
-    Test fTest;
-    Status* fStatus;
-};
-
-static bool should_run(const char* testName, bool isGPUTest, bool isGraphiteTest) {
-    if (CommandLineFlags::ShouldSkip(FLAGS_match, testName)) {
-        return false;
-    }
-    if (!FLAGS_cpu && !isGPUTest && !isGraphiteTest) {
-        return false;
-    }
-    if (!FLAGS_gpu && isGPUTest) {
-        return false;
-    }
-    if (!FLAGS_graphite && isGraphiteTest) {
-        return false;
-    }
-    return true;
-}
-
-int main(int argc, char** argv) {
-    CommandLineFlags::Parse(argc, argv);
-#if DEBUG_DUMP_VERIFY
-    SkPathOpsDebug::gDumpOp = FLAGS_dumpOp;
-    SkPathOpsDebug::gVerifyOp = FLAGS_verifyOp;
-#endif
-    SkPathOpsDebug::gRunFail = FLAGS_runFail;
-    SkPathOpsDebug::gVeryVerbose = FLAGS_veryVerbose;
-    PathOpsDebug::gOutFirst = true;
-    PathOpsDebug::gCheckForDuplicateNames = false;
-    PathOpsDebug::gOutputSVG = false;
-    if ((PathOpsDebug::gJson = !FLAGS_json.isEmpty())) {
-        PathOpsDebug::gOut = fopen(FLAGS_json[0], "wb");
-        fprintf(PathOpsDebug::gOut, "{\n");
-        FLAGS_threads = 0;
-        PathOpsDebug::gMarkJsonFlaky = false;
-    }
-    SetupCrashHandler();
-
-    SkAutoGraphics ag;
-
-    {
-        SkString header("Skia UnitTests:");
-        if (!FLAGS_match.isEmpty()) {
-            header.appendf(" --match");
-            for (int index = 0; index < FLAGS_match.count(); ++index) {
-                header.appendf(" %s", FLAGS_match[index]);
-            }
-        }
-        SkString tmpDir = skiatest::GetTmpDir();
-        if (!tmpDir.isEmpty()) {
-            header.appendf(" --tmpDir %s", tmpDir.c_str());
-        }
-        SkString resourcePath = GetResourcePath();
-        if (!resourcePath.isEmpty()) {
-            header.appendf(" --resourcePath %s", resourcePath.c_str());
-        }
-#if DEBUG_COIN
-        if (FLAGS_coinTest) {
-            header.appendf(" -c");
-        }
-#endif
-        if (FLAGS_dumpOp) {
-            header.appendf(" -d");
-        }
-#ifdef SK_DEBUG
-        if (FLAGS_runFail) {
-            header.appendf(" -f");
-        }
-#endif
-        if (FLAGS_verbose) {
-            header.appendf(" -v");
-        }
-        if (FLAGS_veryVerbose) {
-            header.appendf(" -V");
-        }
-        if (FLAGS_extendedTest) {
-            header.appendf(" -x");
-        }
-        if (FLAGS_verifyOp) {
-            header.appendf(" -y");
-        }
-#ifdef SK_DEBUG
-        header.append(" SK_DEBUG");
-#else
-        header.append(" SK_RELEASE");
-#endif
-        if (FLAGS_veryVerbose) {
-            header.appendf("\n");
-        }
-        SkDebugf("%s", header.c_str());
-    }
-
-
-    // Count tests first.
-    int total = 0;
-    int toRun = 0;
-
-    for (const Test& test : TestRegistry::Range()) {
-        if (should_run(test.fName, test.fNeedsGpu, test.fNeedsGraphite)) {
-            toRun++;
-        }
-        total++;
-    }
-
-    // Now run them.
-    int skipCount = 0;
-
-    SkTaskGroup::Enabler enabled(FLAGS_threads);
-    SkTaskGroup cpuTests;
-    SkTArray<const Test*> gpuTests;
-
-    Status status(toRun);
-
-    for (const Test& test : TestRegistry::Range()) {
-        if (!should_run(test.fName, test.fNeedsGpu, test.fNeedsGraphite)) {
-            ++skipCount;
-        } else if (test.fNeedsGpu || test.fNeedsGraphite) {
-            gpuTests.push_back(&test);
-        } else {
-            cpuTests.add(SkTestRunnable(test, &status));
-        }
-    }
-
-    // Run GPU tests on this thread.
-    for (int i = 0; i < gpuTests.count(); i++) {
-        SkTestRunnable(*gpuTests[i], &status)();
-    }
-
-    // Block until threaded tests finish.
-    cpuTests.wait();
-
-    if (FLAGS_verbose) {
-        SkDebugf(
-                "\nFinished %d tests, %d failures, %d skipped. "
-                "(%d internal tests)",
-                toRun, status.failCount(), skipCount, status.testCount());
-        if (gVerboseFinalize) {
-            (*gVerboseFinalize)();
-        }
-    }
-
-    SkDebugf("\n");
-#if DEBUG_COIN
-    if (FLAGS_coinTest) {
-        SkPathOpsDebug::DumpCoinDict();
-    }
-#endif
-    if (PathOpsDebug::gJson) {
-        fprintf(PathOpsDebug::gOut, "\n}\n");
-        fclose(PathOpsDebug::gOut);
-    }
-    return (status.failCount() == 0) ? 0 : 1;
-}
diff --git a/third_party/skia/tests/sksl/blend/BlendColor.asm.frag b/third_party/skia/tests/sksl/blend/BlendColor.asm.frag
index e0aaf3b716f0f..33a419d7304f1 100644
--- a/third_party/skia/tests/sksl/blend/BlendColor.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendColor.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3"
+OpName %blend_set_color_luminance_Qh3h3hh3 "blend_set_color_luminance_Qh3h3hh3"
 OpName %lum "lum"
 OpName %result "result"
 OpName %minComp "minComp"
@@ -160,7 +160,7 @@ OpDecorate %172 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_1 = OpConstant %int 1
 %int_0 = OpConstant %int 0
-%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %15
+%blend_set_color_luminance_Qh3h3hh3 = OpFunction %v3float None %15
 %18 = OpFunctionParameter %_ptr_Function_v3float
 %19 = OpFunctionParameter %_ptr_Function_float
 %20 = OpFunctionParameter %_ptr_Function_v3float
@@ -304,7 +304,7 @@ OpStore %142 %141
 OpStore %144 %143
 %145 = OpLoad %v3float %_2_dsa
 OpStore %146 %145
-%147 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %142 %144 %146
+%147 = OpFunctionCall %v3float %blend_set_color_luminance_Qh3h3hh3 %142 %144 %146
 %148 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %149 = OpLoad %v4float %148
 %150 = OpVectorShuffle %v3float %149 %149 0 1 2
diff --git a/third_party/skia/tests/sksl/blend/BlendColor.glsl b/third_party/skia/tests/sksl/blend/BlendColor.glsl
index 864ef5a83c4ee..cc7d5165db2b7 100644
--- a/third_party/skia/tests/sksl/blend/BlendColor.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColor.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -20,5 +20,5 @@ void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_1_sda, _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(_1_sda, _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColor.metal b/third_party/skia/tests/sksl/blend/BlendColor.metal
index 703168c29bade..e1286a3d7a8bd 100644
--- a/third_party/skia/tests/sksl/blend/BlendColor.metal
+++ b/third_party/skia/tests/sksl/blend/BlendColor.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
+half3 blend_set_color_luminance_Qh3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
     half lum = dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), lumColor);
     half3 result = (lum - dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), hueSatColor)) + hueSatColor;
     half minComp = min(min(result.x, result.y), result.z);
@@ -30,6 +30,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     half _0_alpha = _uniforms.dst.w * _uniforms.src.w;
     half3 _1_sda = _uniforms.src.xyz * _uniforms.dst.w;
     half3 _2_dsa = _uniforms.dst.xyz * _uniforms.src.w;
-    _out.sk_FragColor = half4((((_blend_set_color_luminance_h3h3hh3(_1_sda, _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
+    _out.sk_FragColor = half4((((blend_set_color_luminance_Qh3h3hh3(_1_sda, _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorBurn.asm.frag b/third_party/skia/tests/sksl/blend/BlendColorBurn.asm.frag
index f956c1ce136b5..ab24fbc5f3800 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorBurn.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendColorBurn.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_color_burn_component_hh2h2 "_color_burn_component_hh2h2"
+OpName %color_burn_component_Qhh2h2 "color_burn_component_Qhh2h2"
 OpName %delta "delta"
 OpName %main "main"
 OpDecorate %sk_FragColor RelaxedPrecision
@@ -130,7 +130,7 @@ OpDecorate %142 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_0 = OpConstant %int 0
 %int_1 = OpConstant %int 1
-%_color_burn_component_hh2h2 = OpFunction %float None %15
+%color_burn_component_Qhh2h2 = OpFunction %float None %15
 %17 = OpFunctionParameter %_ptr_Function_v2float
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpLabel
@@ -234,7 +234,7 @@ OpStore %105 %104
 %108 = OpLoad %v4float %106
 %109 = OpVectorShuffle %v2float %108 %108 0 3
 OpStore %110 %109
-%111 = OpFunctionCall %float %_color_burn_component_hh2h2 %105 %110
+%111 = OpFunctionCall %float %color_burn_component_Qhh2h2 %105 %110
 %112 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %113 = OpLoad %v4float %112
 %114 = OpVectorShuffle %v2float %113 %113 1 3
@@ -243,7 +243,7 @@ OpStore %115 %114
 %117 = OpLoad %v4float %116
 %118 = OpVectorShuffle %v2float %117 %117 1 3
 OpStore %119 %118
-%120 = OpFunctionCall %float %_color_burn_component_hh2h2 %115 %119
+%120 = OpFunctionCall %float %color_burn_component_Qhh2h2 %115 %119
 %121 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %122 = OpLoad %v4float %121
 %123 = OpVectorShuffle %v2float %122 %122 2 3
@@ -252,7 +252,7 @@ OpStore %124 %123
 %126 = OpLoad %v4float %125
 %127 = OpVectorShuffle %v2float %126 %126 2 3
 OpStore %128 %127
-%129 = OpFunctionCall %float %_color_burn_component_hh2h2 %124 %128
+%129 = OpFunctionCall %float %color_burn_component_Qhh2h2 %124 %128
 %130 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %131 = OpLoad %v4float %130
 %132 = OpCompositeExtract %float %131 3
diff --git a/third_party/skia/tests/sksl/blend/BlendColorBurn.glsl b/third_party/skia/tests/sksl/blend/BlendColorBurn.glsl
index b5931d5e4fb90..c6e08988209b9 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorBurn.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColorBurn.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _color_burn_component_hh2h2(vec2 s, vec2 d) {
+float color_burn_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.y == d.x) {
         return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     } else if (s.x == 0.0) {
@@ -13,5 +13,5 @@ float _color_burn_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_burn_component_hh2h2(src.xw, dst.xw), _color_burn_component_hh2h2(src.yw, dst.yw), _color_burn_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_burn_component_Qhh2h2(src.xw, dst.xw), color_burn_component_Qhh2h2(src.yw, dst.yw), color_burn_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorBurn.metal b/third_party/skia/tests/sksl/blend/BlendColorBurn.metal
index 5c83f8bbf652f..a7c8775e53fec 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorBurn.metal
+++ b/third_party/skia/tests/sksl/blend/BlendColorBurn.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half _color_burn_component_hh2h2(half2 s, half2 d) {
+half color_burn_component_Qhh2h2(half2 s, half2 d) {
     if (d.y == d.x) {
         return (s.y * d.y + s.x * (1.0h - d.y)) + d.x * (1.0h - s.y);
     } else if (s.x == 0.0h) {
@@ -23,6 +23,6 @@ half _color_burn_component_hh2h2(half2 s, half2 d) {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    _out.sk_FragColor = half4(_color_burn_component_hh2h2(_uniforms.src.xw, _uniforms.dst.xw), _color_burn_component_hh2h2(_uniforms.src.yw, _uniforms.dst.yw), _color_burn_component_hh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
+    _out.sk_FragColor = half4(color_burn_component_Qhh2h2(_uniforms.src.xw, _uniforms.dst.xw), color_burn_component_Qhh2h2(_uniforms.src.yw, _uniforms.dst.yw), color_burn_component_Qhh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorBurnStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendColorBurnStandaloneSettings.glsl
index 59ca5549aba72..700bf22217f84 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorBurnStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColorBurnStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _color_burn_component_hh2h2(vec2 s, vec2 d) {
+float color_burn_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.y == d.x) {
         return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     } else if (s.x == 0.0) {
@@ -13,5 +13,5 @@ float _color_burn_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_burn_component_hh2h2(src.xw, dst.xw), _color_burn_component_hh2h2(src.yw, dst.yw), _color_burn_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_burn_component_Qhh2h2(src.xw, dst.xw), color_burn_component_Qhh2h2(src.yw, dst.yw), color_burn_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorDodge.asm.frag b/third_party/skia/tests/sksl/blend/BlendColorDodge.asm.frag
index f31bb8e3cd040..85c16fdc606b8 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorDodge.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendColorDodge.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_color_dodge_component_hh2h2 "_color_dodge_component_hh2h2"
+OpName %color_dodge_component_Qhh2h2 "color_dodge_component_Qhh2h2"
 OpName %delta "delta"
 OpName %main "main"
 OpDecorate %sk_FragColor RelaxedPrecision
@@ -127,7 +127,7 @@ OpDecorate %139 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_0 = OpConstant %int 0
 %int_1 = OpConstant %int 1
-%_color_dodge_component_hh2h2 = OpFunction %float None %15
+%color_dodge_component_Qhh2h2 = OpFunction %float None %15
 %17 = OpFunctionParameter %_ptr_Function_v2float
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpLabel
@@ -229,7 +229,7 @@ OpStore %102 %101
 %105 = OpLoad %v4float %103
 %106 = OpVectorShuffle %v2float %105 %105 0 3
 OpStore %107 %106
-%108 = OpFunctionCall %float %_color_dodge_component_hh2h2 %102 %107
+%108 = OpFunctionCall %float %color_dodge_component_Qhh2h2 %102 %107
 %109 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %110 = OpLoad %v4float %109
 %111 = OpVectorShuffle %v2float %110 %110 1 3
@@ -238,7 +238,7 @@ OpStore %112 %111
 %114 = OpLoad %v4float %113
 %115 = OpVectorShuffle %v2float %114 %114 1 3
 OpStore %116 %115
-%117 = OpFunctionCall %float %_color_dodge_component_hh2h2 %112 %116
+%117 = OpFunctionCall %float %color_dodge_component_Qhh2h2 %112 %116
 %118 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %119 = OpLoad %v4float %118
 %120 = OpVectorShuffle %v2float %119 %119 2 3
@@ -247,7 +247,7 @@ OpStore %121 %120
 %123 = OpLoad %v4float %122
 %124 = OpVectorShuffle %v2float %123 %123 2 3
 OpStore %125 %124
-%126 = OpFunctionCall %float %_color_dodge_component_hh2h2 %121 %125
+%126 = OpFunctionCall %float %color_dodge_component_Qhh2h2 %121 %125
 %127 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %128 = OpLoad %v4float %127
 %129 = OpCompositeExtract %float %128 3
diff --git a/third_party/skia/tests/sksl/blend/BlendColorDodge.glsl b/third_party/skia/tests/sksl/blend/BlendColorDodge.glsl
index eeec3a163be06..1580aaf6c21c0 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorDodge.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColorDodge.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
+float color_dodge_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.x == 0.0) {
         return s.x * (1.0 - d.y);
     } else {
@@ -16,5 +16,5 @@ float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_dodge_component_hh2h2(src.xw, dst.xw), _color_dodge_component_hh2h2(src.yw, dst.yw), _color_dodge_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_dodge_component_Qhh2h2(src.xw, dst.xw), color_dodge_component_Qhh2h2(src.yw, dst.yw), color_dodge_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorDodge.metal b/third_party/skia/tests/sksl/blend/BlendColorDodge.metal
index a0bd99dc743f1..6e17b51a9788d 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorDodge.metal
+++ b/third_party/skia/tests/sksl/blend/BlendColorDodge.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half _color_dodge_component_hh2h2(half2 s, half2 d) {
+half color_dodge_component_Qhh2h2(half2 s, half2 d) {
     if (d.x == 0.0h) {
         return s.x * (1.0h - d.y);
     } else {
@@ -26,6 +26,6 @@ half _color_dodge_component_hh2h2(half2 s, half2 d) {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    _out.sk_FragColor = half4(_color_dodge_component_hh2h2(_uniforms.src.xw, _uniforms.dst.xw), _color_dodge_component_hh2h2(_uniforms.src.yw, _uniforms.dst.yw), _color_dodge_component_hh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
+    _out.sk_FragColor = half4(color_dodge_component_Qhh2h2(_uniforms.src.xw, _uniforms.dst.xw), color_dodge_component_Qhh2h2(_uniforms.src.yw, _uniforms.dst.yw), color_dodge_component_Qhh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorDodgeStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendColorDodgeStandaloneSettings.glsl
index 511946156ec5b..35ce7b0e3fef4 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorDodgeStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColorDodgeStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
+float color_dodge_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.x == 0.0) {
         return s.x * (1.0 - d.y);
     } else {
@@ -16,5 +16,5 @@ float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_dodge_component_hh2h2(src.xw, dst.xw), _color_dodge_component_hh2h2(src.yw, dst.yw), _color_dodge_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_dodge_component_Qhh2h2(src.xw, dst.xw), color_dodge_component_Qhh2h2(src.yw, dst.yw), color_dodge_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendColorStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendColorStandaloneSettings.glsl
index 7fad37e9afe64..a1493de1c3530 100644
--- a/third_party/skia/tests/sksl/blend/BlendColorStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendColorStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -20,5 +20,5 @@ void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_1_sda, _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(_1_sda, _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendHardLight.asm.frag b/third_party/skia/tests/sksl/blend/BlendHardLight.asm.frag
index 9a3e761be88da..474c62d54ad0c 100644
--- a/third_party/skia/tests/sksl/blend/BlendHardLight.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendHardLight.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_overlay_component_hh2h2 "_blend_overlay_component_hh2h2"
+OpName %blend_overlay_component_Qhh2h2 "blend_overlay_component_Qhh2h2"
 OpName %main "main"
 OpName %_0_result "_0_result"
 OpDecorate %sk_FragColor RelaxedPrecision
@@ -118,7 +118,7 @@ OpDecorate %130 RelaxedPrecision
 %int_0 = OpConstant %int 0
 %float_1 = OpConstant %float 1
 %v3float = OpTypeVector %float 3
-%_blend_overlay_component_hh2h2 = OpFunction %float None %15
+%blend_overlay_component_Qhh2h2 = OpFunction %float None %15
 %17 = OpFunctionParameter %_ptr_Function_v2float
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpLabel
@@ -182,7 +182,7 @@ OpStore %68 %67
 %71 = OpLoad %v4float %69
 %72 = OpVectorShuffle %v2float %71 %71 0 3
 OpStore %73 %72
-%74 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %68 %73
+%74 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %68 %73
 %75 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %76 = OpLoad %v4float %75
 %77 = OpVectorShuffle %v2float %76 %76 1 3
@@ -191,7 +191,7 @@ OpStore %78 %77
 %80 = OpLoad %v4float %79
 %81 = OpVectorShuffle %v2float %80 %80 1 3
 OpStore %82 %81
-%83 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %78 %82
+%83 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %78 %82
 %84 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %85 = OpLoad %v4float %84
 %86 = OpVectorShuffle %v2float %85 %85 2 3
@@ -200,7 +200,7 @@ OpStore %87 %86
 %89 = OpLoad %v4float %88
 %90 = OpVectorShuffle %v2float %89 %89 2 3
 OpStore %91 %90
-%92 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %87 %91
+%92 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %87 %91
 %93 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %94 = OpLoad %v4float %93
 %95 = OpCompositeExtract %float %94 3
diff --git a/third_party/skia/tests/sksl/blend/BlendHardLight.glsl b/third_party/skia/tests/sksl/blend/BlendHardLight.glsl
index fe68946a52593..db85c5dfd8d6c 100644
--- a/third_party/skia/tests/sksl/blend/BlendHardLight.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendHardLight.glsl
@@ -2,11 +2,11 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _blend_overlay_component_hh2h2(vec2 s, vec2 d) {
+float blend_overlay_component_Qhh2h2(vec2 s, vec2 d) {
     return 2.0 * d.x <= d.y ? (2.0 * s.x) * d.x : s.y * d.y - (2.0 * (d.y - d.x)) * (s.y - s.x);
 }
 void main() {
-    vec4 _0_result = vec4(_blend_overlay_component_hh2h2(dst.xw, src.xw), _blend_overlay_component_hh2h2(dst.yw, src.yw), _blend_overlay_component_hh2h2(dst.zw, src.zw), dst.w + (1.0 - dst.w) * src.w);
+    vec4 _0_result = vec4(blend_overlay_component_Qhh2h2(dst.xw, src.xw), blend_overlay_component_Qhh2h2(dst.yw, src.yw), blend_overlay_component_Qhh2h2(dst.zw, src.zw), dst.w + (1.0 - dst.w) * src.w);
     _0_result.xyz += src.xyz * (1.0 - dst.w) + dst.xyz * (1.0 - src.w);
     sk_FragColor = _0_result;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendHardLight.metal b/third_party/skia/tests/sksl/blend/BlendHardLight.metal
index d75fcb6ddf558..34fad60322688 100644
--- a/third_party/skia/tests/sksl/blend/BlendHardLight.metal
+++ b/third_party/skia/tests/sksl/blend/BlendHardLight.metal
@@ -10,13 +10,13 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half _blend_overlay_component_hh2h2(half2 s, half2 d) {
+half blend_overlay_component_Qhh2h2(half2 s, half2 d) {
     return 2.0h * d.x <= d.y ? (2.0h * s.x) * d.x : s.y * d.y - (2.0h * (d.y - d.x)) * (s.y - s.x);
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    half4 _0_result = half4(_blend_overlay_component_hh2h2(_uniforms.dst.xw, _uniforms.src.xw), _blend_overlay_component_hh2h2(_uniforms.dst.yw, _uniforms.src.yw), _blend_overlay_component_hh2h2(_uniforms.dst.zw, _uniforms.src.zw), _uniforms.dst.w + (1.0h - _uniforms.dst.w) * _uniforms.src.w);
+    half4 _0_result = half4(blend_overlay_component_Qhh2h2(_uniforms.dst.xw, _uniforms.src.xw), blend_overlay_component_Qhh2h2(_uniforms.dst.yw, _uniforms.src.yw), blend_overlay_component_Qhh2h2(_uniforms.dst.zw, _uniforms.src.zw), _uniforms.dst.w + (1.0h - _uniforms.dst.w) * _uniforms.src.w);
     _0_result.xyz = _0_result.xyz + _uniforms.src.xyz * (1.0h - _uniforms.dst.w) + _uniforms.dst.xyz * (1.0h - _uniforms.src.w);
     _out.sk_FragColor = _0_result;
     return _out;
diff --git a/third_party/skia/tests/sksl/blend/BlendHardLightStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendHardLightStandaloneSettings.glsl
index 831a43a82cb9e..ffaf1feedc725 100644
--- a/third_party/skia/tests/sksl/blend/BlendHardLightStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendHardLightStandaloneSettings.glsl
@@ -2,11 +2,11 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _blend_overlay_component_hh2h2(vec2 s, vec2 d) {
+float blend_overlay_component_Qhh2h2(vec2 s, vec2 d) {
     return 2.0 * d.x <= d.y ? (2.0 * s.x) * d.x : s.y * d.y - (2.0 * (d.y - d.x)) * (s.y - s.x);
 }
 void main() {
-    vec4 _0_result = vec4(_blend_overlay_component_hh2h2(dst.xw, src.xw), _blend_overlay_component_hh2h2(dst.yw, src.yw), _blend_overlay_component_hh2h2(dst.zw, src.zw), dst.w + (1.0 - dst.w) * src.w);
+    vec4 _0_result = vec4(blend_overlay_component_Qhh2h2(dst.xw, src.xw), blend_overlay_component_Qhh2h2(dst.yw, src.yw), blend_overlay_component_Qhh2h2(dst.zw, src.zw), dst.w + (1.0 - dst.w) * src.w);
     _0_result.xyz += src.xyz * (1.0 - dst.w) + dst.xyz * (1.0 - src.w);
     sk_FragColor = _0_result;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendHue.asm.frag b/third_party/skia/tests/sksl/blend/BlendHue.asm.frag
index c2a3185288edb..93992819c19dc 100644
--- a/third_party/skia/tests/sksl/blend/BlendHue.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendHue.asm.frag
@@ -8,13 +8,13 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3"
+OpName %blend_set_color_luminance_Qh3h3hh3 "blend_set_color_luminance_Qh3h3hh3"
 OpName %lum "lum"
 OpName %result "result"
 OpName %minComp "minComp"
 OpName %maxComp "maxComp"
-OpName %_blend_set_color_saturation_helper_h3h3h "_blend_set_color_saturation_helper_h3h3h"
-OpName %_blend_set_color_saturation_h3h3h3 "_blend_set_color_saturation_h3h3h3"
+OpName %blend_set_color_saturation_helper_Qh3h3h "blend_set_color_saturation_helper_Qh3h3h"
+OpName %blend_set_color_saturation_Qh3h3h3 "blend_set_color_saturation_Qh3h3h3"
 OpName %sat "sat"
 OpName %main "main"
 OpName %_0_alpha "_0_alpha"
@@ -243,7 +243,7 @@ OpDecorate %308 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_1 = OpConstant %int 1
 %int_0 = OpConstant %int 0
-%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %17
+%blend_set_color_luminance_Qh3h3hh3 = OpFunction %v3float None %17
 %20 = OpFunctionParameter %_ptr_Function_v3float
 %21 = OpFunctionParameter %_ptr_Function_float
 %22 = OpFunctionParameter %_ptr_Function_v3float
@@ -349,7 +349,7 @@ OpReturnValue %111
 %93 = OpLabel
 OpUnreachable
 OpFunctionEnd
-%_blend_set_color_saturation_helper_h3h3h = OpFunction %v3float None %112
+%blend_set_color_saturation_helper_Qh3h3h = OpFunction %v3float None %112
 %113 = OpFunctionParameter %_ptr_Function_v3float
 %114 = OpFunctionParameter %_ptr_Function_float
 %115 = OpLabel
@@ -382,7 +382,7 @@ OpReturnValue %139
 %123 = OpLabel
 OpUnreachable
 OpFunctionEnd
-%_blend_set_color_saturation_h3h3h3 = OpFunction %v3float None %140
+%blend_set_color_saturation_Qh3h3h3 = OpFunction %v3float None %140
 %141 = OpFunctionParameter %_ptr_Function_v3float
 %142 = OpFunctionParameter %_ptr_Function_v3float
 %143 = OpLabel
@@ -437,7 +437,7 @@ OpBranchConditional %174 %175 %176
 OpStore %179 %178
 %180 = OpLoad %float %sat
 OpStore %181 %180
-%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %179 %181
+%182 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %179 %181
 OpReturnValue %182
 %176 = OpLabel
 %183 = OpLoad %v3float %141
@@ -453,7 +453,7 @@ OpBranchConditional %187 %188 %189
 OpStore %193 %192
 %194 = OpLoad %float %sat
 OpStore %195 %194
-%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %193 %195
+%196 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %193 %195
 %197 = OpVectorShuffle %v3float %196 %196 0 2 1
 OpReturnValue %197
 %189 = OpLabel
@@ -462,7 +462,7 @@ OpReturnValue %197
 OpStore %200 %199
 %201 = OpLoad %float %sat
 OpStore %202 %201
-%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %200 %202
+%203 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %200 %202
 %204 = OpVectorShuffle %v3float %203 %203 1 2 0
 OpReturnValue %204
 %190 = OpLabel
@@ -483,7 +483,7 @@ OpBranchConditional %209 %210 %211
 OpStore %215 %214
 %216 = OpLoad %float %sat
 OpStore %217 %216
-%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %215 %217
+%218 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %215 %217
 %219 = OpVectorShuffle %v3float %218 %218 1 0 2
 OpReturnValue %219
 %211 = OpLabel
@@ -500,7 +500,7 @@ OpBranchConditional %224 %225 %226
 OpStore %230 %229
 %231 = OpLoad %float %sat
 OpStore %232 %231
-%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %230 %232
+%233 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %230 %232
 %234 = OpVectorShuffle %v3float %233 %233 2 0 1
 OpReturnValue %234
 %226 = OpLabel
@@ -509,7 +509,7 @@ OpReturnValue %234
 OpStore %237 %236
 %238 = OpLoad %float %sat
 OpStore %239 %238
-%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %237 %239
+%240 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %237 %239
 %241 = OpVectorShuffle %v3float %240 %240 2 1 0
 OpReturnValue %241
 %227 = OpLabel
@@ -557,13 +557,13 @@ OpStore %_2_dsa %272
 OpStore %274 %273
 %275 = OpLoad %v3float %_2_dsa
 OpStore %276 %275
-%277 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %274 %276
+%277 = OpFunctionCall %v3float %blend_set_color_saturation_Qh3h3h3 %274 %276
 OpStore %278 %277
 %279 = OpLoad %float %_0_alpha
 OpStore %280 %279
 %281 = OpLoad %v3float %_2_dsa
 OpStore %282 %281
-%283 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %278 %280 %282
+%283 = OpFunctionCall %v3float %blend_set_color_luminance_Qh3h3hh3 %278 %280 %282
 %284 = OpAccessChain %_ptr_Uniform_v4float %13 %int_1
 %285 = OpLoad %v4float %284
 %286 = OpVectorShuffle %v3float %285 %285 0 1 2
diff --git a/third_party/skia/tests/sksl/blend/BlendHue.glsl b/third_party/skia/tests/sksl/blend/BlendHue.glsl
index 2cc2fa2793806..8347ddcdcb415 100644
--- a/third_party/skia/tests/sksl/blend/BlendHue.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendHue.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -16,34 +16,34 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendHue.metal b/third_party/skia/tests/sksl/blend/BlendHue.metal
index c95d1638ce952..9098b12c14382 100644
--- a/third_party/skia/tests/sksl/blend/BlendHue.metal
+++ b/third_party/skia/tests/sksl/blend/BlendHue.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
+half3 blend_set_color_luminance_Qh3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
     half lum = dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), lumColor);
     half3 result = (lum - dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), hueSatColor)) + hueSatColor;
     half minComp = min(min(result.x, result.y), result.z);
@@ -24,29 +24,29 @@ half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lu
         return result;
     }
 }
-half3 _blend_set_color_saturation_helper_h3h3h(half3 minMidMax, half sat) {
+half3 blend_set_color_saturation_helper_Qh3h3h(half3 minMidMax, half sat) {
     if (minMidMax.x < minMidMax.z) {
         return half3(0.0h, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return half3(0.0h);
     }
 }
-half3 _blend_set_color_saturation_h3h3h3(half3 hueLumColor, half3 satColor) {
+half3 blend_set_color_saturation_Qh3h3h3(half3 hueLumColor, half3 satColor) {
     half sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
@@ -55,6 +55,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     half _0_alpha = _uniforms.dst.w * _uniforms.src.w;
     half3 _1_sda = _uniforms.src.xyz * _uniforms.dst.w;
     half3 _2_dsa = _uniforms.dst.xyz * _uniforms.src.w;
-    _out.sk_FragColor = half4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
+    _out.sk_FragColor = half4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendHueStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendHueStandaloneSettings.glsl
index 619a535dcb1a1..0888e834232fc 100644
--- a/third_party/skia/tests/sksl/blend/BlendHueStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendHueStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -16,34 +16,34 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_1_sda, _2_dsa), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendLuminosity.asm.frag b/third_party/skia/tests/sksl/blend/BlendLuminosity.asm.frag
index a1f5bbb46ffa0..d5b3c2b2d7d57 100644
--- a/third_party/skia/tests/sksl/blend/BlendLuminosity.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendLuminosity.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3"
+OpName %blend_set_color_luminance_Qh3h3hh3 "blend_set_color_luminance_Qh3h3hh3"
 OpName %lum "lum"
 OpName %result "result"
 OpName %minComp "minComp"
@@ -160,7 +160,7 @@ OpDecorate %172 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_1 = OpConstant %int 1
 %int_0 = OpConstant %int 0
-%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %15
+%blend_set_color_luminance_Qh3h3hh3 = OpFunction %v3float None %15
 %18 = OpFunctionParameter %_ptr_Function_v3float
 %19 = OpFunctionParameter %_ptr_Function_float
 %20 = OpFunctionParameter %_ptr_Function_v3float
@@ -304,7 +304,7 @@ OpStore %142 %141
 OpStore %144 %143
 %145 = OpLoad %v3float %_1_sda
 OpStore %146 %145
-%147 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %142 %144 %146
+%147 = OpFunctionCall %v3float %blend_set_color_luminance_Qh3h3hh3 %142 %144 %146
 %148 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %149 = OpLoad %v4float %148
 %150 = OpVectorShuffle %v3float %149 %149 0 1 2
diff --git a/third_party/skia/tests/sksl/blend/BlendLuminosity.glsl b/third_party/skia/tests/sksl/blend/BlendLuminosity.glsl
index a34cb0f3e0a6b..2014559de2e00 100644
--- a/third_party/skia/tests/sksl/blend/BlendLuminosity.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendLuminosity.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -20,5 +20,5 @@ void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_2_dsa, _0_alpha, _1_sda) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(_2_dsa, _0_alpha, _1_sda) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendLuminosity.metal b/third_party/skia/tests/sksl/blend/BlendLuminosity.metal
index 4fa864506b995..7427535cf4dbd 100644
--- a/third_party/skia/tests/sksl/blend/BlendLuminosity.metal
+++ b/third_party/skia/tests/sksl/blend/BlendLuminosity.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
+half3 blend_set_color_luminance_Qh3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
     half lum = dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), lumColor);
     half3 result = (lum - dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), hueSatColor)) + hueSatColor;
     half minComp = min(min(result.x, result.y), result.z);
@@ -30,6 +30,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     half _0_alpha = _uniforms.dst.w * _uniforms.src.w;
     half3 _1_sda = _uniforms.src.xyz * _uniforms.dst.w;
     half3 _2_dsa = _uniforms.dst.xyz * _uniforms.src.w;
-    _out.sk_FragColor = half4((((_blend_set_color_luminance_h3h3hh3(_2_dsa, _0_alpha, _1_sda) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
+    _out.sk_FragColor = half4((((blend_set_color_luminance_Qh3h3hh3(_2_dsa, _0_alpha, _1_sda) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendLuminosityStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendLuminosityStandaloneSettings.glsl
index ebae8564524e2..fd36962fa6110 100644
--- a/third_party/skia/tests/sksl/blend/BlendLuminosityStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendLuminosityStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -20,5 +20,5 @@ void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_2_dsa, _0_alpha, _1_sda) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(_2_dsa, _0_alpha, _1_sda) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendOverlay.asm.frag b/third_party/skia/tests/sksl/blend/BlendOverlay.asm.frag
index d82104fd2b4d1..8175bb241958c 100644
--- a/third_party/skia/tests/sksl/blend/BlendOverlay.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendOverlay.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_overlay_component_hh2h2 "_blend_overlay_component_hh2h2"
+OpName %blend_overlay_component_Qhh2h2 "blend_overlay_component_Qhh2h2"
 OpName %main "main"
 OpName %_0_result "_0_result"
 OpDecorate %sk_FragColor RelaxedPrecision
@@ -118,7 +118,7 @@ OpDecorate %130 RelaxedPrecision
 %int_1 = OpConstant %int 1
 %float_1 = OpConstant %float 1
 %v3float = OpTypeVector %float 3
-%_blend_overlay_component_hh2h2 = OpFunction %float None %15
+%blend_overlay_component_Qhh2h2 = OpFunction %float None %15
 %17 = OpFunctionParameter %_ptr_Function_v2float
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpLabel
@@ -182,7 +182,7 @@ OpStore %68 %67
 %71 = OpLoad %v4float %69
 %72 = OpVectorShuffle %v2float %71 %71 0 3
 OpStore %73 %72
-%74 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %68 %73
+%74 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %68 %73
 %75 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %76 = OpLoad %v4float %75
 %77 = OpVectorShuffle %v2float %76 %76 1 3
@@ -191,7 +191,7 @@ OpStore %78 %77
 %80 = OpLoad %v4float %79
 %81 = OpVectorShuffle %v2float %80 %80 1 3
 OpStore %82 %81
-%83 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %78 %82
+%83 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %78 %82
 %84 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %85 = OpLoad %v4float %84
 %86 = OpVectorShuffle %v2float %85 %85 2 3
@@ -200,7 +200,7 @@ OpStore %87 %86
 %89 = OpLoad %v4float %88
 %90 = OpVectorShuffle %v2float %89 %89 2 3
 OpStore %91 %90
-%92 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %87 %91
+%92 = OpFunctionCall %float %blend_overlay_component_Qhh2h2 %87 %91
 %93 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %94 = OpLoad %v4float %93
 %95 = OpCompositeExtract %float %94 3
diff --git a/third_party/skia/tests/sksl/blend/BlendOverlay.glsl b/third_party/skia/tests/sksl/blend/BlendOverlay.glsl
index 60576e02e372e..7e979583ed2b8 100644
--- a/third_party/skia/tests/sksl/blend/BlendOverlay.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendOverlay.glsl
@@ -2,11 +2,11 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _blend_overlay_component_hh2h2(vec2 s, vec2 d) {
+float blend_overlay_component_Qhh2h2(vec2 s, vec2 d) {
     return 2.0 * d.x <= d.y ? (2.0 * s.x) * d.x : s.y * d.y - (2.0 * (d.y - d.x)) * (s.y - s.x);
 }
 void main() {
-    vec4 _0_result = vec4(_blend_overlay_component_hh2h2(src.xw, dst.xw), _blend_overlay_component_hh2h2(src.yw, dst.yw), _blend_overlay_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    vec4 _0_result = vec4(blend_overlay_component_Qhh2h2(src.xw, dst.xw), blend_overlay_component_Qhh2h2(src.yw, dst.yw), blend_overlay_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
     _0_result.xyz += dst.xyz * (1.0 - src.w) + src.xyz * (1.0 - dst.w);
     sk_FragColor = _0_result;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendOverlay.metal b/third_party/skia/tests/sksl/blend/BlendOverlay.metal
index 9dfd792c76967..1d6f20641df4e 100644
--- a/third_party/skia/tests/sksl/blend/BlendOverlay.metal
+++ b/third_party/skia/tests/sksl/blend/BlendOverlay.metal
@@ -10,13 +10,13 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half _blend_overlay_component_hh2h2(half2 s, half2 d) {
+half blend_overlay_component_Qhh2h2(half2 s, half2 d) {
     return 2.0h * d.x <= d.y ? (2.0h * s.x) * d.x : s.y * d.y - (2.0h * (d.y - d.x)) * (s.y - s.x);
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    half4 _0_result = half4(_blend_overlay_component_hh2h2(_uniforms.src.xw, _uniforms.dst.xw), _blend_overlay_component_hh2h2(_uniforms.src.yw, _uniforms.dst.yw), _blend_overlay_component_hh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
+    half4 _0_result = half4(blend_overlay_component_Qhh2h2(_uniforms.src.xw, _uniforms.dst.xw), blend_overlay_component_Qhh2h2(_uniforms.src.yw, _uniforms.dst.yw), blend_overlay_component_Qhh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
     _0_result.xyz = _0_result.xyz + _uniforms.dst.xyz * (1.0h - _uniforms.src.w) + _uniforms.src.xyz * (1.0h - _uniforms.dst.w);
     _out.sk_FragColor = _0_result;
     return _out;
diff --git a/third_party/skia/tests/sksl/blend/BlendOverlayStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendOverlayStandaloneSettings.glsl
index bd58a5138f07d..422b3eb324cfb 100644
--- a/third_party/skia/tests/sksl/blend/BlendOverlayStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendOverlayStandaloneSettings.glsl
@@ -2,11 +2,11 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _blend_overlay_component_hh2h2(vec2 s, vec2 d) {
+float blend_overlay_component_Qhh2h2(vec2 s, vec2 d) {
     return 2.0 * d.x <= d.y ? (2.0 * s.x) * d.x : s.y * d.y - (2.0 * (d.y - d.x)) * (s.y - s.x);
 }
 void main() {
-    vec4 _0_result = vec4(_blend_overlay_component_hh2h2(src.xw, dst.xw), _blend_overlay_component_hh2h2(src.yw, dst.yw), _blend_overlay_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    vec4 _0_result = vec4(blend_overlay_component_Qhh2h2(src.xw, dst.xw), blend_overlay_component_Qhh2h2(src.yw, dst.yw), blend_overlay_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
     _0_result.xyz += dst.xyz * (1.0 - src.w) + src.xyz * (1.0 - dst.w);
     sk_FragColor = _0_result;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSaturation.asm.frag b/third_party/skia/tests/sksl/blend/BlendSaturation.asm.frag
index 66b4860e7055f..0abfed449639c 100644
--- a/third_party/skia/tests/sksl/blend/BlendSaturation.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendSaturation.asm.frag
@@ -8,13 +8,13 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3"
+OpName %blend_set_color_luminance_Qh3h3hh3 "blend_set_color_luminance_Qh3h3hh3"
 OpName %lum "lum"
 OpName %result "result"
 OpName %minComp "minComp"
 OpName %maxComp "maxComp"
-OpName %_blend_set_color_saturation_helper_h3h3h "_blend_set_color_saturation_helper_h3h3h"
-OpName %_blend_set_color_saturation_h3h3h3 "_blend_set_color_saturation_h3h3h3"
+OpName %blend_set_color_saturation_helper_Qh3h3h "blend_set_color_saturation_helper_Qh3h3h"
+OpName %blend_set_color_saturation_Qh3h3h3 "blend_set_color_saturation_Qh3h3h3"
 OpName %sat "sat"
 OpName %main "main"
 OpName %_0_alpha "_0_alpha"
@@ -243,7 +243,7 @@ OpDecorate %308 RelaxedPrecision
 %int = OpTypeInt 32 1
 %int_1 = OpConstant %int 1
 %int_0 = OpConstant %int 0
-%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %17
+%blend_set_color_luminance_Qh3h3hh3 = OpFunction %v3float None %17
 %20 = OpFunctionParameter %_ptr_Function_v3float
 %21 = OpFunctionParameter %_ptr_Function_float
 %22 = OpFunctionParameter %_ptr_Function_v3float
@@ -349,7 +349,7 @@ OpReturnValue %111
 %93 = OpLabel
 OpUnreachable
 OpFunctionEnd
-%_blend_set_color_saturation_helper_h3h3h = OpFunction %v3float None %112
+%blend_set_color_saturation_helper_Qh3h3h = OpFunction %v3float None %112
 %113 = OpFunctionParameter %_ptr_Function_v3float
 %114 = OpFunctionParameter %_ptr_Function_float
 %115 = OpLabel
@@ -382,7 +382,7 @@ OpReturnValue %139
 %123 = OpLabel
 OpUnreachable
 OpFunctionEnd
-%_blend_set_color_saturation_h3h3h3 = OpFunction %v3float None %140
+%blend_set_color_saturation_Qh3h3h3 = OpFunction %v3float None %140
 %141 = OpFunctionParameter %_ptr_Function_v3float
 %142 = OpFunctionParameter %_ptr_Function_v3float
 %143 = OpLabel
@@ -437,7 +437,7 @@ OpBranchConditional %174 %175 %176
 OpStore %179 %178
 %180 = OpLoad %float %sat
 OpStore %181 %180
-%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %179 %181
+%182 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %179 %181
 OpReturnValue %182
 %176 = OpLabel
 %183 = OpLoad %v3float %141
@@ -453,7 +453,7 @@ OpBranchConditional %187 %188 %189
 OpStore %193 %192
 %194 = OpLoad %float %sat
 OpStore %195 %194
-%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %193 %195
+%196 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %193 %195
 %197 = OpVectorShuffle %v3float %196 %196 0 2 1
 OpReturnValue %197
 %189 = OpLabel
@@ -462,7 +462,7 @@ OpReturnValue %197
 OpStore %200 %199
 %201 = OpLoad %float %sat
 OpStore %202 %201
-%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %200 %202
+%203 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %200 %202
 %204 = OpVectorShuffle %v3float %203 %203 1 2 0
 OpReturnValue %204
 %190 = OpLabel
@@ -483,7 +483,7 @@ OpBranchConditional %209 %210 %211
 OpStore %215 %214
 %216 = OpLoad %float %sat
 OpStore %217 %216
-%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %215 %217
+%218 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %215 %217
 %219 = OpVectorShuffle %v3float %218 %218 1 0 2
 OpReturnValue %219
 %211 = OpLabel
@@ -500,7 +500,7 @@ OpBranchConditional %224 %225 %226
 OpStore %230 %229
 %231 = OpLoad %float %sat
 OpStore %232 %231
-%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %230 %232
+%233 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %230 %232
 %234 = OpVectorShuffle %v3float %233 %233 2 0 1
 OpReturnValue %234
 %226 = OpLabel
@@ -509,7 +509,7 @@ OpReturnValue %234
 OpStore %237 %236
 %238 = OpLoad %float %sat
 OpStore %239 %238
-%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %237 %239
+%240 = OpFunctionCall %v3float %blend_set_color_saturation_helper_Qh3h3h %237 %239
 %241 = OpVectorShuffle %v3float %240 %240 2 1 0
 OpReturnValue %241
 %227 = OpLabel
@@ -557,13 +557,13 @@ OpStore %_2_dsa %272
 OpStore %274 %273
 %275 = OpLoad %v3float %_1_sda
 OpStore %276 %275
-%277 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %274 %276
+%277 = OpFunctionCall %v3float %blend_set_color_saturation_Qh3h3h3 %274 %276
 OpStore %278 %277
 %279 = OpLoad %float %_0_alpha
 OpStore %280 %279
 %281 = OpLoad %v3float %_2_dsa
 OpStore %282 %281
-%283 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %278 %280 %282
+%283 = OpFunctionCall %v3float %blend_set_color_luminance_Qh3h3hh3 %278 %280 %282
 %284 = OpAccessChain %_ptr_Uniform_v4float %13 %int_1
 %285 = OpLoad %v4float %284
 %286 = OpVectorShuffle %v3float %285 %285 0 1 2
diff --git a/third_party/skia/tests/sksl/blend/BlendSaturation.glsl b/third_party/skia/tests/sksl/blend/BlendSaturation.glsl
index 835398aa7b57b..cc9500a9250f5 100644
--- a/third_party/skia/tests/sksl/blend/BlendSaturation.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendSaturation.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -16,34 +16,34 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSaturation.metal b/third_party/skia/tests/sksl/blend/BlendSaturation.metal
index f02711080456c..f306e7411ff60 100644
--- a/third_party/skia/tests/sksl/blend/BlendSaturation.metal
+++ b/third_party/skia/tests/sksl/blend/BlendSaturation.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
+half3 blend_set_color_luminance_Qh3h3hh3(half3 hueSatColor, half alpha, half3 lumColor) {
     half lum = dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), lumColor);
     half3 result = (lum - dot(half3(0.30000001192092896h, 0.5899999737739563h, 0.10999999940395355h), hueSatColor)) + hueSatColor;
     half minComp = min(min(result.x, result.y), result.z);
@@ -24,29 +24,29 @@ half3 _blend_set_color_luminance_h3h3hh3(half3 hueSatColor, half alpha, half3 lu
         return result;
     }
 }
-half3 _blend_set_color_saturation_helper_h3h3h(half3 minMidMax, half sat) {
+half3 blend_set_color_saturation_helper_Qh3h3h(half3 minMidMax, half sat) {
     if (minMidMax.x < minMidMax.z) {
         return half3(0.0h, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return half3(0.0h);
     }
 }
-half3 _blend_set_color_saturation_h3h3h3(half3 hueLumColor, half3 satColor) {
+half3 blend_set_color_saturation_Qh3h3h3(half3 hueLumColor, half3 satColor) {
     half sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
@@ -55,6 +55,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     half _0_alpha = _uniforms.dst.w * _uniforms.src.w;
     half3 _1_sda = _uniforms.src.xyz * _uniforms.dst.w;
     half3 _2_dsa = _uniforms.dst.xyz * _uniforms.src.w;
-    _out.sk_FragColor = half4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
+    _out.sk_FragColor = half4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + _uniforms.dst.xyz) - _2_dsa) + _uniforms.src.xyz) - _1_sda, (_uniforms.src.w + _uniforms.dst.w) - _0_alpha);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSaturationStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendSaturationStandaloneSettings.glsl
index 28d2d0ae75a95..e7c40c1493ebd 100644
--- a/third_party/skia/tests/sksl/blend/BlendSaturationStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendSaturationStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -16,34 +16,34 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 void main() {
     float _0_alpha = dst.w * src.w;
     vec3 _1_sda = src.xyz * dst.w;
     vec3 _2_dsa = dst.xyz * src.w;
-    sk_FragColor = vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
+    sk_FragColor = vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(_2_dsa, _1_sda), _0_alpha, _2_dsa) + dst.xyz) - _2_dsa) + src.xyz) - _1_sda, (src.w + dst.w) - _0_alpha);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSoftLight.asm.frag b/third_party/skia/tests/sksl/blend/BlendSoftLight.asm.frag
index f19e4aa629967..45b2208cbbd42 100644
--- a/third_party/skia/tests/sksl/blend/BlendSoftLight.asm.frag
+++ b/third_party/skia/tests/sksl/blend/BlendSoftLight.asm.frag
@@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise"
 OpName %_UniformBuffer "_UniformBuffer"
 OpMemberName %_UniformBuffer 0 "src"
 OpMemberName %_UniformBuffer 1 "dst"
-OpName %_soft_light_component_hh2h2 "_soft_light_component_hh2h2"
+OpName %soft_light_component_Qhh2h2 "soft_light_component_Qhh2h2"
 OpName %DSqd "DSqd"
 OpName %DCub "DCub"
 OpName %DaSqd "DaSqd"
@@ -225,7 +225,7 @@ OpDecorate %240 RelaxedPrecision
 %float_0 = OpConstant %float 0
 %_ptr_Function_v4float = OpTypePointer Function %v4float
 %int_0 = OpConstant %int 0
-%_soft_light_component_hh2h2 = OpFunction %float None %15
+%soft_light_component_Qhh2h2 = OpFunction %float None %15
 %17 = OpFunctionParameter %_ptr_Function_v2float
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpLabel
@@ -425,7 +425,7 @@ OpStore %203 %202
 %205 = OpLoad %v4float %204
 %206 = OpVectorShuffle %v2float %205 %205 0 3
 OpStore %207 %206
-%208 = OpFunctionCall %float %_soft_light_component_hh2h2 %203 %207
+%208 = OpFunctionCall %float %soft_light_component_Qhh2h2 %203 %207
 %209 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %210 = OpLoad %v4float %209
 %211 = OpVectorShuffle %v2float %210 %210 1 3
@@ -434,7 +434,7 @@ OpStore %212 %211
 %214 = OpLoad %v4float %213
 %215 = OpVectorShuffle %v2float %214 %214 1 3
 OpStore %216 %215
-%217 = OpFunctionCall %float %_soft_light_component_hh2h2 %212 %216
+%217 = OpFunctionCall %float %soft_light_component_Qhh2h2 %212 %216
 %218 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %219 = OpLoad %v4float %218
 %220 = OpVectorShuffle %v2float %219 %219 2 3
@@ -443,7 +443,7 @@ OpStore %221 %220
 %223 = OpLoad %v4float %222
 %224 = OpVectorShuffle %v2float %223 %223 2 3
 OpStore %225 %224
-%226 = OpFunctionCall %float %_soft_light_component_hh2h2 %221 %225
+%226 = OpFunctionCall %float %soft_light_component_Qhh2h2 %221 %225
 %227 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %228 = OpLoad %v4float %227
 %229 = OpCompositeExtract %float %228 3
diff --git a/third_party/skia/tests/sksl/blend/BlendSoftLight.glsl b/third_party/skia/tests/sksl/blend/BlendSoftLight.glsl
index a2c5a248a4bf9..bcd9e66c091e3 100644
--- a/third_party/skia/tests/sksl/blend/BlendSoftLight.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendSoftLight.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _soft_light_component_hh2h2(vec2 s, vec2 d) {
+float soft_light_component_Qhh2h2(vec2 s, vec2 d) {
     if (2.0 * s.x <= s.y) {
         return (((d.x * d.x) * (s.y - 2.0 * s.x)) / d.y + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
     } else if (4.0 * d.x <= d.y) {
@@ -16,5 +16,5 @@ float _soft_light_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = dst.w == 0.0 ? src : vec4(_soft_light_component_hh2h2(src.xw, dst.xw), _soft_light_component_hh2h2(src.yw, dst.yw), _soft_light_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = dst.w == 0.0 ? src : vec4(soft_light_component_Qhh2h2(src.xw, dst.xw), soft_light_component_Qhh2h2(src.yw, dst.yw), soft_light_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSoftLight.metal b/third_party/skia/tests/sksl/blend/BlendSoftLight.metal
index d9d330a4031a5..9003c2055ffa5 100644
--- a/third_party/skia/tests/sksl/blend/BlendSoftLight.metal
+++ b/third_party/skia/tests/sksl/blend/BlendSoftLight.metal
@@ -10,7 +10,7 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half _soft_light_component_hh2h2(half2 s, half2 d) {
+half soft_light_component_Qhh2h2(half2 s, half2 d) {
     if (2.0h * s.x <= s.y) {
         return (((d.x * d.x) * (s.y - 2.0h * s.x)) / d.y + (1.0h - d.y) * s.x) + d.x * ((-s.y + 2.0h * s.x) + 1.0h);
     } else if (4.0h * d.x <= d.y) {
@@ -26,6 +26,6 @@ half _soft_light_component_hh2h2(half2 s, half2 d) {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    _out.sk_FragColor = _uniforms.dst.w == 0.0h ? _uniforms.src : half4(_soft_light_component_hh2h2(_uniforms.src.xw, _uniforms.dst.xw), _soft_light_component_hh2h2(_uniforms.src.yw, _uniforms.dst.yw), _soft_light_component_hh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
+    _out.sk_FragColor = _uniforms.dst.w == 0.0h ? _uniforms.src : half4(soft_light_component_Qhh2h2(_uniforms.src.xw, _uniforms.dst.xw), soft_light_component_Qhh2h2(_uniforms.src.yw, _uniforms.dst.yw), soft_light_component_Qhh2h2(_uniforms.src.zw, _uniforms.dst.zw), _uniforms.src.w + (1.0h - _uniforms.src.w) * _uniforms.dst.w);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/blend/BlendSoftLightStandaloneSettings.glsl b/third_party/skia/tests/sksl/blend/BlendSoftLightStandaloneSettings.glsl
index 1c5987c44c45b..e9e8480caf7d8 100644
--- a/third_party/skia/tests/sksl/blend/BlendSoftLightStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/blend/BlendSoftLightStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 uniform vec4 src;
 uniform vec4 dst;
-float _soft_light_component_hh2h2(vec2 s, vec2 d) {
+float soft_light_component_Qhh2h2(vec2 s, vec2 d) {
     if (2.0 * s.x <= s.y) {
         return (((d.x * d.x) * (s.y - 2.0 * s.x)) / d.y + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
     } else if (4.0 * d.x <= d.y) {
@@ -16,5 +16,5 @@ float _soft_light_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = dst.w == 0.0 ? src : vec4(_soft_light_component_hh2h2(src.xw, dst.xw), _soft_light_component_hh2h2(src.yw, dst.yw), _soft_light_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = dst.w == 0.0 ? src : vec4(soft_light_component_Qhh2h2(src.xw, dst.xw), soft_light_component_Qhh2h2(src.yw, dst.yw), soft_light_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/errors/ArrayConstructorElementCount.glsl b/third_party/skia/tests/sksl/errors/ArrayConstructorElementCount.glsl
index 822db2d132c70..22c5385d1c746 100644
--- a/third_party/skia/tests/sksl/errors/ArrayConstructorElementCount.glsl
+++ b/third_party/skia/tests/sksl/errors/ArrayConstructorElementCount.glsl
@@ -1,6 +1,6 @@
 ### Compilation failed:
 
-error: 3: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 0)
-error: 4: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 1)
-error: 6: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 3)
+error: 1: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 0)
+error: 2: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 1)
+error: 4: invalid arguments to 'float[2]' constructor (expected 2 elements, but found 3)
 3 errors
diff --git a/third_party/skia/tests/sksl/errors/ArrayOfInvalidSize.glsl b/third_party/skia/tests/sksl/errors/ArrayOfInvalidSize.glsl
index f05f4d6163f8c..850b035fc953f 100644
--- a/third_party/skia/tests/sksl/errors/ArrayOfInvalidSize.glsl
+++ b/third_party/skia/tests/sksl/errors/ArrayOfInvalidSize.glsl
@@ -5,20 +5,22 @@ error: 2: array size must be positive
 error: 3: array size must be positive
 error: 4: expected 'int', but found 'float'
 error: 5: integer is out of range for type 'int': 4000000000
-error: 5: array size must be an integer
+error: 5: array size must be positive
 error: 6: expected 'int', but found 'bool'
 error: 7: expected 'int', but found 'bool'
 error: 8: expected 'int', but found 'int2'
 error: 9: missing index in '[]'
 error: 10: integer is out of range for type 'int': 4000000000
-error: 12: array size must be positive
+error: 11: integer is out of range for type 'int': 100000002004087734272
 error: 13: array size must be positive
 error: 14: array size must be positive
-error: 15: array size must be an integer
-error: 16: array size out of bounds
-error: 17: array size must be an integer
+error: 15: array size must be positive
+error: 16: array size must be an integer
+error: 17: array size out of bounds
 error: 18: array size must be an integer
 error: 19: array size must be an integer
-error: 20: expected array dimension
-error: 21: integer is out of range for type 'int': 4000000000
-21 errors
+error: 20: array size must be an integer
+error: 21: expected array dimension
+error: 22: integer is out of range for type 'int': 4000000000
+error: 23: integer is out of range for type 'int': 100000002004087734272
+23 errors
diff --git a/third_party/skia/tests/sksl/errors/ArrayOfVoid.glsl b/third_party/skia/tests/sksl/errors/ArrayOfVoid.glsl
index da20b5bb44ab6..64f7e5d648cb7 100644
--- a/third_party/skia/tests/sksl/errors/ArrayOfVoid.glsl
+++ b/third_party/skia/tests/sksl/errors/ArrayOfVoid.glsl
@@ -1,10 +1,10 @@
 ### Compilation failed:
 
-error: 3: type 'void' may not be used in an array
+error: 1: type 'void' may not be used in an array
+error: 2: type 'void' may not be used in an array
 error: 4: type 'void' may not be used in an array
+error: 4: function 'funcF' can exit without returning a value
+error: 5: type 'void' may not be used in an array
 error: 6: type 'void' may not be used in an array
-error: 6: function 'funcF' can exit without returning a value
 error: 7: type 'void' may not be used in an array
-error: 8: type 'void' may not be used in an array
-error: 9: type 'void' may not be used in an array
 7 errors
diff --git a/third_party/skia/tests/sksl/errors/ComparisonDimensional.glsl b/third_party/skia/tests/sksl/errors/ComparisonDimensional.glsl
new file mode 100644
index 0000000000000..c28186f904c0a
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/ComparisonDimensional.glsl
@@ -0,0 +1,19 @@
+### Compilation failed:
+
+error: 5: type mismatch: '==' cannot operate on 'float2', 'float'
+error: 5: type mismatch: '==' cannot operate on 'float2', 'float2x2'
+error: 5: type mismatch: '==' cannot operate on 'float2x2', 'float'
+error: 6: type mismatch: '==' cannot operate on 'float', 'float2'
+error: 6: type mismatch: '==' cannot operate on 'float2x2', 'float2'
+error: 6: type mismatch: '==' cannot operate on 'float', 'float2x2'
+error: 7: type mismatch: '!=' cannot operate on 'float2', 'float'
+error: 7: type mismatch: '!=' cannot operate on 'float2', 'float2x2'
+error: 7: type mismatch: '!=' cannot operate on 'float2x2', 'float'
+error: 8: type mismatch: '!=' cannot operate on 'float', 'float2'
+error: 8: type mismatch: '!=' cannot operate on 'float2x2', 'float2'
+error: 8: type mismatch: '!=' cannot operate on 'float', 'float2x2'
+error: 14: type mismatch: '==' cannot operate on 'float2x2', 'float3x3'
+error: 14: type mismatch: '!=' cannot operate on 'float2x2', 'float3x3'
+error: 20: type mismatch: '==' cannot operate on 'float2', 'float3'
+error: 20: type mismatch: '!=' cannot operate on 'float2', 'float3'
+16 errors
diff --git a/third_party/skia/tests/sksl/errors/IncompleteExpression.glsl b/third_party/skia/tests/sksl/errors/IncompleteExpression.glsl
index 4959ad8e190f2..9675f837773ad 100644
--- a/third_party/skia/tests/sksl/errors/IncompleteExpression.glsl
+++ b/third_party/skia/tests/sksl/errors/IncompleteExpression.glsl
@@ -1,5 +1,4 @@
 ### Compilation failed:
 
 error: 2: expected '(' to begin constructor invocation
-error: 3: expected a type, but found 'return'
-2 errors
+1 error
diff --git a/third_party/skia/tests/sksl/errors/IncompleteFunctionCall.glsl b/third_party/skia/tests/sksl/errors/IncompleteFunctionCall.glsl
index b82ac36a04572..c606c42cffda8 100644
--- a/third_party/skia/tests/sksl/errors/IncompleteFunctionCall.glsl
+++ b/third_party/skia/tests/sksl/errors/IncompleteFunctionCall.glsl
@@ -1,5 +1,4 @@
 ### Compilation failed:
 
 error: 2: expected '(' to begin function call
-error: 3: expected a type, but found 'return'
-2 errors
+1 error
diff --git a/third_party/skia/tests/sksl/errors/InterfaceBlockMemberReservedName.glsl b/third_party/skia/tests/sksl/errors/InterfaceBlockMemberReservedName.glsl
new file mode 100644
index 0000000000000..1fe3b9b215410
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/InterfaceBlockMemberReservedName.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 2: expected an identifier, but found type 'float'
+1 error
diff --git a/third_party/skia/tests/sksl/errors/InterfaceBlockReservedName.glsl b/third_party/skia/tests/sksl/errors/InterfaceBlockReservedName.glsl
new file mode 100644
index 0000000000000..49164ae826b03
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/InterfaceBlockReservedName.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 3: expected ';', but found 'float'
+1 error
diff --git a/third_party/skia/tests/sksl/errors/MultipleFields.glsl b/third_party/skia/tests/sksl/errors/MultipleFields.glsl
new file mode 100644
index 0000000000000..66932d7b34079
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/MultipleFields.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: field 'var' was already defined in the same struct ('Varyings')
+1 error
diff --git a/third_party/skia/tests/sksl/errors/MultipleFieldsInInterfaceBlocks.glsl b/third_party/skia/tests/sksl/errors/MultipleFieldsInInterfaceBlocks.glsl
new file mode 100644
index 0000000000000..55ecc1224b538
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/MultipleFieldsInInterfaceBlocks.glsl
@@ -0,0 +1,5 @@
+### Compilation failed:
+
+error: 1: field 'f' was already defined in the same interface block ('IB')
+error: 7: symbol 'f' was already defined
+2 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz38106.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz38106.glsl
index 1e973cb57c621..79bf67a4709a8 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz38106.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz38106.glsl
@@ -2,5 +2,5 @@
 
 error: 1: expected identifier, but found ';'
 error: 1: expected field name or swizzle mask after '.'
-error: 2: expected ';', but found ''
+error: 8: expected ';', but found ''
 3 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz38107.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz38107.glsl
index bc5afa7f21e29..5da5ebf2fc7fa 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz38107.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz38107.glsl
@@ -1,4 +1,4 @@
 ### Compilation failed:
 
-error: 1: invalid token
+error: 6: invalid token
 1 error
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz38865.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz38865.glsl
index a9745e4903f79..1a31a22fcd34c 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz38865.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz38865.glsl
@@ -1,4 +1,4 @@
 ### Compilation failed:
 
-error: 1: expected expression, but found ''
+error: 5: expected expression, but found ''
 1 error
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz38944.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz38944.glsl
index a9745e4903f79..1a31a22fcd34c 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz38944.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz38944.glsl
@@ -1,4 +1,4 @@
 ### Compilation failed:
 
-error: 1: expected expression, but found ''
+error: 5: expected expression, but found ''
 1 error
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz40479.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz40479.glsl
index 6047fff3a8423..d4025948d469a 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz40479.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz40479.glsl
@@ -3,6 +3,6 @@
 error: 1: integer is out of range for type 'int': 4016112253
 error: 1: array size must be an integer
 error: 1: type 'void' may not be used in an array
-error: 2: expected ']', but found ''
-error: 2: expected an identifier, but found ''
+error: 10: expected ']', but found ''
+error: 10: expected an identifier, but found ''
 5 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz40660.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz40660.glsl
index 3f669decb5ebd..9fb063af2e5d4 100644
--- a/third_party/skia/tests/sksl/errors/Ossfuzz40660.glsl
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz40660.glsl
@@ -4,7 +4,6 @@ error: 1: unknown identifier 'f'
 error: 1: expected ')' to complete function arguments, but found '`'
 error: 1: expected ')' to complete expression, but found '`'
 error: 1: integer is out of range for type 'int': 3689348940
-error: 1: integer is out of range for type 'int': 3689348940
 error: 2: expected ']' to complete array access expression, but found ''
 error: 2: expected ';', but found ''
-7 errors
+6 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44045.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44045.glsl
new file mode 100644
index 0000000000000..a288e4c050171
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44045.glsl
@@ -0,0 +1,5 @@
+### Compilation failed:
+
+error: 1: integer is out of range for type 'int': 3976000000
+error: 1: array size must be positive
+2 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44551.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44551.glsl
new file mode 100644
index 0000000000000..1b5b1cb4e2fbc
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44551.glsl
@@ -0,0 +1,5 @@
+### Compilation failed:
+
+error: 6: type mismatch: '+' cannot operate on 'int', '<INVALID>'
+error: 8: expected ';', but found 'o'
+2 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44555.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44555.glsl
new file mode 100644
index 0000000000000..4b73323932e2a
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44555.glsl
@@ -0,0 +1,7 @@
+### Compilation failed:
+
+error: 2: unknown identifier 'intts'
+error: 2: unknown identifier 'qr'
+error: 6: unknown identifier 'c'
+error: 9: expected expression, but found '/='
+4 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44557.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44557.glsl
new file mode 100644
index 0000000000000..1207028de0c01
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44557.glsl
@@ -0,0 +1,158 @@
+### Compilation failed:
+
+error: 13: unknown identifier 'v2'
+error: 13: expected ')' to complete function arguments, but found 's'
+error: 13: '<INVALID>' is not a valid parameter to 'int3' constructor
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'z'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'rr'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 's'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'z'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'rr'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'b'
+error: 13: unknown identifier 'r'
+error: 13: unknown identifier 'r'
+error: 13: expected ')' to complete function arguments, but found '{'
+error: 13: invalid arguments to 'int3[2]' constructor (expected 2 elements, but found 151)
+error: 13: expected ':', but found '{'
+155 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44559.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44559.glsl
new file mode 100644
index 0000000000000..af96fc798020a
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44559.glsl
@@ -0,0 +1,5 @@
+### Compilation failed:
+
+error: 1: type mismatch: '<' cannot operate on 'int', '<INVALID>'
+error: 1: expected ';', but found 'iD'
+2 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44561.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44561.glsl
new file mode 100644
index 0000000000000..ad17204238a19
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44561.glsl
@@ -0,0 +1,10 @@
+### Compilation failed:
+
+error: 1: unknown identifier 'ix'
+error: 1: invalid swizzle component 'c'
+error: 1: expected ')' to complete expression, but found '{'
+error: 1: expected ')' to complete function arguments, but found 'case'
+error: 1: not a function
+error: 1: expected ']' to complete array access expression, but found '0'
+error: 1: expected ';', but found ':'
+7 errors
diff --git a/third_party/skia/tests/sksl/errors/Ossfuzz44565.glsl b/third_party/skia/tests/sksl/errors/Ossfuzz44565.glsl
new file mode 100644
index 0000000000000..d336c1008f87a
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/Ossfuzz44565.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 2: expected expression, but found 'in'
+1 error
diff --git a/third_party/skia/tests/sksl/errors/OverflowFloatLiteral.glsl b/third_party/skia/tests/sksl/errors/OverflowFloatLiteral.glsl
index 00523fd6082db..cb52faeda7a00 100644
--- a/third_party/skia/tests/sksl/errors/OverflowFloatLiteral.glsl
+++ b/third_party/skia/tests/sksl/errors/OverflowFloatLiteral.glsl
@@ -1,5 +1,4 @@
 ### Compilation failed:
 
 error: 2: floating-point value is too large: 3.41e+38
-error: 2: type mismatch: '=' cannot operate on 'half', 'half4'
-2 errors
+1 error
diff --git a/third_party/skia/tests/sksl/errors/PrivateTypes.glsl b/third_party/skia/tests/sksl/errors/PrivateTypes.glsl
index 6b961c2f007a6..dbb53e36bb766 100644
--- a/third_party/skia/tests/sksl/errors/PrivateTypes.glsl
+++ b/third_party/skia/tests/sksl/errors/PrivateTypes.glsl
@@ -4,6 +4,6 @@ error: 2: type '$mat' is private
 error: 6: type '$bvec' is private
 error: 9: type '$ivec' is private
 error: 10: type '$genType' is private
-error: 11: cannot construct '$mat'
-error: 12: unknown identifier '$floatLiteral'
+error: 11: type '$mat' is private
+error: 12: type '$floatLiteral' is private
 6 errors
diff --git a/third_party/skia/tests/sksl/errors/PrivateVariables.glsl b/third_party/skia/tests/sksl/errors/PrivateVariables.glsl
new file mode 100644
index 0000000000000..bdf27be2c3f98
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/PrivateVariables.glsl
@@ -0,0 +1,7 @@
+### Compilation failed:
+
+error: 1: name '$a' is reserved
+error: 2: name '$b' is reserved
+error: 3: name '$c' is reserved
+error: 4: name '$d' is reserved
+4 errors
diff --git a/third_party/skia/tests/sksl/errors/PrototypeInFuncBody.glsl b/third_party/skia/tests/sksl/errors/PrototypeInFuncBody.glsl
index 811fa12f602d3..f32373f625620 100644
--- a/third_party/skia/tests/sksl/errors/PrototypeInFuncBody.glsl
+++ b/third_party/skia/tests/sksl/errors/PrototypeInFuncBody.glsl
@@ -1,5 +1,4 @@
 ### Compilation failed:
 
 error: 2: expected ';', but found '('
-error: 2: expected expression, but found ')'
-2 errors
+1 error
diff --git a/third_party/skia/tests/sksl/errors/StructMemberReservedName.glsl b/third_party/skia/tests/sksl/errors/StructMemberReservedName.glsl
new file mode 100644
index 0000000000000..1fe3b9b215410
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/StructMemberReservedName.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 2: expected an identifier, but found type 'float'
+1 error
diff --git a/third_party/skia/tests/sksl/errors/StructVariableReservedName.glsl b/third_party/skia/tests/sksl/errors/StructVariableReservedName.glsl
new file mode 100644
index 0000000000000..49164ae826b03
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/StructVariableReservedName.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 3: expected ';', but found 'float'
+1 error
diff --git a/third_party/skia/tests/sksl/errors/UnassignedOutParameter.glsl b/third_party/skia/tests/sksl/errors/UnassignedOutParameter.glsl
new file mode 100644
index 0000000000000..453cd77d218ad
--- /dev/null
+++ b/third_party/skia/tests/sksl/errors/UnassignedOutParameter.glsl
@@ -0,0 +1,5 @@
+### Compilation failed:
+
+error: 4: function 'testOut' never assigns a value to out parameter 'b'
+error: 4: function 'testOut' never assigns a value to out parameter 'c'
+2 errors
diff --git a/third_party/skia/tests/sksl/folding/ArraySizeFolding.glsl b/third_party/skia/tests/sksl/folding/ArraySizeFolding.glsl
index 865c8be6cc749..90ff051119e1d 100644
--- a/third_party/skia/tests/sksl/folding/ArraySizeFolding.glsl
+++ b/third_party/skia/tests/sksl/folding/ArraySizeFolding.glsl
@@ -14,8 +14,10 @@ bool test_param_bff(float a[3], float b[3]) {
 vec4 main() {
     float f[3];
     float g[3];
-    int _2_b[2];
-    int _3_c[2];
-    int _4_d[2];
-    return ((check_array_is_int_2_bi(_2_b) && check_array_is_int_2_bi(_3_c)) && check_array_is_int_2_bi(_4_d)) && test_param_bff(f, g) ? colorGreen : colorRed;
+    int _3_b[2];
+    int _4_c[2];
+    int _5_d[2];
+    int _6_e[2];
+    int _7_f[2];
+    return ((((check_array_is_int_2_bi(_3_b) && check_array_is_int_2_bi(_4_c)) && check_array_is_int_2_bi(_5_d)) && check_array_is_int_2_bi(_6_e)) && check_array_is_int_2_bi(_7_f)) && test_param_bff(f, g) ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/tests/sksl/folding/MatrixFoldingES2.glsl b/third_party/skia/tests/sksl/folding/MatrixFoldingES2.glsl
index 5bf6af6b662f6..7eb59df967376 100644
--- a/third_party/skia/tests/sksl/folding/MatrixFoldingES2.glsl
+++ b/third_party/skia/tests/sksl/folding/MatrixFoldingES2.glsl
@@ -4,6 +4,22 @@ uniform mat2 testMatrix2x2;
 uniform vec4 colorRed;
 uniform vec4 colorGreen;
 uniform float unknownInput;
+bool test_matrix_op_scalar_float_b() {
+    bool ok = true;
+    return ok;
+}
+bool test_matrix_op_scalar_half_b() {
+    bool ok = true;
+    return ok;
+}
+bool test_matrix_op_matrix_float_b() {
+    bool ok = true;
+    return ok;
+}
+bool test_matrix_op_matrix_half_b() {
+    bool ok = true;
+    return ok;
+}
 vec4 main() {
     bool _0_ok = true;
     _0_ok = _0_ok && mat3(unknownInput) == mat3(mat2(1.0));
@@ -23,5 +39,5 @@ vec4 main() {
         _0_ok = _0_ok && mat4(mat3(testMatrix2x2))[0] == vec4(1.0, 2.0, 0.0, 0.0);
         _0_ok = _0_ok && mat4(mat3(testMatrix2x2))[1] == vec4(3.0, 4.0, 0.0, 0.0);
     }
-    return _0_ok ? colorGreen : colorRed;
+    return (((_0_ok && test_matrix_op_scalar_float_b()) && test_matrix_op_scalar_half_b()) && test_matrix_op_matrix_float_b()) && test_matrix_op_matrix_half_b() ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/tests/sksl/folding/MatrixFoldingES3.glsl b/third_party/skia/tests/sksl/folding/MatrixFoldingES3.glsl
index f40eba41c84d5..5b733ccea067a 100644
--- a/third_party/skia/tests/sksl/folding/MatrixFoldingES3.glsl
+++ b/third_party/skia/tests/sksl/folding/MatrixFoldingES3.glsl
@@ -2,7 +2,19 @@
 out vec4 sk_FragColor;
 uniform vec4 colorRed;
 uniform vec4 colorGreen;
+bool test_eq_half_b() {
+    bool ok = true;
+    return ok;
+}
+bool test_matrix_op_matrix_float_b() {
+    bool ok = true;
+    return ok;
+}
+bool test_matrix_op_matrix_half_b() {
+    bool ok = true;
+    return ok;
+}
 vec4 main() {
     bool _0_ok = true;
-    return _0_ok ? colorGreen : colorRed;
+    return ((_0_ok && test_eq_half_b()) && test_matrix_op_matrix_float_b()) && test_matrix_op_matrix_half_b() ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/tests/sksl/folding/SwitchCaseFolding.glsl b/third_party/skia/tests/sksl/folding/SwitchCaseFolding.glsl
new file mode 100644
index 0000000000000..b5d41db442ec8
--- /dev/null
+++ b/third_party/skia/tests/sksl/folding/SwitchCaseFolding.glsl
@@ -0,0 +1,25 @@
+
+out vec4 sk_FragColor;
+uniform vec4 colorRed;
+uniform vec4 colorGreen;
+vec4 main() {
+    vec4 color = colorRed;
+    switch (int(colorGreen.y)) {
+        case 0:
+            break;
+        case 1:
+            color = colorGreen;
+            break;
+        case 2:
+            break;
+        case 3:
+            break;
+        case 4:
+            break;
+        case 5:
+            break;
+        default:
+            break;
+    }
+    return color;
+}
diff --git a/third_party/skia/tests/sksl/errors/LastFragColorWithoutCaps.glsl b/third_party/skia/tests/sksl/glsl/LastFragColorWithoutCaps.glsl
similarity index 100%
rename from third_party/skia/tests/sksl/errors/LastFragColorWithoutCaps.glsl
rename to third_party/skia/tests/sksl/glsl/LastFragColorWithoutCaps.glsl
diff --git a/third_party/skia/tests/sksl/inliner/ExponentialGrowth.glsl b/third_party/skia/tests/sksl/inliner/ExponentialGrowth.glsl
index 4c8b3c6ec119b..3d20a6b38cd56 100644
--- a/third_party/skia/tests/sksl/inliner/ExponentialGrowth.glsl
+++ b/third_party/skia/tests/sksl/inliner/ExponentialGrowth.glsl
@@ -82,7 +82,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
@@ -164,7 +163,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
@@ -246,7 +244,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
 }
 void fn7_v() {
     sk_FragColor.x = 0.0;
@@ -492,7 +489,6 @@ void fn7_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     fn6_v();
     fn6_v();
 }
diff --git a/third_party/skia/tests/sksl/inliner/ExponentialGrowthStandaloneSettings.glsl b/third_party/skia/tests/sksl/inliner/ExponentialGrowthStandaloneSettings.glsl
index 4c8b3c6ec119b..3d20a6b38cd56 100644
--- a/third_party/skia/tests/sksl/inliner/ExponentialGrowthStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/inliner/ExponentialGrowthStandaloneSettings.glsl
@@ -82,7 +82,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
@@ -164,7 +163,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
@@ -246,7 +244,6 @@ void fn6_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
 }
 void fn7_v() {
     sk_FragColor.x = 0.0;
@@ -492,7 +489,6 @@ void fn7_v() {
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
     sk_FragColor.x = 0.0;
-    false;
     fn6_v();
     fn6_v();
 }
diff --git a/third_party/skia/tests/sksl/inliner/ForWithoutReturnInsideCanBeInlined.glsl b/third_party/skia/tests/sksl/inliner/ForWithoutReturnInsideCanBeInlined.glsl
index 43f91704dccb4..3603a62c2296b 100644
--- a/third_party/skia/tests/sksl/inliner/ForWithoutReturnInsideCanBeInlined.glsl
+++ b/third_party/skia/tests/sksl/inliner/ForWithoutReturnInsideCanBeInlined.glsl
@@ -2,9 +2,9 @@
 out vec4 sk_FragColor;
 uniform vec4 colorGreen;
 vec4 main() {
-    vec4 _0_result;
+    vec4 _0_result = colorGreen;
     for (int _1_x = 0;_1_x < 4; ++_1_x) {
-        _0_result[_1_x] = colorGreen[_1_x];
+        _0_result *= colorGreen;
     }
     return _0_result;
 }
diff --git a/third_party/skia/tests/sksl/inliner/InlineWithNestedCalls.glsl b/third_party/skia/tests/sksl/inliner/InlineWithNestedCalls.glsl
index 1a2d8953d3e7d..e11776904fab6 100644
--- a/third_party/skia/tests/sksl/inliner/InlineWithNestedCalls.glsl
+++ b/third_party/skia/tests/sksl/inliner/InlineWithNestedCalls.glsl
@@ -40,6 +40,5 @@ void main() {
     --_3_x;
     _3_x = 42.0;
     _2_y = _3_x;
-    _2_y;
     sk_FragColor.x = z;
 }
diff --git a/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabled.glsl b/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabled.glsl
index 33f0a3e1e46f3..bc03088418d7d 100644
--- a/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabled.glsl
+++ b/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabled.glsl
@@ -7,7 +7,7 @@ vec4 blend_src_in_h4h4h4(vec4 src, vec4 dst) {
 vec4 blend_dst_in_h4h4h4(vec4 src, vec4 dst) {
     return dst * src.w;
 }
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -21,36 +21,36 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 vec4 blend_hue_h4h4h4(vec4 src, vec4 dst) {
     float alpha = dst.w * src.w;
     vec3 sda = src.xyz * dst.w;
     vec3 dsa = dst.xyz * src.w;
-    return vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(sda, dsa), alpha, dsa) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
+    return vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(sda, dsa), alpha, dsa) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
 }
 float singleuse_h() {
     return 1.25;
diff --git a/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabledStandaloneSettings.glsl b/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabledStandaloneSettings.glsl
index d735e1cef4397..e4afa44c880bc 100644
--- a/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabledStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/inliner/InlinerCanBeDisabledStandaloneSettings.glsl
@@ -1,7 +1,7 @@
 
 out vec4 sk_FragColor;
 uniform vec4 color;
-vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
+vec3 blend_set_color_luminance_Qh3h3hh3(vec3 hueSatColor, float alpha, vec3 lumColor) {
     float lum = dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), lumColor);
     vec3 result = (lum - dot(vec3(0.30000001192092896, 0.5899999737739563, 0.10999999940395355), hueSatColor)) + hueSatColor;
     float minComp = min(min(result.x, result.y), result.z);
@@ -15,36 +15,36 @@ vec3 _blend_set_color_luminance_h3h3hh3(vec3 hueSatColor, float alpha, vec3 lumC
         return result;
     }
 }
-vec3 _blend_set_color_saturation_helper_h3h3h(vec3 minMidMax, float sat) {
+vec3 blend_set_color_saturation_helper_Qh3h3h(vec3 minMidMax, float sat) {
     if (minMidMax.x < minMidMax.z) {
         return vec3(0.0, (sat * (minMidMax.y - minMidMax.x)) / (minMidMax.z - minMidMax.x), sat);
     } else {
         return vec3(0.0);
     }
 }
-vec3 _blend_set_color_saturation_h3h3h3(vec3 hueLumColor, vec3 satColor) {
+vec3 blend_set_color_saturation_Qh3h3h3(vec3 hueLumColor, vec3 satColor) {
     float sat = max(max(satColor.x, satColor.y), satColor.z) - min(min(satColor.x, satColor.y), satColor.z);
     if (hueLumColor.x <= hueLumColor.y) {
         if (hueLumColor.y <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor, sat);
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor, sat);
         } else if (hueLumColor.x <= hueLumColor.z) {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.xzy, sat).xzy;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.xzy, sat).xzy;
         } else {
-            return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zxy, sat).yzx;
+            return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zxy, sat).yzx;
         }
     } else if (hueLumColor.x <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yxz, sat).yxz;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yxz, sat).yxz;
     } else if (hueLumColor.y <= hueLumColor.z) {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.yzx, sat).zxy;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.yzx, sat).zxy;
     } else {
-        return _blend_set_color_saturation_helper_h3h3h(hueLumColor.zyx, sat).zyx;
+        return blend_set_color_saturation_helper_Qh3h3h(hueLumColor.zyx, sat).zyx;
     }
 }
 vec4 blend_hue_h4h4h4(vec4 src, vec4 dst) {
     float alpha = dst.w * src.w;
     vec3 sda = src.xyz * dst.w;
     vec3 dsa = dst.xyz * src.w;
-    return vec4((((_blend_set_color_luminance_h3h3hh3(_blend_set_color_saturation_h3h3h3(sda, dsa), alpha, dsa) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
+    return vec4((((blend_set_color_luminance_Qh3h3hh3(blend_set_color_saturation_Qh3h3h3(sda, dsa), alpha, dsa) + dst.xyz) - dsa) + src.xyz) - sda, (src.w + dst.w) - alpha);
 }
 void main() {
     float _1_c = color.x * color.y + color.z;
diff --git a/third_party/skia/tests/sksl/inliner/Ossfuzz37994.glsl b/third_party/skia/tests/sksl/inliner/Ossfuzz37994.glsl
index 57eaa4e133f84..694be6075c665 100644
--- a/third_party/skia/tests/sksl/inliner/Ossfuzz37994.glsl
+++ b/third_party/skia/tests/sksl/inliner/Ossfuzz37994.glsl
@@ -4,6 +4,5 @@ vec4 colorGreen;
 vec4 main() {
     vec2 _0_x = vec2(2.0);
     _0_x = vec2(0.70710676908493042, 0.70710676908493042);
-    _0_x;
     return colorGreen;
 }
diff --git a/third_party/skia/tests/sksl/intrinsics/ClampFloat.asm.frag b/third_party/skia/tests/sksl/intrinsics/ClampFloat.asm.frag
index e0402f90f8214..fb7b2575a7028 100644
--- a/third_party/skia/tests/sksl/intrinsics/ClampFloat.asm.frag
+++ b/third_party/skia/tests/sksl/intrinsics/ClampFloat.asm.frag
@@ -56,34 +56,34 @@ OpDecorate %87 RelaxedPrecision
 OpDecorate %88 RelaxedPrecision
 OpDecorate %89 RelaxedPrecision
 OpDecorate %90 RelaxedPrecision
-OpDecorate %97 RelaxedPrecision
-OpDecorate %98 RelaxedPrecision
-OpDecorate %103 RelaxedPrecision
-OpDecorate %104 RelaxedPrecision
-OpDecorate %105 RelaxedPrecision
+OpDecorate %99 RelaxedPrecision
+OpDecorate %100 RelaxedPrecision
+OpDecorate %101 RelaxedPrecision
+OpDecorate %102 RelaxedPrecision
+OpDecorate %109 RelaxedPrecision
+OpDecorate %110 RelaxedPrecision
 OpDecorate %111 RelaxedPrecision
 OpDecorate %112 RelaxedPrecision
 OpDecorate %113 RelaxedPrecision
-OpDecorate %119 RelaxedPrecision
+OpDecorate %114 RelaxedPrecision
+OpDecorate %122 RelaxedPrecision
+OpDecorate %123 RelaxedPrecision
+OpDecorate %124 RelaxedPrecision
+OpDecorate %125 RelaxedPrecision
+OpDecorate %126 RelaxedPrecision
 OpDecorate %127 RelaxedPrecision
-OpDecorate %128 RelaxedPrecision
-OpDecorate %129 RelaxedPrecision
-OpDecorate %130 RelaxedPrecision
+OpDecorate %135 RelaxedPrecision
+OpDecorate %136 RelaxedPrecision
 OpDecorate %137 RelaxedPrecision
 OpDecorate %138 RelaxedPrecision
-OpDecorate %139 RelaxedPrecision
-OpDecorate %140 RelaxedPrecision
-OpDecorate %141 RelaxedPrecision
-OpDecorate %142 RelaxedPrecision
+OpDecorate %144 RelaxedPrecision
+OpDecorate %145 RelaxedPrecision
 OpDecorate %150 RelaxedPrecision
 OpDecorate %151 RelaxedPrecision
 OpDecorate %152 RelaxedPrecision
-OpDecorate %153 RelaxedPrecision
-OpDecorate %154 RelaxedPrecision
-OpDecorate %155 RelaxedPrecision
-OpDecorate %163 RelaxedPrecision
-OpDecorate %164 RelaxedPrecision
-OpDecorate %165 RelaxedPrecision
+OpDecorate %158 RelaxedPrecision
+OpDecorate %159 RelaxedPrecision
+OpDecorate %160 RelaxedPrecision
 OpDecorate %166 RelaxedPrecision
 OpDecorate %172 RelaxedPrecision
 OpDecorate %173 RelaxedPrecision
@@ -134,12 +134,12 @@ OpDecorate %207 RelaxedPrecision
 %v3float = OpTypeVector %float 3
 %v3bool = OpTypeVector %bool 3
 %v4bool = OpTypeVector %bool 4
-%103 = OpConstantComposite %v2float %float_n1 %float_0
-%111 = OpConstantComposite %v3float %float_n1 %float_0 %float_0_75
-%139 = OpConstantComposite %v2float %float_n1 %float_n2
-%140 = OpConstantComposite %v2float %float_1 %float_2
-%152 = OpConstantComposite %v3float %float_n1 %float_n2 %float_n2
-%153 = OpConstantComposite %v3float %float_1 %float_2 %float_0_5
+%111 = OpConstantComposite %v2float %float_n1 %float_n2
+%112 = OpConstantComposite %v2float %float_1 %float_2
+%124 = OpConstantComposite %v3float %float_n1 %float_n2 %float_n2
+%125 = OpConstantComposite %v3float %float_1 %float_2 %float_0_5
+%150 = OpConstantComposite %v2float %float_n1 %float_0
+%158 = OpConstantComposite %v3float %float_n1 %float_0 %float_0_75
 %185 = OpConstantComposite %v3float %float_n1 %float_0 %float_0_5
 %int_1 = OpConstant %int 1
 %int_2 = OpConstant %int 2
@@ -219,96 +219,96 @@ OpBranch %84
 OpSelectionMerge %96 None
 OpBranchConditional %94 %95 %96
 %95 = OpLabel
-%97 = OpLoad %v4float %expectedA
-%98 = OpCompositeExtract %float %97 0
-%99 = OpFOrdEqual %bool %float_n1 %98
+%98 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%99 = OpLoad %v4float %98
+%100 = OpCompositeExtract %float %99 0
+%97 = OpExtInst %float %1 FClamp %100 %float_n1 %float_1
+%101 = OpLoad %v4float %expectedB
+%102 = OpCompositeExtract %float %101 0
+%103 = OpFOrdEqual %bool %97 %102
 OpBranch %96
 %96 = OpLabel
-%100 = OpPhi %bool %false %84 %99 %95
-OpSelectionMerge %102 None
-OpBranchConditional %100 %101 %102
-%101 = OpLabel
-%104 = OpLoad %v4float %expectedA
-%105 = OpVectorShuffle %v2float %104 %104 0 1
-%106 = OpFOrdEqual %v2bool %103 %105
-%107 = OpAll %bool %106
-OpBranch %102
-%102 = OpLabel
-%108 = OpPhi %bool %false %96 %107 %101
-OpSelectionMerge %110 None
-OpBranchConditional %108 %109 %110
-%109 = OpLabel
-%112 = OpLoad %v4float %expectedA
-%113 = OpVectorShuffle %v3float %112 %112 0 1 2
-%114 = OpFOrdEqual %v3bool %111 %113
-%115 = OpAll %bool %114
-OpBranch %110
-%110 = OpLabel
-%116 = OpPhi %bool %false %102 %115 %109
-OpSelectionMerge %118 None
-OpBranchConditional %116 %117 %118
-%117 = OpLabel
-%119 = OpLoad %v4float %expectedA
-%120 = OpFOrdEqual %v4bool %31 %119
-%121 = OpAll %bool %120
-OpBranch %118
+%104 = OpPhi %bool %false %84 %103 %95
+OpSelectionMerge %106 None
+OpBranchConditional %104 %105 %106
+%105 = OpLabel
+%108 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%109 = OpLoad %v4float %108
+%110 = OpVectorShuffle %v2float %109 %109 0 1
+%107 = OpExtInst %v2float %1 FClamp %110 %111 %112
+%113 = OpLoad %v4float %expectedB
+%114 = OpVectorShuffle %v2float %113 %113 0 1
+%115 = OpFOrdEqual %v2bool %107 %114
+%116 = OpAll %bool %115
+OpBranch %106
+%106 = OpLabel
+%117 = OpPhi %bool %false %96 %116 %105
+OpSelectionMerge %119 None
+OpBranchConditional %117 %118 %119
 %118 = OpLabel
-%122 = OpPhi %bool %false %110 %121 %117
-OpSelectionMerge %124 None
-OpBranchConditional %122 %123 %124
-%123 = OpLabel
-%126 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%127 = OpLoad %v4float %126
-%128 = OpCompositeExtract %float %127 0
-%125 = OpExtInst %float %1 FClamp %128 %float_n1 %float_1
-%129 = OpLoad %v4float %expectedB
-%130 = OpCompositeExtract %float %129 0
-%131 = OpFOrdEqual %bool %125 %130
-OpBranch %124
-%124 = OpLabel
-%132 = OpPhi %bool %false %118 %131 %123
-OpSelectionMerge %134 None
-OpBranchConditional %132 %133 %134
-%133 = OpLabel
-%136 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%137 = OpLoad %v4float %136
-%138 = OpVectorShuffle %v2float %137 %137 0 1
-%135 = OpExtInst %v2float %1 FClamp %138 %139 %140
-%141 = OpLoad %v4float %expectedB
-%142 = OpVectorShuffle %v2float %141 %141 0 1
-%143 = OpFOrdEqual %v2bool %135 %142
-%144 = OpAll %bool %143
-OpBranch %134
-%134 = OpLabel
-%145 = OpPhi %bool %false %124 %144 %133
-OpSelectionMerge %147 None
-OpBranchConditional %145 %146 %147
-%146 = OpLabel
-%149 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%150 = OpLoad %v4float %149
-%151 = OpVectorShuffle %v3float %150 %150 0 1 2
-%148 = OpExtInst %v3float %1 FClamp %151 %152 %153
-%154 = OpLoad %v4float %expectedB
-%155 = OpVectorShuffle %v3float %154 %154 0 1 2
-%156 = OpFOrdEqual %v3bool %148 %155
-%157 = OpAll %bool %156
-OpBranch %147
-%147 = OpLabel
-%158 = OpPhi %bool %false %134 %157 %146
-OpSelectionMerge %160 None
-OpBranchConditional %158 %159 %160
-%159 = OpLabel
-%162 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%163 = OpLoad %v4float %162
-%164 = OpLoad %v4float %clampLow
-%165 = OpLoad %v4float %clampHigh
-%161 = OpExtInst %v4float %1 FClamp %163 %164 %165
-%166 = OpLoad %v4float %expectedB
-%167 = OpFOrdEqual %v4bool %161 %166
+%121 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%122 = OpLoad %v4float %121
+%123 = OpVectorShuffle %v3float %122 %122 0 1 2
+%120 = OpExtInst %v3float %1 FClamp %123 %124 %125
+%126 = OpLoad %v4float %expectedB
+%127 = OpVectorShuffle %v3float %126 %126 0 1 2
+%128 = OpFOrdEqual %v3bool %120 %127
+%129 = OpAll %bool %128
+OpBranch %119
+%119 = OpLabel
+%130 = OpPhi %bool %false %106 %129 %118
+OpSelectionMerge %132 None
+OpBranchConditional %130 %131 %132
+%131 = OpLabel
+%134 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%135 = OpLoad %v4float %134
+%136 = OpLoad %v4float %clampLow
+%137 = OpLoad %v4float %clampHigh
+%133 = OpExtInst %v4float %1 FClamp %135 %136 %137
+%138 = OpLoad %v4float %expectedB
+%139 = OpFOrdEqual %v4bool %133 %138
+%140 = OpAll %bool %139
+OpBranch %132
+%132 = OpLabel
+%141 = OpPhi %bool %false %119 %140 %131
+OpSelectionMerge %143 None
+OpBranchConditional %141 %142 %143
+%142 = OpLabel
+%144 = OpLoad %v4float %expectedA
+%145 = OpCompositeExtract %float %144 0
+%146 = OpFOrdEqual %bool %float_n1 %145
+OpBranch %143
+%143 = OpLabel
+%147 = OpPhi %bool %false %132 %146 %142
+OpSelectionMerge %149 None
+OpBranchConditional %147 %148 %149
+%148 = OpLabel
+%151 = OpLoad %v4float %expectedA
+%152 = OpVectorShuffle %v2float %151 %151 0 1
+%153 = OpFOrdEqual %v2bool %150 %152
+%154 = OpAll %bool %153
+OpBranch %149
+%149 = OpLabel
+%155 = OpPhi %bool %false %143 %154 %148
+OpSelectionMerge %157 None
+OpBranchConditional %155 %156 %157
+%156 = OpLabel
+%159 = OpLoad %v4float %expectedA
+%160 = OpVectorShuffle %v3float %159 %159 0 1 2
+%161 = OpFOrdEqual %v3bool %158 %160
+%162 = OpAll %bool %161
+OpBranch %157
+%157 = OpLabel
+%163 = OpPhi %bool %false %149 %162 %156
+OpSelectionMerge %165 None
+OpBranchConditional %163 %164 %165
+%164 = OpLabel
+%166 = OpLoad %v4float %expectedA
+%167 = OpFOrdEqual %v4bool %31 %166
 %168 = OpAll %bool %167
-OpBranch %160
-%160 = OpLabel
-%169 = OpPhi %bool %false %147 %168 %159
+OpBranch %165
+%165 = OpLabel
+%169 = OpPhi %bool %false %157 %168 %164
 OpSelectionMerge %171 None
 OpBranchConditional %169 %170 %171
 %170 = OpLabel
@@ -317,13 +317,13 @@ OpBranchConditional %169 %170 %171
 %174 = OpFOrdEqual %bool %float_n1 %173
 OpBranch %171
 %171 = OpLabel
-%175 = OpPhi %bool %false %160 %174 %170
+%175 = OpPhi %bool %false %165 %174 %170
 OpSelectionMerge %177 None
 OpBranchConditional %175 %176 %177
 %176 = OpLabel
 %178 = OpLoad %v4float %expectedB
 %179 = OpVectorShuffle %v2float %178 %178 0 1
-%180 = OpFOrdEqual %v2bool %103 %179
+%180 = OpFOrdEqual %v2bool %150 %179
 %181 = OpAll %bool %180
 OpBranch %177
 %177 = OpLabel
diff --git a/third_party/skia/tests/sksl/intrinsics/ClampFloat.glsl b/third_party/skia/tests/sksl/intrinsics/ClampFloat.glsl
index 0c442a06ec93a..e04af7a98a7ff 100644
--- a/third_party/skia/tests/sksl/intrinsics/ClampFloat.glsl
+++ b/third_party/skia/tests/sksl/intrinsics/ClampFloat.glsl
@@ -8,5 +8,5 @@ vec4 main() {
     const vec4 clampLow = vec4(-1.0, -2.0, -2.0, 1.0);
     vec4 expectedB = vec4(-1.0, 0.0, 0.5, 2.25);
     const vec4 clampHigh = vec4(1.0, 2.0, 0.5, 3.0);
-    return ((((((((((((((clamp(testInputs.x, -1.0, 1.0) == expectedA.x && clamp(testInputs.xy, -1.0, 1.0) == expectedA.xy) && clamp(testInputs.xyz, -1.0, 1.0) == expectedA.xyz) && clamp(testInputs, -1.0, 1.0) == expectedA) && -1.0 == expectedA.x) && vec2(-1.0, 0.0) == expectedA.xy) && vec3(-1.0, 0.0, 0.75) == expectedA.xyz) && vec4(-1.0, 0.0, 0.75, 1.0) == expectedA) && clamp(testInputs.x, -1.0, 1.0) == expectedB.x) && clamp(testInputs.xy, vec2(-1.0, -2.0), vec2(1.0, 2.0)) == expectedB.xy) && clamp(testInputs.xyz, vec3(-1.0, -2.0, -2.0), vec3(1.0, 2.0, 0.5)) == expectedB.xyz) && clamp(testInputs, clampLow, clampHigh) == expectedB) && -1.0 == expectedB.x) && vec2(-1.0, 0.0) == expectedB.xy) && vec3(-1.0, 0.0, 0.5) == expectedB.xyz) && vec4(-1.0, 0.0, 0.5, 2.25) == expectedB ? colorGreen : colorRed;
+    return ((((((((((((((clamp(testInputs.x, -1.0, 1.0) == expectedA.x && clamp(testInputs.xy, -1.0, 1.0) == expectedA.xy) && clamp(testInputs.xyz, -1.0, 1.0) == expectedA.xyz) && clamp(testInputs, -1.0, 1.0) == expectedA) && clamp(testInputs.x, -1.0, 1.0) == expectedB.x) && clamp(testInputs.xy, vec2(-1.0, -2.0), vec2(1.0, 2.0)) == expectedB.xy) && clamp(testInputs.xyz, vec3(-1.0, -2.0, -2.0), vec3(1.0, 2.0, 0.5)) == expectedB.xyz) && clamp(testInputs, clampLow, clampHigh) == expectedB) && -1.0 == expectedA.x) && vec2(-1.0, 0.0) == expectedA.xy) && vec3(-1.0, 0.0, 0.75) == expectedA.xyz) && vec4(-1.0, 0.0, 0.75, 1.0) == expectedA) && -1.0 == expectedB.x) && vec2(-1.0, 0.0) == expectedB.xy) && vec3(-1.0, 0.0, 0.5) == expectedB.xyz) && vec4(-1.0, 0.0, 0.5, 2.25) == expectedB ? colorGreen : colorRed;
 }
diff --git a/third_party/skia/tests/sksl/intrinsics/ClampFloat.metal b/third_party/skia/tests/sksl/intrinsics/ClampFloat.metal
index 3c923f8b53dfa..c36a53e5e14fb 100644
--- a/third_party/skia/tests/sksl/intrinsics/ClampFloat.metal
+++ b/third_party/skia/tests/sksl/intrinsics/ClampFloat.metal
@@ -18,6 +18,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     const half4 clampLow = half4(-1.0h, -2.0h, -2.0h, 1.0h);
     half4 expectedB = half4(-1.0h, 0.0h, 0.5h, 2.25h);
     const half4 clampHigh = half4(1.0h, 2.0h, 0.5h, 3.0h);
-    _out.sk_FragColor = ((((((((((((((clamp(_uniforms.testInputs.x, -1.0h, 1.0h) == expectedA.x && all(clamp(_uniforms.testInputs.xy, -1.0h, 1.0h) == expectedA.xy)) && all(clamp(_uniforms.testInputs.xyz, -1.0h, 1.0h) == expectedA.xyz)) && all(clamp(_uniforms.testInputs, -1.0h, 1.0h) == expectedA)) && -1.0h == expectedA.x) && all(half2(-1.0h, 0.0h) == expectedA.xy)) && all(half3(-1.0h, 0.0h, 0.75h) == expectedA.xyz)) && all(half4(-1.0h, 0.0h, 0.75h, 1.0h) == expectedA)) && clamp(_uniforms.testInputs.x, -1.0h, 1.0h) == expectedB.x) && all(clamp(_uniforms.testInputs.xy, half2(-1.0h, -2.0h), half2(1.0h, 2.0h)) == expectedB.xy)) && all(clamp(_uniforms.testInputs.xyz, half3(-1.0h, -2.0h, -2.0h), half3(1.0h, 2.0h, 0.5h)) == expectedB.xyz)) && all(clamp(_uniforms.testInputs, clampLow, clampHigh) == expectedB)) && -1.0h == expectedB.x) && all(half2(-1.0h, 0.0h) == expectedB.xy)) && all(half3(-1.0h, 0.0h, 0.5h) == expectedB.xyz)) && all(half4(-1.0h, 0.0h, 0.5h, 2.25h) == expectedB) ? _uniforms.colorGreen : _uniforms.colorRed;
+    _out.sk_FragColor = ((((((((((((((clamp(_uniforms.testInputs.x, -1.0h, 1.0h) == expectedA.x && all(clamp(_uniforms.testInputs.xy, -1.0h, 1.0h) == expectedA.xy)) && all(clamp(_uniforms.testInputs.xyz, -1.0h, 1.0h) == expectedA.xyz)) && all(clamp(_uniforms.testInputs, -1.0h, 1.0h) == expectedA)) && clamp(_uniforms.testInputs.x, -1.0h, 1.0h) == expectedB.x) && all(clamp(_uniforms.testInputs.xy, half2(-1.0h, -2.0h), half2(1.0h, 2.0h)) == expectedB.xy)) && all(clamp(_uniforms.testInputs.xyz, half3(-1.0h, -2.0h, -2.0h), half3(1.0h, 2.0h, 0.5h)) == expectedB.xyz)) && all(clamp(_uniforms.testInputs, clampLow, clampHigh) == expectedB)) && -1.0h == expectedA.x) && all(half2(-1.0h, 0.0h) == expectedA.xy)) && all(half3(-1.0h, 0.0h, 0.75h) == expectedA.xyz)) && all(half4(-1.0h, 0.0h, 0.75h, 1.0h) == expectedA)) && -1.0h == expectedB.x) && all(half2(-1.0h, 0.0h) == expectedB.xy)) && all(half3(-1.0h, 0.0h, 0.5h) == expectedB.xyz)) && all(half4(-1.0h, 0.0h, 0.5h, 2.25h) == expectedB) ? _uniforms.colorGreen : _uniforms.colorRed;
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.asm.frag b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.asm.frag
index a0ba48811e863..a26e867d46c7b 100644
--- a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.asm.frag
+++ b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.asm.frag
@@ -10,8 +10,8 @@ OpMemberName %_UniformBuffer 0 "ah"
 OpMemberName %_UniformBuffer 1 "bh"
 OpMemberName %_UniformBuffer 2 "af"
 OpMemberName %_UniformBuffer 3 "bf"
-OpName %cross_hh2h2 "cross_hh2h2"
-OpName %cross_ff2f2 "cross_ff2f2"
+OpName %cross_length_2d_hh2h2 "cross_length_2d_hh2h2"
+OpName %cross_length_2d_ff2f2 "cross_length_2d_ff2f2"
 OpName %main "main"
 OpDecorate %sk_FragColor RelaxedPrecision
 OpDecorate %sk_FragColor Location 0
@@ -61,7 +61,7 @@ OpDecorate %57 RelaxedPrecision
 %_ptr_Output_float = OpTypePointer Output %float
 %int_2 = OpConstant %int 2
 %int_3 = OpConstant %int 3
-%cross_hh2h2 = OpFunction %float None %16
+%cross_length_2d_hh2h2 = OpFunction %float None %16
 %18 = OpFunctionParameter %_ptr_Function_v2float
 %19 = OpFunctionParameter %_ptr_Function_v2float
 %20 = OpLabel
@@ -78,7 +78,7 @@ OpDecorate %57 RelaxedPrecision
 %31 = OpFSub %float %25 %30
 OpReturnValue %31
 OpFunctionEnd
-%cross_ff2f2 = OpFunction %float None %16
+%cross_length_2d_ff2f2 = OpFunction %float None %16
 %32 = OpFunctionParameter %_ptr_Function_v2float
 %33 = OpFunctionParameter %_ptr_Function_v2float
 %34 = OpLabel
@@ -107,7 +107,7 @@ OpStore %54 %53
 %55 = OpAccessChain %_ptr_Uniform_v2float %12 %int_1
 %57 = OpLoad %v2float %55
 OpStore %58 %57
-%59 = OpFunctionCall %float %cross_hh2h2 %54 %58
+%59 = OpFunctionCall %float %cross_length_2d_hh2h2 %54 %58
 %60 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0
 OpStore %60 %59
 %62 = OpAccessChain %_ptr_Uniform_v2float %12 %int_2
@@ -116,7 +116,7 @@ OpStore %65 %64
 %66 = OpAccessChain %_ptr_Uniform_v2float %12 %int_3
 %68 = OpLoad %v2float %66
 OpStore %69 %68
-%70 = OpFunctionCall %float %cross_ff2f2 %65 %69
+%70 = OpFunctionCall %float %cross_length_2d_ff2f2 %65 %69
 %71 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_1
 OpStore %71 %70
 OpReturn
diff --git a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.glsl b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.glsl
index e327a1673e2a1..0313206561cd5 100644
--- a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.glsl
+++ b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.glsl
@@ -4,13 +4,13 @@ uniform vec2 ah;
 uniform vec2 bh;
 uniform vec2 af;
 uniform vec2 bf;
-float cross_hh2h2(vec2 a, vec2 b) {
+float cross_length_2d_hh2h2(vec2 a, vec2 b) {
     return a.x * b.y - a.y * b.x;
 }
-float cross_ff2f2(vec2 a, vec2 b) {
+float cross_length_2d_ff2f2(vec2 a, vec2 b) {
     return a.x * b.y - a.y * b.x;
 }
 void main() {
-    sk_FragColor.x = cross_hh2h2(ah, bh);
-    sk_FragColor.y = cross_ff2f2(af, bf);
+    sk_FragColor.x = cross_length_2d_hh2h2(ah, bh);
+    sk_FragColor.y = cross_length_2d_ff2f2(af, bf);
 }
diff --git a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.metal b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.metal
index 9142089205624..85cff6d019ce6 100644
--- a/third_party/skia/tests/sksl/intrinsics/CrossNoInline.metal
+++ b/third_party/skia/tests/sksl/intrinsics/CrossNoInline.metal
@@ -12,16 +12,16 @@ struct Inputs {
 struct Outputs {
     half4 sk_FragColor [[color(0)]];
 };
-half cross_hh2h2(half2 a, half2 b) {
+half cross_length_2d_hh2h2(half2 a, half2 b) {
     return a.x * b.y - a.y * b.x;
 }
-float cross_ff2f2(float2 a, float2 b) {
+float cross_length_2d_ff2f2(float2 a, float2 b) {
     return a.x * b.y - a.y * b.x;
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    _out.sk_FragColor.x = cross_hh2h2(_uniforms.ah, _uniforms.bh);
-    _out.sk_FragColor.y = half(cross_ff2f2(_uniforms.af, _uniforms.bf));
+    _out.sk_FragColor.x = cross_length_2d_hh2h2(_uniforms.ah, _uniforms.bh);
+    _out.sk_FragColor.y = half(cross_length_2d_ff2f2(_uniforms.af, _uniforms.bf));
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/intrinsics/Frexp.asm.frag b/third_party/skia/tests/sksl/intrinsics/Frexp.asm.frag
index dd5e0843d81b0..52756abdf2843 100644
--- a/third_party/skia/tests/sksl/intrinsics/Frexp.asm.frag
+++ b/third_party/skia/tests/sksl/intrinsics/Frexp.asm.frag
@@ -28,10 +28,10 @@ OpDecorate %10 DescriptorSet 0
 OpDecorate %32 RelaxedPrecision
 OpDecorate %33 RelaxedPrecision
 OpDecorate %35 RelaxedPrecision
-OpDecorate %124 RelaxedPrecision
-OpDecorate %130 RelaxedPrecision
+OpDecorate %126 RelaxedPrecision
 OpDecorate %132 RelaxedPrecision
-OpDecorate %133 RelaxedPrecision
+OpDecorate %134 RelaxedPrecision
+OpDecorate %135 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -89,7 +89,8 @@ OpFunctionEnd
 %48 = OpVariable %_ptr_Function_int Function
 %69 = OpVariable %_ptr_Function_v2int Function
 %92 = OpVariable %_ptr_Function_v3int Function
-%125 = OpVariable %_ptr_Function_v4float Function
+%113 = OpVariable %_ptr_Function_v4int Function
+%127 = OpVariable %_ptr_Function_v4float Function
 %28 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
 %32 = OpLoad %v4float %28
 %33 = OpVectorShuffle %v4float %32 %32 1 1 1 1
@@ -166,37 +167,39 @@ OpBranch %104
 %109 = OpAccessChain %_ptr_Function_bool %ok %int_2
 OpStore %109 %108
 %112 = OpLoad %v4float %value
-%111 = OpExtInst %v4float %1 Frexp %112 %exp
+%111 = OpExtInst %v4float %1 Frexp %112 %113
+%114 = OpLoad %v4int %113
+OpStore %exp %114
 OpStore %result %111
-%113 = OpLoad %v4float %result
-%114 = OpCompositeExtract %float %113 3
-%115 = OpFOrdEqual %bool %114 %float_0_75
-OpSelectionMerge %117 None
-OpBranchConditional %115 %116 %117
-%116 = OpLabel
-%118 = OpLoad %v4int %exp
-%119 = OpCompositeExtract %int %118 3
-%120 = OpIEqual %bool %119 %int_3
-OpBranch %117
-%117 = OpLabel
-%121 = OpPhi %bool %false %104 %120 %116
-%122 = OpAccessChain %_ptr_Function_bool %ok %int_3
-OpStore %122 %121
-%124 = OpLoad %v4bool %ok
-%123 = OpAll %bool %124
-OpSelectionMerge %128 None
-OpBranchConditional %123 %126 %127
-%126 = OpLabel
-%129 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%130 = OpLoad %v4float %129
-OpStore %125 %130
-OpBranch %128
-%127 = OpLabel
-%131 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
-%132 = OpLoad %v4float %131
-OpStore %125 %132
-OpBranch %128
+%115 = OpLoad %v4float %result
+%116 = OpCompositeExtract %float %115 3
+%117 = OpFOrdEqual %bool %116 %float_0_75
+OpSelectionMerge %119 None
+OpBranchConditional %117 %118 %119
+%118 = OpLabel
+%120 = OpLoad %v4int %exp
+%121 = OpCompositeExtract %int %120 3
+%122 = OpIEqual %bool %121 %int_3
+OpBranch %119
+%119 = OpLabel
+%123 = OpPhi %bool %false %104 %122 %118
+%124 = OpAccessChain %_ptr_Function_bool %ok %int_3
+OpStore %124 %123
+%126 = OpLoad %v4bool %ok
+%125 = OpAll %bool %126
+OpSelectionMerge %130 None
+OpBranchConditional %125 %128 %129
 %128 = OpLabel
-%133 = OpLoad %v4float %125
-OpReturnValue %133
+%131 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%132 = OpLoad %v4float %131
+OpStore %127 %132
+OpBranch %130
+%129 = OpLabel
+%133 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
+%134 = OpLoad %v4float %133
+OpStore %127 %134
+OpBranch %130
+%130 = OpLabel
+%135 = OpLoad %v4float %127
+OpReturnValue %135
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/intrinsics/Modf.asm.frag b/third_party/skia/tests/sksl/intrinsics/Modf.asm.frag
index 2c50bb5f121aa..1d57aa5cbd2c0 100644
--- a/third_party/skia/tests/sksl/intrinsics/Modf.asm.frag
+++ b/third_party/skia/tests/sksl/intrinsics/Modf.asm.frag
@@ -27,10 +27,10 @@ OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
 OpDecorate %_UniformBuffer Block
 OpDecorate %10 Binding 0
 OpDecorate %10 DescriptorSet 0
-OpDecorate %137 RelaxedPrecision
-OpDecorate %144 RelaxedPrecision
+OpDecorate %139 RelaxedPrecision
 OpDecorate %146 RelaxedPrecision
-OpDecorate %147 RelaxedPrecision
+OpDecorate %148 RelaxedPrecision
+OpDecorate %149 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -100,7 +100,8 @@ OpFunctionEnd
 %55 = OpVariable %_ptr_Function_float Function
 %72 = OpVariable %_ptr_Function_v2float Function
 %98 = OpVariable %_ptr_Function_v3float Function
-%138 = OpVariable %_ptr_Function_v4float Function
+%123 = OpVariable %_ptr_Function_v4float Function
+%140 = OpVariable %_ptr_Function_v4float Function
 OpStore %value %32
 OpStore %expectedWhole %36
 OpStore %expectedFraction %40
@@ -180,39 +181,41 @@ OpBranch %112
 %119 = OpAccessChain %_ptr_Function_bool %ok %int_2
 OpStore %119 %118
 %122 = OpLoad %v4float %value
-%121 = OpExtInst %v4float %1 Modf %122 %whole
+%121 = OpExtInst %v4float %1 Modf %122 %123
+%124 = OpLoad %v4float %123
+OpStore %whole %124
 OpStore %fraction %121
-%123 = OpLoad %v4float %whole
-%124 = OpLoad %v4float %expectedWhole
-%125 = OpFOrdEqual %v4bool %123 %124
-%126 = OpAll %bool %125
-OpSelectionMerge %128 None
-OpBranchConditional %126 %127 %128
-%127 = OpLabel
-%129 = OpLoad %v4float %fraction
-%130 = OpLoad %v4float %expectedFraction
-%131 = OpFOrdEqual %v4bool %129 %130
-%132 = OpAll %bool %131
-OpBranch %128
-%128 = OpLabel
-%133 = OpPhi %bool %false %112 %132 %127
-%134 = OpAccessChain %_ptr_Function_bool %ok %int_3
-OpStore %134 %133
-%137 = OpLoad %v4bool %ok
-%136 = OpAll %bool %137
-OpSelectionMerge %141 None
-OpBranchConditional %136 %139 %140
-%139 = OpLabel
-%142 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%144 = OpLoad %v4float %142
-OpStore %138 %144
-OpBranch %141
-%140 = OpLabel
-%145 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
-%146 = OpLoad %v4float %145
-OpStore %138 %146
-OpBranch %141
+%125 = OpLoad %v4float %whole
+%126 = OpLoad %v4float %expectedWhole
+%127 = OpFOrdEqual %v4bool %125 %126
+%128 = OpAll %bool %127
+OpSelectionMerge %130 None
+OpBranchConditional %128 %129 %130
+%129 = OpLabel
+%131 = OpLoad %v4float %fraction
+%132 = OpLoad %v4float %expectedFraction
+%133 = OpFOrdEqual %v4bool %131 %132
+%134 = OpAll %bool %133
+OpBranch %130
+%130 = OpLabel
+%135 = OpPhi %bool %false %112 %134 %129
+%136 = OpAccessChain %_ptr_Function_bool %ok %int_3
+OpStore %136 %135
+%139 = OpLoad %v4bool %ok
+%138 = OpAll %bool %139
+OpSelectionMerge %143 None
+OpBranchConditional %138 %141 %142
 %141 = OpLabel
-%147 = OpLoad %v4float %138
-OpReturnValue %147
+%144 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
+%146 = OpLoad %v4float %144
+OpStore %140 %146
+OpBranch %143
+%142 = OpLabel
+%147 = OpAccessChain %_ptr_Uniform_v4float %10 %int_1
+%148 = OpLoad %v4float %147
+OpStore %140 %148
+OpBranch %143
+%143 = OpLabel
+%149 = OpLoad %v4float %140
+OpReturnValue %149
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/intrinsics/SignInt.metal b/third_party/skia/tests/sksl/intrinsics/SignInt.metal
index 23c98637df941..5b40ba1af12e8 100644
--- a/third_party/skia/tests/sksl/intrinsics/SignInt.metal
+++ b/third_party/skia/tests/sksl/intrinsics/SignInt.metal
@@ -14,7 +14,11 @@ struct Outputs {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
+    int _skTemp0;
+    int2 _skTemp1;
+    int3 _skTemp2;
+    int4 _skTemp3;
     int4 expected = int4(-1, 0, 0, 1);
-    _out.sk_FragColor = ((((((sign(int(_uniforms.testInputs.x)) == expected.x && all(sign(int2(_uniforms.testInputs.xy)) == expected.xy)) && all(sign(int3(_uniforms.testInputs.xyz)) == expected.xyz)) && all(sign(int4(_uniforms.testInputs)) == expected)) && -1 == expected.x) && all(int2(-1, 0) == expected.xy)) && all(int3(-1, 0, 0) == expected.xyz)) && all(int4(-1, 0, 0, 1) == expected) ? _uniforms.colorGreen : _uniforms.colorRed;
+    _out.sk_FragColor = (((((((_skTemp0 = (int(_uniforms.testInputs.x)), select(select(int(0), int(-1), _skTemp0 < 0), int(1), _skTemp0 > 0)) == expected.x && all((_skTemp1 = (int2(_uniforms.testInputs.xy)), select(select(int2(0), int2(-1), _skTemp1 < 0), int2(1), _skTemp1 > 0)) == expected.xy)) && all((_skTemp2 = (int3(_uniforms.testInputs.xyz)), select(select(int3(0), int3(-1), _skTemp2 < 0), int3(1), _skTemp2 > 0)) == expected.xyz)) && all((_skTemp3 = (int4(_uniforms.testInputs)), select(select(int4(0), int4(-1), _skTemp3 < 0), int4(1), _skTemp3 > 0)) == expected)) && -1 == expected.x) && all(int2(-1, 0) == expected.xy)) && all(int3(-1, 0, 0) == expected.xyz)) && all(int4(-1, 0, 0, 1) == expected) ? _uniforms.colorGreen : _uniforms.colorRed;
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/runtime/ArrayIndexing.skvm b/third_party/skia/tests/sksl/runtime/ArrayIndexing.skvm
index 3c76c7bcc099b..5adfc84694a56 100644
--- a/third_party/skia/tests/sksl/runtime/ArrayIndexing.skvm
+++ b/third_party/skia/tests/sksl/runtime/ArrayIndexing.skvm
@@ -48,7 +48,7 @@ F2 = float index_by_loop()
 F3 = float index_by_complex_loop()
 F4 = float index_out_of_bounds_checked()
 
-54 registers, 179 instructions:
+54 registers, 231 instructions:
 0	r0 = uniform32 ptr0 0
 1	r1 = uniform32 ptr0 4
 2	r2 = uniform32 ptr0 8
@@ -136,96 +136,148 @@ loop:
 83	    trace_enter 0 r53 r53 F0
 84	    trace_var 0 r53 r53 $32 = r52
 85	    trace_var 0 r53 r53 $33 = r0
-86	    trace_line 0 r53 r53 L38
-87	    trace_enter 0 r53 r53 F1
-88	    trace_line 0 r53 r53 L5
-89	    trace_exit 0 r53 r53 F1
-90	    trace_var 0 r53 r53 $34 = r1
-91	    trace_enter 0 r53 r53 F2
-92	    trace_line 0 r53 r53 L10
-93	    trace_var 0 r53 r53 $36 = r29
-94	    trace_line 0 r53 r53 L11
-95	    trace_var 0 r53 r53 $37 = r32
-96	    trace_line 0 r53 r53 L12
-97	    trace_var 0 r53 r53 $36 = r8
+86	    trace_scope 0 r53 r53 1
+87	    trace_line 0 r53 r53 L38
+88	    trace_enter 0 r53 r53 F1
+89	    trace_scope 0 r53 r53 1
+90	    trace_line 0 r53 r53 L5
+91	    trace_var 0 r53 r53 $34 = r1
+92	    trace_scope 0 r53 r53 -1
+93	    trace_exit 0 r53 r53 F1
+94	    trace_enter 0 r53 r53 F2
+95	    trace_scope 0 r53 r53 1
+96	    trace_line 0 r53 r53 L10
+97	    trace_var 0 r53 r53 $36 = r29
 98	    trace_line 0 r53 r53 L11
-99	    trace_var 0 r53 r53 $37 = r33
-100	    trace_line 0 r53 r53 L12
-101	    trace_var 0 r53 r53 $36 = r34
-102	    trace_line 0 r53 r53 L11
-103	    trace_var 0 r53 r53 $37 = r35
-104	    trace_line 0 r53 r53 L12
-105	    trace_var 0 r53 r53 $36 = r36
-106	    trace_line 0 r53 r53 L11
-107	    trace_var 0 r53 r53 $37 = r29
+99	    trace_scope 0 r53 r53 1
+100	    trace_var 0 r53 r53 $37 = r32
+101	    trace_scope 0 r53 r53 1
+102	    trace_line 0 r53 r53 L12
+103	    trace_var 0 r53 r53 $36 = r8
+104	    trace_scope 0 r53 r53 -1
+105	    trace_line 0 r53 r53 L11
+106	    trace_var 0 r53 r53 $37 = r33
+107	    trace_scope 0 r53 r53 1
 108	    trace_line 0 r53 r53 L12
-109	    trace_var 0 r53 r53 $36 = r37
-110	    trace_line 0 r53 r53 L11
-111	    trace_line 0 r53 r53 L14
-112	    trace_exit 0 r53 r53 F2
-113	    trace_var 0 r53 r53 $35 = r37
-114	    trace_enter 0 r53 r53 F3
-115	    trace_line 0 r53 r53 L19
-116	    trace_var 0 r53 r53 $39 = r38
-117	    trace_line 0 r53 r53 L20
-118	    trace_var 0 r53 r53 $40 = r29
-119	    trace_line 0 r53 r53 L21
-120	    trace_var 0 r53 r53 $39 = r9
-121	    trace_line 0 r53 r53 L20
-122	    trace_var 0 r53 r53 $40 = r35
-123	    trace_line 0 r53 r53 L21
-124	    trace_var 0 r53 r53 $39 = r39
-125	    trace_line 0 r53 r53 L20
-126	    trace_var 0 r53 r53 $40 = r33
-127	    trace_line 0 r53 r53 L21
-128	    trace_var 0 r53 r53 $39 = r40
-129	    trace_line 0 r53 r53 L20
-130	    trace_var 0 r53 r53 $40 = r32
-131	    trace_line 0 r53 r53 L21
-132	    trace_var 0 r53 r53 $39 = r41
+109	    trace_var 0 r53 r53 $36 = r34
+110	    trace_scope 0 r53 r53 -1
+111	    trace_line 0 r53 r53 L11
+112	    trace_var 0 r53 r53 $37 = r35
+113	    trace_scope 0 r53 r53 1
+114	    trace_line 0 r53 r53 L12
+115	    trace_var 0 r53 r53 $36 = r36
+116	    trace_scope 0 r53 r53 -1
+117	    trace_line 0 r53 r53 L11
+118	    trace_var 0 r53 r53 $37 = r29
+119	    trace_scope 0 r53 r53 1
+120	    trace_line 0 r53 r53 L12
+121	    trace_var 0 r53 r53 $36 = r37
+122	    trace_scope 0 r53 r53 -1
+123	    trace_line 0 r53 r53 L11
+124	    trace_scope 0 r53 r53 -1
+125	    trace_line 0 r53 r53 L14
+126	    trace_var 0 r53 r53 $35 = r37
+127	    trace_scope 0 r53 r53 -1
+128	    trace_exit 0 r53 r53 F2
+129	    trace_enter 0 r53 r53 F3
+130	    trace_scope 0 r53 r53 1
+131	    trace_line 0 r53 r53 L19
+132	    trace_var 0 r53 r53 $39 = r38
 133	    trace_line 0 r53 r53 L20
-134	    trace_line 0 r53 r53 L23
-135	    trace_exit 0 r53 r53 F3
-136	    trace_var 0 r53 r53 $38 = r41
-137	    trace_enter 0 r53 r53 F4
-138	    trace_line 0 r53 r53 L28
-139	    trace_var 0 r53 r53 $42 = r29
-140	    trace_line 0 r53 r53 L29
-141	    trace_var 0 r53 r53 $43 = r42
-142	    trace_line 0 r53 r53 L30
-143	    trace_line 0 r53 r53 L29
-144	    trace_var 0 r53 r53 $43 = r43
-145	    trace_line 0 r53 r53 L30
-146	    trace_line 0 r53 r53 L31
-147	    trace_var 0 r53 r53 $42 = r44
-148	    trace_line 0 r53 r53 L29
-149	    trace_var 0 r53 r53 $43 = r45
-150	    trace_line 0 r53 r53 L30
-151	    trace_line 0 r53 r53 L31
-152	    trace_var 0 r53 r53 $42 = r46
-153	    trace_line 0 r53 r53 L29
-154	    trace_var 0 r53 r53 $43 = r47
-155	    trace_line 0 r53 r53 L30
-156	    trace_line 0 r53 r53 L31
-157	    trace_var 0 r53 r53 $42 = r48
-158	    trace_line 0 r53 r53 L29
-159	    trace_var 0 r53 r53 $43 = r49
-160	    trace_line 0 r53 r53 L30
-161	    trace_line 0 r53 r53 L31
-162	    trace_var 0 r53 r53 $42 = r50
-163	    trace_line 0 r53 r53 L29
-164	    trace_var 0 r53 r53 $43 = r51
-165	    trace_line 0 r53 r53 L30
-166	    trace_line 0 r53 r53 L29
-167	    trace_line 0 r53 r53 L34
-168	    trace_exit 0 r53 r53 F4
-169	    trace_var 0 r53 r53 $41 = r50
-170	    trace_exit 0 r53 r53 F0
-171	    trace_var 0 r53 r53 $28 = r1
-172	    trace_var 0 r53 r53 $29 = r37
-173	    trace_var 0 r53 r53 $30 = r41
-174	    trace_var 0 r53 r53 $31 = r50
-175	    store32 ptr1 r1
-176	    store32 ptr2 r37
-177	    store32 ptr3 r41
-178	    store32 ptr4 r50
+134	    trace_scope 0 r53 r53 1
+135	    trace_var 0 r53 r53 $40 = r29
+136	    trace_scope 0 r53 r53 1
+137	    trace_line 0 r53 r53 L21
+138	    trace_var 0 r53 r53 $39 = r9
+139	    trace_scope 0 r53 r53 -1
+140	    trace_line 0 r53 r53 L20
+141	    trace_var 0 r53 r53 $40 = r35
+142	    trace_scope 0 r53 r53 1
+143	    trace_line 0 r53 r53 L21
+144	    trace_var 0 r53 r53 $39 = r39
+145	    trace_scope 0 r53 r53 -1
+146	    trace_line 0 r53 r53 L20
+147	    trace_var 0 r53 r53 $40 = r33
+148	    trace_scope 0 r53 r53 1
+149	    trace_line 0 r53 r53 L21
+150	    trace_var 0 r53 r53 $39 = r40
+151	    trace_scope 0 r53 r53 -1
+152	    trace_line 0 r53 r53 L20
+153	    trace_var 0 r53 r53 $40 = r32
+154	    trace_scope 0 r53 r53 1
+155	    trace_line 0 r53 r53 L21
+156	    trace_var 0 r53 r53 $39 = r41
+157	    trace_scope 0 r53 r53 -1
+158	    trace_line 0 r53 r53 L20
+159	    trace_scope 0 r53 r53 -1
+160	    trace_line 0 r53 r53 L23
+161	    trace_var 0 r53 r53 $38 = r41
+162	    trace_scope 0 r53 r53 -1
+163	    trace_exit 0 r53 r53 F3
+164	    trace_enter 0 r53 r53 F4
+165	    trace_scope 0 r53 r53 1
+166	    trace_line 0 r53 r53 L28
+167	    trace_var 0 r53 r53 $42 = r29
+168	    trace_line 0 r53 r53 L29
+169	    trace_scope 0 r53 r53 1
+170	    trace_var 0 r53 r53 $43 = r42
+171	    trace_scope 0 r53 r53 1
+172	    trace_line 0 r53 r53 L30
+173	    trace_scope 0 r53 r53 -1
+174	    trace_line 0 r53 r53 L29
+175	    trace_var 0 r53 r53 $43 = r43
+176	    trace_scope 0 r53 r53 1
+177	    trace_line 0 r53 r53 L30
+178	    trace_scope 0 r53 r53 1
+179	    trace_line 0 r53 r53 L31
+180	    trace_var 0 r53 r53 $42 = r44
+181	    trace_scope 0 r53 r53 -1
+182	    trace_scope 0 r53 r53 -1
+183	    trace_line 0 r53 r53 L29
+184	    trace_var 0 r53 r53 $43 = r45
+185	    trace_scope 0 r53 r53 1
+186	    trace_line 0 r53 r53 L30
+187	    trace_scope 0 r53 r53 1
+188	    trace_line 0 r53 r53 L31
+189	    trace_var 0 r53 r53 $42 = r46
+190	    trace_scope 0 r53 r53 -1
+191	    trace_scope 0 r53 r53 -1
+192	    trace_line 0 r53 r53 L29
+193	    trace_var 0 r53 r53 $43 = r47
+194	    trace_scope 0 r53 r53 1
+195	    trace_line 0 r53 r53 L30
+196	    trace_scope 0 r53 r53 1
+197	    trace_line 0 r53 r53 L31
+198	    trace_var 0 r53 r53 $42 = r48
+199	    trace_scope 0 r53 r53 -1
+200	    trace_scope 0 r53 r53 -1
+201	    trace_line 0 r53 r53 L29
+202	    trace_var 0 r53 r53 $43 = r49
+203	    trace_scope 0 r53 r53 1
+204	    trace_line 0 r53 r53 L30
+205	    trace_scope 0 r53 r53 1
+206	    trace_line 0 r53 r53 L31
+207	    trace_var 0 r53 r53 $42 = r50
+208	    trace_scope 0 r53 r53 -1
+209	    trace_scope 0 r53 r53 -1
+210	    trace_line 0 r53 r53 L29
+211	    trace_var 0 r53 r53 $43 = r51
+212	    trace_scope 0 r53 r53 1
+213	    trace_line 0 r53 r53 L30
+214	    trace_scope 0 r53 r53 -1
+215	    trace_line 0 r53 r53 L29
+216	    trace_scope 0 r53 r53 -1
+217	    trace_line 0 r53 r53 L34
+218	    trace_var 0 r53 r53 $41 = r50
+219	    trace_scope 0 r53 r53 -1
+220	    trace_exit 0 r53 r53 F4
+221	    trace_var 0 r53 r53 $28 = r1
+222	    trace_var 0 r53 r53 $29 = r37
+223	    trace_var 0 r53 r53 $30 = r41
+224	    trace_var 0 r53 r53 $31 = r50
+225	    trace_scope 0 r53 r53 -1
+226	    trace_exit 0 r53 r53 F0
+227	    store32 ptr1 r1
+228	    store32 ptr2 r37
+229	    store32 ptr3 r41
+230	    store32 ptr4 r50
diff --git a/third_party/skia/tests/sksl/runtime/ChildEffects.skvm b/third_party/skia/tests/sksl/runtime/ChildEffects.skvm
new file mode 100644
index 0000000000000..90232f40a6db6
--- /dev/null
+++ b/third_party/skia/tests/sksl/runtime/ChildEffects.skvm
@@ -0,0 +1,45 @@
+15 registers, 43 instructions:
+0	r0 = uniform32 ptr0 0
+1	r1 = uniform32 ptr0 C
+2	r2 = uniform32 ptr0 18
+3	r0 = trunc r0
+4	r1 = mul_i32 r1 r0
+5	r3 = splat 1 (1.4012985e-45)
+6	r4 = splat 2 (2.8025969e-45)
+7	r5 = splat 3 (4.2038954e-45)
+8	r0 = mul_i32 r2 r0
+9	r2 = splat 3F800000 (1)
+loop:
+10	    r6 = index
+11	    r6 = trunc r6
+12	    r7 = add_i32 r6 r1
+13	    r7 = shl_i32 r7 2
+14	    r8 = gather32 ptr0 4 r7
+15	    r9 = add_i32 r7 r3
+16	    r9 = gather32 ptr0 4 r9
+17	    r10 = add_i32 r7 r4
+18	    r10 = gather32 ptr0 4 r10
+19	    r7 = add_i32 r7 r5
+20	    r7 = gather32 ptr0 4 r7
+21	    r6 = add_i32 r6 r0
+22	    r6 = shl_i32 r6 2
+23	    r11 = gather32 ptr0 10 r6
+24	    r12 = add_i32 r3 r6
+25	    r12 = gather32 ptr0 10 r12
+26	    r13 = add_i32 r4 r6
+27	    r13 = gather32 ptr0 10 r13
+28	    r6 = add_i32 r5 r6
+29	    r6 = gather32 ptr0 10 r6
+30	    r14 = sub_f32 r2 r7
+31	    r11 = mul_f32 r11 r14
+32	    r11 = add_f32 r8 r11
+33	    r12 = mul_f32 r12 r14
+34	    r12 = add_f32 r9 r12
+35	    r13 = mul_f32 r13 r14
+36	    r13 = add_f32 r10 r13
+37	    r14 = mul_f32 r6 r14
+38	    r14 = add_f32 r7 r14
+39	    store32 ptr1 r11
+40	    store32 ptr2 r12
+41	    store32 ptr3 r13
+42	    store32 ptr4 r14
diff --git a/third_party/skia/tests/sksl/runtime/ChildEffects.stage b/third_party/skia/tests/sksl/runtime/ChildEffects.stage
new file mode 100644
index 0000000000000..c65924163c093
--- /dev/null
+++ b/third_party/skia/tests/sksl/runtime/ChildEffects.stage
@@ -0,0 +1,4 @@
+half4 main(float2 xy)
+{
+	return half4(child_4.eval(child_2.eval(child_0.eval(_coords)), child_3.eval(child_1.eval(_coords))));
+}
diff --git a/third_party/skia/tests/sksl/runtime/Commutative.skvm b/third_party/skia/tests/sksl/runtime/Commutative.skvm
index d711d921d4cb5..2cefd9f0a56cc 100644
--- a/third_party/skia/tests/sksl/runtime/Commutative.skvm
+++ b/third_party/skia/tests/sksl/runtime/Commutative.skvm
@@ -37,7 +37,7 @@ $35 = c_mul_d (float, L43)
 $36 = d_mul_c (float, L44)
 F0 = half4 main(float2 xy)
 
-13 registers, 60 instructions:
+13 registers, 62 instructions:
 0	r0 = uniform32 ptr0 0
 1	r1 = uniform32 ptr0 4
 2	r2 = uniform32 ptr0 8
@@ -65,37 +65,39 @@ loop:
 23	    r4 = eq_f32 r4 r11
 24	    r4 = bit_and r4 r0
 25	    trace_enter 0 r4 r4 F0
-26	    trace_line 0 r4 r4 L9
-27	    trace_line 0 r4 r4 L11
-28	    trace_line 0 r4 r4 L12
-29	    trace_line 0 r4 r4 L13
-30	    trace_line 0 r4 r4 L15
-31	    trace_line 0 r4 r4 L16
-32	    trace_line 0 r4 r4 L17
-33	    trace_line 0 r4 r4 L19
-34	    trace_line 0 r4 r4 L20
-35	    trace_line 0 r4 r4 L21
-36	    trace_line 0 r4 r4 L23
-37	    trace_line 0 r4 r4 L24
-38	    trace_line 0 r4 r4 L25
-39	    trace_line 0 r4 r4 L27
-40	    trace_line 0 r4 r4 L28
-41	    trace_line 0 r4 r4 L29
-42	    trace_line 0 r4 r4 L31
-43	    trace_line 0 r4 r4 L32
-44	    trace_line 0 r4 r4 L33
-45	    trace_line 0 r4 r4 L35
-46	    trace_line 0 r4 r4 L36
-47	    trace_line 0 r4 r4 L37
-48	    trace_line 0 r4 r4 L39
-49	    trace_line 0 r4 r4 L40
-50	    trace_line 0 r4 r4 L41
-51	    trace_line 0 r4 r4 L43
-52	    trace_line 0 r4 r4 L44
-53	    trace_line 0 r4 r4 L45
-54	    trace_line 0 r4 r4 L47
-55	    trace_exit 0 r4 r4 F0
-56	    store32 ptr1 r5
-57	    store32 ptr2 r6
-58	    store32 ptr3 r7
-59	    store32 ptr4 r8
+26	    trace_scope 0 r4 r4 1
+27	    trace_line 0 r4 r4 L9
+28	    trace_line 0 r4 r4 L11
+29	    trace_line 0 r4 r4 L12
+30	    trace_line 0 r4 r4 L13
+31	    trace_line 0 r4 r4 L15
+32	    trace_line 0 r4 r4 L16
+33	    trace_line 0 r4 r4 L17
+34	    trace_line 0 r4 r4 L19
+35	    trace_line 0 r4 r4 L20
+36	    trace_line 0 r4 r4 L21
+37	    trace_line 0 r4 r4 L23
+38	    trace_line 0 r4 r4 L24
+39	    trace_line 0 r4 r4 L25
+40	    trace_line 0 r4 r4 L27
+41	    trace_line 0 r4 r4 L28
+42	    trace_line 0 r4 r4 L29
+43	    trace_line 0 r4 r4 L31
+44	    trace_line 0 r4 r4 L32
+45	    trace_line 0 r4 r4 L33
+46	    trace_line 0 r4 r4 L35
+47	    trace_line 0 r4 r4 L36
+48	    trace_line 0 r4 r4 L37
+49	    trace_line 0 r4 r4 L39
+50	    trace_line 0 r4 r4 L40
+51	    trace_line 0 r4 r4 L41
+52	    trace_line 0 r4 r4 L43
+53	    trace_line 0 r4 r4 L44
+54	    trace_line 0 r4 r4 L45
+55	    trace_line 0 r4 r4 L47
+56	    trace_scope 0 r4 r4 -1
+57	    trace_exit 0 r4 r4 F0
+58	    store32 ptr1 r5
+59	    store32 ptr2 r6
+60	    store32 ptr3 r7
+61	    store32 ptr4 r8
diff --git a/third_party/skia/tests/sksl/runtime/GlobalVariables.skvm b/third_party/skia/tests/sksl/runtime/GlobalVariables.skvm
index 6cdeab87e4810..81d7774fa1a8e 100644
--- a/third_party/skia/tests/sksl/runtime/GlobalVariables.skvm
+++ b/third_party/skia/tests/sksl/runtime/GlobalVariables.skvm
@@ -1,8 +1,47 @@
-2 registers, 6 instructions:
-0	r0 = splat 0 (0)
-1	r1 = splat 3F800000 (1)
+$0 = gInitialized (float, L3)
+$1 = gInitializedFromOther (float, L4)
+$2 = gUninitialized (float, L5)
+$3 = [main].result (float4 : slot 1/4, L11)
+$4 = [main].result (float4 : slot 2/4, L11)
+$5 = [main].result (float4 : slot 3/4, L11)
+$6 = [main].result (float4 : slot 4/4, L11)
+$7 = xy (float2 : slot 1/2, L11)
+$8 = xy (float2 : slot 2/2, L11)
+F0 = float4 main(float2 xy)
+F1 = void init_globals()
+
+8 registers, 33 instructions:
+0	r0 = uniform32 ptr0 0
+1	r1 = splat 0 (0)
+2	r2 = splat 3F000000 (0.5)
+3	r3 = eq_f32 r0 r2
+4	r4 = splat BF800000 (-1)
+5	r5 = splat 3F800000 (1)
 loop:
-2	    store32 ptr1 r0
-3	    store32 ptr2 r1
-4	    store32 ptr3 r0
-5	    store32 ptr4 r1
+6	    r6 = index
+7	    r7 = eq_f32 r6 r2
+8	    r7 = bit_and r7 r3
+9	    trace_var 0 r7 r7 $0 = r4
+10	    trace_var 0 r7 r7 $1 = r5
+11	    trace_enter 0 r7 r7 F0
+12	    trace_var 0 r7 r7 $7 = r6
+13	    trace_var 0 r7 r7 $8 = r0
+14	    trace_scope 0 r7 r7 1
+15	    trace_line 0 r7 r7 L12
+16	    trace_enter 0 r7 r7 F1
+17	    trace_scope 0 r7 r7 1
+18	    trace_line 0 r7 r7 L8
+19	    trace_var 0 r7 r7 $2 = r5
+20	    trace_scope 0 r7 r7 -1
+21	    trace_exit 0 r7 r7 F1
+22	    trace_line 0 r7 r7 L13
+23	    trace_var 0 r7 r7 $3 = r1
+24	    trace_var 0 r7 r7 $4 = r5
+25	    trace_var 0 r7 r7 $5 = r1
+26	    trace_var 0 r7 r7 $6 = r5
+27	    trace_scope 0 r7 r7 -1
+28	    trace_exit 0 r7 r7 F0
+29	    store32 ptr1 r1
+30	    store32 ptr2 r5
+31	    store32 ptr3 r1
+32	    store32 ptr4 r5
diff --git a/third_party/skia/tests/sksl/runtime/GlobalVariables.stage b/third_party/skia/tests/sksl/runtime/GlobalVariables.stage
index 4f389029d0cde..f1c722706e568 100644
--- a/third_party/skia/tests/sksl/runtime/GlobalVariables.stage
+++ b/third_party/skia/tests/sksl/runtime/GlobalVariables.stage
@@ -1,3 +1,4 @@
+const float gInitialized_0 = -1.0;
 float gInitializedFromOther_0 = 1.0;
 float gUninitialized_0;
 void init_globals_0();
diff --git a/third_party/skia/tests/sksl/runtime/LoopFloat.skvm b/third_party/skia/tests/sksl/runtime/LoopFloat.skvm
index b812fc1d6b2c5..884994496d650 100644
--- a/third_party/skia/tests/sksl/runtime/LoopFloat.skvm
+++ b/third_party/skia/tests/sksl/runtime/LoopFloat.skvm
@@ -78,7 +78,7 @@ F8 = bool loop_operator_gt()
 F9 = bool loop_operator_eq()
 F10 = bool loop_operator_ne()
 
-41 registers, 734 instructions:
+42 registers, 948 instructions:
 0	r0 = uniform32 ptr0 0
 1	r1 = uniform32 ptr0 4
 2	r2 = uniform32 ptr0 8
@@ -129,688 +129,902 @@ loop:
 46	    trace_enter 0 r34 r34 F0
 47	    trace_var 0 r34 r34 $14 = r33
 48	    trace_var 0 r34 r34 $15 = r0
-49	    trace_line 0 r34 r34 L116
-50	    r33 = min_f32 r33 r8
-51	    r33 = max_f32 r6 r33
-52	    r33 = mul_f32 r33 r14
-53	    trace_var 0 r34 r34 $16 = r33
-54	    trace_line 0 r34 r34 L117
-55	    trace_enter 0 r34 r34 F1
-56	    trace_var 0 r34 r34 $18 = r33
-57	    trace_line 0 r34 r34 L8
-58	    trace_var 0 r34 r34 $19 = r9
-59	    trace_line 0 r34 r34 L9
-60	    r35 = eq_f32 r9 r33
-61	    trace_line 0 r35 r34 L9
-62	    r36 = bit_xor r10 r35
-63	    trace_line 0 r36 r34 L8
-64	    trace_var 0 r36 r34 $19 = r15
-65	    trace_line 0 r36 r34 L9
-66	    r37 = eq_f32 r33 r15
-67	    r37 = bit_and r36 r37
-68	    trace_line 0 r37 r34 L9
-69	    r36 = bit_and r15 r37
-70	    r37 = bit_or r35 r37
-71	    r35 = bit_xor r10 r37
-72	    trace_line 0 r35 r34 L8
-73	    trace_var 0 r35 r34 $19 = r16
-74	    trace_line 0 r35 r34 L9
-75	    r38 = eq_f32 r33 r16
-76	    r38 = bit_and r35 r38
-77	    trace_line 0 r38 r34 L9
-78	    r36 = select r38 r16 r36
-79	    r38 = bit_or r37 r38
-80	    r37 = bit_xor r10 r38
-81	    trace_line 0 r37 r34 L8
-82	    trace_var 0 r37 r34 $19 = r17
-83	    trace_line 0 r37 r34 L9
-84	    r35 = eq_f32 r33 r17
-85	    r35 = bit_and r37 r35
-86	    trace_line 0 r35 r34 L9
-87	    r36 = select r35 r17 r36
-88	    r35 = bit_or r38 r35
-89	    r38 = bit_xor r10 r35
-90	    trace_line 0 r38 r34 L8
-91	    trace_var 0 r38 r34 $19 = r18
-92	    trace_line 0 r38 r34 L9
-93	    r37 = eq_f32 r33 r18
-94	    r37 = bit_and r38 r37
-95	    trace_line 0 r37 r34 L9
-96	    r36 = select r37 r18 r36
-97	    r37 = bit_or r35 r37
-98	    r35 = bit_xor r10 r37
-99	    trace_line 0 r35 r34 L8
-100	    trace_var 0 r35 r34 $19 = r14
-101	    trace_line 0 r35 r34 L9
-102	    r38 = eq_f32 r14 r33
-103	    r38 = bit_and r35 r38
-104	    trace_line 0 r38 r34 L9
-105	    r36 = select r38 r14 r36
-106	    r38 = bit_or r37 r38
-107	    r37 = bit_xor r10 r38
-108	    trace_line 0 r37 r34 L8
-109	    trace_var 0 r37 r34 $19 = r19
-110	    trace_line 0 r37 r34 L9
-111	    r35 = eq_f32 r33 r19
-112	    r35 = bit_and r37 r35
-113	    trace_line 0 r35 r34 L9
-114	    r36 = select r35 r19 r36
-115	    r35 = bit_or r38 r35
-116	    r38 = bit_xor r10 r35
-117	    trace_line 0 r38 r34 L8
-118	    trace_var 0 r38 r34 $19 = r20
-119	    trace_line 0 r38 r34 L9
-120	    r37 = eq_f32 r33 r20
-121	    r37 = bit_and r38 r37
-122	    trace_line 0 r37 r34 L9
-123	    r36 = select r37 r20 r36
-124	    r37 = bit_or r35 r37
-125	    r35 = bit_xor r10 r37
-126	    trace_line 0 r35 r34 L8
-127	    trace_var 0 r35 r34 $19 = r21
-128	    trace_line 0 r35 r34 L9
-129	    r38 = eq_f32 r33 r21
-130	    r38 = bit_and r35 r38
-131	    trace_line 0 r38 r34 L9
-132	    r36 = select r38 r21 r36
-133	    r38 = bit_or r37 r38
-134	    r37 = bit_xor r10 r38
-135	    trace_line 0 r37 r34 L8
-136	    trace_var 0 r37 r34 $19 = r22
-137	    trace_line 0 r37 r34 L9
-138	    r35 = eq_f32 r33 r22
-139	    r35 = bit_and r37 r35
-140	    trace_line 0 r35 r34 L9
-141	    r36 = select r35 r22 r36
-142	    r35 = bit_or r38 r35
-143	    r35 = bit_xor r10 r35
-144	    trace_line 0 r35 r34 L8
-145	    trace_line 0 r35 r34 L11
-146	    r35 = bit_clear r36 r35
-147	    trace_exit 0 r34 r34 F1
-148	    trace_var 0 r34 r34 $17 = r35
-149	    r35 = eq_f32 r14 r35
-150	    trace_enter 0 r35 r34 F2
-151	    trace_var 0 r35 r34 $21 = r33
-152	    trace_line 0 r35 r34 L17
-153	    trace_var 0 r35 r34 $22 = r9
-154	    trace_line 0 r35 r34 L18
-155	    trace_var 0 r35 r34 $23 = r9
-156	    trace_line 0 r35 r34 L19
-157	    r36 = gt_f32 r33 r9
-158	    r36 = bit_and r35 r36
-159	    trace_line 0 r36 r34 L19
-160	    r38 = bit_xor r10 r36
-161	    r37 = bit_and r35 r38
-162	    trace_line 0 r37 r34 L20
-163	    r38 = bit_or r36 r38
-164	    r36 = bit_and r35 r38
-165	    trace_line 0 r36 r34 L18
-166	    trace_var 0 r36 r34 $23 = r15
-167	    trace_line 0 r36 r34 L19
-168	    r36 = gt_f32 r33 r15
-169	    r36 = bit_and r35 r36
-170	    r36 = bit_and r38 r36
-171	    trace_line 0 r36 r34 L19
-172	    r37 = bit_xor r10 r36
-173	    r37 = bit_and r38 r37
-174	    r38 = bit_and r35 r37
-175	    trace_line 0 r38 r34 L20
-176	    r39 = bit_and r15 r38
-177	    trace_var 0 r38 r34 $22 = r39
-178	    r37 = bit_or r36 r37
-179	    r36 = bit_and r35 r37
-180	    trace_line 0 r36 r34 L18
-181	    trace_var 0 r36 r34 $23 = r16
-182	    trace_line 0 r36 r34 L19
-183	    r36 = gt_f32 r33 r16
-184	    r36 = bit_and r35 r36
-185	    r36 = bit_and r37 r36
-186	    trace_line 0 r36 r34 L19
-187	    r38 = bit_xor r10 r36
-188	    r38 = bit_and r37 r38
-189	    r37 = bit_and r35 r38
-190	    trace_line 0 r37 r34 L20
-191	    r40 = add_f32 r16 r39
-192	    r39 = select r37 r40 r39
-193	    trace_var 0 r37 r34 $22 = r39
-194	    r38 = bit_or r36 r38
-195	    r36 = bit_and r35 r38
-196	    trace_line 0 r36 r34 L18
-197	    trace_var 0 r36 r34 $23 = r17
-198	    trace_line 0 r36 r34 L19
-199	    r36 = gt_f32 r33 r17
-200	    r36 = bit_and r35 r36
-201	    r36 = bit_and r38 r36
-202	    trace_line 0 r36 r34 L19
-203	    r37 = bit_xor r10 r36
-204	    r37 = bit_and r38 r37
-205	    r38 = bit_and r35 r37
-206	    trace_line 0 r38 r34 L20
-207	    r40 = add_f32 r17 r39
-208	    r39 = select r38 r40 r39
-209	    trace_var 0 r38 r34 $22 = r39
-210	    r37 = bit_or r36 r37
-211	    r36 = bit_and r35 r37
-212	    trace_line 0 r36 r34 L18
-213	    trace_var 0 r36 r34 $23 = r18
-214	    trace_line 0 r36 r34 L19
-215	    r36 = gt_f32 r33 r18
-216	    r36 = bit_and r35 r36
-217	    r36 = bit_and r37 r36
-218	    trace_line 0 r36 r34 L19
-219	    r38 = bit_xor r10 r36
-220	    r38 = bit_and r37 r38
-221	    r37 = bit_and r35 r38
+49	    trace_scope 0 r34 r34 1
+50	    trace_line 0 r34 r34 L116
+51	    r33 = min_f32 r33 r8
+52	    r33 = max_f32 r6 r33
+53	    r33 = mul_f32 r33 r14
+54	    trace_var 0 r34 r34 $16 = r33
+55	    trace_line 0 r34 r34 L117
+56	    trace_enter 0 r34 r34 F1
+57	    trace_var 0 r34 r34 $18 = r33
+58	    trace_scope 0 r34 r34 1
+59	    trace_line 0 r34 r34 L8
+60	    trace_scope 0 r34 r34 1
+61	    trace_var 0 r34 r34 $19 = r9
+62	    trace_scope 0 r34 r34 1
+63	    trace_line 0 r34 r34 L9
+64	    r35 = eq_f32 r9 r33
+65	    trace_scope 0 r35 r34 1
+66	    trace_line 0 r35 r34 L9
+67	    trace_var 0 r35 r34 $17 = r9
+68	    trace_scope 0 r35 r34 -1
+69	    trace_scope 0 r34 r34 -1
+70	    r36 = bit_xor r10 r35
+71	    trace_line 0 r36 r34 L8
+72	    trace_var 0 r36 r34 $19 = r15
+73	    trace_scope 0 r36 r34 1
+74	    trace_line 0 r36 r34 L9
+75	    r37 = eq_f32 r33 r15
+76	    r37 = bit_and r36 r37
+77	    trace_scope 0 r37 r34 1
+78	    trace_line 0 r37 r34 L9
+79	    r38 = bit_and r15 r37
+80	    trace_var 0 r37 r34 $17 = r38
+81	    r35 = bit_or r35 r37
+82	    trace_scope 0 r37 r34 -1
+83	    trace_scope 0 r36 r34 -1
+84	    r36 = bit_xor r10 r35
+85	    trace_line 0 r36 r34 L8
+86	    trace_var 0 r36 r34 $19 = r16
+87	    trace_scope 0 r36 r34 1
+88	    trace_line 0 r36 r34 L9
+89	    r37 = eq_f32 r33 r16
+90	    r37 = bit_and r36 r37
+91	    trace_scope 0 r37 r34 1
+92	    trace_line 0 r37 r34 L9
+93	    r38 = select r37 r16 r38
+94	    trace_var 0 r37 r34 $17 = r38
+95	    r35 = bit_or r35 r37
+96	    trace_scope 0 r37 r34 -1
+97	    trace_scope 0 r36 r34 -1
+98	    r36 = bit_xor r10 r35
+99	    trace_line 0 r36 r34 L8
+100	    trace_var 0 r36 r34 $19 = r17
+101	    trace_scope 0 r36 r34 1
+102	    trace_line 0 r36 r34 L9
+103	    r37 = eq_f32 r33 r17
+104	    r37 = bit_and r36 r37
+105	    trace_scope 0 r37 r34 1
+106	    trace_line 0 r37 r34 L9
+107	    r38 = select r37 r17 r38
+108	    trace_var 0 r37 r34 $17 = r38
+109	    r35 = bit_or r35 r37
+110	    trace_scope 0 r37 r34 -1
+111	    trace_scope 0 r36 r34 -1
+112	    r36 = bit_xor r10 r35
+113	    trace_line 0 r36 r34 L8
+114	    trace_var 0 r36 r34 $19 = r18
+115	    trace_scope 0 r36 r34 1
+116	    trace_line 0 r36 r34 L9
+117	    r37 = eq_f32 r33 r18
+118	    r37 = bit_and r36 r37
+119	    trace_scope 0 r37 r34 1
+120	    trace_line 0 r37 r34 L9
+121	    r38 = select r37 r18 r38
+122	    trace_var 0 r37 r34 $17 = r38
+123	    r35 = bit_or r35 r37
+124	    trace_scope 0 r37 r34 -1
+125	    trace_scope 0 r36 r34 -1
+126	    r36 = bit_xor r10 r35
+127	    trace_line 0 r36 r34 L8
+128	    trace_var 0 r36 r34 $19 = r14
+129	    trace_scope 0 r36 r34 1
+130	    trace_line 0 r36 r34 L9
+131	    r37 = eq_f32 r14 r33
+132	    r37 = bit_and r36 r37
+133	    trace_scope 0 r37 r34 1
+134	    trace_line 0 r37 r34 L9
+135	    r38 = select r37 r14 r38
+136	    trace_var 0 r37 r34 $17 = r38
+137	    r35 = bit_or r35 r37
+138	    trace_scope 0 r37 r34 -1
+139	    trace_scope 0 r36 r34 -1
+140	    r36 = bit_xor r10 r35
+141	    trace_line 0 r36 r34 L8
+142	    trace_var 0 r36 r34 $19 = r19
+143	    trace_scope 0 r36 r34 1
+144	    trace_line 0 r36 r34 L9
+145	    r37 = eq_f32 r33 r19
+146	    r37 = bit_and r36 r37
+147	    trace_scope 0 r37 r34 1
+148	    trace_line 0 r37 r34 L9
+149	    r38 = select r37 r19 r38
+150	    trace_var 0 r37 r34 $17 = r38
+151	    r35 = bit_or r35 r37
+152	    trace_scope 0 r37 r34 -1
+153	    trace_scope 0 r36 r34 -1
+154	    r36 = bit_xor r10 r35
+155	    trace_line 0 r36 r34 L8
+156	    trace_var 0 r36 r34 $19 = r20
+157	    trace_scope 0 r36 r34 1
+158	    trace_line 0 r36 r34 L9
+159	    r37 = eq_f32 r33 r20
+160	    r37 = bit_and r36 r37
+161	    trace_scope 0 r37 r34 1
+162	    trace_line 0 r37 r34 L9
+163	    r38 = select r37 r20 r38
+164	    trace_var 0 r37 r34 $17 = r38
+165	    r35 = bit_or r35 r37
+166	    trace_scope 0 r37 r34 -1
+167	    trace_scope 0 r36 r34 -1
+168	    r36 = bit_xor r10 r35
+169	    trace_line 0 r36 r34 L8
+170	    trace_var 0 r36 r34 $19 = r21
+171	    trace_scope 0 r36 r34 1
+172	    trace_line 0 r36 r34 L9
+173	    r37 = eq_f32 r33 r21
+174	    r37 = bit_and r36 r37
+175	    trace_scope 0 r37 r34 1
+176	    trace_line 0 r37 r34 L9
+177	    r38 = select r37 r21 r38
+178	    trace_var 0 r37 r34 $17 = r38
+179	    r35 = bit_or r35 r37
+180	    trace_scope 0 r37 r34 -1
+181	    trace_scope 0 r36 r34 -1
+182	    r36 = bit_xor r10 r35
+183	    trace_line 0 r36 r34 L8
+184	    trace_var 0 r36 r34 $19 = r22
+185	    trace_scope 0 r36 r34 1
+186	    trace_line 0 r36 r34 L9
+187	    r37 = eq_f32 r33 r22
+188	    r37 = bit_and r36 r37
+189	    trace_scope 0 r37 r34 1
+190	    trace_line 0 r37 r34 L9
+191	    r38 = select r37 r22 r38
+192	    trace_var 0 r37 r34 $17 = r38
+193	    r35 = bit_or r35 r37
+194	    trace_scope 0 r37 r34 -1
+195	    trace_scope 0 r36 r34 -1
+196	    r35 = bit_xor r10 r35
+197	    trace_line 0 r35 r34 L8
+198	    trace_scope 0 r34 r34 -1
+199	    trace_line 0 r35 r34 L11
+200	    r38 = bit_clear r38 r35
+201	    trace_var 0 r35 r34 $17 = r38
+202	    trace_scope 0 r34 r34 -1
+203	    trace_exit 0 r34 r34 F1
+204	    r38 = eq_f32 r14 r38
+205	    trace_enter 0 r38 r34 F2
+206	    trace_var 0 r38 r34 $21 = r33
+207	    trace_scope 0 r38 r34 1
+208	    trace_line 0 r38 r34 L17
+209	    trace_var 0 r38 r34 $22 = r9
+210	    trace_line 0 r38 r34 L18
+211	    trace_scope 0 r38 r34 1
+212	    trace_var 0 r38 r34 $23 = r9
+213	    trace_scope 0 r38 r34 1
+214	    trace_line 0 r38 r34 L19
+215	    r35 = gt_f32 r33 r9
+216	    r35 = bit_and r38 r35
+217	    trace_scope 0 r35 r34 1
+218	    trace_line 0 r35 r34 L19
+219	    r36 = bit_xor r10 r35
+220	    trace_scope 0 r35 r34 -1
+221	    r37 = bit_and r38 r36
 222	    trace_line 0 r37 r34 L20
-223	    r40 = add_f32 r18 r39
-224	    r39 = select r37 r40 r39
-225	    trace_var 0 r37 r34 $22 = r39
-226	    r38 = bit_or r36 r38
-227	    r36 = bit_and r35 r38
-228	    trace_line 0 r36 r34 L18
-229	    trace_var 0 r36 r34 $23 = r14
-230	    trace_line 0 r36 r34 L19
-231	    r36 = gt_f32 r33 r14
-232	    r36 = bit_and r35 r36
-233	    r36 = bit_and r38 r36
-234	    trace_line 0 r36 r34 L19
-235	    r37 = bit_xor r10 r36
-236	    r37 = bit_and r38 r37
-237	    r38 = bit_and r35 r37
-238	    trace_line 0 r38 r34 L20
-239	    r40 = add_f32 r14 r39
-240	    r39 = select r38 r40 r39
-241	    trace_var 0 r38 r34 $22 = r39
-242	    r37 = bit_or r36 r37
-243	    r36 = bit_and r35 r37
-244	    trace_line 0 r36 r34 L18
-245	    trace_var 0 r36 r34 $23 = r19
-246	    trace_line 0 r36 r34 L19
-247	    r36 = gt_f32 r33 r19
-248	    r36 = bit_and r35 r36
-249	    r36 = bit_and r37 r36
-250	    trace_line 0 r36 r34 L19
-251	    r38 = bit_xor r10 r36
-252	    r38 = bit_and r37 r38
-253	    r37 = bit_and r35 r38
-254	    trace_line 0 r37 r34 L20
-255	    r40 = add_f32 r19 r39
-256	    r39 = select r37 r40 r39
-257	    trace_var 0 r37 r34 $22 = r39
-258	    r38 = bit_or r36 r38
-259	    r36 = bit_and r35 r38
-260	    trace_line 0 r36 r34 L18
-261	    trace_var 0 r36 r34 $23 = r20
-262	    trace_line 0 r36 r34 L19
-263	    r36 = gt_f32 r33 r20
-264	    r36 = bit_and r35 r36
-265	    r36 = bit_and r38 r36
-266	    trace_line 0 r36 r34 L19
-267	    r37 = bit_xor r10 r36
-268	    r37 = bit_and r38 r37
-269	    r38 = bit_and r35 r37
-270	    trace_line 0 r38 r34 L20
-271	    r40 = add_f32 r20 r39
-272	    r39 = select r38 r40 r39
-273	    trace_var 0 r38 r34 $22 = r39
-274	    r37 = bit_or r36 r37
-275	    r36 = bit_and r35 r37
-276	    trace_line 0 r36 r34 L18
-277	    trace_var 0 r36 r34 $23 = r21
-278	    trace_line 0 r36 r34 L19
-279	    r36 = gt_f32 r33 r21
-280	    r36 = bit_and r35 r36
-281	    r36 = bit_and r37 r36
-282	    trace_line 0 r36 r34 L19
-283	    r38 = bit_xor r10 r36
-284	    r38 = bit_and r37 r38
-285	    r37 = bit_and r35 r38
-286	    trace_line 0 r37 r34 L20
-287	    r40 = add_f32 r21 r39
-288	    r39 = select r37 r40 r39
-289	    trace_var 0 r37 r34 $22 = r39
-290	    r38 = bit_or r36 r38
-291	    r36 = bit_and r35 r38
-292	    trace_line 0 r36 r34 L18
-293	    trace_var 0 r36 r34 $23 = r22
-294	    trace_line 0 r36 r34 L19
-295	    r36 = gt_f32 r33 r22
-296	    r36 = bit_and r35 r36
-297	    r36 = bit_and r38 r36
-298	    trace_line 0 r36 r34 L19
-299	    r37 = bit_xor r10 r36
-300	    r37 = bit_and r38 r37
-301	    r38 = bit_and r35 r37
-302	    trace_line 0 r38 r34 L20
-303	    r40 = add_f32 r22 r39
-304	    r39 = select r38 r40 r39
-305	    trace_var 0 r38 r34 $22 = r39
-306	    r37 = bit_or r36 r37
-307	    r37 = bit_and r35 r37
-308	    trace_line 0 r37 r34 L18
-309	    trace_line 0 r35 r34 L22
-310	    r39 = bit_and r35 r39
-311	    trace_exit 0 r35 r34 F2
-312	    trace_var 0 r35 r34 $20 = r39
-313	    r39 = eq_f32 r39 r23
-314	    r39 = bit_and r35 r39
-315	    trace_enter 0 r39 r34 F3
-316	    trace_var 0 r39 r34 $25 = r33
-317	    trace_line 0 r39 r34 L27
-318	    trace_var 0 r39 r34 $26 = r9
-319	    trace_line 0 r39 r34 L28
-320	    trace_var 0 r39 r34 $27 = r15
-321	    trace_line 0 r39 r34 L29
-322	    trace_var 0 r39 r34 $28 = r9
-323	    trace_line 0 r39 r34 L30
-324	    r35 = gt_f32 r9 r33
-325	    r35 = bit_and r39 r35
-326	    trace_line 0 r35 r34 L30
-327	    r35 = bit_xor r10 r35
-328	    r37 = bit_and r39 r35
-329	    trace_line 0 r37 r34 L31
-330	    trace_line 0 r37 r34 L29
-331	    trace_var 0 r37 r34 $28 = r15
-332	    trace_line 0 r37 r34 L30
-333	    r37 = gt_f32 r15 r33
-334	    r37 = bit_and r39 r37
-335	    r37 = bit_and r35 r37
-336	    trace_line 0 r37 r34 L30
-337	    r37 = bit_xor r10 r37
-338	    r37 = bit_and r35 r37
-339	    r35 = bit_and r39 r37
-340	    trace_line 0 r35 r34 L31
-341	    r36 = bit_and r15 r35
-342	    trace_var 0 r35 r34 $26 = r36
-343	    trace_line 0 r35 r34 L29
-344	    trace_var 0 r35 r34 $28 = r16
-345	    trace_line 0 r35 r34 L30
-346	    r35 = gt_f32 r16 r33
-347	    r35 = bit_and r39 r35
-348	    r35 = bit_and r37 r35
-349	    trace_line 0 r35 r34 L30
-350	    r35 = bit_xor r10 r35
-351	    r35 = bit_and r37 r35
-352	    r37 = bit_and r39 r35
-353	    trace_line 0 r37 r34 L31
-354	    r38 = add_f32 r16 r36
-355	    r36 = select r37 r38 r36
-356	    trace_var 0 r37 r34 $26 = r36
-357	    trace_line 0 r37 r34 L29
-358	    trace_var 0 r37 r34 $28 = r17
-359	    trace_line 0 r37 r34 L30
-360	    r37 = gt_f32 r17 r33
-361	    r37 = bit_and r39 r37
-362	    r37 = bit_and r35 r37
-363	    trace_line 0 r37 r34 L30
-364	    r37 = bit_xor r10 r37
-365	    r37 = bit_and r35 r37
-366	    r35 = bit_and r39 r37
-367	    trace_line 0 r35 r34 L31
-368	    r38 = add_f32 r17 r36
-369	    r36 = select r35 r38 r36
-370	    trace_var 0 r35 r34 $26 = r36
-371	    trace_line 0 r35 r34 L29
-372	    trace_var 0 r35 r34 $28 = r18
-373	    trace_line 0 r35 r34 L30
-374	    r35 = gt_f32 r18 r33
-375	    r35 = bit_and r39 r35
-376	    r35 = bit_and r37 r35
-377	    trace_line 0 r35 r34 L30
-378	    r35 = bit_xor r10 r35
-379	    r35 = bit_and r37 r35
-380	    r37 = bit_and r39 r35
-381	    trace_line 0 r37 r34 L31
-382	    r38 = add_f32 r18 r36
-383	    r36 = select r37 r38 r36
-384	    trace_var 0 r37 r34 $26 = r36
-385	    trace_line 0 r37 r34 L29
-386	    trace_var 0 r37 r34 $28 = r14
-387	    trace_line 0 r37 r34 L30
-388	    r37 = gt_f32 r14 r33
-389	    r37 = bit_and r39 r37
-390	    r37 = bit_and r35 r37
-391	    trace_line 0 r37 r34 L30
-392	    r37 = bit_xor r10 r37
-393	    r37 = bit_and r35 r37
-394	    r35 = bit_and r39 r37
-395	    trace_line 0 r35 r34 L31
-396	    r38 = add_f32 r14 r36
-397	    r36 = select r35 r38 r36
-398	    trace_var 0 r35 r34 $26 = r36
-399	    trace_line 0 r35 r34 L29
-400	    trace_var 0 r35 r34 $28 = r19
-401	    trace_line 0 r35 r34 L30
-402	    r35 = gt_f32 r19 r33
-403	    r35 = bit_and r39 r35
-404	    r35 = bit_and r37 r35
-405	    trace_line 0 r35 r34 L30
-406	    r35 = bit_xor r10 r35
-407	    r35 = bit_and r37 r35
-408	    r37 = bit_and r39 r35
-409	    trace_line 0 r37 r34 L31
-410	    r38 = add_f32 r19 r36
-411	    r36 = select r37 r38 r36
-412	    trace_var 0 r37 r34 $26 = r36
-413	    trace_line 0 r37 r34 L29
-414	    trace_var 0 r37 r34 $28 = r20
-415	    trace_line 0 r37 r34 L30
-416	    r37 = gt_f32 r20 r33
-417	    r37 = bit_and r39 r37
-418	    r37 = bit_and r35 r37
-419	    trace_line 0 r37 r34 L30
-420	    r37 = bit_xor r10 r37
-421	    r37 = bit_and r35 r37
-422	    r35 = bit_and r39 r37
-423	    trace_line 0 r35 r34 L31
-424	    r38 = add_f32 r20 r36
-425	    r36 = select r35 r38 r36
-426	    trace_var 0 r35 r34 $26 = r36
-427	    trace_line 0 r35 r34 L29
-428	    trace_var 0 r35 r34 $28 = r21
-429	    trace_line 0 r35 r34 L30
-430	    r35 = gt_f32 r21 r33
-431	    r35 = bit_and r39 r35
-432	    r35 = bit_and r37 r35
-433	    trace_line 0 r35 r34 L30
-434	    r35 = bit_xor r10 r35
-435	    r35 = bit_and r37 r35
-436	    r37 = bit_and r39 r35
-437	    trace_line 0 r37 r34 L31
-438	    r38 = add_f32 r21 r36
-439	    r36 = select r37 r38 r36
-440	    trace_var 0 r37 r34 $26 = r36
-441	    trace_line 0 r37 r34 L29
-442	    trace_var 0 r37 r34 $28 = r22
+223	    trace_scope 0 r38 r34 -1
+224	    r36 = bit_or r35 r36
+225	    r35 = bit_and r38 r36
+226	    trace_line 0 r35 r34 L18
+227	    trace_var 0 r35 r34 $23 = r15
+228	    trace_scope 0 r35 r34 1
+229	    trace_line 0 r35 r34 L19
+230	    r37 = gt_f32 r33 r15
+231	    r37 = bit_and r38 r37
+232	    r37 = bit_and r36 r37
+233	    trace_scope 0 r37 r34 1
+234	    trace_line 0 r37 r34 L19
+235	    r39 = bit_xor r10 r37
+236	    r39 = bit_and r36 r39
+237	    trace_scope 0 r37 r34 -1
+238	    r36 = bit_and r38 r39
+239	    trace_line 0 r36 r34 L20
+240	    r40 = bit_and r15 r36
+241	    trace_var 0 r36 r34 $22 = r40
+242	    trace_scope 0 r35 r34 -1
+243	    r39 = bit_or r37 r39
+244	    r37 = bit_and r38 r39
+245	    trace_line 0 r37 r34 L18
+246	    trace_var 0 r37 r34 $23 = r16
+247	    trace_scope 0 r37 r34 1
+248	    trace_line 0 r37 r34 L19
+249	    r35 = gt_f32 r33 r16
+250	    r35 = bit_and r38 r35
+251	    r35 = bit_and r39 r35
+252	    trace_scope 0 r35 r34 1
+253	    trace_line 0 r35 r34 L19
+254	    r36 = bit_xor r10 r35
+255	    r36 = bit_and r39 r36
+256	    trace_scope 0 r35 r34 -1
+257	    r39 = bit_and r38 r36
+258	    trace_line 0 r39 r34 L20
+259	    r41 = add_f32 r16 r40
+260	    r40 = select r39 r41 r40
+261	    trace_var 0 r39 r34 $22 = r40
+262	    trace_scope 0 r37 r34 -1
+263	    r36 = bit_or r35 r36
+264	    r35 = bit_and r38 r36
+265	    trace_line 0 r35 r34 L18
+266	    trace_var 0 r35 r34 $23 = r17
+267	    trace_scope 0 r35 r34 1
+268	    trace_line 0 r35 r34 L19
+269	    r37 = gt_f32 r33 r17
+270	    r37 = bit_and r38 r37
+271	    r37 = bit_and r36 r37
+272	    trace_scope 0 r37 r34 1
+273	    trace_line 0 r37 r34 L19
+274	    r39 = bit_xor r10 r37
+275	    r39 = bit_and r36 r39
+276	    trace_scope 0 r37 r34 -1
+277	    r36 = bit_and r38 r39
+278	    trace_line 0 r36 r34 L20
+279	    r41 = add_f32 r17 r40
+280	    r40 = select r36 r41 r40
+281	    trace_var 0 r36 r34 $22 = r40
+282	    trace_scope 0 r35 r34 -1
+283	    r39 = bit_or r37 r39
+284	    r37 = bit_and r38 r39
+285	    trace_line 0 r37 r34 L18
+286	    trace_var 0 r37 r34 $23 = r18
+287	    trace_scope 0 r37 r34 1
+288	    trace_line 0 r37 r34 L19
+289	    r35 = gt_f32 r33 r18
+290	    r35 = bit_and r38 r35
+291	    r35 = bit_and r39 r35
+292	    trace_scope 0 r35 r34 1
+293	    trace_line 0 r35 r34 L19
+294	    r36 = bit_xor r10 r35
+295	    r36 = bit_and r39 r36
+296	    trace_scope 0 r35 r34 -1
+297	    r39 = bit_and r38 r36
+298	    trace_line 0 r39 r34 L20
+299	    r41 = add_f32 r18 r40
+300	    r40 = select r39 r41 r40
+301	    trace_var 0 r39 r34 $22 = r40
+302	    trace_scope 0 r37 r34 -1
+303	    r36 = bit_or r35 r36
+304	    r35 = bit_and r38 r36
+305	    trace_line 0 r35 r34 L18
+306	    trace_var 0 r35 r34 $23 = r14
+307	    trace_scope 0 r35 r34 1
+308	    trace_line 0 r35 r34 L19
+309	    r37 = gt_f32 r33 r14
+310	    r37 = bit_and r38 r37
+311	    r37 = bit_and r36 r37
+312	    trace_scope 0 r37 r34 1
+313	    trace_line 0 r37 r34 L19
+314	    r39 = bit_xor r10 r37
+315	    r39 = bit_and r36 r39
+316	    trace_scope 0 r37 r34 -1
+317	    r36 = bit_and r38 r39
+318	    trace_line 0 r36 r34 L20
+319	    r41 = add_f32 r14 r40
+320	    r40 = select r36 r41 r40
+321	    trace_var 0 r36 r34 $22 = r40
+322	    trace_scope 0 r35 r34 -1
+323	    r39 = bit_or r37 r39
+324	    r37 = bit_and r38 r39
+325	    trace_line 0 r37 r34 L18
+326	    trace_var 0 r37 r34 $23 = r19
+327	    trace_scope 0 r37 r34 1
+328	    trace_line 0 r37 r34 L19
+329	    r35 = gt_f32 r33 r19
+330	    r35 = bit_and r38 r35
+331	    r35 = bit_and r39 r35
+332	    trace_scope 0 r35 r34 1
+333	    trace_line 0 r35 r34 L19
+334	    r36 = bit_xor r10 r35
+335	    r36 = bit_and r39 r36
+336	    trace_scope 0 r35 r34 -1
+337	    r39 = bit_and r38 r36
+338	    trace_line 0 r39 r34 L20
+339	    r41 = add_f32 r19 r40
+340	    r40 = select r39 r41 r40
+341	    trace_var 0 r39 r34 $22 = r40
+342	    trace_scope 0 r37 r34 -1
+343	    r36 = bit_or r35 r36
+344	    r35 = bit_and r38 r36
+345	    trace_line 0 r35 r34 L18
+346	    trace_var 0 r35 r34 $23 = r20
+347	    trace_scope 0 r35 r34 1
+348	    trace_line 0 r35 r34 L19
+349	    r37 = gt_f32 r33 r20
+350	    r37 = bit_and r38 r37
+351	    r37 = bit_and r36 r37
+352	    trace_scope 0 r37 r34 1
+353	    trace_line 0 r37 r34 L19
+354	    r39 = bit_xor r10 r37
+355	    r39 = bit_and r36 r39
+356	    trace_scope 0 r37 r34 -1
+357	    r36 = bit_and r38 r39
+358	    trace_line 0 r36 r34 L20
+359	    r41 = add_f32 r20 r40
+360	    r40 = select r36 r41 r40
+361	    trace_var 0 r36 r34 $22 = r40
+362	    trace_scope 0 r35 r34 -1
+363	    r39 = bit_or r37 r39
+364	    r37 = bit_and r38 r39
+365	    trace_line 0 r37 r34 L18
+366	    trace_var 0 r37 r34 $23 = r21
+367	    trace_scope 0 r37 r34 1
+368	    trace_line 0 r37 r34 L19
+369	    r35 = gt_f32 r33 r21
+370	    r35 = bit_and r38 r35
+371	    r35 = bit_and r39 r35
+372	    trace_scope 0 r35 r34 1
+373	    trace_line 0 r35 r34 L19
+374	    r36 = bit_xor r10 r35
+375	    r36 = bit_and r39 r36
+376	    trace_scope 0 r35 r34 -1
+377	    r39 = bit_and r38 r36
+378	    trace_line 0 r39 r34 L20
+379	    r41 = add_f32 r21 r40
+380	    r40 = select r39 r41 r40
+381	    trace_var 0 r39 r34 $22 = r40
+382	    trace_scope 0 r37 r34 -1
+383	    r36 = bit_or r35 r36
+384	    r35 = bit_and r38 r36
+385	    trace_line 0 r35 r34 L18
+386	    trace_var 0 r35 r34 $23 = r22
+387	    trace_scope 0 r35 r34 1
+388	    trace_line 0 r35 r34 L19
+389	    r37 = gt_f32 r33 r22
+390	    r37 = bit_and r38 r37
+391	    r37 = bit_and r36 r37
+392	    trace_scope 0 r37 r34 1
+393	    trace_line 0 r37 r34 L19
+394	    r39 = bit_xor r10 r37
+395	    r39 = bit_and r36 r39
+396	    trace_scope 0 r37 r34 -1
+397	    r36 = bit_and r38 r39
+398	    trace_line 0 r36 r34 L20
+399	    r41 = add_f32 r22 r40
+400	    r40 = select r36 r41 r40
+401	    trace_var 0 r36 r34 $22 = r40
+402	    trace_scope 0 r35 r34 -1
+403	    r39 = bit_or r37 r39
+404	    r39 = bit_and r38 r39
+405	    trace_line 0 r39 r34 L18
+406	    trace_scope 0 r38 r34 -1
+407	    trace_line 0 r38 r34 L22
+408	    r40 = bit_and r38 r40
+409	    trace_var 0 r38 r34 $20 = r40
+410	    trace_scope 0 r38 r34 -1
+411	    trace_exit 0 r38 r34 F2
+412	    r40 = eq_f32 r40 r23
+413	    r40 = bit_and r38 r40
+414	    trace_enter 0 r40 r34 F3
+415	    trace_var 0 r40 r34 $25 = r33
+416	    trace_scope 0 r40 r34 1
+417	    trace_line 0 r40 r34 L27
+418	    trace_var 0 r40 r34 $26 = r9
+419	    trace_line 0 r40 r34 L28
+420	    trace_var 0 r40 r34 $27 = r15
+421	    trace_line 0 r40 r34 L29
+422	    trace_scope 0 r40 r34 1
+423	    trace_var 0 r40 r34 $28 = r9
+424	    trace_scope 0 r40 r34 1
+425	    trace_line 0 r40 r34 L30
+426	    r38 = gt_f32 r9 r33
+427	    r38 = bit_and r40 r38
+428	    trace_scope 0 r38 r34 1
+429	    trace_line 0 r38 r34 L30
+430	    r39 = bit_xor r10 r38
+431	    trace_scope 0 r38 r34 -1
+432	    r38 = bit_and r40 r39
+433	    trace_line 0 r38 r34 L31
+434	    trace_scope 0 r40 r34 -1
+435	    trace_line 0 r38 r34 L29
+436	    trace_var 0 r38 r34 $28 = r15
+437	    trace_scope 0 r38 r34 1
+438	    trace_line 0 r38 r34 L30
+439	    r37 = gt_f32 r15 r33
+440	    r37 = bit_and r40 r37
+441	    r37 = bit_and r39 r37
+442	    trace_scope 0 r37 r34 1
 443	    trace_line 0 r37 r34 L30
-444	    r33 = gt_f32 r22 r33
-445	    r33 = bit_and r39 r33
-446	    r33 = bit_and r35 r33
-447	    trace_line 0 r33 r34 L30
-448	    r33 = bit_xor r10 r33
-449	    r33 = bit_and r35 r33
-450	    r33 = bit_and r39 r33
-451	    trace_line 0 r33 r34 L31
-452	    r35 = add_f32 r22 r36
-453	    r36 = select r33 r35 r36
-454	    trace_var 0 r33 r34 $26 = r36
-455	    trace_line 0 r33 r34 L29
-456	    trace_line 0 r39 r34 L33
-457	    r36 = bit_and r39 r36
-458	    trace_exit 0 r39 r34 F3
-459	    trace_var 0 r39 r34 $24 = r36
-460	    r36 = eq_f32 r36 r24
-461	    r36 = bit_and r39 r36
-462	    trace_enter 0 r36 r34 F4
-463	    trace_line 0 r36 r34 L38
-464	    trace_var 0 r36 r34 $30 = r9
-465	    trace_line 0 r36 r34 L39
-466	    trace_var 0 r36 r34 $31 = r25
-467	    trace_line 0 r36 r34 L40
-468	    r39 = bit_and r36 r25
-469	    trace_var 0 r36 r34 $30 = r39
-470	    trace_line 0 r36 r34 L39
-471	    trace_var 0 r36 r34 $31 = r26
-472	    trace_line 0 r36 r34 L40
-473	    r33 = add_f32 r39 r26
-474	    r39 = select r36 r33 r39
-475	    trace_var 0 r36 r34 $30 = r39
-476	    trace_line 0 r36 r34 L39
-477	    trace_var 0 r36 r34 $31 = r27
-478	    trace_line 0 r36 r34 L40
-479	    r33 = add_f32 r39 r27
-480	    r39 = select r36 r33 r39
-481	    trace_var 0 r36 r34 $30 = r39
-482	    trace_line 0 r36 r34 L39
-483	    trace_var 0 r36 r34 $31 = r28
-484	    trace_line 0 r36 r34 L40
-485	    r33 = add_f32 r39 r28
-486	    r39 = select r36 r33 r39
-487	    trace_var 0 r36 r34 $30 = r39
-488	    trace_line 0 r36 r34 L39
-489	    trace_var 0 r36 r34 $31 = r29
-490	    trace_line 0 r36 r34 L40
-491	    r33 = add_f32 r39 r29
-492	    r39 = select r36 r33 r39
-493	    trace_var 0 r36 r34 $30 = r39
-494	    trace_line 0 r36 r34 L39
-495	    trace_line 0 r36 r34 L42
-496	    r39 = sub_f32 r39 r30
-497	    r39 = bit_and r36 r39
-498	    trace_exit 0 r36 r34 F4
-499	    trace_var 0 r36 r34 $29 = r39
-500	    r39 = bit_and r39 r31
-501	    r39 = gt_f32 r32 r39
-502	    r39 = bit_and r36 r39
-503	    trace_enter 0 r39 r34 F5
-504	    trace_line 0 r39 r34 L47
-505	    trace_line 0 r39 r34 L48
-506	    trace_line 0 r39 r34 L50
-507	    trace_var 0 r39 r34 $33 = r22
-508	    trace_var 0 r39 r34 $34 = r22
-509	    trace_var 0 r39 r34 $35 = r22
-510	    trace_var 0 r39 r34 $36 = r22
-511	    trace_line 0 r39 r34 L51
-512	    trace_var 0 r39 r34 $37 = r15
-513	    trace_line 0 r39 r34 L52
-514	    r36 = select r39 r15 r22
-515	    trace_var 0 r39 r34 $36 = r36
-516	    trace_line 0 r39 r34 L51
-517	    trace_var 0 r39 r34 $37 = r16
-518	    trace_line 0 r39 r34 L52
-519	    r33 = select r39 r36 r22
-520	    trace_var 0 r39 r34 $35 = r33
-521	    r36 = select r39 r16 r36
-522	    trace_var 0 r39 r34 $36 = r36
-523	    trace_line 0 r39 r34 L51
-524	    trace_var 0 r39 r34 $37 = r17
-525	    trace_line 0 r39 r34 L52
-526	    r35 = select r39 r33 r22
-527	    trace_var 0 r39 r34 $34 = r35
-528	    r33 = select r39 r36 r33
-529	    trace_var 0 r39 r34 $35 = r33
-530	    r36 = select r39 r17 r36
-531	    trace_var 0 r39 r34 $36 = r36
-532	    trace_line 0 r39 r34 L51
-533	    trace_line 0 r39 r34 L54
-534	    r35 = eq_f32 r15 r35
-535	    r33 = eq_f32 r16 r33
-536	    r36 = eq_f32 r17 r36
-537	    r33 = bit_and r35 r33
-538	    r33 = bit_and r36 r33
-539	    r33 = bit_and r39 r33
-540	    trace_exit 0 r39 r34 F5
-541	    trace_var 0 r39 r34 $32 = r33
-542	    r33 = bit_and r39 r33
-543	    trace_enter 0 r33 r34 F6
-544	    trace_line 0 r33 r34 L59
-545	    trace_line 0 r33 r34 L60
-546	    trace_line 0 r33 r34 L62
-547	    trace_var 0 r33 r34 $39 = r22
-548	    trace_var 0 r33 r34 $40 = r22
-549	    trace_var 0 r33 r34 $41 = r22
-550	    trace_var 0 r33 r34 $42 = r22
-551	    trace_line 0 r33 r34 L63
-552	    trace_var 0 r33 r34 $43 = r15
-553	    trace_line 0 r33 r34 L64
-554	    r39 = select r33 r15 r22
-555	    trace_var 0 r33 r34 $42 = r39
-556	    trace_line 0 r33 r34 L63
-557	    trace_var 0 r33 r34 $43 = r16
-558	    trace_line 0 r33 r34 L64
-559	    r36 = select r33 r39 r22
-560	    trace_var 0 r33 r34 $41 = r36
-561	    r39 = select r33 r16 r39
-562	    trace_var 0 r33 r34 $42 = r39
-563	    trace_line 0 r33 r34 L63
-564	    trace_var 0 r33 r34 $43 = r17
-565	    trace_line 0 r33 r34 L64
-566	    r35 = select r33 r36 r22
-567	    trace_var 0 r33 r34 $40 = r35
-568	    r36 = select r33 r39 r36
-569	    trace_var 0 r33 r34 $41 = r36
-570	    r39 = select r33 r17 r39
-571	    trace_var 0 r33 r34 $42 = r39
-572	    trace_line 0 r33 r34 L63
-573	    trace_line 0 r33 r34 L66
-574	    r35 = eq_f32 r15 r35
-575	    r36 = eq_f32 r16 r36
-576	    r39 = eq_f32 r17 r39
-577	    r36 = bit_and r35 r36
-578	    r36 = bit_and r39 r36
-579	    r36 = bit_and r33 r36
-580	    trace_exit 0 r33 r34 F6
-581	    trace_var 0 r33 r34 $38 = r36
-582	    r36 = bit_and r33 r36
-583	    trace_enter 0 r36 r34 F7
-584	    trace_line 0 r36 r34 L71
-585	    trace_line 0 r36 r34 L72
-586	    trace_line 0 r36 r34 L74
-587	    trace_var 0 r36 r34 $45 = r22
-588	    trace_var 0 r36 r34 $46 = r22
-589	    trace_var 0 r36 r34 $47 = r22
-590	    trace_var 0 r36 r34 $48 = r22
-591	    trace_line 0 r36 r34 L75
-592	    trace_var 0 r36 r34 $49 = r17
-593	    trace_line 0 r36 r34 L76
-594	    r33 = select r36 r17 r22
-595	    trace_var 0 r36 r34 $48 = r33
-596	    trace_line 0 r36 r34 L75
-597	    trace_var 0 r36 r34 $49 = r16
-598	    trace_line 0 r36 r34 L76
-599	    r39 = select r36 r33 r22
-600	    trace_var 0 r36 r34 $47 = r39
-601	    r33 = select r36 r16 r33
-602	    trace_var 0 r36 r34 $48 = r33
-603	    trace_line 0 r36 r34 L75
-604	    trace_var 0 r36 r34 $49 = r15
-605	    trace_line 0 r36 r34 L76
-606	    r35 = select r36 r39 r22
-607	    trace_var 0 r36 r34 $46 = r35
-608	    r39 = select r36 r33 r39
-609	    trace_var 0 r36 r34 $47 = r39
-610	    r33 = select r36 r15 r33
-611	    trace_var 0 r36 r34 $48 = r33
-612	    trace_line 0 r36 r34 L75
-613	    trace_line 0 r36 r34 L78
-614	    r35 = eq_f32 r17 r35
-615	    r39 = eq_f32 r16 r39
-616	    r33 = eq_f32 r15 r33
-617	    r39 = bit_and r35 r39
-618	    r39 = bit_and r33 r39
-619	    r39 = bit_and r36 r39
-620	    trace_exit 0 r36 r34 F7
-621	    trace_var 0 r36 r34 $44 = r39
-622	    r39 = bit_and r36 r39
-623	    trace_enter 0 r39 r34 F8
-624	    trace_line 0 r39 r34 L83
-625	    trace_line 0 r39 r34 L84
-626	    trace_line 0 r39 r34 L86
-627	    trace_var 0 r39 r34 $51 = r22
-628	    trace_var 0 r39 r34 $52 = r22
-629	    trace_var 0 r39 r34 $53 = r22
-630	    trace_var 0 r39 r34 $54 = r22
-631	    trace_line 0 r39 r34 L87
-632	    trace_var 0 r39 r34 $55 = r17
-633	    trace_line 0 r39 r34 L88
-634	    r36 = select r39 r17 r22
-635	    trace_var 0 r39 r34 $54 = r36
-636	    trace_line 0 r39 r34 L87
-637	    trace_var 0 r39 r34 $55 = r16
-638	    trace_line 0 r39 r34 L88
-639	    r33 = select r39 r36 r22
-640	    trace_var 0 r39 r34 $53 = r33
-641	    r36 = select r39 r16 r36
-642	    trace_var 0 r39 r34 $54 = r36
-643	    trace_line 0 r39 r34 L87
-644	    trace_var 0 r39 r34 $55 = r15
-645	    trace_line 0 r39 r34 L88
-646	    r35 = select r39 r33 r22
-647	    trace_var 0 r39 r34 $52 = r35
-648	    r33 = select r39 r36 r33
-649	    trace_var 0 r39 r34 $53 = r33
-650	    r36 = select r39 r15 r36
-651	    trace_var 0 r39 r34 $54 = r36
-652	    trace_line 0 r39 r34 L87
-653	    trace_line 0 r39 r34 L90
-654	    r35 = eq_f32 r17 r35
-655	    r33 = eq_f32 r16 r33
-656	    r36 = eq_f32 r15 r36
-657	    r33 = bit_and r35 r33
-658	    r33 = bit_and r36 r33
-659	    r33 = bit_and r39 r33
-660	    trace_exit 0 r39 r34 F8
-661	    trace_var 0 r39 r34 $50 = r33
-662	    r33 = bit_and r39 r33
-663	    trace_enter 0 r33 r34 F9
-664	    trace_line 0 r33 r34 L106
-665	    trace_line 0 r33 r34 L108
-666	    trace_var 0 r33 r34 $57 = r22
-667	    trace_var 0 r33 r34 $58 = r22
-668	    trace_var 0 r33 r34 $59 = r22
-669	    trace_var 0 r33 r34 $60 = r22
-670	    trace_line 0 r33 r34 L109
-671	    trace_var 0 r33 r34 $61 = r15
-672	    trace_line 0 r33 r34 L110
-673	    r39 = select r33 r15 r22
-674	    trace_var 0 r33 r34 $60 = r39
-675	    trace_line 0 r33 r34 L109
-676	    trace_line 0 r33 r34 L112
-677	    r39 = eq_f32 r15 r39
-678	    r39 = bit_and r33 r39
-679	    trace_exit 0 r33 r34 F9
-680	    trace_var 0 r33 r34 $56 = r39
-681	    r39 = bit_and r33 r39
-682	    trace_enter 0 r39 r34 F10
-683	    trace_line 0 r39 r34 L95
-684	    trace_line 0 r39 r34 L97
-685	    trace_var 0 r39 r34 $63 = r22
-686	    trace_var 0 r39 r34 $64 = r22
-687	    trace_var 0 r39 r34 $65 = r22
-688	    trace_var 0 r39 r34 $66 = r22
-689	    trace_line 0 r39 r34 L98
-690	    trace_var 0 r39 r34 $67 = r15
-691	    trace_line 0 r39 r34 L99
-692	    r33 = select r39 r15 r22
-693	    trace_var 0 r39 r34 $66 = r33
-694	    trace_line 0 r39 r34 L98
-695	    trace_var 0 r39 r34 $67 = r16
-696	    trace_line 0 r39 r34 L99
-697	    r36 = select r39 r33 r22
-698	    trace_var 0 r39 r34 $65 = r36
-699	    r33 = select r39 r16 r33
-700	    trace_var 0 r39 r34 $66 = r33
-701	    trace_line 0 r39 r34 L98
-702	    trace_var 0 r39 r34 $67 = r17
-703	    trace_line 0 r39 r34 L99
-704	    r35 = select r39 r36 r22
-705	    trace_var 0 r39 r34 $64 = r35
-706	    r36 = select r39 r33 r36
-707	    trace_var 0 r39 r34 $65 = r36
-708	    r33 = select r39 r17 r33
-709	    trace_var 0 r39 r34 $66 = r33
-710	    trace_line 0 r39 r34 L98
-711	    trace_line 0 r39 r34 L101
-712	    r35 = eq_f32 r15 r35
-713	    r36 = eq_f32 r16 r36
-714	    r33 = eq_f32 r17 r33
-715	    r36 = bit_and r35 r36
-716	    r36 = bit_and r33 r36
-717	    r36 = bit_and r39 r36
-718	    trace_exit 0 r39 r34 F10
-719	    trace_var 0 r39 r34 $62 = r36
-720	    r36 = bit_and r39 r36
-721	    r39 = select r36 r5 r1
-722	    r33 = select r36 r6 r2
-723	    r35 = select r36 r7 r3
-724	    r36 = select r36 r8 r4
-725	    trace_exit 0 r34 r34 F0
-726	    trace_var 0 r34 r34 $10 = r39
-727	    trace_var 0 r34 r34 $11 = r33
-728	    trace_var 0 r34 r34 $12 = r35
-729	    trace_var 0 r34 r34 $13 = r36
-730	    store32 ptr1 r39
-731	    store32 ptr2 r33
-732	    store32 ptr3 r35
-733	    store32 ptr4 r36
+444	    r35 = bit_xor r10 r37
+445	    r35 = bit_and r39 r35
+446	    trace_scope 0 r37 r34 -1
+447	    r37 = bit_and r40 r35
+448	    trace_line 0 r37 r34 L31
+449	    r39 = bit_and r15 r37
+450	    trace_var 0 r37 r34 $26 = r39
+451	    trace_scope 0 r38 r34 -1
+452	    trace_line 0 r37 r34 L29
+453	    trace_var 0 r37 r34 $28 = r16
+454	    trace_scope 0 r37 r34 1
+455	    trace_line 0 r37 r34 L30
+456	    r38 = gt_f32 r16 r33
+457	    r38 = bit_and r40 r38
+458	    r38 = bit_and r35 r38
+459	    trace_scope 0 r38 r34 1
+460	    trace_line 0 r38 r34 L30
+461	    r36 = bit_xor r10 r38
+462	    r36 = bit_and r35 r36
+463	    trace_scope 0 r38 r34 -1
+464	    r38 = bit_and r40 r36
+465	    trace_line 0 r38 r34 L31
+466	    r35 = add_f32 r16 r39
+467	    r39 = select r38 r35 r39
+468	    trace_var 0 r38 r34 $26 = r39
+469	    trace_scope 0 r37 r34 -1
+470	    trace_line 0 r38 r34 L29
+471	    trace_var 0 r38 r34 $28 = r17
+472	    trace_scope 0 r38 r34 1
+473	    trace_line 0 r38 r34 L30
+474	    r37 = gt_f32 r17 r33
+475	    r37 = bit_and r40 r37
+476	    r37 = bit_and r36 r37
+477	    trace_scope 0 r37 r34 1
+478	    trace_line 0 r37 r34 L30
+479	    r35 = bit_xor r10 r37
+480	    r35 = bit_and r36 r35
+481	    trace_scope 0 r37 r34 -1
+482	    r37 = bit_and r40 r35
+483	    trace_line 0 r37 r34 L31
+484	    r36 = add_f32 r17 r39
+485	    r39 = select r37 r36 r39
+486	    trace_var 0 r37 r34 $26 = r39
+487	    trace_scope 0 r38 r34 -1
+488	    trace_line 0 r37 r34 L29
+489	    trace_var 0 r37 r34 $28 = r18
+490	    trace_scope 0 r37 r34 1
+491	    trace_line 0 r37 r34 L30
+492	    r38 = gt_f32 r18 r33
+493	    r38 = bit_and r40 r38
+494	    r38 = bit_and r35 r38
+495	    trace_scope 0 r38 r34 1
+496	    trace_line 0 r38 r34 L30
+497	    r36 = bit_xor r10 r38
+498	    r36 = bit_and r35 r36
+499	    trace_scope 0 r38 r34 -1
+500	    r38 = bit_and r40 r36
+501	    trace_line 0 r38 r34 L31
+502	    r35 = add_f32 r18 r39
+503	    r39 = select r38 r35 r39
+504	    trace_var 0 r38 r34 $26 = r39
+505	    trace_scope 0 r37 r34 -1
+506	    trace_line 0 r38 r34 L29
+507	    trace_var 0 r38 r34 $28 = r14
+508	    trace_scope 0 r38 r34 1
+509	    trace_line 0 r38 r34 L30
+510	    r37 = gt_f32 r14 r33
+511	    r37 = bit_and r40 r37
+512	    r37 = bit_and r36 r37
+513	    trace_scope 0 r37 r34 1
+514	    trace_line 0 r37 r34 L30
+515	    r35 = bit_xor r10 r37
+516	    r35 = bit_and r36 r35
+517	    trace_scope 0 r37 r34 -1
+518	    r37 = bit_and r40 r35
+519	    trace_line 0 r37 r34 L31
+520	    r36 = add_f32 r14 r39
+521	    r39 = select r37 r36 r39
+522	    trace_var 0 r37 r34 $26 = r39
+523	    trace_scope 0 r38 r34 -1
+524	    trace_line 0 r37 r34 L29
+525	    trace_var 0 r37 r34 $28 = r19
+526	    trace_scope 0 r37 r34 1
+527	    trace_line 0 r37 r34 L30
+528	    r38 = gt_f32 r19 r33
+529	    r38 = bit_and r40 r38
+530	    r38 = bit_and r35 r38
+531	    trace_scope 0 r38 r34 1
+532	    trace_line 0 r38 r34 L30
+533	    r36 = bit_xor r10 r38
+534	    r36 = bit_and r35 r36
+535	    trace_scope 0 r38 r34 -1
+536	    r38 = bit_and r40 r36
+537	    trace_line 0 r38 r34 L31
+538	    r35 = add_f32 r19 r39
+539	    r39 = select r38 r35 r39
+540	    trace_var 0 r38 r34 $26 = r39
+541	    trace_scope 0 r37 r34 -1
+542	    trace_line 0 r38 r34 L29
+543	    trace_var 0 r38 r34 $28 = r20
+544	    trace_scope 0 r38 r34 1
+545	    trace_line 0 r38 r34 L30
+546	    r37 = gt_f32 r20 r33
+547	    r37 = bit_and r40 r37
+548	    r37 = bit_and r36 r37
+549	    trace_scope 0 r37 r34 1
+550	    trace_line 0 r37 r34 L30
+551	    r35 = bit_xor r10 r37
+552	    r35 = bit_and r36 r35
+553	    trace_scope 0 r37 r34 -1
+554	    r37 = bit_and r40 r35
+555	    trace_line 0 r37 r34 L31
+556	    r36 = add_f32 r20 r39
+557	    r39 = select r37 r36 r39
+558	    trace_var 0 r37 r34 $26 = r39
+559	    trace_scope 0 r38 r34 -1
+560	    trace_line 0 r37 r34 L29
+561	    trace_var 0 r37 r34 $28 = r21
+562	    trace_scope 0 r37 r34 1
+563	    trace_line 0 r37 r34 L30
+564	    r38 = gt_f32 r21 r33
+565	    r38 = bit_and r40 r38
+566	    r38 = bit_and r35 r38
+567	    trace_scope 0 r38 r34 1
+568	    trace_line 0 r38 r34 L30
+569	    r36 = bit_xor r10 r38
+570	    r36 = bit_and r35 r36
+571	    trace_scope 0 r38 r34 -1
+572	    r38 = bit_and r40 r36
+573	    trace_line 0 r38 r34 L31
+574	    r35 = add_f32 r21 r39
+575	    r39 = select r38 r35 r39
+576	    trace_var 0 r38 r34 $26 = r39
+577	    trace_scope 0 r37 r34 -1
+578	    trace_line 0 r38 r34 L29
+579	    trace_var 0 r38 r34 $28 = r22
+580	    trace_scope 0 r38 r34 1
+581	    trace_line 0 r38 r34 L30
+582	    r33 = gt_f32 r22 r33
+583	    r33 = bit_and r40 r33
+584	    r33 = bit_and r36 r33
+585	    trace_scope 0 r33 r34 1
+586	    trace_line 0 r33 r34 L30
+587	    r37 = bit_xor r10 r33
+588	    r37 = bit_and r36 r37
+589	    trace_scope 0 r33 r34 -1
+590	    r37 = bit_and r40 r37
+591	    trace_line 0 r37 r34 L31
+592	    r33 = add_f32 r22 r39
+593	    r39 = select r37 r33 r39
+594	    trace_var 0 r37 r34 $26 = r39
+595	    trace_scope 0 r38 r34 -1
+596	    trace_line 0 r37 r34 L29
+597	    trace_scope 0 r40 r34 -1
+598	    trace_line 0 r40 r34 L33
+599	    r39 = bit_and r40 r39
+600	    trace_var 0 r40 r34 $24 = r39
+601	    trace_scope 0 r40 r34 -1
+602	    trace_exit 0 r40 r34 F3
+603	    r39 = eq_f32 r39 r24
+604	    r39 = bit_and r40 r39
+605	    trace_enter 0 r39 r34 F4
+606	    trace_scope 0 r39 r34 1
+607	    trace_line 0 r39 r34 L38
+608	    trace_var 0 r39 r34 $30 = r9
+609	    trace_line 0 r39 r34 L39
+610	    trace_scope 0 r39 r34 1
+611	    trace_var 0 r39 r34 $31 = r25
+612	    trace_scope 0 r39 r34 1
+613	    trace_line 0 r39 r34 L40
+614	    r40 = bit_and r39 r25
+615	    trace_var 0 r39 r34 $30 = r40
+616	    trace_scope 0 r39 r34 -1
+617	    trace_line 0 r39 r34 L39
+618	    trace_var 0 r39 r34 $31 = r26
+619	    trace_scope 0 r39 r34 1
+620	    trace_line 0 r39 r34 L40
+621	    r37 = add_f32 r40 r26
+622	    r40 = select r39 r37 r40
+623	    trace_var 0 r39 r34 $30 = r40
+624	    trace_scope 0 r39 r34 -1
+625	    trace_line 0 r39 r34 L39
+626	    trace_var 0 r39 r34 $31 = r27
+627	    trace_scope 0 r39 r34 1
+628	    trace_line 0 r39 r34 L40
+629	    r37 = add_f32 r40 r27
+630	    r40 = select r39 r37 r40
+631	    trace_var 0 r39 r34 $30 = r40
+632	    trace_scope 0 r39 r34 -1
+633	    trace_line 0 r39 r34 L39
+634	    trace_var 0 r39 r34 $31 = r28
+635	    trace_scope 0 r39 r34 1
+636	    trace_line 0 r39 r34 L40
+637	    r37 = add_f32 r40 r28
+638	    r40 = select r39 r37 r40
+639	    trace_var 0 r39 r34 $30 = r40
+640	    trace_scope 0 r39 r34 -1
+641	    trace_line 0 r39 r34 L39
+642	    trace_var 0 r39 r34 $31 = r29
+643	    trace_scope 0 r39 r34 1
+644	    trace_line 0 r39 r34 L40
+645	    r37 = add_f32 r40 r29
+646	    r40 = select r39 r37 r40
+647	    trace_var 0 r39 r34 $30 = r40
+648	    trace_scope 0 r39 r34 -1
+649	    trace_line 0 r39 r34 L39
+650	    trace_scope 0 r39 r34 -1
+651	    trace_line 0 r39 r34 L42
+652	    r40 = sub_f32 r40 r30
+653	    r40 = bit_and r39 r40
+654	    trace_var 0 r39 r34 $29 = r40
+655	    trace_scope 0 r39 r34 -1
+656	    trace_exit 0 r39 r34 F4
+657	    r40 = bit_and r40 r31
+658	    r40 = gt_f32 r32 r40
+659	    r40 = bit_and r39 r40
+660	    trace_enter 0 r40 r34 F5
+661	    trace_scope 0 r40 r34 1
+662	    trace_line 0 r40 r34 L47
+663	    trace_line 0 r40 r34 L48
+664	    trace_line 0 r40 r34 L50
+665	    trace_var 0 r40 r34 $33 = r22
+666	    trace_var 0 r40 r34 $34 = r22
+667	    trace_var 0 r40 r34 $35 = r22
+668	    trace_var 0 r40 r34 $36 = r22
+669	    trace_line 0 r40 r34 L51
+670	    trace_scope 0 r40 r34 1
+671	    trace_var 0 r40 r34 $37 = r15
+672	    trace_scope 0 r40 r34 1
+673	    trace_line 0 r40 r34 L52
+674	    r39 = select r40 r15 r22
+675	    trace_var 0 r40 r34 $36 = r39
+676	    trace_scope 0 r40 r34 -1
+677	    trace_line 0 r40 r34 L51
+678	    trace_var 0 r40 r34 $37 = r16
+679	    trace_scope 0 r40 r34 1
+680	    trace_line 0 r40 r34 L52
+681	    r37 = select r40 r39 r22
+682	    trace_var 0 r40 r34 $35 = r37
+683	    r39 = select r40 r16 r39
+684	    trace_var 0 r40 r34 $36 = r39
+685	    trace_scope 0 r40 r34 -1
+686	    trace_line 0 r40 r34 L51
+687	    trace_var 0 r40 r34 $37 = r17
+688	    trace_scope 0 r40 r34 1
+689	    trace_line 0 r40 r34 L52
+690	    r38 = select r40 r37 r22
+691	    trace_var 0 r40 r34 $34 = r38
+692	    r37 = select r40 r39 r37
+693	    trace_var 0 r40 r34 $35 = r37
+694	    r39 = select r40 r17 r39
+695	    trace_var 0 r40 r34 $36 = r39
+696	    trace_scope 0 r40 r34 -1
+697	    trace_line 0 r40 r34 L51
+698	    trace_scope 0 r40 r34 -1
+699	    trace_line 0 r40 r34 L54
+700	    r38 = eq_f32 r15 r38
+701	    r37 = eq_f32 r16 r37
+702	    r39 = eq_f32 r17 r39
+703	    r37 = bit_and r38 r37
+704	    r37 = bit_and r39 r37
+705	    r37 = bit_and r40 r37
+706	    trace_var 0 r40 r34 $32 = r37
+707	    trace_scope 0 r40 r34 -1
+708	    trace_exit 0 r40 r34 F5
+709	    r37 = bit_and r40 r37
+710	    trace_enter 0 r37 r34 F6
+711	    trace_scope 0 r37 r34 1
+712	    trace_line 0 r37 r34 L59
+713	    trace_line 0 r37 r34 L60
+714	    trace_line 0 r37 r34 L62
+715	    trace_var 0 r37 r34 $39 = r22
+716	    trace_var 0 r37 r34 $40 = r22
+717	    trace_var 0 r37 r34 $41 = r22
+718	    trace_var 0 r37 r34 $42 = r22
+719	    trace_line 0 r37 r34 L63
+720	    trace_scope 0 r37 r34 1
+721	    trace_var 0 r37 r34 $43 = r15
+722	    trace_scope 0 r37 r34 1
+723	    trace_line 0 r37 r34 L64
+724	    r40 = select r37 r15 r22
+725	    trace_var 0 r37 r34 $42 = r40
+726	    trace_scope 0 r37 r34 -1
+727	    trace_line 0 r37 r34 L63
+728	    trace_var 0 r37 r34 $43 = r16
+729	    trace_scope 0 r37 r34 1
+730	    trace_line 0 r37 r34 L64
+731	    r39 = select r37 r40 r22
+732	    trace_var 0 r37 r34 $41 = r39
+733	    r40 = select r37 r16 r40
+734	    trace_var 0 r37 r34 $42 = r40
+735	    trace_scope 0 r37 r34 -1
+736	    trace_line 0 r37 r34 L63
+737	    trace_var 0 r37 r34 $43 = r17
+738	    trace_scope 0 r37 r34 1
+739	    trace_line 0 r37 r34 L64
+740	    r38 = select r37 r39 r22
+741	    trace_var 0 r37 r34 $40 = r38
+742	    r39 = select r37 r40 r39
+743	    trace_var 0 r37 r34 $41 = r39
+744	    r40 = select r37 r17 r40
+745	    trace_var 0 r37 r34 $42 = r40
+746	    trace_scope 0 r37 r34 -1
+747	    trace_line 0 r37 r34 L63
+748	    trace_scope 0 r37 r34 -1
+749	    trace_line 0 r37 r34 L66
+750	    r38 = eq_f32 r15 r38
+751	    r39 = eq_f32 r16 r39
+752	    r40 = eq_f32 r17 r40
+753	    r39 = bit_and r38 r39
+754	    r39 = bit_and r40 r39
+755	    r39 = bit_and r37 r39
+756	    trace_var 0 r37 r34 $38 = r39
+757	    trace_scope 0 r37 r34 -1
+758	    trace_exit 0 r37 r34 F6
+759	    r39 = bit_and r37 r39
+760	    trace_enter 0 r39 r34 F7
+761	    trace_scope 0 r39 r34 1
+762	    trace_line 0 r39 r34 L71
+763	    trace_line 0 r39 r34 L72
+764	    trace_line 0 r39 r34 L74
+765	    trace_var 0 r39 r34 $45 = r22
+766	    trace_var 0 r39 r34 $46 = r22
+767	    trace_var 0 r39 r34 $47 = r22
+768	    trace_var 0 r39 r34 $48 = r22
+769	    trace_line 0 r39 r34 L75
+770	    trace_scope 0 r39 r34 1
+771	    trace_var 0 r39 r34 $49 = r17
+772	    trace_scope 0 r39 r34 1
+773	    trace_line 0 r39 r34 L76
+774	    r37 = select r39 r17 r22
+775	    trace_var 0 r39 r34 $48 = r37
+776	    trace_scope 0 r39 r34 -1
+777	    trace_line 0 r39 r34 L75
+778	    trace_var 0 r39 r34 $49 = r16
+779	    trace_scope 0 r39 r34 1
+780	    trace_line 0 r39 r34 L76
+781	    r40 = select r39 r37 r22
+782	    trace_var 0 r39 r34 $47 = r40
+783	    r37 = select r39 r16 r37
+784	    trace_var 0 r39 r34 $48 = r37
+785	    trace_scope 0 r39 r34 -1
+786	    trace_line 0 r39 r34 L75
+787	    trace_var 0 r39 r34 $49 = r15
+788	    trace_scope 0 r39 r34 1
+789	    trace_line 0 r39 r34 L76
+790	    r38 = select r39 r40 r22
+791	    trace_var 0 r39 r34 $46 = r38
+792	    r40 = select r39 r37 r40
+793	    trace_var 0 r39 r34 $47 = r40
+794	    r37 = select r39 r15 r37
+795	    trace_var 0 r39 r34 $48 = r37
+796	    trace_scope 0 r39 r34 -1
+797	    trace_line 0 r39 r34 L75
+798	    trace_scope 0 r39 r34 -1
+799	    trace_line 0 r39 r34 L78
+800	    r38 = eq_f32 r17 r38
+801	    r40 = eq_f32 r16 r40
+802	    r37 = eq_f32 r15 r37
+803	    r40 = bit_and r38 r40
+804	    r40 = bit_and r37 r40
+805	    r40 = bit_and r39 r40
+806	    trace_var 0 r39 r34 $44 = r40
+807	    trace_scope 0 r39 r34 -1
+808	    trace_exit 0 r39 r34 F7
+809	    r40 = bit_and r39 r40
+810	    trace_enter 0 r40 r34 F8
+811	    trace_scope 0 r40 r34 1
+812	    trace_line 0 r40 r34 L83
+813	    trace_line 0 r40 r34 L84
+814	    trace_line 0 r40 r34 L86
+815	    trace_var 0 r40 r34 $51 = r22
+816	    trace_var 0 r40 r34 $52 = r22
+817	    trace_var 0 r40 r34 $53 = r22
+818	    trace_var 0 r40 r34 $54 = r22
+819	    trace_line 0 r40 r34 L87
+820	    trace_scope 0 r40 r34 1
+821	    trace_var 0 r40 r34 $55 = r17
+822	    trace_scope 0 r40 r34 1
+823	    trace_line 0 r40 r34 L88
+824	    r39 = select r40 r17 r22
+825	    trace_var 0 r40 r34 $54 = r39
+826	    trace_scope 0 r40 r34 -1
+827	    trace_line 0 r40 r34 L87
+828	    trace_var 0 r40 r34 $55 = r16
+829	    trace_scope 0 r40 r34 1
+830	    trace_line 0 r40 r34 L88
+831	    r37 = select r40 r39 r22
+832	    trace_var 0 r40 r34 $53 = r37
+833	    r39 = select r40 r16 r39
+834	    trace_var 0 r40 r34 $54 = r39
+835	    trace_scope 0 r40 r34 -1
+836	    trace_line 0 r40 r34 L87
+837	    trace_var 0 r40 r34 $55 = r15
+838	    trace_scope 0 r40 r34 1
+839	    trace_line 0 r40 r34 L88
+840	    r38 = select r40 r37 r22
+841	    trace_var 0 r40 r34 $52 = r38
+842	    r37 = select r40 r39 r37
+843	    trace_var 0 r40 r34 $53 = r37
+844	    r39 = select r40 r15 r39
+845	    trace_var 0 r40 r34 $54 = r39
+846	    trace_scope 0 r40 r34 -1
+847	    trace_line 0 r40 r34 L87
+848	    trace_scope 0 r40 r34 -1
+849	    trace_line 0 r40 r34 L90
+850	    r38 = eq_f32 r17 r38
+851	    r37 = eq_f32 r16 r37
+852	    r39 = eq_f32 r15 r39
+853	    r37 = bit_and r38 r37
+854	    r37 = bit_and r39 r37
+855	    r37 = bit_and r40 r37
+856	    trace_var 0 r40 r34 $50 = r37
+857	    trace_scope 0 r40 r34 -1
+858	    trace_exit 0 r40 r34 F8
+859	    r37 = bit_and r40 r37
+860	    trace_enter 0 r37 r34 F9
+861	    trace_scope 0 r37 r34 1
+862	    trace_line 0 r37 r34 L106
+863	    trace_line 0 r37 r34 L108
+864	    trace_var 0 r37 r34 $57 = r22
+865	    trace_var 0 r37 r34 $58 = r22
+866	    trace_var 0 r37 r34 $59 = r22
+867	    trace_var 0 r37 r34 $60 = r22
+868	    trace_line 0 r37 r34 L109
+869	    trace_scope 0 r37 r34 1
+870	    trace_var 0 r37 r34 $61 = r15
+871	    trace_scope 0 r37 r34 1
+872	    trace_line 0 r37 r34 L110
+873	    r40 = select r37 r15 r22
+874	    trace_var 0 r37 r34 $60 = r40
+875	    trace_scope 0 r37 r34 -1
+876	    trace_line 0 r37 r34 L109
+877	    trace_scope 0 r37 r34 -1
+878	    trace_line 0 r37 r34 L112
+879	    r40 = eq_f32 r15 r40
+880	    r40 = bit_and r37 r40
+881	    trace_var 0 r37 r34 $56 = r40
+882	    trace_scope 0 r37 r34 -1
+883	    trace_exit 0 r37 r34 F9
+884	    r40 = bit_and r37 r40
+885	    trace_enter 0 r40 r34 F10
+886	    trace_scope 0 r40 r34 1
+887	    trace_line 0 r40 r34 L95
+888	    trace_line 0 r40 r34 L97
+889	    trace_var 0 r40 r34 $63 = r22
+890	    trace_var 0 r40 r34 $64 = r22
+891	    trace_var 0 r40 r34 $65 = r22
+892	    trace_var 0 r40 r34 $66 = r22
+893	    trace_line 0 r40 r34 L98
+894	    trace_scope 0 r40 r34 1
+895	    trace_var 0 r40 r34 $67 = r15
+896	    trace_scope 0 r40 r34 1
+897	    trace_line 0 r40 r34 L99
+898	    r37 = select r40 r15 r22
+899	    trace_var 0 r40 r34 $66 = r37
+900	    trace_scope 0 r40 r34 -1
+901	    trace_line 0 r40 r34 L98
+902	    trace_var 0 r40 r34 $67 = r16
+903	    trace_scope 0 r40 r34 1
+904	    trace_line 0 r40 r34 L99
+905	    r39 = select r40 r37 r22
+906	    trace_var 0 r40 r34 $65 = r39
+907	    r37 = select r40 r16 r37
+908	    trace_var 0 r40 r34 $66 = r37
+909	    trace_scope 0 r40 r34 -1
+910	    trace_line 0 r40 r34 L98
+911	    trace_var 0 r40 r34 $67 = r17
+912	    trace_scope 0 r40 r34 1
+913	    trace_line 0 r40 r34 L99
+914	    r38 = select r40 r39 r22
+915	    trace_var 0 r40 r34 $64 = r38
+916	    r39 = select r40 r37 r39
+917	    trace_var 0 r40 r34 $65 = r39
+918	    r37 = select r40 r17 r37
+919	    trace_var 0 r40 r34 $66 = r37
+920	    trace_scope 0 r40 r34 -1
+921	    trace_line 0 r40 r34 L98
+922	    trace_scope 0 r40 r34 -1
+923	    trace_line 0 r40 r34 L101
+924	    r38 = eq_f32 r15 r38
+925	    r39 = eq_f32 r16 r39
+926	    r37 = eq_f32 r17 r37
+927	    r39 = bit_and r38 r39
+928	    r39 = bit_and r37 r39
+929	    r39 = bit_and r40 r39
+930	    trace_var 0 r40 r34 $62 = r39
+931	    trace_scope 0 r40 r34 -1
+932	    trace_exit 0 r40 r34 F10
+933	    r39 = bit_and r40 r39
+934	    r40 = select r39 r5 r1
+935	    r37 = select r39 r6 r2
+936	    r38 = select r39 r7 r3
+937	    r39 = select r39 r8 r4
+938	    trace_var 0 r34 r34 $10 = r40
+939	    trace_var 0 r34 r34 $11 = r37
+940	    trace_var 0 r34 r34 $12 = r38
+941	    trace_var 0 r34 r34 $13 = r39
+942	    trace_scope 0 r34 r34 -1
+943	    trace_exit 0 r34 r34 F0
+944	    store32 ptr1 r40
+945	    store32 ptr2 r37
+946	    store32 ptr3 r38
+947	    store32 ptr4 r39
diff --git a/third_party/skia/tests/sksl/runtime/LoopInt.skvm b/third_party/skia/tests/sksl/runtime/LoopInt.skvm
index 36d1bf48e7ea2..fdd12972cf2d8 100644
--- a/third_party/skia/tests/sksl/runtime/LoopInt.skvm
+++ b/third_party/skia/tests/sksl/runtime/LoopInt.skvm
@@ -74,7 +74,7 @@ F7 = bool loop_operator_gt()
 F8 = bool loop_operator_eq()
 F9 = bool loop_operator_ne()
 
-33 registers, 686 instructions:
+34 registers, 886 instructions:
 0	r0 = uniform32 ptr0 0
 1	r1 = uniform32 ptr0 4
 2	r2 = uniform32 ptr0 8
@@ -117,648 +117,848 @@ loop:
 38	    trace_enter 0 r26 r26 F0
 39	    trace_var 0 r26 r26 $14 = r25
 40	    trace_var 0 r26 r26 $15 = r0
-41	    trace_line 0 r26 r26 L107
-42	    r25 = min_f32 r25 r8
-43	    r25 = max_f32 r6 r25
-44	    r25 = trunc r25
-45	    r25 = mul_i32 r25 r14
-46	    trace_var 0 r26 r26 $16 = r25
-47	    trace_line 0 r26 r26 L108
-48	    trace_enter 0 r26 r26 F1
-49	    trace_var 0 r26 r26 $18 = r25
-50	    trace_line 0 r26 r26 L8
-51	    trace_var 0 r26 r26 $19 = r9
-52	    trace_line 0 r26 r26 L9
-53	    r27 = eq_i32 r9 r25
-54	    trace_line 0 r27 r26 L9
-55	    r28 = bit_xor r10 r27
-56	    trace_line 0 r28 r26 L8
-57	    trace_var 0 r28 r26 $19 = r15
-58	    trace_line 0 r28 r26 L9
-59	    r29 = eq_i32 r25 r15
-60	    r29 = bit_and r28 r29
-61	    trace_line 0 r29 r26 L9
-62	    r28 = bit_and r15 r29
-63	    r29 = bit_or r27 r29
-64	    r27 = bit_xor r10 r29
-65	    trace_line 0 r27 r26 L8
-66	    trace_var 0 r27 r26 $19 = r16
-67	    trace_line 0 r27 r26 L9
-68	    r30 = eq_i32 r25 r16
-69	    r30 = bit_and r27 r30
-70	    trace_line 0 r30 r26 L9
-71	    r28 = select r30 r16 r28
-72	    r30 = bit_or r29 r30
-73	    r29 = bit_xor r10 r30
-74	    trace_line 0 r29 r26 L8
-75	    trace_var 0 r29 r26 $19 = r17
-76	    trace_line 0 r29 r26 L9
-77	    r27 = eq_i32 r25 r17
-78	    r27 = bit_and r29 r27
-79	    trace_line 0 r27 r26 L9
-80	    r28 = select r27 r17 r28
-81	    r27 = bit_or r30 r27
-82	    r30 = bit_xor r10 r27
-83	    trace_line 0 r30 r26 L8
-84	    trace_var 0 r30 r26 $19 = r18
-85	    trace_line 0 r30 r26 L9
-86	    r29 = eq_i32 r25 r18
-87	    r29 = bit_and r30 r29
-88	    trace_line 0 r29 r26 L9
-89	    r28 = select r29 r18 r28
-90	    r29 = bit_or r27 r29
-91	    r27 = bit_xor r10 r29
-92	    trace_line 0 r27 r26 L8
-93	    trace_var 0 r27 r26 $19 = r14
-94	    trace_line 0 r27 r26 L9
-95	    r30 = eq_i32 r14 r25
-96	    r30 = bit_and r27 r30
-97	    trace_line 0 r30 r26 L9
-98	    r28 = select r30 r14 r28
-99	    r30 = bit_or r29 r30
-100	    r29 = bit_xor r10 r30
-101	    trace_line 0 r29 r26 L8
-102	    trace_var 0 r29 r26 $19 = r19
-103	    trace_line 0 r29 r26 L9
-104	    r27 = eq_i32 r25 r19
-105	    r27 = bit_and r29 r27
-106	    trace_line 0 r27 r26 L9
-107	    r28 = select r27 r19 r28
-108	    r27 = bit_or r30 r27
-109	    r30 = bit_xor r10 r27
-110	    trace_line 0 r30 r26 L8
-111	    trace_var 0 r30 r26 $19 = r20
-112	    trace_line 0 r30 r26 L9
-113	    r29 = eq_i32 r25 r20
-114	    r29 = bit_and r30 r29
-115	    trace_line 0 r29 r26 L9
-116	    r28 = select r29 r20 r28
-117	    r29 = bit_or r27 r29
-118	    r27 = bit_xor r10 r29
-119	    trace_line 0 r27 r26 L8
-120	    trace_var 0 r27 r26 $19 = r21
-121	    trace_line 0 r27 r26 L9
-122	    r30 = eq_i32 r25 r21
-123	    r30 = bit_and r27 r30
-124	    trace_line 0 r30 r26 L9
-125	    r28 = select r30 r21 r28
-126	    r30 = bit_or r29 r30
-127	    r29 = bit_xor r10 r30
-128	    trace_line 0 r29 r26 L8
-129	    trace_var 0 r29 r26 $19 = r22
-130	    trace_line 0 r29 r26 L9
-131	    r27 = eq_i32 r25 r22
-132	    r27 = bit_and r29 r27
-133	    trace_line 0 r27 r26 L9
-134	    r28 = select r27 r22 r28
-135	    r27 = bit_or r30 r27
-136	    r27 = bit_xor r10 r27
-137	    trace_line 0 r27 r26 L8
-138	    trace_line 0 r27 r26 L11
-139	    r27 = bit_clear r28 r27
-140	    trace_exit 0 r26 r26 F1
-141	    trace_var 0 r26 r26 $17 = r27
-142	    r27 = eq_i32 r14 r27
-143	    trace_enter 0 r27 r26 F2
-144	    trace_var 0 r27 r26 $21 = r25
-145	    trace_line 0 r27 r26 L17
-146	    trace_var 0 r27 r26 $22 = r9
-147	    trace_line 0 r27 r26 L18
-148	    trace_var 0 r27 r26 $23 = r9
-149	    trace_line 0 r27 r26 L19
-150	    r28 = gt_i32 r25 r9
-151	    r28 = bit_and r27 r28
-152	    trace_line 0 r28 r26 L19
-153	    r30 = bit_xor r10 r28
-154	    r29 = bit_and r27 r30
-155	    trace_line 0 r29 r26 L20
-156	    r30 = bit_or r28 r30
-157	    r28 = bit_and r27 r30
-158	    trace_line 0 r28 r26 L18
-159	    trace_var 0 r28 r26 $23 = r15
-160	    trace_line 0 r28 r26 L19
-161	    r28 = gt_i32 r25 r15
-162	    r28 = bit_and r27 r28
-163	    r28 = bit_and r30 r28
-164	    trace_line 0 r28 r26 L19
-165	    r29 = bit_xor r10 r28
-166	    r29 = bit_and r30 r29
-167	    r30 = bit_and r27 r29
-168	    trace_line 0 r30 r26 L20
-169	    r31 = bit_and r15 r30
-170	    trace_var 0 r30 r26 $22 = r31
-171	    r29 = bit_or r28 r29
-172	    r28 = bit_and r27 r29
-173	    trace_line 0 r28 r26 L18
-174	    trace_var 0 r28 r26 $23 = r16
-175	    trace_line 0 r28 r26 L19
-176	    r28 = gt_i32 r25 r16
-177	    r28 = bit_and r27 r28
-178	    r28 = bit_and r29 r28
-179	    trace_line 0 r28 r26 L19
-180	    r30 = bit_xor r10 r28
-181	    r30 = bit_and r29 r30
-182	    r29 = bit_and r27 r30
-183	    trace_line 0 r29 r26 L20
-184	    r32 = add_i32 r16 r31
-185	    r31 = select r29 r32 r31
-186	    trace_var 0 r29 r26 $22 = r31
-187	    r30 = bit_or r28 r30
-188	    r28 = bit_and r27 r30
-189	    trace_line 0 r28 r26 L18
-190	    trace_var 0 r28 r26 $23 = r17
-191	    trace_line 0 r28 r26 L19
-192	    r28 = gt_i32 r25 r17
-193	    r28 = bit_and r27 r28
-194	    r28 = bit_and r30 r28
-195	    trace_line 0 r28 r26 L19
-196	    r29 = bit_xor r10 r28
-197	    r29 = bit_and r30 r29
-198	    r30 = bit_and r27 r29
-199	    trace_line 0 r30 r26 L20
-200	    r32 = add_i32 r17 r31
-201	    r31 = select r30 r32 r31
-202	    trace_var 0 r30 r26 $22 = r31
-203	    r29 = bit_or r28 r29
-204	    r28 = bit_and r27 r29
-205	    trace_line 0 r28 r26 L18
-206	    trace_var 0 r28 r26 $23 = r18
-207	    trace_line 0 r28 r26 L19
-208	    r28 = gt_i32 r25 r18
-209	    r28 = bit_and r27 r28
-210	    r28 = bit_and r29 r28
-211	    trace_line 0 r28 r26 L19
-212	    r30 = bit_xor r10 r28
-213	    r30 = bit_and r29 r30
-214	    r29 = bit_and r27 r30
+41	    trace_scope 0 r26 r26 1
+42	    trace_line 0 r26 r26 L107
+43	    r25 = min_f32 r25 r8
+44	    r25 = max_f32 r6 r25
+45	    r25 = trunc r25
+46	    r25 = mul_i32 r25 r14
+47	    trace_var 0 r26 r26 $16 = r25
+48	    trace_line 0 r26 r26 L108
+49	    trace_enter 0 r26 r26 F1
+50	    trace_var 0 r26 r26 $18 = r25
+51	    trace_scope 0 r26 r26 1
+52	    trace_line 0 r26 r26 L8
+53	    trace_scope 0 r26 r26 1
+54	    trace_var 0 r26 r26 $19 = r9
+55	    trace_scope 0 r26 r26 1
+56	    trace_line 0 r26 r26 L9
+57	    r27 = eq_i32 r9 r25
+58	    trace_scope 0 r27 r26 1
+59	    trace_line 0 r27 r26 L9
+60	    trace_var 0 r27 r26 $17 = r9
+61	    trace_scope 0 r27 r26 -1
+62	    trace_scope 0 r26 r26 -1
+63	    r28 = bit_xor r10 r27
+64	    trace_line 0 r28 r26 L8
+65	    trace_var 0 r28 r26 $19 = r15
+66	    trace_scope 0 r28 r26 1
+67	    trace_line 0 r28 r26 L9
+68	    r29 = eq_i32 r25 r15
+69	    r29 = bit_and r28 r29
+70	    trace_scope 0 r29 r26 1
+71	    trace_line 0 r29 r26 L9
+72	    r30 = bit_and r15 r29
+73	    trace_var 0 r29 r26 $17 = r30
+74	    r27 = bit_or r27 r29
+75	    trace_scope 0 r29 r26 -1
+76	    trace_scope 0 r28 r26 -1
+77	    r28 = bit_xor r10 r27
+78	    trace_line 0 r28 r26 L8
+79	    trace_var 0 r28 r26 $19 = r16
+80	    trace_scope 0 r28 r26 1
+81	    trace_line 0 r28 r26 L9
+82	    r29 = eq_i32 r25 r16
+83	    r29 = bit_and r28 r29
+84	    trace_scope 0 r29 r26 1
+85	    trace_line 0 r29 r26 L9
+86	    r30 = select r29 r16 r30
+87	    trace_var 0 r29 r26 $17 = r30
+88	    r27 = bit_or r27 r29
+89	    trace_scope 0 r29 r26 -1
+90	    trace_scope 0 r28 r26 -1
+91	    r28 = bit_xor r10 r27
+92	    trace_line 0 r28 r26 L8
+93	    trace_var 0 r28 r26 $19 = r17
+94	    trace_scope 0 r28 r26 1
+95	    trace_line 0 r28 r26 L9
+96	    r29 = eq_i32 r25 r17
+97	    r29 = bit_and r28 r29
+98	    trace_scope 0 r29 r26 1
+99	    trace_line 0 r29 r26 L9
+100	    r30 = select r29 r17 r30
+101	    trace_var 0 r29 r26 $17 = r30
+102	    r27 = bit_or r27 r29
+103	    trace_scope 0 r29 r26 -1
+104	    trace_scope 0 r28 r26 -1
+105	    r28 = bit_xor r10 r27
+106	    trace_line 0 r28 r26 L8
+107	    trace_var 0 r28 r26 $19 = r18
+108	    trace_scope 0 r28 r26 1
+109	    trace_line 0 r28 r26 L9
+110	    r29 = eq_i32 r25 r18
+111	    r29 = bit_and r28 r29
+112	    trace_scope 0 r29 r26 1
+113	    trace_line 0 r29 r26 L9
+114	    r30 = select r29 r18 r30
+115	    trace_var 0 r29 r26 $17 = r30
+116	    r27 = bit_or r27 r29
+117	    trace_scope 0 r29 r26 -1
+118	    trace_scope 0 r28 r26 -1
+119	    r28 = bit_xor r10 r27
+120	    trace_line 0 r28 r26 L8
+121	    trace_var 0 r28 r26 $19 = r14
+122	    trace_scope 0 r28 r26 1
+123	    trace_line 0 r28 r26 L9
+124	    r29 = eq_i32 r14 r25
+125	    r29 = bit_and r28 r29
+126	    trace_scope 0 r29 r26 1
+127	    trace_line 0 r29 r26 L9
+128	    r30 = select r29 r14 r30
+129	    trace_var 0 r29 r26 $17 = r30
+130	    r27 = bit_or r27 r29
+131	    trace_scope 0 r29 r26 -1
+132	    trace_scope 0 r28 r26 -1
+133	    r28 = bit_xor r10 r27
+134	    trace_line 0 r28 r26 L8
+135	    trace_var 0 r28 r26 $19 = r19
+136	    trace_scope 0 r28 r26 1
+137	    trace_line 0 r28 r26 L9
+138	    r29 = eq_i32 r25 r19
+139	    r29 = bit_and r28 r29
+140	    trace_scope 0 r29 r26 1
+141	    trace_line 0 r29 r26 L9
+142	    r30 = select r29 r19 r30
+143	    trace_var 0 r29 r26 $17 = r30
+144	    r27 = bit_or r27 r29
+145	    trace_scope 0 r29 r26 -1
+146	    trace_scope 0 r28 r26 -1
+147	    r28 = bit_xor r10 r27
+148	    trace_line 0 r28 r26 L8
+149	    trace_var 0 r28 r26 $19 = r20
+150	    trace_scope 0 r28 r26 1
+151	    trace_line 0 r28 r26 L9
+152	    r29 = eq_i32 r25 r20
+153	    r29 = bit_and r28 r29
+154	    trace_scope 0 r29 r26 1
+155	    trace_line 0 r29 r26 L9
+156	    r30 = select r29 r20 r30
+157	    trace_var 0 r29 r26 $17 = r30
+158	    r27 = bit_or r27 r29
+159	    trace_scope 0 r29 r26 -1
+160	    trace_scope 0 r28 r26 -1
+161	    r28 = bit_xor r10 r27
+162	    trace_line 0 r28 r26 L8
+163	    trace_var 0 r28 r26 $19 = r21
+164	    trace_scope 0 r28 r26 1
+165	    trace_line 0 r28 r26 L9
+166	    r29 = eq_i32 r25 r21
+167	    r29 = bit_and r28 r29
+168	    trace_scope 0 r29 r26 1
+169	    trace_line 0 r29 r26 L9
+170	    r30 = select r29 r21 r30
+171	    trace_var 0 r29 r26 $17 = r30
+172	    r27 = bit_or r27 r29
+173	    trace_scope 0 r29 r26 -1
+174	    trace_scope 0 r28 r26 -1
+175	    r28 = bit_xor r10 r27
+176	    trace_line 0 r28 r26 L8
+177	    trace_var 0 r28 r26 $19 = r22
+178	    trace_scope 0 r28 r26 1
+179	    trace_line 0 r28 r26 L9
+180	    r29 = eq_i32 r25 r22
+181	    r29 = bit_and r28 r29
+182	    trace_scope 0 r29 r26 1
+183	    trace_line 0 r29 r26 L9
+184	    r30 = select r29 r22 r30
+185	    trace_var 0 r29 r26 $17 = r30
+186	    r27 = bit_or r27 r29
+187	    trace_scope 0 r29 r26 -1
+188	    trace_scope 0 r28 r26 -1
+189	    r27 = bit_xor r10 r27
+190	    trace_line 0 r27 r26 L8
+191	    trace_scope 0 r26 r26 -1
+192	    trace_line 0 r27 r26 L11
+193	    r30 = bit_clear r30 r27
+194	    trace_var 0 r27 r26 $17 = r30
+195	    trace_scope 0 r26 r26 -1
+196	    trace_exit 0 r26 r26 F1
+197	    r30 = eq_i32 r14 r30
+198	    trace_enter 0 r30 r26 F2
+199	    trace_var 0 r30 r26 $21 = r25
+200	    trace_scope 0 r30 r26 1
+201	    trace_line 0 r30 r26 L17
+202	    trace_var 0 r30 r26 $22 = r9
+203	    trace_line 0 r30 r26 L18
+204	    trace_scope 0 r30 r26 1
+205	    trace_var 0 r30 r26 $23 = r9
+206	    trace_scope 0 r30 r26 1
+207	    trace_line 0 r30 r26 L19
+208	    r27 = gt_i32 r25 r9
+209	    r27 = bit_and r30 r27
+210	    trace_scope 0 r27 r26 1
+211	    trace_line 0 r27 r26 L19
+212	    r28 = bit_xor r10 r27
+213	    trace_scope 0 r27 r26 -1
+214	    r29 = bit_and r30 r28
 215	    trace_line 0 r29 r26 L20
-216	    r32 = add_i32 r18 r31
-217	    r31 = select r29 r32 r31
-218	    trace_var 0 r29 r26 $22 = r31
-219	    r30 = bit_or r28 r30
-220	    r28 = bit_and r27 r30
-221	    trace_line 0 r28 r26 L18
-222	    trace_var 0 r28 r26 $23 = r14
-223	    trace_line 0 r28 r26 L19
-224	    r28 = gt_i32 r25 r14
-225	    r28 = bit_and r27 r28
-226	    r28 = bit_and r30 r28
-227	    trace_line 0 r28 r26 L19
-228	    r29 = bit_xor r10 r28
-229	    r29 = bit_and r30 r29
-230	    r30 = bit_and r27 r29
-231	    trace_line 0 r30 r26 L20
-232	    r32 = add_i32 r14 r31
-233	    r31 = select r30 r32 r31
-234	    trace_var 0 r30 r26 $22 = r31
-235	    r29 = bit_or r28 r29
-236	    r28 = bit_and r27 r29
-237	    trace_line 0 r28 r26 L18
-238	    trace_var 0 r28 r26 $23 = r19
-239	    trace_line 0 r28 r26 L19
-240	    r28 = gt_i32 r25 r19
-241	    r28 = bit_and r27 r28
-242	    r28 = bit_and r29 r28
-243	    trace_line 0 r28 r26 L19
-244	    r30 = bit_xor r10 r28
-245	    r30 = bit_and r29 r30
-246	    r29 = bit_and r27 r30
-247	    trace_line 0 r29 r26 L20
-248	    r32 = add_i32 r19 r31
-249	    r31 = select r29 r32 r31
-250	    trace_var 0 r29 r26 $22 = r31
-251	    r30 = bit_or r28 r30
-252	    r28 = bit_and r27 r30
-253	    trace_line 0 r28 r26 L18
-254	    trace_var 0 r28 r26 $23 = r20
-255	    trace_line 0 r28 r26 L19
-256	    r28 = gt_i32 r25 r20
-257	    r28 = bit_and r27 r28
-258	    r28 = bit_and r30 r28
-259	    trace_line 0 r28 r26 L19
-260	    r29 = bit_xor r10 r28
-261	    r29 = bit_and r30 r29
-262	    r30 = bit_and r27 r29
-263	    trace_line 0 r30 r26 L20
-264	    r32 = add_i32 r20 r31
-265	    r31 = select r30 r32 r31
-266	    trace_var 0 r30 r26 $22 = r31
-267	    r29 = bit_or r28 r29
-268	    r28 = bit_and r27 r29
-269	    trace_line 0 r28 r26 L18
-270	    trace_var 0 r28 r26 $23 = r21
-271	    trace_line 0 r28 r26 L19
-272	    r28 = gt_i32 r25 r21
-273	    r28 = bit_and r27 r28
-274	    r28 = bit_and r29 r28
-275	    trace_line 0 r28 r26 L19
-276	    r30 = bit_xor r10 r28
-277	    r30 = bit_and r29 r30
-278	    r29 = bit_and r27 r30
-279	    trace_line 0 r29 r26 L20
-280	    r32 = add_i32 r21 r31
-281	    r31 = select r29 r32 r31
-282	    trace_var 0 r29 r26 $22 = r31
-283	    r30 = bit_or r28 r30
-284	    r28 = bit_and r27 r30
-285	    trace_line 0 r28 r26 L18
-286	    trace_var 0 r28 r26 $23 = r22
-287	    trace_line 0 r28 r26 L19
-288	    r28 = gt_i32 r25 r22
-289	    r28 = bit_and r27 r28
-290	    r28 = bit_and r30 r28
-291	    trace_line 0 r28 r26 L19
-292	    r29 = bit_xor r10 r28
-293	    r29 = bit_and r30 r29
-294	    r30 = bit_and r27 r29
-295	    trace_line 0 r30 r26 L20
-296	    r32 = add_i32 r22 r31
-297	    r31 = select r30 r32 r31
-298	    trace_var 0 r30 r26 $22 = r31
-299	    r29 = bit_or r28 r29
-300	    r29 = bit_and r27 r29
-301	    trace_line 0 r29 r26 L18
-302	    trace_line 0 r27 r26 L22
-303	    r31 = bit_and r27 r31
-304	    trace_exit 0 r27 r26 F2
-305	    trace_var 0 r27 r26 $20 = r31
-306	    r31 = eq_i32 r31 r23
-307	    r31 = bit_and r27 r31
-308	    trace_enter 0 r31 r26 F3
-309	    trace_var 0 r31 r26 $25 = r25
-310	    trace_line 0 r31 r26 L27
-311	    trace_var 0 r31 r26 $26 = r9
-312	    trace_line 0 r31 r26 L28
-313	    trace_var 0 r31 r26 $27 = r15
-314	    trace_line 0 r31 r26 L29
-315	    trace_var 0 r31 r26 $28 = r9
-316	    trace_line 0 r31 r26 L30
-317	    r27 = gt_i32 r9 r25
-318	    r27 = bit_and r31 r27
-319	    trace_line 0 r27 r26 L30
-320	    r27 = bit_xor r10 r27
-321	    r29 = bit_and r31 r27
-322	    trace_line 0 r29 r26 L31
-323	    trace_line 0 r29 r26 L29
-324	    trace_var 0 r29 r26 $28 = r15
-325	    trace_line 0 r29 r26 L30
-326	    r29 = gt_i32 r15 r25
-327	    r29 = bit_and r31 r29
-328	    r29 = bit_and r27 r29
-329	    trace_line 0 r29 r26 L30
-330	    r29 = bit_xor r10 r29
-331	    r29 = bit_and r27 r29
-332	    r27 = bit_and r31 r29
-333	    trace_line 0 r27 r26 L31
-334	    r28 = bit_and r15 r27
-335	    trace_var 0 r27 r26 $26 = r28
-336	    trace_line 0 r27 r26 L29
-337	    trace_var 0 r27 r26 $28 = r16
-338	    trace_line 0 r27 r26 L30
-339	    r27 = gt_i32 r16 r25
-340	    r27 = bit_and r31 r27
-341	    r27 = bit_and r29 r27
-342	    trace_line 0 r27 r26 L30
-343	    r27 = bit_xor r10 r27
-344	    r27 = bit_and r29 r27
-345	    r29 = bit_and r31 r27
-346	    trace_line 0 r29 r26 L31
-347	    r30 = add_i32 r16 r28
-348	    r28 = select r29 r30 r28
-349	    trace_var 0 r29 r26 $26 = r28
-350	    trace_line 0 r29 r26 L29
-351	    trace_var 0 r29 r26 $28 = r17
-352	    trace_line 0 r29 r26 L30
-353	    r29 = gt_i32 r17 r25
-354	    r29 = bit_and r31 r29
-355	    r29 = bit_and r27 r29
-356	    trace_line 0 r29 r26 L30
-357	    r29 = bit_xor r10 r29
-358	    r29 = bit_and r27 r29
-359	    r27 = bit_and r31 r29
-360	    trace_line 0 r27 r26 L31
-361	    r30 = add_i32 r17 r28
-362	    r28 = select r27 r30 r28
-363	    trace_var 0 r27 r26 $26 = r28
-364	    trace_line 0 r27 r26 L29
-365	    trace_var 0 r27 r26 $28 = r18
-366	    trace_line 0 r27 r26 L30
-367	    r27 = gt_i32 r18 r25
-368	    r27 = bit_and r31 r27
-369	    r27 = bit_and r29 r27
-370	    trace_line 0 r27 r26 L30
-371	    r27 = bit_xor r10 r27
-372	    r27 = bit_and r29 r27
-373	    r29 = bit_and r31 r27
-374	    trace_line 0 r29 r26 L31
-375	    r30 = add_i32 r18 r28
-376	    r28 = select r29 r30 r28
-377	    trace_var 0 r29 r26 $26 = r28
-378	    trace_line 0 r29 r26 L29
-379	    trace_var 0 r29 r26 $28 = r14
-380	    trace_line 0 r29 r26 L30
-381	    r29 = gt_i32 r14 r25
-382	    r29 = bit_and r31 r29
-383	    r29 = bit_and r27 r29
-384	    trace_line 0 r29 r26 L30
-385	    r29 = bit_xor r10 r29
-386	    r29 = bit_and r27 r29
-387	    r27 = bit_and r31 r29
-388	    trace_line 0 r27 r26 L31
-389	    r30 = add_i32 r14 r28
-390	    r28 = select r27 r30 r28
-391	    trace_var 0 r27 r26 $26 = r28
-392	    trace_line 0 r27 r26 L29
-393	    trace_var 0 r27 r26 $28 = r19
-394	    trace_line 0 r27 r26 L30
-395	    r27 = gt_i32 r19 r25
-396	    r27 = bit_and r31 r27
-397	    r27 = bit_and r29 r27
-398	    trace_line 0 r27 r26 L30
-399	    r27 = bit_xor r10 r27
-400	    r27 = bit_and r29 r27
-401	    r29 = bit_and r31 r27
-402	    trace_line 0 r29 r26 L31
-403	    r30 = add_i32 r19 r28
-404	    r28 = select r29 r30 r28
-405	    trace_var 0 r29 r26 $26 = r28
-406	    trace_line 0 r29 r26 L29
-407	    trace_var 0 r29 r26 $28 = r20
-408	    trace_line 0 r29 r26 L30
-409	    r29 = gt_i32 r20 r25
-410	    r29 = bit_and r31 r29
-411	    r29 = bit_and r27 r29
-412	    trace_line 0 r29 r26 L30
-413	    r29 = bit_xor r10 r29
-414	    r29 = bit_and r27 r29
-415	    r27 = bit_and r31 r29
-416	    trace_line 0 r27 r26 L31
-417	    r30 = add_i32 r20 r28
-418	    r28 = select r27 r30 r28
-419	    trace_var 0 r27 r26 $26 = r28
-420	    trace_line 0 r27 r26 L29
-421	    trace_var 0 r27 r26 $28 = r21
-422	    trace_line 0 r27 r26 L30
-423	    r27 = gt_i32 r21 r25
-424	    r27 = bit_and r31 r27
-425	    r27 = bit_and r29 r27
-426	    trace_line 0 r27 r26 L30
-427	    r27 = bit_xor r10 r27
-428	    r27 = bit_and r29 r27
-429	    r29 = bit_and r31 r27
-430	    trace_line 0 r29 r26 L31
-431	    r30 = add_i32 r21 r28
-432	    r28 = select r29 r30 r28
-433	    trace_var 0 r29 r26 $26 = r28
-434	    trace_line 0 r29 r26 L29
-435	    trace_var 0 r29 r26 $28 = r22
+216	    trace_scope 0 r30 r26 -1
+217	    r28 = bit_or r27 r28
+218	    r27 = bit_and r30 r28
+219	    trace_line 0 r27 r26 L18
+220	    trace_var 0 r27 r26 $23 = r15
+221	    trace_scope 0 r27 r26 1
+222	    trace_line 0 r27 r26 L19
+223	    r29 = gt_i32 r25 r15
+224	    r29 = bit_and r30 r29
+225	    r29 = bit_and r28 r29
+226	    trace_scope 0 r29 r26 1
+227	    trace_line 0 r29 r26 L19
+228	    r31 = bit_xor r10 r29
+229	    r31 = bit_and r28 r31
+230	    trace_scope 0 r29 r26 -1
+231	    r28 = bit_and r30 r31
+232	    trace_line 0 r28 r26 L20
+233	    r32 = bit_and r15 r28
+234	    trace_var 0 r28 r26 $22 = r32
+235	    trace_scope 0 r27 r26 -1
+236	    r31 = bit_or r29 r31
+237	    r29 = bit_and r30 r31
+238	    trace_line 0 r29 r26 L18
+239	    trace_var 0 r29 r26 $23 = r16
+240	    trace_scope 0 r29 r26 1
+241	    trace_line 0 r29 r26 L19
+242	    r27 = gt_i32 r25 r16
+243	    r27 = bit_and r30 r27
+244	    r27 = bit_and r31 r27
+245	    trace_scope 0 r27 r26 1
+246	    trace_line 0 r27 r26 L19
+247	    r28 = bit_xor r10 r27
+248	    r28 = bit_and r31 r28
+249	    trace_scope 0 r27 r26 -1
+250	    r31 = bit_and r30 r28
+251	    trace_line 0 r31 r26 L20
+252	    r33 = add_i32 r16 r32
+253	    r32 = select r31 r33 r32
+254	    trace_var 0 r31 r26 $22 = r32
+255	    trace_scope 0 r29 r26 -1
+256	    r28 = bit_or r27 r28
+257	    r27 = bit_and r30 r28
+258	    trace_line 0 r27 r26 L18
+259	    trace_var 0 r27 r26 $23 = r17
+260	    trace_scope 0 r27 r26 1
+261	    trace_line 0 r27 r26 L19
+262	    r29 = gt_i32 r25 r17
+263	    r29 = bit_and r30 r29
+264	    r29 = bit_and r28 r29
+265	    trace_scope 0 r29 r26 1
+266	    trace_line 0 r29 r26 L19
+267	    r31 = bit_xor r10 r29
+268	    r31 = bit_and r28 r31
+269	    trace_scope 0 r29 r26 -1
+270	    r28 = bit_and r30 r31
+271	    trace_line 0 r28 r26 L20
+272	    r33 = add_i32 r17 r32
+273	    r32 = select r28 r33 r32
+274	    trace_var 0 r28 r26 $22 = r32
+275	    trace_scope 0 r27 r26 -1
+276	    r31 = bit_or r29 r31
+277	    r29 = bit_and r30 r31
+278	    trace_line 0 r29 r26 L18
+279	    trace_var 0 r29 r26 $23 = r18
+280	    trace_scope 0 r29 r26 1
+281	    trace_line 0 r29 r26 L19
+282	    r27 = gt_i32 r25 r18
+283	    r27 = bit_and r30 r27
+284	    r27 = bit_and r31 r27
+285	    trace_scope 0 r27 r26 1
+286	    trace_line 0 r27 r26 L19
+287	    r28 = bit_xor r10 r27
+288	    r28 = bit_and r31 r28
+289	    trace_scope 0 r27 r26 -1
+290	    r31 = bit_and r30 r28
+291	    trace_line 0 r31 r26 L20
+292	    r33 = add_i32 r18 r32
+293	    r32 = select r31 r33 r32
+294	    trace_var 0 r31 r26 $22 = r32
+295	    trace_scope 0 r29 r26 -1
+296	    r28 = bit_or r27 r28
+297	    r27 = bit_and r30 r28
+298	    trace_line 0 r27 r26 L18
+299	    trace_var 0 r27 r26 $23 = r14
+300	    trace_scope 0 r27 r26 1
+301	    trace_line 0 r27 r26 L19
+302	    r29 = gt_i32 r25 r14
+303	    r29 = bit_and r30 r29
+304	    r29 = bit_and r28 r29
+305	    trace_scope 0 r29 r26 1
+306	    trace_line 0 r29 r26 L19
+307	    r31 = bit_xor r10 r29
+308	    r31 = bit_and r28 r31
+309	    trace_scope 0 r29 r26 -1
+310	    r28 = bit_and r30 r31
+311	    trace_line 0 r28 r26 L20
+312	    r33 = add_i32 r14 r32
+313	    r32 = select r28 r33 r32
+314	    trace_var 0 r28 r26 $22 = r32
+315	    trace_scope 0 r27 r26 -1
+316	    r31 = bit_or r29 r31
+317	    r29 = bit_and r30 r31
+318	    trace_line 0 r29 r26 L18
+319	    trace_var 0 r29 r26 $23 = r19
+320	    trace_scope 0 r29 r26 1
+321	    trace_line 0 r29 r26 L19
+322	    r27 = gt_i32 r25 r19
+323	    r27 = bit_and r30 r27
+324	    r27 = bit_and r31 r27
+325	    trace_scope 0 r27 r26 1
+326	    trace_line 0 r27 r26 L19
+327	    r28 = bit_xor r10 r27
+328	    r28 = bit_and r31 r28
+329	    trace_scope 0 r27 r26 -1
+330	    r31 = bit_and r30 r28
+331	    trace_line 0 r31 r26 L20
+332	    r33 = add_i32 r19 r32
+333	    r32 = select r31 r33 r32
+334	    trace_var 0 r31 r26 $22 = r32
+335	    trace_scope 0 r29 r26 -1
+336	    r28 = bit_or r27 r28
+337	    r27 = bit_and r30 r28
+338	    trace_line 0 r27 r26 L18
+339	    trace_var 0 r27 r26 $23 = r20
+340	    trace_scope 0 r27 r26 1
+341	    trace_line 0 r27 r26 L19
+342	    r29 = gt_i32 r25 r20
+343	    r29 = bit_and r30 r29
+344	    r29 = bit_and r28 r29
+345	    trace_scope 0 r29 r26 1
+346	    trace_line 0 r29 r26 L19
+347	    r31 = bit_xor r10 r29
+348	    r31 = bit_and r28 r31
+349	    trace_scope 0 r29 r26 -1
+350	    r28 = bit_and r30 r31
+351	    trace_line 0 r28 r26 L20
+352	    r33 = add_i32 r20 r32
+353	    r32 = select r28 r33 r32
+354	    trace_var 0 r28 r26 $22 = r32
+355	    trace_scope 0 r27 r26 -1
+356	    r31 = bit_or r29 r31
+357	    r29 = bit_and r30 r31
+358	    trace_line 0 r29 r26 L18
+359	    trace_var 0 r29 r26 $23 = r21
+360	    trace_scope 0 r29 r26 1
+361	    trace_line 0 r29 r26 L19
+362	    r27 = gt_i32 r25 r21
+363	    r27 = bit_and r30 r27
+364	    r27 = bit_and r31 r27
+365	    trace_scope 0 r27 r26 1
+366	    trace_line 0 r27 r26 L19
+367	    r28 = bit_xor r10 r27
+368	    r28 = bit_and r31 r28
+369	    trace_scope 0 r27 r26 -1
+370	    r31 = bit_and r30 r28
+371	    trace_line 0 r31 r26 L20
+372	    r33 = add_i32 r21 r32
+373	    r32 = select r31 r33 r32
+374	    trace_var 0 r31 r26 $22 = r32
+375	    trace_scope 0 r29 r26 -1
+376	    r28 = bit_or r27 r28
+377	    r27 = bit_and r30 r28
+378	    trace_line 0 r27 r26 L18
+379	    trace_var 0 r27 r26 $23 = r22
+380	    trace_scope 0 r27 r26 1
+381	    trace_line 0 r27 r26 L19
+382	    r29 = gt_i32 r25 r22
+383	    r29 = bit_and r30 r29
+384	    r29 = bit_and r28 r29
+385	    trace_scope 0 r29 r26 1
+386	    trace_line 0 r29 r26 L19
+387	    r31 = bit_xor r10 r29
+388	    r31 = bit_and r28 r31
+389	    trace_scope 0 r29 r26 -1
+390	    r28 = bit_and r30 r31
+391	    trace_line 0 r28 r26 L20
+392	    r33 = add_i32 r22 r32
+393	    r32 = select r28 r33 r32
+394	    trace_var 0 r28 r26 $22 = r32
+395	    trace_scope 0 r27 r26 -1
+396	    r31 = bit_or r29 r31
+397	    r31 = bit_and r30 r31
+398	    trace_line 0 r31 r26 L18
+399	    trace_scope 0 r30 r26 -1
+400	    trace_line 0 r30 r26 L22
+401	    r32 = bit_and r30 r32
+402	    trace_var 0 r30 r26 $20 = r32
+403	    trace_scope 0 r30 r26 -1
+404	    trace_exit 0 r30 r26 F2
+405	    r32 = eq_i32 r32 r23
+406	    r32 = bit_and r30 r32
+407	    trace_enter 0 r32 r26 F3
+408	    trace_var 0 r32 r26 $25 = r25
+409	    trace_scope 0 r32 r26 1
+410	    trace_line 0 r32 r26 L27
+411	    trace_var 0 r32 r26 $26 = r9
+412	    trace_line 0 r32 r26 L28
+413	    trace_var 0 r32 r26 $27 = r15
+414	    trace_line 0 r32 r26 L29
+415	    trace_scope 0 r32 r26 1
+416	    trace_var 0 r32 r26 $28 = r9
+417	    trace_scope 0 r32 r26 1
+418	    trace_line 0 r32 r26 L30
+419	    r30 = gt_i32 r9 r25
+420	    r30 = bit_and r32 r30
+421	    trace_scope 0 r30 r26 1
+422	    trace_line 0 r30 r26 L30
+423	    r31 = bit_xor r10 r30
+424	    trace_scope 0 r30 r26 -1
+425	    r30 = bit_and r32 r31
+426	    trace_line 0 r30 r26 L31
+427	    trace_scope 0 r32 r26 -1
+428	    trace_line 0 r30 r26 L29
+429	    trace_var 0 r30 r26 $28 = r15
+430	    trace_scope 0 r30 r26 1
+431	    trace_line 0 r30 r26 L30
+432	    r29 = gt_i32 r15 r25
+433	    r29 = bit_and r32 r29
+434	    r29 = bit_and r31 r29
+435	    trace_scope 0 r29 r26 1
 436	    trace_line 0 r29 r26 L30
-437	    r25 = gt_i32 r22 r25
-438	    r25 = bit_and r31 r25
-439	    r25 = bit_and r27 r25
-440	    trace_line 0 r25 r26 L30
-441	    r25 = bit_xor r10 r25
-442	    r25 = bit_and r27 r25
-443	    r25 = bit_and r31 r25
-444	    trace_line 0 r25 r26 L31
-445	    r27 = add_i32 r22 r28
-446	    r28 = select r25 r27 r28
-447	    trace_var 0 r25 r26 $26 = r28
-448	    trace_line 0 r25 r26 L29
-449	    trace_line 0 r31 r26 L33
-450	    r28 = bit_and r31 r28
-451	    trace_exit 0 r31 r26 F3
-452	    trace_var 0 r31 r26 $24 = r28
-453	    r28 = eq_i32 r28 r24
-454	    r28 = bit_and r31 r28
-455	    trace_enter 0 r28 r26 F4
-456	    trace_line 0 r28 r26 L38
-457	    trace_line 0 r28 r26 L39
-458	    trace_line 0 r28 r26 L41
-459	    trace_var 0 r28 r26 $30 = r22
-460	    trace_var 0 r28 r26 $31 = r22
-461	    trace_var 0 r28 r26 $32 = r22
-462	    trace_var 0 r28 r26 $33 = r22
-463	    trace_line 0 r28 r26 L42
-464	    trace_var 0 r28 r26 $34 = r15
-465	    trace_line 0 r28 r26 L43
-466	    r31 = select r28 r15 r22
-467	    trace_var 0 r28 r26 $33 = r31
-468	    trace_line 0 r28 r26 L42
-469	    trace_var 0 r28 r26 $34 = r16
-470	    trace_line 0 r28 r26 L43
-471	    r25 = select r28 r31 r22
-472	    trace_var 0 r28 r26 $32 = r25
-473	    r31 = select r28 r16 r31
-474	    trace_var 0 r28 r26 $33 = r31
-475	    trace_line 0 r28 r26 L42
-476	    trace_var 0 r28 r26 $34 = r17
-477	    trace_line 0 r28 r26 L43
-478	    r27 = select r28 r25 r22
-479	    trace_var 0 r28 r26 $31 = r27
-480	    r25 = select r28 r31 r25
-481	    trace_var 0 r28 r26 $32 = r25
-482	    r31 = select r28 r17 r31
-483	    trace_var 0 r28 r26 $33 = r31
-484	    trace_line 0 r28 r26 L42
-485	    trace_line 0 r28 r26 L45
-486	    r27 = eq_i32 r15 r27
-487	    r25 = eq_i32 r16 r25
-488	    r31 = eq_i32 r17 r31
-489	    r25 = bit_and r27 r25
-490	    r25 = bit_and r31 r25
-491	    r25 = bit_and r28 r25
-492	    trace_exit 0 r28 r26 F4
-493	    trace_var 0 r28 r26 $29 = r25
-494	    r25 = bit_and r28 r25
-495	    trace_enter 0 r25 r26 F5
-496	    trace_line 0 r25 r26 L50
-497	    trace_line 0 r25 r26 L51
-498	    trace_line 0 r25 r26 L53
-499	    trace_var 0 r25 r26 $36 = r22
-500	    trace_var 0 r25 r26 $37 = r22
-501	    trace_var 0 r25 r26 $38 = r22
-502	    trace_var 0 r25 r26 $39 = r22
-503	    trace_line 0 r25 r26 L54
-504	    trace_var 0 r25 r26 $40 = r15
-505	    trace_line 0 r25 r26 L55
-506	    r28 = select r25 r15 r22
-507	    trace_var 0 r25 r26 $39 = r28
-508	    trace_line 0 r25 r26 L54
-509	    trace_var 0 r25 r26 $40 = r16
-510	    trace_line 0 r25 r26 L55
-511	    r31 = select r25 r28 r22
-512	    trace_var 0 r25 r26 $38 = r31
-513	    r28 = select r25 r16 r28
-514	    trace_var 0 r25 r26 $39 = r28
-515	    trace_line 0 r25 r26 L54
-516	    trace_var 0 r25 r26 $40 = r17
-517	    trace_line 0 r25 r26 L55
-518	    r27 = select r25 r31 r22
-519	    trace_var 0 r25 r26 $37 = r27
-520	    r31 = select r25 r28 r31
-521	    trace_var 0 r25 r26 $38 = r31
-522	    r28 = select r25 r17 r28
-523	    trace_var 0 r25 r26 $39 = r28
-524	    trace_line 0 r25 r26 L54
-525	    trace_line 0 r25 r26 L57
-526	    r27 = eq_i32 r15 r27
-527	    r31 = eq_i32 r16 r31
-528	    r28 = eq_i32 r17 r28
-529	    r31 = bit_and r27 r31
-530	    r31 = bit_and r28 r31
-531	    r31 = bit_and r25 r31
-532	    trace_exit 0 r25 r26 F5
-533	    trace_var 0 r25 r26 $35 = r31
-534	    r31 = bit_and r25 r31
-535	    trace_enter 0 r31 r26 F6
-536	    trace_line 0 r31 r26 L62
-537	    trace_line 0 r31 r26 L63
-538	    trace_line 0 r31 r26 L65
-539	    trace_var 0 r31 r26 $42 = r22
-540	    trace_var 0 r31 r26 $43 = r22
-541	    trace_var 0 r31 r26 $44 = r22
-542	    trace_var 0 r31 r26 $45 = r22
-543	    trace_line 0 r31 r26 L66
-544	    trace_var 0 r31 r26 $46 = r17
-545	    trace_line 0 r31 r26 L67
-546	    r25 = select r31 r17 r22
-547	    trace_var 0 r31 r26 $45 = r25
-548	    trace_line 0 r31 r26 L66
-549	    trace_var 0 r31 r26 $46 = r16
-550	    trace_line 0 r31 r26 L67
-551	    r28 = select r31 r25 r22
-552	    trace_var 0 r31 r26 $44 = r28
-553	    r25 = select r31 r16 r25
-554	    trace_var 0 r31 r26 $45 = r25
-555	    trace_line 0 r31 r26 L66
-556	    trace_var 0 r31 r26 $46 = r15
-557	    trace_line 0 r31 r26 L67
-558	    r27 = select r31 r28 r22
-559	    trace_var 0 r31 r26 $43 = r27
-560	    r28 = select r31 r25 r28
-561	    trace_var 0 r31 r26 $44 = r28
-562	    r25 = select r31 r15 r25
-563	    trace_var 0 r31 r26 $45 = r25
-564	    trace_line 0 r31 r26 L66
-565	    trace_line 0 r31 r26 L69
-566	    r27 = eq_i32 r17 r27
-567	    r28 = eq_i32 r16 r28
-568	    r25 = eq_i32 r15 r25
-569	    r28 = bit_and r27 r28
-570	    r28 = bit_and r25 r28
-571	    r28 = bit_and r31 r28
-572	    trace_exit 0 r31 r26 F6
-573	    trace_var 0 r31 r26 $41 = r28
-574	    r28 = bit_and r31 r28
-575	    trace_enter 0 r28 r26 F7
-576	    trace_line 0 r28 r26 L74
-577	    trace_line 0 r28 r26 L75
-578	    trace_line 0 r28 r26 L77
-579	    trace_var 0 r28 r26 $48 = r22
-580	    trace_var 0 r28 r26 $49 = r22
-581	    trace_var 0 r28 r26 $50 = r22
-582	    trace_var 0 r28 r26 $51 = r22
-583	    trace_line 0 r28 r26 L78
-584	    trace_var 0 r28 r26 $52 = r17
-585	    trace_line 0 r28 r26 L79
-586	    r31 = select r28 r17 r22
-587	    trace_var 0 r28 r26 $51 = r31
-588	    trace_line 0 r28 r26 L78
-589	    trace_var 0 r28 r26 $52 = r16
-590	    trace_line 0 r28 r26 L79
-591	    r25 = select r28 r31 r22
-592	    trace_var 0 r28 r26 $50 = r25
-593	    r31 = select r28 r16 r31
-594	    trace_var 0 r28 r26 $51 = r31
-595	    trace_line 0 r28 r26 L78
-596	    trace_var 0 r28 r26 $52 = r15
-597	    trace_line 0 r28 r26 L79
-598	    r27 = select r28 r25 r22
-599	    trace_var 0 r28 r26 $49 = r27
-600	    r25 = select r28 r31 r25
-601	    trace_var 0 r28 r26 $50 = r25
-602	    r31 = select r28 r15 r31
-603	    trace_var 0 r28 r26 $51 = r31
-604	    trace_line 0 r28 r26 L78
-605	    trace_line 0 r28 r26 L81
-606	    r27 = eq_i32 r17 r27
-607	    r25 = eq_i32 r16 r25
-608	    r31 = eq_i32 r15 r31
-609	    r25 = bit_and r27 r25
-610	    r25 = bit_and r31 r25
-611	    r25 = bit_and r28 r25
-612	    trace_exit 0 r28 r26 F7
-613	    trace_var 0 r28 r26 $47 = r25
-614	    r25 = bit_and r28 r25
-615	    trace_enter 0 r25 r26 F8
-616	    trace_line 0 r25 r26 L97
-617	    trace_line 0 r25 r26 L99
-618	    trace_var 0 r25 r26 $54 = r22
-619	    trace_var 0 r25 r26 $55 = r22
-620	    trace_var 0 r25 r26 $56 = r22
-621	    trace_var 0 r25 r26 $57 = r22
-622	    trace_line 0 r25 r26 L100
-623	    trace_var 0 r25 r26 $58 = r15
-624	    trace_line 0 r25 r26 L101
-625	    r28 = select r25 r15 r22
-626	    trace_var 0 r25 r26 $57 = r28
-627	    trace_line 0 r25 r26 L100
-628	    trace_line 0 r25 r26 L103
-629	    r28 = eq_i32 r15 r28
-630	    r28 = bit_and r25 r28
-631	    trace_exit 0 r25 r26 F8
-632	    trace_var 0 r25 r26 $53 = r28
-633	    r28 = bit_and r25 r28
-634	    trace_enter 0 r28 r26 F9
-635	    trace_line 0 r28 r26 L86
-636	    trace_line 0 r28 r26 L88
-637	    trace_var 0 r28 r26 $60 = r22
-638	    trace_var 0 r28 r26 $61 = r22
-639	    trace_var 0 r28 r26 $62 = r22
-640	    trace_var 0 r28 r26 $63 = r22
-641	    trace_line 0 r28 r26 L89
-642	    trace_var 0 r28 r26 $64 = r15
-643	    trace_line 0 r28 r26 L90
-644	    r25 = select r28 r15 r22
-645	    trace_var 0 r28 r26 $63 = r25
-646	    trace_line 0 r28 r26 L89
-647	    trace_var 0 r28 r26 $64 = r16
-648	    trace_line 0 r28 r26 L90
-649	    r31 = select r28 r25 r22
-650	    trace_var 0 r28 r26 $62 = r31
-651	    r25 = select r28 r16 r25
-652	    trace_var 0 r28 r26 $63 = r25
-653	    trace_line 0 r28 r26 L89
-654	    trace_var 0 r28 r26 $64 = r17
-655	    trace_line 0 r28 r26 L90
-656	    r27 = select r28 r31 r22
-657	    trace_var 0 r28 r26 $61 = r27
-658	    r31 = select r28 r25 r31
-659	    trace_var 0 r28 r26 $62 = r31
-660	    r25 = select r28 r17 r25
-661	    trace_var 0 r28 r26 $63 = r25
-662	    trace_line 0 r28 r26 L89
-663	    trace_line 0 r28 r26 L92
-664	    r27 = eq_i32 r15 r27
-665	    r31 = eq_i32 r16 r31
-666	    r25 = eq_i32 r17 r25
-667	    r31 = bit_and r27 r31
-668	    r31 = bit_and r25 r31
-669	    r31 = bit_and r28 r31
-670	    trace_exit 0 r28 r26 F9
-671	    trace_var 0 r28 r26 $59 = r31
-672	    r31 = bit_and r28 r31
-673	    r28 = select r31 r5 r1
-674	    r25 = select r31 r6 r2
-675	    r27 = select r31 r7 r3
-676	    r31 = select r31 r8 r4
-677	    trace_exit 0 r26 r26 F0
-678	    trace_var 0 r26 r26 $10 = r28
-679	    trace_var 0 r26 r26 $11 = r25
-680	    trace_var 0 r26 r26 $12 = r27
-681	    trace_var 0 r26 r26 $13 = r31
-682	    store32 ptr1 r28
-683	    store32 ptr2 r25
-684	    store32 ptr3 r27
-685	    store32 ptr4 r31
+437	    r27 = bit_xor r10 r29
+438	    r27 = bit_and r31 r27
+439	    trace_scope 0 r29 r26 -1
+440	    r29 = bit_and r32 r27
+441	    trace_line 0 r29 r26 L31
+442	    r31 = bit_and r15 r29
+443	    trace_var 0 r29 r26 $26 = r31
+444	    trace_scope 0 r30 r26 -1
+445	    trace_line 0 r29 r26 L29
+446	    trace_var 0 r29 r26 $28 = r16
+447	    trace_scope 0 r29 r26 1
+448	    trace_line 0 r29 r26 L30
+449	    r30 = gt_i32 r16 r25
+450	    r30 = bit_and r32 r30
+451	    r30 = bit_and r27 r30
+452	    trace_scope 0 r30 r26 1
+453	    trace_line 0 r30 r26 L30
+454	    r28 = bit_xor r10 r30
+455	    r28 = bit_and r27 r28
+456	    trace_scope 0 r30 r26 -1
+457	    r30 = bit_and r32 r28
+458	    trace_line 0 r30 r26 L31
+459	    r27 = add_i32 r16 r31
+460	    r31 = select r30 r27 r31
+461	    trace_var 0 r30 r26 $26 = r31
+462	    trace_scope 0 r29 r26 -1
+463	    trace_line 0 r30 r26 L29
+464	    trace_var 0 r30 r26 $28 = r17
+465	    trace_scope 0 r30 r26 1
+466	    trace_line 0 r30 r26 L30
+467	    r29 = gt_i32 r17 r25
+468	    r29 = bit_and r32 r29
+469	    r29 = bit_and r28 r29
+470	    trace_scope 0 r29 r26 1
+471	    trace_line 0 r29 r26 L30
+472	    r27 = bit_xor r10 r29
+473	    r27 = bit_and r28 r27
+474	    trace_scope 0 r29 r26 -1
+475	    r29 = bit_and r32 r27
+476	    trace_line 0 r29 r26 L31
+477	    r28 = add_i32 r17 r31
+478	    r31 = select r29 r28 r31
+479	    trace_var 0 r29 r26 $26 = r31
+480	    trace_scope 0 r30 r26 -1
+481	    trace_line 0 r29 r26 L29
+482	    trace_var 0 r29 r26 $28 = r18
+483	    trace_scope 0 r29 r26 1
+484	    trace_line 0 r29 r26 L30
+485	    r30 = gt_i32 r18 r25
+486	    r30 = bit_and r32 r30
+487	    r30 = bit_and r27 r30
+488	    trace_scope 0 r30 r26 1
+489	    trace_line 0 r30 r26 L30
+490	    r28 = bit_xor r10 r30
+491	    r28 = bit_and r27 r28
+492	    trace_scope 0 r30 r26 -1
+493	    r30 = bit_and r32 r28
+494	    trace_line 0 r30 r26 L31
+495	    r27 = add_i32 r18 r31
+496	    r31 = select r30 r27 r31
+497	    trace_var 0 r30 r26 $26 = r31
+498	    trace_scope 0 r29 r26 -1
+499	    trace_line 0 r30 r26 L29
+500	    trace_var 0 r30 r26 $28 = r14
+501	    trace_scope 0 r30 r26 1
+502	    trace_line 0 r30 r26 L30
+503	    r29 = gt_i32 r14 r25
+504	    r29 = bit_and r32 r29
+505	    r29 = bit_and r28 r29
+506	    trace_scope 0 r29 r26 1
+507	    trace_line 0 r29 r26 L30
+508	    r27 = bit_xor r10 r29
+509	    r27 = bit_and r28 r27
+510	    trace_scope 0 r29 r26 -1
+511	    r29 = bit_and r32 r27
+512	    trace_line 0 r29 r26 L31
+513	    r28 = add_i32 r14 r31
+514	    r31 = select r29 r28 r31
+515	    trace_var 0 r29 r26 $26 = r31
+516	    trace_scope 0 r30 r26 -1
+517	    trace_line 0 r29 r26 L29
+518	    trace_var 0 r29 r26 $28 = r19
+519	    trace_scope 0 r29 r26 1
+520	    trace_line 0 r29 r26 L30
+521	    r30 = gt_i32 r19 r25
+522	    r30 = bit_and r32 r30
+523	    r30 = bit_and r27 r30
+524	    trace_scope 0 r30 r26 1
+525	    trace_line 0 r30 r26 L30
+526	    r28 = bit_xor r10 r30
+527	    r28 = bit_and r27 r28
+528	    trace_scope 0 r30 r26 -1
+529	    r30 = bit_and r32 r28
+530	    trace_line 0 r30 r26 L31
+531	    r27 = add_i32 r19 r31
+532	    r31 = select r30 r27 r31
+533	    trace_var 0 r30 r26 $26 = r31
+534	    trace_scope 0 r29 r26 -1
+535	    trace_line 0 r30 r26 L29
+536	    trace_var 0 r30 r26 $28 = r20
+537	    trace_scope 0 r30 r26 1
+538	    trace_line 0 r30 r26 L30
+539	    r29 = gt_i32 r20 r25
+540	    r29 = bit_and r32 r29
+541	    r29 = bit_and r28 r29
+542	    trace_scope 0 r29 r26 1
+543	    trace_line 0 r29 r26 L30
+544	    r27 = bit_xor r10 r29
+545	    r27 = bit_and r28 r27
+546	    trace_scope 0 r29 r26 -1
+547	    r29 = bit_and r32 r27
+548	    trace_line 0 r29 r26 L31
+549	    r28 = add_i32 r20 r31
+550	    r31 = select r29 r28 r31
+551	    trace_var 0 r29 r26 $26 = r31
+552	    trace_scope 0 r30 r26 -1
+553	    trace_line 0 r29 r26 L29
+554	    trace_var 0 r29 r26 $28 = r21
+555	    trace_scope 0 r29 r26 1
+556	    trace_line 0 r29 r26 L30
+557	    r30 = gt_i32 r21 r25
+558	    r30 = bit_and r32 r30
+559	    r30 = bit_and r27 r30
+560	    trace_scope 0 r30 r26 1
+561	    trace_line 0 r30 r26 L30
+562	    r28 = bit_xor r10 r30
+563	    r28 = bit_and r27 r28
+564	    trace_scope 0 r30 r26 -1
+565	    r30 = bit_and r32 r28
+566	    trace_line 0 r30 r26 L31
+567	    r27 = add_i32 r21 r31
+568	    r31 = select r30 r27 r31
+569	    trace_var 0 r30 r26 $26 = r31
+570	    trace_scope 0 r29 r26 -1
+571	    trace_line 0 r30 r26 L29
+572	    trace_var 0 r30 r26 $28 = r22
+573	    trace_scope 0 r30 r26 1
+574	    trace_line 0 r30 r26 L30
+575	    r25 = gt_i32 r22 r25
+576	    r25 = bit_and r32 r25
+577	    r25 = bit_and r28 r25
+578	    trace_scope 0 r25 r26 1
+579	    trace_line 0 r25 r26 L30
+580	    r29 = bit_xor r10 r25
+581	    r29 = bit_and r28 r29
+582	    trace_scope 0 r25 r26 -1
+583	    r29 = bit_and r32 r29
+584	    trace_line 0 r29 r26 L31
+585	    r25 = add_i32 r22 r31
+586	    r31 = select r29 r25 r31
+587	    trace_var 0 r29 r26 $26 = r31
+588	    trace_scope 0 r30 r26 -1
+589	    trace_line 0 r29 r26 L29
+590	    trace_scope 0 r32 r26 -1
+591	    trace_line 0 r32 r26 L33
+592	    r31 = bit_and r32 r31
+593	    trace_var 0 r32 r26 $24 = r31
+594	    trace_scope 0 r32 r26 -1
+595	    trace_exit 0 r32 r26 F3
+596	    r31 = eq_i32 r31 r24
+597	    r31 = bit_and r32 r31
+598	    trace_enter 0 r31 r26 F4
+599	    trace_scope 0 r31 r26 1
+600	    trace_line 0 r31 r26 L38
+601	    trace_line 0 r31 r26 L39
+602	    trace_line 0 r31 r26 L41
+603	    trace_var 0 r31 r26 $30 = r22
+604	    trace_var 0 r31 r26 $31 = r22
+605	    trace_var 0 r31 r26 $32 = r22
+606	    trace_var 0 r31 r26 $33 = r22
+607	    trace_line 0 r31 r26 L42
+608	    trace_scope 0 r31 r26 1
+609	    trace_var 0 r31 r26 $34 = r15
+610	    trace_scope 0 r31 r26 1
+611	    trace_line 0 r31 r26 L43
+612	    r32 = select r31 r15 r22
+613	    trace_var 0 r31 r26 $33 = r32
+614	    trace_scope 0 r31 r26 -1
+615	    trace_line 0 r31 r26 L42
+616	    trace_var 0 r31 r26 $34 = r16
+617	    trace_scope 0 r31 r26 1
+618	    trace_line 0 r31 r26 L43
+619	    r29 = select r31 r32 r22
+620	    trace_var 0 r31 r26 $32 = r29
+621	    r32 = select r31 r16 r32
+622	    trace_var 0 r31 r26 $33 = r32
+623	    trace_scope 0 r31 r26 -1
+624	    trace_line 0 r31 r26 L42
+625	    trace_var 0 r31 r26 $34 = r17
+626	    trace_scope 0 r31 r26 1
+627	    trace_line 0 r31 r26 L43
+628	    r30 = select r31 r29 r22
+629	    trace_var 0 r31 r26 $31 = r30
+630	    r29 = select r31 r32 r29
+631	    trace_var 0 r31 r26 $32 = r29
+632	    r32 = select r31 r17 r32
+633	    trace_var 0 r31 r26 $33 = r32
+634	    trace_scope 0 r31 r26 -1
+635	    trace_line 0 r31 r26 L42
+636	    trace_scope 0 r31 r26 -1
+637	    trace_line 0 r31 r26 L45
+638	    r30 = eq_i32 r15 r30
+639	    r29 = eq_i32 r16 r29
+640	    r32 = eq_i32 r17 r32
+641	    r29 = bit_and r30 r29
+642	    r29 = bit_and r32 r29
+643	    r29 = bit_and r31 r29
+644	    trace_var 0 r31 r26 $29 = r29
+645	    trace_scope 0 r31 r26 -1
+646	    trace_exit 0 r31 r26 F4
+647	    r29 = bit_and r31 r29
+648	    trace_enter 0 r29 r26 F5
+649	    trace_scope 0 r29 r26 1
+650	    trace_line 0 r29 r26 L50
+651	    trace_line 0 r29 r26 L51
+652	    trace_line 0 r29 r26 L53
+653	    trace_var 0 r29 r26 $36 = r22
+654	    trace_var 0 r29 r26 $37 = r22
+655	    trace_var 0 r29 r26 $38 = r22
+656	    trace_var 0 r29 r26 $39 = r22
+657	    trace_line 0 r29 r26 L54
+658	    trace_scope 0 r29 r26 1
+659	    trace_var 0 r29 r26 $40 = r15
+660	    trace_scope 0 r29 r26 1
+661	    trace_line 0 r29 r26 L55
+662	    r31 = select r29 r15 r22
+663	    trace_var 0 r29 r26 $39 = r31
+664	    trace_scope 0 r29 r26 -1
+665	    trace_line 0 r29 r26 L54
+666	    trace_var 0 r29 r26 $40 = r16
+667	    trace_scope 0 r29 r26 1
+668	    trace_line 0 r29 r26 L55
+669	    r32 = select r29 r31 r22
+670	    trace_var 0 r29 r26 $38 = r32
+671	    r31 = select r29 r16 r31
+672	    trace_var 0 r29 r26 $39 = r31
+673	    trace_scope 0 r29 r26 -1
+674	    trace_line 0 r29 r26 L54
+675	    trace_var 0 r29 r26 $40 = r17
+676	    trace_scope 0 r29 r26 1
+677	    trace_line 0 r29 r26 L55
+678	    r30 = select r29 r32 r22
+679	    trace_var 0 r29 r26 $37 = r30
+680	    r32 = select r29 r31 r32
+681	    trace_var 0 r29 r26 $38 = r32
+682	    r31 = select r29 r17 r31
+683	    trace_var 0 r29 r26 $39 = r31
+684	    trace_scope 0 r29 r26 -1
+685	    trace_line 0 r29 r26 L54
+686	    trace_scope 0 r29 r26 -1
+687	    trace_line 0 r29 r26 L57
+688	    r30 = eq_i32 r15 r30
+689	    r32 = eq_i32 r16 r32
+690	    r31 = eq_i32 r17 r31
+691	    r32 = bit_and r30 r32
+692	    r32 = bit_and r31 r32
+693	    r32 = bit_and r29 r32
+694	    trace_var 0 r29 r26 $35 = r32
+695	    trace_scope 0 r29 r26 -1
+696	    trace_exit 0 r29 r26 F5
+697	    r32 = bit_and r29 r32
+698	    trace_enter 0 r32 r26 F6
+699	    trace_scope 0 r32 r26 1
+700	    trace_line 0 r32 r26 L62
+701	    trace_line 0 r32 r26 L63
+702	    trace_line 0 r32 r26 L65
+703	    trace_var 0 r32 r26 $42 = r22
+704	    trace_var 0 r32 r26 $43 = r22
+705	    trace_var 0 r32 r26 $44 = r22
+706	    trace_var 0 r32 r26 $45 = r22
+707	    trace_line 0 r32 r26 L66
+708	    trace_scope 0 r32 r26 1
+709	    trace_var 0 r32 r26 $46 = r17
+710	    trace_scope 0 r32 r26 1
+711	    trace_line 0 r32 r26 L67
+712	    r29 = select r32 r17 r22
+713	    trace_var 0 r32 r26 $45 = r29
+714	    trace_scope 0 r32 r26 -1
+715	    trace_line 0 r32 r26 L66
+716	    trace_var 0 r32 r26 $46 = r16
+717	    trace_scope 0 r32 r26 1
+718	    trace_line 0 r32 r26 L67
+719	    r31 = select r32 r29 r22
+720	    trace_var 0 r32 r26 $44 = r31
+721	    r29 = select r32 r16 r29
+722	    trace_var 0 r32 r26 $45 = r29
+723	    trace_scope 0 r32 r26 -1
+724	    trace_line 0 r32 r26 L66
+725	    trace_var 0 r32 r26 $46 = r15
+726	    trace_scope 0 r32 r26 1
+727	    trace_line 0 r32 r26 L67
+728	    r30 = select r32 r31 r22
+729	    trace_var 0 r32 r26 $43 = r30
+730	    r31 = select r32 r29 r31
+731	    trace_var 0 r32 r26 $44 = r31
+732	    r29 = select r32 r15 r29
+733	    trace_var 0 r32 r26 $45 = r29
+734	    trace_scope 0 r32 r26 -1
+735	    trace_line 0 r32 r26 L66
+736	    trace_scope 0 r32 r26 -1
+737	    trace_line 0 r32 r26 L69
+738	    r30 = eq_i32 r17 r30
+739	    r31 = eq_i32 r16 r31
+740	    r29 = eq_i32 r15 r29
+741	    r31 = bit_and r30 r31
+742	    r31 = bit_and r29 r31
+743	    r31 = bit_and r32 r31
+744	    trace_var 0 r32 r26 $41 = r31
+745	    trace_scope 0 r32 r26 -1
+746	    trace_exit 0 r32 r26 F6
+747	    r31 = bit_and r32 r31
+748	    trace_enter 0 r31 r26 F7
+749	    trace_scope 0 r31 r26 1
+750	    trace_line 0 r31 r26 L74
+751	    trace_line 0 r31 r26 L75
+752	    trace_line 0 r31 r26 L77
+753	    trace_var 0 r31 r26 $48 = r22
+754	    trace_var 0 r31 r26 $49 = r22
+755	    trace_var 0 r31 r26 $50 = r22
+756	    trace_var 0 r31 r26 $51 = r22
+757	    trace_line 0 r31 r26 L78
+758	    trace_scope 0 r31 r26 1
+759	    trace_var 0 r31 r26 $52 = r17
+760	    trace_scope 0 r31 r26 1
+761	    trace_line 0 r31 r26 L79
+762	    r32 = select r31 r17 r22
+763	    trace_var 0 r31 r26 $51 = r32
+764	    trace_scope 0 r31 r26 -1
+765	    trace_line 0 r31 r26 L78
+766	    trace_var 0 r31 r26 $52 = r16
+767	    trace_scope 0 r31 r26 1
+768	    trace_line 0 r31 r26 L79
+769	    r29 = select r31 r32 r22
+770	    trace_var 0 r31 r26 $50 = r29
+771	    r32 = select r31 r16 r32
+772	    trace_var 0 r31 r26 $51 = r32
+773	    trace_scope 0 r31 r26 -1
+774	    trace_line 0 r31 r26 L78
+775	    trace_var 0 r31 r26 $52 = r15
+776	    trace_scope 0 r31 r26 1
+777	    trace_line 0 r31 r26 L79
+778	    r30 = select r31 r29 r22
+779	    trace_var 0 r31 r26 $49 = r30
+780	    r29 = select r31 r32 r29
+781	    trace_var 0 r31 r26 $50 = r29
+782	    r32 = select r31 r15 r32
+783	    trace_var 0 r31 r26 $51 = r32
+784	    trace_scope 0 r31 r26 -1
+785	    trace_line 0 r31 r26 L78
+786	    trace_scope 0 r31 r26 -1
+787	    trace_line 0 r31 r26 L81
+788	    r30 = eq_i32 r17 r30
+789	    r29 = eq_i32 r16 r29
+790	    r32 = eq_i32 r15 r32
+791	    r29 = bit_and r30 r29
+792	    r29 = bit_and r32 r29
+793	    r29 = bit_and r31 r29
+794	    trace_var 0 r31 r26 $47 = r29
+795	    trace_scope 0 r31 r26 -1
+796	    trace_exit 0 r31 r26 F7
+797	    r29 = bit_and r31 r29
+798	    trace_enter 0 r29 r26 F8
+799	    trace_scope 0 r29 r26 1
+800	    trace_line 0 r29 r26 L97
+801	    trace_line 0 r29 r26 L99
+802	    trace_var 0 r29 r26 $54 = r22
+803	    trace_var 0 r29 r26 $55 = r22
+804	    trace_var 0 r29 r26 $56 = r22
+805	    trace_var 0 r29 r26 $57 = r22
+806	    trace_line 0 r29 r26 L100
+807	    trace_scope 0 r29 r26 1
+808	    trace_var 0 r29 r26 $58 = r15
+809	    trace_scope 0 r29 r26 1
+810	    trace_line 0 r29 r26 L101
+811	    r31 = select r29 r15 r22
+812	    trace_var 0 r29 r26 $57 = r31
+813	    trace_scope 0 r29 r26 -1
+814	    trace_line 0 r29 r26 L100
+815	    trace_scope 0 r29 r26 -1
+816	    trace_line 0 r29 r26 L103
+817	    r31 = eq_i32 r15 r31
+818	    r31 = bit_and r29 r31
+819	    trace_var 0 r29 r26 $53 = r31
+820	    trace_scope 0 r29 r26 -1
+821	    trace_exit 0 r29 r26 F8
+822	    r31 = bit_and r29 r31
+823	    trace_enter 0 r31 r26 F9
+824	    trace_scope 0 r31 r26 1
+825	    trace_line 0 r31 r26 L86
+826	    trace_line 0 r31 r26 L88
+827	    trace_var 0 r31 r26 $60 = r22
+828	    trace_var 0 r31 r26 $61 = r22
+829	    trace_var 0 r31 r26 $62 = r22
+830	    trace_var 0 r31 r26 $63 = r22
+831	    trace_line 0 r31 r26 L89
+832	    trace_scope 0 r31 r26 1
+833	    trace_var 0 r31 r26 $64 = r15
+834	    trace_scope 0 r31 r26 1
+835	    trace_line 0 r31 r26 L90
+836	    r29 = select r31 r15 r22
+837	    trace_var 0 r31 r26 $63 = r29
+838	    trace_scope 0 r31 r26 -1
+839	    trace_line 0 r31 r26 L89
+840	    trace_var 0 r31 r26 $64 = r16
+841	    trace_scope 0 r31 r26 1
+842	    trace_line 0 r31 r26 L90
+843	    r32 = select r31 r29 r22
+844	    trace_var 0 r31 r26 $62 = r32
+845	    r29 = select r31 r16 r29
+846	    trace_var 0 r31 r26 $63 = r29
+847	    trace_scope 0 r31 r26 -1
+848	    trace_line 0 r31 r26 L89
+849	    trace_var 0 r31 r26 $64 = r17
+850	    trace_scope 0 r31 r26 1
+851	    trace_line 0 r31 r26 L90
+852	    r30 = select r31 r32 r22
+853	    trace_var 0 r31 r26 $61 = r30
+854	    r32 = select r31 r29 r32
+855	    trace_var 0 r31 r26 $62 = r32
+856	    r29 = select r31 r17 r29
+857	    trace_var 0 r31 r26 $63 = r29
+858	    trace_scope 0 r31 r26 -1
+859	    trace_line 0 r31 r26 L89
+860	    trace_scope 0 r31 r26 -1
+861	    trace_line 0 r31 r26 L92
+862	    r30 = eq_i32 r15 r30
+863	    r32 = eq_i32 r16 r32
+864	    r29 = eq_i32 r17 r29
+865	    r32 = bit_and r30 r32
+866	    r32 = bit_and r29 r32
+867	    r32 = bit_and r31 r32
+868	    trace_var 0 r31 r26 $59 = r32
+869	    trace_scope 0 r31 r26 -1
+870	    trace_exit 0 r31 r26 F9
+871	    r32 = bit_and r31 r32
+872	    r31 = select r32 r5 r1
+873	    r29 = select r32 r6 r2
+874	    r30 = select r32 r7 r3
+875	    r32 = select r32 r8 r4
+876	    trace_var 0 r26 r26 $10 = r31
+877	    trace_var 0 r26 r26 $11 = r29
+878	    trace_var 0 r26 r26 $12 = r30
+879	    trace_var 0 r26 r26 $13 = r32
+880	    trace_scope 0 r26 r26 -1
+881	    trace_exit 0 r26 r26 F0
+882	    store32 ptr1 r31
+883	    store32 ptr2 r29
+884	    store32 ptr3 r30
+885	    store32 ptr4 r32
diff --git a/third_party/skia/tests/sksl/runtime/PrecisionQualifiers.skvm b/third_party/skia/tests/sksl/runtime/PrecisionQualifiers.skvm
index c37d38c32fe22..34d882750db37 100644
--- a/third_party/skia/tests/sksl/runtime/PrecisionQualifiers.skvm
+++ b/third_party/skia/tests/sksl/runtime/PrecisionQualifiers.skvm
@@ -146,7 +146,7 @@ $144 = [mediump_param].result (bool, L54)
 $145 = value (float, L54)
 $146 = [lowp_param].result (bool, L55)
 $147 = value (float, L55)
-F0 = float4 main(float2 coords)
+F0 = vec4 main(vec2 coords)
 F1 = bool test_scalar()
 F2 = bool test_vector()
 F3 = bool test_matrix()
@@ -155,7 +155,7 @@ F5 = bool highp_param(float value)
 F6 = bool mediump_param(half value)
 F7 = bool lowp_param(half value)
 
-22 registers, 245 instructions:
+22 registers, 261 instructions:
 0	r0 = uniform32 ptr0 0
 1	r1 = uniform32 ptr0 4
 2	r2 = uniform32 ptr0 8
@@ -191,214 +191,230 @@ loop:
 31	    trace_enter 0 r21 r21 F0
 32	    trace_var 0 r21 r21 $12 = r20
 33	    trace_var 0 r21 r21 $13 = r0
-34	    trace_line 0 r21 r21 L58
-35	    trace_var 0 r21 r21 $14 = r9
-36	    trace_var 0 r21 r21 $15 = r9
-37	    trace_var 0 r21 r21 $16 = r9
-38	    trace_var 0 r21 r21 $17 = r9
-39	    trace_line 0 r21 r21 L59
-40	    trace_var 0 r21 r21 $18 = r13
-41	    trace_var 0 r21 r21 $19 = r13
-42	    trace_var 0 r21 r21 $20 = r13
-43	    trace_var 0 r21 r21 $21 = r13
-44	    trace_line 0 r21 r21 L60
-45	    trace_var 0 r21 r21 $22 = r1
-46	    trace_var 0 r21 r21 $23 = r2
-47	    trace_var 0 r21 r21 $24 = r3
-48	    trace_var 0 r21 r21 $25 = r4
-49	    trace_line 0 r21 r21 L61
-50	    trace_line 0 r21 r21 L63
-51	    trace_var 0 r21 r21 $26 = r5
-52	    trace_var 0 r21 r21 $27 = r6
-53	    trace_var 0 r21 r21 $28 = r7
-54	    trace_var 0 r21 r21 $29 = r8
-55	    trace_line 0 r21 r21 L64
-56	    trace_line 0 r21 r21 L66
-57	    trace_enter 0 r21 r21 F1
-58	    trace_line 0 r21 r21 L6
-59	    trace_var 0 r21 r21 $31 = r11
-60	    trace_line 0 r21 r21 L7
-61	    trace_var 0 r21 r21 $32 = r11
-62	    trace_line 0 r21 r21 L8
-63	    trace_var 0 r21 r21 $33 = r14
-64	    trace_line 0 r21 r21 L9
-65	    trace_var 0 r21 r21 $34 = r14
-66	    trace_line 0 r21 r21 L11
-67	    trace_exit 0 r21 r21 F1
-68	    trace_var 0 r21 r21 $30 = r10
-69	    trace_enter 0 r21 r21 F2
-70	    trace_line 0 r21 r21 L15
-71	    trace_var 0 r21 r21 $36 = r15
-72	    trace_var 0 r21 r21 $37 = r15
-73	    trace_line 0 r21 r21 L16
-74	    trace_var 0 r21 r21 $38 = r15
-75	    trace_var 0 r21 r21 $39 = r15
-76	    trace_line 0 r21 r21 L17
-77	    trace_var 0 r21 r21 $40 = r16
-78	    trace_var 0 r21 r21 $41 = r16
-79	    trace_var 0 r21 r21 $42 = r16
-80	    trace_line 0 r21 r21 L18
-81	    trace_var 0 r21 r21 $43 = r16
-82	    trace_var 0 r21 r21 $44 = r16
-83	    trace_var 0 r21 r21 $45 = r16
-84	    trace_line 0 r21 r21 L19
-85	    trace_var 0 r21 r21 $46 = r17
-86	    trace_var 0 r21 r21 $47 = r17
-87	    trace_var 0 r21 r21 $48 = r17
-88	    trace_var 0 r21 r21 $49 = r17
-89	    trace_line 0 r21 r21 L20
-90	    trace_var 0 r21 r21 $50 = r17
-91	    trace_var 0 r21 r21 $51 = r17
-92	    trace_var 0 r21 r21 $52 = r17
-93	    trace_var 0 r21 r21 $53 = r17
-94	    trace_line 0 r21 r21 L22
-95	    trace_var 0 r21 r21 $54 = r14
-96	    trace_var 0 r21 r21 $55 = r14
-97	    trace_line 0 r21 r21 L23
-98	    trace_var 0 r21 r21 $56 = r14
-99	    trace_var 0 r21 r21 $57 = r14
-100	    trace_line 0 r21 r21 L24
-101	    trace_var 0 r21 r21 $58 = r18
-102	    trace_var 0 r21 r21 $59 = r18
-103	    trace_var 0 r21 r21 $60 = r18
-104	    trace_line 0 r21 r21 L25
-105	    trace_var 0 r21 r21 $61 = r18
-106	    trace_var 0 r21 r21 $62 = r18
-107	    trace_var 0 r21 r21 $63 = r18
-108	    trace_line 0 r21 r21 L26
-109	    trace_var 0 r21 r21 $64 = r19
-110	    trace_var 0 r21 r21 $65 = r19
-111	    trace_var 0 r21 r21 $66 = r19
-112	    trace_var 0 r21 r21 $67 = r19
-113	    trace_line 0 r21 r21 L27
-114	    trace_var 0 r21 r21 $68 = r19
-115	    trace_var 0 r21 r21 $69 = r19
-116	    trace_var 0 r21 r21 $70 = r19
-117	    trace_var 0 r21 r21 $71 = r19
-118	    trace_line 0 r21 r21 L29
-119	    trace_exit 0 r21 r21 F2
-120	    trace_var 0 r21 r21 $35 = r10
-121	    trace_enter 0 r21 r21 F3
-122	    trace_line 0 r21 r21 L34
-123	    trace_var 0 r21 r21 $73 = r15
-124	    trace_var 0 r21 r21 $74 = r9
-125	    trace_var 0 r21 r21 $75 = r9
-126	    trace_var 0 r21 r21 $76 = r15
-127	    trace_line 0 r21 r21 L35
-128	    trace_var 0 r21 r21 $77 = r15
-129	    trace_var 0 r21 r21 $78 = r9
-130	    trace_var 0 r21 r21 $79 = r9
-131	    trace_var 0 r21 r21 $80 = r15
-132	    trace_line 0 r21 r21 L36
-133	    trace_var 0 r21 r21 $81 = r16
-134	    trace_var 0 r21 r21 $82 = r9
-135	    trace_var 0 r21 r21 $83 = r9
-136	    trace_var 0 r21 r21 $84 = r9
-137	    trace_var 0 r21 r21 $85 = r16
-138	    trace_var 0 r21 r21 $86 = r9
-139	    trace_var 0 r21 r21 $87 = r9
-140	    trace_var 0 r21 r21 $88 = r9
-141	    trace_var 0 r21 r21 $89 = r16
-142	    trace_line 0 r21 r21 L37
-143	    trace_var 0 r21 r21 $90 = r16
-144	    trace_var 0 r21 r21 $91 = r9
-145	    trace_var 0 r21 r21 $92 = r9
-146	    trace_var 0 r21 r21 $93 = r9
-147	    trace_var 0 r21 r21 $94 = r16
-148	    trace_var 0 r21 r21 $95 = r9
-149	    trace_var 0 r21 r21 $96 = r9
-150	    trace_var 0 r21 r21 $97 = r9
-151	    trace_var 0 r21 r21 $98 = r16
-152	    trace_line 0 r21 r21 L38
-153	    trace_var 0 r21 r21 $99 = r17
-154	    trace_var 0 r21 r21 $100 = r9
-155	    trace_var 0 r21 r21 $101 = r9
-156	    trace_var 0 r21 r21 $102 = r9
-157	    trace_var 0 r21 r21 $103 = r9
-158	    trace_var 0 r21 r21 $104 = r17
-159	    trace_var 0 r21 r21 $105 = r9
-160	    trace_var 0 r21 r21 $106 = r9
-161	    trace_var 0 r21 r21 $107 = r9
-162	    trace_var 0 r21 r21 $108 = r9
-163	    trace_var 0 r21 r21 $109 = r17
-164	    trace_var 0 r21 r21 $110 = r9
-165	    trace_var 0 r21 r21 $111 = r9
-166	    trace_var 0 r21 r21 $112 = r9
-167	    trace_var 0 r21 r21 $113 = r9
-168	    trace_var 0 r21 r21 $114 = r17
-169	    trace_line 0 r21 r21 L39
-170	    trace_var 0 r21 r21 $115 = r17
-171	    trace_var 0 r21 r21 $116 = r9
-172	    trace_var 0 r21 r21 $117 = r9
-173	    trace_var 0 r21 r21 $118 = r9
-174	    trace_var 0 r21 r21 $119 = r9
-175	    trace_var 0 r21 r21 $120 = r17
-176	    trace_var 0 r21 r21 $121 = r9
-177	    trace_var 0 r21 r21 $122 = r9
-178	    trace_var 0 r21 r21 $123 = r9
-179	    trace_var 0 r21 r21 $124 = r9
-180	    trace_var 0 r21 r21 $125 = r17
-181	    trace_var 0 r21 r21 $126 = r9
-182	    trace_var 0 r21 r21 $127 = r9
-183	    trace_var 0 r21 r21 $128 = r9
-184	    trace_var 0 r21 r21 $129 = r9
-185	    trace_var 0 r21 r21 $130 = r17
-186	    trace_line 0 r21 r21 L41
-187	    trace_exit 0 r21 r21 F3
-188	    trace_var 0 r21 r21 $72 = r10
-189	    trace_enter 0 r21 r21 F4
-190	    trace_line 0 r21 r21 L45
-191	    trace_var 0 r21 r21 $132 = r9
-192	    trace_line 0 r21 r21 L45
-193	    trace_var 0 r21 r21 $132 = r13
-194	    trace_line 0 r21 r21 L46
-195	    trace_var 0 r21 r21 $133 = r9
-196	    trace_line 0 r21 r21 L46
-197	    trace_var 0 r21 r21 $133 = r13
-198	    trace_line 0 r21 r21 L47
-199	    trace_var 0 r21 r21 $134 = r9
-200	    trace_var 0 r21 r21 $135 = r9
-201	    trace_var 0 r21 r21 $136 = r9
-202	    trace_var 0 r21 r21 $137 = r9
-203	    trace_line 0 r21 r21 L47
-204	    trace_var 0 r21 r21 $135 = r13
-205	    trace_line 0 r21 r21 L47
-206	    trace_var 0 r21 r21 $136 = r15
-207	    trace_var 0 r21 r21 $137 = r16
-208	    trace_line 0 r21 r21 L48
-209	    trace_var 0 r21 r21 $138 = r9
-210	    trace_var 0 r21 r21 $139 = r9
-211	    trace_var 0 r21 r21 $140 = r9
-212	    trace_var 0 r21 r21 $141 = r9
-213	    trace_line 0 r21 r21 L48
-214	    trace_var 0 r21 r21 $139 = r13
-215	    trace_line 0 r21 r21 L48
-216	    trace_var 0 r21 r21 $140 = r15
-217	    trace_var 0 r21 r21 $141 = r16
-218	    trace_line 0 r21 r21 L50
-219	    trace_exit 0 r21 r21 F4
-220	    trace_var 0 r21 r21 $131 = r10
-221	    trace_enter 0 r21 r21 F5
-222	    trace_var 0 r21 r21 $143 = r13
-223	    trace_line 0 r21 r21 L53
-224	    trace_exit 0 r21 r21 F5
-225	    trace_var 0 r21 r21 $142 = r10
-226	    trace_enter 0 r21 r21 F6
-227	    trace_var 0 r21 r21 $145 = r15
-228	    trace_line 0 r21 r21 L54
-229	    trace_exit 0 r21 r21 F6
-230	    trace_var 0 r21 r21 $144 = r10
-231	    trace_enter 0 r21 r21 F7
-232	    trace_var 0 r21 r21 $147 = r16
-233	    trace_line 0 r21 r21 L55
-234	    trace_exit 0 r21 r21 F7
-235	    trace_var 0 r21 r21 $146 = r10
-236	    trace_exit 0 r21 r21 F0
-237	    trace_var 0 r21 r21 $8 = r1
-238	    trace_var 0 r21 r21 $9 = r2
-239	    trace_var 0 r21 r21 $10 = r3
-240	    trace_var 0 r21 r21 $11 = r4
-241	    store32 ptr1 r1
-242	    store32 ptr2 r2
-243	    store32 ptr3 r3
-244	    store32 ptr4 r4
+34	    trace_scope 0 r21 r21 1
+35	    trace_line 0 r21 r21 L58
+36	    trace_var 0 r21 r21 $14 = r9
+37	    trace_var 0 r21 r21 $15 = r9
+38	    trace_var 0 r21 r21 $16 = r9
+39	    trace_var 0 r21 r21 $17 = r9
+40	    trace_line 0 r21 r21 L59
+41	    trace_var 0 r21 r21 $18 = r13
+42	    trace_var 0 r21 r21 $19 = r13
+43	    trace_var 0 r21 r21 $20 = r13
+44	    trace_var 0 r21 r21 $21 = r13
+45	    trace_line 0 r21 r21 L60
+46	    trace_var 0 r21 r21 $22 = r1
+47	    trace_var 0 r21 r21 $23 = r2
+48	    trace_var 0 r21 r21 $24 = r3
+49	    trace_var 0 r21 r21 $25 = r4
+50	    trace_line 0 r21 r21 L61
+51	    trace_line 0 r21 r21 L63
+52	    trace_var 0 r21 r21 $26 = r5
+53	    trace_var 0 r21 r21 $27 = r6
+54	    trace_var 0 r21 r21 $28 = r7
+55	    trace_var 0 r21 r21 $29 = r8
+56	    trace_line 0 r21 r21 L64
+57	    trace_line 0 r21 r21 L66
+58	    trace_enter 0 r21 r21 F1
+59	    trace_scope 0 r21 r21 1
+60	    trace_line 0 r21 r21 L6
+61	    trace_var 0 r21 r21 $31 = r11
+62	    trace_line 0 r21 r21 L7
+63	    trace_var 0 r21 r21 $32 = r11
+64	    trace_line 0 r21 r21 L8
+65	    trace_var 0 r21 r21 $33 = r14
+66	    trace_line 0 r21 r21 L9
+67	    trace_var 0 r21 r21 $34 = r14
+68	    trace_line 0 r21 r21 L11
+69	    trace_var 0 r21 r21 $30 = r10
+70	    trace_scope 0 r21 r21 -1
+71	    trace_exit 0 r21 r21 F1
+72	    trace_enter 0 r21 r21 F2
+73	    trace_scope 0 r21 r21 1
+74	    trace_line 0 r21 r21 L15
+75	    trace_var 0 r21 r21 $36 = r15
+76	    trace_var 0 r21 r21 $37 = r15
+77	    trace_line 0 r21 r21 L16
+78	    trace_var 0 r21 r21 $38 = r15
+79	    trace_var 0 r21 r21 $39 = r15
+80	    trace_line 0 r21 r21 L17
+81	    trace_var 0 r21 r21 $40 = r16
+82	    trace_var 0 r21 r21 $41 = r16
+83	    trace_var 0 r21 r21 $42 = r16
+84	    trace_line 0 r21 r21 L18
+85	    trace_var 0 r21 r21 $43 = r16
+86	    trace_var 0 r21 r21 $44 = r16
+87	    trace_var 0 r21 r21 $45 = r16
+88	    trace_line 0 r21 r21 L19
+89	    trace_var 0 r21 r21 $46 = r17
+90	    trace_var 0 r21 r21 $47 = r17
+91	    trace_var 0 r21 r21 $48 = r17
+92	    trace_var 0 r21 r21 $49 = r17
+93	    trace_line 0 r21 r21 L20
+94	    trace_var 0 r21 r21 $50 = r17
+95	    trace_var 0 r21 r21 $51 = r17
+96	    trace_var 0 r21 r21 $52 = r17
+97	    trace_var 0 r21 r21 $53 = r17
+98	    trace_line 0 r21 r21 L22
+99	    trace_var 0 r21 r21 $54 = r14
+100	    trace_var 0 r21 r21 $55 = r14
+101	    trace_line 0 r21 r21 L23
+102	    trace_var 0 r21 r21 $56 = r14
+103	    trace_var 0 r21 r21 $57 = r14
+104	    trace_line 0 r21 r21 L24
+105	    trace_var 0 r21 r21 $58 = r18
+106	    trace_var 0 r21 r21 $59 = r18
+107	    trace_var 0 r21 r21 $60 = r18
+108	    trace_line 0 r21 r21 L25
+109	    trace_var 0 r21 r21 $61 = r18
+110	    trace_var 0 r21 r21 $62 = r18
+111	    trace_var 0 r21 r21 $63 = r18
+112	    trace_line 0 r21 r21 L26
+113	    trace_var 0 r21 r21 $64 = r19
+114	    trace_var 0 r21 r21 $65 = r19
+115	    trace_var 0 r21 r21 $66 = r19
+116	    trace_var 0 r21 r21 $67 = r19
+117	    trace_line 0 r21 r21 L27
+118	    trace_var 0 r21 r21 $68 = r19
+119	    trace_var 0 r21 r21 $69 = r19
+120	    trace_var 0 r21 r21 $70 = r19
+121	    trace_var 0 r21 r21 $71 = r19
+122	    trace_line 0 r21 r21 L29
+123	    trace_var 0 r21 r21 $35 = r10
+124	    trace_scope 0 r21 r21 -1
+125	    trace_exit 0 r21 r21 F2
+126	    trace_enter 0 r21 r21 F3
+127	    trace_scope 0 r21 r21 1
+128	    trace_line 0 r21 r21 L34
+129	    trace_var 0 r21 r21 $73 = r15
+130	    trace_var 0 r21 r21 $74 = r9
+131	    trace_var 0 r21 r21 $75 = r9
+132	    trace_var 0 r21 r21 $76 = r15
+133	    trace_line 0 r21 r21 L35
+134	    trace_var 0 r21 r21 $77 = r15
+135	    trace_var 0 r21 r21 $78 = r9
+136	    trace_var 0 r21 r21 $79 = r9
+137	    trace_var 0 r21 r21 $80 = r15
+138	    trace_line 0 r21 r21 L36
+139	    trace_var 0 r21 r21 $81 = r16
+140	    trace_var 0 r21 r21 $82 = r9
+141	    trace_var 0 r21 r21 $83 = r9
+142	    trace_var 0 r21 r21 $84 = r9
+143	    trace_var 0 r21 r21 $85 = r16
+144	    trace_var 0 r21 r21 $86 = r9
+145	    trace_var 0 r21 r21 $87 = r9
+146	    trace_var 0 r21 r21 $88 = r9
+147	    trace_var 0 r21 r21 $89 = r16
+148	    trace_line 0 r21 r21 L37
+149	    trace_var 0 r21 r21 $90 = r16
+150	    trace_var 0 r21 r21 $91 = r9
+151	    trace_var 0 r21 r21 $92 = r9
+152	    trace_var 0 r21 r21 $93 = r9
+153	    trace_var 0 r21 r21 $94 = r16
+154	    trace_var 0 r21 r21 $95 = r9
+155	    trace_var 0 r21 r21 $96 = r9
+156	    trace_var 0 r21 r21 $97 = r9
+157	    trace_var 0 r21 r21 $98 = r16
+158	    trace_line 0 r21 r21 L38
+159	    trace_var 0 r21 r21 $99 = r17
+160	    trace_var 0 r21 r21 $100 = r9
+161	    trace_var 0 r21 r21 $101 = r9
+162	    trace_var 0 r21 r21 $102 = r9
+163	    trace_var 0 r21 r21 $103 = r9
+164	    trace_var 0 r21 r21 $104 = r17
+165	    trace_var 0 r21 r21 $105 = r9
+166	    trace_var 0 r21 r21 $106 = r9
+167	    trace_var 0 r21 r21 $107 = r9
+168	    trace_var 0 r21 r21 $108 = r9
+169	    trace_var 0 r21 r21 $109 = r17
+170	    trace_var 0 r21 r21 $110 = r9
+171	    trace_var 0 r21 r21 $111 = r9
+172	    trace_var 0 r21 r21 $112 = r9
+173	    trace_var 0 r21 r21 $113 = r9
+174	    trace_var 0 r21 r21 $114 = r17
+175	    trace_line 0 r21 r21 L39
+176	    trace_var 0 r21 r21 $115 = r17
+177	    trace_var 0 r21 r21 $116 = r9
+178	    trace_var 0 r21 r21 $117 = r9
+179	    trace_var 0 r21 r21 $118 = r9
+180	    trace_var 0 r21 r21 $119 = r9
+181	    trace_var 0 r21 r21 $120 = r17
+182	    trace_var 0 r21 r21 $121 = r9
+183	    trace_var 0 r21 r21 $122 = r9
+184	    trace_var 0 r21 r21 $123 = r9
+185	    trace_var 0 r21 r21 $124 = r9
+186	    trace_var 0 r21 r21 $125 = r17
+187	    trace_var 0 r21 r21 $126 = r9
+188	    trace_var 0 r21 r21 $127 = r9
+189	    trace_var 0 r21 r21 $128 = r9
+190	    trace_var 0 r21 r21 $129 = r9
+191	    trace_var 0 r21 r21 $130 = r17
+192	    trace_line 0 r21 r21 L41
+193	    trace_var 0 r21 r21 $72 = r10
+194	    trace_scope 0 r21 r21 -1
+195	    trace_exit 0 r21 r21 F3
+196	    trace_enter 0 r21 r21 F4
+197	    trace_scope 0 r21 r21 1
+198	    trace_line 0 r21 r21 L45
+199	    trace_var 0 r21 r21 $132 = r9
+200	    trace_line 0 r21 r21 L45
+201	    trace_var 0 r21 r21 $132 = r13
+202	    trace_line 0 r21 r21 L46
+203	    trace_var 0 r21 r21 $133 = r9
+204	    trace_line 0 r21 r21 L46
+205	    trace_var 0 r21 r21 $133 = r13
+206	    trace_line 0 r21 r21 L47
+207	    trace_var 0 r21 r21 $134 = r9
+208	    trace_var 0 r21 r21 $135 = r9
+209	    trace_var 0 r21 r21 $136 = r9
+210	    trace_var 0 r21 r21 $137 = r9
+211	    trace_line 0 r21 r21 L47
+212	    trace_var 0 r21 r21 $135 = r13
+213	    trace_line 0 r21 r21 L47
+214	    trace_var 0 r21 r21 $136 = r15
+215	    trace_var 0 r21 r21 $137 = r16
+216	    trace_line 0 r21 r21 L48
+217	    trace_var 0 r21 r21 $138 = r9
+218	    trace_var 0 r21 r21 $139 = r9
+219	    trace_var 0 r21 r21 $140 = r9
+220	    trace_var 0 r21 r21 $141 = r9
+221	    trace_line 0 r21 r21 L48
+222	    trace_var 0 r21 r21 $139 = r13
+223	    trace_line 0 r21 r21 L48
+224	    trace_var 0 r21 r21 $140 = r15
+225	    trace_var 0 r21 r21 $141 = r16
+226	    trace_line 0 r21 r21 L50
+227	    trace_var 0 r21 r21 $131 = r10
+228	    trace_scope 0 r21 r21 -1
+229	    trace_exit 0 r21 r21 F4
+230	    trace_enter 0 r21 r21 F5
+231	    trace_var 0 r21 r21 $143 = r13
+232	    trace_scope 0 r21 r21 1
+233	    trace_line 0 r21 r21 L53
+234	    trace_var 0 r21 r21 $142 = r10
+235	    trace_scope 0 r21 r21 -1
+236	    trace_exit 0 r21 r21 F5
+237	    trace_enter 0 r21 r21 F6
+238	    trace_var 0 r21 r21 $145 = r15
+239	    trace_scope 0 r21 r21 1
+240	    trace_line 0 r21 r21 L54
+241	    trace_var 0 r21 r21 $144 = r10
+242	    trace_scope 0 r21 r21 -1
+243	    trace_exit 0 r21 r21 F6
+244	    trace_enter 0 r21 r21 F7
+245	    trace_var 0 r21 r21 $147 = r16
+246	    trace_scope 0 r21 r21 1
+247	    trace_line 0 r21 r21 L55
+248	    trace_var 0 r21 r21 $146 = r10
+249	    trace_scope 0 r21 r21 -1
+250	    trace_exit 0 r21 r21 F7
+251	    trace_var 0 r21 r21 $8 = r1
+252	    trace_var 0 r21 r21 $9 = r2
+253	    trace_var 0 r21 r21 $10 = r3
+254	    trace_var 0 r21 r21 $11 = r4
+255	    trace_scope 0 r21 r21 -1
+256	    trace_exit 0 r21 r21 F0
+257	    store32 ptr1 r1
+258	    store32 ptr2 r2
+259	    store32 ptr3 r3
+260	    store32 ptr4 r4
diff --git a/third_party/skia/tests/sksl/runtime/QualifierOrder.stage b/third_party/skia/tests/sksl/runtime/QualifierOrder.stage
index 3990477c9f0e8..be9e87995af7d 100644
--- a/third_party/skia/tests/sksl/runtime/QualifierOrder.stage
+++ b/third_party/skia/tests/sksl/runtime/QualifierOrder.stage
@@ -10,6 +10,7 @@ noinline void inout_after_high_precision_0(inout float2 x)
 }
 noinline void out_after_high_precision_0(out float2 x)
 {
+	x = float2(0.0);
 }
 float4 main(float2 coords)
 {
diff --git a/third_party/skia/tests/sksl/runtime/SwitchWithLoops.skvm b/third_party/skia/tests/sksl/runtime/SwitchWithLoops.skvm
index b5dc601b781ef..a5c630a00e609 100644
--- a/third_party/skia/tests/sksl/runtime/SwitchWithLoops.skvm
+++ b/third_party/skia/tests/sksl/runtime/SwitchWithLoops.skvm
@@ -89,53 +89,53 @@
 87	r16 = bit_and r12 r15
 88	r13 = select r16 r14 r13
 89	r15 = bit_or r12 r15
-90	r14 = add_i32 r10 r13
-91	r16 = bit_and r12 r15
-92	r13 = select r16 r14 r13
-93	r14 = bit_xor r8 r16
-94	r14 = bit_and r15 r14
+90	r14 = bit_and r12 r15
+91	r16 = add_i32 r10 r13
+92	r13 = select r14 r16 r13
+93	r16 = bit_xor r8 r14
+94	r16 = bit_and r15 r16
 95	r15 = add_i32 r10 r13
-96	r17 = bit_and r12 r14
+96	r17 = bit_and r12 r16
 97	r13 = select r17 r15 r13
-98	r14 = bit_or r16 r14
-99	r16 = add_i32 r10 r13
-100	r15 = bit_and r12 r14
-101	r13 = select r15 r16 r13
-102	r16 = bit_xor r8 r15
-103	r16 = bit_and r14 r16
-104	r14 = add_i32 r10 r13
-105	r17 = bit_and r12 r16
-106	r13 = select r17 r14 r13
-107	r16 = bit_or r15 r16
-108	r15 = add_i32 r10 r13
-109	r14 = bit_and r12 r16
-110	r13 = select r14 r15 r13
-111	r15 = bit_xor r8 r14
-112	r15 = bit_and r16 r15
-113	r16 = add_i32 r10 r13
-114	r17 = bit_and r12 r15
-115	r13 = select r17 r16 r13
-116	r15 = bit_or r14 r15
-117	r14 = add_i32 r10 r13
-118	r16 = bit_and r12 r15
-119	r13 = select r16 r14 r13
-120	r14 = bit_xor r8 r16
-121	r14 = bit_and r15 r14
-122	r15 = add_i32 r10 r13
-123	r17 = bit_and r12 r14
-124	r13 = select r17 r15 r13
-125	r14 = bit_or r16 r14
-126	r16 = add_i32 r10 r13
-127	r15 = bit_and r12 r14
-128	r13 = select r15 r16 r13
-129	r16 = bit_xor r8 r15
-130	r16 = bit_and r14 r16
-131	r14 = add_i32 r10 r13
+98	r16 = bit_or r14 r16
+99	r14 = bit_and r12 r16
+100	r15 = add_i32 r10 r13
+101	r13 = select r14 r15 r13
+102	r15 = bit_xor r8 r14
+103	r15 = bit_and r16 r15
+104	r16 = add_i32 r10 r13
+105	r17 = bit_and r12 r15
+106	r13 = select r17 r16 r13
+107	r15 = bit_or r14 r15
+108	r14 = bit_and r12 r15
+109	r16 = add_i32 r10 r13
+110	r13 = select r14 r16 r13
+111	r16 = bit_xor r8 r14
+112	r16 = bit_and r15 r16
+113	r15 = add_i32 r10 r13
+114	r17 = bit_and r12 r16
+115	r13 = select r17 r15 r13
+116	r16 = bit_or r14 r16
+117	r14 = bit_and r12 r16
+118	r15 = add_i32 r10 r13
+119	r13 = select r14 r15 r13
+120	r15 = bit_xor r8 r14
+121	r15 = bit_and r16 r15
+122	r16 = add_i32 r10 r13
+123	r17 = bit_and r12 r15
+124	r13 = select r17 r16 r13
+125	r15 = bit_or r14 r15
+126	r14 = bit_and r12 r15
+127	r16 = add_i32 r10 r13
+128	r13 = select r14 r16 r13
+129	r16 = bit_xor r8 r14
+130	r16 = bit_and r15 r16
+131	r15 = add_i32 r10 r13
 132	r17 = bit_and r12 r16
-133	r13 = select r17 r14 r13
-134	r16 = bit_or r15 r16
-135	r15 = add_i32 r10 r13
-136	r14 = bit_and r12 r16
+133	r13 = select r17 r15 r13
+134	r16 = bit_or r14 r16
+135	r14 = bit_and r12 r16
+136	r15 = add_i32 r10 r13
 137	r13 = select r14 r15 r13
 138	r15 = bit_xor r8 r14
 139	r15 = bit_and r16 r15
@@ -143,149 +143,149 @@
 141	r17 = bit_and r12 r15
 142	r13 = select r17 r16 r13
 143	r15 = bit_or r14 r15
-144	r14 = add_i32 r10 r13
-145	r16 = bit_and r12 r15
-146	r13 = select r16 r14 r13
-147	r14 = bit_xor r8 r16
-148	r14 = bit_and r15 r14
+144	r14 = bit_and r12 r15
+145	r16 = add_i32 r10 r13
+146	r13 = select r14 r16 r13
+147	r16 = bit_xor r8 r14
+148	r16 = bit_and r15 r16
 149	r15 = add_i32 r10 r13
-150	r17 = bit_and r12 r14
+150	r17 = bit_and r12 r16
 151	r13 = select r17 r15 r13
-152	r14 = bit_or r16 r14
-153	r16 = add_i32 r10 r13
-154	r15 = bit_and r12 r14
-155	r13 = select r15 r16 r13
-156	r16 = bit_xor r8 r15
-157	r16 = bit_and r14 r16
-158	r14 = add_i32 r10 r13
-159	r17 = bit_and r12 r16
-160	r13 = select r17 r14 r13
-161	r16 = bit_or r15 r16
-162	r15 = add_i32 r10 r13
-163	r14 = bit_and r12 r16
-164	r13 = select r14 r15 r13
+152	r16 = bit_or r14 r16
+153	r14 = bit_and r12 r16
+154	r15 = add_i32 r10 r13
+155	r13 = select r14 r15 r13
+156	r15 = bit_xor r8 r14
+157	r15 = bit_and r16 r15
+158	r16 = add_i32 r10 r13
+159	r17 = bit_and r12 r15
+160	r13 = select r17 r16 r13
+161	r15 = bit_or r14 r15
+162	r14 = bit_and r12 r15
+163	r16 = add_i32 r10 r13
+164	r13 = select r14 r16 r13
 165	r14 = bit_xor r8 r14
-166	r14 = bit_and r16 r14
-167	r16 = add_i32 r10 r13
+166	r14 = bit_and r15 r14
+167	r15 = add_i32 r10 r13
 168	r14 = bit_and r12 r14
-169	r13 = select r14 r16 r13
-170	r16 = add_i32 r10 r13
-171	r13 = select r11 r16 r13
-172	r16 = splat B (1.5414283e-44)
-173	r16 = eq_i32 r13 r16
-174	r16 = bit_and r11 r16
-175	r16 = bit_and r11 r16
-176	r9 = bit_and r9 r16
+169	r13 = select r14 r15 r13
+170	r15 = add_i32 r10 r13
+171	r13 = select r11 r15 r13
+172	r15 = splat B (1.5414283e-44)
+173	r15 = eq_i32 r13 r15
+174	r15 = bit_and r11 r15
+175	r15 = bit_and r11 r15
+176	r9 = bit_and r9 r15
 177	r11 = bit_and r10 r9
 178	r13 = bit_xor r8 r9
-179	r13 = bit_and r16 r13
+179	r13 = bit_and r15 r13
 180	r14 = add_i32 r10 r11
 181	r12 = bit_xor r8 r13
-182	r15 = bit_and r16 r12
-183	r11 = select r15 r14 r11
-184	r14 = add_i32 r10 r11
-185	r15 = bit_and r9 r12
-186	r11 = select r15 r14 r11
-187	r15 = bit_xor r8 r15
-188	r15 = bit_and r16 r15
-189	r15 = bit_and r12 r15
-190	r15 = bit_or r13 r15
+182	r16 = bit_and r15 r12
+183	r11 = select r16 r14 r11
+184	r14 = bit_and r9 r12
+185	r16 = add_i32 r10 r11
+186	r11 = select r14 r16 r11
+187	r14 = bit_xor r8 r14
+188	r14 = bit_and r15 r14
+189	r14 = bit_and r12 r14
+190	r14 = bit_or r13 r14
 191	r13 = add_i32 r10 r11
-192	r12 = bit_xor r8 r15
-193	r14 = bit_and r16 r12
-194	r11 = select r14 r13 r11
-195	r13 = add_i32 r10 r11
-196	r14 = bit_and r9 r12
-197	r11 = select r14 r13 r11
-198	r14 = bit_xor r8 r14
-199	r14 = bit_and r16 r14
-200	r14 = bit_and r12 r14
-201	r14 = bit_or r15 r14
-202	r15 = add_i32 r10 r11
-203	r12 = bit_xor r8 r14
-204	r13 = bit_and r16 r12
-205	r11 = select r13 r15 r11
-206	r15 = add_i32 r10 r11
-207	r13 = bit_and r9 r12
-208	r11 = select r13 r15 r11
-209	r13 = bit_xor r8 r13
-210	r13 = bit_and r16 r13
-211	r13 = bit_and r12 r13
-212	r13 = bit_or r14 r13
-213	r14 = add_i32 r10 r11
-214	r12 = bit_xor r8 r13
-215	r15 = bit_and r16 r12
-216	r11 = select r15 r14 r11
-217	r14 = add_i32 r10 r11
-218	r15 = bit_and r9 r12
-219	r11 = select r15 r14 r11
-220	r15 = bit_xor r8 r15
-221	r15 = bit_and r16 r15
-222	r15 = bit_and r12 r15
-223	r15 = bit_or r13 r15
-224	r13 = add_i32 r10 r11
-225	r12 = bit_xor r8 r15
-226	r14 = bit_and r16 r12
-227	r11 = select r14 r13 r11
-228	r13 = add_i32 r10 r11
-229	r14 = bit_and r9 r12
-230	r11 = select r14 r13 r11
+192	r12 = bit_xor r8 r14
+193	r16 = bit_and r15 r12
+194	r11 = select r16 r13 r11
+195	r13 = bit_and r9 r12
+196	r16 = add_i32 r10 r11
+197	r11 = select r13 r16 r11
+198	r13 = bit_xor r8 r13
+199	r13 = bit_and r15 r13
+200	r13 = bit_and r12 r13
+201	r13 = bit_or r14 r13
+202	r14 = add_i32 r10 r11
+203	r12 = bit_xor r8 r13
+204	r16 = bit_and r15 r12
+205	r11 = select r16 r14 r11
+206	r14 = bit_and r9 r12
+207	r16 = add_i32 r10 r11
+208	r11 = select r14 r16 r11
+209	r14 = bit_xor r8 r14
+210	r14 = bit_and r15 r14
+211	r14 = bit_and r12 r14
+212	r14 = bit_or r13 r14
+213	r13 = add_i32 r10 r11
+214	r12 = bit_xor r8 r14
+215	r16 = bit_and r15 r12
+216	r11 = select r16 r13 r11
+217	r13 = bit_and r9 r12
+218	r16 = add_i32 r10 r11
+219	r11 = select r13 r16 r11
+220	r13 = bit_xor r8 r13
+221	r13 = bit_and r15 r13
+222	r13 = bit_and r12 r13
+223	r13 = bit_or r14 r13
+224	r14 = add_i32 r10 r11
+225	r12 = bit_xor r8 r13
+226	r16 = bit_and r15 r12
+227	r11 = select r16 r14 r11
+228	r14 = bit_and r9 r12
+229	r16 = add_i32 r10 r11
+230	r11 = select r14 r16 r11
 231	r14 = bit_xor r8 r14
-232	r14 = bit_and r16 r14
+232	r14 = bit_and r15 r14
 233	r14 = bit_and r12 r14
-234	r14 = bit_or r15 r14
-235	r15 = add_i32 r10 r11
+234	r14 = bit_or r13 r14
+235	r13 = add_i32 r10 r11
 236	r12 = bit_xor r8 r14
-237	r13 = bit_and r16 r12
-238	r11 = select r13 r15 r11
-239	r15 = add_i32 r10 r11
-240	r13 = bit_and r9 r12
-241	r11 = select r13 r15 r11
+237	r16 = bit_and r15 r12
+238	r11 = select r16 r13 r11
+239	r13 = bit_and r9 r12
+240	r16 = add_i32 r10 r11
+241	r11 = select r13 r16 r11
 242	r13 = bit_xor r8 r13
-243	r13 = bit_and r16 r13
+243	r13 = bit_and r15 r13
 244	r13 = bit_and r12 r13
 245	r13 = bit_or r14 r13
 246	r14 = add_i32 r10 r11
 247	r12 = bit_xor r8 r13
-248	r15 = bit_and r16 r12
-249	r11 = select r15 r14 r11
-250	r14 = add_i32 r10 r11
-251	r15 = bit_and r9 r12
-252	r11 = select r15 r14 r11
-253	r15 = bit_xor r8 r15
-254	r15 = bit_and r16 r15
-255	r15 = bit_and r12 r15
-256	r15 = bit_or r13 r15
+248	r16 = bit_and r15 r12
+249	r11 = select r16 r14 r11
+250	r14 = bit_and r9 r12
+251	r16 = add_i32 r10 r11
+252	r11 = select r14 r16 r11
+253	r14 = bit_xor r8 r14
+254	r14 = bit_and r15 r14
+255	r14 = bit_and r12 r14
+256	r14 = bit_or r13 r14
 257	r13 = add_i32 r10 r11
-258	r12 = bit_xor r8 r15
-259	r14 = bit_and r16 r12
-260	r11 = select r14 r13 r11
-261	r13 = add_i32 r10 r11
-262	r14 = bit_and r9 r12
-263	r11 = select r14 r13 r11
-264	r14 = bit_xor r8 r14
-265	r14 = bit_and r16 r14
-266	r14 = bit_and r12 r14
-267	r14 = bit_or r15 r14
-268	r15 = add_i32 r10 r11
-269	r12 = bit_xor r8 r14
-270	r13 = bit_and r16 r12
-271	r11 = select r13 r15 r11
-272	r15 = add_i32 r10 r11
-273	r9 = bit_and r9 r12
-274	r11 = select r9 r15 r11
+258	r12 = bit_xor r8 r14
+259	r16 = bit_and r15 r12
+260	r11 = select r16 r13 r11
+261	r13 = bit_and r9 r12
+262	r16 = add_i32 r10 r11
+263	r11 = select r13 r16 r11
+264	r13 = bit_xor r8 r13
+265	r13 = bit_and r15 r13
+266	r13 = bit_and r12 r13
+267	r13 = bit_or r14 r13
+268	r14 = add_i32 r10 r11
+269	r12 = bit_xor r8 r13
+270	r16 = bit_and r15 r12
+271	r11 = select r16 r14 r11
+272	r9 = bit_and r9 r12
+273	r14 = add_i32 r10 r11
+274	r11 = select r9 r14 r11
 275	r9 = bit_xor r8 r9
-276	r9 = bit_and r16 r9
+276	r9 = bit_and r15 r9
 277	r9 = bit_and r12 r9
-278	r9 = bit_or r14 r9
+278	r9 = bit_or r13 r9
 279	r10 = add_i32 r10 r11
 280	r9 = bit_xor r8 r9
-281	r9 = bit_and r16 r9
+281	r9 = bit_and r15 r9
 282	r11 = select r9 r10 r11
 283	r10 = splat 14 (2.8025969e-44)
 284	r10 = eq_i32 r11 r10
 285	r10 = bit_and r9 r10
-286	r10 = bit_and r16 r10
+286	r10 = bit_and r15 r10
 287	r4 = select r10 r0 r4
 288	r5 = select r10 r1 r5
 289	r6 = select r10 r2 r6
diff --git a/third_party/skia/tests/sksl/runtime_errors/FirstClassArrays.skvm b/third_party/skia/tests/sksl/runtime_errors/FirstClassArrays.skvm
index 8a47926d2d73a..112163c008bf3 100644
--- a/third_party/skia/tests/sksl/runtime_errors/FirstClassArrays.skvm
+++ b/third_party/skia/tests/sksl/runtime_errors/FirstClassArrays.skvm
@@ -1,4 +1,4 @@
 ### Compilation failed:
 
-error: 5: construction of array type 'float[3]' is not supported
+error: 8: construction of array type 'float[3]' is not supported
 1 error
diff --git a/third_party/skia/tests/sksl/runtime_errors/IllegalIndexing.skvm b/third_party/skia/tests/sksl/runtime_errors/IllegalIndexing.skvm
index aaf54774d1db3..5fc8776672550 100644
--- a/third_party/skia/tests/sksl/runtime_errors/IllegalIndexing.skvm
+++ b/third_party/skia/tests/sksl/runtime_errors/IllegalIndexing.skvm
@@ -1,5 +1,5 @@
 ### Compilation failed:
 
-error: 25: index expression must be constant
-error: 26: index expression must be constant
+error: 23: index expression must be constant
+error: 24: index expression must be constant
 2 errors
diff --git a/third_party/skia/tests/sksl/runtime_errors/IllegalShaderUse.skvm b/third_party/skia/tests/sksl/runtime_errors/IllegalShaderUse.skvm
index 703445afc5085..4039804127858 100644
--- a/third_party/skia/tests/sksl/runtime_errors/IllegalShaderUse.skvm
+++ b/third_party/skia/tests/sksl/runtime_errors/IllegalShaderUse.skvm
@@ -11,5 +11,5 @@ error: 16: functions may not return opaque type 'shader'
 error: 17: cannot construct 'shader'
 error: 18: ternary expression of opaque type 'shader' not allowed
 error: 19: expected '(' to begin method call
-error: 19: expected a type, but found '}'
+error: 19: function 'dangling_eval' can exit without returning a value
 12 errors
diff --git a/third_party/skia/tests/sksl/runtime_errors/Ossfuzz36655.skvm b/third_party/skia/tests/sksl/runtime_errors/Ossfuzz36655.skvm
index 49add91a2acba..e65a7652d9c0e 100644
--- a/third_party/skia/tests/sksl/runtime_errors/Ossfuzz36655.skvm
+++ b/third_party/skia/tests/sksl/runtime_errors/Ossfuzz36655.skvm
@@ -1,12 +1,15 @@
 ### Compilation failed:
 
 error: 2: expected '(' to begin constructor invocation
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 2: expected a declaration, but found ';'
-error: 3: expected a type, but found '}'
-9 errors
+error: 11: expected '(' to begin function call
+error: 17: expected '(' to begin function call
+error: 21: expected '(' to begin function call
+error: 23: expected '(' to begin constructor invocation
+error: 26: expected '(' to begin function call
+error: 32: expected '(' to begin function call
+error: 32: expected '(' to begin function call
+error: 35: expected '(' to begin function call
+error: 39: expected '(' to begin function call
+error: 43: expected '(' to begin constructor invocation
+error: 46: expected '(' to begin function call
+12 errors
diff --git a/third_party/skia/tests/sksl/runtime_errors/TypeAliases.skvm b/third_party/skia/tests/sksl/runtime_errors/TypeAliases.skvm
new file mode 100644
index 0000000000000..a08c4ea88a8e7
--- /dev/null
+++ b/third_party/skia/tests/sksl/runtime_errors/TypeAliases.skvm
@@ -0,0 +1,9 @@
+### Compilation failed:
+
+error: 9: expected 'vec2', but found 'int'
+error: 10: expected 'int', but found 'mat2'
+error: 11: expected 'bvec2', but found 'vec2'
+error: 12: expected 'float2', but found 'vec3'
+error: 13: expected 'mat4', but found 'float3x3'
+error: 14: expected 'vec4', but found 'ivec4'
+6 errors
diff --git a/third_party/skia/tests/sksl/runtime_errors/UnsupportedExtension.skvm b/third_party/skia/tests/sksl/runtime_errors/UnsupportedExtension.skvm
new file mode 100644
index 0000000000000..447ee63e22acd
--- /dev/null
+++ b/third_party/skia/tests/sksl/runtime_errors/UnsupportedExtension.skvm
@@ -0,0 +1,6 @@
+### Compilation failed:
+
+error: 1: unsupported directive '#extension'
+error: 1: no type named 'i'
+error: 1: expected a type, but found ':'
+3 errors
diff --git a/third_party/skia/tests/sksl/shared/ArrayTypes.asm.frag b/third_party/skia/tests/sksl/shared/ArrayTypes.asm.frag
index e0b3cf6ec811f..f49cb87c4999b 100644
--- a/third_party/skia/tests/sksl/shared/ArrayTypes.asm.frag
+++ b/third_party/skia/tests/sksl/shared/ArrayTypes.asm.frag
@@ -20,7 +20,7 @@ OpDecorate %sk_Clockwise BuiltIn FrontFacing
 OpMemberDecorate %S 0 Offset 0
 OpDecorate %_arr_S_int_2 ArrayStride 16
 OpDecorate %_arr_v2float_int_2 ArrayStride 16
-OpDecorate %97 RelaxedPrecision
+OpDecorate %99 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -75,6 +75,7 @@ OpFunctionEnd
 %x = OpVariable %_ptr_Function__arr_v2float_int_2 Function
 %y = OpVariable %_ptr_Function__arr_v2float_int_2 Function
 %z = OpVariable %_ptr_Function__arr_S_int_2 Function
+%52 = OpVariable %_ptr_Function__arr_S_int_2 Function
 %43 = OpAccessChain %_ptr_Function_v2float %x %int_0
 OpStore %43 %17
 %45 = OpAccessChain %_ptr_Function_v2float %x %int_1
@@ -83,51 +84,53 @@ OpStore %45 %44
 OpStore %47 %30
 %50 = OpAccessChain %_ptr_Function_v2float %y %int_1
 OpStore %50 %49
-%52 = OpFunctionCall %void %initialize_vS %z
-%53 = OpAccessChain %_ptr_Function_v2float %x %int_0
-%54 = OpLoad %v2float %53
-%55 = OpCompositeExtract %float %54 0
-%56 = OpAccessChain %_ptr_Function_v2float %x %int_0
-%57 = OpLoad %v2float %56
-%58 = OpCompositeExtract %float %57 1
-%59 = OpFMul %float %55 %58
-%60 = OpAccessChain %_ptr_Function_v2float %z %int_0 %int_0
-%61 = OpLoad %v2float %60
-%62 = OpCompositeExtract %float %61 0
-%63 = OpFAdd %float %59 %62
-%64 = OpAccessChain %_ptr_Function_v2float %x %int_1
-%65 = OpLoad %v2float %64
-%66 = OpCompositeExtract %float %65 0
-%67 = OpAccessChain %_ptr_Function_v2float %x %int_1
-%68 = OpLoad %v2float %67
-%69 = OpCompositeExtract %float %68 1
-%70 = OpAccessChain %_ptr_Function_v2float %z %int_0 %int_0
-%71 = OpLoad %v2float %70
-%72 = OpCompositeExtract %float %71 1
-%73 = OpFMul %float %69 %72
-%74 = OpFSub %float %66 %73
-%75 = OpAccessChain %_ptr_Function_v2float %y %int_0
-%76 = OpLoad %v2float %75
-%77 = OpCompositeExtract %float %76 0
-%78 = OpAccessChain %_ptr_Function_v2float %y %int_0
-%79 = OpLoad %v2float %78
-%80 = OpCompositeExtract %float %79 1
-%81 = OpFDiv %float %77 %80
-%82 = OpAccessChain %_ptr_Function_v2float %z %int_1 %int_0
-%83 = OpLoad %v2float %82
-%84 = OpCompositeExtract %float %83 0
-%85 = OpFDiv %float %81 %84
-%86 = OpAccessChain %_ptr_Function_v2float %y %int_1
-%87 = OpLoad %v2float %86
-%88 = OpCompositeExtract %float %87 0
-%89 = OpAccessChain %_ptr_Function_v2float %y %int_1
-%90 = OpLoad %v2float %89
-%91 = OpCompositeExtract %float %90 1
-%92 = OpAccessChain %_ptr_Function_v2float %z %int_1 %int_0
-%93 = OpLoad %v2float %92
-%94 = OpCompositeExtract %float %93 1
-%95 = OpFMul %float %91 %94
-%96 = OpFAdd %float %88 %95
-%97 = OpCompositeConstruct %v4float %63 %74 %85 %96
-OpReturnValue %97
+%53 = OpFunctionCall %void %initialize_vS %52
+%54 = OpLoad %_arr_S_int_2 %52
+OpStore %z %54
+%55 = OpAccessChain %_ptr_Function_v2float %x %int_0
+%56 = OpLoad %v2float %55
+%57 = OpCompositeExtract %float %56 0
+%58 = OpAccessChain %_ptr_Function_v2float %x %int_0
+%59 = OpLoad %v2float %58
+%60 = OpCompositeExtract %float %59 1
+%61 = OpFMul %float %57 %60
+%62 = OpAccessChain %_ptr_Function_v2float %z %int_0 %int_0
+%63 = OpLoad %v2float %62
+%64 = OpCompositeExtract %float %63 0
+%65 = OpFAdd %float %61 %64
+%66 = OpAccessChain %_ptr_Function_v2float %x %int_1
+%67 = OpLoad %v2float %66
+%68 = OpCompositeExtract %float %67 0
+%69 = OpAccessChain %_ptr_Function_v2float %x %int_1
+%70 = OpLoad %v2float %69
+%71 = OpCompositeExtract %float %70 1
+%72 = OpAccessChain %_ptr_Function_v2float %z %int_0 %int_0
+%73 = OpLoad %v2float %72
+%74 = OpCompositeExtract %float %73 1
+%75 = OpFMul %float %71 %74
+%76 = OpFSub %float %68 %75
+%77 = OpAccessChain %_ptr_Function_v2float %y %int_0
+%78 = OpLoad %v2float %77
+%79 = OpCompositeExtract %float %78 0
+%80 = OpAccessChain %_ptr_Function_v2float %y %int_0
+%81 = OpLoad %v2float %80
+%82 = OpCompositeExtract %float %81 1
+%83 = OpFDiv %float %79 %82
+%84 = OpAccessChain %_ptr_Function_v2float %z %int_1 %int_0
+%85 = OpLoad %v2float %84
+%86 = OpCompositeExtract %float %85 0
+%87 = OpFDiv %float %83 %86
+%88 = OpAccessChain %_ptr_Function_v2float %y %int_1
+%89 = OpLoad %v2float %88
+%90 = OpCompositeExtract %float %89 0
+%91 = OpAccessChain %_ptr_Function_v2float %y %int_1
+%92 = OpLoad %v2float %91
+%93 = OpCompositeExtract %float %92 1
+%94 = OpAccessChain %_ptr_Function_v2float %z %int_1 %int_0
+%95 = OpLoad %v2float %94
+%96 = OpCompositeExtract %float %95 1
+%97 = OpFMul %float %93 %96
+%98 = OpFAdd %float %90 %97
+%99 = OpCompositeConstruct %v4float %65 %76 %87 %98
+OpReturnValue %99
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/CommaSideEffects.asm.frag b/third_party/skia/tests/sksl/shared/CommaSideEffects.asm.frag
index d40cf41ef4744..42da5a8364c0a 100644
--- a/third_party/skia/tests/sksl/shared/CommaSideEffects.asm.frag
+++ b/third_party/skia/tests/sksl/shared/CommaSideEffects.asm.frag
@@ -39,8 +39,8 @@ OpDecorate %c RelaxedPrecision
 OpDecorate %d RelaxedPrecision
 OpDecorate %42 RelaxedPrecision
 OpDecorate %45 RelaxedPrecision
-OpDecorate %49 RelaxedPrecision
-OpDecorate %50 RelaxedPrecision
+OpDecorate %46 RelaxedPrecision
+OpDecorate %48 RelaxedPrecision
 OpDecorate %51 RelaxedPrecision
 OpDecorate %52 RelaxedPrecision
 OpDecorate %53 RelaxedPrecision
@@ -52,17 +52,19 @@ OpDecorate %58 RelaxedPrecision
 OpDecorate %59 RelaxedPrecision
 OpDecorate %60 RelaxedPrecision
 OpDecorate %61 RelaxedPrecision
+OpDecorate %62 RelaxedPrecision
 OpDecorate %63 RelaxedPrecision
 OpDecorate %65 RelaxedPrecision
-OpDecorate %71 RelaxedPrecision
+OpDecorate %67 RelaxedPrecision
 OpDecorate %73 RelaxedPrecision
-OpDecorate %79 RelaxedPrecision
+OpDecorate %75 RelaxedPrecision
 OpDecorate %81 RelaxedPrecision
-OpDecorate %87 RelaxedPrecision
+OpDecorate %83 RelaxedPrecision
 OpDecorate %89 RelaxedPrecision
-OpDecorate %98 RelaxedPrecision
+OpDecorate %91 RelaxedPrecision
 OpDecorate %100 RelaxedPrecision
-OpDecorate %101 RelaxedPrecision
+OpDecorate %102 RelaxedPrecision
+OpDecorate %103 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -113,84 +115,87 @@ OpFunctionEnd
 %b = OpVariable %_ptr_Function_v4float Function
 %c = OpVariable %_ptr_Function_v4float Function
 %d = OpVariable %_ptr_Function_v4float Function
-%93 = OpVariable %_ptr_Function_v4float Function
+%46 = OpVariable %_ptr_Function_v4float Function
+%95 = OpVariable %_ptr_Function_v4float Function
 %40 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
 %42 = OpLoad %v4float %40
 OpStore %b %42
 %43 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
 %45 = OpLoad %v4float %43
 OpStore %c %45
-%46 = OpFunctionCall %void %setToColorBlack_vh4 %d
-%47 = OpAccessChain %_ptr_Uniform_v4float %11 %int_2
-%49 = OpLoad %v4float %47
-OpStore %a %49
-%50 = OpLoad %v4float %a
-%51 = OpLoad %v4float %a
-%52 = OpFMul %v4float %50 %51
-OpStore %a %52
-%53 = OpLoad %v4float %b
-%54 = OpLoad %v4float %b
-%55 = OpFMul %v4float %53 %54
-OpStore %b %55
-%56 = OpLoad %v4float %c
-%57 = OpLoad %v4float %c
-%58 = OpFMul %v4float %56 %57
-OpStore %c %58
-%59 = OpLoad %v4float %d
-%60 = OpLoad %v4float %d
-%61 = OpFMul %v4float %59 %60
-OpStore %d %61
-%63 = OpLoad %v4float %a
-%64 = OpAccessChain %_ptr_Uniform_v4float %11 %int_2
-%65 = OpLoad %v4float %64
-%66 = OpFOrdEqual %v4bool %63 %65
-%68 = OpAll %bool %66
-OpSelectionMerge %70 None
-OpBranchConditional %68 %69 %70
-%69 = OpLabel
-%71 = OpLoad %v4float %b
-%72 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
-%73 = OpLoad %v4float %72
-%74 = OpFOrdEqual %v4bool %71 %73
-%75 = OpAll %bool %74
-OpBranch %70
-%70 = OpLabel
-%76 = OpPhi %bool %false %35 %75 %69
-OpSelectionMerge %78 None
-OpBranchConditional %76 %77 %78
-%77 = OpLabel
-%79 = OpLoad %v4float %c
-%80 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
-%81 = OpLoad %v4float %80
-%82 = OpFOrdEqual %v4bool %79 %81
-%83 = OpAll %bool %82
-OpBranch %78
-%78 = OpLabel
-%84 = OpPhi %bool %false %70 %83 %77
-OpSelectionMerge %86 None
-OpBranchConditional %84 %85 %86
-%85 = OpLabel
-%87 = OpLoad %v4float %d
-%88 = OpAccessChain %_ptr_Uniform_v4float %11 %int_3
-%89 = OpLoad %v4float %88
-%90 = OpFOrdEqual %v4bool %87 %89
-%91 = OpAll %bool %90
-OpBranch %86
-%86 = OpLabel
-%92 = OpPhi %bool %false %78 %91 %85
-OpSelectionMerge %96 None
-OpBranchConditional %92 %94 %95
-%94 = OpLabel
-%97 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
-%98 = OpLoad %v4float %97
-OpStore %93 %98
-OpBranch %96
-%95 = OpLabel
-%99 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
-%100 = OpLoad %v4float %99
-OpStore %93 %100
-OpBranch %96
+%47 = OpFunctionCall %void %setToColorBlack_vh4 %46
+%48 = OpLoad %v4float %46
+OpStore %d %48
+%49 = OpAccessChain %_ptr_Uniform_v4float %11 %int_2
+%51 = OpLoad %v4float %49
+OpStore %a %51
+%52 = OpLoad %v4float %a
+%53 = OpLoad %v4float %a
+%54 = OpFMul %v4float %52 %53
+OpStore %a %54
+%55 = OpLoad %v4float %b
+%56 = OpLoad %v4float %b
+%57 = OpFMul %v4float %55 %56
+OpStore %b %57
+%58 = OpLoad %v4float %c
+%59 = OpLoad %v4float %c
+%60 = OpFMul %v4float %58 %59
+OpStore %c %60
+%61 = OpLoad %v4float %d
+%62 = OpLoad %v4float %d
+%63 = OpFMul %v4float %61 %62
+OpStore %d %63
+%65 = OpLoad %v4float %a
+%66 = OpAccessChain %_ptr_Uniform_v4float %11 %int_2
+%67 = OpLoad %v4float %66
+%68 = OpFOrdEqual %v4bool %65 %67
+%70 = OpAll %bool %68
+OpSelectionMerge %72 None
+OpBranchConditional %70 %71 %72
+%71 = OpLabel
+%73 = OpLoad %v4float %b
+%74 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
+%75 = OpLoad %v4float %74
+%76 = OpFOrdEqual %v4bool %73 %75
+%77 = OpAll %bool %76
+OpBranch %72
+%72 = OpLabel
+%78 = OpPhi %bool %false %35 %77 %71
+OpSelectionMerge %80 None
+OpBranchConditional %78 %79 %80
+%79 = OpLabel
+%81 = OpLoad %v4float %c
+%82 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
+%83 = OpLoad %v4float %82
+%84 = OpFOrdEqual %v4bool %81 %83
+%85 = OpAll %bool %84
+OpBranch %80
+%80 = OpLabel
+%86 = OpPhi %bool %false %72 %85 %79
+OpSelectionMerge %88 None
+OpBranchConditional %86 %87 %88
+%87 = OpLabel
+%89 = OpLoad %v4float %d
+%90 = OpAccessChain %_ptr_Uniform_v4float %11 %int_3
+%91 = OpLoad %v4float %90
+%92 = OpFOrdEqual %v4bool %89 %91
+%93 = OpAll %bool %92
+OpBranch %88
+%88 = OpLabel
+%94 = OpPhi %bool %false %80 %93 %87
+OpSelectionMerge %98 None
+OpBranchConditional %94 %96 %97
 %96 = OpLabel
-%101 = OpLoad %v4float %93
-OpReturnValue %101
+%99 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
+%100 = OpLoad %v4float %99
+OpStore %95 %100
+OpBranch %98
+%97 = OpLabel
+%101 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
+%102 = OpLoad %v4float %101
+OpStore %95 %102
+OpBranch %98
+%98 = OpLabel
+%103 = OpLoad %v4float %95
+OpReturnValue %103
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/CommaSideEffects.glsl b/third_party/skia/tests/sksl/shared/CommaSideEffects.glsl
index 8ad492681b1fe..76691c41ef027 100644
--- a/third_party/skia/tests/sksl/shared/CommaSideEffects.glsl
+++ b/third_party/skia/tests/sksl/shared/CommaSideEffects.glsl
@@ -12,8 +12,8 @@ vec4 main() {
     vec4 b;
     vec4 c;
     vec4 d;
-    (b = colorRed , c = colorGreen);
-    a = (setToColorBlack_vh4(d) , colorWhite);
+    (b = colorRed, c = colorGreen);
+    a = (setToColorBlack_vh4(d), colorWhite);
     a *= a;
     b *= b;
     c *= c;
diff --git a/third_party/skia/tests/sksl/shared/CommaSideEffects.metal b/third_party/skia/tests/sksl/shared/CommaSideEffects.metal
index 7a953431c5d9d..3791975234d85 100644
--- a/third_party/skia/tests/sksl/shared/CommaSideEffects.metal
+++ b/third_party/skia/tests/sksl/shared/CommaSideEffects.metal
@@ -28,8 +28,8 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     half4 b;
     half4 c;
     half4 d;
-    (b = _uniforms.colorRed , c = _uniforms.colorGreen);
-    a = (    _skOutParamHelper0_setToColorBlack_vh4(_uniforms, d) , _uniforms.colorWhite);
+    (b = _uniforms.colorRed, c = _uniforms.colorGreen);
+    a = (    _skOutParamHelper0_setToColorBlack_vh4(_uniforms, d), _uniforms.colorWhite);
     a *= a;
     b *= b;
     c *= c;
diff --git a/third_party/skia/tests/sksl/shared/ComplexDelete.glsl b/third_party/skia/tests/sksl/shared/ComplexDelete.glsl
index d5aea346697ba..1a0d3eb0dd93f 100644
--- a/third_party/skia/tests/sksl/shared/ComplexDelete.glsl
+++ b/third_party/skia/tests/sksl/shared/ComplexDelete.glsl
@@ -4,5 +4,5 @@ uniform mat4 colorXform;
 layout (binding = 0) uniform sampler2D s;
 void main() {
     vec4 tmpColor;
-    sk_FragColor = (tmpColor = texture(s, vec2(1.0)) , colorXform != mat4(1.0) ? vec4(clamp((colorXform * vec4(tmpColor.xyz, 1.0)).xyz, 0.0, tmpColor.w), tmpColor.w) : tmpColor);
+    sk_FragColor = (tmpColor = texture(s, vec2(1.0)), colorXform != mat4(1.0) ? vec4(clamp((colorXform * vec4(tmpColor.xyz, 1.0)).xyz, 0.0, tmpColor.w), tmpColor.w) : tmpColor);
 }
diff --git a/third_party/skia/tests/sksl/shared/ComplexDelete.metal b/third_party/skia/tests/sksl/shared/ComplexDelete.metal
index 4d1de4f866bd8..95f50b1bf9c91 100644
--- a/third_party/skia/tests/sksl/shared/ComplexDelete.metal
+++ b/third_party/skia/tests/sksl/shared/ComplexDelete.metal
@@ -31,6 +31,6 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _unifo
     Outputs _out;
     (void)_out;
     float4 tmpColor;
-    _out.sk_FragColor = (tmpColor = float4(_globals.s.sample(_globals.sSmplr, float2(1.0))) , half4(_uniforms.colorXform != float4x4(1.0) ? float4(clamp((_uniforms.colorXform * float4(tmpColor.xyz, 1.0)).xyz, 0.0, tmpColor.w), tmpColor.w) : tmpColor));
+    _out.sk_FragColor = (tmpColor = float4(_globals.s.sample(_globals.sSmplr, float2(1.0))), half4(_uniforms.colorXform != float4x4(1.0) ? float4(clamp((_uniforms.colorXform * float4(tmpColor.xyz, 1.0)).xyz, 0.0, tmpColor.w), tmpColor.w) : tmpColor));
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.glsl b/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.glsl
index 8c7c38f6349e4..1a71e30301b5c 100644
--- a/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.glsl
+++ b/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.glsl
@@ -5,7 +5,7 @@ vec4 main() {
     {
         float a = 0.0;
         float b = 0.0;
-        for (; a < 10.0 && b < 10.0; (++a , ++b)) {
+        for (; a < 10.0 && b < 10.0; (++a, ++b)) {
             result.x += a;
             result.y += b;
         }
diff --git a/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.metal b/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.metal
index 3e3f64f51bd56..ead9c1341b8e3 100644
--- a/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.metal
+++ b/third_party/skia/tests/sksl/shared/ForLoopMultipleInit.metal
@@ -13,7 +13,7 @@ fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front
     {
         half a = 0.0h;
         half b = 0.0h;
-        for (; a < 10.0h && b < 10.0h; (++a , ++b)) {
+        for (; a < 10.0h && b < 10.0h; (++a, ++b)) {
             result.x = result.x + a;
             result.y = result.y + b;
         }
diff --git a/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.asm.frag b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.asm.frag
new file mode 100644
index 0000000000000..b0a5c350c7bbd
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.asm.frag
@@ -0,0 +1,124 @@
+OpCapability Shader
+%1 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
+OpExecutionMode %_entrypoint_v OriginUpperLeft
+OpName %sk_FragColor "sk_FragColor"
+OpName %sk_Clockwise "sk_Clockwise"
+OpName %_UniformBuffer "_UniformBuffer"
+OpMemberName %_UniformBuffer 0 "colorGreen"
+OpMemberName %_UniformBuffer 1 "colorRed"
+OpName %_entrypoint_v "_entrypoint_v"
+OpName %fnGreen_h4bf2 "fnGreen_h4bf2"
+OpName %S "S"
+OpMemberName %S 0 "i"
+OpName %fnRed_h4ifS "fnRed_h4ifS"
+OpName %main "main"
+OpDecorate %sk_FragColor RelaxedPrecision
+OpDecorate %sk_FragColor Location 0
+OpDecorate %sk_FragColor Index 0
+OpDecorate %sk_Clockwise BuiltIn FrontFacing
+OpMemberDecorate %_UniformBuffer 0 Offset 0
+OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
+OpMemberDecorate %_UniformBuffer 1 Offset 16
+OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
+OpDecorate %_UniformBuffer Block
+OpDecorate %12 Binding 0
+OpDecorate %12 DescriptorSet 0
+OpDecorate %34 RelaxedPrecision
+OpMemberDecorate %S 0 Offset 0
+OpDecorate %46 RelaxedPrecision
+OpDecorate %51 RelaxedPrecision
+OpDecorate %52 RelaxedPrecision
+OpDecorate %71 RelaxedPrecision
+%float = OpTypeFloat 32
+%v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+%sk_FragColor = OpVariable %_ptr_Output_v4float Output
+%bool = OpTypeBool
+%_ptr_Input_bool = OpTypePointer Input %bool
+%sk_Clockwise = OpVariable %_ptr_Input_bool Input
+%_UniformBuffer = OpTypeStruct %v4float %v4float
+%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
+%12 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
+%void = OpTypeVoid
+%17 = OpTypeFunction %void
+%v2float = OpTypeVector %float 2
+%float_0 = OpConstant %float 0
+%21 = OpConstantComposite %v2float %float_0 %float_0
+%_ptr_Function_v2float = OpTypePointer Function %v2float
+%_ptr_Function_bool = OpTypePointer Function %bool
+%25 = OpTypeFunction %v4float %_ptr_Function_bool %_ptr_Function_v2float
+%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
+%int = OpTypeInt 32 1
+%int_0 = OpConstant %int 0
+%S = OpTypeStruct %int
+%_ptr_Function_int = OpTypePointer Function %int
+%_ptr_Function_float = OpTypePointer Function %float
+%_ptr_Function_S = OpTypePointer Function %S
+%36 = OpTypeFunction %v4float %_ptr_Function_int %_ptr_Function_float %_ptr_Function_S
+%int_1 = OpConstant %int 1
+%47 = OpTypeFunction %v4float %_ptr_Function_v2float
+%_ptr_Function_v4float = OpTypePointer Function %v4float
+%true = OpConstantTrue %bool
+%int_123 = OpConstant %int 123
+%float_3_1400001 = OpConstant %float 3.1400001
+%_entrypoint_v = OpFunction %void None %17
+%18 = OpLabel
+%22 = OpVariable %_ptr_Function_v2float Function
+OpStore %22 %21
+%24 = OpFunctionCall %v4float %main %22
+OpStore %sk_FragColor %24
+OpReturn
+OpFunctionEnd
+%fnGreen_h4bf2 = OpFunction %v4float None %25
+%27 = OpFunctionParameter %_ptr_Function_bool
+%28 = OpFunctionParameter %_ptr_Function_v2float
+%29 = OpLabel
+%30 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
+%34 = OpLoad %v4float %30
+OpReturnValue %34
+OpFunctionEnd
+%fnRed_h4ifS = OpFunction %v4float None %36
+%40 = OpFunctionParameter %_ptr_Function_int
+%41 = OpFunctionParameter %_ptr_Function_float
+%42 = OpFunctionParameter %_ptr_Function_S
+%43 = OpLabel
+%44 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
+%46 = OpLoad %v4float %44
+OpReturnValue %46
+OpFunctionEnd
+%main = OpFunction %v4float None %47
+%48 = OpFunctionParameter %_ptr_Function_v2float
+%49 = OpLabel
+%54 = OpVariable %_ptr_Function_v4float Function
+%60 = OpVariable %_ptr_Function_bool Function
+%62 = OpVariable %_ptr_Function_v2float Function
+%65 = OpVariable %_ptr_Function_int Function
+%67 = OpVariable %_ptr_Function_float Function
+%69 = OpVariable %_ptr_Function_S Function
+%50 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
+%51 = OpLoad %v4float %50
+%52 = OpCompositeExtract %float %51 1
+%53 = OpFUnordNotEqual %bool %52 %float_0
+OpSelectionMerge %58 None
+OpBranchConditional %53 %56 %57
+%56 = OpLabel
+OpStore %60 %true
+%61 = OpLoad %v2float %48
+OpStore %62 %61
+%63 = OpFunctionCall %v4float %fnGreen_h4bf2 %60 %62
+OpStore %54 %63
+OpBranch %58
+%57 = OpLabel
+OpStore %65 %int_123
+OpStore %67 %float_3_1400001
+%68 = OpCompositeConstruct %S %int_0
+OpStore %69 %68
+%70 = OpFunctionCall %v4float %fnRed_h4ifS %65 %67 %69
+OpStore %54 %70
+OpBranch %58
+%58 = OpLabel
+%71 = OpLoad %v4float %54
+OpReturnValue %71
+OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.glsl b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.glsl
new file mode 100644
index 0000000000000..53865a405eb96
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.glsl
@@ -0,0 +1,16 @@
+
+out vec4 sk_FragColor;
+uniform vec4 colorGreen;
+uniform vec4 colorRed;
+struct S {
+    int i;
+};
+vec4 fnGreen_h4bf2(bool b, vec2 _skAnonymousParam1) {
+    return colorGreen;
+}
+vec4 fnRed_h4ifS(int _skAnonymousParam0, float f, S _skAnonymousParam2) {
+    return colorRed;
+}
+vec4 main() {
+    return bool(colorGreen.y) ? fnGreen_h4bf2(true, coords) : fnRed_h4ifS(123, 3.1400001049041748, S(0));
+}
diff --git a/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.metal b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.metal
new file mode 100644
index 0000000000000..6d1a68d3d8587
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/FunctionAnonymousParameters.metal
@@ -0,0 +1,27 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+using namespace metal;
+struct S {
+    int i;
+};
+struct Uniforms {
+    half4 colorGreen;
+    half4 colorRed;
+};
+struct Inputs {
+};
+struct Outputs {
+    half4 sk_FragColor [[color(0)]];
+};
+half4 fnGreen_h4bf2(Uniforms _uniforms, bool b, float2 _skAnonymousParam1) {
+    return _uniforms.colorGreen;
+}
+half4 fnRed_h4ifS(Uniforms _uniforms, int _skAnonymousParam0, float f, S _skAnonymousParam2) {
+    return _uniforms.colorRed;
+}
+fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
+    Outputs _out;
+    (void)_out;
+    _out.sk_FragColor = bool(_uniforms.colorGreen.y) ? fnGreen_h4bf2(_uniforms, true, coords) : fnRed_h4ifS(_uniforms, 123, 3.1400001049041748, S{0});
+    return _out;
+}
diff --git a/third_party/skia/tests/sksl/shared/Functions.asm.frag b/third_party/skia/tests/sksl/shared/Functions.asm.frag
index 2d4a24b466135..2735ce225ba79 100644
--- a/third_party/skia/tests/sksl/shared/Functions.asm.frag
+++ b/third_party/skia/tests/sksl/shared/Functions.asm.frag
@@ -26,9 +26,9 @@ OpDecorate %_UniformBuffer Block
 OpDecorate %12 Binding 0
 OpDecorate %12 DescriptorSet 0
 OpDecorate %_arr_float_int_2 ArrayStride 16
-OpDecorate %73 RelaxedPrecision
-OpDecorate %75 RelaxedPrecision
 OpDecorate %76 RelaxedPrecision
+OpDecorate %78 RelaxedPrecision
+OpDecorate %79 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -104,24 +104,29 @@ OpFunctionEnd
 %58 = OpFunctionParameter %_ptr_Function_v2float
 %59 = OpLabel
 %x = OpVariable %_ptr_Function_float Function
-%66 = OpVariable %_ptr_Function_v4float Function
+%63 = OpVariable %_ptr_Function_float Function
+%69 = OpVariable %_ptr_Function_v4float Function
 OpStore %x %float_10
-%62 = OpFunctionCall %void %bar_vf %x
-%63 = OpLoad %float %x
-%65 = OpFOrdEqual %bool %63 %float_200
-OpSelectionMerge %70 None
-OpBranchConditional %65 %68 %69
-%68 = OpLabel
-%71 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
-%73 = OpLoad %v4float %71
-OpStore %66 %73
-OpBranch %70
-%69 = OpLabel
-%74 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
-%75 = OpLoad %v4float %74
-OpStore %66 %75
-OpBranch %70
-%70 = OpLabel
-%76 = OpLoad %v4float %66
-OpReturnValue %76
+%62 = OpLoad %float %x
+OpStore %63 %62
+%64 = OpFunctionCall %void %bar_vf %63
+%65 = OpLoad %float %63
+OpStore %x %65
+%66 = OpLoad %float %x
+%68 = OpFOrdEqual %bool %66 %float_200
+OpSelectionMerge %73 None
+OpBranchConditional %68 %71 %72
+%71 = OpLabel
+%74 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
+%76 = OpLoad %v4float %74
+OpStore %69 %76
+OpBranch %73
+%72 = OpLabel
+%77 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
+%78 = OpLoad %v4float %77
+OpStore %69 %78
+OpBranch %73
+%73 = OpLabel
+%79 = OpLoad %v4float %69
+OpReturnValue %79
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/InoutParameters.asm.frag b/third_party/skia/tests/sksl/shared/InoutParameters.asm.frag
new file mode 100644
index 0000000000000..c5f2a33b3d831
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/InoutParameters.asm.frag
@@ -0,0 +1,141 @@
+OpCapability Shader
+%1 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
+OpExecutionMode %_entrypoint_v OriginUpperLeft
+OpName %sk_FragColor "sk_FragColor"
+OpName %sk_Clockwise "sk_Clockwise"
+OpName %_UniformBuffer "_UniformBuffer"
+OpMemberName %_UniformBuffer 0 "colorGreen"
+OpName %_entrypoint_v "_entrypoint_v"
+OpName %outParameterWrite_vh4 "outParameterWrite_vh4"
+OpName %outParameterWriteIndirect_vh4 "outParameterWriteIndirect_vh4"
+OpName %inoutParameterWrite_vh4 "inoutParameterWrite_vh4"
+OpName %inoutParameterWriteIndirect_vh4 "inoutParameterWriteIndirect_vh4"
+OpName %main "main"
+OpName %c "c"
+OpDecorate %sk_FragColor RelaxedPrecision
+OpDecorate %sk_FragColor Location 0
+OpDecorate %sk_FragColor Index 0
+OpDecorate %sk_Clockwise BuiltIn FrontFacing
+OpMemberDecorate %_UniformBuffer 0 Offset 0
+OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
+OpDecorate %_UniformBuffer Block
+OpDecorate %14 Binding 0
+OpDecorate %14 DescriptorSet 0
+OpDecorate %35 RelaxedPrecision
+OpDecorate %38 RelaxedPrecision
+OpDecorate %40 RelaxedPrecision
+OpDecorate %43 RelaxedPrecision
+OpDecorate %44 RelaxedPrecision
+OpDecorate %45 RelaxedPrecision
+OpDecorate %48 RelaxedPrecision
+OpDecorate %49 RelaxedPrecision
+OpDecorate %51 RelaxedPrecision
+OpDecorate %c RelaxedPrecision
+OpDecorate %56 RelaxedPrecision
+OpDecorate %58 RelaxedPrecision
+OpDecorate %59 RelaxedPrecision
+OpDecorate %61 RelaxedPrecision
+OpDecorate %62 RelaxedPrecision
+OpDecorate %63 RelaxedPrecision
+OpDecorate %65 RelaxedPrecision
+OpDecorate %66 RelaxedPrecision
+OpDecorate %67 RelaxedPrecision
+OpDecorate %69 RelaxedPrecision
+OpDecorate %71 RelaxedPrecision
+%float = OpTypeFloat 32
+%v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+%sk_FragColor = OpVariable %_ptr_Output_v4float Output
+%bool = OpTypeBool
+%_ptr_Input_bool = OpTypePointer Input %bool
+%sk_Clockwise = OpVariable %_ptr_Input_bool Input
+%_UniformBuffer = OpTypeStruct %v4float
+%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
+%14 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
+%void = OpTypeVoid
+%19 = OpTypeFunction %void
+%v2float = OpTypeVector %float 2
+%float_0 = OpConstant %float 0
+%23 = OpConstantComposite %v2float %float_0 %float_0
+%_ptr_Function_v2float = OpTypePointer Function %v2float
+%_ptr_Function_v4float = OpTypePointer Function %v4float
+%27 = OpTypeFunction %void %_ptr_Function_v4float
+%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
+%int = OpTypeInt 32 1
+%int_0 = OpConstant %int 0
+%52 = OpTypeFunction %v4float %_ptr_Function_v2float
+%false = OpConstantFalse %bool
+%_entrypoint_v = OpFunction %void None %19
+%20 = OpLabel
+%24 = OpVariable %_ptr_Function_v2float Function
+OpStore %24 %23
+%26 = OpFunctionCall %v4float %main %24
+OpStore %sk_FragColor %26
+OpReturn
+OpFunctionEnd
+%outParameterWrite_vh4 = OpFunction %void None %27
+%29 = OpFunctionParameter %_ptr_Function_v4float
+%30 = OpLabel
+%31 = OpAccessChain %_ptr_Uniform_v4float %14 %int_0
+%35 = OpLoad %v4float %31
+OpStore %29 %35
+OpReturn
+OpFunctionEnd
+%outParameterWriteIndirect_vh4 = OpFunction %void None %27
+%36 = OpFunctionParameter %_ptr_Function_v4float
+%37 = OpLabel
+%38 = OpVariable %_ptr_Function_v4float Function
+%39 = OpFunctionCall %void %outParameterWrite_vh4 %38
+%40 = OpLoad %v4float %38
+OpStore %36 %40
+OpReturn
+OpFunctionEnd
+%inoutParameterWrite_vh4 = OpFunction %void None %27
+%41 = OpFunctionParameter %_ptr_Function_v4float
+%42 = OpLabel
+%43 = OpLoad %v4float %41
+%44 = OpLoad %v4float %41
+%45 = OpFMul %v4float %43 %44
+OpStore %41 %45
+OpReturn
+OpFunctionEnd
+%inoutParameterWriteIndirect_vh4 = OpFunction %void None %27
+%46 = OpFunctionParameter %_ptr_Function_v4float
+%47 = OpLabel
+%49 = OpVariable %_ptr_Function_v4float Function
+%48 = OpLoad %v4float %46
+OpStore %49 %48
+%50 = OpFunctionCall %void %inoutParameterWrite_vh4 %49
+%51 = OpLoad %v4float %49
+OpStore %46 %51
+OpReturn
+OpFunctionEnd
+%main = OpFunction %v4float None %52
+%53 = OpFunctionParameter %_ptr_Function_v2float
+%54 = OpLabel
+%c = OpVariable %_ptr_Function_v4float Function
+%56 = OpVariable %_ptr_Function_v4float Function
+%59 = OpVariable %_ptr_Function_v4float Function
+%63 = OpVariable %_ptr_Function_v4float Function
+%67 = OpVariable %_ptr_Function_v4float Function
+%57 = OpFunctionCall %void %outParameterWrite_vh4 %56
+%58 = OpLoad %v4float %56
+OpStore %c %58
+%60 = OpFunctionCall %void %outParameterWriteIndirect_vh4 %59
+%61 = OpLoad %v4float %59
+OpStore %c %61
+%62 = OpLoad %v4float %c
+OpStore %63 %62
+%64 = OpFunctionCall %void %inoutParameterWrite_vh4 %63
+%65 = OpLoad %v4float %63
+OpStore %c %65
+%66 = OpLoad %v4float %c
+OpStore %67 %66
+%68 = OpFunctionCall %void %inoutParameterWriteIndirect_vh4 %67
+%69 = OpLoad %v4float %67
+OpStore %c %69
+%71 = OpLoad %v4float %c
+OpReturnValue %71
+OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/inliner/InlineWithInoutArgument.glsl b/third_party/skia/tests/sksl/shared/InoutParameters.glsl
similarity index 94%
rename from third_party/skia/tests/sksl/inliner/InlineWithInoutArgument.glsl
rename to third_party/skia/tests/sksl/shared/InoutParameters.glsl
index 1ff57f773710d..b46a216058744 100644
--- a/third_party/skia/tests/sksl/inliner/InlineWithInoutArgument.glsl
+++ b/third_party/skia/tests/sksl/shared/InoutParameters.glsl
@@ -19,8 +19,5 @@ vec4 main() {
     outParameterWriteIndirect_vh4(c);
     inoutParameterWrite_vh4(c);
     inoutParameterWriteIndirect_vh4(c);
-    false;
-    false;
-    false;
     return c;
 }
diff --git a/third_party/skia/tests/sksl/shared/InoutParameters.metal b/third_party/skia/tests/sksl/shared/InoutParameters.metal
new file mode 100644
index 0000000000000..bdd38aedba5b6
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/InoutParameters.metal
@@ -0,0 +1,70 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+using namespace metal;
+struct Uniforms {
+    half4 colorGreen;
+};
+struct Inputs {
+};
+struct Outputs {
+    half4 sk_FragColor [[color(0)]];
+};
+void outParameterWrite_vh4(Uniforms _uniforms, thread half4& x);
+void _skOutParamHelper0_outParameterWrite_vh4(Uniforms _uniforms, thread half4& c) {
+    half4 _var0;
+    outParameterWrite_vh4(_uniforms, _var0);
+    c = _var0;
+}
+void inoutParameterWrite_vh4(thread half4& x);
+void _skOutParamHelper1_inoutParameterWrite_vh4(thread half4& x) {
+    half4 _var0 = x;
+    inoutParameterWrite_vh4(_var0);
+    x = _var0;
+}
+void outParameterWrite_vh4(Uniforms _uniforms, thread half4& x);
+void _skOutParamHelper2_outParameterWrite_vh4(Uniforms _uniforms, thread half4& c) {
+    half4 _var0;
+    outParameterWrite_vh4(_uniforms, _var0);
+    c = _var0;
+}
+void outParameterWriteIndirect_vh4(Uniforms _uniforms, thread half4& c);
+void _skOutParamHelper3_outParameterWriteIndirect_vh4(Uniforms _uniforms, thread half4& c) {
+    half4 _var0;
+    outParameterWriteIndirect_vh4(_uniforms, _var0);
+    c = _var0;
+}
+void inoutParameterWrite_vh4(thread half4& x);
+void _skOutParamHelper4_inoutParameterWrite_vh4(thread half4& c) {
+    half4 _var0 = c;
+    inoutParameterWrite_vh4(_var0);
+    c = _var0;
+}
+void inoutParameterWriteIndirect_vh4(thread half4& x);
+void _skOutParamHelper5_inoutParameterWriteIndirect_vh4(thread half4& c) {
+    half4 _var0 = c;
+    inoutParameterWriteIndirect_vh4(_var0);
+    c = _var0;
+}
+void outParameterWrite_vh4(Uniforms _uniforms, thread half4& x) {
+    x = _uniforms.colorGreen;
+}
+void outParameterWriteIndirect_vh4(Uniforms _uniforms, thread half4& c) {
+    _skOutParamHelper0_outParameterWrite_vh4(_uniforms, c);
+}
+void inoutParameterWrite_vh4(thread half4& x) {
+    x *= x;
+}
+void inoutParameterWriteIndirect_vh4(thread half4& x) {
+    _skOutParamHelper1_inoutParameterWrite_vh4(x);
+}
+fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
+    Outputs _out;
+    (void)_out;
+    half4 c;
+    _skOutParamHelper2_outParameterWrite_vh4(_uniforms, c);
+    _skOutParamHelper3_outParameterWriteIndirect_vh4(_uniforms, c);
+    _skOutParamHelper4_inoutParameterWrite_vh4(c);
+    _skOutParamHelper5_inoutParameterWriteIndirect_vh4(c);
+    _out.sk_FragColor = c;
+    return _out;
+}
diff --git a/third_party/skia/tests/sksl/shared/Matrices.asm.frag b/third_party/skia/tests/sksl/shared/Matrices.asm.frag
index b6aabc759a0a0..ac798d3bdf689 100644
--- a/third_party/skia/tests/sksl/shared/Matrices.asm.frag
+++ b/third_party/skia/tests/sksl/shared/Matrices.asm.frag
@@ -163,20 +163,20 @@ OpDecorate %299 RelaxedPrecision
 OpDecorate %300 RelaxedPrecision
 OpDecorate %301 RelaxedPrecision
 OpDecorate %322 RelaxedPrecision
-OpDecorate %353 RelaxedPrecision
-OpDecorate %372 RelaxedPrecision
-OpDecorate %393 RelaxedPrecision
-OpDecorate %413 RelaxedPrecision
-OpDecorate %437 RelaxedPrecision
-OpDecorate %463 RelaxedPrecision
-OpDecorate %484 RelaxedPrecision
-OpDecorate %506 RelaxedPrecision
-OpDecorate %535 RelaxedPrecision
-OpDecorate %585 RelaxedPrecision
-OpDecorate %614 RelaxedPrecision
+OpDecorate %351 RelaxedPrecision
+OpDecorate %370 RelaxedPrecision
+OpDecorate %391 RelaxedPrecision
+OpDecorate %411 RelaxedPrecision
+OpDecorate %435 RelaxedPrecision
+OpDecorate %461 RelaxedPrecision
+OpDecorate %482 RelaxedPrecision
+OpDecorate %504 RelaxedPrecision
+OpDecorate %533 RelaxedPrecision
+OpDecorate %583 RelaxedPrecision
+OpDecorate %612 RelaxedPrecision
+OpDecorate %629 RelaxedPrecision
 OpDecorate %631 RelaxedPrecision
-OpDecorate %633 RelaxedPrecision
-OpDecorate %634 RelaxedPrecision
+OpDecorate %632 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -223,8 +223,7 @@ OpDecorate %634 RelaxedPrecision
 %float_11 = OpConstant %float 11
 %v4bool = OpTypeVector %bool 4
 %float_20 = OpConstant %float 20
-%float_0_5 = OpConstant %float 0.5
-%345 = OpTypeFunction %v4float %_ptr_Function_v2float
+%343 = OpTypeFunction %v4float %_ptr_Function_v2float
 %_ptr_Function_v4float = OpTypePointer Function %v4float
 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
 %int_0 = OpConstant %int 0
@@ -567,27 +566,26 @@ OpFunctionEnd
 %327 = OpCompositeConstruct %v2float %float_3 %float_4
 %328 = OpCompositeConstruct %mat2v2float %326 %327
 OpStore %x %328
-%330 = OpCompositeConstruct %v2float %float_2 %float_4
-%331 = OpCompositeConstruct %v2float %float_6 %float_8
-%332 = OpCompositeConstruct %mat2v2float %330 %331
-%333 = OpMatrixTimesScalar %mat2v2float %332 %float_0_5
-OpStore %y %333
-%334 = OpLoad %mat2v2float %x
-%335 = OpLoad %mat2v2float %y
-%336 = OpCompositeExtract %v2float %334 0
-%337 = OpCompositeExtract %v2float %335 0
-%338 = OpFOrdEqual %v2bool %336 %337
-%339 = OpAll %bool %338
-%340 = OpCompositeExtract %v2float %334 1
-%341 = OpCompositeExtract %v2float %335 1
-%342 = OpFOrdEqual %v2bool %340 %341
-%343 = OpAll %bool %342
-%344 = OpLogicalAnd %bool %339 %343
-OpReturnValue %344
+%329 = OpCompositeConstruct %v2float %float_1 %float_2
+%330 = OpCompositeConstruct %v2float %float_3 %float_4
+%331 = OpCompositeConstruct %mat2v2float %329 %330
+OpStore %y %331
+%332 = OpLoad %mat2v2float %x
+%333 = OpLoad %mat2v2float %y
+%334 = OpCompositeExtract %v2float %332 0
+%335 = OpCompositeExtract %v2float %333 0
+%336 = OpFOrdEqual %v2bool %334 %335
+%337 = OpAll %bool %336
+%338 = OpCompositeExtract %v2float %332 1
+%339 = OpCompositeExtract %v2float %333 1
+%340 = OpFOrdEqual %v2bool %338 %339
+%341 = OpAll %bool %340
+%342 = OpLogicalAnd %bool %337 %341
+OpReturnValue %342
 OpFunctionEnd
-%main = OpFunction %v4float None %345
-%346 = OpFunctionParameter %_ptr_Function_v2float
-%347 = OpLabel
+%main = OpFunction %v4float None %343
+%344 = OpFunctionParameter %_ptr_Function_v2float
+%345 = OpLabel
 %_0_ok = OpVariable %_ptr_Function_bool Function
 %_1_m1 = OpVariable %_ptr_Function_mat2v2float Function
 %_2_m3 = OpVariable %_ptr_Function_mat2v2float Function
@@ -597,344 +595,344 @@ OpFunctionEnd
 %_6_m9 = OpVariable %_ptr_Function_mat3v3float Function
 %_7_m10 = OpVariable %_ptr_Function_mat4v4float Function
 %_8_m11 = OpVariable %_ptr_Function_mat4v4float Function
-%623 = OpVariable %_ptr_Function_v4float Function
+%621 = OpVariable %_ptr_Function_v4float Function
 OpStore %_0_ok %true
-%350 = OpCompositeConstruct %v2float %float_1 %float_2
-%351 = OpCompositeConstruct %v2float %float_3 %float_4
-%352 = OpCompositeConstruct %mat2v2float %350 %351
-OpStore %_1_m1 %352
-%353 = OpLoad %bool %_0_ok
-OpSelectionMerge %355 None
-OpBranchConditional %353 %354 %355
-%354 = OpLabel
-%356 = OpLoad %mat2v2float %_1_m1
-%357 = OpCompositeConstruct %v2float %float_1 %float_2
-%358 = OpCompositeConstruct %v2float %float_3 %float_4
-%359 = OpCompositeConstruct %mat2v2float %357 %358
-%360 = OpCompositeExtract %v2float %356 0
-%361 = OpCompositeExtract %v2float %359 0
-%362 = OpFOrdEqual %v2bool %360 %361
-%363 = OpAll %bool %362
-%364 = OpCompositeExtract %v2float %356 1
-%365 = OpCompositeExtract %v2float %359 1
-%366 = OpFOrdEqual %v2bool %364 %365
-%367 = OpAll %bool %366
-%368 = OpLogicalAnd %bool %363 %367
-OpBranch %355
-%355 = OpLabel
-%369 = OpPhi %bool %false %347 %368 %354
-OpStore %_0_ok %369
-%371 = OpLoad %mat2v2float %_1_m1
-OpStore %_2_m3 %371
-%372 = OpLoad %bool %_0_ok
-OpSelectionMerge %374 None
-OpBranchConditional %372 %373 %374
-%373 = OpLabel
-%375 = OpLoad %mat2v2float %_2_m3
-%376 = OpCompositeConstruct %v2float %float_1 %float_2
-%377 = OpCompositeConstruct %v2float %float_3 %float_4
-%378 = OpCompositeConstruct %mat2v2float %376 %377
-%379 = OpCompositeExtract %v2float %375 0
-%380 = OpCompositeExtract %v2float %378 0
-%381 = OpFOrdEqual %v2bool %379 %380
-%382 = OpAll %bool %381
-%383 = OpCompositeExtract %v2float %375 1
-%384 = OpCompositeExtract %v2float %378 1
-%385 = OpFOrdEqual %v2bool %383 %384
-%386 = OpAll %bool %385
-%387 = OpLogicalAnd %bool %382 %386
-OpBranch %374
-%374 = OpLabel
-%388 = OpPhi %bool %false %355 %387 %373
-OpStore %_0_ok %388
-%391 = OpCompositeConstruct %v2float %float_6 %float_0
-%392 = OpCompositeConstruct %v2float %float_0 %float_6
-%390 = OpCompositeConstruct %mat2v2float %391 %392
-OpStore %_3_m4 %390
-%393 = OpLoad %bool %_0_ok
-OpSelectionMerge %395 None
-OpBranchConditional %393 %394 %395
-%394 = OpLabel
-%396 = OpLoad %mat2v2float %_3_m4
-%397 = OpCompositeConstruct %v2float %float_6 %float_0
-%398 = OpCompositeConstruct %v2float %float_0 %float_6
-%399 = OpCompositeConstruct %mat2v2float %397 %398
-%400 = OpCompositeExtract %v2float %396 0
-%401 = OpCompositeExtract %v2float %399 0
-%402 = OpFOrdEqual %v2bool %400 %401
-%403 = OpAll %bool %402
-%404 = OpCompositeExtract %v2float %396 1
-%405 = OpCompositeExtract %v2float %399 1
-%406 = OpFOrdEqual %v2bool %404 %405
-%407 = OpAll %bool %406
-%408 = OpLogicalAnd %bool %403 %407
-OpBranch %395
-%395 = OpLabel
-%409 = OpPhi %bool %false %374 %408 %394
-OpStore %_0_ok %409
-%410 = OpLoad %mat2v2float %_2_m3
-%411 = OpLoad %mat2v2float %_3_m4
-%412 = OpMatrixTimesMatrix %mat2v2float %410 %411
-OpStore %_2_m3 %412
-%413 = OpLoad %bool %_0_ok
-OpSelectionMerge %415 None
-OpBranchConditional %413 %414 %415
-%414 = OpLabel
-%416 = OpLoad %mat2v2float %_2_m3
-%417 = OpCompositeConstruct %v2float %float_6 %float_12
-%418 = OpCompositeConstruct %v2float %float_18 %float_24
-%419 = OpCompositeConstruct %mat2v2float %417 %418
-%420 = OpCompositeExtract %v2float %416 0
-%421 = OpCompositeExtract %v2float %419 0
-%422 = OpFOrdEqual %v2bool %420 %421
-%423 = OpAll %bool %422
-%424 = OpCompositeExtract %v2float %416 1
-%425 = OpCompositeExtract %v2float %419 1
-%426 = OpFOrdEqual %v2bool %424 %425
-%427 = OpAll %bool %426
-%428 = OpLogicalAnd %bool %423 %427
-OpBranch %415
-%415 = OpLabel
-%429 = OpPhi %bool %false %395 %428 %414
-OpStore %_0_ok %429
-%431 = OpAccessChain %_ptr_Function_v2float %_1_m1 %int_1
-%432 = OpLoad %v2float %431
-%433 = OpCompositeExtract %float %432 1
-%435 = OpCompositeConstruct %v2float %433 %float_0
-%436 = OpCompositeConstruct %v2float %float_0 %433
-%434 = OpCompositeConstruct %mat2v2float %435 %436
-OpStore %_4_m5 %434
-%437 = OpLoad %bool %_0_ok
-OpSelectionMerge %439 None
-OpBranchConditional %437 %438 %439
-%438 = OpLabel
-%440 = OpLoad %mat2v2float %_4_m5
-%441 = OpCompositeConstruct %v2float %float_4 %float_0
-%442 = OpCompositeConstruct %v2float %float_0 %float_4
-%443 = OpCompositeConstruct %mat2v2float %441 %442
-%444 = OpCompositeExtract %v2float %440 0
-%445 = OpCompositeExtract %v2float %443 0
-%446 = OpFOrdEqual %v2bool %444 %445
-%447 = OpAll %bool %446
-%448 = OpCompositeExtract %v2float %440 1
-%449 = OpCompositeExtract %v2float %443 1
-%450 = OpFOrdEqual %v2bool %448 %449
-%451 = OpAll %bool %450
-%452 = OpLogicalAnd %bool %447 %451
-OpBranch %439
-%439 = OpLabel
-%453 = OpPhi %bool %false %415 %452 %438
-OpStore %_0_ok %453
-%454 = OpLoad %mat2v2float %_1_m1
-%455 = OpLoad %mat2v2float %_4_m5
-%456 = OpCompositeExtract %v2float %454 0
-%457 = OpCompositeExtract %v2float %455 0
-%458 = OpFAdd %v2float %456 %457
-%459 = OpCompositeExtract %v2float %454 1
-%460 = OpCompositeExtract %v2float %455 1
-%461 = OpFAdd %v2float %459 %460
-%462 = OpCompositeConstruct %mat2v2float %458 %461
-OpStore %_1_m1 %462
-%463 = OpLoad %bool %_0_ok
-OpSelectionMerge %465 None
-OpBranchConditional %463 %464 %465
-%464 = OpLabel
-%466 = OpLoad %mat2v2float %_1_m1
-%467 = OpCompositeConstruct %v2float %float_5 %float_2
-%468 = OpCompositeConstruct %v2float %float_3 %float_8
-%469 = OpCompositeConstruct %mat2v2float %467 %468
-%470 = OpCompositeExtract %v2float %466 0
-%471 = OpCompositeExtract %v2float %469 0
-%472 = OpFOrdEqual %v2bool %470 %471
-%473 = OpAll %bool %472
-%474 = OpCompositeExtract %v2float %466 1
-%475 = OpCompositeExtract %v2float %469 1
-%476 = OpFOrdEqual %v2bool %474 %475
-%477 = OpAll %bool %476
-%478 = OpLogicalAnd %bool %473 %477
-OpBranch %465
-%465 = OpLabel
-%479 = OpPhi %bool %false %439 %478 %464
-OpStore %_0_ok %479
-%481 = OpCompositeConstruct %v2float %float_5 %float_6
-%482 = OpCompositeConstruct %v2float %float_7 %float_8
-%483 = OpCompositeConstruct %mat2v2float %481 %482
-OpStore %_5_m7 %483
-%484 = OpLoad %bool %_0_ok
-OpSelectionMerge %486 None
-OpBranchConditional %484 %485 %486
-%485 = OpLabel
-%487 = OpLoad %mat2v2float %_5_m7
-%488 = OpCompositeConstruct %v2float %float_5 %float_6
-%489 = OpCompositeConstruct %v2float %float_7 %float_8
-%490 = OpCompositeConstruct %mat2v2float %488 %489
-%491 = OpCompositeExtract %v2float %487 0
-%492 = OpCompositeExtract %v2float %490 0
-%493 = OpFOrdEqual %v2bool %491 %492
-%494 = OpAll %bool %493
-%495 = OpCompositeExtract %v2float %487 1
-%496 = OpCompositeExtract %v2float %490 1
-%497 = OpFOrdEqual %v2bool %495 %496
-%498 = OpAll %bool %497
-%499 = OpLogicalAnd %bool %494 %498
-OpBranch %486
-%486 = OpLabel
-%500 = OpPhi %bool %false %465 %499 %485
-OpStore %_0_ok %500
-%503 = OpCompositeConstruct %v3float %float_9 %float_0 %float_0
-%504 = OpCompositeConstruct %v3float %float_0 %float_9 %float_0
-%505 = OpCompositeConstruct %v3float %float_0 %float_0 %float_9
-%502 = OpCompositeConstruct %mat3v3float %503 %504 %505
-OpStore %_6_m9 %502
-%506 = OpLoad %bool %_0_ok
-OpSelectionMerge %508 None
-OpBranchConditional %506 %507 %508
-%507 = OpLabel
-%509 = OpLoad %mat3v3float %_6_m9
-%510 = OpCompositeConstruct %v3float %float_9 %float_0 %float_0
-%511 = OpCompositeConstruct %v3float %float_0 %float_9 %float_0
-%512 = OpCompositeConstruct %v3float %float_0 %float_0 %float_9
-%513 = OpCompositeConstruct %mat3v3float %510 %511 %512
-%514 = OpCompositeExtract %v3float %509 0
-%515 = OpCompositeExtract %v3float %513 0
-%516 = OpFOrdEqual %v3bool %514 %515
-%517 = OpAll %bool %516
-%518 = OpCompositeExtract %v3float %509 1
-%519 = OpCompositeExtract %v3float %513 1
-%520 = OpFOrdEqual %v3bool %518 %519
-%521 = OpAll %bool %520
-%522 = OpLogicalAnd %bool %517 %521
-%523 = OpCompositeExtract %v3float %509 2
-%524 = OpCompositeExtract %v3float %513 2
-%525 = OpFOrdEqual %v3bool %523 %524
-%526 = OpAll %bool %525
-%527 = OpLogicalAnd %bool %522 %526
-OpBranch %508
-%508 = OpLabel
-%528 = OpPhi %bool %false %486 %527 %507
-OpStore %_0_ok %528
-%531 = OpCompositeConstruct %v4float %float_11 %float_0 %float_0 %float_0
-%532 = OpCompositeConstruct %v4float %float_0 %float_11 %float_0 %float_0
-%533 = OpCompositeConstruct %v4float %float_0 %float_0 %float_11 %float_0
-%534 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_11
-%530 = OpCompositeConstruct %mat4v4float %531 %532 %533 %534
-OpStore %_7_m10 %530
-%535 = OpLoad %bool %_0_ok
-OpSelectionMerge %537 None
-OpBranchConditional %535 %536 %537
-%536 = OpLabel
-%538 = OpLoad %mat4v4float %_7_m10
-%539 = OpCompositeConstruct %v4float %float_11 %float_0 %float_0 %float_0
-%540 = OpCompositeConstruct %v4float %float_0 %float_11 %float_0 %float_0
-%541 = OpCompositeConstruct %v4float %float_0 %float_0 %float_11 %float_0
-%542 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_11
-%543 = OpCompositeConstruct %mat4v4float %539 %540 %541 %542
-%544 = OpCompositeExtract %v4float %538 0
-%545 = OpCompositeExtract %v4float %543 0
-%546 = OpFOrdEqual %v4bool %544 %545
-%547 = OpAll %bool %546
-%548 = OpCompositeExtract %v4float %538 1
-%549 = OpCompositeExtract %v4float %543 1
-%550 = OpFOrdEqual %v4bool %548 %549
-%551 = OpAll %bool %550
-%552 = OpLogicalAnd %bool %547 %551
-%553 = OpCompositeExtract %v4float %538 2
-%554 = OpCompositeExtract %v4float %543 2
-%555 = OpFOrdEqual %v4bool %553 %554
-%556 = OpAll %bool %555
-%557 = OpLogicalAnd %bool %552 %556
-%558 = OpCompositeExtract %v4float %538 3
-%559 = OpCompositeExtract %v4float %543 3
-%560 = OpFOrdEqual %v4bool %558 %559
-%561 = OpAll %bool %560
-%562 = OpLogicalAnd %bool %557 %561
-OpBranch %537
-%537 = OpLabel
-%563 = OpPhi %bool %false %508 %562 %536
-OpStore %_0_ok %563
+%348 = OpCompositeConstruct %v2float %float_1 %float_2
+%349 = OpCompositeConstruct %v2float %float_3 %float_4
+%350 = OpCompositeConstruct %mat2v2float %348 %349
+OpStore %_1_m1 %350
+%351 = OpLoad %bool %_0_ok
+OpSelectionMerge %353 None
+OpBranchConditional %351 %352 %353
+%352 = OpLabel
+%354 = OpLoad %mat2v2float %_1_m1
+%355 = OpCompositeConstruct %v2float %float_1 %float_2
+%356 = OpCompositeConstruct %v2float %float_3 %float_4
+%357 = OpCompositeConstruct %mat2v2float %355 %356
+%358 = OpCompositeExtract %v2float %354 0
+%359 = OpCompositeExtract %v2float %357 0
+%360 = OpFOrdEqual %v2bool %358 %359
+%361 = OpAll %bool %360
+%362 = OpCompositeExtract %v2float %354 1
+%363 = OpCompositeExtract %v2float %357 1
+%364 = OpFOrdEqual %v2bool %362 %363
+%365 = OpAll %bool %364
+%366 = OpLogicalAnd %bool %361 %365
+OpBranch %353
+%353 = OpLabel
+%367 = OpPhi %bool %false %345 %366 %352
+OpStore %_0_ok %367
+%369 = OpLoad %mat2v2float %_1_m1
+OpStore %_2_m3 %369
+%370 = OpLoad %bool %_0_ok
+OpSelectionMerge %372 None
+OpBranchConditional %370 %371 %372
+%371 = OpLabel
+%373 = OpLoad %mat2v2float %_2_m3
+%374 = OpCompositeConstruct %v2float %float_1 %float_2
+%375 = OpCompositeConstruct %v2float %float_3 %float_4
+%376 = OpCompositeConstruct %mat2v2float %374 %375
+%377 = OpCompositeExtract %v2float %373 0
+%378 = OpCompositeExtract %v2float %376 0
+%379 = OpFOrdEqual %v2bool %377 %378
+%380 = OpAll %bool %379
+%381 = OpCompositeExtract %v2float %373 1
+%382 = OpCompositeExtract %v2float %376 1
+%383 = OpFOrdEqual %v2bool %381 %382
+%384 = OpAll %bool %383
+%385 = OpLogicalAnd %bool %380 %384
+OpBranch %372
+%372 = OpLabel
+%386 = OpPhi %bool %false %353 %385 %371
+OpStore %_0_ok %386
+%389 = OpCompositeConstruct %v2float %float_6 %float_0
+%390 = OpCompositeConstruct %v2float %float_0 %float_6
+%388 = OpCompositeConstruct %mat2v2float %389 %390
+OpStore %_3_m4 %388
+%391 = OpLoad %bool %_0_ok
+OpSelectionMerge %393 None
+OpBranchConditional %391 %392 %393
+%392 = OpLabel
+%394 = OpLoad %mat2v2float %_3_m4
+%395 = OpCompositeConstruct %v2float %float_6 %float_0
+%396 = OpCompositeConstruct %v2float %float_0 %float_6
+%397 = OpCompositeConstruct %mat2v2float %395 %396
+%398 = OpCompositeExtract %v2float %394 0
+%399 = OpCompositeExtract %v2float %397 0
+%400 = OpFOrdEqual %v2bool %398 %399
+%401 = OpAll %bool %400
+%402 = OpCompositeExtract %v2float %394 1
+%403 = OpCompositeExtract %v2float %397 1
+%404 = OpFOrdEqual %v2bool %402 %403
+%405 = OpAll %bool %404
+%406 = OpLogicalAnd %bool %401 %405
+OpBranch %393
+%393 = OpLabel
+%407 = OpPhi %bool %false %372 %406 %392
+OpStore %_0_ok %407
+%408 = OpLoad %mat2v2float %_2_m3
+%409 = OpLoad %mat2v2float %_3_m4
+%410 = OpMatrixTimesMatrix %mat2v2float %408 %409
+OpStore %_2_m3 %410
+%411 = OpLoad %bool %_0_ok
+OpSelectionMerge %413 None
+OpBranchConditional %411 %412 %413
+%412 = OpLabel
+%414 = OpLoad %mat2v2float %_2_m3
+%415 = OpCompositeConstruct %v2float %float_6 %float_12
+%416 = OpCompositeConstruct %v2float %float_18 %float_24
+%417 = OpCompositeConstruct %mat2v2float %415 %416
+%418 = OpCompositeExtract %v2float %414 0
+%419 = OpCompositeExtract %v2float %417 0
+%420 = OpFOrdEqual %v2bool %418 %419
+%421 = OpAll %bool %420
+%422 = OpCompositeExtract %v2float %414 1
+%423 = OpCompositeExtract %v2float %417 1
+%424 = OpFOrdEqual %v2bool %422 %423
+%425 = OpAll %bool %424
+%426 = OpLogicalAnd %bool %421 %425
+OpBranch %413
+%413 = OpLabel
+%427 = OpPhi %bool %false %393 %426 %412
+OpStore %_0_ok %427
+%429 = OpAccessChain %_ptr_Function_v2float %_1_m1 %int_1
+%430 = OpLoad %v2float %429
+%431 = OpCompositeExtract %float %430 1
+%433 = OpCompositeConstruct %v2float %431 %float_0
+%434 = OpCompositeConstruct %v2float %float_0 %431
+%432 = OpCompositeConstruct %mat2v2float %433 %434
+OpStore %_4_m5 %432
+%435 = OpLoad %bool %_0_ok
+OpSelectionMerge %437 None
+OpBranchConditional %435 %436 %437
+%436 = OpLabel
+%438 = OpLoad %mat2v2float %_4_m5
+%439 = OpCompositeConstruct %v2float %float_4 %float_0
+%440 = OpCompositeConstruct %v2float %float_0 %float_4
+%441 = OpCompositeConstruct %mat2v2float %439 %440
+%442 = OpCompositeExtract %v2float %438 0
+%443 = OpCompositeExtract %v2float %441 0
+%444 = OpFOrdEqual %v2bool %442 %443
+%445 = OpAll %bool %444
+%446 = OpCompositeExtract %v2float %438 1
+%447 = OpCompositeExtract %v2float %441 1
+%448 = OpFOrdEqual %v2bool %446 %447
+%449 = OpAll %bool %448
+%450 = OpLogicalAnd %bool %445 %449
+OpBranch %437
+%437 = OpLabel
+%451 = OpPhi %bool %false %413 %450 %436
+OpStore %_0_ok %451
+%452 = OpLoad %mat2v2float %_1_m1
+%453 = OpLoad %mat2v2float %_4_m5
+%454 = OpCompositeExtract %v2float %452 0
+%455 = OpCompositeExtract %v2float %453 0
+%456 = OpFAdd %v2float %454 %455
+%457 = OpCompositeExtract %v2float %452 1
+%458 = OpCompositeExtract %v2float %453 1
+%459 = OpFAdd %v2float %457 %458
+%460 = OpCompositeConstruct %mat2v2float %456 %459
+OpStore %_1_m1 %460
+%461 = OpLoad %bool %_0_ok
+OpSelectionMerge %463 None
+OpBranchConditional %461 %462 %463
+%462 = OpLabel
+%464 = OpLoad %mat2v2float %_1_m1
+%465 = OpCompositeConstruct %v2float %float_5 %float_2
+%466 = OpCompositeConstruct %v2float %float_3 %float_8
+%467 = OpCompositeConstruct %mat2v2float %465 %466
+%468 = OpCompositeExtract %v2float %464 0
+%469 = OpCompositeExtract %v2float %467 0
+%470 = OpFOrdEqual %v2bool %468 %469
+%471 = OpAll %bool %470
+%472 = OpCompositeExtract %v2float %464 1
+%473 = OpCompositeExtract %v2float %467 1
+%474 = OpFOrdEqual %v2bool %472 %473
+%475 = OpAll %bool %474
+%476 = OpLogicalAnd %bool %471 %475
+OpBranch %463
+%463 = OpLabel
+%477 = OpPhi %bool %false %437 %476 %462
+OpStore %_0_ok %477
+%479 = OpCompositeConstruct %v2float %float_5 %float_6
+%480 = OpCompositeConstruct %v2float %float_7 %float_8
+%481 = OpCompositeConstruct %mat2v2float %479 %480
+OpStore %_5_m7 %481
+%482 = OpLoad %bool %_0_ok
+OpSelectionMerge %484 None
+OpBranchConditional %482 %483 %484
+%483 = OpLabel
+%485 = OpLoad %mat2v2float %_5_m7
+%486 = OpCompositeConstruct %v2float %float_5 %float_6
+%487 = OpCompositeConstruct %v2float %float_7 %float_8
+%488 = OpCompositeConstruct %mat2v2float %486 %487
+%489 = OpCompositeExtract %v2float %485 0
+%490 = OpCompositeExtract %v2float %488 0
+%491 = OpFOrdEqual %v2bool %489 %490
+%492 = OpAll %bool %491
+%493 = OpCompositeExtract %v2float %485 1
+%494 = OpCompositeExtract %v2float %488 1
+%495 = OpFOrdEqual %v2bool %493 %494
+%496 = OpAll %bool %495
+%497 = OpLogicalAnd %bool %492 %496
+OpBranch %484
+%484 = OpLabel
+%498 = OpPhi %bool %false %463 %497 %483
+OpStore %_0_ok %498
+%501 = OpCompositeConstruct %v3float %float_9 %float_0 %float_0
+%502 = OpCompositeConstruct %v3float %float_0 %float_9 %float_0
+%503 = OpCompositeConstruct %v3float %float_0 %float_0 %float_9
+%500 = OpCompositeConstruct %mat3v3float %501 %502 %503
+OpStore %_6_m9 %500
+%504 = OpLoad %bool %_0_ok
+OpSelectionMerge %506 None
+OpBranchConditional %504 %505 %506
+%505 = OpLabel
+%507 = OpLoad %mat3v3float %_6_m9
+%508 = OpCompositeConstruct %v3float %float_9 %float_0 %float_0
+%509 = OpCompositeConstruct %v3float %float_0 %float_9 %float_0
+%510 = OpCompositeConstruct %v3float %float_0 %float_0 %float_9
+%511 = OpCompositeConstruct %mat3v3float %508 %509 %510
+%512 = OpCompositeExtract %v3float %507 0
+%513 = OpCompositeExtract %v3float %511 0
+%514 = OpFOrdEqual %v3bool %512 %513
+%515 = OpAll %bool %514
+%516 = OpCompositeExtract %v3float %507 1
+%517 = OpCompositeExtract %v3float %511 1
+%518 = OpFOrdEqual %v3bool %516 %517
+%519 = OpAll %bool %518
+%520 = OpLogicalAnd %bool %515 %519
+%521 = OpCompositeExtract %v3float %507 2
+%522 = OpCompositeExtract %v3float %511 2
+%523 = OpFOrdEqual %v3bool %521 %522
+%524 = OpAll %bool %523
+%525 = OpLogicalAnd %bool %520 %524
+OpBranch %506
+%506 = OpLabel
+%526 = OpPhi %bool %false %484 %525 %505
+OpStore %_0_ok %526
+%529 = OpCompositeConstruct %v4float %float_11 %float_0 %float_0 %float_0
+%530 = OpCompositeConstruct %v4float %float_0 %float_11 %float_0 %float_0
+%531 = OpCompositeConstruct %v4float %float_0 %float_0 %float_11 %float_0
+%532 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_11
+%528 = OpCompositeConstruct %mat4v4float %529 %530 %531 %532
+OpStore %_7_m10 %528
+%533 = OpLoad %bool %_0_ok
+OpSelectionMerge %535 None
+OpBranchConditional %533 %534 %535
+%534 = OpLabel
+%536 = OpLoad %mat4v4float %_7_m10
+%537 = OpCompositeConstruct %v4float %float_11 %float_0 %float_0 %float_0
+%538 = OpCompositeConstruct %v4float %float_0 %float_11 %float_0 %float_0
+%539 = OpCompositeConstruct %v4float %float_0 %float_0 %float_11 %float_0
+%540 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_11
+%541 = OpCompositeConstruct %mat4v4float %537 %538 %539 %540
+%542 = OpCompositeExtract %v4float %536 0
+%543 = OpCompositeExtract %v4float %541 0
+%544 = OpFOrdEqual %v4bool %542 %543
+%545 = OpAll %bool %544
+%546 = OpCompositeExtract %v4float %536 1
+%547 = OpCompositeExtract %v4float %541 1
+%548 = OpFOrdEqual %v4bool %546 %547
+%549 = OpAll %bool %548
+%550 = OpLogicalAnd %bool %545 %549
+%551 = OpCompositeExtract %v4float %536 2
+%552 = OpCompositeExtract %v4float %541 2
+%553 = OpFOrdEqual %v4bool %551 %552
+%554 = OpAll %bool %553
+%555 = OpLogicalAnd %bool %550 %554
+%556 = OpCompositeExtract %v4float %536 3
+%557 = OpCompositeExtract %v4float %541 3
+%558 = OpFOrdEqual %v4bool %556 %557
+%559 = OpAll %bool %558
+%560 = OpLogicalAnd %bool %555 %559
+OpBranch %535
+%535 = OpLabel
+%561 = OpPhi %bool %false %506 %560 %534
+OpStore %_0_ok %561
+%563 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
+%564 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
 %565 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
 %566 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
-%567 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
-%568 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_20
-%569 = OpCompositeConstruct %mat4v4float %565 %566 %567 %568
-OpStore %_8_m11 %569
-%570 = OpLoad %mat4v4float %_8_m11
-%571 = OpLoad %mat4v4float %_7_m10
-%572 = OpCompositeExtract %v4float %570 0
-%573 = OpCompositeExtract %v4float %571 0
-%574 = OpFSub %v4float %572 %573
-%575 = OpCompositeExtract %v4float %570 1
-%576 = OpCompositeExtract %v4float %571 1
-%577 = OpFSub %v4float %575 %576
-%578 = OpCompositeExtract %v4float %570 2
-%579 = OpCompositeExtract %v4float %571 2
-%580 = OpFSub %v4float %578 %579
-%581 = OpCompositeExtract %v4float %570 3
-%582 = OpCompositeExtract %v4float %571 3
-%583 = OpFSub %v4float %581 %582
-%584 = OpCompositeConstruct %mat4v4float %574 %577 %580 %583
-OpStore %_8_m11 %584
-%585 = OpLoad %bool %_0_ok
-OpSelectionMerge %587 None
-OpBranchConditional %585 %586 %587
-%586 = OpLabel
-%588 = OpLoad %mat4v4float %_8_m11
-%589 = OpCompositeConstruct %v4float %float_9 %float_20 %float_20 %float_20
-%590 = OpCompositeConstruct %v4float %float_20 %float_9 %float_20 %float_20
-%591 = OpCompositeConstruct %v4float %float_20 %float_20 %float_9 %float_20
-%592 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_9
-%593 = OpCompositeConstruct %mat4v4float %589 %590 %591 %592
-%594 = OpCompositeExtract %v4float %588 0
-%595 = OpCompositeExtract %v4float %593 0
-%596 = OpFOrdEqual %v4bool %594 %595
-%597 = OpAll %bool %596
-%598 = OpCompositeExtract %v4float %588 1
-%599 = OpCompositeExtract %v4float %593 1
-%600 = OpFOrdEqual %v4bool %598 %599
-%601 = OpAll %bool %600
-%602 = OpLogicalAnd %bool %597 %601
-%603 = OpCompositeExtract %v4float %588 2
-%604 = OpCompositeExtract %v4float %593 2
-%605 = OpFOrdEqual %v4bool %603 %604
-%606 = OpAll %bool %605
-%607 = OpLogicalAnd %bool %602 %606
-%608 = OpCompositeExtract %v4float %588 3
-%609 = OpCompositeExtract %v4float %593 3
-%610 = OpFOrdEqual %v4bool %608 %609
-%611 = OpAll %bool %610
-%612 = OpLogicalAnd %bool %607 %611
-OpBranch %587
-%587 = OpLabel
-%613 = OpPhi %bool %false %537 %612 %586
-OpStore %_0_ok %613
-%614 = OpLoad %bool %_0_ok
-OpSelectionMerge %616 None
-OpBranchConditional %614 %615 %616
-%615 = OpLabel
-%617 = OpFunctionCall %bool %test_half_b
-OpBranch %616
-%616 = OpLabel
-%618 = OpPhi %bool %false %587 %617 %615
-OpSelectionMerge %620 None
-OpBranchConditional %618 %619 %620
-%619 = OpLabel
-%621 = OpFunctionCall %bool %test_comma_b
-OpBranch %620
-%620 = OpLabel
-%622 = OpPhi %bool %false %616 %621 %619
-OpSelectionMerge %627 None
-OpBranchConditional %622 %625 %626
+%567 = OpCompositeConstruct %mat4v4float %563 %564 %565 %566
+OpStore %_8_m11 %567
+%568 = OpLoad %mat4v4float %_8_m11
+%569 = OpLoad %mat4v4float %_7_m10
+%570 = OpCompositeExtract %v4float %568 0
+%571 = OpCompositeExtract %v4float %569 0
+%572 = OpFSub %v4float %570 %571
+%573 = OpCompositeExtract %v4float %568 1
+%574 = OpCompositeExtract %v4float %569 1
+%575 = OpFSub %v4float %573 %574
+%576 = OpCompositeExtract %v4float %568 2
+%577 = OpCompositeExtract %v4float %569 2
+%578 = OpFSub %v4float %576 %577
+%579 = OpCompositeExtract %v4float %568 3
+%580 = OpCompositeExtract %v4float %569 3
+%581 = OpFSub %v4float %579 %580
+%582 = OpCompositeConstruct %mat4v4float %572 %575 %578 %581
+OpStore %_8_m11 %582
+%583 = OpLoad %bool %_0_ok
+OpSelectionMerge %585 None
+OpBranchConditional %583 %584 %585
+%584 = OpLabel
+%586 = OpLoad %mat4v4float %_8_m11
+%587 = OpCompositeConstruct %v4float %float_9 %float_20 %float_20 %float_20
+%588 = OpCompositeConstruct %v4float %float_20 %float_9 %float_20 %float_20
+%589 = OpCompositeConstruct %v4float %float_20 %float_20 %float_9 %float_20
+%590 = OpCompositeConstruct %v4float %float_20 %float_20 %float_20 %float_9
+%591 = OpCompositeConstruct %mat4v4float %587 %588 %589 %590
+%592 = OpCompositeExtract %v4float %586 0
+%593 = OpCompositeExtract %v4float %591 0
+%594 = OpFOrdEqual %v4bool %592 %593
+%595 = OpAll %bool %594
+%596 = OpCompositeExtract %v4float %586 1
+%597 = OpCompositeExtract %v4float %591 1
+%598 = OpFOrdEqual %v4bool %596 %597
+%599 = OpAll %bool %598
+%600 = OpLogicalAnd %bool %595 %599
+%601 = OpCompositeExtract %v4float %586 2
+%602 = OpCompositeExtract %v4float %591 2
+%603 = OpFOrdEqual %v4bool %601 %602
+%604 = OpAll %bool %603
+%605 = OpLogicalAnd %bool %600 %604
+%606 = OpCompositeExtract %v4float %586 3
+%607 = OpCompositeExtract %v4float %591 3
+%608 = OpFOrdEqual %v4bool %606 %607
+%609 = OpAll %bool %608
+%610 = OpLogicalAnd %bool %605 %609
+OpBranch %585
+%585 = OpLabel
+%611 = OpPhi %bool %false %535 %610 %584
+OpStore %_0_ok %611
+%612 = OpLoad %bool %_0_ok
+OpSelectionMerge %614 None
+OpBranchConditional %612 %613 %614
+%613 = OpLabel
+%615 = OpFunctionCall %bool %test_half_b
+OpBranch %614
+%614 = OpLabel
+%616 = OpPhi %bool %false %585 %615 %613
+OpSelectionMerge %618 None
+OpBranchConditional %616 %617 %618
+%617 = OpLabel
+%619 = OpFunctionCall %bool %test_comma_b
+OpBranch %618
+%618 = OpLabel
+%620 = OpPhi %bool %false %614 %619 %617
+OpSelectionMerge %625 None
+OpBranchConditional %620 %623 %624
+%623 = OpLabel
+%626 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
+%629 = OpLoad %v4float %626
+OpStore %621 %629
+OpBranch %625
+%624 = OpLabel
+%630 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
+%631 = OpLoad %v4float %630
+OpStore %621 %631
+OpBranch %625
 %625 = OpLabel
-%628 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
-%631 = OpLoad %v4float %628
-OpStore %623 %631
-OpBranch %627
-%626 = OpLabel
-%632 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
-%633 = OpLoad %v4float %632
-OpStore %623 %633
-OpBranch %627
-%627 = OpLabel
-%634 = OpLoad %v4float %623
-OpReturnValue %634
+%632 = OpLoad %v4float %621
+OpReturnValue %632
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/Matrices.glsl b/third_party/skia/tests/sksl/shared/Matrices.glsl
index 3cf9fb70d4935..7bd4e48dde3f2 100644
--- a/third_party/skia/tests/sksl/shared/Matrices.glsl
+++ b/third_party/skia/tests/sksl/shared/Matrices.glsl
@@ -30,7 +30,7 @@ bool test_half_b() {
 bool test_comma_b() {
     mat2 x;
     mat2 y;
-    return ((x = mat2(1.0, 2.0, 3.0, 4.0) , y = 0.5 * mat2(2.0, 4.0, 6.0, 8.0)) , x == y);
+    return ((x = mat2(1.0, 2.0, 3.0, 4.0), y = mat2(1.0, 2.0, 3.0, 4.0)), x == y);
 }
 vec4 main() {
     bool _0_ok = true;
diff --git a/third_party/skia/tests/sksl/shared/Matrices.metal b/third_party/skia/tests/sksl/shared/Matrices.metal
index 2933a099fc536..f1ce43f1f6e3f 100644
--- a/third_party/skia/tests/sksl/shared/Matrices.metal
+++ b/third_party/skia/tests/sksl/shared/Matrices.metal
@@ -112,7 +112,7 @@ bool test_half_b() {
 bool test_comma_b() {
     float2x2 x;
     float2x2 y;
-    return ((x = float2x2(float2(1.0, 2.0), float2(3.0, 4.0)) , y = 0.5 * float2x2(float2(2.0, 4.0), float2(6.0, 8.0))) , x == y);
+    return ((x = float2x2(float2(1.0, 2.0), float2(3.0, 4.0)), y = float2x2(float2(1.0, 2.0), float2(3.0, 4.0))), x == y);
 }
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarMath.asm.frag b/third_party/skia/tests/sksl/shared/MatrixScalarMath.asm.frag
new file mode 100644
index 0000000000000..cc3da395035b2
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/MatrixScalarMath.asm.frag
@@ -0,0 +1,471 @@
+OpCapability Shader
+%1 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
+OpExecutionMode %_entrypoint_v OriginUpperLeft
+OpName %sk_FragColor "sk_FragColor"
+OpName %sk_Clockwise "sk_Clockwise"
+OpName %minus "minus"
+OpName %star "star"
+OpName %slash "slash"
+OpName %_UniformBuffer "_UniformBuffer"
+OpMemberName %_UniformBuffer 0 "colorGreen"
+OpMemberName %_UniformBuffer 1 "colorRed"
+OpName %_entrypoint_v "_entrypoint_v"
+OpName %test_bifffff22 "test_bifffff22"
+OpName %one "one"
+OpName %m2 "m2"
+OpName %main "main"
+OpName %f1 "f1"
+OpName %f2 "f2"
+OpName %f3 "f3"
+OpName %f4 "f4"
+OpName %_0_expected "_0_expected"
+OpName %_1_one "_1_one"
+OpName %_2_m2 "_2_m2"
+OpDecorate %sk_FragColor RelaxedPrecision
+OpDecorate %sk_FragColor Location 0
+OpDecorate %sk_FragColor Index 0
+OpDecorate %sk_Clockwise BuiltIn FrontFacing
+OpMemberDecorate %_UniformBuffer 0 Offset 0
+OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
+OpMemberDecorate %_UniformBuffer 1 Offset 16
+OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
+OpDecorate %_UniformBuffer Block
+OpDecorate %19 Binding 0
+OpDecorate %19 DescriptorSet 0
+OpDecorate %48 RelaxedPrecision
+OpDecorate %49 RelaxedPrecision
+OpDecorate %150 RelaxedPrecision
+OpDecorate %151 RelaxedPrecision
+OpDecorate %154 RelaxedPrecision
+OpDecorate %155 RelaxedPrecision
+OpDecorate %156 RelaxedPrecision
+OpDecorate %160 RelaxedPrecision
+OpDecorate %161 RelaxedPrecision
+OpDecorate %162 RelaxedPrecision
+OpDecorate %166 RelaxedPrecision
+OpDecorate %167 RelaxedPrecision
+OpDecorate %168 RelaxedPrecision
+OpDecorate %183 RelaxedPrecision
+OpDecorate %184 RelaxedPrecision
+OpDecorate %333 RelaxedPrecision
+OpDecorate %335 RelaxedPrecision
+OpDecorate %336 RelaxedPrecision
+%float = OpTypeFloat 32
+%v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+%sk_FragColor = OpVariable %_ptr_Output_v4float Output
+%bool = OpTypeBool
+%_ptr_Input_bool = OpTypePointer Input %bool
+%sk_Clockwise = OpVariable %_ptr_Input_bool Input
+%int = OpTypeInt 32 1
+%_ptr_Private_int = OpTypePointer Private %int
+%minus = OpVariable %_ptr_Private_int Private
+%int_2 = OpConstant %int 2
+%star = OpVariable %_ptr_Private_int Private
+%int_3 = OpConstant %int 3
+%slash = OpVariable %_ptr_Private_int Private
+%int_4 = OpConstant %int 4
+%_UniformBuffer = OpTypeStruct %v4float %v4float
+%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
+%19 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
+%void = OpTypeVoid
+%24 = OpTypeFunction %void
+%v2float = OpTypeVector %float 2
+%float_0 = OpConstant %float 0
+%28 = OpConstantComposite %v2float %float_0 %float_0
+%_ptr_Function_v2float = OpTypePointer Function %v2float
+%mat2v2float = OpTypeMatrix %v2float 2
+%_ptr_Function_int = OpTypePointer Function %int
+%_ptr_Function_float = OpTypePointer Function %float
+%_ptr_Function_mat2v2float = OpTypePointer Function %mat2v2float
+%33 = OpTypeFunction %bool %_ptr_Function_int %_ptr_Function_float %_ptr_Function_float %_ptr_Function_float %_ptr_Function_float %_ptr_Function_mat2v2float
+%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
+%int_1 = OpConstant %int 1
+%float_1 = OpConstant %float 1
+%float_2 = OpConstant %float 2
+%false = OpConstantFalse %bool
+%int_0 = OpConstant %int 0
+%145 = OpTypeFunction %v4float %_ptr_Function_v2float
+%float_3 = OpConstant %float 3
+%float_4 = OpConstant %float 4
+%float_0_5 = OpConstant %float 0.5
+%_ptr_Function_v4float = OpTypePointer Function %v4float
+%_entrypoint_v = OpFunction %void None %24
+%25 = OpLabel
+%29 = OpVariable %_ptr_Function_v2float Function
+OpStore %29 %28
+%31 = OpFunctionCall %v4float %main %29
+OpStore %sk_FragColor %31
+OpReturn
+OpFunctionEnd
+%test_bifffff22 = OpFunction %bool None %33
+%37 = OpFunctionParameter %_ptr_Function_int
+%38 = OpFunctionParameter %_ptr_Function_float
+%39 = OpFunctionParameter %_ptr_Function_float
+%40 = OpFunctionParameter %_ptr_Function_float
+%41 = OpFunctionParameter %_ptr_Function_float
+%42 = OpFunctionParameter %_ptr_Function_mat2v2float
+%43 = OpLabel
+%one = OpVariable %_ptr_Function_float Function
+%m2 = OpVariable %_ptr_Function_mat2v2float Function
+%45 = OpAccessChain %_ptr_Uniform_v4float %19 %int_1
+%48 = OpLoad %v4float %45
+%49 = OpCompositeExtract %float %48 0
+OpStore %one %49
+%51 = OpLoad %float %38
+%52 = OpLoad %float %one
+%53 = OpFMul %float %51 %52
+%54 = OpLoad %float %39
+%55 = OpLoad %float %one
+%56 = OpFMul %float %54 %55
+%57 = OpLoad %float %40
+%58 = OpLoad %float %one
+%59 = OpFMul %float %57 %58
+%60 = OpLoad %float %41
+%61 = OpLoad %float %one
+%62 = OpFMul %float %60 %61
+%63 = OpCompositeConstruct %v2float %53 %56
+%64 = OpCompositeConstruct %v2float %59 %62
+%65 = OpCompositeConstruct %mat2v2float %63 %64
+OpStore %m2 %65
+%66 = OpLoad %int %37
+OpSelectionMerge %67 None
+OpSwitch %66 %67 1 %68 2 %69 3 %70 4 %71
+%68 = OpLabel
+%72 = OpLoad %mat2v2float %m2
+%74 = OpCompositeConstruct %v2float %float_1 %float_1
+%75 = OpCompositeConstruct %mat2v2float %74 %74
+%76 = OpCompositeExtract %v2float %72 0
+%77 = OpCompositeExtract %v2float %75 0
+%78 = OpFAdd %v2float %76 %77
+%79 = OpCompositeExtract %v2float %72 1
+%80 = OpCompositeExtract %v2float %75 1
+%81 = OpFAdd %v2float %79 %80
+%82 = OpCompositeConstruct %mat2v2float %78 %81
+OpStore %m2 %82
+OpBranch %67
+%69 = OpLabel
+%83 = OpLoad %mat2v2float %m2
+%84 = OpCompositeConstruct %v2float %float_1 %float_1
+%85 = OpCompositeConstruct %mat2v2float %84 %84
+%86 = OpCompositeExtract %v2float %83 0
+%87 = OpCompositeExtract %v2float %85 0
+%88 = OpFSub %v2float %86 %87
+%89 = OpCompositeExtract %v2float %83 1
+%90 = OpCompositeExtract %v2float %85 1
+%91 = OpFSub %v2float %89 %90
+%92 = OpCompositeConstruct %mat2v2float %88 %91
+OpStore %m2 %92
+OpBranch %67
+%70 = OpLabel
+%93 = OpLoad %mat2v2float %m2
+%95 = OpMatrixTimesScalar %mat2v2float %93 %float_2
+OpStore %m2 %95
+OpBranch %67
+%71 = OpLabel
+%96 = OpLoad %mat2v2float %m2
+%97 = OpCompositeConstruct %v2float %float_2 %float_2
+%98 = OpCompositeConstruct %mat2v2float %97 %97
+%99 = OpCompositeExtract %v2float %96 0
+%100 = OpCompositeExtract %v2float %98 0
+%101 = OpFDiv %v2float %99 %100
+%102 = OpCompositeExtract %v2float %96 1
+%103 = OpCompositeExtract %v2float %98 1
+%104 = OpFDiv %v2float %102 %103
+%105 = OpCompositeConstruct %mat2v2float %101 %104
+OpStore %m2 %105
+OpBranch %67
+%67 = OpLabel
+%108 = OpAccessChain %_ptr_Function_v2float %m2 %int_0
+%109 = OpLoad %v2float %108
+%110 = OpCompositeExtract %float %109 0
+%111 = OpAccessChain %_ptr_Function_v2float %42 %int_0
+%112 = OpLoad %v2float %111
+%113 = OpCompositeExtract %float %112 0
+%114 = OpFOrdEqual %bool %110 %113
+OpSelectionMerge %116 None
+OpBranchConditional %114 %115 %116
+%115 = OpLabel
+%117 = OpAccessChain %_ptr_Function_v2float %m2 %int_0
+%118 = OpLoad %v2float %117
+%119 = OpCompositeExtract %float %118 1
+%120 = OpAccessChain %_ptr_Function_v2float %42 %int_0
+%121 = OpLoad %v2float %120
+%122 = OpCompositeExtract %float %121 1
+%123 = OpFOrdEqual %bool %119 %122
+OpBranch %116
+%116 = OpLabel
+%124 = OpPhi %bool %false %67 %123 %115
+OpSelectionMerge %126 None
+OpBranchConditional %124 %125 %126
+%125 = OpLabel
+%127 = OpAccessChain %_ptr_Function_v2float %m2 %int_1
+%128 = OpLoad %v2float %127
+%129 = OpCompositeExtract %float %128 0
+%130 = OpAccessChain %_ptr_Function_v2float %42 %int_1
+%131 = OpLoad %v2float %130
+%132 = OpCompositeExtract %float %131 0
+%133 = OpFOrdEqual %bool %129 %132
+OpBranch %126
+%126 = OpLabel
+%134 = OpPhi %bool %false %116 %133 %125
+OpSelectionMerge %136 None
+OpBranchConditional %134 %135 %136
+%135 = OpLabel
+%137 = OpAccessChain %_ptr_Function_v2float %m2 %int_1
+%138 = OpLoad %v2float %137
+%139 = OpCompositeExtract %float %138 1
+%140 = OpAccessChain %_ptr_Function_v2float %42 %int_1
+%141 = OpLoad %v2float %140
+%142 = OpCompositeExtract %float %141 1
+%143 = OpFOrdEqual %bool %139 %142
+OpBranch %136
+%136 = OpLabel
+%144 = OpPhi %bool %false %126 %143 %135
+OpReturnValue %144
+OpFunctionEnd
+%main = OpFunction %v4float None %145
+%146 = OpFunctionParameter %_ptr_Function_v2float
+%147 = OpLabel
+%f1 = OpVariable %_ptr_Function_float Function
+%f2 = OpVariable %_ptr_Function_float Function
+%f3 = OpVariable %_ptr_Function_float Function
+%f4 = OpVariable %_ptr_Function_float Function
+%_0_expected = OpVariable %_ptr_Function_mat2v2float Function
+%_1_one = OpVariable %_ptr_Function_float Function
+%_2_m2 = OpVariable %_ptr_Function_mat2v2float Function
+%251 = OpVariable %_ptr_Function_int Function
+%253 = OpVariable %_ptr_Function_float Function
+%255 = OpVariable %_ptr_Function_float Function
+%257 = OpVariable %_ptr_Function_float Function
+%259 = OpVariable %_ptr_Function_float Function
+%271 = OpVariable %_ptr_Function_mat2v2float Function
+%277 = OpVariable %_ptr_Function_int Function
+%279 = OpVariable %_ptr_Function_float Function
+%281 = OpVariable %_ptr_Function_float Function
+%283 = OpVariable %_ptr_Function_float Function
+%285 = OpVariable %_ptr_Function_float Function
+%297 = OpVariable %_ptr_Function_mat2v2float Function
+%303 = OpVariable %_ptr_Function_int Function
+%305 = OpVariable %_ptr_Function_float Function
+%307 = OpVariable %_ptr_Function_float Function
+%309 = OpVariable %_ptr_Function_float Function
+%311 = OpVariable %_ptr_Function_float Function
+%324 = OpVariable %_ptr_Function_mat2v2float Function
+%327 = OpVariable %_ptr_Function_v4float Function
+OpStore %minus %int_2
+OpStore %star %int_3
+OpStore %slash %int_4
+%149 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
+%150 = OpLoad %v4float %149
+%151 = OpCompositeExtract %float %150 1
+OpStore %f1 %151
+%153 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
+%154 = OpLoad %v4float %153
+%155 = OpCompositeExtract %float %154 1
+%156 = OpFMul %float %float_2 %155
+OpStore %f2 %156
+%159 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
+%160 = OpLoad %v4float %159
+%161 = OpCompositeExtract %float %160 1
+%162 = OpFMul %float %float_3 %161
+OpStore %f3 %162
+%165 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
+%166 = OpLoad %v4float %165
+%167 = OpCompositeExtract %float %166 1
+%168 = OpFMul %float %float_4 %167
+OpStore %f4 %168
+%170 = OpLoad %float %f1
+%171 = OpFAdd %float %170 %float_1
+%172 = OpLoad %float %f2
+%173 = OpFAdd %float %172 %float_1
+%174 = OpLoad %float %f3
+%175 = OpFAdd %float %174 %float_1
+%176 = OpLoad %float %f4
+%177 = OpFAdd %float %176 %float_1
+%178 = OpCompositeConstruct %v2float %171 %173
+%179 = OpCompositeConstruct %v2float %175 %177
+%180 = OpCompositeConstruct %mat2v2float %178 %179
+OpStore %_0_expected %180
+%182 = OpAccessChain %_ptr_Uniform_v4float %19 %int_1
+%183 = OpLoad %v4float %182
+%184 = OpCompositeExtract %float %183 0
+OpStore %_1_one %184
+%186 = OpLoad %float %f1
+%187 = OpLoad %float %_1_one
+%188 = OpFMul %float %186 %187
+%189 = OpLoad %float %f2
+%190 = OpLoad %float %_1_one
+%191 = OpFMul %float %189 %190
+%192 = OpLoad %float %f3
+%193 = OpLoad %float %_1_one
+%194 = OpFMul %float %192 %193
+%195 = OpLoad %float %f4
+%196 = OpLoad %float %_1_one
+%197 = OpFMul %float %195 %196
+%198 = OpCompositeConstruct %v2float %188 %191
+%199 = OpCompositeConstruct %v2float %194 %197
+%200 = OpCompositeConstruct %mat2v2float %198 %199
+OpStore %_2_m2 %200
+%201 = OpLoad %mat2v2float %_2_m2
+%202 = OpCompositeConstruct %v2float %float_1 %float_1
+%203 = OpCompositeConstruct %mat2v2float %202 %202
+%204 = OpCompositeExtract %v2float %201 0
+%205 = OpCompositeExtract %v2float %203 0
+%206 = OpFAdd %v2float %204 %205
+%207 = OpCompositeExtract %v2float %201 1
+%208 = OpCompositeExtract %v2float %203 1
+%209 = OpFAdd %v2float %207 %208
+%210 = OpCompositeConstruct %mat2v2float %206 %209
+OpStore %_2_m2 %210
+%211 = OpAccessChain %_ptr_Function_v2float %_2_m2 %int_0
+%212 = OpLoad %v2float %211
+%213 = OpCompositeExtract %float %212 0
+%214 = OpAccessChain %_ptr_Function_v2float %_0_expected %int_0
+%215 = OpLoad %v2float %214
+%216 = OpCompositeExtract %float %215 0
+%217 = OpFOrdEqual %bool %213 %216
+OpSelectionMerge %219 None
+OpBranchConditional %217 %218 %219
+%218 = OpLabel
+%220 = OpAccessChain %_ptr_Function_v2float %_2_m2 %int_0
+%221 = OpLoad %v2float %220
+%222 = OpCompositeExtract %float %221 1
+%223 = OpAccessChain %_ptr_Function_v2float %_0_expected %int_0
+%224 = OpLoad %v2float %223
+%225 = OpCompositeExtract %float %224 1
+%226 = OpFOrdEqual %bool %222 %225
+OpBranch %219
+%219 = OpLabel
+%227 = OpPhi %bool %false %147 %226 %218
+OpSelectionMerge %229 None
+OpBranchConditional %227 %228 %229
+%228 = OpLabel
+%230 = OpAccessChain %_ptr_Function_v2float %_2_m2 %int_1
+%231 = OpLoad %v2float %230
+%232 = OpCompositeExtract %float %231 0
+%233 = OpAccessChain %_ptr_Function_v2float %_0_expected %int_1
+%234 = OpLoad %v2float %233
+%235 = OpCompositeExtract %float %234 0
+%236 = OpFOrdEqual %bool %232 %235
+OpBranch %229
+%229 = OpLabel
+%237 = OpPhi %bool %false %219 %236 %228
+OpSelectionMerge %239 None
+OpBranchConditional %237 %238 %239
+%238 = OpLabel
+%240 = OpAccessChain %_ptr_Function_v2float %_2_m2 %int_1
+%241 = OpLoad %v2float %240
+%242 = OpCompositeExtract %float %241 1
+%243 = OpAccessChain %_ptr_Function_v2float %_0_expected %int_1
+%244 = OpLoad %v2float %243
+%245 = OpCompositeExtract %float %244 1
+%246 = OpFOrdEqual %bool %242 %245
+OpBranch %239
+%239 = OpLabel
+%247 = OpPhi %bool %false %229 %246 %238
+OpSelectionMerge %249 None
+OpBranchConditional %247 %248 %249
+%248 = OpLabel
+%250 = OpLoad %int %minus
+OpStore %251 %250
+%252 = OpLoad %float %f1
+OpStore %253 %252
+%254 = OpLoad %float %f2
+OpStore %255 %254
+%256 = OpLoad %float %f3
+OpStore %257 %256
+%258 = OpLoad %float %f4
+OpStore %259 %258
+%260 = OpLoad %float %f1
+%261 = OpFSub %float %260 %float_1
+%262 = OpLoad %float %f2
+%263 = OpFSub %float %262 %float_1
+%264 = OpLoad %float %f3
+%265 = OpFSub %float %264 %float_1
+%266 = OpLoad %float %f4
+%267 = OpFSub %float %266 %float_1
+%268 = OpCompositeConstruct %v2float %261 %263
+%269 = OpCompositeConstruct %v2float %265 %267
+%270 = OpCompositeConstruct %mat2v2float %268 %269
+OpStore %271 %270
+%272 = OpFunctionCall %bool %test_bifffff22 %251 %253 %255 %257 %259 %271
+OpBranch %249
+%249 = OpLabel
+%273 = OpPhi %bool %false %239 %272 %248
+OpSelectionMerge %275 None
+OpBranchConditional %273 %274 %275
+%274 = OpLabel
+%276 = OpLoad %int %star
+OpStore %277 %276
+%278 = OpLoad %float %f1
+OpStore %279 %278
+%280 = OpLoad %float %f2
+OpStore %281 %280
+%282 = OpLoad %float %f3
+OpStore %283 %282
+%284 = OpLoad %float %f4
+OpStore %285 %284
+%286 = OpLoad %float %f1
+%287 = OpFMul %float %286 %float_2
+%288 = OpLoad %float %f2
+%289 = OpFMul %float %288 %float_2
+%290 = OpLoad %float %f3
+%291 = OpFMul %float %290 %float_2
+%292 = OpLoad %float %f4
+%293 = OpFMul %float %292 %float_2
+%294 = OpCompositeConstruct %v2float %287 %289
+%295 = OpCompositeConstruct %v2float %291 %293
+%296 = OpCompositeConstruct %mat2v2float %294 %295
+OpStore %297 %296
+%298 = OpFunctionCall %bool %test_bifffff22 %277 %279 %281 %283 %285 %297
+OpBranch %275
+%275 = OpLabel
+%299 = OpPhi %bool %false %249 %298 %274
+OpSelectionMerge %301 None
+OpBranchConditional %299 %300 %301
+%300 = OpLabel
+%302 = OpLoad %int %slash
+OpStore %303 %302
+%304 = OpLoad %float %f1
+OpStore %305 %304
+%306 = OpLoad %float %f2
+OpStore %307 %306
+%308 = OpLoad %float %f3
+OpStore %309 %308
+%310 = OpLoad %float %f4
+OpStore %311 %310
+%312 = OpLoad %float %f1
+%314 = OpFMul %float %312 %float_0_5
+%315 = OpLoad %float %f2
+%316 = OpFMul %float %315 %float_0_5
+%317 = OpLoad %float %f3
+%318 = OpFMul %float %317 %float_0_5
+%319 = OpLoad %float %f4
+%320 = OpFMul %float %319 %float_0_5
+%321 = OpCompositeConstruct %v2float %314 %316
+%322 = OpCompositeConstruct %v2float %318 %320
+%323 = OpCompositeConstruct %mat2v2float %321 %322
+OpStore %324 %323
+%325 = OpFunctionCall %bool %test_bifffff22 %303 %305 %307 %309 %311 %324
+OpBranch %301
+%301 = OpLabel
+%326 = OpPhi %bool %false %275 %325 %300
+OpSelectionMerge %331 None
+OpBranchConditional %326 %329 %330
+%329 = OpLabel
+%332 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
+%333 = OpLoad %v4float %332
+OpStore %327 %333
+OpBranch %331
+%330 = OpLabel
+%334 = OpAccessChain %_ptr_Uniform_v4float %19 %int_1
+%335 = OpLoad %v4float %334
+OpStore %327 %335
+OpBranch %331
+%331 = OpLabel
+%336 = OpLoad %v4float %327
+OpReturnValue %336
+OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarMath.glsl b/third_party/skia/tests/sksl/shared/MatrixScalarMath.glsl
new file mode 100644
index 0000000000000..f11b141ad292d
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/MatrixScalarMath.glsl
@@ -0,0 +1,39 @@
+
+out vec4 sk_FragColor;
+uniform vec4 colorGreen;
+uniform vec4 colorRed;
+const int minus = 2;
+const int star = 3;
+const int slash = 4;
+bool test_bifffff22(int op, float m11, float m12, float m21, float m22, mat2 expected) {
+    float one = colorRed.x;
+    mat2 m2 = mat2(m11 * one, m12 * one, m21 * one, m22 * one);
+    switch (op) {
+        case 1:
+            m2 += 1.0;
+            break;
+        case 2:
+            m2 -= 1.0;
+            break;
+        case 3:
+            m2 *= 2.0;
+            break;
+        case 4:
+            m2 /= 2.0;
+            break;
+    }
+    return ((m2[0].x == expected[0].x && m2[0].y == expected[0].y) && m2[1].x == expected[1].x) && m2[1].y == expected[1].y;
+}
+vec4 main() {
+    float f1 = colorGreen.y;
+    float f2 = 2.0 * colorGreen.y;
+    float f3 = 3.0 * colorGreen.y;
+    float f4 = 4.0 * colorGreen.y;
+    mat2 _0_expected = mat2(f1 + 1.0, f2 + 1.0, f3 + 1.0, f4 + 1.0);
+    float _1_one = colorRed.x;
+    mat2 _2_m2 = mat2(f1 * _1_one, f2 * _1_one, f3 * _1_one, f4 * _1_one);
+    {
+        _2_m2 += 1.0;
+    }
+    return (((((_2_m2[0].x == _0_expected[0].x && _2_m2[0].y == _0_expected[0].y) && _2_m2[1].x == _0_expected[1].x) && _2_m2[1].y == _0_expected[1].y) && test_bifffff22(minus, f1, f2, f3, f4, mat2(f1 - 1.0, f2 - 1.0, f3 - 1.0, f4 - 1.0))) && test_bifffff22(star, f1, f2, f3, f4, mat2(f1 * 2.0, f2 * 2.0, f3 * 2.0, f4 * 2.0))) && test_bifffff22(slash, f1, f2, f3, f4, mat2(f1 / 2.0, f2 / 2.0, f3 / 2.0, f4 / 2.0)) ? colorGreen : colorRed;
+}
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarMath.metal b/third_party/skia/tests/sksl/shared/MatrixScalarMath.metal
new file mode 100644
index 0000000000000..26d254a4bb124
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/MatrixScalarMath.metal
@@ -0,0 +1,61 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+using namespace metal;
+struct Uniforms {
+    half4 colorGreen;
+    half4 colorRed;
+};
+struct Inputs {
+};
+struct Outputs {
+    half4 sk_FragColor [[color(0)]];
+};
+struct Globals {
+    const int minus;
+    const int star;
+    const int slash;
+};
+thread float2x2 operator/(const float2x2 left, const float2x2 right) {
+    return float2x2(left[0] / right[0], left[1] / right[1]);
+}
+thread float2x2& operator/=(thread float2x2& left, thread const float2x2& right) {
+    left = left / right;
+    return left;
+}
+bool test_bifffff22(Uniforms _uniforms, int op, float m11, float m12, float m21, float m22, float2x2 expected) {
+    float one = float(_uniforms.colorRed.x);
+    float2x2 m2 = float2x2(float2(m11 * one, m12 * one), float2(m21 * one, m22 * one));
+    switch (op) {
+        case 1:
+            m2 += (float2x2(1.0, 1.0, 1.0, 1.0) * 1.0);
+            break;
+        case 2:
+            m2 -= (float2x2(1.0, 1.0, 1.0, 1.0) * 1.0);
+            break;
+        case 3:
+            m2 *= 2.0;
+            break;
+        case 4:
+            m2 /= (float2x2(1.0, 1.0, 1.0, 1.0) * 2.0);
+            break;
+    }
+    return ((m2[0].x == expected[0].x && m2[0].y == expected[0].y) && m2[1].x == expected[1].x) && m2[1].y == expected[1].y;
+}
+fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
+    Globals _globals{2, 3, 4};
+    (void)_globals;
+    Outputs _out;
+    (void)_out;
+    float f1 = float(_uniforms.colorGreen.y);
+    float f2 = float(2.0h * _uniforms.colorGreen.y);
+    float f3 = float(3.0h * _uniforms.colorGreen.y);
+    float f4 = float(4.0h * _uniforms.colorGreen.y);
+    float2x2 _0_expected = float2x2(float2(f1 + 1.0, f2 + 1.0), float2(f3 + 1.0, f4 + 1.0));
+    float _1_one = float(_uniforms.colorRed.x);
+    float2x2 _2_m2 = float2x2(float2(f1 * _1_one, f2 * _1_one), float2(f3 * _1_one, f4 * _1_one));
+    {
+        _2_m2 += (float2x2(1.0, 1.0, 1.0, 1.0) * 1.0);
+    }
+    _out.sk_FragColor = (((((_2_m2[0].x == _0_expected[0].x && _2_m2[0].y == _0_expected[0].y) && _2_m2[1].x == _0_expected[1].x) && _2_m2[1].y == _0_expected[1].y) && test_bifffff22(_uniforms, _globals.minus, f1, f2, f3, f4, float2x2(float2(f1 - 1.0, f2 - 1.0), float2(f3 - 1.0, f4 - 1.0)))) && test_bifffff22(_uniforms, _globals.star, f1, f2, f3, f4, float2x2(float2(f1 * 2.0, f2 * 2.0), float2(f3 * 2.0, f4 * 2.0)))) && test_bifffff22(_uniforms, _globals.slash, f1, f2, f3, f4, float2x2(float2(f1 / 2.0, f2 / 2.0), float2(f3 / 2.0, f4 / 2.0))) ? _uniforms.colorGreen : _uniforms.colorRed;
+    return _out;
+}
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.asm.frag b/third_party/skia/tests/sksl/shared/MatrixScalarSplat.asm.frag
deleted file mode 100644
index e57a0ef3c7bcd..0000000000000
--- a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.asm.frag
+++ /dev/null
@@ -1,839 +0,0 @@
-OpCapability Shader
-%1 = OpExtInstImport "GLSL.std.450"
-OpMemoryModel Logical GLSL450
-OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
-OpExecutionMode %_entrypoint_v OriginUpperLeft
-OpName %sk_FragColor "sk_FragColor"
-OpName %sk_Clockwise "sk_Clockwise"
-OpName %_UniformBuffer "_UniformBuffer"
-OpMemberName %_UniformBuffer 0 "colorGreen"
-OpMemberName %_UniformBuffer 1 "colorRed"
-OpName %_entrypoint_v "_entrypoint_v"
-OpName %test_half_b "test_half_b"
-OpName %ok "ok"
-OpName %main "main"
-OpName %_0_ok "_0_ok"
-OpDecorate %sk_FragColor RelaxedPrecision
-OpDecorate %sk_FragColor Location 0
-OpDecorate %sk_FragColor Index 0
-OpDecorate %sk_Clockwise BuiltIn FrontFacing
-OpMemberDecorate %_UniformBuffer 0 Offset 0
-OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
-OpMemberDecorate %_UniformBuffer 1 Offset 16
-OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
-OpDecorate %_UniformBuffer Block
-OpDecorate %11 Binding 0
-OpDecorate %11 DescriptorSet 0
-OpDecorate %30 RelaxedPrecision
-OpDecorate %34 RelaxedPrecision
-OpDecorate %36 RelaxedPrecision
-OpDecorate %37 RelaxedPrecision
-OpDecorate %38 RelaxedPrecision
-OpDecorate %41 RelaxedPrecision
-OpDecorate %42 RelaxedPrecision
-OpDecorate %43 RelaxedPrecision
-OpDecorate %44 RelaxedPrecision
-OpDecorate %45 RelaxedPrecision
-OpDecorate %46 RelaxedPrecision
-OpDecorate %47 RelaxedPrecision
-OpDecorate %48 RelaxedPrecision
-OpDecorate %49 RelaxedPrecision
-OpDecorate %50 RelaxedPrecision
-OpDecorate %51 RelaxedPrecision
-OpDecorate %52 RelaxedPrecision
-OpDecorate %54 RelaxedPrecision
-OpDecorate %55 RelaxedPrecision
-OpDecorate %56 RelaxedPrecision
-OpDecorate %57 RelaxedPrecision
-OpDecorate %74 RelaxedPrecision
-OpDecorate %77 RelaxedPrecision
-OpDecorate %78 RelaxedPrecision
-OpDecorate %79 RelaxedPrecision
-OpDecorate %80 RelaxedPrecision
-OpDecorate %81 RelaxedPrecision
-OpDecorate %82 RelaxedPrecision
-OpDecorate %83 RelaxedPrecision
-OpDecorate %84 RelaxedPrecision
-OpDecorate %85 RelaxedPrecision
-OpDecorate %86 RelaxedPrecision
-OpDecorate %87 RelaxedPrecision
-OpDecorate %88 RelaxedPrecision
-OpDecorate %89 RelaxedPrecision
-OpDecorate %90 RelaxedPrecision
-OpDecorate %91 RelaxedPrecision
-OpDecorate %92 RelaxedPrecision
-OpDecorate %95 RelaxedPrecision
-OpDecorate %96 RelaxedPrecision
-OpDecorate %97 RelaxedPrecision
-OpDecorate %98 RelaxedPrecision
-OpDecorate %114 RelaxedPrecision
-OpDecorate %117 RelaxedPrecision
-OpDecorate %118 RelaxedPrecision
-OpDecorate %119 RelaxedPrecision
-OpDecorate %120 RelaxedPrecision
-OpDecorate %121 RelaxedPrecision
-OpDecorate %123 RelaxedPrecision
-OpDecorate %124 RelaxedPrecision
-OpDecorate %125 RelaxedPrecision
-OpDecorate %126 RelaxedPrecision
-OpDecorate %142 RelaxedPrecision
-OpDecorate %145 RelaxedPrecision
-OpDecorate %146 RelaxedPrecision
-OpDecorate %147 RelaxedPrecision
-OpDecorate %148 RelaxedPrecision
-OpDecorate %150 RelaxedPrecision
-OpDecorate %152 RelaxedPrecision
-OpDecorate %153 RelaxedPrecision
-OpDecorate %154 RelaxedPrecision
-OpDecorate %155 RelaxedPrecision
-OpDecorate %171 RelaxedPrecision
-OpDecorate %174 RelaxedPrecision
-OpDecorate %175 RelaxedPrecision
-OpDecorate %176 RelaxedPrecision
-OpDecorate %177 RelaxedPrecision
-OpDecorate %178 RelaxedPrecision
-OpDecorate %179 RelaxedPrecision
-OpDecorate %180 RelaxedPrecision
-OpDecorate %181 RelaxedPrecision
-OpDecorate %182 RelaxedPrecision
-OpDecorate %183 RelaxedPrecision
-OpDecorate %184 RelaxedPrecision
-OpDecorate %185 RelaxedPrecision
-OpDecorate %186 RelaxedPrecision
-OpDecorate %187 RelaxedPrecision
-OpDecorate %188 RelaxedPrecision
-OpDecorate %189 RelaxedPrecision
-OpDecorate %190 RelaxedPrecision
-OpDecorate %191 RelaxedPrecision
-OpDecorate %192 RelaxedPrecision
-OpDecorate %193 RelaxedPrecision
-OpDecorate %209 RelaxedPrecision
-OpDecorate %212 RelaxedPrecision
-OpDecorate %213 RelaxedPrecision
-OpDecorate %214 RelaxedPrecision
-OpDecorate %215 RelaxedPrecision
-OpDecorate %216 RelaxedPrecision
-OpDecorate %217 RelaxedPrecision
-OpDecorate %218 RelaxedPrecision
-OpDecorate %219 RelaxedPrecision
-OpDecorate %220 RelaxedPrecision
-OpDecorate %221 RelaxedPrecision
-OpDecorate %222 RelaxedPrecision
-OpDecorate %223 RelaxedPrecision
-OpDecorate %224 RelaxedPrecision
-OpDecorate %225 RelaxedPrecision
-OpDecorate %226 RelaxedPrecision
-OpDecorate %227 RelaxedPrecision
-OpDecorate %228 RelaxedPrecision
-OpDecorate %229 RelaxedPrecision
-OpDecorate %230 RelaxedPrecision
-OpDecorate %231 RelaxedPrecision
-OpDecorate %247 RelaxedPrecision
-OpDecorate %250 RelaxedPrecision
-OpDecorate %251 RelaxedPrecision
-OpDecorate %252 RelaxedPrecision
-OpDecorate %253 RelaxedPrecision
-OpDecorate %254 RelaxedPrecision
-OpDecorate %255 RelaxedPrecision
-OpDecorate %256 RelaxedPrecision
-OpDecorate %257 RelaxedPrecision
-OpDecorate %258 RelaxedPrecision
-OpDecorate %274 RelaxedPrecision
-OpDecorate %277 RelaxedPrecision
-OpDecorate %278 RelaxedPrecision
-OpDecorate %279 RelaxedPrecision
-OpDecorate %281 RelaxedPrecision
-OpDecorate %282 RelaxedPrecision
-OpDecorate %283 RelaxedPrecision
-OpDecorate %284 RelaxedPrecision
-OpDecorate %285 RelaxedPrecision
-OpDecorate %286 RelaxedPrecision
-OpDecorate %287 RelaxedPrecision
-OpDecorate %288 RelaxedPrecision
-OpDecorate %289 RelaxedPrecision
-OpDecorate %290 RelaxedPrecision
-OpDecorate %291 RelaxedPrecision
-OpDecorate %292 RelaxedPrecision
-OpDecorate %304 RelaxedPrecision
-OpDecorate %309 RelaxedPrecision
-OpDecorate %347 RelaxedPrecision
-OpDecorate %385 RelaxedPrecision
-OpDecorate %412 RelaxedPrecision
-OpDecorate %439 RelaxedPrecision
-OpDecorate %477 RelaxedPrecision
-OpDecorate %515 RelaxedPrecision
-OpDecorate %542 RelaxedPrecision
-OpDecorate %570 RelaxedPrecision
-OpDecorate %584 RelaxedPrecision
-OpDecorate %587 RelaxedPrecision
-OpDecorate %588 RelaxedPrecision
-%float = OpTypeFloat 32
-%v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%sk_FragColor = OpVariable %_ptr_Output_v4float Output
-%bool = OpTypeBool
-%_ptr_Input_bool = OpTypePointer Input %bool
-%sk_Clockwise = OpVariable %_ptr_Input_bool Input
-%_UniformBuffer = OpTypeStruct %v4float %v4float
-%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
-%11 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
-%void = OpTypeVoid
-%16 = OpTypeFunction %void
-%v2float = OpTypeVector %float 2
-%float_0 = OpConstant %float 0
-%20 = OpConstantComposite %v2float %float_0 %float_0
-%_ptr_Function_v2float = OpTypePointer Function %v2float
-%24 = OpTypeFunction %bool
-%_ptr_Function_bool = OpTypePointer Function %bool
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%float_2 = OpConstant %float 2
-%v3float = OpTypeVector %float 3
-%mat3v3float = OpTypeMatrix %v3float 3
-%float_4 = OpConstant %float 4
-%float_6 = OpConstant %float 6
-%v3bool = OpTypeVector %bool 3
-%float_n2 = OpConstant %float -2
-%float_n4 = OpConstant %float -4
-%float_8 = OpConstant %float 8
-%float_0_25 = OpConstant %float 0.25
-%float_0_5 = OpConstant %float 0.5
-%mat2v2float = OpTypeMatrix %v2float 2
-%v2bool = OpTypeVector %bool 2
-%305 = OpTypeFunction %v4float %_ptr_Function_v2float
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
-%int = OpTypeInt 32 1
-%int_0 = OpConstant %int 0
-%int_1 = OpConstant %int 1
-%_entrypoint_v = OpFunction %void None %16
-%17 = OpLabel
-%21 = OpVariable %_ptr_Function_v2float Function
-OpStore %21 %20
-%23 = OpFunctionCall %v4float %main %21
-OpStore %sk_FragColor %23
-OpReturn
-OpFunctionEnd
-%test_half_b = OpFunction %bool None %24
-%25 = OpLabel
-%ok = OpVariable %_ptr_Function_bool Function
-OpStore %ok %true
-%30 = OpLoad %bool %ok
-OpSelectionMerge %32 None
-OpBranchConditional %30 %31 %32
-%31 = OpLabel
-%36 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%37 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%38 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%34 = OpCompositeConstruct %mat3v3float %36 %37 %38
-%41 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%42 = OpCompositeConstruct %mat3v3float %41 %41 %41
-%43 = OpCompositeExtract %v3float %34 0
-%44 = OpCompositeExtract %v3float %42 0
-%45 = OpFAdd %v3float %43 %44
-%46 = OpCompositeExtract %v3float %34 1
-%47 = OpCompositeExtract %v3float %42 1
-%48 = OpFAdd %v3float %46 %47
-%49 = OpCompositeExtract %v3float %34 2
-%50 = OpCompositeExtract %v3float %42 2
-%51 = OpFAdd %v3float %49 %50
-%52 = OpCompositeConstruct %mat3v3float %45 %48 %51
-%54 = OpCompositeConstruct %v3float %float_6 %float_4 %float_4
-%55 = OpCompositeConstruct %v3float %float_4 %float_6 %float_4
-%56 = OpCompositeConstruct %v3float %float_4 %float_4 %float_6
-%57 = OpCompositeConstruct %mat3v3float %54 %55 %56
-%59 = OpCompositeExtract %v3float %52 0
-%60 = OpCompositeExtract %v3float %57 0
-%61 = OpFOrdEqual %v3bool %59 %60
-%62 = OpAll %bool %61
-%63 = OpCompositeExtract %v3float %52 1
-%64 = OpCompositeExtract %v3float %57 1
-%65 = OpFOrdEqual %v3bool %63 %64
-%66 = OpAll %bool %65
-%67 = OpLogicalAnd %bool %62 %66
-%68 = OpCompositeExtract %v3float %52 2
-%69 = OpCompositeExtract %v3float %57 2
-%70 = OpFOrdEqual %v3bool %68 %69
-%71 = OpAll %bool %70
-%72 = OpLogicalAnd %bool %67 %71
-OpBranch %32
-%32 = OpLabel
-%73 = OpPhi %bool %false %25 %72 %31
-OpStore %ok %73
-%74 = OpLoad %bool %ok
-OpSelectionMerge %76 None
-OpBranchConditional %74 %75 %76
-%75 = OpLabel
-%78 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%79 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%80 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%77 = OpCompositeConstruct %mat3v3float %78 %79 %80
-%81 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%82 = OpCompositeConstruct %mat3v3float %81 %81 %81
-%83 = OpCompositeExtract %v3float %77 0
-%84 = OpCompositeExtract %v3float %82 0
-%85 = OpFSub %v3float %83 %84
-%86 = OpCompositeExtract %v3float %77 1
-%87 = OpCompositeExtract %v3float %82 1
-%88 = OpFSub %v3float %86 %87
-%89 = OpCompositeExtract %v3float %77 2
-%90 = OpCompositeExtract %v3float %82 2
-%91 = OpFSub %v3float %89 %90
-%92 = OpCompositeConstruct %mat3v3float %85 %88 %91
-%95 = OpCompositeConstruct %v3float %float_n2 %float_n4 %float_n4
-%96 = OpCompositeConstruct %v3float %float_n4 %float_n2 %float_n4
-%97 = OpCompositeConstruct %v3float %float_n4 %float_n4 %float_n2
-%98 = OpCompositeConstruct %mat3v3float %95 %96 %97
-%99 = OpCompositeExtract %v3float %92 0
-%100 = OpCompositeExtract %v3float %98 0
-%101 = OpFOrdEqual %v3bool %99 %100
-%102 = OpAll %bool %101
-%103 = OpCompositeExtract %v3float %92 1
-%104 = OpCompositeExtract %v3float %98 1
-%105 = OpFOrdEqual %v3bool %103 %104
-%106 = OpAll %bool %105
-%107 = OpLogicalAnd %bool %102 %106
-%108 = OpCompositeExtract %v3float %92 2
-%109 = OpCompositeExtract %v3float %98 2
-%110 = OpFOrdEqual %v3bool %108 %109
-%111 = OpAll %bool %110
-%112 = OpLogicalAnd %bool %107 %111
-OpBranch %76
-%76 = OpLabel
-%113 = OpPhi %bool %false %32 %112 %75
-OpStore %ok %113
-%114 = OpLoad %bool %ok
-OpSelectionMerge %116 None
-OpBranchConditional %114 %115 %116
-%115 = OpLabel
-%118 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%119 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%120 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%117 = OpCompositeConstruct %mat3v3float %118 %119 %120
-%121 = OpMatrixTimesScalar %mat3v3float %117 %float_4
-%124 = OpCompositeConstruct %v3float %float_8 %float_0 %float_0
-%125 = OpCompositeConstruct %v3float %float_0 %float_8 %float_0
-%126 = OpCompositeConstruct %v3float %float_0 %float_0 %float_8
-%123 = OpCompositeConstruct %mat3v3float %124 %125 %126
-%127 = OpCompositeExtract %v3float %121 0
-%128 = OpCompositeExtract %v3float %123 0
-%129 = OpFOrdEqual %v3bool %127 %128
-%130 = OpAll %bool %129
-%131 = OpCompositeExtract %v3float %121 1
-%132 = OpCompositeExtract %v3float %123 1
-%133 = OpFOrdEqual %v3bool %131 %132
-%134 = OpAll %bool %133
-%135 = OpLogicalAnd %bool %130 %134
-%136 = OpCompositeExtract %v3float %121 2
-%137 = OpCompositeExtract %v3float %123 2
-%138 = OpFOrdEqual %v3bool %136 %137
-%139 = OpAll %bool %138
-%140 = OpLogicalAnd %bool %135 %139
-OpBranch %116
-%116 = OpLabel
-%141 = OpPhi %bool %false %76 %140 %115
-OpStore %ok %141
-%142 = OpLoad %bool %ok
-OpSelectionMerge %144 None
-OpBranchConditional %142 %143 %144
-%143 = OpLabel
-%146 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%147 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%148 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%145 = OpCompositeConstruct %mat3v3float %146 %147 %148
-%150 = OpMatrixTimesScalar %mat3v3float %145 %float_0_25
-%153 = OpCompositeConstruct %v3float %float_0_5 %float_0 %float_0
-%154 = OpCompositeConstruct %v3float %float_0 %float_0_5 %float_0
-%155 = OpCompositeConstruct %v3float %float_0 %float_0 %float_0_5
-%152 = OpCompositeConstruct %mat3v3float %153 %154 %155
-%156 = OpCompositeExtract %v3float %150 0
-%157 = OpCompositeExtract %v3float %152 0
-%158 = OpFOrdEqual %v3bool %156 %157
-%159 = OpAll %bool %158
-%160 = OpCompositeExtract %v3float %150 1
-%161 = OpCompositeExtract %v3float %152 1
-%162 = OpFOrdEqual %v3bool %160 %161
-%163 = OpAll %bool %162
-%164 = OpLogicalAnd %bool %159 %163
-%165 = OpCompositeExtract %v3float %150 2
-%166 = OpCompositeExtract %v3float %152 2
-%167 = OpFOrdEqual %v3bool %165 %166
-%168 = OpAll %bool %167
-%169 = OpLogicalAnd %bool %164 %168
-OpBranch %144
-%144 = OpLabel
-%170 = OpPhi %bool %false %116 %169 %143
-OpStore %ok %170
-%171 = OpLoad %bool %ok
-OpSelectionMerge %173 None
-OpBranchConditional %171 %172 %173
-%172 = OpLabel
-%175 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%176 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%177 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%174 = OpCompositeConstruct %mat3v3float %175 %176 %177
-%178 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%179 = OpCompositeConstruct %mat3v3float %178 %178 %178
-%180 = OpCompositeExtract %v3float %179 0
-%181 = OpCompositeExtract %v3float %174 0
-%182 = OpFAdd %v3float %180 %181
-%183 = OpCompositeExtract %v3float %179 1
-%184 = OpCompositeExtract %v3float %174 1
-%185 = OpFAdd %v3float %183 %184
-%186 = OpCompositeExtract %v3float %179 2
-%187 = OpCompositeExtract %v3float %174 2
-%188 = OpFAdd %v3float %186 %187
-%189 = OpCompositeConstruct %mat3v3float %182 %185 %188
-%190 = OpCompositeConstruct %v3float %float_6 %float_4 %float_4
-%191 = OpCompositeConstruct %v3float %float_4 %float_6 %float_4
-%192 = OpCompositeConstruct %v3float %float_4 %float_4 %float_6
-%193 = OpCompositeConstruct %mat3v3float %190 %191 %192
-%194 = OpCompositeExtract %v3float %189 0
-%195 = OpCompositeExtract %v3float %193 0
-%196 = OpFOrdEqual %v3bool %194 %195
-%197 = OpAll %bool %196
-%198 = OpCompositeExtract %v3float %189 1
-%199 = OpCompositeExtract %v3float %193 1
-%200 = OpFOrdEqual %v3bool %198 %199
-%201 = OpAll %bool %200
-%202 = OpLogicalAnd %bool %197 %201
-%203 = OpCompositeExtract %v3float %189 2
-%204 = OpCompositeExtract %v3float %193 2
-%205 = OpFOrdEqual %v3bool %203 %204
-%206 = OpAll %bool %205
-%207 = OpLogicalAnd %bool %202 %206
-OpBranch %173
-%173 = OpLabel
-%208 = OpPhi %bool %false %144 %207 %172
-OpStore %ok %208
-%209 = OpLoad %bool %ok
-OpSelectionMerge %211 None
-OpBranchConditional %209 %210 %211
-%210 = OpLabel
-%213 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%214 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%215 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%212 = OpCompositeConstruct %mat3v3float %213 %214 %215
-%216 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%217 = OpCompositeConstruct %mat3v3float %216 %216 %216
-%218 = OpCompositeExtract %v3float %217 0
-%219 = OpCompositeExtract %v3float %212 0
-%220 = OpFSub %v3float %218 %219
-%221 = OpCompositeExtract %v3float %217 1
-%222 = OpCompositeExtract %v3float %212 1
-%223 = OpFSub %v3float %221 %222
-%224 = OpCompositeExtract %v3float %217 2
-%225 = OpCompositeExtract %v3float %212 2
-%226 = OpFSub %v3float %224 %225
-%227 = OpCompositeConstruct %mat3v3float %220 %223 %226
-%228 = OpCompositeConstruct %v3float %float_2 %float_4 %float_4
-%229 = OpCompositeConstruct %v3float %float_4 %float_2 %float_4
-%230 = OpCompositeConstruct %v3float %float_4 %float_4 %float_2
-%231 = OpCompositeConstruct %mat3v3float %228 %229 %230
-%232 = OpCompositeExtract %v3float %227 0
-%233 = OpCompositeExtract %v3float %231 0
-%234 = OpFOrdEqual %v3bool %232 %233
-%235 = OpAll %bool %234
-%236 = OpCompositeExtract %v3float %227 1
-%237 = OpCompositeExtract %v3float %231 1
-%238 = OpFOrdEqual %v3bool %236 %237
-%239 = OpAll %bool %238
-%240 = OpLogicalAnd %bool %235 %239
-%241 = OpCompositeExtract %v3float %227 2
-%242 = OpCompositeExtract %v3float %231 2
-%243 = OpFOrdEqual %v3bool %241 %242
-%244 = OpAll %bool %243
-%245 = OpLogicalAnd %bool %240 %244
-OpBranch %211
-%211 = OpLabel
-%246 = OpPhi %bool %false %173 %245 %210
-OpStore %ok %246
-%247 = OpLoad %bool %ok
-OpSelectionMerge %249 None
-OpBranchConditional %247 %248 %249
-%248 = OpLabel
-%251 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%252 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%253 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%250 = OpCompositeConstruct %mat3v3float %251 %252 %253
-%254 = OpMatrixTimesScalar %mat3v3float %250 %float_4
-%256 = OpCompositeConstruct %v3float %float_8 %float_0 %float_0
-%257 = OpCompositeConstruct %v3float %float_0 %float_8 %float_0
-%258 = OpCompositeConstruct %v3float %float_0 %float_0 %float_8
-%255 = OpCompositeConstruct %mat3v3float %256 %257 %258
-%259 = OpCompositeExtract %v3float %254 0
-%260 = OpCompositeExtract %v3float %255 0
-%261 = OpFOrdEqual %v3bool %259 %260
-%262 = OpAll %bool %261
-%263 = OpCompositeExtract %v3float %254 1
-%264 = OpCompositeExtract %v3float %255 1
-%265 = OpFOrdEqual %v3bool %263 %264
-%266 = OpAll %bool %265
-%267 = OpLogicalAnd %bool %262 %266
-%268 = OpCompositeExtract %v3float %254 2
-%269 = OpCompositeExtract %v3float %255 2
-%270 = OpFOrdEqual %v3bool %268 %269
-%271 = OpAll %bool %270
-%272 = OpLogicalAnd %bool %267 %271
-OpBranch %249
-%249 = OpLabel
-%273 = OpPhi %bool %false %211 %272 %248
-OpStore %ok %273
-%274 = OpLoad %bool %ok
-OpSelectionMerge %276 None
-OpBranchConditional %274 %275 %276
-%275 = OpLabel
-%277 = OpCompositeConstruct %v2float %float_2 %float_2
-%278 = OpCompositeConstruct %v2float %float_2 %float_2
-%279 = OpCompositeConstruct %mat2v2float %277 %278
-%281 = OpCompositeConstruct %v2float %float_4 %float_4
-%282 = OpCompositeConstruct %mat2v2float %281 %281
-%283 = OpCompositeExtract %v2float %282 0
-%284 = OpCompositeExtract %v2float %279 0
-%285 = OpFDiv %v2float %283 %284
-%286 = OpCompositeExtract %v2float %282 1
-%287 = OpCompositeExtract %v2float %279 1
-%288 = OpFDiv %v2float %286 %287
-%289 = OpCompositeConstruct %mat2v2float %285 %288
-%290 = OpCompositeConstruct %v2float %float_2 %float_2
-%291 = OpCompositeConstruct %v2float %float_2 %float_2
-%292 = OpCompositeConstruct %mat2v2float %290 %291
-%294 = OpCompositeExtract %v2float %289 0
-%295 = OpCompositeExtract %v2float %292 0
-%296 = OpFOrdEqual %v2bool %294 %295
-%297 = OpAll %bool %296
-%298 = OpCompositeExtract %v2float %289 1
-%299 = OpCompositeExtract %v2float %292 1
-%300 = OpFOrdEqual %v2bool %298 %299
-%301 = OpAll %bool %300
-%302 = OpLogicalAnd %bool %297 %301
-OpBranch %276
-%276 = OpLabel
-%303 = OpPhi %bool %false %249 %302 %275
-OpStore %ok %303
-%304 = OpLoad %bool %ok
-OpReturnValue %304
-OpFunctionEnd
-%main = OpFunction %v4float None %305
-%306 = OpFunctionParameter %_ptr_Function_v2float
-%307 = OpLabel
-%_0_ok = OpVariable %_ptr_Function_bool Function
-%575 = OpVariable %_ptr_Function_v4float Function
-OpStore %_0_ok %true
-%309 = OpLoad %bool %_0_ok
-OpSelectionMerge %311 None
-OpBranchConditional %309 %310 %311
-%310 = OpLabel
-%313 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%314 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%315 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%312 = OpCompositeConstruct %mat3v3float %313 %314 %315
-%316 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%317 = OpCompositeConstruct %mat3v3float %316 %316 %316
-%318 = OpCompositeExtract %v3float %312 0
-%319 = OpCompositeExtract %v3float %317 0
-%320 = OpFAdd %v3float %318 %319
-%321 = OpCompositeExtract %v3float %312 1
-%322 = OpCompositeExtract %v3float %317 1
-%323 = OpFAdd %v3float %321 %322
-%324 = OpCompositeExtract %v3float %312 2
-%325 = OpCompositeExtract %v3float %317 2
-%326 = OpFAdd %v3float %324 %325
-%327 = OpCompositeConstruct %mat3v3float %320 %323 %326
-%328 = OpCompositeConstruct %v3float %float_6 %float_4 %float_4
-%329 = OpCompositeConstruct %v3float %float_4 %float_6 %float_4
-%330 = OpCompositeConstruct %v3float %float_4 %float_4 %float_6
-%331 = OpCompositeConstruct %mat3v3float %328 %329 %330
-%332 = OpCompositeExtract %v3float %327 0
-%333 = OpCompositeExtract %v3float %331 0
-%334 = OpFOrdEqual %v3bool %332 %333
-%335 = OpAll %bool %334
-%336 = OpCompositeExtract %v3float %327 1
-%337 = OpCompositeExtract %v3float %331 1
-%338 = OpFOrdEqual %v3bool %336 %337
-%339 = OpAll %bool %338
-%340 = OpLogicalAnd %bool %335 %339
-%341 = OpCompositeExtract %v3float %327 2
-%342 = OpCompositeExtract %v3float %331 2
-%343 = OpFOrdEqual %v3bool %341 %342
-%344 = OpAll %bool %343
-%345 = OpLogicalAnd %bool %340 %344
-OpBranch %311
-%311 = OpLabel
-%346 = OpPhi %bool %false %307 %345 %310
-OpStore %_0_ok %346
-%347 = OpLoad %bool %_0_ok
-OpSelectionMerge %349 None
-OpBranchConditional %347 %348 %349
-%348 = OpLabel
-%351 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%352 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%353 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%350 = OpCompositeConstruct %mat3v3float %351 %352 %353
-%354 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%355 = OpCompositeConstruct %mat3v3float %354 %354 %354
-%356 = OpCompositeExtract %v3float %350 0
-%357 = OpCompositeExtract %v3float %355 0
-%358 = OpFSub %v3float %356 %357
-%359 = OpCompositeExtract %v3float %350 1
-%360 = OpCompositeExtract %v3float %355 1
-%361 = OpFSub %v3float %359 %360
-%362 = OpCompositeExtract %v3float %350 2
-%363 = OpCompositeExtract %v3float %355 2
-%364 = OpFSub %v3float %362 %363
-%365 = OpCompositeConstruct %mat3v3float %358 %361 %364
-%366 = OpCompositeConstruct %v3float %float_n2 %float_n4 %float_n4
-%367 = OpCompositeConstruct %v3float %float_n4 %float_n2 %float_n4
-%368 = OpCompositeConstruct %v3float %float_n4 %float_n4 %float_n2
-%369 = OpCompositeConstruct %mat3v3float %366 %367 %368
-%370 = OpCompositeExtract %v3float %365 0
-%371 = OpCompositeExtract %v3float %369 0
-%372 = OpFOrdEqual %v3bool %370 %371
-%373 = OpAll %bool %372
-%374 = OpCompositeExtract %v3float %365 1
-%375 = OpCompositeExtract %v3float %369 1
-%376 = OpFOrdEqual %v3bool %374 %375
-%377 = OpAll %bool %376
-%378 = OpLogicalAnd %bool %373 %377
-%379 = OpCompositeExtract %v3float %365 2
-%380 = OpCompositeExtract %v3float %369 2
-%381 = OpFOrdEqual %v3bool %379 %380
-%382 = OpAll %bool %381
-%383 = OpLogicalAnd %bool %378 %382
-OpBranch %349
-%349 = OpLabel
-%384 = OpPhi %bool %false %311 %383 %348
-OpStore %_0_ok %384
-%385 = OpLoad %bool %_0_ok
-OpSelectionMerge %387 None
-OpBranchConditional %385 %386 %387
-%386 = OpLabel
-%389 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%390 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%391 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%388 = OpCompositeConstruct %mat3v3float %389 %390 %391
-%392 = OpMatrixTimesScalar %mat3v3float %388 %float_4
-%394 = OpCompositeConstruct %v3float %float_8 %float_0 %float_0
-%395 = OpCompositeConstruct %v3float %float_0 %float_8 %float_0
-%396 = OpCompositeConstruct %v3float %float_0 %float_0 %float_8
-%393 = OpCompositeConstruct %mat3v3float %394 %395 %396
-%397 = OpCompositeExtract %v3float %392 0
-%398 = OpCompositeExtract %v3float %393 0
-%399 = OpFOrdEqual %v3bool %397 %398
-%400 = OpAll %bool %399
-%401 = OpCompositeExtract %v3float %392 1
-%402 = OpCompositeExtract %v3float %393 1
-%403 = OpFOrdEqual %v3bool %401 %402
-%404 = OpAll %bool %403
-%405 = OpLogicalAnd %bool %400 %404
-%406 = OpCompositeExtract %v3float %392 2
-%407 = OpCompositeExtract %v3float %393 2
-%408 = OpFOrdEqual %v3bool %406 %407
-%409 = OpAll %bool %408
-%410 = OpLogicalAnd %bool %405 %409
-OpBranch %387
-%387 = OpLabel
-%411 = OpPhi %bool %false %349 %410 %386
-OpStore %_0_ok %411
-%412 = OpLoad %bool %_0_ok
-OpSelectionMerge %414 None
-OpBranchConditional %412 %413 %414
-%413 = OpLabel
-%416 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%417 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%418 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%415 = OpCompositeConstruct %mat3v3float %416 %417 %418
-%419 = OpMatrixTimesScalar %mat3v3float %415 %float_0_25
-%421 = OpCompositeConstruct %v3float %float_0_5 %float_0 %float_0
-%422 = OpCompositeConstruct %v3float %float_0 %float_0_5 %float_0
-%423 = OpCompositeConstruct %v3float %float_0 %float_0 %float_0_5
-%420 = OpCompositeConstruct %mat3v3float %421 %422 %423
-%424 = OpCompositeExtract %v3float %419 0
-%425 = OpCompositeExtract %v3float %420 0
-%426 = OpFOrdEqual %v3bool %424 %425
-%427 = OpAll %bool %426
-%428 = OpCompositeExtract %v3float %419 1
-%429 = OpCompositeExtract %v3float %420 1
-%430 = OpFOrdEqual %v3bool %428 %429
-%431 = OpAll %bool %430
-%432 = OpLogicalAnd %bool %427 %431
-%433 = OpCompositeExtract %v3float %419 2
-%434 = OpCompositeExtract %v3float %420 2
-%435 = OpFOrdEqual %v3bool %433 %434
-%436 = OpAll %bool %435
-%437 = OpLogicalAnd %bool %432 %436
-OpBranch %414
-%414 = OpLabel
-%438 = OpPhi %bool %false %387 %437 %413
-OpStore %_0_ok %438
-%439 = OpLoad %bool %_0_ok
-OpSelectionMerge %441 None
-OpBranchConditional %439 %440 %441
-%440 = OpLabel
-%443 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%444 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%445 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%442 = OpCompositeConstruct %mat3v3float %443 %444 %445
-%446 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%447 = OpCompositeConstruct %mat3v3float %446 %446 %446
-%448 = OpCompositeExtract %v3float %447 0
-%449 = OpCompositeExtract %v3float %442 0
-%450 = OpFAdd %v3float %448 %449
-%451 = OpCompositeExtract %v3float %447 1
-%452 = OpCompositeExtract %v3float %442 1
-%453 = OpFAdd %v3float %451 %452
-%454 = OpCompositeExtract %v3float %447 2
-%455 = OpCompositeExtract %v3float %442 2
-%456 = OpFAdd %v3float %454 %455
-%457 = OpCompositeConstruct %mat3v3float %450 %453 %456
-%458 = OpCompositeConstruct %v3float %float_6 %float_4 %float_4
-%459 = OpCompositeConstruct %v3float %float_4 %float_6 %float_4
-%460 = OpCompositeConstruct %v3float %float_4 %float_4 %float_6
-%461 = OpCompositeConstruct %mat3v3float %458 %459 %460
-%462 = OpCompositeExtract %v3float %457 0
-%463 = OpCompositeExtract %v3float %461 0
-%464 = OpFOrdEqual %v3bool %462 %463
-%465 = OpAll %bool %464
-%466 = OpCompositeExtract %v3float %457 1
-%467 = OpCompositeExtract %v3float %461 1
-%468 = OpFOrdEqual %v3bool %466 %467
-%469 = OpAll %bool %468
-%470 = OpLogicalAnd %bool %465 %469
-%471 = OpCompositeExtract %v3float %457 2
-%472 = OpCompositeExtract %v3float %461 2
-%473 = OpFOrdEqual %v3bool %471 %472
-%474 = OpAll %bool %473
-%475 = OpLogicalAnd %bool %470 %474
-OpBranch %441
-%441 = OpLabel
-%476 = OpPhi %bool %false %414 %475 %440
-OpStore %_0_ok %476
-%477 = OpLoad %bool %_0_ok
-OpSelectionMerge %479 None
-OpBranchConditional %477 %478 %479
-%478 = OpLabel
-%481 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%482 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%483 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%480 = OpCompositeConstruct %mat3v3float %481 %482 %483
-%484 = OpCompositeConstruct %v3float %float_4 %float_4 %float_4
-%485 = OpCompositeConstruct %mat3v3float %484 %484 %484
-%486 = OpCompositeExtract %v3float %485 0
-%487 = OpCompositeExtract %v3float %480 0
-%488 = OpFSub %v3float %486 %487
-%489 = OpCompositeExtract %v3float %485 1
-%490 = OpCompositeExtract %v3float %480 1
-%491 = OpFSub %v3float %489 %490
-%492 = OpCompositeExtract %v3float %485 2
-%493 = OpCompositeExtract %v3float %480 2
-%494 = OpFSub %v3float %492 %493
-%495 = OpCompositeConstruct %mat3v3float %488 %491 %494
-%496 = OpCompositeConstruct %v3float %float_2 %float_4 %float_4
-%497 = OpCompositeConstruct %v3float %float_4 %float_2 %float_4
-%498 = OpCompositeConstruct %v3float %float_4 %float_4 %float_2
-%499 = OpCompositeConstruct %mat3v3float %496 %497 %498
-%500 = OpCompositeExtract %v3float %495 0
-%501 = OpCompositeExtract %v3float %499 0
-%502 = OpFOrdEqual %v3bool %500 %501
-%503 = OpAll %bool %502
-%504 = OpCompositeExtract %v3float %495 1
-%505 = OpCompositeExtract %v3float %499 1
-%506 = OpFOrdEqual %v3bool %504 %505
-%507 = OpAll %bool %506
-%508 = OpLogicalAnd %bool %503 %507
-%509 = OpCompositeExtract %v3float %495 2
-%510 = OpCompositeExtract %v3float %499 2
-%511 = OpFOrdEqual %v3bool %509 %510
-%512 = OpAll %bool %511
-%513 = OpLogicalAnd %bool %508 %512
-OpBranch %479
-%479 = OpLabel
-%514 = OpPhi %bool %false %441 %513 %478
-OpStore %_0_ok %514
-%515 = OpLoad %bool %_0_ok
-OpSelectionMerge %517 None
-OpBranchConditional %515 %516 %517
-%516 = OpLabel
-%519 = OpCompositeConstruct %v3float %float_2 %float_0 %float_0
-%520 = OpCompositeConstruct %v3float %float_0 %float_2 %float_0
-%521 = OpCompositeConstruct %v3float %float_0 %float_0 %float_2
-%518 = OpCompositeConstruct %mat3v3float %519 %520 %521
-%522 = OpMatrixTimesScalar %mat3v3float %518 %float_4
-%524 = OpCompositeConstruct %v3float %float_8 %float_0 %float_0
-%525 = OpCompositeConstruct %v3float %float_0 %float_8 %float_0
-%526 = OpCompositeConstruct %v3float %float_0 %float_0 %float_8
-%523 = OpCompositeConstruct %mat3v3float %524 %525 %526
-%527 = OpCompositeExtract %v3float %522 0
-%528 = OpCompositeExtract %v3float %523 0
-%529 = OpFOrdEqual %v3bool %527 %528
-%530 = OpAll %bool %529
-%531 = OpCompositeExtract %v3float %522 1
-%532 = OpCompositeExtract %v3float %523 1
-%533 = OpFOrdEqual %v3bool %531 %532
-%534 = OpAll %bool %533
-%535 = OpLogicalAnd %bool %530 %534
-%536 = OpCompositeExtract %v3float %522 2
-%537 = OpCompositeExtract %v3float %523 2
-%538 = OpFOrdEqual %v3bool %536 %537
-%539 = OpAll %bool %538
-%540 = OpLogicalAnd %bool %535 %539
-OpBranch %517
-%517 = OpLabel
-%541 = OpPhi %bool %false %479 %540 %516
-OpStore %_0_ok %541
-%542 = OpLoad %bool %_0_ok
-OpSelectionMerge %544 None
-OpBranchConditional %542 %543 %544
-%543 = OpLabel
-%545 = OpCompositeConstruct %v2float %float_2 %float_2
-%546 = OpCompositeConstruct %v2float %float_2 %float_2
-%547 = OpCompositeConstruct %mat2v2float %545 %546
-%548 = OpCompositeConstruct %v2float %float_4 %float_4
-%549 = OpCompositeConstruct %mat2v2float %548 %548
-%550 = OpCompositeExtract %v2float %549 0
-%551 = OpCompositeExtract %v2float %547 0
-%552 = OpFDiv %v2float %550 %551
-%553 = OpCompositeExtract %v2float %549 1
-%554 = OpCompositeExtract %v2float %547 1
-%555 = OpFDiv %v2float %553 %554
-%556 = OpCompositeConstruct %mat2v2float %552 %555
-%557 = OpCompositeConstruct %v2float %float_2 %float_2
-%558 = OpCompositeConstruct %v2float %float_2 %float_2
-%559 = OpCompositeConstruct %mat2v2float %557 %558
-%560 = OpCompositeExtract %v2float %556 0
-%561 = OpCompositeExtract %v2float %559 0
-%562 = OpFOrdEqual %v2bool %560 %561
-%563 = OpAll %bool %562
-%564 = OpCompositeExtract %v2float %556 1
-%565 = OpCompositeExtract %v2float %559 1
-%566 = OpFOrdEqual %v2bool %564 %565
-%567 = OpAll %bool %566
-%568 = OpLogicalAnd %bool %563 %567
-OpBranch %544
-%544 = OpLabel
-%569 = OpPhi %bool %false %517 %568 %543
-OpStore %_0_ok %569
-%570 = OpLoad %bool %_0_ok
-OpSelectionMerge %572 None
-OpBranchConditional %570 %571 %572
-%571 = OpLabel
-%573 = OpFunctionCall %bool %test_half_b
-OpBranch %572
-%572 = OpLabel
-%574 = OpPhi %bool %false %544 %573 %571
-OpSelectionMerge %579 None
-OpBranchConditional %574 %577 %578
-%577 = OpLabel
-%580 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
-%584 = OpLoad %v4float %580
-OpStore %575 %584
-OpBranch %579
-%578 = OpLabel
-%585 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
-%587 = OpLoad %v4float %585
-OpStore %575 %587
-OpBranch %579
-%579 = OpLabel
-%588 = OpLoad %v4float %575
-OpReturnValue %588
-OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.glsl b/third_party/skia/tests/sksl/shared/MatrixScalarSplat.glsl
deleted file mode 100644
index 78957cc38f1e2..0000000000000
--- a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.glsl
+++ /dev/null
@@ -1,28 +0,0 @@
-
-out vec4 sk_FragColor;
-uniform vec4 colorGreen;
-uniform vec4 colorRed;
-bool test_half_b() {
-    bool ok = true;
-    ok = ok && mat3(2.0) + 4.0 == mat3(6.0, 4.0, 4.0, 4.0, 6.0, 4.0, 4.0, 4.0, 6.0);
-    ok = ok && mat3(2.0) - 4.0 == mat3(-2.0, -4.0, -4.0, -4.0, -2.0, -4.0, -4.0, -4.0, -2.0);
-    ok = ok && mat3(2.0) * 4.0 == mat3(8.0);
-    ok = ok && mat3(2.0) / 4.0 == mat3(0.5);
-    ok = ok && 4.0 + mat3(2.0) == mat3(6.0, 4.0, 4.0, 4.0, 6.0, 4.0, 4.0, 4.0, 6.0);
-    ok = ok && 4.0 - mat3(2.0) == mat3(2.0, 4.0, 4.0, 4.0, 2.0, 4.0, 4.0, 4.0, 2.0);
-    ok = ok && 4.0 * mat3(2.0) == mat3(8.0);
-    ok = ok && 4.0 / mat2(2.0, 2.0, 2.0, 2.0) == mat2(2.0, 2.0, 2.0, 2.0);
-    return ok;
-}
-vec4 main() {
-    bool _0_ok = true;
-    _0_ok = _0_ok && mat3(2.0) + 4.0 == mat3(6.0, 4.0, 4.0, 4.0, 6.0, 4.0, 4.0, 4.0, 6.0);
-    _0_ok = _0_ok && mat3(2.0) - 4.0 == mat3(-2.0, -4.0, -4.0, -4.0, -2.0, -4.0, -4.0, -4.0, -2.0);
-    _0_ok = _0_ok && mat3(2.0) * 4.0 == mat3(8.0);
-    _0_ok = _0_ok && mat3(2.0) / 4.0 == mat3(0.5);
-    _0_ok = _0_ok && 4.0 + mat3(2.0) == mat3(6.0, 4.0, 4.0, 4.0, 6.0, 4.0, 4.0, 4.0, 6.0);
-    _0_ok = _0_ok && 4.0 - mat3(2.0) == mat3(2.0, 4.0, 4.0, 4.0, 2.0, 4.0, 4.0, 4.0, 2.0);
-    _0_ok = _0_ok && 4.0 * mat3(2.0) == mat3(8.0);
-    _0_ok = _0_ok && 4.0 / mat2(2.0, 2.0, 2.0, 2.0) == mat2(2.0, 2.0, 2.0, 2.0);
-    return _0_ok && test_half_b() ? colorGreen : colorRed;
-}
diff --git a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.metal b/third_party/skia/tests/sksl/shared/MatrixScalarSplat.metal
deleted file mode 100644
index 242827eae1abd..0000000000000
--- a/third_party/skia/tests/sksl/shared/MatrixScalarSplat.metal
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-using namespace metal;
-struct Uniforms {
-    half4 colorGreen;
-    half4 colorRed;
-};
-struct Inputs {
-};
-struct Outputs {
-    half4 sk_FragColor [[color(0)]];
-};
-
-thread bool operator==(const half3x3 left, const half3x3 right);
-thread bool operator!=(const half3x3 left, const half3x3 right);
-
-thread bool operator==(const half2x2 left, const half2x2 right);
-thread bool operator!=(const half2x2 left, const half2x2 right);
-
-thread bool operator==(const float3x3 left, const float3x3 right);
-thread bool operator!=(const float3x3 left, const float3x3 right);
-
-thread bool operator==(const float2x2 left, const float2x2 right);
-thread bool operator!=(const float2x2 left, const float2x2 right);
-thread bool operator==(const half3x3 left, const half3x3 right) {
-    return all(left[0] == right[0]) &&
-           all(left[1] == right[1]) &&
-           all(left[2] == right[2]);
-}
-thread bool operator!=(const half3x3 left, const half3x3 right) {
-    return !(left == right);
-}
-thread half3x3 operator/(const half3x3 left, const half3x3 right) {
-    return half3x3(left[0] / right[0], left[1] / right[1], left[2] / right[2]);
-}
-thread half3x3& operator/=(thread half3x3& left, thread const half3x3& right) {
-    left = left / right;
-    return left;
-}
-thread bool operator==(const half2x2 left, const half2x2 right) {
-    return all(left[0] == right[0]) &&
-           all(left[1] == right[1]);
-}
-thread bool operator!=(const half2x2 left, const half2x2 right) {
-    return !(left == right);
-}
-thread half2x2 operator/(const half2x2 left, const half2x2 right) {
-    return half2x2(left[0] / right[0], left[1] / right[1]);
-}
-thread half2x2& operator/=(thread half2x2& left, thread const half2x2& right) {
-    left = left / right;
-    return left;
-}
-thread bool operator==(const float3x3 left, const float3x3 right) {
-    return all(left[0] == right[0]) &&
-           all(left[1] == right[1]) &&
-           all(left[2] == right[2]);
-}
-thread bool operator!=(const float3x3 left, const float3x3 right) {
-    return !(left == right);
-}
-thread float3x3 operator/(const float3x3 left, const float3x3 right) {
-    return float3x3(left[0] / right[0], left[1] / right[1], left[2] / right[2]);
-}
-thread float3x3& operator/=(thread float3x3& left, thread const float3x3& right) {
-    left = left / right;
-    return left;
-}
-thread bool operator==(const float2x2 left, const float2x2 right) {
-    return all(left[0] == right[0]) &&
-           all(left[1] == right[1]);
-}
-thread bool operator!=(const float2x2 left, const float2x2 right) {
-    return !(left == right);
-}
-thread float2x2 operator/(const float2x2 left, const float2x2 right) {
-    return float2x2(left[0] / right[0], left[1] / right[1]);
-}
-thread float2x2& operator/=(thread float2x2& left, thread const float2x2& right) {
-    left = left / right;
-    return left;
-}
-bool test_half_b() {
-    bool ok = true;
-    ok = ok && half3x3(2.0h) + (half3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0h) == half3x3(half3(6.0h, 4.0h, 4.0h), half3(4.0h, 6.0h, 4.0h), half3(4.0h, 4.0h, 6.0h));
-    ok = ok && half3x3(2.0h) - (half3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0h) == half3x3(half3(-2.0h, -4.0h, -4.0h), half3(-4.0h, -2.0h, -4.0h), half3(-4.0h, -4.0h, -2.0h));
-    ok = ok && half3x3(2.0h) * 4.0h == half3x3(8.0h);
-    ok = ok && half3x3(2.0h) / (half3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0h) == half3x3(0.5h);
-    ok = ok && (half3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0h) + half3x3(2.0h) == half3x3(half3(6.0h, 4.0h, 4.0h), half3(4.0h, 6.0h, 4.0h), half3(4.0h, 4.0h, 6.0h));
-    ok = ok && (half3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0h) - half3x3(2.0h) == half3x3(half3(2.0h, 4.0h, 4.0h), half3(4.0h, 2.0h, 4.0h), half3(4.0h, 4.0h, 2.0h));
-    ok = ok && 4.0h * half3x3(2.0h) == half3x3(8.0h);
-    ok = ok && (half2x2(1.0, 1.0, 1.0, 1.0) * 4.0h) / half2x2(half2(2.0h, 2.0h), half2(2.0h, 2.0h)) == half2x2(half2(2.0h, 2.0h), half2(2.0h, 2.0h));
-    return ok;
-}
-fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
-    Outputs _out;
-    (void)_out;
-    bool _0_ok = true;
-    _0_ok = _0_ok && float3x3(2.0) + (float3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0) == float3x3(float3(6.0, 4.0, 4.0), float3(4.0, 6.0, 4.0), float3(4.0, 4.0, 6.0));
-    _0_ok = _0_ok && float3x3(2.0) - (float3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0) == float3x3(float3(-2.0, -4.0, -4.0), float3(-4.0, -2.0, -4.0), float3(-4.0, -4.0, -2.0));
-    _0_ok = _0_ok && float3x3(2.0) * 4.0 == float3x3(8.0);
-    _0_ok = _0_ok && float3x3(2.0) / (float3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0) == float3x3(0.5);
-    _0_ok = _0_ok && (float3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0) + float3x3(2.0) == float3x3(float3(6.0, 4.0, 4.0), float3(4.0, 6.0, 4.0), float3(4.0, 4.0, 6.0));
-    _0_ok = _0_ok && (float3x3(1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0) * 4.0) - float3x3(2.0) == float3x3(float3(2.0, 4.0, 4.0), float3(4.0, 2.0, 4.0), float3(4.0, 4.0, 2.0));
-    _0_ok = _0_ok && 4.0 * float3x3(2.0) == float3x3(8.0);
-    _0_ok = _0_ok && (float2x2(1.0, 1.0, 1.0, 1.0) * 4.0) / float2x2(float2(2.0, 2.0), float2(2.0, 2.0)) == float2x2(float2(2.0, 2.0), float2(2.0, 2.0));
-    _out.sk_FragColor = _0_ok && test_half_b() ? _uniforms.colorGreen : _uniforms.colorRed;
-    return _out;
-}
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz26167.glsl b/third_party/skia/tests/sksl/shared/Ossfuzz26167.glsl
index 041b24bfb9797..29335207851d2 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz26167.glsl
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz26167.glsl
@@ -1,4 +1,3 @@
 
 void main() {
-    false;
 }
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz26167.metal b/third_party/skia/tests/sksl/shared/Ossfuzz26167.metal
index 51be5174cbff2..110caabb4feaf 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz26167.metal
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz26167.metal
@@ -9,6 +9,5 @@ struct Outputs {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    false;
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz28904.glsl b/third_party/skia/tests/sksl/shared/Ossfuzz28904.glsl
index b48b713fd640e..604f63cb78ee6 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz28904.glsl
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz28904.glsl
@@ -1,6 +1,5 @@
 
 out vec4 sk_FragColor;
 void main() {
-    false;
     sk_FragColor = vec4(0.0);
 }
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz28904.metal b/third_party/skia/tests/sksl/shared/Ossfuzz28904.metal
index c917a0f6ede21..d76dafc43bbb6 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz28904.metal
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz28904.metal
@@ -9,7 +9,6 @@ struct Outputs {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    false;
     _out.sk_FragColor = half4(0.0h);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz29494.glsl b/third_party/skia/tests/sksl/shared/Ossfuzz29494.glsl
index b48b713fd640e..604f63cb78ee6 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz29494.glsl
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz29494.glsl
@@ -1,6 +1,5 @@
 
 out vec4 sk_FragColor;
 void main() {
-    false;
     sk_FragColor = vec4(0.0);
 }
diff --git a/third_party/skia/tests/sksl/shared/Ossfuzz29494.metal b/third_party/skia/tests/sksl/shared/Ossfuzz29494.metal
index c917a0f6ede21..d76dafc43bbb6 100644
--- a/third_party/skia/tests/sksl/shared/Ossfuzz29494.metal
+++ b/third_party/skia/tests/sksl/shared/Ossfuzz29494.metal
@@ -9,7 +9,6 @@ struct Outputs {
 fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
     Outputs _out;
     (void)_out;
-    false;
     _out.sk_FragColor = half4(0.0h);
     return _out;
 }
diff --git a/third_party/skia/tests/sksl/shared/OutParams.asm.frag b/third_party/skia/tests/sksl/shared/OutParams.asm.frag
index 5621226799c97..8bbc64e52bbef 100644
--- a/third_party/skia/tests/sksl/shared/OutParams.asm.frag
+++ b/third_party/skia/tests/sksl/shared/OutParams.asm.frag
@@ -129,59 +129,73 @@ OpDecorate %228 RelaxedPrecision
 OpDecorate %237 RelaxedPrecision
 OpDecorate %238 RelaxedPrecision
 OpDecorate %h RelaxedPrecision
+OpDecorate %245 RelaxedPrecision
+OpDecorate %247 RelaxedPrecision
 OpDecorate %h2 RelaxedPrecision
+OpDecorate %249 RelaxedPrecision
+OpDecorate %251 RelaxedPrecision
 OpDecorate %h3 RelaxedPrecision
+OpDecorate %253 RelaxedPrecision
+OpDecorate %255 RelaxedPrecision
 OpDecorate %h4 RelaxedPrecision
-OpDecorate %254 RelaxedPrecision
-OpDecorate %256 RelaxedPrecision
 OpDecorate %257 RelaxedPrecision
 OpDecorate %259 RelaxedPrecision
-OpDecorate %260 RelaxedPrecision
-OpDecorate %261 RelaxedPrecision
 OpDecorate %262 RelaxedPrecision
 OpDecorate %264 RelaxedPrecision
 OpDecorate %265 RelaxedPrecision
-OpDecorate %266 RelaxedPrecision
-OpDecorate %h2x2 RelaxedPrecision
-OpDecorate %h3x3 RelaxedPrecision
-OpDecorate %h4x4 RelaxedPrecision
+OpDecorate %267 RelaxedPrecision
+OpDecorate %268 RelaxedPrecision
+OpDecorate %269 RelaxedPrecision
+OpDecorate %270 RelaxedPrecision
+OpDecorate %272 RelaxedPrecision
+OpDecorate %273 RelaxedPrecision
 OpDecorate %274 RelaxedPrecision
+OpDecorate %h2x2 RelaxedPrecision
 OpDecorate %276 RelaxedPrecision
+OpDecorate %278 RelaxedPrecision
+OpDecorate %h3x3 RelaxedPrecision
 OpDecorate %280 RelaxedPrecision
 OpDecorate %282 RelaxedPrecision
+OpDecorate %h4x4 RelaxedPrecision
+OpDecorate %284 RelaxedPrecision
 OpDecorate %286 RelaxedPrecision
 OpDecorate %288 RelaxedPrecision
-OpDecorate %354 RelaxedPrecision
-OpDecorate %358 RelaxedPrecision
-OpDecorate %359 RelaxedPrecision
-OpDecorate %360 RelaxedPrecision
-OpDecorate %361 RelaxedPrecision
-OpDecorate %362 RelaxedPrecision
-OpDecorate %363 RelaxedPrecision
-OpDecorate %364 RelaxedPrecision
-OpDecorate %365 RelaxedPrecision
-OpDecorate %366 RelaxedPrecision
-OpDecorate %367 RelaxedPrecision
-OpDecorate %369 RelaxedPrecision
-OpDecorate %370 RelaxedPrecision
-OpDecorate %371 RelaxedPrecision
-OpDecorate %373 RelaxedPrecision
-OpDecorate %374 RelaxedPrecision
-OpDecorate %375 RelaxedPrecision
-OpDecorate %377 RelaxedPrecision
-OpDecorate %378 RelaxedPrecision
-OpDecorate %379 RelaxedPrecision
-OpDecorate %382 RelaxedPrecision
+OpDecorate %290 RelaxedPrecision
+OpDecorate %294 RelaxedPrecision
+OpDecorate %296 RelaxedPrecision
+OpDecorate %300 RelaxedPrecision
+OpDecorate %302 RelaxedPrecision
+OpDecorate %398 RelaxedPrecision
+OpDecorate %402 RelaxedPrecision
+OpDecorate %403 RelaxedPrecision
+OpDecorate %404 RelaxedPrecision
+OpDecorate %405 RelaxedPrecision
+OpDecorate %406 RelaxedPrecision
+OpDecorate %407 RelaxedPrecision
+OpDecorate %408 RelaxedPrecision
 OpDecorate %409 RelaxedPrecision
-OpDecorate %424 RelaxedPrecision
-OpDecorate %427 RelaxedPrecision
-OpDecorate %430 RelaxedPrecision
-OpDecorate %435 RelaxedPrecision
-OpDecorate %440 RelaxedPrecision
-OpDecorate %444 RelaxedPrecision
-OpDecorate %450 RelaxedPrecision
-OpDecorate %452 RelaxedPrecision
+OpDecorate %410 RelaxedPrecision
+OpDecorate %411 RelaxedPrecision
+OpDecorate %413 RelaxedPrecision
+OpDecorate %414 RelaxedPrecision
+OpDecorate %415 RelaxedPrecision
+OpDecorate %417 RelaxedPrecision
+OpDecorate %418 RelaxedPrecision
+OpDecorate %419 RelaxedPrecision
+OpDecorate %421 RelaxedPrecision
+OpDecorate %422 RelaxedPrecision
+OpDecorate %423 RelaxedPrecision
+OpDecorate %426 RelaxedPrecision
 OpDecorate %453 RelaxedPrecision
+OpDecorate %468 RelaxedPrecision
+OpDecorate %471 RelaxedPrecision
+OpDecorate %474 RelaxedPrecision
+OpDecorate %479 RelaxedPrecision
+OpDecorate %484 RelaxedPrecision
+OpDecorate %488 RelaxedPrecision
+OpDecorate %494 RelaxedPrecision
+OpDecorate %496 RelaxedPrecision
+OpDecorate %497 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -501,253 +515,319 @@ OpFunctionEnd
 %242 = OpFunctionParameter %_ptr_Function_v2float
 %243 = OpLabel
 %h = OpVariable %_ptr_Function_float Function
+%245 = OpVariable %_ptr_Function_float Function
 %h2 = OpVariable %_ptr_Function_v2float Function
+%249 = OpVariable %_ptr_Function_v2float Function
 %h3 = OpVariable %_ptr_Function_v3float Function
+%253 = OpVariable %_ptr_Function_v3float Function
 %h4 = OpVariable %_ptr_Function_v4float Function
-%254 = OpVariable %_ptr_Function_float Function
-%257 = OpVariable %_ptr_Function_v2float Function
-%262 = OpVariable %_ptr_Function_v4float Function
+%257 = OpVariable %_ptr_Function_v4float Function
+%262 = OpVariable %_ptr_Function_float Function
+%265 = OpVariable %_ptr_Function_v2float Function
+%270 = OpVariable %_ptr_Function_v4float Function
 %h2x2 = OpVariable %_ptr_Function_mat2v2float Function
+%276 = OpVariable %_ptr_Function_mat2v2float Function
 %h3x3 = OpVariable %_ptr_Function_mat3v3float Function
+%280 = OpVariable %_ptr_Function_mat3v3float Function
 %h4x4 = OpVariable %_ptr_Function_mat4v4float Function
-%274 = OpVariable %_ptr_Function_v3float Function
-%280 = OpVariable %_ptr_Function_float Function
-%286 = OpVariable %_ptr_Function_float Function
+%284 = OpVariable %_ptr_Function_mat4v4float Function
+%288 = OpVariable %_ptr_Function_v3float Function
+%294 = OpVariable %_ptr_Function_float Function
+%300 = OpVariable %_ptr_Function_float Function
 %i = OpVariable %_ptr_Function_int Function
+%304 = OpVariable %_ptr_Function_int Function
 %i2 = OpVariable %_ptr_Function_v2int Function
+%308 = OpVariable %_ptr_Function_v2int Function
 %i3 = OpVariable %_ptr_Function_v3int Function
+%312 = OpVariable %_ptr_Function_v3int Function
 %i4 = OpVariable %_ptr_Function_v4int Function
-%297 = OpVariable %_ptr_Function_v3int Function
-%303 = OpVariable %_ptr_Function_int Function
+%316 = OpVariable %_ptr_Function_v4int Function
+%319 = OpVariable %_ptr_Function_v3int Function
+%325 = OpVariable %_ptr_Function_int Function
 %f = OpVariable %_ptr_Function_float Function
+%329 = OpVariable %_ptr_Function_float Function
 %f2 = OpVariable %_ptr_Function_v2float Function
+%333 = OpVariable %_ptr_Function_v2float Function
 %f3 = OpVariable %_ptr_Function_v3float Function
+%337 = OpVariable %_ptr_Function_v3float Function
 %f4 = OpVariable %_ptr_Function_v4float Function
-%314 = OpVariable %_ptr_Function_v2float Function
-%320 = OpVariable %_ptr_Function_float Function
+%341 = OpVariable %_ptr_Function_v4float Function
+%344 = OpVariable %_ptr_Function_v2float Function
+%350 = OpVariable %_ptr_Function_float Function
 %f2x2 = OpVariable %_ptr_Function_mat2v2float Function
+%354 = OpVariable %_ptr_Function_mat2v2float Function
 %f3x3 = OpVariable %_ptr_Function_mat3v3float Function
+%358 = OpVariable %_ptr_Function_mat3v3float Function
 %f4x4 = OpVariable %_ptr_Function_mat4v4float Function
-%331 = OpVariable %_ptr_Function_float Function
+%362 = OpVariable %_ptr_Function_mat4v4float Function
+%367 = OpVariable %_ptr_Function_float Function
 %b = OpVariable %_ptr_Function_bool Function
+%371 = OpVariable %_ptr_Function_bool Function
 %b2 = OpVariable %_ptr_Function_v2bool Function
+%375 = OpVariable %_ptr_Function_v2bool Function
 %b3 = OpVariable %_ptr_Function_v3bool Function
+%379 = OpVariable %_ptr_Function_v3bool Function
 %b4 = OpVariable %_ptr_Function_v4bool Function
-%342 = OpVariable %_ptr_Function_v2bool Function
-%348 = OpVariable %_ptr_Function_bool Function
+%383 = OpVariable %_ptr_Function_v4bool Function
+%386 = OpVariable %_ptr_Function_v2bool Function
+%392 = OpVariable %_ptr_Function_bool Function
 %ok = OpVariable %_ptr_Function_bool Function
-%445 = OpVariable %_ptr_Function_v4float Function
-%245 = OpFunctionCall %void %out_half_vh %h
-%247 = OpFunctionCall %void %out_half2_vh2 %h2
-%249 = OpFunctionCall %void %out_half3_vh3 %h3
-%251 = OpFunctionCall %void %out_half4_vh4 %h4
-%252 = OpAccessChain %_ptr_Function_float %h3 %int_1
-%255 = OpFunctionCall %void %out_half_vh %254
-%256 = OpLoad %float %254
-OpStore %252 %256
-%258 = OpFunctionCall %void %out_half2_vh2 %257
-%259 = OpLoad %v2float %257
-%260 = OpLoad %v3float %h3
-%261 = OpVectorShuffle %v3float %260 %259 3 1 4
-OpStore %h3 %261
-%263 = OpFunctionCall %void %out_half4_vh4 %262
-%264 = OpLoad %v4float %262
-%265 = OpLoad %v4float %h4
-%266 = OpVectorShuffle %v4float %265 %264 6 7 4 5
-OpStore %h4 %266
-%268 = OpFunctionCall %void %out_half2x2_vh22 %h2x2
-%270 = OpFunctionCall %void %out_half3x3_vh33 %h3x3
-%272 = OpFunctionCall %void %out_half4x4_vh44 %h4x4
-%273 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_1
-%275 = OpFunctionCall %void %out_half3_vh3 %274
-%276 = OpLoad %v3float %274
-OpStore %273 %276
-%278 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_3
-%279 = OpAccessChain %_ptr_Function_float %278 %int_3
-%281 = OpFunctionCall %void %out_half_vh %280
-%282 = OpLoad %float %280
-OpStore %279 %282
-%284 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
-%285 = OpAccessChain %_ptr_Function_float %284 %int_0
-%287 = OpFunctionCall %void %out_half_vh %286
-%288 = OpLoad %float %286
-OpStore %285 %288
-%290 = OpFunctionCall %void %out_int_vi %i
-%292 = OpFunctionCall %void %out_int2_vi2 %i2
-%294 = OpFunctionCall %void %out_int3_vi3 %i3
-%296 = OpFunctionCall %void %out_int4_vi4 %i4
-%298 = OpFunctionCall %void %out_int3_vi3 %297
-%299 = OpLoad %v3int %297
-%300 = OpLoad %v4int %i4
-%301 = OpVectorShuffle %v4int %300 %299 4 5 6 3
-OpStore %i4 %301
-%302 = OpAccessChain %_ptr_Function_int %i2 %int_1
-%304 = OpFunctionCall %void %out_int_vi %303
-%305 = OpLoad %int %303
-OpStore %302 %305
-%307 = OpFunctionCall %void %out_float_vf %f
-%309 = OpFunctionCall %void %out_float2_vf2 %f2
-%311 = OpFunctionCall %void %out_float3_vf3 %f3
-%313 = OpFunctionCall %void %out_float4_vf4 %f4
-%315 = OpFunctionCall %void %out_float2_vf2 %314
-%316 = OpLoad %v2float %314
-%317 = OpLoad %v3float %f3
-%318 = OpVectorShuffle %v3float %317 %316 3 4 2
-OpStore %f3 %318
-%319 = OpAccessChain %_ptr_Function_float %f2 %int_0
-%321 = OpFunctionCall %void %out_float_vf %320
-%322 = OpLoad %float %320
-OpStore %319 %322
-%324 = OpFunctionCall %void %out_float2x2_vf22 %f2x2
-%326 = OpFunctionCall %void %out_float3x3_vf33 %f3x3
-%328 = OpFunctionCall %void %out_float4x4_vf44 %f4x4
-%329 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
-%330 = OpAccessChain %_ptr_Function_float %329 %int_0
-%332 = OpFunctionCall %void %out_float_vf %331
-%333 = OpLoad %float %331
-OpStore %330 %333
-%335 = OpFunctionCall %void %out_bool_vb %b
-%337 = OpFunctionCall %void %out_bool2_vb2 %b2
-%339 = OpFunctionCall %void %out_bool3_vb3 %b3
-%341 = OpFunctionCall %void %out_bool4_vb4 %b4
-%343 = OpFunctionCall %void %out_bool2_vb2 %342
-%344 = OpLoad %v2bool %342
-%345 = OpLoad %v4bool %b4
-%346 = OpVectorShuffle %v4bool %345 %344 4 1 2 5
-OpStore %b4 %346
-%347 = OpAccessChain %_ptr_Function_bool %b3 %int_2
-%349 = OpFunctionCall %void %out_bool_vb %348
-%350 = OpLoad %bool %348
-OpStore %347 %350
+%489 = OpVariable %_ptr_Function_v4float Function
+%246 = OpFunctionCall %void %out_half_vh %245
+%247 = OpLoad %float %245
+OpStore %h %247
+%250 = OpFunctionCall %void %out_half2_vh2 %249
+%251 = OpLoad %v2float %249
+OpStore %h2 %251
+%254 = OpFunctionCall %void %out_half3_vh3 %253
+%255 = OpLoad %v3float %253
+OpStore %h3 %255
+%258 = OpFunctionCall %void %out_half4_vh4 %257
+%259 = OpLoad %v4float %257
+OpStore %h4 %259
+%260 = OpAccessChain %_ptr_Function_float %h3 %int_1
+%263 = OpFunctionCall %void %out_half_vh %262
+%264 = OpLoad %float %262
+OpStore %260 %264
+%266 = OpFunctionCall %void %out_half2_vh2 %265
+%267 = OpLoad %v2float %265
+%268 = OpLoad %v3float %h3
+%269 = OpVectorShuffle %v3float %268 %267 3 1 4
+OpStore %h3 %269
+%271 = OpFunctionCall %void %out_half4_vh4 %270
+%272 = OpLoad %v4float %270
+%273 = OpLoad %v4float %h4
+%274 = OpVectorShuffle %v4float %273 %272 6 7 4 5
+OpStore %h4 %274
+%277 = OpFunctionCall %void %out_half2x2_vh22 %276
+%278 = OpLoad %mat2v2float %276
+OpStore %h2x2 %278
+%281 = OpFunctionCall %void %out_half3x3_vh33 %280
+%282 = OpLoad %mat3v3float %280
+OpStore %h3x3 %282
+%285 = OpFunctionCall %void %out_half4x4_vh44 %284
+%286 = OpLoad %mat4v4float %284
+OpStore %h4x4 %286
+%287 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_1
+%289 = OpFunctionCall %void %out_half3_vh3 %288
+%290 = OpLoad %v3float %288
+OpStore %287 %290
+%292 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_3
+%293 = OpAccessChain %_ptr_Function_float %292 %int_3
+%295 = OpFunctionCall %void %out_half_vh %294
+%296 = OpLoad %float %294
+OpStore %293 %296
+%298 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
+%299 = OpAccessChain %_ptr_Function_float %298 %int_0
+%301 = OpFunctionCall %void %out_half_vh %300
+%302 = OpLoad %float %300
+OpStore %299 %302
+%305 = OpFunctionCall %void %out_int_vi %304
+%306 = OpLoad %int %304
+OpStore %i %306
+%309 = OpFunctionCall %void %out_int2_vi2 %308
+%310 = OpLoad %v2int %308
+OpStore %i2 %310
+%313 = OpFunctionCall %void %out_int3_vi3 %312
+%314 = OpLoad %v3int %312
+OpStore %i3 %314
+%317 = OpFunctionCall %void %out_int4_vi4 %316
+%318 = OpLoad %v4int %316
+OpStore %i4 %318
+%320 = OpFunctionCall %void %out_int3_vi3 %319
+%321 = OpLoad %v3int %319
+%322 = OpLoad %v4int %i4
+%323 = OpVectorShuffle %v4int %322 %321 4 5 6 3
+OpStore %i4 %323
+%324 = OpAccessChain %_ptr_Function_int %i2 %int_1
+%326 = OpFunctionCall %void %out_int_vi %325
+%327 = OpLoad %int %325
+OpStore %324 %327
+%330 = OpFunctionCall %void %out_float_vf %329
+%331 = OpLoad %float %329
+OpStore %f %331
+%334 = OpFunctionCall %void %out_float2_vf2 %333
+%335 = OpLoad %v2float %333
+OpStore %f2 %335
+%338 = OpFunctionCall %void %out_float3_vf3 %337
+%339 = OpLoad %v3float %337
+OpStore %f3 %339
+%342 = OpFunctionCall %void %out_float4_vf4 %341
+%343 = OpLoad %v4float %341
+OpStore %f4 %343
+%345 = OpFunctionCall %void %out_float2_vf2 %344
+%346 = OpLoad %v2float %344
+%347 = OpLoad %v3float %f3
+%348 = OpVectorShuffle %v3float %347 %346 3 4 2
+OpStore %f3 %348
+%349 = OpAccessChain %_ptr_Function_float %f2 %int_0
+%351 = OpFunctionCall %void %out_float_vf %350
+%352 = OpLoad %float %350
+OpStore %349 %352
+%355 = OpFunctionCall %void %out_float2x2_vf22 %354
+%356 = OpLoad %mat2v2float %354
+OpStore %f2x2 %356
+%359 = OpFunctionCall %void %out_float3x3_vf33 %358
+%360 = OpLoad %mat3v3float %358
+OpStore %f3x3 %360
+%363 = OpFunctionCall %void %out_float4x4_vf44 %362
+%364 = OpLoad %mat4v4float %362
+OpStore %f4x4 %364
+%365 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
+%366 = OpAccessChain %_ptr_Function_float %365 %int_0
+%368 = OpFunctionCall %void %out_float_vf %367
+%369 = OpLoad %float %367
+OpStore %366 %369
+%372 = OpFunctionCall %void %out_bool_vb %371
+%373 = OpLoad %bool %371
+OpStore %b %373
+%376 = OpFunctionCall %void %out_bool2_vb2 %375
+%377 = OpLoad %v2bool %375
+OpStore %b2 %377
+%380 = OpFunctionCall %void %out_bool3_vb3 %379
+%381 = OpLoad %v3bool %379
+OpStore %b3 %381
+%384 = OpFunctionCall %void %out_bool4_vb4 %383
+%385 = OpLoad %v4bool %383
+OpStore %b4 %385
+%387 = OpFunctionCall %void %out_bool2_vb2 %386
+%388 = OpLoad %v2bool %386
+%389 = OpLoad %v4bool %b4
+%390 = OpVectorShuffle %v4bool %389 %388 4 1 2 5
+OpStore %b4 %390
+%391 = OpAccessChain %_ptr_Function_bool %b3 %int_2
+%393 = OpFunctionCall %void %out_bool_vb %392
+%394 = OpLoad %bool %392
+OpStore %391 %394
 OpStore %ok %true
-%354 = OpLoad %bool %ok
-OpSelectionMerge %356 None
-OpBranchConditional %354 %355 %356
-%355 = OpLabel
-%358 = OpLoad %float %h
-%359 = OpLoad %v2float %h2
-%360 = OpCompositeExtract %float %359 0
-%361 = OpFMul %float %358 %360
-%362 = OpLoad %v3float %h3
-%363 = OpCompositeExtract %float %362 0
-%364 = OpFMul %float %361 %363
-%365 = OpLoad %v4float %h4
-%366 = OpCompositeExtract %float %365 0
-%367 = OpFMul %float %364 %366
-%368 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
-%369 = OpLoad %v2float %368
-%370 = OpCompositeExtract %float %369 0
-%371 = OpFMul %float %367 %370
-%372 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_0
-%373 = OpLoad %v3float %372
-%374 = OpCompositeExtract %float %373 0
-%375 = OpFMul %float %371 %374
-%376 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_0
-%377 = OpLoad %v4float %376
-%378 = OpCompositeExtract %float %377 0
-%379 = OpFMul %float %375 %378
-%380 = OpFOrdEqual %bool %float_1 %379
-OpBranch %356
-%356 = OpLabel
-%381 = OpPhi %bool %false %243 %380 %355
-OpStore %ok %381
-%382 = OpLoad %bool %ok
-OpSelectionMerge %384 None
-OpBranchConditional %382 %383 %384
-%383 = OpLabel
-%385 = OpLoad %float %f
-%386 = OpLoad %v2float %f2
-%387 = OpCompositeExtract %float %386 0
-%388 = OpFMul %float %385 %387
-%389 = OpLoad %v3float %f3
-%390 = OpCompositeExtract %float %389 0
-%391 = OpFMul %float %388 %390
-%392 = OpLoad %v4float %f4
-%393 = OpCompositeExtract %float %392 0
-%394 = OpFMul %float %391 %393
-%395 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
-%396 = OpLoad %v2float %395
-%397 = OpCompositeExtract %float %396 0
-%398 = OpFMul %float %394 %397
-%399 = OpAccessChain %_ptr_Function_v3float %f3x3 %int_0
-%400 = OpLoad %v3float %399
-%401 = OpCompositeExtract %float %400 0
-%402 = OpFMul %float %398 %401
-%403 = OpAccessChain %_ptr_Function_v4float %f4x4 %int_0
-%404 = OpLoad %v4float %403
-%405 = OpCompositeExtract %float %404 0
-%406 = OpFMul %float %402 %405
-%407 = OpFOrdEqual %bool %float_1 %406
-OpBranch %384
-%384 = OpLabel
-%408 = OpPhi %bool %false %356 %407 %383
-OpStore %ok %408
-%409 = OpLoad %bool %ok
-OpSelectionMerge %411 None
-OpBranchConditional %409 %410 %411
-%410 = OpLabel
-%412 = OpLoad %int %i
-%413 = OpLoad %v2int %i2
-%414 = OpCompositeExtract %int %413 0
-%415 = OpIMul %int %412 %414
-%416 = OpLoad %v3int %i3
-%417 = OpCompositeExtract %int %416 0
-%418 = OpIMul %int %415 %417
-%419 = OpLoad %v4int %i4
-%420 = OpCompositeExtract %int %419 0
-%421 = OpIMul %int %418 %420
-%422 = OpIEqual %bool %int_1 %421
-OpBranch %411
-%411 = OpLabel
-%423 = OpPhi %bool %false %384 %422 %410
-OpStore %ok %423
-%424 = OpLoad %bool %ok
-OpSelectionMerge %426 None
-OpBranchConditional %424 %425 %426
-%425 = OpLabel
-%427 = OpLoad %bool %b
-OpSelectionMerge %429 None
-OpBranchConditional %427 %428 %429
+%398 = OpLoad %bool %ok
+OpSelectionMerge %400 None
+OpBranchConditional %398 %399 %400
+%399 = OpLabel
+%402 = OpLoad %float %h
+%403 = OpLoad %v2float %h2
+%404 = OpCompositeExtract %float %403 0
+%405 = OpFMul %float %402 %404
+%406 = OpLoad %v3float %h3
+%407 = OpCompositeExtract %float %406 0
+%408 = OpFMul %float %405 %407
+%409 = OpLoad %v4float %h4
+%410 = OpCompositeExtract %float %409 0
+%411 = OpFMul %float %408 %410
+%412 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
+%413 = OpLoad %v2float %412
+%414 = OpCompositeExtract %float %413 0
+%415 = OpFMul %float %411 %414
+%416 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_0
+%417 = OpLoad %v3float %416
+%418 = OpCompositeExtract %float %417 0
+%419 = OpFMul %float %415 %418
+%420 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_0
+%421 = OpLoad %v4float %420
+%422 = OpCompositeExtract %float %421 0
+%423 = OpFMul %float %419 %422
+%424 = OpFOrdEqual %bool %float_1 %423
+OpBranch %400
+%400 = OpLabel
+%425 = OpPhi %bool %false %243 %424 %399
+OpStore %ok %425
+%426 = OpLoad %bool %ok
+OpSelectionMerge %428 None
+OpBranchConditional %426 %427 %428
+%427 = OpLabel
+%429 = OpLoad %float %f
+%430 = OpLoad %v2float %f2
+%431 = OpCompositeExtract %float %430 0
+%432 = OpFMul %float %429 %431
+%433 = OpLoad %v3float %f3
+%434 = OpCompositeExtract %float %433 0
+%435 = OpFMul %float %432 %434
+%436 = OpLoad %v4float %f4
+%437 = OpCompositeExtract %float %436 0
+%438 = OpFMul %float %435 %437
+%439 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
+%440 = OpLoad %v2float %439
+%441 = OpCompositeExtract %float %440 0
+%442 = OpFMul %float %438 %441
+%443 = OpAccessChain %_ptr_Function_v3float %f3x3 %int_0
+%444 = OpLoad %v3float %443
+%445 = OpCompositeExtract %float %444 0
+%446 = OpFMul %float %442 %445
+%447 = OpAccessChain %_ptr_Function_v4float %f4x4 %int_0
+%448 = OpLoad %v4float %447
+%449 = OpCompositeExtract %float %448 0
+%450 = OpFMul %float %446 %449
+%451 = OpFOrdEqual %bool %float_1 %450
+OpBranch %428
 %428 = OpLabel
-%430 = OpLoad %v2bool %b2
-%431 = OpCompositeExtract %bool %430 0
-OpBranch %429
-%429 = OpLabel
-%432 = OpPhi %bool %false %425 %431 %428
-OpSelectionMerge %434 None
-OpBranchConditional %432 %433 %434
-%433 = OpLabel
-%435 = OpLoad %v3bool %b3
-%436 = OpCompositeExtract %bool %435 0
-OpBranch %434
-%434 = OpLabel
-%437 = OpPhi %bool %false %429 %436 %433
-OpSelectionMerge %439 None
-OpBranchConditional %437 %438 %439
-%438 = OpLabel
-%440 = OpLoad %v4bool %b4
-%441 = OpCompositeExtract %bool %440 0
-OpBranch %439
-%439 = OpLabel
-%442 = OpPhi %bool %false %434 %441 %438
-OpBranch %426
-%426 = OpLabel
-%443 = OpPhi %bool %false %411 %442 %439
-OpStore %ok %443
-%444 = OpLoad %bool %ok
-OpSelectionMerge %448 None
-OpBranchConditional %444 %446 %447
-%446 = OpLabel
-%449 = OpAccessChain %_ptr_Uniform_v4float %32 %int_0
-%450 = OpLoad %v4float %449
-OpStore %445 %450
-OpBranch %448
-%447 = OpLabel
-%451 = OpAccessChain %_ptr_Uniform_v4float %32 %int_1
-%452 = OpLoad %v4float %451
-OpStore %445 %452
-OpBranch %448
-%448 = OpLabel
-%453 = OpLoad %v4float %445
-OpReturnValue %453
+%452 = OpPhi %bool %false %400 %451 %427
+OpStore %ok %452
+%453 = OpLoad %bool %ok
+OpSelectionMerge %455 None
+OpBranchConditional %453 %454 %455
+%454 = OpLabel
+%456 = OpLoad %int %i
+%457 = OpLoad %v2int %i2
+%458 = OpCompositeExtract %int %457 0
+%459 = OpIMul %int %456 %458
+%460 = OpLoad %v3int %i3
+%461 = OpCompositeExtract %int %460 0
+%462 = OpIMul %int %459 %461
+%463 = OpLoad %v4int %i4
+%464 = OpCompositeExtract %int %463 0
+%465 = OpIMul %int %462 %464
+%466 = OpIEqual %bool %int_1 %465
+OpBranch %455
+%455 = OpLabel
+%467 = OpPhi %bool %false %428 %466 %454
+OpStore %ok %467
+%468 = OpLoad %bool %ok
+OpSelectionMerge %470 None
+OpBranchConditional %468 %469 %470
+%469 = OpLabel
+%471 = OpLoad %bool %b
+OpSelectionMerge %473 None
+OpBranchConditional %471 %472 %473
+%472 = OpLabel
+%474 = OpLoad %v2bool %b2
+%475 = OpCompositeExtract %bool %474 0
+OpBranch %473
+%473 = OpLabel
+%476 = OpPhi %bool %false %469 %475 %472
+OpSelectionMerge %478 None
+OpBranchConditional %476 %477 %478
+%477 = OpLabel
+%479 = OpLoad %v3bool %b3
+%480 = OpCompositeExtract %bool %479 0
+OpBranch %478
+%478 = OpLabel
+%481 = OpPhi %bool %false %473 %480 %477
+OpSelectionMerge %483 None
+OpBranchConditional %481 %482 %483
+%482 = OpLabel
+%484 = OpLoad %v4bool %b4
+%485 = OpCompositeExtract %bool %484 0
+OpBranch %483
+%483 = OpLabel
+%486 = OpPhi %bool %false %478 %485 %482
+OpBranch %470
+%470 = OpLabel
+%487 = OpPhi %bool %false %455 %486 %483
+OpStore %ok %487
+%488 = OpLoad %bool %ok
+OpSelectionMerge %492 None
+OpBranchConditional %488 %490 %491
+%490 = OpLabel
+%493 = OpAccessChain %_ptr_Uniform_v4float %32 %int_0
+%494 = OpLoad %v4float %493
+OpStore %489 %494
+OpBranch %492
+%491 = OpLabel
+%495 = OpAccessChain %_ptr_Uniform_v4float %32 %int_1
+%496 = OpLoad %v4float %495
+OpStore %489 %496
+OpBranch %492
+%492 = OpLabel
+%497 = OpLoad %v4float %489
+OpReturnValue %497
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.asm.frag b/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.asm.frag
new file mode 100644
index 0000000000000..7aa5d7cf36cbc
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.asm.frag
@@ -0,0 +1,117 @@
+OpCapability Shader
+%1 = OpExtInstImport "GLSL.std.450"
+OpMemoryModel Logical GLSL450
+OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
+OpExecutionMode %_entrypoint_v OriginUpperLeft
+OpName %sk_FragColor "sk_FragColor"
+OpName %sk_Clockwise "sk_Clockwise"
+OpName %_UniformBuffer "_UniformBuffer"
+OpMemberName %_UniformBuffer 0 "colorGreen"
+OpMemberName %_UniformBuffer 1 "colorRed"
+OpName %_entrypoint_v "_entrypoint_v"
+OpName %out_params_are_distinct_bhh "out_params_are_distinct_bhh"
+OpName %main "main"
+OpName %x "x"
+OpDecorate %sk_FragColor RelaxedPrecision
+OpDecorate %sk_FragColor Location 0
+OpDecorate %sk_FragColor Index 0
+OpDecorate %sk_Clockwise BuiltIn FrontFacing
+OpMemberDecorate %_UniformBuffer 0 Offset 0
+OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
+OpMemberDecorate %_UniformBuffer 1 Offset 16
+OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
+OpDecorate %_UniformBuffer Block
+OpDecorate %11 Binding 0
+OpDecorate %11 DescriptorSet 0
+OpDecorate %32 RelaxedPrecision
+OpDecorate %36 RelaxedPrecision
+OpDecorate %x RelaxedPrecision
+OpDecorate %43 RelaxedPrecision
+OpDecorate %44 RelaxedPrecision
+OpDecorate %46 RelaxedPrecision
+OpDecorate %47 RelaxedPrecision
+OpDecorate %57 RelaxedPrecision
+OpDecorate %60 RelaxedPrecision
+OpDecorate %61 RelaxedPrecision
+%float = OpTypeFloat 32
+%v4float = OpTypeVector %float 4
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+%sk_FragColor = OpVariable %_ptr_Output_v4float Output
+%bool = OpTypeBool
+%_ptr_Input_bool = OpTypePointer Input %bool
+%sk_Clockwise = OpVariable %_ptr_Input_bool Input
+%_UniformBuffer = OpTypeStruct %v4float %v4float
+%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
+%11 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
+%void = OpTypeVoid
+%16 = OpTypeFunction %void
+%v2float = OpTypeVector %float 2
+%float_0 = OpConstant %float 0
+%20 = OpConstantComposite %v2float %float_0 %float_0
+%_ptr_Function_v2float = OpTypePointer Function %v2float
+%_ptr_Function_float = OpTypePointer Function %float
+%24 = OpTypeFunction %bool %_ptr_Function_float %_ptr_Function_float
+%float_1 = OpConstant %float 1
+%float_2 = OpConstant %float 2
+%false = OpConstantFalse %bool
+%39 = OpTypeFunction %v4float %_ptr_Function_v2float
+%_ptr_Function_v4float = OpTypePointer Function %v4float
+%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
+%int = OpTypeInt 32 1
+%int_0 = OpConstant %int 0
+%int_1 = OpConstant %int 1
+%_entrypoint_v = OpFunction %void None %16
+%17 = OpLabel
+%21 = OpVariable %_ptr_Function_v2float Function
+OpStore %21 %20
+%23 = OpFunctionCall %v4float %main %21
+OpStore %sk_FragColor %23
+OpReturn
+OpFunctionEnd
+%out_params_are_distinct_bhh = OpFunction %bool None %24
+%26 = OpFunctionParameter %_ptr_Function_float
+%27 = OpFunctionParameter %_ptr_Function_float
+%28 = OpLabel
+OpStore %26 %float_1
+OpStore %27 %float_2
+%32 = OpLoad %float %26
+%33 = OpFOrdEqual %bool %32 %float_1
+OpSelectionMerge %35 None
+OpBranchConditional %33 %34 %35
+%34 = OpLabel
+%36 = OpLoad %float %27
+%37 = OpFOrdEqual %bool %36 %float_2
+OpBranch %35
+%35 = OpLabel
+%38 = OpPhi %bool %false %28 %37 %34
+OpReturnValue %38
+OpFunctionEnd
+%main = OpFunction %v4float None %39
+%40 = OpFunctionParameter %_ptr_Function_v2float
+%41 = OpLabel
+%x = OpVariable %_ptr_Function_float Function
+%43 = OpVariable %_ptr_Function_float Function
+%44 = OpVariable %_ptr_Function_float Function
+%48 = OpVariable %_ptr_Function_v4float Function
+OpStore %x %float_0
+%45 = OpFunctionCall %bool %out_params_are_distinct_bhh %43 %44
+%46 = OpLoad %float %43
+OpStore %x %46
+%47 = OpLoad %float %44
+OpStore %x %47
+OpSelectionMerge %52 None
+OpBranchConditional %45 %50 %51
+%50 = OpLabel
+%53 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0
+%57 = OpLoad %v4float %53
+OpStore %48 %57
+OpBranch %52
+%51 = OpLabel
+%58 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1
+%60 = OpLoad %v4float %58
+OpStore %48 %60
+OpBranch %52
+%52 = OpLabel
+%61 = OpLoad %v4float %48
+OpReturnValue %61
+OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.glsl b/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.glsl
similarity index 100%
rename from third_party/skia/tests/sksl/inliner/InlinerHonorsGLSLOutParamSemantics.glsl
rename to third_party/skia/tests/sksl/shared/OutParamsAreDistinct.glsl
diff --git a/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.metal b/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.metal
new file mode 100644
index 0000000000000..ae4561ab484b8
--- /dev/null
+++ b/third_party/skia/tests/sksl/shared/OutParamsAreDistinct.metal
@@ -0,0 +1,33 @@
+#include <metal_stdlib>
+#include <simd/simd.h>
+using namespace metal;
+struct Uniforms {
+    half4 colorGreen;
+    half4 colorRed;
+};
+struct Inputs {
+};
+struct Outputs {
+    half4 sk_FragColor [[color(0)]];
+};
+bool out_params_are_distinct_bhh(thread half& x, thread half& y);
+bool _skOutParamHelper0_out_params_are_distinct_bhh(thread half& x, thread half&) {
+    half _var0;
+    half _var1;
+    bool _skResult = out_params_are_distinct_bhh(_var0, _var1);
+    x = _var0;
+    x = _var1;
+    return _skResult;
+}
+bool out_params_are_distinct_bhh(thread half& x, thread half& y) {
+    x = 1.0h;
+    y = 2.0h;
+    return x == 1.0h && y == 2.0h;
+}
+fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
+    Outputs _out;
+    (void)_out;
+    half x = 0.0h;
+    _out.sk_FragColor =     _skOutParamHelper0_out_params_are_distinct_bhh(x, x) ? _uniforms.colorGreen : _uniforms.colorRed;
+    return _out;
+}
diff --git a/third_party/skia/tests/sksl/shared/OutParamsNoInline.asm.frag b/third_party/skia/tests/sksl/shared/OutParamsNoInline.asm.frag
deleted file mode 100644
index 5621226799c97..0000000000000
--- a/third_party/skia/tests/sksl/shared/OutParamsNoInline.asm.frag
+++ /dev/null
@@ -1,753 +0,0 @@
-OpCapability Shader
-%1 = OpExtInstImport "GLSL.std.450"
-OpMemoryModel Logical GLSL450
-OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
-OpExecutionMode %_entrypoint_v OriginUpperLeft
-OpName %sk_FragColor "sk_FragColor"
-OpName %sk_Clockwise "sk_Clockwise"
-OpName %_UniformBuffer "_UniformBuffer"
-OpMemberName %_UniformBuffer 0 "colorGreen"
-OpMemberName %_UniformBuffer 1 "colorRed"
-OpMemberName %_UniformBuffer 2 "colorWhite"
-OpName %_entrypoint_v "_entrypoint_v"
-OpName %out_half_vh "out_half_vh"
-OpName %out_half2_vh2 "out_half2_vh2"
-OpName %out_half3_vh3 "out_half3_vh3"
-OpName %out_half4_vh4 "out_half4_vh4"
-OpName %out_half2x2_vh22 "out_half2x2_vh22"
-OpName %out_half3x3_vh33 "out_half3x3_vh33"
-OpName %out_half4x4_vh44 "out_half4x4_vh44"
-OpName %out_int_vi "out_int_vi"
-OpName %out_int2_vi2 "out_int2_vi2"
-OpName %out_int3_vi3 "out_int3_vi3"
-OpName %out_int4_vi4 "out_int4_vi4"
-OpName %out_float_vf "out_float_vf"
-OpName %out_float2_vf2 "out_float2_vf2"
-OpName %out_float3_vf3 "out_float3_vf3"
-OpName %out_float4_vf4 "out_float4_vf4"
-OpName %out_float2x2_vf22 "out_float2x2_vf22"
-OpName %out_float3x3_vf33 "out_float3x3_vf33"
-OpName %out_float4x4_vf44 "out_float4x4_vf44"
-OpName %out_bool_vb "out_bool_vb"
-OpName %out_bool2_vb2 "out_bool2_vb2"
-OpName %out_bool3_vb3 "out_bool3_vb3"
-OpName %out_bool4_vb4 "out_bool4_vb4"
-OpName %main "main"
-OpName %h "h"
-OpName %h2 "h2"
-OpName %h3 "h3"
-OpName %h4 "h4"
-OpName %h2x2 "h2x2"
-OpName %h3x3 "h3x3"
-OpName %h4x4 "h4x4"
-OpName %i "i"
-OpName %i2 "i2"
-OpName %i3 "i3"
-OpName %i4 "i4"
-OpName %f "f"
-OpName %f2 "f2"
-OpName %f3 "f3"
-OpName %f4 "f4"
-OpName %f2x2 "f2x2"
-OpName %f3x3 "f3x3"
-OpName %f4x4 "f4x4"
-OpName %b "b"
-OpName %b2 "b2"
-OpName %b3 "b3"
-OpName %b4 "b4"
-OpName %ok "ok"
-OpDecorate %sk_FragColor RelaxedPrecision
-OpDecorate %sk_FragColor Location 0
-OpDecorate %sk_FragColor Index 0
-OpDecorate %sk_Clockwise BuiltIn FrontFacing
-OpMemberDecorate %_UniformBuffer 0 Offset 0
-OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
-OpMemberDecorate %_UniformBuffer 1 Offset 16
-OpMemberDecorate %_UniformBuffer 1 RelaxedPrecision
-OpMemberDecorate %_UniformBuffer 2 Offset 32
-OpMemberDecorate %_UniformBuffer 2 RelaxedPrecision
-OpDecorate %_UniformBuffer Block
-OpDecorate %32 Binding 0
-OpDecorate %32 DescriptorSet 0
-OpDecorate %53 RelaxedPrecision
-OpDecorate %54 RelaxedPrecision
-OpDecorate %59 RelaxedPrecision
-OpDecorate %60 RelaxedPrecision
-OpDecorate %61 RelaxedPrecision
-OpDecorate %68 RelaxedPrecision
-OpDecorate %69 RelaxedPrecision
-OpDecorate %70 RelaxedPrecision
-OpDecorate %76 RelaxedPrecision
-OpDecorate %77 RelaxedPrecision
-OpDecorate %78 RelaxedPrecision
-OpDecorate %85 RelaxedPrecision
-OpDecorate %86 RelaxedPrecision
-OpDecorate %87 RelaxedPrecision
-OpDecorate %88 RelaxedPrecision
-OpDecorate %89 RelaxedPrecision
-OpDecorate %96 RelaxedPrecision
-OpDecorate %97 RelaxedPrecision
-OpDecorate %98 RelaxedPrecision
-OpDecorate %99 RelaxedPrecision
-OpDecorate %100 RelaxedPrecision
-OpDecorate %101 RelaxedPrecision
-OpDecorate %108 RelaxedPrecision
-OpDecorate %109 RelaxedPrecision
-OpDecorate %110 RelaxedPrecision
-OpDecorate %111 RelaxedPrecision
-OpDecorate %112 RelaxedPrecision
-OpDecorate %113 RelaxedPrecision
-OpDecorate %114 RelaxedPrecision
-OpDecorate %120 RelaxedPrecision
-OpDecorate %121 RelaxedPrecision
-OpDecorate %129 RelaxedPrecision
-OpDecorate %130 RelaxedPrecision
-OpDecorate %139 RelaxedPrecision
-OpDecorate %140 RelaxedPrecision
-OpDecorate %149 RelaxedPrecision
-OpDecorate %150 RelaxedPrecision
-OpDecorate %156 RelaxedPrecision
-OpDecorate %157 RelaxedPrecision
-OpDecorate %161 RelaxedPrecision
-OpDecorate %162 RelaxedPrecision
-OpDecorate %167 RelaxedPrecision
-OpDecorate %168 RelaxedPrecision
-OpDecorate %173 RelaxedPrecision
-OpDecorate %174 RelaxedPrecision
-OpDecorate %179 RelaxedPrecision
-OpDecorate %180 RelaxedPrecision
-OpDecorate %187 RelaxedPrecision
-OpDecorate %188 RelaxedPrecision
-OpDecorate %196 RelaxedPrecision
-OpDecorate %197 RelaxedPrecision
-OpDecorate %208 RelaxedPrecision
-OpDecorate %209 RelaxedPrecision
-OpDecorate %217 RelaxedPrecision
-OpDecorate %218 RelaxedPrecision
-OpDecorate %227 RelaxedPrecision
-OpDecorate %228 RelaxedPrecision
-OpDecorate %237 RelaxedPrecision
-OpDecorate %238 RelaxedPrecision
-OpDecorate %h RelaxedPrecision
-OpDecorate %h2 RelaxedPrecision
-OpDecorate %h3 RelaxedPrecision
-OpDecorate %h4 RelaxedPrecision
-OpDecorate %254 RelaxedPrecision
-OpDecorate %256 RelaxedPrecision
-OpDecorate %257 RelaxedPrecision
-OpDecorate %259 RelaxedPrecision
-OpDecorate %260 RelaxedPrecision
-OpDecorate %261 RelaxedPrecision
-OpDecorate %262 RelaxedPrecision
-OpDecorate %264 RelaxedPrecision
-OpDecorate %265 RelaxedPrecision
-OpDecorate %266 RelaxedPrecision
-OpDecorate %h2x2 RelaxedPrecision
-OpDecorate %h3x3 RelaxedPrecision
-OpDecorate %h4x4 RelaxedPrecision
-OpDecorate %274 RelaxedPrecision
-OpDecorate %276 RelaxedPrecision
-OpDecorate %280 RelaxedPrecision
-OpDecorate %282 RelaxedPrecision
-OpDecorate %286 RelaxedPrecision
-OpDecorate %288 RelaxedPrecision
-OpDecorate %354 RelaxedPrecision
-OpDecorate %358 RelaxedPrecision
-OpDecorate %359 RelaxedPrecision
-OpDecorate %360 RelaxedPrecision
-OpDecorate %361 RelaxedPrecision
-OpDecorate %362 RelaxedPrecision
-OpDecorate %363 RelaxedPrecision
-OpDecorate %364 RelaxedPrecision
-OpDecorate %365 RelaxedPrecision
-OpDecorate %366 RelaxedPrecision
-OpDecorate %367 RelaxedPrecision
-OpDecorate %369 RelaxedPrecision
-OpDecorate %370 RelaxedPrecision
-OpDecorate %371 RelaxedPrecision
-OpDecorate %373 RelaxedPrecision
-OpDecorate %374 RelaxedPrecision
-OpDecorate %375 RelaxedPrecision
-OpDecorate %377 RelaxedPrecision
-OpDecorate %378 RelaxedPrecision
-OpDecorate %379 RelaxedPrecision
-OpDecorate %382 RelaxedPrecision
-OpDecorate %409 RelaxedPrecision
-OpDecorate %424 RelaxedPrecision
-OpDecorate %427 RelaxedPrecision
-OpDecorate %430 RelaxedPrecision
-OpDecorate %435 RelaxedPrecision
-OpDecorate %440 RelaxedPrecision
-OpDecorate %444 RelaxedPrecision
-OpDecorate %450 RelaxedPrecision
-OpDecorate %452 RelaxedPrecision
-OpDecorate %453 RelaxedPrecision
-%float = OpTypeFloat 32
-%v4float = OpTypeVector %float 4
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%sk_FragColor = OpVariable %_ptr_Output_v4float Output
-%bool = OpTypeBool
-%_ptr_Input_bool = OpTypePointer Input %bool
-%sk_Clockwise = OpVariable %_ptr_Input_bool Input
-%_UniformBuffer = OpTypeStruct %v4float %v4float %v4float
-%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
-%32 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
-%void = OpTypeVoid
-%37 = OpTypeFunction %void
-%v2float = OpTypeVector %float 2
-%float_0 = OpConstant %float 0
-%41 = OpConstantComposite %v2float %float_0 %float_0
-%_ptr_Function_v2float = OpTypePointer Function %v2float
-%_ptr_Function_float = OpTypePointer Function %float
-%45 = OpTypeFunction %void %_ptr_Function_float
-%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
-%int = OpTypeInt 32 1
-%int_2 = OpConstant %int 2
-%55 = OpTypeFunction %void %_ptr_Function_v2float
-%v3float = OpTypeVector %float 3
-%_ptr_Function_v3float = OpTypePointer Function %v3float
-%63 = OpTypeFunction %void %_ptr_Function_v3float
-%_ptr_Function_v4float = OpTypePointer Function %v4float
-%71 = OpTypeFunction %void %_ptr_Function_v4float
-%mat2v2float = OpTypeMatrix %v2float 2
-%_ptr_Function_mat2v2float = OpTypePointer Function %mat2v2float
-%80 = OpTypeFunction %void %_ptr_Function_mat2v2float
-%mat3v3float = OpTypeMatrix %v3float 3
-%_ptr_Function_mat3v3float = OpTypePointer Function %mat3v3float
-%91 = OpTypeFunction %void %_ptr_Function_mat3v3float
-%mat4v4float = OpTypeMatrix %v4float 4
-%_ptr_Function_mat4v4float = OpTypePointer Function %mat4v4float
-%103 = OpTypeFunction %void %_ptr_Function_mat4v4float
-%_ptr_Function_int = OpTypePointer Function %int
-%115 = OpTypeFunction %void %_ptr_Function_int
-%v2int = OpTypeVector %int 2
-%_ptr_Function_v2int = OpTypePointer Function %v2int
-%124 = OpTypeFunction %void %_ptr_Function_v2int
-%v3int = OpTypeVector %int 3
-%_ptr_Function_v3int = OpTypePointer Function %v3int
-%134 = OpTypeFunction %void %_ptr_Function_v3int
-%v4int = OpTypeVector %int 4
-%_ptr_Function_v4int = OpTypePointer Function %v4int
-%144 = OpTypeFunction %void %_ptr_Function_v4int
-%_ptr_Function_bool = OpTypePointer Function %bool
-%203 = OpTypeFunction %void %_ptr_Function_bool
-%v2bool = OpTypeVector %bool 2
-%_ptr_Function_v2bool = OpTypePointer Function %v2bool
-%212 = OpTypeFunction %void %_ptr_Function_v2bool
-%v3bool = OpTypeVector %bool 3
-%_ptr_Function_v3bool = OpTypePointer Function %v3bool
-%222 = OpTypeFunction %void %_ptr_Function_v3bool
-%v4bool = OpTypeVector %bool 4
-%_ptr_Function_v4bool = OpTypePointer Function %v4bool
-%232 = OpTypeFunction %void %_ptr_Function_v4bool
-%241 = OpTypeFunction %v4float %_ptr_Function_v2float
-%int_1 = OpConstant %int 1
-%int_3 = OpConstant %int 3
-%int_0 = OpConstant %int 0
-%true = OpConstantTrue %bool
-%false = OpConstantFalse %bool
-%float_1 = OpConstant %float 1
-%_entrypoint_v = OpFunction %void None %37
-%38 = OpLabel
-%42 = OpVariable %_ptr_Function_v2float Function
-OpStore %42 %41
-%44 = OpFunctionCall %v4float %main %42
-OpStore %sk_FragColor %44
-OpReturn
-OpFunctionEnd
-%out_half_vh = OpFunction %void None %45
-%47 = OpFunctionParameter %_ptr_Function_float
-%48 = OpLabel
-%49 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%53 = OpLoad %v4float %49
-%54 = OpCompositeExtract %float %53 0
-OpStore %47 %54
-OpReturn
-OpFunctionEnd
-%out_half2_vh2 = OpFunction %void None %55
-%56 = OpFunctionParameter %_ptr_Function_v2float
-%57 = OpLabel
-%58 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%59 = OpLoad %v4float %58
-%60 = OpCompositeExtract %float %59 1
-%61 = OpCompositeConstruct %v2float %60 %60
-OpStore %56 %61
-OpReturn
-OpFunctionEnd
-%out_half3_vh3 = OpFunction %void None %63
-%65 = OpFunctionParameter %_ptr_Function_v3float
-%66 = OpLabel
-%67 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%68 = OpLoad %v4float %67
-%69 = OpCompositeExtract %float %68 2
-%70 = OpCompositeConstruct %v3float %69 %69 %69
-OpStore %65 %70
-OpReturn
-OpFunctionEnd
-%out_half4_vh4 = OpFunction %void None %71
-%73 = OpFunctionParameter %_ptr_Function_v4float
-%74 = OpLabel
-%75 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%76 = OpLoad %v4float %75
-%77 = OpCompositeExtract %float %76 3
-%78 = OpCompositeConstruct %v4float %77 %77 %77 %77
-OpStore %73 %78
-OpReturn
-OpFunctionEnd
-%out_half2x2_vh22 = OpFunction %void None %80
-%82 = OpFunctionParameter %_ptr_Function_mat2v2float
-%83 = OpLabel
-%84 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%85 = OpLoad %v4float %84
-%86 = OpCompositeExtract %float %85 0
-%88 = OpCompositeConstruct %v2float %86 %float_0
-%89 = OpCompositeConstruct %v2float %float_0 %86
-%87 = OpCompositeConstruct %mat2v2float %88 %89
-OpStore %82 %87
-OpReturn
-OpFunctionEnd
-%out_half3x3_vh33 = OpFunction %void None %91
-%93 = OpFunctionParameter %_ptr_Function_mat3v3float
-%94 = OpLabel
-%95 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%96 = OpLoad %v4float %95
-%97 = OpCompositeExtract %float %96 1
-%99 = OpCompositeConstruct %v3float %97 %float_0 %float_0
-%100 = OpCompositeConstruct %v3float %float_0 %97 %float_0
-%101 = OpCompositeConstruct %v3float %float_0 %float_0 %97
-%98 = OpCompositeConstruct %mat3v3float %99 %100 %101
-OpStore %93 %98
-OpReturn
-OpFunctionEnd
-%out_half4x4_vh44 = OpFunction %void None %103
-%105 = OpFunctionParameter %_ptr_Function_mat4v4float
-%106 = OpLabel
-%107 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%108 = OpLoad %v4float %107
-%109 = OpCompositeExtract %float %108 2
-%111 = OpCompositeConstruct %v4float %109 %float_0 %float_0 %float_0
-%112 = OpCompositeConstruct %v4float %float_0 %109 %float_0 %float_0
-%113 = OpCompositeConstruct %v4float %float_0 %float_0 %109 %float_0
-%114 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %109
-%110 = OpCompositeConstruct %mat4v4float %111 %112 %113 %114
-OpStore %105 %110
-OpReturn
-OpFunctionEnd
-%out_int_vi = OpFunction %void None %115
-%117 = OpFunctionParameter %_ptr_Function_int
-%118 = OpLabel
-%119 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%120 = OpLoad %v4float %119
-%121 = OpCompositeExtract %float %120 0
-%122 = OpConvertFToS %int %121
-OpStore %117 %122
-OpReturn
-OpFunctionEnd
-%out_int2_vi2 = OpFunction %void None %124
-%126 = OpFunctionParameter %_ptr_Function_v2int
-%127 = OpLabel
-%128 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%129 = OpLoad %v4float %128
-%130 = OpCompositeExtract %float %129 1
-%131 = OpConvertFToS %int %130
-%132 = OpCompositeConstruct %v2int %131 %131
-OpStore %126 %132
-OpReturn
-OpFunctionEnd
-%out_int3_vi3 = OpFunction %void None %134
-%136 = OpFunctionParameter %_ptr_Function_v3int
-%137 = OpLabel
-%138 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%139 = OpLoad %v4float %138
-%140 = OpCompositeExtract %float %139 2
-%141 = OpConvertFToS %int %140
-%142 = OpCompositeConstruct %v3int %141 %141 %141
-OpStore %136 %142
-OpReturn
-OpFunctionEnd
-%out_int4_vi4 = OpFunction %void None %144
-%146 = OpFunctionParameter %_ptr_Function_v4int
-%147 = OpLabel
-%148 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%149 = OpLoad %v4float %148
-%150 = OpCompositeExtract %float %149 3
-%151 = OpConvertFToS %int %150
-%152 = OpCompositeConstruct %v4int %151 %151 %151 %151
-OpStore %146 %152
-OpReturn
-OpFunctionEnd
-%out_float_vf = OpFunction %void None %45
-%153 = OpFunctionParameter %_ptr_Function_float
-%154 = OpLabel
-%155 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%156 = OpLoad %v4float %155
-%157 = OpCompositeExtract %float %156 0
-OpStore %153 %157
-OpReturn
-OpFunctionEnd
-%out_float2_vf2 = OpFunction %void None %55
-%158 = OpFunctionParameter %_ptr_Function_v2float
-%159 = OpLabel
-%160 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%161 = OpLoad %v4float %160
-%162 = OpCompositeExtract %float %161 1
-%163 = OpCompositeConstruct %v2float %162 %162
-OpStore %158 %163
-OpReturn
-OpFunctionEnd
-%out_float3_vf3 = OpFunction %void None %63
-%164 = OpFunctionParameter %_ptr_Function_v3float
-%165 = OpLabel
-%166 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%167 = OpLoad %v4float %166
-%168 = OpCompositeExtract %float %167 2
-%169 = OpCompositeConstruct %v3float %168 %168 %168
-OpStore %164 %169
-OpReturn
-OpFunctionEnd
-%out_float4_vf4 = OpFunction %void None %71
-%170 = OpFunctionParameter %_ptr_Function_v4float
-%171 = OpLabel
-%172 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%173 = OpLoad %v4float %172
-%174 = OpCompositeExtract %float %173 3
-%175 = OpCompositeConstruct %v4float %174 %174 %174 %174
-OpStore %170 %175
-OpReturn
-OpFunctionEnd
-%out_float2x2_vf22 = OpFunction %void None %80
-%176 = OpFunctionParameter %_ptr_Function_mat2v2float
-%177 = OpLabel
-%178 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%179 = OpLoad %v4float %178
-%180 = OpCompositeExtract %float %179 0
-%182 = OpCompositeConstruct %v2float %180 %float_0
-%183 = OpCompositeConstruct %v2float %float_0 %180
-%181 = OpCompositeConstruct %mat2v2float %182 %183
-OpStore %176 %181
-OpReturn
-OpFunctionEnd
-%out_float3x3_vf33 = OpFunction %void None %91
-%184 = OpFunctionParameter %_ptr_Function_mat3v3float
-%185 = OpLabel
-%186 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%187 = OpLoad %v4float %186
-%188 = OpCompositeExtract %float %187 1
-%190 = OpCompositeConstruct %v3float %188 %float_0 %float_0
-%191 = OpCompositeConstruct %v3float %float_0 %188 %float_0
-%192 = OpCompositeConstruct %v3float %float_0 %float_0 %188
-%189 = OpCompositeConstruct %mat3v3float %190 %191 %192
-OpStore %184 %189
-OpReturn
-OpFunctionEnd
-%out_float4x4_vf44 = OpFunction %void None %103
-%193 = OpFunctionParameter %_ptr_Function_mat4v4float
-%194 = OpLabel
-%195 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%196 = OpLoad %v4float %195
-%197 = OpCompositeExtract %float %196 2
-%199 = OpCompositeConstruct %v4float %197 %float_0 %float_0 %float_0
-%200 = OpCompositeConstruct %v4float %float_0 %197 %float_0 %float_0
-%201 = OpCompositeConstruct %v4float %float_0 %float_0 %197 %float_0
-%202 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %197
-%198 = OpCompositeConstruct %mat4v4float %199 %200 %201 %202
-OpStore %193 %198
-OpReturn
-OpFunctionEnd
-%out_bool_vb = OpFunction %void None %203
-%205 = OpFunctionParameter %_ptr_Function_bool
-%206 = OpLabel
-%207 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%208 = OpLoad %v4float %207
-%209 = OpCompositeExtract %float %208 0
-%210 = OpFUnordNotEqual %bool %209 %float_0
-OpStore %205 %210
-OpReturn
-OpFunctionEnd
-%out_bool2_vb2 = OpFunction %void None %212
-%214 = OpFunctionParameter %_ptr_Function_v2bool
-%215 = OpLabel
-%216 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%217 = OpLoad %v4float %216
-%218 = OpCompositeExtract %float %217 1
-%219 = OpFUnordNotEqual %bool %218 %float_0
-%220 = OpCompositeConstruct %v2bool %219 %219
-OpStore %214 %220
-OpReturn
-OpFunctionEnd
-%out_bool3_vb3 = OpFunction %void None %222
-%224 = OpFunctionParameter %_ptr_Function_v3bool
-%225 = OpLabel
-%226 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%227 = OpLoad %v4float %226
-%228 = OpCompositeExtract %float %227 2
-%229 = OpFUnordNotEqual %bool %228 %float_0
-%230 = OpCompositeConstruct %v3bool %229 %229 %229
-OpStore %224 %230
-OpReturn
-OpFunctionEnd
-%out_bool4_vb4 = OpFunction %void None %232
-%234 = OpFunctionParameter %_ptr_Function_v4bool
-%235 = OpLabel
-%236 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2
-%237 = OpLoad %v4float %236
-%238 = OpCompositeExtract %float %237 3
-%239 = OpFUnordNotEqual %bool %238 %float_0
-%240 = OpCompositeConstruct %v4bool %239 %239 %239 %239
-OpStore %234 %240
-OpReturn
-OpFunctionEnd
-%main = OpFunction %v4float None %241
-%242 = OpFunctionParameter %_ptr_Function_v2float
-%243 = OpLabel
-%h = OpVariable %_ptr_Function_float Function
-%h2 = OpVariable %_ptr_Function_v2float Function
-%h3 = OpVariable %_ptr_Function_v3float Function
-%h4 = OpVariable %_ptr_Function_v4float Function
-%254 = OpVariable %_ptr_Function_float Function
-%257 = OpVariable %_ptr_Function_v2float Function
-%262 = OpVariable %_ptr_Function_v4float Function
-%h2x2 = OpVariable %_ptr_Function_mat2v2float Function
-%h3x3 = OpVariable %_ptr_Function_mat3v3float Function
-%h4x4 = OpVariable %_ptr_Function_mat4v4float Function
-%274 = OpVariable %_ptr_Function_v3float Function
-%280 = OpVariable %_ptr_Function_float Function
-%286 = OpVariable %_ptr_Function_float Function
-%i = OpVariable %_ptr_Function_int Function
-%i2 = OpVariable %_ptr_Function_v2int Function
-%i3 = OpVariable %_ptr_Function_v3int Function
-%i4 = OpVariable %_ptr_Function_v4int Function
-%297 = OpVariable %_ptr_Function_v3int Function
-%303 = OpVariable %_ptr_Function_int Function
-%f = OpVariable %_ptr_Function_float Function
-%f2 = OpVariable %_ptr_Function_v2float Function
-%f3 = OpVariable %_ptr_Function_v3float Function
-%f4 = OpVariable %_ptr_Function_v4float Function
-%314 = OpVariable %_ptr_Function_v2float Function
-%320 = OpVariable %_ptr_Function_float Function
-%f2x2 = OpVariable %_ptr_Function_mat2v2float Function
-%f3x3 = OpVariable %_ptr_Function_mat3v3float Function
-%f4x4 = OpVariable %_ptr_Function_mat4v4float Function
-%331 = OpVariable %_ptr_Function_float Function
-%b = OpVariable %_ptr_Function_bool Function
-%b2 = OpVariable %_ptr_Function_v2bool Function
-%b3 = OpVariable %_ptr_Function_v3bool Function
-%b4 = OpVariable %_ptr_Function_v4bool Function
-%342 = OpVariable %_ptr_Function_v2bool Function
-%348 = OpVariable %_ptr_Function_bool Function
-%ok = OpVariable %_ptr_Function_bool Function
-%445 = OpVariable %_ptr_Function_v4float Function
-%245 = OpFunctionCall %void %out_half_vh %h
-%247 = OpFunctionCall %void %out_half2_vh2 %h2
-%249 = OpFunctionCall %void %out_half3_vh3 %h3
-%251 = OpFunctionCall %void %out_half4_vh4 %h4
-%252 = OpAccessChain %_ptr_Function_float %h3 %int_1
-%255 = OpFunctionCall %void %out_half_vh %254
-%256 = OpLoad %float %254
-OpStore %252 %256
-%258 = OpFunctionCall %void %out_half2_vh2 %257
-%259 = OpLoad %v2float %257
-%260 = OpLoad %v3float %h3
-%261 = OpVectorShuffle %v3float %260 %259 3 1 4
-OpStore %h3 %261
-%263 = OpFunctionCall %void %out_half4_vh4 %262
-%264 = OpLoad %v4float %262
-%265 = OpLoad %v4float %h4
-%266 = OpVectorShuffle %v4float %265 %264 6 7 4 5
-OpStore %h4 %266
-%268 = OpFunctionCall %void %out_half2x2_vh22 %h2x2
-%270 = OpFunctionCall %void %out_half3x3_vh33 %h3x3
-%272 = OpFunctionCall %void %out_half4x4_vh44 %h4x4
-%273 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_1
-%275 = OpFunctionCall %void %out_half3_vh3 %274
-%276 = OpLoad %v3float %274
-OpStore %273 %276
-%278 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_3
-%279 = OpAccessChain %_ptr_Function_float %278 %int_3
-%281 = OpFunctionCall %void %out_half_vh %280
-%282 = OpLoad %float %280
-OpStore %279 %282
-%284 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
-%285 = OpAccessChain %_ptr_Function_float %284 %int_0
-%287 = OpFunctionCall %void %out_half_vh %286
-%288 = OpLoad %float %286
-OpStore %285 %288
-%290 = OpFunctionCall %void %out_int_vi %i
-%292 = OpFunctionCall %void %out_int2_vi2 %i2
-%294 = OpFunctionCall %void %out_int3_vi3 %i3
-%296 = OpFunctionCall %void %out_int4_vi4 %i4
-%298 = OpFunctionCall %void %out_int3_vi3 %297
-%299 = OpLoad %v3int %297
-%300 = OpLoad %v4int %i4
-%301 = OpVectorShuffle %v4int %300 %299 4 5 6 3
-OpStore %i4 %301
-%302 = OpAccessChain %_ptr_Function_int %i2 %int_1
-%304 = OpFunctionCall %void %out_int_vi %303
-%305 = OpLoad %int %303
-OpStore %302 %305
-%307 = OpFunctionCall %void %out_float_vf %f
-%309 = OpFunctionCall %void %out_float2_vf2 %f2
-%311 = OpFunctionCall %void %out_float3_vf3 %f3
-%313 = OpFunctionCall %void %out_float4_vf4 %f4
-%315 = OpFunctionCall %void %out_float2_vf2 %314
-%316 = OpLoad %v2float %314
-%317 = OpLoad %v3float %f3
-%318 = OpVectorShuffle %v3float %317 %316 3 4 2
-OpStore %f3 %318
-%319 = OpAccessChain %_ptr_Function_float %f2 %int_0
-%321 = OpFunctionCall %void %out_float_vf %320
-%322 = OpLoad %float %320
-OpStore %319 %322
-%324 = OpFunctionCall %void %out_float2x2_vf22 %f2x2
-%326 = OpFunctionCall %void %out_float3x3_vf33 %f3x3
-%328 = OpFunctionCall %void %out_float4x4_vf44 %f4x4
-%329 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
-%330 = OpAccessChain %_ptr_Function_float %329 %int_0
-%332 = OpFunctionCall %void %out_float_vf %331
-%333 = OpLoad %float %331
-OpStore %330 %333
-%335 = OpFunctionCall %void %out_bool_vb %b
-%337 = OpFunctionCall %void %out_bool2_vb2 %b2
-%339 = OpFunctionCall %void %out_bool3_vb3 %b3
-%341 = OpFunctionCall %void %out_bool4_vb4 %b4
-%343 = OpFunctionCall %void %out_bool2_vb2 %342
-%344 = OpLoad %v2bool %342
-%345 = OpLoad %v4bool %b4
-%346 = OpVectorShuffle %v4bool %345 %344 4 1 2 5
-OpStore %b4 %346
-%347 = OpAccessChain %_ptr_Function_bool %b3 %int_2
-%349 = OpFunctionCall %void %out_bool_vb %348
-%350 = OpLoad %bool %348
-OpStore %347 %350
-OpStore %ok %true
-%354 = OpLoad %bool %ok
-OpSelectionMerge %356 None
-OpBranchConditional %354 %355 %356
-%355 = OpLabel
-%358 = OpLoad %float %h
-%359 = OpLoad %v2float %h2
-%360 = OpCompositeExtract %float %359 0
-%361 = OpFMul %float %358 %360
-%362 = OpLoad %v3float %h3
-%363 = OpCompositeExtract %float %362 0
-%364 = OpFMul %float %361 %363
-%365 = OpLoad %v4float %h4
-%366 = OpCompositeExtract %float %365 0
-%367 = OpFMul %float %364 %366
-%368 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0
-%369 = OpLoad %v2float %368
-%370 = OpCompositeExtract %float %369 0
-%371 = OpFMul %float %367 %370
-%372 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_0
-%373 = OpLoad %v3float %372
-%374 = OpCompositeExtract %float %373 0
-%375 = OpFMul %float %371 %374
-%376 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_0
-%377 = OpLoad %v4float %376
-%378 = OpCompositeExtract %float %377 0
-%379 = OpFMul %float %375 %378
-%380 = OpFOrdEqual %bool %float_1 %379
-OpBranch %356
-%356 = OpLabel
-%381 = OpPhi %bool %false %243 %380 %355
-OpStore %ok %381
-%382 = OpLoad %bool %ok
-OpSelectionMerge %384 None
-OpBranchConditional %382 %383 %384
-%383 = OpLabel
-%385 = OpLoad %float %f
-%386 = OpLoad %v2float %f2
-%387 = OpCompositeExtract %float %386 0
-%388 = OpFMul %float %385 %387
-%389 = OpLoad %v3float %f3
-%390 = OpCompositeExtract %float %389 0
-%391 = OpFMul %float %388 %390
-%392 = OpLoad %v4float %f4
-%393 = OpCompositeExtract %float %392 0
-%394 = OpFMul %float %391 %393
-%395 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0
-%396 = OpLoad %v2float %395
-%397 = OpCompositeExtract %float %396 0
-%398 = OpFMul %float %394 %397
-%399 = OpAccessChain %_ptr_Function_v3float %f3x3 %int_0
-%400 = OpLoad %v3float %399
-%401 = OpCompositeExtract %float %400 0
-%402 = OpFMul %float %398 %401
-%403 = OpAccessChain %_ptr_Function_v4float %f4x4 %int_0
-%404 = OpLoad %v4float %403
-%405 = OpCompositeExtract %float %404 0
-%406 = OpFMul %float %402 %405
-%407 = OpFOrdEqual %bool %float_1 %406
-OpBranch %384
-%384 = OpLabel
-%408 = OpPhi %bool %false %356 %407 %383
-OpStore %ok %408
-%409 = OpLoad %bool %ok
-OpSelectionMerge %411 None
-OpBranchConditional %409 %410 %411
-%410 = OpLabel
-%412 = OpLoad %int %i
-%413 = OpLoad %v2int %i2
-%414 = OpCompositeExtract %int %413 0
-%415 = OpIMul %int %412 %414
-%416 = OpLoad %v3int %i3
-%417 = OpCompositeExtract %int %416 0
-%418 = OpIMul %int %415 %417
-%419 = OpLoad %v4int %i4
-%420 = OpCompositeExtract %int %419 0
-%421 = OpIMul %int %418 %420
-%422 = OpIEqual %bool %int_1 %421
-OpBranch %411
-%411 = OpLabel
-%423 = OpPhi %bool %false %384 %422 %410
-OpStore %ok %423
-%424 = OpLoad %bool %ok
-OpSelectionMerge %426 None
-OpBranchConditional %424 %425 %426
-%425 = OpLabel
-%427 = OpLoad %bool %b
-OpSelectionMerge %429 None
-OpBranchConditional %427 %428 %429
-%428 = OpLabel
-%430 = OpLoad %v2bool %b2
-%431 = OpCompositeExtract %bool %430 0
-OpBranch %429
-%429 = OpLabel
-%432 = OpPhi %bool %false %425 %431 %428
-OpSelectionMerge %434 None
-OpBranchConditional %432 %433 %434
-%433 = OpLabel
-%435 = OpLoad %v3bool %b3
-%436 = OpCompositeExtract %bool %435 0
-OpBranch %434
-%434 = OpLabel
-%437 = OpPhi %bool %false %429 %436 %433
-OpSelectionMerge %439 None
-OpBranchConditional %437 %438 %439
-%438 = OpLabel
-%440 = OpLoad %v4bool %b4
-%441 = OpCompositeExtract %bool %440 0
-OpBranch %439
-%439 = OpLabel
-%442 = OpPhi %bool %false %434 %441 %438
-OpBranch %426
-%426 = OpLabel
-%443 = OpPhi %bool %false %411 %442 %439
-OpStore %ok %443
-%444 = OpLoad %bool %ok
-OpSelectionMerge %448 None
-OpBranchConditional %444 %446 %447
-%446 = OpLabel
-%449 = OpAccessChain %_ptr_Uniform_v4float %32 %int_0
-%450 = OpLoad %v4float %449
-OpStore %445 %450
-OpBranch %448
-%447 = OpLabel
-%451 = OpAccessChain %_ptr_Uniform_v4float %32 %int_1
-%452 = OpLoad %v4float %451
-OpStore %445 %452
-OpBranch %448
-%448 = OpLabel
-%453 = OpLoad %v4float %445
-OpReturnValue %453
-OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/OutParamsNoInline.glsl b/third_party/skia/tests/sksl/shared/OutParamsNoInline.glsl
deleted file mode 100644
index a1fb84dd4d0ae..0000000000000
--- a/third_party/skia/tests/sksl/shared/OutParamsNoInline.glsl
+++ /dev/null
@@ -1,136 +0,0 @@
-
-out vec4 sk_FragColor;
-uniform vec4 colorGreen;
-uniform vec4 colorRed;
-uniform vec4 colorWhite;
-void out_half_vh(out float v) {
-    v = colorWhite.x;
-}
-void out_half2_vh2(out vec2 v) {
-    v = vec2(colorWhite.y);
-}
-void out_half3_vh3(out vec3 v) {
-    v = vec3(colorWhite.z);
-}
-void out_half4_vh4(out vec4 v) {
-    v = vec4(colorWhite.w);
-}
-void out_half2x2_vh22(out mat2 v) {
-    v = mat2(colorWhite.x);
-}
-void out_half3x3_vh33(out mat3 v) {
-    v = mat3(colorWhite.y);
-}
-void out_half4x4_vh44(out mat4 v) {
-    v = mat4(colorWhite.z);
-}
-void out_int_vi(out int v) {
-    v = int(colorWhite.x);
-}
-void out_int2_vi2(out ivec2 v) {
-    v = ivec2(int(colorWhite.y));
-}
-void out_int3_vi3(out ivec3 v) {
-    v = ivec3(int(colorWhite.z));
-}
-void out_int4_vi4(out ivec4 v) {
-    v = ivec4(int(colorWhite.w));
-}
-void out_float_vf(out float v) {
-    v = colorWhite.x;
-}
-void out_float2_vf2(out vec2 v) {
-    v = vec2(colorWhite.y);
-}
-void out_float3_vf3(out vec3 v) {
-    v = vec3(colorWhite.z);
-}
-void out_float4_vf4(out vec4 v) {
-    v = vec4(colorWhite.w);
-}
-void out_float2x2_vf22(out mat2 v) {
-    v = mat2(colorWhite.x);
-}
-void out_float3x3_vf33(out mat3 v) {
-    v = mat3(colorWhite.y);
-}
-void out_float4x4_vf44(out mat4 v) {
-    v = mat4(colorWhite.z);
-}
-void out_bool_vb(out bool v) {
-    v = bool(colorWhite.x);
-}
-void out_bool2_vb2(out bvec2 v) {
-    v = bvec2(bool(colorWhite.y));
-}
-void out_bool3_vb3(out bvec3 v) {
-    v = bvec3(bool(colorWhite.z));
-}
-void out_bool4_vb4(out bvec4 v) {
-    v = bvec4(bool(colorWhite.w));
-}
-vec4 main() {
-    float h;
-    out_half_vh(h);
-    vec2 h2;
-    out_half2_vh2(h2);
-    vec3 h3;
-    out_half3_vh3(h3);
-    vec4 h4;
-    out_half4_vh4(h4);
-    out_half_vh(h3.y);
-    out_half2_vh2(h3.xz);
-    out_half4_vh4(h4.zwxy);
-    mat2 h2x2;
-    out_half2x2_vh22(h2x2);
-    mat3 h3x3;
-    out_half3x3_vh33(h3x3);
-    mat4 h4x4;
-    out_half4x4_vh44(h4x4);
-    out_half3_vh3(h3x3[1]);
-    out_half_vh(h4x4[3].w);
-    out_half_vh(h2x2[0].x);
-    int i;
-    out_int_vi(i);
-    ivec2 i2;
-    out_int2_vi2(i2);
-    ivec3 i3;
-    out_int3_vi3(i3);
-    ivec4 i4;
-    out_int4_vi4(i4);
-    out_int3_vi3(i4.xyz);
-    out_int_vi(i2.y);
-    float f;
-    out_float_vf(f);
-    vec2 f2;
-    out_float2_vf2(f2);
-    vec3 f3;
-    out_float3_vf3(f3);
-    vec4 f4;
-    out_float4_vf4(f4);
-    out_float2_vf2(f3.xy);
-    out_float_vf(f2.x);
-    mat2 f2x2;
-    out_float2x2_vf22(f2x2);
-    mat3 f3x3;
-    out_float3x3_vf33(f3x3);
-    mat4 f4x4;
-    out_float4x4_vf44(f4x4);
-    out_float_vf(f2x2[0].x);
-    bool b;
-    out_bool_vb(b);
-    bvec2 b2;
-    out_bool2_vb2(b2);
-    bvec3 b3;
-    out_bool3_vb3(b3);
-    bvec4 b4;
-    out_bool4_vb4(b4);
-    out_bool2_vb2(b4.xw);
-    out_bool_vb(b3.z);
-    bool ok = true;
-    ok = ok && 1.0 == (((((h * h2.x) * h3.x) * h4.x) * h2x2[0].x) * h3x3[0].x) * h4x4[0].x;
-    ok = ok && 1.0 == (((((f * f2.x) * f3.x) * f4.x) * f2x2[0].x) * f3x3[0].x) * f4x4[0].x;
-    ok = ok && 1 == ((i * i2.x) * i3.x) * i4.x;
-    ok = ok && (((b && b2.x) && b3.x) && b4.x);
-    return ok ? colorGreen : colorRed;
-}
diff --git a/third_party/skia/tests/sksl/shared/OutParamsNoInline.metal b/third_party/skia/tests/sksl/shared/OutParamsNoInline.metal
deleted file mode 100644
index 3c154d0bc9fe9..0000000000000
--- a/third_party/skia/tests/sksl/shared/OutParamsNoInline.metal
+++ /dev/null
@@ -1,357 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-using namespace metal;
-struct Uniforms {
-    half4 colorGreen;
-    half4 colorRed;
-    half4 colorWhite;
-};
-struct Inputs {
-};
-struct Outputs {
-    half4 sk_FragColor [[color(0)]];
-};
-void out_half_vh(Uniforms _uniforms, thread half& v);
-void _skOutParamHelper0_out_half_vh(Uniforms _uniforms, thread half& h) {
-    half _var0;
-    out_half_vh(_uniforms, _var0);
-    h = _var0;
-}
-void out_half2_vh2(Uniforms _uniforms, thread half2& v);
-void _skOutParamHelper1_out_half2_vh2(Uniforms _uniforms, thread half2& h2) {
-    half2 _var0;
-    out_half2_vh2(_uniforms, _var0);
-    h2 = _var0;
-}
-void out_half3_vh3(Uniforms _uniforms, thread half3& v);
-void _skOutParamHelper2_out_half3_vh3(Uniforms _uniforms, thread half3& h3) {
-    half3 _var0;
-    out_half3_vh3(_uniforms, _var0);
-    h3 = _var0;
-}
-void out_half4_vh4(Uniforms _uniforms, thread half4& v);
-void _skOutParamHelper3_out_half4_vh4(Uniforms _uniforms, thread half4& h4) {
-    half4 _var0;
-    out_half4_vh4(_uniforms, _var0);
-    h4 = _var0;
-}
-void out_half_vh(Uniforms _uniforms, thread half& v);
-void _skOutParamHelper4_out_half_vh(Uniforms _uniforms, thread half3& h3) {
-    half _var0;
-    out_half_vh(_uniforms, _var0);
-    h3.y = _var0;
-}
-void out_half2_vh2(Uniforms _uniforms, thread half2& v);
-void _skOutParamHelper5_out_half2_vh2(Uniforms _uniforms, thread half3& h3) {
-    half2 _var0;
-    out_half2_vh2(_uniforms, _var0);
-    h3.xz = _var0;
-}
-void out_half4_vh4(Uniforms _uniforms, thread half4& v);
-void _skOutParamHelper6_out_half4_vh4(Uniforms _uniforms, thread half4& h4) {
-    half4 _var0;
-    out_half4_vh4(_uniforms, _var0);
-    h4.zwxy = _var0;
-}
-void out_half2x2_vh22(Uniforms _uniforms, thread half2x2& v);
-void _skOutParamHelper7_out_half2x2_vh22(Uniforms _uniforms, thread half2x2& h2x2) {
-    half2x2 _var0;
-    out_half2x2_vh22(_uniforms, _var0);
-    h2x2 = _var0;
-}
-void out_half3x3_vh33(Uniforms _uniforms, thread half3x3& v);
-void _skOutParamHelper8_out_half3x3_vh33(Uniforms _uniforms, thread half3x3& h3x3) {
-    half3x3 _var0;
-    out_half3x3_vh33(_uniforms, _var0);
-    h3x3 = _var0;
-}
-void out_half4x4_vh44(Uniforms _uniforms, thread half4x4& v);
-void _skOutParamHelper9_out_half4x4_vh44(Uniforms _uniforms, thread half4x4& h4x4) {
-    half4x4 _var0;
-    out_half4x4_vh44(_uniforms, _var0);
-    h4x4 = _var0;
-}
-void out_half3_vh3(Uniforms _uniforms, thread half3& v);
-void _skOutParamHelper10_out_half3_vh3(Uniforms _uniforms, thread half3x3& h3x3) {
-    half3 _var0;
-    out_half3_vh3(_uniforms, _var0);
-    h3x3[1] = _var0;
-}
-void out_half_vh(Uniforms _uniforms, thread half& v);
-void _skOutParamHelper11_out_half_vh(Uniforms _uniforms, thread half4x4& h4x4) {
-    half _var0;
-    out_half_vh(_uniforms, _var0);
-    h4x4[3].w = _var0;
-}
-void out_half_vh(Uniforms _uniforms, thread half& v);
-void _skOutParamHelper12_out_half_vh(Uniforms _uniforms, thread half2x2& h2x2) {
-    half _var0;
-    out_half_vh(_uniforms, _var0);
-    h2x2[0].x = _var0;
-}
-void out_int_vi(Uniforms _uniforms, thread int& v);
-void _skOutParamHelper13_out_int_vi(Uniforms _uniforms, thread int& i) {
-    int _var0;
-    out_int_vi(_uniforms, _var0);
-    i = _var0;
-}
-void out_int2_vi2(Uniforms _uniforms, thread int2& v);
-void _skOutParamHelper14_out_int2_vi2(Uniforms _uniforms, thread int2& i2) {
-    int2 _var0;
-    out_int2_vi2(_uniforms, _var0);
-    i2 = _var0;
-}
-void out_int3_vi3(Uniforms _uniforms, thread int3& v);
-void _skOutParamHelper15_out_int3_vi3(Uniforms _uniforms, thread int3& i3) {
-    int3 _var0;
-    out_int3_vi3(_uniforms, _var0);
-    i3 = _var0;
-}
-void out_int4_vi4(Uniforms _uniforms, thread int4& v);
-void _skOutParamHelper16_out_int4_vi4(Uniforms _uniforms, thread int4& i4) {
-    int4 _var0;
-    out_int4_vi4(_uniforms, _var0);
-    i4 = _var0;
-}
-void out_int3_vi3(Uniforms _uniforms, thread int3& v);
-void _skOutParamHelper17_out_int3_vi3(Uniforms _uniforms, thread int4& i4) {
-    int3 _var0;
-    out_int3_vi3(_uniforms, _var0);
-    i4.xyz = _var0;
-}
-void out_int_vi(Uniforms _uniforms, thread int& v);
-void _skOutParamHelper18_out_int_vi(Uniforms _uniforms, thread int2& i2) {
-    int _var0;
-    out_int_vi(_uniforms, _var0);
-    i2.y = _var0;
-}
-void out_float_vf(Uniforms _uniforms, thread float& v);
-void _skOutParamHelper19_out_float_vf(Uniforms _uniforms, thread float& f) {
-    float _var0;
-    out_float_vf(_uniforms, _var0);
-    f = _var0;
-}
-void out_float2_vf2(Uniforms _uniforms, thread float2& v);
-void _skOutParamHelper20_out_float2_vf2(Uniforms _uniforms, thread float2& f2) {
-    float2 _var0;
-    out_float2_vf2(_uniforms, _var0);
-    f2 = _var0;
-}
-void out_float3_vf3(Uniforms _uniforms, thread float3& v);
-void _skOutParamHelper21_out_float3_vf3(Uniforms _uniforms, thread float3& f3) {
-    float3 _var0;
-    out_float3_vf3(_uniforms, _var0);
-    f3 = _var0;
-}
-void out_float4_vf4(Uniforms _uniforms, thread float4& v);
-void _skOutParamHelper22_out_float4_vf4(Uniforms _uniforms, thread float4& f4) {
-    float4 _var0;
-    out_float4_vf4(_uniforms, _var0);
-    f4 = _var0;
-}
-void out_float2_vf2(Uniforms _uniforms, thread float2& v);
-void _skOutParamHelper23_out_float2_vf2(Uniforms _uniforms, thread float3& f3) {
-    float2 _var0;
-    out_float2_vf2(_uniforms, _var0);
-    f3.xy = _var0;
-}
-void out_float_vf(Uniforms _uniforms, thread float& v);
-void _skOutParamHelper24_out_float_vf(Uniforms _uniforms, thread float2& f2) {
-    float _var0;
-    out_float_vf(_uniforms, _var0);
-    f2.x = _var0;
-}
-void out_float2x2_vf22(Uniforms _uniforms, thread float2x2& v);
-void _skOutParamHelper25_out_float2x2_vf22(Uniforms _uniforms, thread float2x2& f2x2) {
-    float2x2 _var0;
-    out_float2x2_vf22(_uniforms, _var0);
-    f2x2 = _var0;
-}
-void out_float3x3_vf33(Uniforms _uniforms, thread float3x3& v);
-void _skOutParamHelper26_out_float3x3_vf33(Uniforms _uniforms, thread float3x3& f3x3) {
-    float3x3 _var0;
-    out_float3x3_vf33(_uniforms, _var0);
-    f3x3 = _var0;
-}
-void out_float4x4_vf44(Uniforms _uniforms, thread float4x4& v);
-void _skOutParamHelper27_out_float4x4_vf44(Uniforms _uniforms, thread float4x4& f4x4) {
-    float4x4 _var0;
-    out_float4x4_vf44(_uniforms, _var0);
-    f4x4 = _var0;
-}
-void out_float_vf(Uniforms _uniforms, thread float& v);
-void _skOutParamHelper28_out_float_vf(Uniforms _uniforms, thread float2x2& f2x2) {
-    float _var0;
-    out_float_vf(_uniforms, _var0);
-    f2x2[0].x = _var0;
-}
-void out_bool_vb(Uniforms _uniforms, thread bool& v);
-void _skOutParamHelper29_out_bool_vb(Uniforms _uniforms, thread bool& b) {
-    bool _var0;
-    out_bool_vb(_uniforms, _var0);
-    b = _var0;
-}
-void out_bool2_vb2(Uniforms _uniforms, thread bool2& v);
-void _skOutParamHelper30_out_bool2_vb2(Uniforms _uniforms, thread bool2& b2) {
-    bool2 _var0;
-    out_bool2_vb2(_uniforms, _var0);
-    b2 = _var0;
-}
-void out_bool3_vb3(Uniforms _uniforms, thread bool3& v);
-void _skOutParamHelper31_out_bool3_vb3(Uniforms _uniforms, thread bool3& b3) {
-    bool3 _var0;
-    out_bool3_vb3(_uniforms, _var0);
-    b3 = _var0;
-}
-void out_bool4_vb4(Uniforms _uniforms, thread bool4& v);
-void _skOutParamHelper32_out_bool4_vb4(Uniforms _uniforms, thread bool4& b4) {
-    bool4 _var0;
-    out_bool4_vb4(_uniforms, _var0);
-    b4 = _var0;
-}
-void out_bool2_vb2(Uniforms _uniforms, thread bool2& v);
-void _skOutParamHelper33_out_bool2_vb2(Uniforms _uniforms, thread bool4& b4) {
-    bool2 _var0;
-    out_bool2_vb2(_uniforms, _var0);
-    b4.xw = _var0;
-}
-void out_bool_vb(Uniforms _uniforms, thread bool& v);
-void _skOutParamHelper34_out_bool_vb(Uniforms _uniforms, thread bool3& b3) {
-    bool _var0;
-    out_bool_vb(_uniforms, _var0);
-    b3.z = _var0;
-}
-void out_half_vh(Uniforms _uniforms, thread half& v) {
-    v = _uniforms.colorWhite.x;
-}
-void out_half2_vh2(Uniforms _uniforms, thread half2& v) {
-    v = half2(_uniforms.colorWhite.y);
-}
-void out_half3_vh3(Uniforms _uniforms, thread half3& v) {
-    v = half3(_uniforms.colorWhite.z);
-}
-void out_half4_vh4(Uniforms _uniforms, thread half4& v) {
-    v = half4(_uniforms.colorWhite.w);
-}
-void out_half2x2_vh22(Uniforms _uniforms, thread half2x2& v) {
-    v = half2x2(_uniforms.colorWhite.x);
-}
-void out_half3x3_vh33(Uniforms _uniforms, thread half3x3& v) {
-    v = half3x3(_uniforms.colorWhite.y);
-}
-void out_half4x4_vh44(Uniforms _uniforms, thread half4x4& v) {
-    v = half4x4(_uniforms.colorWhite.z);
-}
-void out_int_vi(Uniforms _uniforms, thread int& v) {
-    v = int(_uniforms.colorWhite.x);
-}
-void out_int2_vi2(Uniforms _uniforms, thread int2& v) {
-    v = int2(int(_uniforms.colorWhite.y));
-}
-void out_int3_vi3(Uniforms _uniforms, thread int3& v) {
-    v = int3(int(_uniforms.colorWhite.z));
-}
-void out_int4_vi4(Uniforms _uniforms, thread int4& v) {
-    v = int4(int(_uniforms.colorWhite.w));
-}
-void out_float_vf(Uniforms _uniforms, thread float& v) {
-    v = float(_uniforms.colorWhite.x);
-}
-void out_float2_vf2(Uniforms _uniforms, thread float2& v) {
-    v = float2(float(_uniforms.colorWhite.y));
-}
-void out_float3_vf3(Uniforms _uniforms, thread float3& v) {
-    v = float3(float(_uniforms.colorWhite.z));
-}
-void out_float4_vf4(Uniforms _uniforms, thread float4& v) {
-    v = float4(float(_uniforms.colorWhite.w));
-}
-void out_float2x2_vf22(Uniforms _uniforms, thread float2x2& v) {
-    v = float2x2(float(_uniforms.colorWhite.x));
-}
-void out_float3x3_vf33(Uniforms _uniforms, thread float3x3& v) {
-    v = float3x3(float(_uniforms.colorWhite.y));
-}
-void out_float4x4_vf44(Uniforms _uniforms, thread float4x4& v) {
-    v = float4x4(float(_uniforms.colorWhite.z));
-}
-void out_bool_vb(Uniforms _uniforms, thread bool& v) {
-    v = bool(_uniforms.colorWhite.x);
-}
-void out_bool2_vb2(Uniforms _uniforms, thread bool2& v) {
-    v = bool2(bool(_uniforms.colorWhite.y));
-}
-void out_bool3_vb3(Uniforms _uniforms, thread bool3& v) {
-    v = bool3(bool(_uniforms.colorWhite.z));
-}
-void out_bool4_vb4(Uniforms _uniforms, thread bool4& v) {
-    v = bool4(bool(_uniforms.colorWhite.w));
-}
-fragment Outputs fragmentMain(Inputs _in [[stage_in]], constant Uniforms& _uniforms [[buffer(0)]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
-    Outputs _out;
-    (void)_out;
-    half h;
-    _skOutParamHelper0_out_half_vh(_uniforms, h);
-    half2 h2;
-    _skOutParamHelper1_out_half2_vh2(_uniforms, h2);
-    half3 h3;
-    _skOutParamHelper2_out_half3_vh3(_uniforms, h3);
-    half4 h4;
-    _skOutParamHelper3_out_half4_vh4(_uniforms, h4);
-    _skOutParamHelper4_out_half_vh(_uniforms, h3);
-    _skOutParamHelper5_out_half2_vh2(_uniforms, h3);
-    _skOutParamHelper6_out_half4_vh4(_uniforms, h4);
-    half2x2 h2x2;
-    _skOutParamHelper7_out_half2x2_vh22(_uniforms, h2x2);
-    half3x3 h3x3;
-    _skOutParamHelper8_out_half3x3_vh33(_uniforms, h3x3);
-    half4x4 h4x4;
-    _skOutParamHelper9_out_half4x4_vh44(_uniforms, h4x4);
-    _skOutParamHelper10_out_half3_vh3(_uniforms, h3x3);
-    _skOutParamHelper11_out_half_vh(_uniforms, h4x4);
-    _skOutParamHelper12_out_half_vh(_uniforms, h2x2);
-    int i;
-    _skOutParamHelper13_out_int_vi(_uniforms, i);
-    int2 i2;
-    _skOutParamHelper14_out_int2_vi2(_uniforms, i2);
-    int3 i3;
-    _skOutParamHelper15_out_int3_vi3(_uniforms, i3);
-    int4 i4;
-    _skOutParamHelper16_out_int4_vi4(_uniforms, i4);
-    _skOutParamHelper17_out_int3_vi3(_uniforms, i4);
-    _skOutParamHelper18_out_int_vi(_uniforms, i2);
-    float f;
-    _skOutParamHelper19_out_float_vf(_uniforms, f);
-    float2 f2;
-    _skOutParamHelper20_out_float2_vf2(_uniforms, f2);
-    float3 f3;
-    _skOutParamHelper21_out_float3_vf3(_uniforms, f3);
-    float4 f4;
-    _skOutParamHelper22_out_float4_vf4(_uniforms, f4);
-    _skOutParamHelper23_out_float2_vf2(_uniforms, f3);
-    _skOutParamHelper24_out_float_vf(_uniforms, f2);
-    float2x2 f2x2;
-    _skOutParamHelper25_out_float2x2_vf22(_uniforms, f2x2);
-    float3x3 f3x3;
-    _skOutParamHelper26_out_float3x3_vf33(_uniforms, f3x3);
-    float4x4 f4x4;
-    _skOutParamHelper27_out_float4x4_vf44(_uniforms, f4x4);
-    _skOutParamHelper28_out_float_vf(_uniforms, f2x2);
-    bool b;
-    _skOutParamHelper29_out_bool_vb(_uniforms, b);
-    bool2 b2;
-    _skOutParamHelper30_out_bool2_vb2(_uniforms, b2);
-    bool3 b3;
-    _skOutParamHelper31_out_bool3_vb3(_uniforms, b3);
-    bool4 b4;
-    _skOutParamHelper32_out_bool4_vb4(_uniforms, b4);
-    _skOutParamHelper33_out_bool2_vb2(_uniforms, b4);
-    _skOutParamHelper34_out_bool_vb(_uniforms, b3);
-    bool ok = true;
-    ok = ok && 1.0h == (((((h * h2.x) * h3.x) * h4.x) * h2x2[0].x) * h3x3[0].x) * h4x4[0].x;
-    ok = ok && 1.0 == (((((f * f2.x) * f3.x) * f4.x) * f2x2[0].x) * f3x3[0].x) * f4x4[0].x;
-    ok = ok && 1 == ((i * i2.x) * i3.x) * i4.x;
-    ok = ok && (((b && b2.x) && b3.x) && b4.x);
-    _out.sk_FragColor = ok ? _uniforms.colorGreen : _uniforms.colorRed;
-    return _out;
-}
diff --git a/third_party/skia/tests/sksl/shared/OutParamsTricky.asm.frag b/third_party/skia/tests/sksl/shared/OutParamsTricky.asm.frag
index 4086cad356f5a..dca346a6c67cc 100644
--- a/third_party/skia/tests/sksl/shared/OutParamsTricky.asm.frag
+++ b/third_party/skia/tests/sksl/shared/OutParamsTricky.asm.frag
@@ -44,11 +44,14 @@ OpDecorate %58 RelaxedPrecision
 OpDecorate %59 RelaxedPrecision
 OpDecorate %result RelaxedPrecision
 OpDecorate %65 RelaxedPrecision
+OpDecorate %66 RelaxedPrecision
 OpDecorate %67 RelaxedPrecision
-OpDecorate %68 RelaxedPrecision
-OpDecorate %80 RelaxedPrecision
+OpDecorate %69 RelaxedPrecision
+OpDecorate %70 RelaxedPrecision
+OpDecorate %71 RelaxedPrecision
 OpDecorate %83 RelaxedPrecision
-OpDecorate %84 RelaxedPrecision
+OpDecorate %86 RelaxedPrecision
+OpDecorate %87 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -75,7 +78,7 @@ OpDecorate %84 RelaxedPrecision
 %60 = OpTypeFunction %v4float %_ptr_Function_v2float
 %float_3 = OpConstant %float 3
 %65 = OpConstantComposite %v4float %float_0 %float_1 %float_2 %float_3
-%68 = OpConstantComposite %v4float %float_2 %float_3 %float_0 %float_5
+%71 = OpConstantComposite %v4float %float_2 %float_3 %float_0 %float_5
 %v4bool = OpTypeVector %bool 4
 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
 %int = OpTypeInt 32 1
@@ -135,25 +138,30 @@ OpFunctionEnd
 %61 = OpFunctionParameter %_ptr_Function_v2float
 %62 = OpLabel
 %result = OpVariable %_ptr_Function_v4float Function
-%72 = OpVariable %_ptr_Function_v4float Function
+%67 = OpVariable %_ptr_Function_v4float Function
+%75 = OpVariable %_ptr_Function_v4float Function
 OpStore %result %65
-%66 = OpFunctionCall %void %func_vh4 %result
-%67 = OpLoad %v4float %result
-%69 = OpFOrdEqual %v4bool %67 %68
-%71 = OpAll %bool %69
-OpSelectionMerge %75 None
-OpBranchConditional %71 %73 %74
-%73 = OpLabel
-%76 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
-%80 = OpLoad %v4float %76
-OpStore %72 %80
-OpBranch %75
-%74 = OpLabel
-%81 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
-%83 = OpLoad %v4float %81
-OpStore %72 %83
-OpBranch %75
-%75 = OpLabel
-%84 = OpLoad %v4float %72
-OpReturnValue %84
+%66 = OpLoad %v4float %result
+OpStore %67 %66
+%68 = OpFunctionCall %void %func_vh4 %67
+%69 = OpLoad %v4float %67
+OpStore %result %69
+%70 = OpLoad %v4float %result
+%72 = OpFOrdEqual %v4bool %70 %71
+%74 = OpAll %bool %72
+OpSelectionMerge %78 None
+OpBranchConditional %74 %76 %77
+%76 = OpLabel
+%79 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0
+%83 = OpLoad %v4float %79
+OpStore %75 %83
+OpBranch %78
+%77 = OpLabel
+%84 = OpAccessChain %_ptr_Uniform_v4float %12 %int_1
+%86 = OpLoad %v4float %84
+OpStore %75 %86
+OpBranch %78
+%78 = OpLabel
+%87 = OpLoad %v4float %75
+OpReturnValue %87
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.glsl b/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.glsl
index 457662ec2e012..45bcff1224cd2 100644
--- a/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.glsl
+++ b/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.glsl
@@ -13,7 +13,6 @@ bool for_inside_body_b() {
 }
 bool after_for_body_b() {
     for (int x = 0;x <= 10; ++x) {
-        true;
     }
     return true;
 }
diff --git a/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.metal b/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.metal
index a668a3d9cc5c8..53968e56d7ee6 100644
--- a/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.metal
+++ b/third_party/skia/tests/sksl/shared/ReturnsValueOnEveryPathES2.metal
@@ -21,7 +21,6 @@ bool for_inside_body_b() {
 }
 bool after_for_body_b() {
     for (int x = 0;x <= 10; ++x) {
-        true;
     }
     return true;
 }
diff --git a/third_party/skia/tests/sksl/shared/StructsInFunctions.asm.frag b/third_party/skia/tests/sksl/shared/StructsInFunctions.asm.frag
index 5e0f18264c781..b44a1167d37dd 100644
--- a/third_party/skia/tests/sksl/shared/StructsInFunctions.asm.frag
+++ b/third_party/skia/tests/sksl/shared/StructsInFunctions.asm.frag
@@ -49,37 +49,38 @@ OpMemberDecorate %S 0 Offset 0
 OpMemberDecorate %S 1 Offset 4
 OpDecorate %41 RelaxedPrecision
 OpDecorate %70 RelaxedPrecision
+OpDecorate %73 RelaxedPrecision
 OpMemberDecorate %Nested 0 Offset 0
 OpMemberDecorate %Nested 0 RelaxedPrecision
 OpMemberDecorate %Nested 1 Offset 16
 OpMemberDecorate %Nested 1 RelaxedPrecision
-OpDecorate %84 RelaxedPrecision
-OpDecorate %86 RelaxedPrecision
 OpDecorate %87 RelaxedPrecision
 OpDecorate %89 RelaxedPrecision
+OpDecorate %90 RelaxedPrecision
+OpDecorate %92 RelaxedPrecision
 OpMemberDecorate %Compound 0 Offset 0
 OpMemberDecorate %Compound 1 Offset 16
-OpDecorate %108 RelaxedPrecision
-OpDecorate %109 RelaxedPrecision
-OpDecorate %114 RelaxedPrecision
-OpDecorate %115 RelaxedPrecision
-OpDecorate %137 RelaxedPrecision
-OpDecorate %138 RelaxedPrecision
-OpDecorate %149 RelaxedPrecision
-OpDecorate %161 RelaxedPrecision
-OpDecorate %173 RelaxedPrecision
-OpDecorate %174 RelaxedPrecision
-OpDecorate %197 RelaxedPrecision
-OpDecorate %198 RelaxedPrecision
-OpDecorate %221 RelaxedPrecision
-OpDecorate %247 RelaxedPrecision
-OpDecorate %248 RelaxedPrecision
-OpDecorate %263 RelaxedPrecision
-OpDecorate %264 RelaxedPrecision
-OpDecorate %275 RelaxedPrecision
-OpDecorate %282 RelaxedPrecision
-OpDecorate %284 RelaxedPrecision
+OpDecorate %111 RelaxedPrecision
+OpDecorate %112 RelaxedPrecision
+OpDecorate %117 RelaxedPrecision
+OpDecorate %118 RelaxedPrecision
+OpDecorate %140 RelaxedPrecision
+OpDecorate %141 RelaxedPrecision
+OpDecorate %152 RelaxedPrecision
+OpDecorate %164 RelaxedPrecision
+OpDecorate %176 RelaxedPrecision
+OpDecorate %177 RelaxedPrecision
+OpDecorate %200 RelaxedPrecision
+OpDecorate %201 RelaxedPrecision
+OpDecorate %224 RelaxedPrecision
+OpDecorate %250 RelaxedPrecision
+OpDecorate %251 RelaxedPrecision
+OpDecorate %266 RelaxedPrecision
+OpDecorate %267 RelaxedPrecision
+OpDecorate %278 RelaxedPrecision
 OpDecorate %285 RelaxedPrecision
+OpDecorate %287 RelaxedPrecision
+OpDecorate %288 RelaxedPrecision
 %float = OpTypeFloat 32
 %v4float = OpTypeVector %float 4
 %_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -118,11 +119,11 @@ OpDecorate %285 RelaxedPrecision
 %_ptr_Function_Compound = OpTypePointer Function %Compound
 %float_3 = OpConstant %float 3
 %float_4 = OpConstant %float 4
-%99 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
+%102 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4
 %int_5 = OpConstant %int 5
 %int_6 = OpConstant %int 6
 %int_7 = OpConstant %int 7
-%103 = OpConstantComposite %v3int %int_5 %int_6 %int_7
+%106 = OpConstantComposite %v3int %int_5 %int_6 %int_7
 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
 %_ptr_Function_bool = OpTypePointer Function %bool
 %false = OpConstantFalse %bool
@@ -182,253 +183,258 @@ OpFunctionEnd
 %s_0 = OpVariable %_ptr_Function_S Function
 %x = OpVariable %_ptr_Function_float Function
 %71 = OpVariable %_ptr_Function_S Function
+%74 = OpVariable %_ptr_Function_S Function
 %expected = OpVariable %_ptr_Function_S Function
 %n1 = OpVariable %_ptr_Function_Nested Function
 %n2 = OpVariable %_ptr_Function_Nested Function
 %n3 = OpVariable %_ptr_Function_Nested Function
-%90 = OpVariable %_ptr_Function_S Function
+%93 = OpVariable %_ptr_Function_S Function
 %c1 = OpVariable %_ptr_Function_Compound Function
 %c2 = OpVariable %_ptr_Function_Compound Function
 %c3 = OpVariable %_ptr_Function_Compound Function
 %valid = OpVariable %_ptr_Function_bool Function
-%276 = OpVariable %_ptr_Function_v4float Function
+%279 = OpVariable %_ptr_Function_v4float Function
 %68 = OpFunctionCall %S %returns_a_struct_S
 OpStore %s_0 %68
 %70 = OpLoad %S %s_0
 OpStore %71 %70
 %72 = OpFunctionCall %float %accepts_a_struct_fS %71
 OpStore %x %72
-%73 = OpFunctionCall %void %modifies_a_struct_vS %s_0
-%75 = OpFunctionCall %S %constructs_a_struct_S
-OpStore %expected %75
-%81 = OpFunctionCall %S %returns_a_struct_S
-%82 = OpAccessChain %_ptr_Function_S %n1 %int_0
-OpStore %82 %81
-%83 = OpAccessChain %_ptr_Function_S %n1 %int_0
-%84 = OpLoad %S %83
-%85 = OpAccessChain %_ptr_Function_S %n1 %int_1
+%73 = OpLoad %S %s_0
+OpStore %74 %73
+%75 = OpFunctionCall %void %modifies_a_struct_vS %74
+%76 = OpLoad %S %74
+OpStore %s_0 %76
+%78 = OpFunctionCall %S %constructs_a_struct_S
+OpStore %expected %78
+%84 = OpFunctionCall %S %returns_a_struct_S
+%85 = OpAccessChain %_ptr_Function_S %n1 %int_0
 OpStore %85 %84
-%86 = OpLoad %Nested %n1
-OpStore %n2 %86
-%87 = OpLoad %Nested %n2
-OpStore %n3 %87
-%88 = OpAccessChain %_ptr_Function_S %n3 %int_1
-%89 = OpLoad %S %88
-OpStore %90 %89
-%91 = OpFunctionCall %void %modifies_a_struct_vS %90
-%92 = OpLoad %S %90
-OpStore %88 %92
-%104 = OpCompositeConstruct %Compound %99 %103
-OpStore %c1 %104
-%106 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
-%108 = OpLoad %v4float %106
-%109 = OpCompositeExtract %float %108 1
-%110 = OpCompositeConstruct %v4float %109 %float_2 %float_3 %float_4
-%111 = OpCompositeConstruct %Compound %110 %103
-OpStore %c2 %111
-%113 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
-%114 = OpLoad %v4float %113
-%115 = OpCompositeExtract %float %114 0
-%116 = OpCompositeConstruct %v4float %115 %float_2 %float_3 %float_4
-%117 = OpCompositeConstruct %Compound %116 %103
-OpStore %c3 %117
-%121 = OpLoad %float %x
-%122 = OpFOrdEqual %bool %121 %float_3
-OpSelectionMerge %124 None
-OpBranchConditional %122 %123 %124
-%123 = OpLabel
-%125 = OpAccessChain %_ptr_Function_float %s_0 %int_0
-%126 = OpLoad %float %125
-%127 = OpFOrdEqual %bool %126 %float_2
-OpBranch %124
-%124 = OpLabel
-%128 = OpPhi %bool %false %66 %127 %123
-OpSelectionMerge %130 None
-OpBranchConditional %128 %129 %130
-%129 = OpLabel
-%131 = OpAccessChain %_ptr_Function_int %s_0 %int_1
-%132 = OpLoad %int %131
-%133 = OpIEqual %bool %132 %int_3
-OpBranch %130
-%130 = OpLabel
-%134 = OpPhi %bool %false %124 %133 %129
-OpSelectionMerge %136 None
-OpBranchConditional %134 %135 %136
-%135 = OpLabel
-%137 = OpLoad %S %s_0
-%138 = OpLoad %S %expected
-%139 = OpCompositeExtract %float %137 0
-%140 = OpCompositeExtract %float %138 0
-%141 = OpFOrdEqual %bool %139 %140
-%142 = OpCompositeExtract %int %137 1
-%143 = OpCompositeExtract %int %138 1
-%144 = OpIEqual %bool %142 %143
-%145 = OpLogicalAnd %bool %144 %141
-OpBranch %136
-%136 = OpLabel
-%146 = OpPhi %bool %false %130 %145 %135
-OpSelectionMerge %148 None
-OpBranchConditional %146 %147 %148
-%147 = OpLabel
-%149 = OpLoad %S %s_0
-%150 = OpCompositeConstruct %S %float_2 %int_3
-%151 = OpCompositeExtract %float %149 0
-%152 = OpCompositeExtract %float %150 0
-%153 = OpFOrdEqual %bool %151 %152
-%154 = OpCompositeExtract %int %149 1
-%155 = OpCompositeExtract %int %150 1
-%156 = OpIEqual %bool %154 %155
-%157 = OpLogicalAnd %bool %156 %153
-OpBranch %148
-%148 = OpLabel
-%158 = OpPhi %bool %false %136 %157 %147
-OpSelectionMerge %160 None
-OpBranchConditional %158 %159 %160
-%159 = OpLabel
-%161 = OpLoad %S %s_0
-%162 = OpFunctionCall %S %returns_a_struct_S
-%163 = OpCompositeExtract %float %161 0
-%164 = OpCompositeExtract %float %162 0
-%165 = OpFOrdNotEqual %bool %163 %164
-%166 = OpCompositeExtract %int %161 1
-%167 = OpCompositeExtract %int %162 1
-%168 = OpINotEqual %bool %166 %167
-%169 = OpLogicalOr %bool %168 %165
-OpBranch %160
-%160 = OpLabel
-%170 = OpPhi %bool %false %148 %169 %159
-OpSelectionMerge %172 None
-OpBranchConditional %170 %171 %172
-%171 = OpLabel
-%173 = OpLoad %Nested %n1
-%174 = OpLoad %Nested %n2
-%175 = OpCompositeExtract %S %173 0
-%176 = OpCompositeExtract %S %174 0
-%177 = OpCompositeExtract %float %175 0
-%178 = OpCompositeExtract %float %176 0
-%179 = OpFOrdEqual %bool %177 %178
-%180 = OpCompositeExtract %int %175 1
-%181 = OpCompositeExtract %int %176 1
-%182 = OpIEqual %bool %180 %181
-%183 = OpLogicalAnd %bool %182 %179
-%184 = OpCompositeExtract %S %173 1
-%185 = OpCompositeExtract %S %174 1
-%186 = OpCompositeExtract %float %184 0
-%187 = OpCompositeExtract %float %185 0
-%188 = OpFOrdEqual %bool %186 %187
-%189 = OpCompositeExtract %int %184 1
-%190 = OpCompositeExtract %int %185 1
-%191 = OpIEqual %bool %189 %190
-%192 = OpLogicalAnd %bool %191 %188
-%193 = OpLogicalAnd %bool %192 %183
-OpBranch %172
-%172 = OpLabel
-%194 = OpPhi %bool %false %160 %193 %171
-OpSelectionMerge %196 None
-OpBranchConditional %194 %195 %196
-%195 = OpLabel
-%197 = OpLoad %Nested %n1
-%198 = OpLoad %Nested %n3
-%199 = OpCompositeExtract %S %197 0
-%200 = OpCompositeExtract %S %198 0
-%201 = OpCompositeExtract %float %199 0
-%202 = OpCompositeExtract %float %200 0
-%203 = OpFOrdNotEqual %bool %201 %202
-%204 = OpCompositeExtract %int %199 1
-%205 = OpCompositeExtract %int %200 1
-%206 = OpINotEqual %bool %204 %205
-%207 = OpLogicalOr %bool %206 %203
-%208 = OpCompositeExtract %S %197 1
-%209 = OpCompositeExtract %S %198 1
-%210 = OpCompositeExtract %float %208 0
-%211 = OpCompositeExtract %float %209 0
-%212 = OpFOrdNotEqual %bool %210 %211
-%213 = OpCompositeExtract %int %208 1
-%214 = OpCompositeExtract %int %209 1
-%215 = OpINotEqual %bool %213 %214
-%216 = OpLogicalOr %bool %215 %212
-%217 = OpLogicalOr %bool %216 %207
-OpBranch %196
-%196 = OpLabel
-%218 = OpPhi %bool %false %172 %217 %195
-OpSelectionMerge %220 None
-OpBranchConditional %218 %219 %220
-%219 = OpLabel
-%221 = OpLoad %Nested %n3
-%222 = OpCompositeConstruct %S %float_1 %int_2
-%223 = OpCompositeConstruct %S %float_2 %int_3
-%224 = OpCompositeConstruct %Nested %222 %223
-%225 = OpCompositeExtract %S %221 0
-%226 = OpCompositeExtract %S %224 0
-%227 = OpCompositeExtract %float %225 0
-%228 = OpCompositeExtract %float %226 0
-%229 = OpFOrdEqual %bool %227 %228
-%230 = OpCompositeExtract %int %225 1
-%231 = OpCompositeExtract %int %226 1
-%232 = OpIEqual %bool %230 %231
-%233 = OpLogicalAnd %bool %232 %229
-%234 = OpCompositeExtract %S %221 1
-%235 = OpCompositeExtract %S %224 1
-%236 = OpCompositeExtract %float %234 0
-%237 = OpCompositeExtract %float %235 0
-%238 = OpFOrdEqual %bool %236 %237
-%239 = OpCompositeExtract %int %234 1
-%240 = OpCompositeExtract %int %235 1
-%241 = OpIEqual %bool %239 %240
-%242 = OpLogicalAnd %bool %241 %238
-%243 = OpLogicalAnd %bool %242 %233
-OpBranch %220
-%220 = OpLabel
-%244 = OpPhi %bool %false %196 %243 %219
-OpSelectionMerge %246 None
-OpBranchConditional %244 %245 %246
-%245 = OpLabel
-%247 = OpLoad %Compound %c1
-%248 = OpLoad %Compound %c2
-%249 = OpCompositeExtract %v4float %247 0
-%250 = OpCompositeExtract %v4float %248 0
-%251 = OpFOrdEqual %v4bool %249 %250
-%253 = OpAll %bool %251
-%254 = OpCompositeExtract %v3int %247 1
-%255 = OpCompositeExtract %v3int %248 1
-%256 = OpIEqual %v3bool %254 %255
-%258 = OpAll %bool %256
-%259 = OpLogicalAnd %bool %258 %253
-OpBranch %246
-%246 = OpLabel
-%260 = OpPhi %bool %false %220 %259 %245
-OpSelectionMerge %262 None
-OpBranchConditional %260 %261 %262
-%261 = OpLabel
-%263 = OpLoad %Compound %c2
-%264 = OpLoad %Compound %c3
-%265 = OpCompositeExtract %v4float %263 0
-%266 = OpCompositeExtract %v4float %264 0
-%267 = OpFOrdNotEqual %v4bool %265 %266
-%268 = OpAny %bool %267
-%269 = OpCompositeExtract %v3int %263 1
-%270 = OpCompositeExtract %v3int %264 1
-%271 = OpINotEqual %v3bool %269 %270
-%272 = OpAny %bool %271
-%273 = OpLogicalOr %bool %272 %268
-OpBranch %262
-%262 = OpLabel
-%274 = OpPhi %bool %false %246 %273 %261
-OpStore %valid %274
-%275 = OpLoad %bool %valid
-OpSelectionMerge %280 None
-OpBranchConditional %275 %278 %279
-%278 = OpLabel
-%281 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
-%282 = OpLoad %v4float %281
-OpStore %276 %282
-OpBranch %280
-%279 = OpLabel
-%283 = OpAccessChain %_ptr_Uniform_v4float %14 %int_0
-%284 = OpLoad %v4float %283
-OpStore %276 %284
-OpBranch %280
-%280 = OpLabel
-%285 = OpLoad %v4float %276
-OpReturnValue %285
+%86 = OpAccessChain %_ptr_Function_S %n1 %int_0
+%87 = OpLoad %S %86
+%88 = OpAccessChain %_ptr_Function_S %n1 %int_1
+OpStore %88 %87
+%89 = OpLoad %Nested %n1
+OpStore %n2 %89
+%90 = OpLoad %Nested %n2
+OpStore %n3 %90
+%91 = OpAccessChain %_ptr_Function_S %n3 %int_1
+%92 = OpLoad %S %91
+OpStore %93 %92
+%94 = OpFunctionCall %void %modifies_a_struct_vS %93
+%95 = OpLoad %S %93
+OpStore %91 %95
+%107 = OpCompositeConstruct %Compound %102 %106
+OpStore %c1 %107
+%109 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
+%111 = OpLoad %v4float %109
+%112 = OpCompositeExtract %float %111 1
+%113 = OpCompositeConstruct %v4float %112 %float_2 %float_3 %float_4
+%114 = OpCompositeConstruct %Compound %113 %106
+OpStore %c2 %114
+%116 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
+%117 = OpLoad %v4float %116
+%118 = OpCompositeExtract %float %117 0
+%119 = OpCompositeConstruct %v4float %118 %float_2 %float_3 %float_4
+%120 = OpCompositeConstruct %Compound %119 %106
+OpStore %c3 %120
+%124 = OpLoad %float %x
+%125 = OpFOrdEqual %bool %124 %float_3
+OpSelectionMerge %127 None
+OpBranchConditional %125 %126 %127
+%126 = OpLabel
+%128 = OpAccessChain %_ptr_Function_float %s_0 %int_0
+%129 = OpLoad %float %128
+%130 = OpFOrdEqual %bool %129 %float_2
+OpBranch %127
+%127 = OpLabel
+%131 = OpPhi %bool %false %66 %130 %126
+OpSelectionMerge %133 None
+OpBranchConditional %131 %132 %133
+%132 = OpLabel
+%134 = OpAccessChain %_ptr_Function_int %s_0 %int_1
+%135 = OpLoad %int %134
+%136 = OpIEqual %bool %135 %int_3
+OpBranch %133
+%133 = OpLabel
+%137 = OpPhi %bool %false %127 %136 %132
+OpSelectionMerge %139 None
+OpBranchConditional %137 %138 %139
+%138 = OpLabel
+%140 = OpLoad %S %s_0
+%141 = OpLoad %S %expected
+%142 = OpCompositeExtract %float %140 0
+%143 = OpCompositeExtract %float %141 0
+%144 = OpFOrdEqual %bool %142 %143
+%145 = OpCompositeExtract %int %140 1
+%146 = OpCompositeExtract %int %141 1
+%147 = OpIEqual %bool %145 %146
+%148 = OpLogicalAnd %bool %147 %144
+OpBranch %139
+%139 = OpLabel
+%149 = OpPhi %bool %false %133 %148 %138
+OpSelectionMerge %151 None
+OpBranchConditional %149 %150 %151
+%150 = OpLabel
+%152 = OpLoad %S %s_0
+%153 = OpCompositeConstruct %S %float_2 %int_3
+%154 = OpCompositeExtract %float %152 0
+%155 = OpCompositeExtract %float %153 0
+%156 = OpFOrdEqual %bool %154 %155
+%157 = OpCompositeExtract %int %152 1
+%158 = OpCompositeExtract %int %153 1
+%159 = OpIEqual %bool %157 %158
+%160 = OpLogicalAnd %bool %159 %156
+OpBranch %151
+%151 = OpLabel
+%161 = OpPhi %bool %false %139 %160 %150
+OpSelectionMerge %163 None
+OpBranchConditional %161 %162 %163
+%162 = OpLabel
+%164 = OpLoad %S %s_0
+%165 = OpFunctionCall %S %returns_a_struct_S
+%166 = OpCompositeExtract %float %164 0
+%167 = OpCompositeExtract %float %165 0
+%168 = OpFOrdNotEqual %bool %166 %167
+%169 = OpCompositeExtract %int %164 1
+%170 = OpCompositeExtract %int %165 1
+%171 = OpINotEqual %bool %169 %170
+%172 = OpLogicalOr %bool %171 %168
+OpBranch %163
+%163 = OpLabel
+%173 = OpPhi %bool %false %151 %172 %162
+OpSelectionMerge %175 None
+OpBranchConditional %173 %174 %175
+%174 = OpLabel
+%176 = OpLoad %Nested %n1
+%177 = OpLoad %Nested %n2
+%178 = OpCompositeExtract %S %176 0
+%179 = OpCompositeExtract %S %177 0
+%180 = OpCompositeExtract %float %178 0
+%181 = OpCompositeExtract %float %179 0
+%182 = OpFOrdEqual %bool %180 %181
+%183 = OpCompositeExtract %int %178 1
+%184 = OpCompositeExtract %int %179 1
+%185 = OpIEqual %bool %183 %184
+%186 = OpLogicalAnd %bool %185 %182
+%187 = OpCompositeExtract %S %176 1
+%188 = OpCompositeExtract %S %177 1
+%189 = OpCompositeExtract %float %187 0
+%190 = OpCompositeExtract %float %188 0
+%191 = OpFOrdEqual %bool %189 %190
+%192 = OpCompositeExtract %int %187 1
+%193 = OpCompositeExtract %int %188 1
+%194 = OpIEqual %bool %192 %193
+%195 = OpLogicalAnd %bool %194 %191
+%196 = OpLogicalAnd %bool %195 %186
+OpBranch %175
+%175 = OpLabel
+%197 = OpPhi %bool %false %163 %196 %174
+OpSelectionMerge %199 None
+OpBranchConditional %197 %198 %199
+%198 = OpLabel
+%200 = OpLoad %Nested %n1
+%201 = OpLoad %Nested %n3
+%202 = OpCompositeExtract %S %200 0
+%203 = OpCompositeExtract %S %201 0
+%204 = OpCompositeExtract %float %202 0
+%205 = OpCompositeExtract %float %203 0
+%206 = OpFOrdNotEqual %bool %204 %205
+%207 = OpCompositeExtract %int %202 1
+%208 = OpCompositeExtract %int %203 1
+%209 = OpINotEqual %bool %207 %208
+%210 = OpLogicalOr %bool %209 %206
+%211 = OpCompositeExtract %S %200 1
+%212 = OpCompositeExtract %S %201 1
+%213 = OpCompositeExtract %float %211 0
+%214 = OpCompositeExtract %float %212 0
+%215 = OpFOrdNotEqual %bool %213 %214
+%216 = OpCompositeExtract %int %211 1
+%217 = OpCompositeExtract %int %212 1
+%218 = OpINotEqual %bool %216 %217
+%219 = OpLogicalOr %bool %218 %215
+%220 = OpLogicalOr %bool %219 %210
+OpBranch %199
+%199 = OpLabel
+%221 = OpPhi %bool %false %175 %220 %198
+OpSelectionMerge %223 None
+OpBranchConditional %221 %222 %223
+%222 = OpLabel
+%224 = OpLoad %Nested %n3
+%225 = OpCompositeConstruct %S %float_1 %int_2
+%226 = OpCompositeConstruct %S %float_2 %int_3
+%227 = OpCompositeConstruct %Nested %225 %226
+%228 = OpCompositeExtract %S %224 0
+%229 = OpCompositeExtract %S %227 0
+%230 = OpCompositeExtract %float %228 0
+%231 = OpCompositeExtract %float %229 0
+%232 = OpFOrdEqual %bool %230 %231
+%233 = OpCompositeExtract %int %228 1
+%234 = OpCompositeExtract %int %229 1
+%235 = OpIEqual %bool %233 %234
+%236 = OpLogicalAnd %bool %235 %232
+%237 = OpCompositeExtract %S %224 1
+%238 = OpCompositeExtract %S %227 1
+%239 = OpCompositeExtract %float %237 0
+%240 = OpCompositeExtract %float %238 0
+%241 = OpFOrdEqual %bool %239 %240
+%242 = OpCompositeExtract %int %237 1
+%243 = OpCompositeExtract %int %238 1
+%244 = OpIEqual %bool %242 %243
+%245 = OpLogicalAnd %bool %244 %241
+%246 = OpLogicalAnd %bool %245 %236
+OpBranch %223
+%223 = OpLabel
+%247 = OpPhi %bool %false %199 %246 %222
+OpSelectionMerge %249 None
+OpBranchConditional %247 %248 %249
+%248 = OpLabel
+%250 = OpLoad %Compound %c1
+%251 = OpLoad %Compound %c2
+%252 = OpCompositeExtract %v4float %250 0
+%253 = OpCompositeExtract %v4float %251 0
+%254 = OpFOrdEqual %v4bool %252 %253
+%256 = OpAll %bool %254
+%257 = OpCompositeExtract %v3int %250 1
+%258 = OpCompositeExtract %v3int %251 1
+%259 = OpIEqual %v3bool %257 %258
+%261 = OpAll %bool %259
+%262 = OpLogicalAnd %bool %261 %256
+OpBranch %249
+%249 = OpLabel
+%263 = OpPhi %bool %false %223 %262 %248
+OpSelectionMerge %265 None
+OpBranchConditional %263 %264 %265
+%264 = OpLabel
+%266 = OpLoad %Compound %c2
+%267 = OpLoad %Compound %c3
+%268 = OpCompositeExtract %v4float %266 0
+%269 = OpCompositeExtract %v4float %267 0
+%270 = OpFOrdNotEqual %v4bool %268 %269
+%271 = OpAny %bool %270
+%272 = OpCompositeExtract %v3int %266 1
+%273 = OpCompositeExtract %v3int %267 1
+%274 = OpINotEqual %v3bool %272 %273
+%275 = OpAny %bool %274
+%276 = OpLogicalOr %bool %275 %271
+OpBranch %265
+%265 = OpLabel
+%277 = OpPhi %bool %false %249 %276 %264
+OpStore %valid %277
+%278 = OpLoad %bool %valid
+OpSelectionMerge %283 None
+OpBranchConditional %278 %281 %282
+%281 = OpLabel
+%284 = OpAccessChain %_ptr_Uniform_v4float %14 %int_1
+%285 = OpLoad %v4float %284
+OpStore %279 %285
+OpBranch %283
+%282 = OpLabel
+%286 = OpAccessChain %_ptr_Uniform_v4float %14 %int_0
+%287 = OpLoad %v4float %286
+OpStore %279 %287
+OpBranch %283
+%283 = OpLabel
+%288 = OpLoad %v4float %279
+OpReturnValue %288
 OpFunctionEnd
diff --git a/third_party/skia/tests/sksl/spirv/Ossfuzz44096.asm.frag b/third_party/skia/tests/sksl/spirv/Ossfuzz44096.asm.frag
new file mode 100644
index 0000000000000..77a8c8c8ee6ad
--- /dev/null
+++ b/third_party/skia/tests/sksl/spirv/Ossfuzz44096.asm.frag
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 9: sk_SecondaryFragColor is not allowed in SPIR-V
+1 error
diff --git a/third_party/skia/tests/sksl/errors/UnusedInterfaceBlock.asm.frag b/third_party/skia/tests/sksl/spirv/UnusedInterfaceBlock.asm.frag
similarity index 100%
rename from third_party/skia/tests/sksl/errors/UnusedInterfaceBlock.asm.frag
rename to third_party/skia/tests/sksl/spirv/UnusedInterfaceBlock.asm.frag
diff --git a/third_party/skia/tests/sksl/workarounds/BlendGuardedDivide.glsl b/third_party/skia/tests/sksl/workarounds/BlendGuardedDivide.glsl
index 62255611e925a..ae3f8d18b1894 100644
--- a/third_party/skia/tests/sksl/workarounds/BlendGuardedDivide.glsl
+++ b/third_party/skia/tests/sksl/workarounds/BlendGuardedDivide.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 in vec4 src;
 in vec4 dst;
-float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
+float color_dodge_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.x == 0.0) {
         return s.x * (1.0 - d.y);
     } else {
@@ -15,7 +15,7 @@ float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
         }
     }
 }
-float _color_burn_component_hh2h2(vec2 s, vec2 d) {
+float color_burn_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.y == d.x) {
         return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     } else if (s.x == 0.0) {
@@ -25,7 +25,7 @@ float _color_burn_component_hh2h2(vec2 s, vec2 d) {
         return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     }
 }
-float _soft_light_component_hh2h2(vec2 s, vec2 d) {
+float soft_light_component_Qhh2h2(vec2 s, vec2 d) {
     if (2.0 * s.x <= s.y) {
         return (((d.x * d.x) * (s.y - 2.0 * s.x)) / (d.y + 9.9999999392252903e-09) + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
     } else if (4.0 * d.x <= d.y) {
@@ -39,7 +39,7 @@ float _soft_light_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_dodge_component_hh2h2(src.xw, dst.xw), _color_dodge_component_hh2h2(src.yw, dst.yw), _color_dodge_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
-    sk_FragColor = vec4(_color_burn_component_hh2h2(src.xw, dst.xw), _color_burn_component_hh2h2(src.yw, dst.yw), _color_burn_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
-    sk_FragColor = dst.w == 0.0 ? src : vec4(_soft_light_component_hh2h2(src.xw, dst.xw), _soft_light_component_hh2h2(src.yw, dst.yw), _soft_light_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_dodge_component_Qhh2h2(src.xw, dst.xw), color_dodge_component_Qhh2h2(src.yw, dst.yw), color_dodge_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_burn_component_Qhh2h2(src.xw, dst.xw), color_burn_component_Qhh2h2(src.yw, dst.yw), color_burn_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = dst.w == 0.0 ? src : vec4(soft_light_component_Qhh2h2(src.xw, dst.xw), soft_light_component_Qhh2h2(src.yw, dst.yw), soft_light_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/tests/sksl/workarounds/BlendGuardedDivideStandaloneSettings.glsl b/third_party/skia/tests/sksl/workarounds/BlendGuardedDivideStandaloneSettings.glsl
index 2eb055cd12abf..8d97f7779178e 100644
--- a/third_party/skia/tests/sksl/workarounds/BlendGuardedDivideStandaloneSettings.glsl
+++ b/third_party/skia/tests/sksl/workarounds/BlendGuardedDivideStandaloneSettings.glsl
@@ -2,7 +2,7 @@
 out vec4 sk_FragColor;
 in vec4 src;
 in vec4 dst;
-float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
+float color_dodge_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.x == 0.0) {
         return s.x * (1.0 - d.y);
     } else {
@@ -15,7 +15,7 @@ float _color_dodge_component_hh2h2(vec2 s, vec2 d) {
         }
     }
 }
-float _color_burn_component_hh2h2(vec2 s, vec2 d) {
+float color_burn_component_Qhh2h2(vec2 s, vec2 d) {
     if (d.y == d.x) {
         return (s.y * d.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     } else if (s.x == 0.0) {
@@ -25,7 +25,7 @@ float _color_burn_component_hh2h2(vec2 s, vec2 d) {
         return (delta * s.y + s.x * (1.0 - d.y)) + d.x * (1.0 - s.y);
     }
 }
-float _soft_light_component_hh2h2(vec2 s, vec2 d) {
+float soft_light_component_Qhh2h2(vec2 s, vec2 d) {
     if (2.0 * s.x <= s.y) {
         return (((d.x * d.x) * (s.y - 2.0 * s.x)) / d.y + (1.0 - d.y) * s.x) + d.x * ((-s.y + 2.0 * s.x) + 1.0);
     } else if (4.0 * d.x <= d.y) {
@@ -39,7 +39,7 @@ float _soft_light_component_hh2h2(vec2 s, vec2 d) {
     }
 }
 void main() {
-    sk_FragColor = vec4(_color_dodge_component_hh2h2(src.xw, dst.xw), _color_dodge_component_hh2h2(src.yw, dst.yw), _color_dodge_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
-    sk_FragColor = vec4(_color_burn_component_hh2h2(src.xw, dst.xw), _color_burn_component_hh2h2(src.yw, dst.yw), _color_burn_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
-    sk_FragColor = dst.w == 0.0 ? src : vec4(_soft_light_component_hh2h2(src.xw, dst.xw), _soft_light_component_hh2h2(src.yw, dst.yw), _soft_light_component_hh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_dodge_component_Qhh2h2(src.xw, dst.xw), color_dodge_component_Qhh2h2(src.yw, dst.yw), color_dodge_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = vec4(color_burn_component_Qhh2h2(src.xw, dst.xw), color_burn_component_Qhh2h2(src.yw, dst.yw), color_burn_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
+    sk_FragColor = dst.w == 0.0 ? src : vec4(soft_light_component_Qhh2h2(src.xw, dst.xw), soft_light_component_Qhh2h2(src.yw, dst.yw), soft_light_component_Qhh2h2(src.zw, dst.zw), src.w + (1.0 - src.w) * dst.w);
 }
diff --git a/third_party/skia/third_party/BUILD.bazel b/third_party/skia/third_party/BUILD.bazel
index 91dbd12e1bb04..bf92d3a0504d3 100644
--- a/third_party/skia/third_party/BUILD.bazel
+++ b/third_party/skia/third_party/BUILD.bazel
@@ -70,7 +70,7 @@ cc_library(
     ],
     copts = [
         "-isystem third_party/libpng/",
-        #"-Wno-unused-but-set-variable",
+        "-Wno-unused-but-set-variable",
     ],
     includes = [
         # This adds -isystem "third_party/externals/libpng" to any dependent
@@ -200,18 +200,6 @@ cc_library(
     strip_include_prefix = "externals/zlib/",
 )
 
-# This library is used to fix linking errors when trying to statically link in some symbols
-# The symbols defined here:
-# https://github.com/llvm/llvm-project/blob/main/libcxx/include/__support/musl/xlocale.h
-# are defined to be inlined, however they are missing during the final linking of a static
-# executable. By re-defining them in our own .a file, this makes the linker happy.
-cc_library(
-    name = "musl_compat",
-    srcs = [
-        "musl_compat/locale.c",
-    ],
-)
-
 JPEGTURBO_SRCS = [
     "externals/libjpeg-turbo/jaricom.c",
     "externals/libjpeg-turbo/jcapimin.c",
@@ -841,9 +829,11 @@ cc_library(
         "externals/freetype/include/freetype/internal/services/svttglyf.h",
         "externals/freetype/include/freetype/internal/services/svwinfnt.h",
         "externals/freetype/include/freetype/internal/sfnt.h",
+        "externals/freetype/include/freetype/internal/svginterface.h",
         "externals/freetype/include/freetype/internal/t1types.h",
         "externals/freetype/include/freetype/internal/tttypes.h",
         "externals/freetype/include/freetype/internal/wofftypes.h",
+        "externals/freetype/include/freetype/otsvg.h",
         "externals/freetype/include/freetype/t1tables.h",
         "externals/freetype/include/freetype/ttnameid.h",
         "externals/freetype/include/freetype/tttables.h",
@@ -901,13 +891,13 @@ cc_library(
         "externals/freetype/src/cid/cidriver.h",
         "externals/freetype/src/cid/cidtoken.h",
         "externals/freetype/src/cid/type1cid.c",
+        "externals/freetype/src/gzip/crc32.h",
         "externals/freetype/src/gzip/ftgzip.c",
         "externals/freetype/src/gzip/ftzconf.h",
-        "externals/freetype/src/gzip/infblock.h",
-        "externals/freetype/src/gzip/infcodes.h",
+        "externals/freetype/src/gzip/inffast.h",
         "externals/freetype/src/gzip/inffixed.h",
+        "externals/freetype/src/gzip/inflate.h",
         "externals/freetype/src/gzip/inftrees.h",
-        "externals/freetype/src/gzip/infutil.h",
         "externals/freetype/src/gzip/zlib.h",
         "externals/freetype/src/gzip/zutil.h",
         "externals/freetype/src/psaux/afmparse.h",
@@ -1101,11 +1091,10 @@ cc_library(
         "externals/freetype/src/cid/cidparse.c",
         "externals/freetype/src/cid/cidriver.c",
         "externals/freetype/src/gzip/adler32.c",
-        "externals/freetype/src/gzip/infblock.c",
-        "externals/freetype/src/gzip/infcodes.c",
+        "externals/freetype/src/gzip/crc32.c",
+        "externals/freetype/src/gzip/inffast.c",
         "externals/freetype/src/gzip/inflate.c",
         "externals/freetype/src/gzip/inftrees.c",
-        "externals/freetype/src/gzip/infutil.c",
         "externals/freetype/src/gzip/zutil.c",
         "externals/freetype/src/psaux/afmparse.c",
         "externals/freetype/src/psaux/cffdecode.c",
@@ -1144,6 +1133,7 @@ cc_library(
         "externals/freetype/src/sfnt/ttmtx.c",
         "externals/freetype/src/sfnt/ttpost.c",
         "externals/freetype/src/sfnt/ttsbit.c",
+        "externals/freetype/src/sfnt/ttsvg.c",
         "externals/freetype/src/sfnt/woff2tags.c",
         "externals/freetype/src/smooth/ftgrays.c",
         "externals/freetype/src/smooth/ftsmooth.c",
@@ -2077,6 +2067,7 @@ cc_library(
     hdrs = ICU_HDRS,
     copts = [
         "-Wno-deprecated-declarations",
+        "-Wno-unused-but-set-variable",
         "-Wno-unused-function",
     ],
     defines = [
@@ -2256,7 +2247,6 @@ HARFBUZZ_SRCS = [
     "externals/harfbuzz/src/hb-map.cc",
     "externals/harfbuzz/src/hb-map.hh",
     "externals/harfbuzz/src/hb-meta.hh",
-    "externals/harfbuzz/src/hb-ms-feature-ranges.cc",
     "externals/harfbuzz/src/hb-ms-feature-ranges.hh",
     "externals/harfbuzz/src/hb-mutex.hh",
     "externals/harfbuzz/src/hb-null.hh",
@@ -2359,6 +2349,7 @@ HARFBUZZ_SRCS = [
     "externals/harfbuzz/src/hb-ot-tag-table.hh",
     "externals/harfbuzz/src/hb-ot-tag.cc",
     "externals/harfbuzz/src/hb-ot-var-avar-table.hh",
+    "externals/harfbuzz/src/hb-ot-var-common.hh",
     "externals/harfbuzz/src/hb-ot-var-fvar-table.hh",
     "externals/harfbuzz/src/hb-ot-var-gvar-table.hh",
     "externals/harfbuzz/src/hb-ot-var-hvar-table.hh",
@@ -2420,3 +2411,13 @@ cc_library(
         "HB_NO_WIN1256",
     ],
 )
+
+cc_library(
+    name = "etc1",
+    srcs = [
+        "etc1/etc1.cpp",
+    ],
+    hdrs = [
+        "etc1/etc1.h",
+    ],
+)
diff --git a/third_party/skia/third_party/file_map_for_bazel.json b/third_party/skia/third_party/file_map_for_bazel.json
index ee42f8ec83e2a..aa60b62877c67 100644
--- a/third_party/skia/third_party/file_map_for_bazel.json
+++ b/third_party/skia/third_party/file_map_for_bazel.json
@@ -13,6 +13,8 @@
   "dng_render.h": "//third_party:dng_sdk",
   "dng_stream.h": "//third_party:dng_sdk",
 
+  "third_party/etc1/etc1.h": "//third_party:etc1",
+
   "ft2build.h": "//third_party:freetype2",
   "freetype/ftadvanc.h": "//third_party:freetype2",
   "freetype/ftimage.h": "//third_party:freetype2",
@@ -82,7 +84,14 @@
 
   "HeifDecoderAPI.h": "SK_GAZELLE_IGNORE Android-only build",
   "SkGifCodec.h": "SK_GAZELLE_IGNORE Deprecated gif library",
+  "log/log_main.h": "SK_GAZELLE_IGNORE",
   "mozilla/mozalloc.h": "SK_GAZELLE_IGNORE",
   "mozilla/mozalloc_abort.h": "SK_GAZELLE_IGNORE",
-  "mozilla/mozalloc_oom.h": "SK_GAZELLE_IGNORE"
+  "mozilla/mozalloc_oom.h": "SK_GAZELLE_IGNORE",
+
+  "libavcodec/avcodec.h": "SK_GAZELLE_IGNORE for experimental/ffmpeg",
+  "libavformat/avformat.h": "SK_GAZELLE_IGNORE",
+  "libavformat/avio.h": "SK_GAZELLE_IGNORE",
+  "libavutil/pixdesc.h": "SK_GAZELLE_IGNORE",
+  "libswscale/swscale.h": "SK_GAZELLE_IGNORE"
 }
\ No newline at end of file
diff --git a/third_party/skia/third_party/freetype2/BUILD.gn b/third_party/skia/third_party/freetype2/BUILD.gn
index c770da5e0dbfa..ee2e2d6a71738 100644
--- a/third_party/skia/third_party/freetype2/BUILD.gn
+++ b/third_party/skia/third_party/freetype2/BUILD.gn
@@ -6,8 +6,9 @@
 declare_args() {
   # TODO: build from source all the time for testing?
   skia_use_system_freetype2 =
-      (is_official_build || !(is_android || sanitize == "MSAN")) && !is_fuchsia
-  skia_use_freetype_woff2 = false
+      (is_official_build || !(is_android || sanitize == "MSAN")) &&
+      !is_fuchsia && !is_wasm
+  skia_use_freetype_woff2 = is_wasm
 }
 
 import("../third_party.gni")
diff --git a/third_party/skia/third_party/freetype2/include/freetype-android/ftmodule.h b/third_party/skia/third_party/freetype2/include/freetype-android/ftmodule.h
index 314e039a669f3..1ac5fbcc8d340 100644
--- a/third_party/skia/third_party/freetype2/include/freetype-android/ftmodule.h
+++ b/third_party/skia/third_party/freetype2/include/freetype-android/ftmodule.h
@@ -19,14 +19,15 @@ FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
+//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
 FT_USE_MODULE( FT_Module_Class, psaux_module_class )
 FT_USE_MODULE( FT_Module_Class, psnames_module_class )
 FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
 FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
 FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
 //FT_USE_MODULE( FT_Renderer_Class, ft_sdf_renderer_class )
 //FT_USE_MODULE( FT_Renderer_Class, ft_bitmap_sdf_renderer_class )
+//FT_USE_MODULE( FT_Renderer_Class, ft_svg_renderer_class )
 
 /* EOF */
diff --git a/third_party/skia/third_party/freetype2/include/freetype-android/ftoption.h b/third_party/skia/third_party/freetype2/include/freetype-android/ftoption.h
index 85742d2f74ff6..335423bd2dc3e 100644
--- a/third_party/skia/third_party/freetype2/include/freetype-android/ftoption.h
+++ b/third_party/skia/third_party/freetype2/include/freetype-android/ftoption.h
@@ -4,7 +4,7 @@
  *
  *   User-selectable configuration macros (specification only).
  *
- * Copyright (C) 1996-2021 by
+ * Copyright (C) 1996-2022 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -220,6 +220,10 @@ FT_BEGIN_HEADER
    *   If you use a build system like cmake or the `configure` script,
    *   options set by those programs have precedence, overwriting the value
    *   here with the configured one.
+   *
+   *   If you use the GNU make build system directly (that is, without the
+   *   `configure` script) and you define this macro, you also have to pass
+   *   `SYSTEM_ZLIB=yes` as an argument to make.
    */
 /* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
@@ -524,6 +528,20 @@ FT_BEGIN_HEADER
 #undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
 
 
+  /**************************************************************************
+   *
+   * OpenType SVG Glyph Support
+   *
+   *   Setting this macro enables support for OpenType SVG glyphs.  By
+   *   default, FreeType can only fetch SVG documents.  However, it can also
+   *   render them if external rendering hook functions are plugged in at
+   *   runtime.
+   *
+   *   More details on the hooks can be found in file `otsvg.h`.
+   */
+/* #define FT_CONFIG_OPTION_SVG */
+
+
   /**************************************************************************
    *
    * Error Strings
@@ -1021,8 +1039,8 @@ FT_BEGIN_HEADER
 #error "Invalid CFF darkening parameters!"
 #endif
 
-FT_END_HEADER
 
+FT_END_HEADER
 
 #endif /* FTOPTION_H_ */
 
diff --git a/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftmodule.h b/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftmodule.h
index d87f32c65a127..1ea39c4fd1e06 100644
--- a/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftmodule.h
+++ b/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftmodule.h
@@ -19,16 +19,17 @@ FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
 //FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
+//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
 FT_USE_MODULE( FT_Module_Class, psaux_module_class )
 FT_USE_MODULE( FT_Module_Class, psnames_module_class )
 FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
+FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
+FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
 #ifndef CANVASKIT_NO_ALIAS_FONT
 FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
 #endif
-FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
-FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
-//FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
 //FT_USE_MODULE( FT_Renderer_Class, ft_sdf_renderer_class )
 //FT_USE_MODULE( FT_Renderer_Class, ft_bitmap_sdf_renderer_class )
+//FT_USE_MODULE( FT_Renderer_Class, ft_svg_renderer_class )
 
 /* EOF */
diff --git a/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftoption.h b/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftoption.h
index eefa7dd1ddbf6..7be4ca722a6ff 100644
--- a/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftoption.h
+++ b/third_party/skia/third_party/freetype2/include/freetype-no-type1/ftoption.h
@@ -4,7 +4,7 @@
  *
  *   User-selectable configuration macros (specification only).
  *
- * Copyright (C) 1996-2021 by
+ * Copyright (C) 1996-2022 by
  * David Turner, Robert Wilhelm, and Werner Lemberg.
  *
  * This file is part of the FreeType project, and may only be used,
@@ -220,6 +220,10 @@ FT_BEGIN_HEADER
    *   If you use a build system like cmake or the `configure` script,
    *   options set by those programs have precedence, overwriting the value
    *   here with the configured one.
+   *
+   *   If you use the GNU make build system directly (that is, without the
+   *   `configure` script) and you define this macro, you also have to pass
+   *   `SYSTEM_ZLIB=yes` as an argument to make.
    */
 /* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
 
@@ -524,6 +528,20 @@ FT_BEGIN_HEADER
 #undef FT_CONFIG_OPTION_USE_MODULE_ERRORS
 
 
+  /**************************************************************************
+   *
+   * OpenType SVG Glyph Support
+   *
+   *   Setting this macro enables support for OpenType SVG glyphs.  By
+   *   default, FreeType can only fetch SVG documents.  However, it can also
+   *   render them if external rendering hook functions are plugged in at
+   *   runtime.
+   *
+   *   More details on the hooks can be found in file `otsvg.h`.
+   */
+/* #define FT_CONFIG_OPTION_SVG */
+
+
   /**************************************************************************
    *
    * Error Strings
@@ -1021,8 +1039,8 @@ FT_BEGIN_HEADER
 #error "Invalid CFF darkening parameters!"
 #endif
 
-FT_END_HEADER
 
+FT_END_HEADER
 
 #endif /* FTOPTION_H_ */
 
diff --git a/third_party/skia/third_party/freetype2/roll-freetype.sh b/third_party/skia/third_party/freetype2/roll-freetype.sh
index 5a2d9a6573f08..33b91b3821998 100755
--- a/third_party/skia/third_party/freetype2/roll-freetype.sh
+++ b/third_party/skia/third_party/freetype2/roll-freetype.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-FT_GIT_REPO=https://chromium.googlesource.com/chromium/src/third_party/freetype2.git
-FT_GIT_REF=origin/master
-FT_GIT_DIR=third_party/externals/freetype
-FT_BUILD_DIR=$(dirname -- "$0")
+FT_GIT_REPO="https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+FT_GIT_REF="origin/master"
+FT_GIT_DIR="third_party/externals/freetype"
+FT_BUILD_DIR="$(dirname -- "$0")"
 
 previousrev() {
   STEP="original revision" &&
@@ -12,8 +12,8 @@ previousrev() {
 
 nextrev() {
   STEP="next revision" &&
-  git -C ${FT_GIT_DIR} fetch &&
-  FT_NEXT_REV=$(git -C ${FT_GIT_DIR} rev-parse ${FT_GIT_REF})
+  git -C "${FT_GIT_DIR}" fetch &&
+  FT_NEXT_REV=$(git -C "${FT_GIT_DIR}" rev-parse "${FT_GIT_REF}")
 }
 
 rolldeps() {
@@ -24,21 +24,21 @@ rolldeps() {
 }
 
 mergeinclude() {
+  SKIA_INCLUDE="include/$1/$2" &&
   STEP="merge ${SKIA_INCLUDE}: check for merge conflicts" &&
-  SKIA_INCLUDE=include/$1/$2 &&
-  FT_INCLUDE=include/freetype/config/$2 &&
-  TMPFILE=$(mktemp) &&
-  git -C ${FT_GIT_DIR} cat-file blob ${FT_PREVIOUS_REV}:${FT_INCLUDE} >> ${TMPFILE} &&
-  git merge-file ${FT_BUILD_DIR}/${SKIA_INCLUDE} ${TMPFILE} ${FT_GIT_DIR}/${FT_INCLUDE} &&
-  rm ${TMPFILE} &&
-  git add ${FT_BUILD_DIR}/${SKIA_INCLUDE}
+  FT_INCLUDE="include/freetype/config/$2" &&
+  TMPFILE="$(mktemp)" &&
+  git -C "${FT_GIT_DIR}" cat-file blob "${FT_PREVIOUS_REV}:${FT_INCLUDE}" >> "${TMPFILE}" &&
+  git merge-file "${FT_BUILD_DIR}/${SKIA_INCLUDE}" "${TMPFILE}" "${FT_GIT_DIR}/${FT_INCLUDE}" &&
+  rm "${TMPFILE}" &&
+  git add "${FT_BUILD_DIR}/${SKIA_INCLUDE}"
 }
 
 commit() {
   STEP="commit" &&
   FT_PREVIOUS_REV_SHORT=$(expr substr "${FT_PREVIOUS_REV}" 1 8) &&
   FT_NEXT_REV_SHORT=$(expr substr "${FT_NEXT_REV}" 1 8) &&
-  FT_COMMIT_COUNT=$(git -C ${FT_GIT_DIR} rev-list --count ${FT_PREVIOUS_REV}..${FT_NEXT_REV}) &&
+  FT_COMMIT_COUNT=$(git -C "${FT_GIT_DIR}" rev-list --count "${FT_PREVIOUS_REV}..${FT_NEXT_REV}") &&
   git commit -m"Roll FreeType from ${FT_PREVIOUS_REV_SHORT} to ${FT_NEXT_REV_SHORT} (${FT_COMMIT_COUNT} commits)
 
 ${FT_GIT_REPO}/+log/${FT_PREVIOUS_REV}..${FT_NEXT_REV}
diff --git a/third_party/skia/third_party/harfbuzz/BUILD.gn b/third_party/skia/third_party/harfbuzz/BUILD.gn
index 68e4689c1af70..17a717804a75e 100644
--- a/third_party/skia/third_party/harfbuzz/BUILD.gn
+++ b/third_party/skia/third_party/harfbuzz/BUILD.gn
@@ -7,7 +7,7 @@ import("../../gn/skia.gni")
 import("../third_party.gni")
 
 declare_args() {
-  skia_use_system_harfbuzz = is_official_build
+  skia_use_system_harfbuzz = is_official_build && !is_wasm
 }
 
 if (skia_use_system_harfbuzz) {
@@ -111,7 +111,6 @@ if (skia_use_system_harfbuzz) {
       "$_src/hb-map.cc",
       "$_src/hb-map.hh",
       "$_src/hb-meta.hh",
-      "$_src/hb-ms-feature-ranges.cc",
       "$_src/hb-ms-feature-ranges.hh",
       "$_src/hb-mutex.hh",
       "$_src/hb-null.hh",
diff --git a/third_party/skia/third_party/harfbuzz/roll-harfbuzz.sh b/third_party/skia/third_party/harfbuzz/roll-harfbuzz.sh
index 022985f99addb..8826c98b7defe 100755
--- a/third_party/skia/third_party/harfbuzz/roll-harfbuzz.sh
+++ b/third_party/skia/third_party/harfbuzz/roll-harfbuzz.sh
@@ -41,7 +41,7 @@ check_all_files_are_categorized() {
     cd -- "${HB_GIT_DIR}" &&
 
     HB_SOURCE_MISSING=false &&
-    find src/ -type f \( -name "hb-*.cc" -o -name "hb-*.h" -o -name "hb-*.hh" \) | while read HB_SOURCE
+    find src -type f \( -name "hb-*.cc" -o -name "hb-*.h" -o -name "hb-*.hh" \) | while read HB_SOURCE
     do
       if ! grep -qF "$HB_SOURCE" ${HB_BUILD_DIR_REL}/BUILD.gn; then
         if ! ${HB_SOURCE_MISSING}; then
diff --git a/third_party/skia/third_party/highway/BUILD.gn b/third_party/skia/third_party/highway/BUILD.gn
new file mode 100644
index 0000000000000..859da114a76e0
--- /dev/null
+++ b/third_party/skia/third_party/highway/BUILD.gn
@@ -0,0 +1,15 @@
+# Copyright 2021 Google LLC
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../third_party.gni")
+
+third_party("highway") {
+  public_include_dirs = [ "../externals/highway" ]
+
+  sources = [
+    "../externals/highway/hwy/aligned_allocator.cc",
+    "../externals/highway/hwy/targets.cc",
+  ]
+}
diff --git a/third_party/skia/third_party/icu/BUILD.gn b/third_party/skia/third_party/icu/BUILD.gn
index 90334dc97a9e8..e7c94b829e68d 100644
--- a/third_party/skia/third_party/icu/BUILD.gn
+++ b/third_party/skia/third_party/icu/BUILD.gn
@@ -8,7 +8,7 @@ import("../third_party.gni")
 import("icu.gni")
 
 declare_args() {
-  skia_use_system_icu = is_official_build
+  skia_use_system_icu = is_official_build && !is_wasm
 }
 
 if (skia_use_system_icu) {
diff --git a/third_party/skia/third_party/libjpeg-turbo/BUILD.gn b/third_party/skia/third_party/libjpeg-turbo/BUILD.gn
index b342a22e96129..a997082cb3aa0 100644
--- a/third_party/skia/third_party/libjpeg-turbo/BUILD.gn
+++ b/third_party/skia/third_party/libjpeg-turbo/BUILD.gn
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 declare_args() {
-  skia_use_system_libjpeg_turbo = is_official_build
+  skia_use_system_libjpeg_turbo = is_official_build && !is_wasm
 }
 
 import("../third_party.gni")
diff --git a/third_party/skia/third_party/libjxl/BUILD.gn b/third_party/skia/third_party/libjxl/BUILD.gn
new file mode 100644
index 0000000000000..5e89a932b19ba
--- /dev/null
+++ b/third_party/skia/third_party/libjxl/BUILD.gn
@@ -0,0 +1,100 @@
+# Copyright 2021 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../third_party.gni")
+
+third_party("libjxl") {
+  deps = [
+    "//third_party/brotli",
+    "//third_party/highway",
+  ]
+
+  public_include_dirs = [
+    ".",
+    "../externals/libjxl/lib/include",
+  ]
+
+  include_dirs = [ "../externals/libjxl" ]
+
+  defines = [
+    # Does not really matter.
+    "JPEGXL_MAJOR_VERSION=1",
+    "JPEGXL_MINOR_VERSION=0",
+    "JPEGXL_PATCH_VERSION=0",
+
+    "JPEGXL_ENABLE_SKCMS=1",
+    "JPEGXL_ENABLE_TRANSCODE_JPEG=0",
+  ]
+
+  if (is_official_build) {
+    defines += [ "JXL_DEBUG_ON_ABORT=0" ]
+  }
+
+  sources = [
+    "../externals/libjxl/lib/jxl/ac_strategy.cc",
+    "../externals/libjxl/lib/jxl/alpha.cc",
+    "../externals/libjxl/lib/jxl/ans_common.cc",
+    "../externals/libjxl/lib/jxl/aux_out.cc",
+    "../externals/libjxl/lib/jxl/base/cache_aligned.cc",
+    "../externals/libjxl/lib/jxl/base/data_parallel.cc",
+    "../externals/libjxl/lib/jxl/base/descriptive_statistics.cc",
+    "../externals/libjxl/lib/jxl/base/padded_bytes.cc",
+    "../externals/libjxl/lib/jxl/base/status.cc",
+    "../externals/libjxl/lib/jxl/blending.cc",
+    "../externals/libjxl/lib/jxl/chroma_from_luma.cc",
+    "../externals/libjxl/lib/jxl/coeff_order.cc",
+    "../externals/libjxl/lib/jxl/color_encoding_internal.cc",
+    "../externals/libjxl/lib/jxl/color_management.cc",
+    "../externals/libjxl/lib/jxl/compressed_dc.cc",
+    "../externals/libjxl/lib/jxl/convolve.cc",
+    "../externals/libjxl/lib/jxl/dct_scales.cc",
+    "../externals/libjxl/lib/jxl/dec_ans.cc",
+    "../externals/libjxl/lib/jxl/dec_cache.cc",
+    "../externals/libjxl/lib/jxl/dec_context_map.cc",
+    "../externals/libjxl/lib/jxl/dec_external_image.cc",
+    "../externals/libjxl/lib/jxl/dec_frame.cc",
+    "../externals/libjxl/lib/jxl/dec_group.cc",
+    "../externals/libjxl/lib/jxl/dec_group_border.cc",
+    "../externals/libjxl/lib/jxl/dec_huffman.cc",
+    "../externals/libjxl/lib/jxl/dec_modular.cc",
+    "../externals/libjxl/lib/jxl/dec_noise.cc",
+    "../externals/libjxl/lib/jxl/dec_patch_dictionary.cc",
+    "../externals/libjxl/lib/jxl/dec_reconstruct.cc",
+    "../externals/libjxl/lib/jxl/dec_upsample.cc",
+    "../externals/libjxl/lib/jxl/dec_xyb.cc",
+    "../externals/libjxl/lib/jxl/decode.cc",
+    "../externals/libjxl/lib/jxl/decode_to_jpeg.cc",
+    "../externals/libjxl/lib/jxl/enc_bit_writer.cc",
+    "../externals/libjxl/lib/jxl/entropy_coder.cc",
+    "../externals/libjxl/lib/jxl/epf.cc",
+    "../externals/libjxl/lib/jxl/fields.cc",
+    "../externals/libjxl/lib/jxl/filters.cc",
+    "../externals/libjxl/lib/jxl/frame_header.cc",
+    "../externals/libjxl/lib/jxl/gauss_blur.cc",
+    "../externals/libjxl/lib/jxl/headers.cc",
+    "../externals/libjxl/lib/jxl/huffman_table.cc",
+    "../externals/libjxl/lib/jxl/icc_codec.cc",
+    "../externals/libjxl/lib/jxl/icc_codec_common.cc",
+    "../externals/libjxl/lib/jxl/image.cc",
+    "../externals/libjxl/lib/jxl/image_bundle.cc",
+    "../externals/libjxl/lib/jxl/image_metadata.cc",
+    "../externals/libjxl/lib/jxl/jpeg/dec_jpeg_data.cc",
+    "../externals/libjxl/lib/jxl/jpeg/dec_jpeg_data_writer.cc",
+    "../externals/libjxl/lib/jxl/jpeg/jpeg_data.cc",
+    "../externals/libjxl/lib/jxl/loop_filter.cc",
+    "../externals/libjxl/lib/jxl/luminance.cc",
+    "../externals/libjxl/lib/jxl/memory_manager_internal.cc",
+    "../externals/libjxl/lib/jxl/modular/encoding/dec_ma.cc",
+    "../externals/libjxl/lib/jxl/modular/encoding/encoding.cc",
+    "../externals/libjxl/lib/jxl/modular/modular_image.cc",
+    "../externals/libjxl/lib/jxl/modular/transform/squeeze.cc",
+    "../externals/libjxl/lib/jxl/modular/transform/transform.cc",
+    "../externals/libjxl/lib/jxl/opsin_params.cc",
+    "../externals/libjxl/lib/jxl/passes_state.cc",
+    "../externals/libjxl/lib/jxl/quant_weights.cc",
+    "../externals/libjxl/lib/jxl/quantizer.cc",
+    "../externals/libjxl/lib/jxl/splines.cc",
+    "../externals/libjxl/lib/jxl/toc.cc",
+  ]
+}
diff --git a/third_party/skia/third_party/libjxl/jxl/jxl_export.h b/third_party/skia/third_party/libjxl/jxl/jxl_export.h
new file mode 100644
index 0000000000000..d96e9d8c19d14
--- /dev/null
+++ b/third_party/skia/third_party/libjxl/jxl/jxl_export.h
@@ -0,0 +1,11 @@
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef THIRD_PARTY_LIBJXL_JXL_JXL_EXPORT_H_
+#define THIRD_PARTY_LIBJXL_JXL_JXL_EXPORT_H_
+
+#define JXL_EXPORT
+#define JXL_DEPRECATED
+
+#endif  // THIRD_PARTY_LIBJXL_JXL_JXL_EXPORT_H_
diff --git a/third_party/skia/third_party/libpng/BUILD.gn b/third_party/skia/third_party/libpng/BUILD.gn
index 217dbdd185d76..3302689860706 100644
--- a/third_party/skia/third_party/libpng/BUILD.gn
+++ b/third_party/skia/third_party/libpng/BUILD.gn
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 declare_args() {
-  skia_use_system_libpng = is_official_build
+  skia_use_system_libpng = is_official_build && !is_wasm
 }
 
 import("../third_party.gni")
diff --git a/third_party/skia/third_party/libwebp/BUILD.gn b/third_party/skia/third_party/libwebp/BUILD.gn
index 2377a4cb133bb..e9cb7ac989ad9 100644
--- a/third_party/skia/third_party/libwebp/BUILD.gn
+++ b/third_party/skia/third_party/libwebp/BUILD.gn
@@ -4,7 +4,7 @@
 # found in the LICENSE file.
 
 declare_args() {
-  skia_use_system_libwebp = is_official_build
+  skia_use_system_libwebp = is_official_build && !is_wasm
 }
 
 import("../third_party.gni")
diff --git a/third_party/skia/third_party/musl_compat/LICENSE b/third_party/skia/third_party/musl_compat/LICENSE
deleted file mode 100644
index 5fa1b0bb5efb7..0000000000000
--- a/third_party/skia/third_party/musl_compat/LICENSE
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2021 Google LLC All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//    * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//    * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
---------------------------------------------------------------------------------
diff --git a/third_party/skia/third_party/musl_compat/locale.c b/third_party/skia/third_party/musl_compat/locale.c
deleted file mode 100644
index bc6df1caa9fd1..0000000000000
--- a/third_party/skia/third_party/musl_compat/locale.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- *
- * Fixes linking issues with musl due to missing locale-specific string functions.
- */
-
-#include <stdlib.h>
-
-long long strtoll_l(const char *nptr, char **endptr, int base,
-                    int locale_t) {
-  return strtoll(nptr, endptr, base);
-}
-
-long long strtoull_l(const char *nptr, char **endptr, int base,
-                     int locale_t) {
-  return strtoull(nptr, endptr, base);
-}
diff --git a/third_party/skia/third_party/skcms/src/Transform_inl.h b/third_party/skia/third_party/skcms/src/Transform_inl.h
index 0dd6404a6775c..348a765ab2cab 100644
--- a/third_party/skia/third_party/skcms/src/Transform_inl.h
+++ b/third_party/skia/third_party/skcms/src/Transform_inl.h
@@ -22,10 +22,12 @@ using U8  = V<uint8_t>;
 #if defined(__GNUC__) && !defined(__clang__)
     // Once again, GCC is kind of weird, not allowing vector = scalar directly.
     static constexpr F F0 = F() + 0.0f,
-                       F1 = F() + 1.0f;
+                       F1 = F() + 1.0f,
+                       FInfBits = F() + 0x7f800000; // equals 2139095040, the bit pattern of +Inf
 #else
     static constexpr F F0 = 0.0f,
-                       F1 = 1.0f;
+                       F1 = 1.0f,
+                       FInfBits = 0x7f800000; // equals 2139095040, the bit pattern of +Inf
 #endif
 
 // Instead of checking __AVX__ below, we'll check USING_AVX.
@@ -294,7 +296,7 @@ SI F approx_exp2(F x) {
     F fbits = (1.0f * (1<<23)) * (x + 121.274057500f
                                     -   1.490129070f*fract
                                     +  27.728023300f/(4.84252568f - fract));
-    I32 bits = cast<I32>(max_(fbits, F0));
+    I32 bits = cast<I32>(min_(max_(fbits, F0), FInfBits));
 
     return bit_pun<F>(bits);
 #endif
diff --git a/third_party/skia/third_party/skcms/version.sha1 b/third_party/skia/third_party/skcms/version.sha1
index 514b40514b572..74f68c6622848 100755
--- a/third_party/skia/third_party/skcms/version.sha1
+++ b/third_party/skia/third_party/skcms/version.sha1
@@ -1 +1 @@
-1ea0b89e7a7e64ad040cf43450c27f8cc0c6f342
+30c8e303800c256febb03a09fdcda7f75d119b1b
diff --git a/third_party/skia/toolchain/BUILD.bazel b/third_party/skia/toolchain/BUILD.bazel
index 0aaa05c76d52c..1d44aab9e18ff 100644
--- a/third_party/skia/toolchain/BUILD.bazel
+++ b/third_party/skia/toolchain/BUILD.bazel
@@ -21,7 +21,7 @@ filegroup(
         "ar_trampoline.sh",
         "clang_trampoline.sh",
         "lld_trampoline.sh",
-        "@clang_linux_amd64_musl//:all_files",
+        "@clang_linux_amd64//:all_files",
     ],
 )
 
diff --git a/third_party/skia/toolchain/ar_trampoline.sh b/third_party/skia/toolchain/ar_trampoline.sh
index eb2ccb3661fa2..7d81b22c62146 100755
--- a/third_party/skia/toolchain/ar_trampoline.sh
+++ b/third_party/skia/toolchain/ar_trampoline.sh
@@ -4,4 +4,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-external/clang_linux_amd64_musl/bin/llvm-ar $@
+external/clang_linux_amd64/bin/llvm-ar $@
diff --git a/third_party/skia/toolchain/build_toolchain.bzl b/third_party/skia/toolchain/build_toolchain.bzl
index 78f59419cfd50..5a092300e862f 100644
--- a/third_party/skia/toolchain/build_toolchain.bzl
+++ b/third_party/skia/toolchain/build_toolchain.bzl
@@ -1,21 +1,105 @@
 """
-This file assembles a toolchain for Linux using the Clang Compiler and musl.
+This file assembles a toolchain for Linux using the Clang Compiler glibc.
 
-It currently makes use of musl and not glibc because the pre-compiled libraries from the latter
-have absolute paths baked in and this makes linking difficult. The pre-compiled musl library
-does not have this restriction and is much easier to statically link in as a result.
-
-As inputs, it takes external URLs from which to download the clang binaries/libraries/includes
-as well as the musl headers and pre-compiled binaries. Those files are downloaded and put
-into one folder, with a little bit of re-arrangement so clang can find files (like the C runtime).
+It downloads the necessary header files and pre-compiled static/shared libraries to
 """
 
+# From https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz.sha256
+clang_prefix = "clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04/"
+clang_sha256 = "2c2fb857af97f41a5032e9ecadf7f78d3eff389a5cd3c9ec620d24f134ceb3c8"
+clang_url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-13.0.0/clang+llvm-13.0.0-x86_64-linux-gnu-ubuntu-20.04.tar.xz"
+
+# Files are expected to be in the mirror location named after their sha256 hash. The files should
+# still have their file extension, as some of the Starlark functions sniff the file extension
+# (e.g. download_and_extract). See //bazel/gcs_mirror for an automated way to update this mirror.
+mirror_prefix = "https://storage.googleapis.com/skia-world-readable/bazel/"
+# Set this to True to only use the files from the mirror host. This can be used to test the data
+# in the mirrors is not corrupt and publicly accessible.
+# If testing this, you need to delete the download cache, which defaults to
+# ~/.cache/bazel/_bazel_$USER/cache/repos/v1/
+# https://docs.bazel.build/versions/main/guide.html#the-repository-cache
+force_test_of_mirrors = False
+
+debs_to_install = [
+    # These three comprise glibc. libc6 has the shared libraries, like libc itself, the math library
+    # (libm), etc. linux-libc-dev has the header files specific to linux. libc6-dev has the libc
+    # system headers (e.g. malloc.h, math.h).
+    {
+        # From https://packages.debian.org/bullseye/amd64/libc6/download
+        "sha256": "3d9421c3fc0ef0d8ce57c0a149e1f8dbad78aba067f120be9e652af28902e346",
+        "url": "https://ftp.debian.org/debian/pool/main/g/glibc/libc6_2.31-13+deb11u2_amd64.deb",
+    },
+    {
+        # From https://packages.debian.org/bullseye/amd64/linux-libc-dev/download
+        "sha256": "1bb053863873916cb8d5fa877cc4972a6279931783c1fd9e4339d0369a617af4",
+        "url": "https://ftp.debian.org/debian/pool/main/l/linux/linux-libc-dev_5.10.84-1_amd64.deb",
+    },
+    {
+        # From https://packages.debian.org/bullseye/amd64/libc6-dev/download
+        "sha256": "1911bac1137f8f51359047d2fc94053f831abcfb50f1d7584e3ae95ea0831569",
+        "url": "https://ftp.debian.org/debian/pool/main/g/glibc/libc6-dev_2.31-13+deb11u2_amd64.deb",
+    },
+    # These two put the X11 include files in ${PWD}/usr/include/X11
+    # libx11-dev puts libX11.a in ${PWD}/usr/lib/x86_64-linux-gnu
+    {
+        # From https://packages.debian.org/bullseye/amd64/libx11-dev/download
+        "sha256": "11e5f9dcded1a1226b3ee02847b86edce525240367b3989274a891a43dc49f5f",
+        "url": "https://ftp.debian.org/debian/pool/main/libx/libx11/libx11-dev_1.7.2-1_amd64.deb",
+    },
+    {
+        # From https://packages.debian.org/bullseye/all/x11proto-dev/download
+        "sha256": "d5568d587d9ad2664c34c14b0ac538ccb3c567e126ee5291085a8de704a565f5",
+        "url": "https://ftp.debian.org/debian/pool/main/x/xorgproto/x11proto-dev_2020.1-1_all.deb",
+    },
+    # xcb is a dep of X11
+    {
+        # From https://packages.debian.org/bullseye/amd64/libxcb1-dev/download
+        "sha256": "b75544f334c8963b8b7b0e8a88f8a7cde95a714dddbcda076d4beb669a961b58",
+        "url": "https://ftp.debian.org/debian/pool/main/libx/libxcb/libxcb1-dev_1.14-3_amd64.deb",
+    },
+    # Xau is a dep of xcb
+    {
+        # From https://packages.debian.org/bullseye/amd64/libxau-dev/download
+        "sha256": "d1a7f5d484e0879b3b2e8d512894744505e53d078712ce65903fef2ecfd824bb",
+        "url": "https://ftp.debian.org/debian/pool/main/libx/libxau/libxau-dev_1.0.9-1_amd64.deb",
+    },
+    # Xdmcp is a dep of xcb. libxdmcp-dev provides the the libXdmcp.so symlink (and the
+    # .a if we want to statically include it). libxdmcp6 actually provides the .so file
+    {
+        # https://packages.debian.org/bullseye/amd64/libxdmcp-dev/download
+        "sha256": "c6733e5f6463afd261998e408be6eb37f24ce0a64b63bed50a87ddb18ebc1699",
+        "url": "https://ftp.debian.org/debian/pool/main/libx/libxdmcp/libxdmcp-dev_1.1.2-3_amd64.deb",
+    },
+    {
+        # https://packages.debian.org/bullseye/amd64/libxdmcp6/download
+        "sha256": "ecb8536f5fb34543b55bb9dc5f5b14c9dbb4150a7bddb3f2287b7cab6e9d25ef",
+        "url": "https://ftp.debian.org/debian/pool/main/libx/libxdmcp/libxdmcp6_1.1.2-3_amd64.deb",
+    },
+    # These two put GL include files in ${PWD}/usr/include/GL
+    {
+        # From https://packages.debian.org/bullseye/amd64/libgl-dev/download
+        "sha256": "a6487873f2706bbabf9346cdb190f47f23a1464f31cecf92c363bac37c342f2f",
+        "url": "https://ftp.debian.org/debian/pool/main/libg/libglvnd/libgl-dev_1.3.2-1_amd64.deb",
+    },
+    {
+        # From https://packages.debian.org/bullseye/amd64/libglx-dev/download
+        "sha256": "5a50549948bc4363eab32b1083dad2165402c3628f2ee85e9a32563228cc61c1",
+        "url": "https://ftp.debian.org/debian/pool/main/libg/libglvnd/libglx-dev_1.3.2-1_amd64.deb",
+    },
+    # This provides libGL.so for us to link against.
+    {
+        # From https://packages.debian.org/bullseye/amd64/libgl1/download
+        "sha256": "f300f9610b5f05f1ce566c4095f1bf2170e512ac5d201c40d895b8fce29dec98",
+        "url": "https://ftp.debian.org/debian/pool/main/libg/libglvnd/libgl1_1.3.2-1_amd64.deb",
+    },
+]
+
 def _download_and_extract_deb(ctx, deb, sha256, prefix, output = ""):
     """Downloads a debian file and extracts the data into the provided output directory"""
 
     # https://docs.bazel.build/versions/main/skylark/lib/repository_ctx.html#download
     download_info = ctx.download(
-        url = deb,
+        url = _mirror([deb, mirror_prefix+sha256+".deb"]),
         output = "deb.ar",
         sha256 = sha256,
     )
@@ -38,27 +122,23 @@ def _download_and_extract_deb(ctx, deb, sha256, prefix, output = ""):
 
 def _build_cpp_toolchain_impl(ctx):
     # Download the clang toolchain (the extraction can take a while)
-    # https://docs.bazel.build/versions/main/skylark/lib/repository_ctx.html#download
+    # https://docs.bazel.build/versions/main/skylark/lib/repository_ctx.html#download_and_extract
     download_info = ctx.download_and_extract(
-        url = ctx.attr.clang_url,
+        url = _mirror([clang_url, mirror_prefix+clang_sha256+".tar.xz"]),
         output = "",
-        stripPrefix = ctx.attr.clang_prefix,
-        sha256 = ctx.attr.clang_sha256,
-    )
-
-    # This puts the musl include files in ${PWD}/usr/include/x86_64-linux-musl
-    # and the runtime files and lib.a files in ${PWD}/usr/lib/x86_64-linux-musl
-    _download_and_extract_deb(
-        ctx,
-        ctx.attr.musl_dev_url,
-        ctx.attr.musl_dev_sha256,
-        ".",
+        stripPrefix = clang_prefix,
+        sha256 = clang_sha256,
     )
 
-    # kjlubick@ cannot figure out how to get clang to look in ${PWD}/usr/lib/x86_64-linux-musl
-    # for the crt1.o files, so we'll move them to ${PWD}/usr/lib/ where clang *is* looking.
-    for file in ["crt1.o", "crtn.o", "Scrt1.o", "crti.o", "rcrt1.o"]:
-        ctx.execute(["cp", "usr/lib/x86_64-linux-musl/" + file, "usr/lib/"])
+    # Extract all the debs into our sysroot. This is very similar to installing them, except their
+    # dependencies are not installed automatically.
+    for deb in debs_to_install:
+        _download_and_extract_deb(
+            ctx,
+            deb["url"],
+            deb["sha256"],
+            ".",
+        )
 
     # Create a BUILD.bazel file that makes all the files in this subfolder
     # available for use in rules, i.e. in the toolchain declaration.
@@ -77,14 +157,15 @@ filegroup(
         executable = False,
     )
 
+# If force_test_of_mirrors is set, return a list containing only the second item. This assumes
+# that the given list will have a primary source and a mirror source (precisely two items).
+def _mirror(arr):
+    if force_test_of_mirrors:
+        return [arr[1]]
+    return arr
+
 build_cpp_toolchain = repository_rule(
     implementation = _build_cpp_toolchain_impl,
-    attrs = {
-        "clang_url": attr.string(mandatory = True),
-        "clang_sha256": attr.string(mandatory = True),
-        "clang_prefix": attr.string(mandatory = True),
-        "musl_dev_url": attr.string(mandatory = True),
-        "musl_dev_sha256": attr.string(mandatory = True),
-    },
+    attrs = {},
     doc = "",
 )
diff --git a/third_party/skia/toolchain/clang_toolchain_config.bzl b/third_party/skia/toolchain/clang_toolchain_config.bzl
index d90c623a0124b..7fbc0431bd9c3 100644
--- a/third_party/skia/toolchain/clang_toolchain_config.bzl
+++ b/third_party/skia/toolchain/clang_toolchain_config.bzl
@@ -23,7 +23,7 @@ load(
 load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
 
 # The location of the created clang toolchain.
-EXTERNAL_TOOLCHAIN = "external/clang_linux_amd64_musl"
+EXTERNAL_TOOLCHAIN = "external/clang_linux_amd64"
 
 def _clang_impl(ctx):
     action_configs = _make_action_configs()
@@ -40,11 +40,19 @@ def _clang_impl(ctx):
         abi_libc_version = "unknown",
         abi_version = "unknown",
         action_configs = action_configs,
-        builtin_sysroot = EXTERNAL_TOOLCHAIN + "/usr",
+        # This is important because the linker will complain if the libc shared libraries are not
+        # under this directory. Because we extract the libc libraries to
+        # EXTERNAL_TOOLCHAIN/lib, and the various headers and shared libraries to
+        # EXTERNAL_TOOLCHAIN/usr, we make the top level folder the sysroot so the linker can
+        # find the referenced libraries (e.g. EXTERNAL_TOOLCHAIN/usr/lib/x86_64-linux-gnu/libc.so
+        # is just a text file that refers to "/lib/x86_64-linux-gnu/libc.so.6" and
+        # "/lib64/ld-linux-x86-64.so.2" which will use the sysroot as the root).
+        builtin_sysroot = EXTERNAL_TOOLCHAIN,
         compiler = "clang",
         host_system_name = "local",
         target_cpu = "k8",
-        target_libc = "musl",
+        # It is unclear if target_libc matters.
+        target_libc = "glibc-2.31",
         target_system_name = "local",
         toolchain_identifier = "clang-toolchain",
     )
@@ -195,17 +203,20 @@ def _make_default_flags():
             flag_group(
                 flags = [
                     # THIS ORDER MATTERS GREATLY. If these are in the wrong order, the
-                    # #include_next directives will walk off the end of the specified system
-                    # folders here and look in the absolute path that happens to contain
-                    # the clang executable. Because that looks like an absolute path to
-                    # Bazel, it will declare the Build is not properly specified (that is,
-                    # it appears to use headers outside of Bazel's control/view) and fail.
+                    # #include_next directives will fail to find the files, causing a compilation
+                    # error (or, without -no-canonical-prefixes, a mysterious case where files
+                    # are included with an absolute path and fail the build).
                     "-isystem",
                     EXTERNAL_TOOLCHAIN + "/include/c++/v1",
                     "-isystem",
+                    EXTERNAL_TOOLCHAIN + "/usr/include",
+                    "-isystem",
                     EXTERNAL_TOOLCHAIN + "/lib/clang/13.0.0/include",
                     "-isystem",
-                    EXTERNAL_TOOLCHAIN + "/usr/include/x86_64-linux-musl",
+                    EXTERNAL_TOOLCHAIN + "/usr/include/x86_64-linux-gnu",
+                    # We do not want clang to search in absolute paths for files. This makes
+                    # Bazel think we are using an outside resource and fail the compile.
+                    "-no-canonical-prefixes",
                 ],
             ),
         ],
@@ -218,16 +229,8 @@ def _make_default_flags():
         flag_groups = [
             flag_group(
                 flags = [
-                    # http://g/skia-staff/bhPPBV4YdeU/5oyG5GRgBQAJ
-                    "-std=c++14",
-                    "-Wno-c++17-extensions",
+                    "-std=c++17",
                     "-Wno-psabi",  # noisy
-                    # This define allows libc++ to work with musl. They were discovered by
-                    # trying to compile without them, reading errors and source code, e.g.
-                    # https://github.com/llvm/llvm-project/blob/f4c1258d5633fcf06385ff3fd1f4bf57ab971964/libcxx/include/__locale#L513
-                    # https://github.com/llvm/llvm-project/blob/f4c1258d5633fcf06385ff3fd1f4bf57ab971964/libcxx/include/__config#L1155
-                    # https://github.com/llvm/llvm-project/blob/f4c1258d5633fcf06385ff3fd1f4bf57ab971964/libcxx/include/__support/musl/xlocale.h
-                    "-D_LIBCPP_HAS_MUSL_LIBC",
                 ],
             ),
         ],
@@ -239,20 +242,19 @@ def _make_default_flags():
             flag_group(
                 flags = [
                     "-fuse-ld=lld",
-                    # This is the path to libc.a and other libraries.
-                    "-L" + EXTERNAL_TOOLCHAIN + "/usr/lib/x86_64-linux-musl",
-                    "-L" + EXTERNAL_TOOLCHAIN + "/lib",
                     # We chose to use the llvm runtime, not the gcc one because it is already
                     # included in the clang binary
                     "--rtlib=compiler-rt",
-                    # In order to run our executables, they need to be statically linked,
-                    # otherwise, the libc++.so and friends will not be found if they are
-                    # not installed on the user's machine.
-                    "-static",
-                    "-std=c++14",
-                    "-lc++abi",
-                    "-lunwind",
-                    "-lc++",
+                    "-std=c++17",
+                    # We statically include these libc++ libraries so they do not need to be
+                    # on a developer's machine (they can be tricky to get).
+                    EXTERNAL_TOOLCHAIN + "/lib/libc++.a",
+                    EXTERNAL_TOOLCHAIN + "/lib/libc++abi.a",
+                    EXTERNAL_TOOLCHAIN + "/lib/libunwind.a",
+                    # Dynamically Link in the other parts of glibc (not needed in glibc 2.34+)
+                    "-lpthread",
+                    "-lm",
+                    "-ldl",
                 ],
             ),
         ],
diff --git a/third_party/skia/toolchain/clang_trampoline.sh b/third_party/skia/toolchain/clang_trampoline.sh
index 7672c776a8b7e..c7319183f1894 100755
--- a/third_party/skia/toolchain/clang_trampoline.sh
+++ b/third_party/skia/toolchain/clang_trampoline.sh
@@ -4,4 +4,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-external/clang_linux_amd64_musl/bin/clang $@
+external/clang_linux_amd64/bin/clang $@
diff --git a/third_party/skia/toolchain/lld_trampoline.sh b/third_party/skia/toolchain/lld_trampoline.sh
index f32562fca4eac..3349e5351a8a0 100755
--- a/third_party/skia/toolchain/lld_trampoline.sh
+++ b/third_party/skia/toolchain/lld_trampoline.sh
@@ -4,4 +4,4 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-external/clang_linux_amd64_musl/bin/ld.lld $@
+external/clang_linux_amd64/bin/ld.lld $@
diff --git a/third_party/skia/tools/BUILD.bazel b/third_party/skia/tools/BUILD.bazel
index fb7c231ef3f3b..5ca48b287e1ff 100644
--- a/third_party/skia/tools/BUILD.bazel
+++ b/third_party/skia/tools/BUILD.bazel
@@ -7,6 +7,31 @@ py_binary(
     visibility = ["//:__subpackages__"],
 )
 
+cc_library(
+    name = "hash_and_encode",
+    testonly = True,
+    hdrs = [
+        ":HashAndEncode_hdr",
+    ],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":HashAndEncode_src",
+        "//tools/flags:CommandLineFlags_src",
+    ],
+)
+
+cc_library(
+    name = "resource_factory",
+    testonly = True,
+    hdrs = [
+        ":ResourceFactory_hdr",
+    ],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Resources_src",
+    ],
+)
+
 generated_cc_atom(
     name = "AndroidSkDebugToStdOut_src",
     srcs = ["AndroidSkDebugToStdOut.cpp"],
@@ -254,6 +279,7 @@ generated_cc_atom(
     srcs = ["RuntimeBlendUtils.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":RuntimeBlendUtils_hdr",
         "//include/core:SkBlendMode_hdr",
         "//include/core:SkRefCnt_hdr",
         "//include/effects:SkRuntimeEffect_hdr",
@@ -400,7 +426,7 @@ generated_cc_atom(
         "//include/core:SkColor_hdr",
         "//include/core:SkStream_hdr",
         "//include/core:SkSurface_hdr",
-        "//src/core:SkRemoteGlyphCache_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
         "//src/core:SkScalerContext_hdr",
         "//src/core:SkTextBlobTrace_hdr",
     ],
@@ -568,7 +594,7 @@ generated_cc_atom(
     deps = [
         "//include/core:SkGraphics_hdr",
         "//include/core:SkSurface_hdr",
-        "//src/core:SkRemoteGlyphCache_hdr",
+        "//include/private/chromium:SkChromeRemoteGlyphCache_hdr",
         "//src/core:SkScalerContext_hdr",
     ],
 )
diff --git a/third_party/skia/tools/HashAndEncode.cpp b/third_party/skia/tools/HashAndEncode.cpp
index e9c9dfb62dd80..c2fcd0f7d143e 100644
--- a/third_party/skia/tools/HashAndEncode.cpp
+++ b/third_party/skia/tools/HashAndEncode.cpp
@@ -34,6 +34,8 @@ HashAndEncode::HashAndEncode(const SkBitmap& bitmap) : fSize(bitmap.info().dimen
         case kRGBA_1010102_SkColorType:       srcFmt = skcms_PixelFormat_RGBA_1010102;    break;
         case kBGRA_1010102_SkColorType:       srcFmt = skcms_PixelFormat_BGRA_1010102;    break;
         case kGray_8_SkColorType:             srcFmt = skcms_PixelFormat_G_8;             break;
+        // skcms doesn't have R_8. Pretend it's G_8, but see below for color space trickery:
+        case kR8_unorm_SkColorType:           srcFmt = skcms_PixelFormat_G_8;             break;
         case kRGBA_F16Norm_SkColorType:       srcFmt = skcms_PixelFormat_RGBA_hhhh;       break;
         case kRGBA_F16_SkColorType:           srcFmt = skcms_PixelFormat_RGBA_hhhh;       break;
         case kRGBA_F32_SkColorType:           srcFmt = skcms_PixelFormat_RGBA_ffff;       break;
@@ -58,6 +60,14 @@ HashAndEncode::HashAndEncode(const SkBitmap& bitmap) : fSize(bitmap.info().dimen
         cs->toProfile(&srcProfile);
     }
 
+    // NOTE: If the color type is R8, we told skcms it's actually G8 above. To get red PNGs,
+    // we tweak the source color space to throw away any green and blue:
+    if (bitmap.colorType() == kR8_unorm_SkColorType) {
+        srcProfile.toXYZD50.vals[0][1] = srcProfile.toXYZD50.vals[0][2] = 0;
+        srcProfile.toXYZD50.vals[1][1] = srcProfile.toXYZD50.vals[1][2] = 0;
+        srcProfile.toXYZD50.vals[2][1] = srcProfile.toXYZD50.vals[2][2] = 0;
+    }
+
     // Our common format that can represent anything we draw and encode as a PNG:
     //   - 16-bit big-endian RGBA
     //   - unpremul
diff --git a/third_party/skia/tools/ProcStats.cpp b/third_party/skia/tools/ProcStats.cpp
index c9f1f3756c28f..759604f7eeab7 100644
--- a/third_party/skia/tools/ProcStats.cpp
+++ b/third_party/skia/tools/ProcStats.cpp
@@ -18,7 +18,7 @@
       zx_info_task_stats_t task_stats;
       zx_handle_t process = zx_process_self();
       zx_status_t status = zx_object_get_info(
-      process, ZX_INFO_TASK_STATS, &task_stats, sizeof(task_stats), NULL, NULL);
+      process, ZX_INFO_TASK_STATS, &task_stats, sizeof(task_stats), nullptr, nullptr);
       if (status != ZX_OK) {
         return -1;
       }
diff --git a/third_party/skia/tools/RuntimeBlendUtils.cpp b/third_party/skia/tools/RuntimeBlendUtils.cpp
index 2305521da7d5c..8dfbf9cb5ca79 100644
--- a/third_party/skia/tools/RuntimeBlendUtils.cpp
+++ b/third_party/skia/tools/RuntimeBlendUtils.cpp
@@ -8,6 +8,7 @@
 #include "include/core/SkBlendMode.h"
 #include "include/core/SkRefCnt.h"
 #include "include/effects/SkRuntimeEffect.h"
+#include "tools/RuntimeBlendUtils.h"
 
 sk_sp<SkBlender> GetRuntimeBlendForBlendMode(SkBlendMode mode) {
     static auto result = SkRuntimeEffect::MakeForBlender(SkString(R"(
diff --git a/third_party/skia/tools/ToolUtils.cpp b/third_party/skia/tools/ToolUtils.cpp
index 239226292dc6c..48050231d1c99 100644
--- a/third_party/skia/tools/ToolUtils.cpp
+++ b/third_party/skia/tools/ToolUtils.cpp
@@ -73,6 +73,7 @@ const char* colortype_name(SkColorType ct) {
         case kR16G16_unorm_SkColorType:       return "R16G16_unorm";
         case kR16G16_float_SkColorType:       return "R16G16_float";
         case kR16G16B16A16_unorm_SkColorType: return "R16G16B16A16_unorm";
+        case kR8_unorm_SkColorType:           return "R8_unorm";
     }
     SkASSERT(false);
     return "unexpected colortype";
@@ -102,6 +103,7 @@ const char* colortype_depth(SkColorType ct) {
         case kR16G16_unorm_SkColorType:       return "1616";
         case kR16G16_float_SkColorType:       return "F16F16";
         case kR16G16B16A16_unorm_SkColorType: return "16161616";
+        case kR8_unorm_SkColorType:           return "8";
     }
     SkASSERT(false);
     return "unexpected colortype";
diff --git a/third_party/skia/tools/blob_cache_sim.cpp b/third_party/skia/tools/blob_cache_sim.cpp
index 4352115c0b400..19d5a3b4e22fc 100644
--- a/third_party/skia/tools/blob_cache_sim.cpp
+++ b/third_party/skia/tools/blob_cache_sim.cpp
@@ -8,7 +8,7 @@
 #include "include/core/SkColor.h"
 #include "include/core/SkStream.h"
 #include "include/core/SkSurface.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkScalerContext.h"
 #include "src/core/SkTextBlobTrace.h"
 
diff --git a/third_party/skia/tools/debugger/BUILD.bazel b/third_party/skia/tools/debugger/BUILD.bazel
index 904063e11c89e..7f00249b4cafe 100644
--- a/third_party/skia/tools/debugger/BUILD.bazel
+++ b/third_party/skia/tools/debugger/BUILD.bazel
@@ -1,11 +1,23 @@
 load("//bazel:macros.bzl", "generated_cc_atom")
 
+cc_library(
+    name = "debugger",
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":DebugCanvas_src",
+        ":DebugLayerManager_src",
+        ":DrawCommand_src",
+        ":JsonWriteBuffer_src",
+        "//tools:SkSharingProc_src",
+        "//tools:UrlDataManager_src",
+    ],
+)
+
 generated_cc_atom(
     name = "DebugCanvas_hdr",
     hdrs = ["DebugCanvas.h"],
     visibility = ["//:__subpackages__"],
     deps = [
-        ":DebugLayerManager_hdr",
         ":DrawCommand_hdr",
         "//include/core:SkCanvasVirtualEnforcer_hdr",
         "//include/core:SkCanvas_hdr",
diff --git a/third_party/skia/tools/debugger/DebugCanvas.h b/third_party/skia/tools/debugger/DebugCanvas.h
index 9ae1bf51ca6f9..c67f0c4b89c57 100644
--- a/third_party/skia/tools/debugger/DebugCanvas.h
+++ b/third_party/skia/tools/debugger/DebugCanvas.h
@@ -16,7 +16,6 @@
 #include "include/pathops/SkPathOps.h"
 #include "include/private/SkTArray.h"
 #include "tools/UrlDataManager.h"
-#include "tools/debugger/DebugLayerManager.h"
 #include "tools/debugger/DrawCommand.h"
 
 #include <map>
diff --git a/third_party/skia/tools/debugger/DrawCommand.cpp b/third_party/skia/tools/debugger/DrawCommand.cpp
index c44b8c44724c9..07400acaf8d41 100644
--- a/third_party/skia/tools/debugger/DrawCommand.cpp
+++ b/third_party/skia/tools/debugger/DrawCommand.cpp
@@ -362,29 +362,10 @@ void render_shadow(SkCanvas* canvas, const SkPath& path, SkDrawShadowRec rec) {
     canvas->private_draw_shadow_rec(path, rec);
 }
 
-static const char* const gBlendModeMap[] = {
-        "clear",      "src",        "dst",      "srcOver",    "dstOver",   "srcIn",     "dstIn",
-        "srcOut",     "dstOut",     "srcATop",  "dstATop",    "xor",       "plus",      "modulate",
-
-        "screen",
-
-        "overlay",    "darken",     "lighten",  "colorDodge", "colorBurn", "hardLight", "softLight",
-        "difference", "exclusion",  "multiply",
-
-        "hue",        "saturation", "color",    "luminosity",
-};
-
-static_assert(SK_ARRAY_COUNT(gBlendModeMap) == static_cast<size_t>(SkBlendMode::kLastMode) + 1,
-              "blendMode mismatch");
-static_assert(SK_ARRAY_COUNT(gBlendModeMap) == static_cast<size_t>(SkBlendMode::kLuminosity) + 1,
-              "blendMode mismatch");
-
 void apply_paint_blend_mode(const SkPaint& paint, SkJSONWriter& writer) {
     const auto mode = paint.getBlendMode_or(SkBlendMode::kSrcOver);
     if (mode != SkBlendMode::kSrcOver) {
-        SkASSERT(static_cast<size_t>(mode) < SK_ARRAY_COUNT(gBlendModeMap));
-        writer.appendString(DEBUGCANVAS_ATTRIBUTE_BLENDMODE,
-                            gBlendModeMap[static_cast<size_t>(mode)]);
+        writer.appendString(DEBUGCANVAS_ATTRIBUTE_BLENDMODE, SkBlendMode_Name(mode));
     }
 }
 
diff --git a/third_party/skia/tools/fiddle/fiddle_main.cpp b/third_party/skia/tools/fiddle/fiddle_main.cpp
index 0d983cf24d450..5870be2ef6b20 100644
--- a/third_party/skia/tools/fiddle/fiddle_main.cpp
+++ b/third_party/skia/tools/fiddle/fiddle_main.cpp
@@ -139,7 +139,8 @@ static bool setup_backend_objects(GrDirectContext* dContext,
         }
 
         SkAutoPixmapStorage rgbaPixmap;
-        if (kN32_SkColorType != kRGBA_8888_SkColorType) {
+        constexpr bool kRGBAIsNative = kN32_SkColorType == kRGBA_8888_SkColorType;
+        if ((!kRGBAIsNative)) {
             if (!rgbaPixmap.tryAlloc(bm.info().makeColorType(kRGBA_8888_SkColorType))) {
                 fputs("Unable to alloc rgbaPixmap.\n", stderr);
                 return false;
diff --git a/third_party/skia/tools/flags/BUILD.bazel b/third_party/skia/tools/flags/BUILD.bazel
index d38bb0fe56924..4aae132bb258a 100644
--- a/third_party/skia/tools/flags/BUILD.bazel
+++ b/third_party/skia/tools/flags/BUILD.bazel
@@ -50,7 +50,6 @@ generated_cc_atom(
     deps = [
         ":CommonFlagsConfig_hdr",
         "//include/core:SkImageInfo_hdr",
-        "//include/core:SkStringView_hdr",
         "//include/core:SkSurfaceProps_hdr",
         "//include/private:SkTHash_hdr",
         "//src/core:SkColorSpacePriv_hdr",
diff --git a/third_party/skia/tools/flags/CommonFlagsConfig.cpp b/third_party/skia/tools/flags/CommonFlagsConfig.cpp
index 4ce855ad800d0..dbe5beb20b1d4 100644
--- a/third_party/skia/tools/flags/CommonFlagsConfig.cpp
+++ b/third_party/skia/tools/flags/CommonFlagsConfig.cpp
@@ -8,13 +8,13 @@
 #include "tools/flags/CommonFlagsConfig.h"
 
 #include "include/core/SkImageInfo.h"
-#include "include/core/SkStringView.h"
 #include "include/core/SkSurfaceProps.h"
 #include "include/private/SkTHash.h"
 #include "src/core/SkColorSpacePriv.h"
 #include "src/core/SkSurfacePriv.h"
 
 #include <stdlib.h>
+#include <string_view>
 #include <unordered_map>
 
 using sk_gpu_test::GrContextFactory;
@@ -62,6 +62,7 @@ static const struct {
     { "glf16",                 "gpu", "api=gl,color=f16" },
     { "glf16norm",             "gpu", "api=gl,color=f16norm" },
     { "glsrgba",               "gpu", "api=gl,color=srgba" },
+    { "glr8",                  "gpu", "api=gl,color=r8" },
     { "glesf16",               "gpu", "api=gles,color=f16" },
     { "glessrgba",             "gpu", "api=gles,color=srgba" },
     { "glnostencils",          "gpu", "api=gl,stencils=false" },
@@ -233,7 +234,7 @@ SkCommandLineConfig::SkCommandLineConfig(const SkString& tag,
                                          const SkTArray<SkString>& viaParts)
         : fTag(tag), fBackend(backend) {
 
-    static std::unordered_map<skstd::string_view, sk_sp<SkColorSpace>> kColorSpaces = {
+    static std::unordered_map<std::string_view, sk_sp<SkColorSpace>> kColorSpaces = {
         // 'narrow' has a gamut narrower than sRGB, and different transfer function.
         { "narrow",  SkColorSpace::MakeRGB(SkNamedTransferFn::k2Dot2, gNarrow_toXYZD50) },
         { "srgb",    SkColorSpace::MakeSRGB() },
@@ -380,6 +381,9 @@ static bool parse_option_gpu_color(const SkString& value,
         *outColorType  = kRGBA_F16Norm_SkColorType;
     } else if (value.equals("srgba")) {
         *outColorType = kSRGBA_8888_SkColorType;
+    } else if (value.equals("r8")) {
+        *outColorType = kR8_unorm_SkColorType;
+        *alphaType = kOpaque_SkAlphaType;
     } else {
         return false;
     }
diff --git a/third_party/skia/tools/fm/fm.cpp b/third_party/skia/tools/fm/fm.cpp
index 34794eec2a606..239f3dc473a0a 100644
--- a/third_party/skia/tools/fm/fm.cpp
+++ b/third_party/skia/tools/fm/fm.cpp
@@ -121,20 +121,15 @@ static bool parse_flag(const CommandLineFlags::StringArray& flag,
 }
 
 struct Result {
-    enum { Ok, Skip, Fail} status;
-    SkString               failure;
+    enum { Ok, Skip, Fail } status;
+    SkString                failure;
 };
-static const Result ok = {Result::Ok,   {}},
-                  skip = {Result::Skip, {}};
+static const Result ok   = {Result::Ok,   {}},
+                    skip = {Result::Skip, {}};
 
-static Result fail(const char* why) {
-    return { Result::Fail, SkString(why) };
+static Result fail(SkString why) {
+    return {Result::Fail, why};
 }
-template <typename... Args>
-static Result fail(const char* whyFmt, Args... args) {
-    return { Result::Fail, SkStringPrintf(whyFmt, args...) };
-}
-
 
 struct Source {
     SkString                               name;
@@ -153,13 +148,13 @@ static void init(Source* source, std::shared_ptr<skiagm::GM> gm) {
         switch (gm->gpuSetup(direct, canvas, &err)) {
             case skiagm::DrawResult::kOk  : break;
             case skiagm::DrawResult::kSkip: return skip;
-            case skiagm::DrawResult::kFail: return fail(err.c_str());
+            case skiagm::DrawResult::kFail: return fail(err);
         }
 
         switch (gm->draw(canvas, &err)) {
             case skiagm::DrawResult::kOk:   break;
             case skiagm::DrawResult::kSkip: return skip;
-            case skiagm::DrawResult::kFail: return fail(err.c_str());
+            case skiagm::DrawResult::kFail: return fail(err);
         }
         return ok;
     };
@@ -186,7 +181,7 @@ static void init(Source* source, std::shared_ptr<SkCodec> codec) {
             canvas->drawImage(image, 0,0);
             return ok;
         }
-        return fail("codec->getPixels() failed: %d\n", result);
+        return fail(SkStringPrintf("codec->getPixels() failed: %d\n", result));
     };
 }
 
@@ -254,7 +249,7 @@ static void init(Source* source, const skiatest::Test& test) {
         }
 
         canvas->clear(SK_ColorRED);
-        return fail(reporter.msg.c_str());
+        return fail(reporter.msg);
     };
 }
 
@@ -515,7 +510,7 @@ int main(int argc, char** argv) {
     };
     const FlagOption<SkColorType> kColorTypes[] = {
         { "a8",                  kAlpha_8_SkColorType },
-        { "g8",                   kGray_8_SkColorType },
+        { "r8",                 kR8_unorm_SkColorType },
         { "565",                 kRGB_565_SkColorType },
         { "4444",              kARGB_4444_SkColorType },
         { "8888",                    kN32_SkColorType },
diff --git a/third_party/skia/tools/fonts/BUILD.bazel b/third_party/skia/tools/fonts/BUILD.bazel
index fd87b3fb62057..aca61d0c16b5c 100644
--- a/third_party/skia/tools/fonts/BUILD.bazel
+++ b/third_party/skia/tools/fonts/BUILD.bazel
@@ -1,5 +1,17 @@
 load("//bazel:macros.bzl", "generated_cc_atom")
 
+cc_library(
+    name = "test_font_manager",
+    testonly = True,
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":TestFontMgr_hdr",
+        ":TestFontMgr_src",
+        ":TestTypeface_src",
+        ":ToolUtilsFont_src",
+    ],
+)
+
 generated_cc_atom(
     name = "RandomScalerContext_hdr",
     hdrs = ["RandomScalerContext.h"],
@@ -18,6 +30,7 @@ generated_cc_atom(
         ":RandomScalerContext_hdr",
         "//include/core:SkBitmap_hdr",
         "//include/core:SkCanvas_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkPath_hdr",
         "//src/core:SkAdvancedTypefaceMetrics_hdr",
         "//src/core:SkGlyph_hdr",
@@ -95,6 +108,7 @@ generated_cc_atom(
         "//include/core:SkCanvas_hdr",
         "//include/core:SkColor_hdr",
         "//include/core:SkData_hdr",
+        "//include/core:SkDrawable_hdr",
         "//include/core:SkEncodedImageFormat_hdr",
         "//include/core:SkFontStyle_hdr",
         "//include/core:SkImageInfo_hdr",
diff --git a/third_party/skia/tools/fonts/RandomScalerContext.cpp b/third_party/skia/tools/fonts/RandomScalerContext.cpp
index 813d7a582e782..cff0ffd34877b 100644
--- a/third_party/skia/tools/fonts/RandomScalerContext.cpp
+++ b/third_party/skia/tools/fonts/RandomScalerContext.cpp
@@ -7,6 +7,7 @@
 
 #include "include/core/SkBitmap.h"
 #include "include/core/SkCanvas.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkPath.h"
 #include "src/core/SkAdvancedTypefaceMetrics.h"
 #include "src/core/SkGlyph.h"
@@ -27,6 +28,7 @@ class RandomScalerContext : public SkScalerContext {
     void     generateMetrics(SkGlyph*, SkArenaAlloc*) override;
     void     generateImage(const SkGlyph&) override;
     bool     generatePath(const SkGlyph&, SkPath*) override;
+    sk_sp<SkDrawable> generateDrawable(const SkGlyph&) override;
     void     generateFontMetrics(SkFontMetrics*) override;
 
 private:
@@ -138,6 +140,14 @@ bool RandomScalerContext::generatePath(const SkGlyph& glyph, SkPath* path) {
     return fProxy->generatePath(glyph, path);
 }
 
+sk_sp<SkDrawable> RandomScalerContext::generateDrawable(const SkGlyph& glyph) {
+    SkGlyph* shadowProxyGlyph = fProxyGlyphs.find(glyph.getPackedID());
+    if (shadowProxyGlyph && shadowProxyGlyph->path()) {
+        return nullptr;
+    }
+    return fProxy->generateDrawable(glyph);
+}
+
 void RandomScalerContext::generateFontMetrics(SkFontMetrics* metrics) {
     fProxy->getFontMetrics(metrics);
 }
@@ -213,6 +223,10 @@ void SkRandomTypeface::getPostScriptGlyphNames(SkString* names) const {
     return fProxy->getPostScriptGlyphNames(names);
 }
 
+bool SkRandomTypeface::onGlyphMaskNeedsCurrentColor() const {
+    return fProxy->glyphMaskNeedsCurrentColor();
+}
+
 int SkRandomTypeface::onGetVariationDesignPosition(
         SkFontArguments::VariationPosition::Coordinate coordinates[],
         int                                            coordinateCount) const {
diff --git a/third_party/skia/tools/fonts/RandomScalerContext.h b/third_party/skia/tools/fonts/RandomScalerContext.h
index 4f555a7c795cc..4e238ce9978c9 100644
--- a/third_party/skia/tools/fonts/RandomScalerContext.h
+++ b/third_party/skia/tools/fonts/RandomScalerContext.h
@@ -43,7 +43,7 @@ class SkRandomTypeface : public SkTypeface {
 
     void getPostScriptGlyphNames(SkString*) const override;
 
-    bool onGlyphMaskNeedsCurrentColor() const override { return false; }
+    bool onGlyphMaskNeedsCurrentColor() const override;
     int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[],
                                      int coordinateCount) const override;
     int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
diff --git a/third_party/skia/tools/fonts/TestFontMgr.cpp b/third_party/skia/tools/fonts/TestFontMgr.cpp
index e957c0713f7ec..e82477ac3420d 100644
--- a/third_party/skia/tools/fonts/TestFontMgr.cpp
+++ b/third_party/skia/tools/fonts/TestFontMgr.cpp
@@ -128,7 +128,7 @@ class FontMgr final : public SkFontMgr {
             if (strstr(familyName, "erif")) {
                 return this->createStyleSet(2);
             }
-#ifdef SK_XML
+#if defined(SK_ENABLE_SVG)
             if (strstr(familyName, "oji")) {
                 return this->createStyleSet(6);
             }
diff --git a/third_party/skia/tools/fonts/TestSVGTypeface.cpp b/third_party/skia/tools/fonts/TestSVGTypeface.cpp
index c340c8df2f399..2a044321c5b40 100644
--- a/third_party/skia/tools/fonts/TestSVGTypeface.cpp
+++ b/third_party/skia/tools/fonts/TestSVGTypeface.cpp
@@ -13,6 +13,7 @@
 #include "include/core/SkCanvas.h"
 #include "include/core/SkColor.h"
 #include "include/core/SkData.h"
+#include "include/core/SkDrawable.h"
 #include "include/core/SkEncodedImageFormat.h"
 #include "include/core/SkFontStyle.h"
 #include "include/core/SkImage.h"
@@ -255,6 +256,34 @@ class SkTestSVGScalerContext : public SkScalerContext {
         return false;
     }
 
+    struct SVGGlyphDrawable : public SkDrawable {
+        SkTestSVGScalerContext* fSelf;
+        SkGlyph fGlyph;
+        SVGGlyphDrawable(SkTestSVGScalerContext* self, const SkGlyph& glyph)
+            : fSelf(self), fGlyph(glyph) {}
+        SkRect onGetBounds() override { return fGlyph.rect();  }
+        size_t onApproximateBytesUsed() override { return sizeof(SVGGlyphDrawable); }
+
+        void onDraw(SkCanvas* canvas) override {
+            SkGlyphID glyphID = fGlyph.getGlyphID();
+            glyphID = glyphID < fSelf->getTestSVGTypeface()->fGlyphCount ? glyphID : 0;
+
+            TestSVGTypeface::Glyph& glyphData = fSelf->getTestSVGTypeface()->fGlyphs[glyphID];
+
+            SkScalar dx = SkFixedToScalar(fGlyph.getSubXFixed());
+            SkScalar dy = SkFixedToScalar(fGlyph.getSubYFixed());
+
+            canvas->translate(dx, dy);
+            canvas->concat(fSelf->fMatrix);
+            canvas->translate(glyphData.fOrigin.fX, -glyphData.fOrigin.fY);
+
+            glyphData.render(canvas);
+        }
+    };
+    sk_sp<SkDrawable> generateDrawable(const SkGlyph& glyph) override {
+        return sk_sp<SVGGlyphDrawable>(new SVGGlyphDrawable(this, glyph));
+    }
+
     void generateFontMetrics(SkFontMetrics* metrics) override {
         this->getTestSVGTypeface()->getFontMetrics(metrics);
         SkFontPriv::ScaleFontMetrics(metrics, fMatrix.getScaleY());
diff --git a/third_party/skia/tools/get_current_monitor_profile.cpp b/third_party/skia/tools/get_current_monitor_profile.cpp
index 9f2bd3c3da7a2..79191766e842a 100644
--- a/third_party/skia/tools/get_current_monitor_profile.cpp
+++ b/third_party/skia/tools/get_current_monitor_profile.cpp
@@ -34,12 +34,12 @@ int main(int argc, char** argv) {
     // over all attached monitors, so it's "better" in that sense. Making intelligent use of this
     // information (via things like MonitorFromWindow or MonitorFromRect to pick the correct
     // profile for a particular window or region of a window), is an exercise left to the reader.
-    for (int i = 0; EnumDisplayDevices(NULL, i, &dd, 0); ++i) {
+    for (int i = 0; EnumDisplayDevices(nullptr, i, &dd, 0); ++i) {
         if (dd.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) {
             // There are other helpful things in dd at this point:
             // dd.DeviceString has a longer name for the adapter
             // dd.StateFlags indicates primary display, mirroring, etc...
-            HDC dc = CreateDC(NULL, dd.DeviceName, NULL, NULL);
+            HDC dc = CreateDC(nullptr, dd.DeviceName, nullptr, nullptr);
             if (dc) {
                 char icmPath[MAX_PATH + 1];
                 DWORD pathLength = MAX_PATH;
diff --git a/third_party/skia/tools/git-sync-deps b/third_party/skia/tools/git-sync-deps
index 5ade4845c33a1..44d936b426b72 100755
--- a/third_party/skia/tools/git-sync-deps
+++ b/third_party/skia/tools/git-sync-deps
@@ -43,7 +43,7 @@ def git_executable():
       A string suitable for passing to subprocess functions, or None.
   """
   envgit = os.environ.get('GIT_EXECUTABLE')
-  searchlist = ['git']
+  searchlist = ['git', 'git.bat']
   if envgit:
     searchlist.insert(0, envgit)
   with open(os.devnull, 'w') as devnull:
@@ -141,7 +141,7 @@ def git_checkout_to_directory(git, repo, commithash, directory, verbose):
 
   if not is_git_toplevel(git, directory):
     # if the directory exists, but isn't a git repo, you will modify
-    # the parent repostory, which isn't what you want.
+    # the parent repository, which isn't what you want.
     sys.stdout.write('%s\n  IS NOT TOP-LEVEL GIT DIRECTORY.\n' % directory)
     return
 
@@ -262,6 +262,9 @@ def main(argv):
   subprocess.check_call(
       [sys.executable,
        os.path.join(os.path.dirname(deps_file_path), 'bin', 'fetch-gn')])
+  subprocess.check_call(
+      [sys.executable,
+       os.path.join(os.path.dirname(deps_file_path), 'bin', 'activate-emsdk')])
   return 0
 
 
diff --git a/third_party/skia/tools/gpu/BUILD.bazel b/third_party/skia/tools/gpu/BUILD.bazel
index 89cde210c65ad..3f92be3b8cbad 100644
--- a/third_party/skia/tools/gpu/BUILD.bazel
+++ b/third_party/skia/tools/gpu/BUILD.bazel
@@ -1,5 +1,39 @@
 load("//bazel:macros.bzl", "generated_cc_atom")
 
+cc_library(
+    name = "gpu_tool_utils",
+    testonly = True,
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":BackendSurfaceFactory_hdr",
+        ":BackendSurfaceFactory_src",
+        ":BackendTextureImageFactory_hdr",
+        ":BackendTextureImageFactory_src",
+        ":FenceSync_hdr",
+        ":FlushFinishTracker_hdr",
+        ":FlushFinishTracker_src",
+        ":GpuTimer_hdr",
+        ":GrContextFactory_hdr",
+        ":GrContextFactory_src",
+        ":GrTest_src",
+        ":ManagedBackendTexture_hdr",
+        ":ManagedBackendTexture_src",
+        ":MemoryCache_hdr",
+        ":MemoryCache_src",
+        ":ProxyUtils_hdr",
+        ":ProxyUtils_src",
+        ":TestContext_hdr",
+        ":TestContext_src",
+        ":TestOps_hdr",
+        ":TestOps_src",
+        ":YUVUtils_hdr",
+        ":YUVUtils_src",
+        "//src/gpu/mock:GrMockRenderTask_hdr",
+        "//src/gpu/mock:GrMockSurfaceProxy_hdr",
+        "//tools/gpu/mock:MockTestContext_src",
+    ],
+)
+
 generated_cc_atom(
     name = "BackendSurfaceFactory_hdr",
     hdrs = ["BackendSurfaceFactory.h"],
@@ -89,6 +123,7 @@ generated_cc_atom(
     hdrs = ["GrContextFactory.h"],
     visibility = ["//:__subpackages__"],
     deps = [
+        ":TestContext_hdr",
         "//include/gpu:GrContextOptions_hdr",
         "//include/gpu:GrDirectContext_hdr",
         "//include/private:SkTArray_hdr",
@@ -141,7 +176,7 @@ generated_cc_atom(
         "//src/gpu:GrTexture_hdr",
         "//src/gpu:SkGr_hdr",
         "//src/gpu/text:GrStrikeCache_hdr",
-        "//src/gpu/text:GrTextBlobCache_hdr",
+        "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr",
         "//src/gpu/v1:SurfaceDrawContext_v1_hdr",
         "//src/image:SkImage_Gpu_hdr",
     ],
@@ -284,6 +319,7 @@ generated_cc_atom(
         "//src/gpu:GrMemoryPool_hdr",
         "//src/gpu:GrOpFlushState_hdr",
         "//src/gpu:GrProgramInfo_hdr",
+        "//src/gpu:KeyBuilder_hdr",
         "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr",
         "//src/gpu/glsl:GrGLSLVarying_hdr",
         "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr",
diff --git a/third_party/skia/tools/gpu/GrContextFactory.cpp b/third_party/skia/tools/gpu/GrContextFactory.cpp
index 485d278dd2bdb..8702496e17dd4 100644
--- a/third_party/skia/tools/gpu/GrContextFactory.cpp
+++ b/third_party/skia/tools/gpu/GrContextFactory.cpp
@@ -242,10 +242,10 @@ ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOv
             if (!testCtx) {
                 return ContextInfo();
             }
-
+#ifdef SK_GL
             // We previously had an issue where the VkDevice destruction would occasionally hang
-            // on systems with NVIDIA GPUs and having an existing GL context fixed it. Now (March
-            // 2020) we still need the GL context to keep Vulkan/TSAN bots from running incredibly
+            // on systems with NVIDIA GPUs and having an existing GL context fixed it. Now (Feb
+            // 2022) we still need the GL context to keep Vulkan/TSAN bots from running incredibly
             // slow. Perhaps this prevents repeated driver loading/unloading? Note that keeping
             // a persistent VkTestContext around instead was tried and did not work.
             if (!fSentinelGLContext) {
@@ -254,6 +254,7 @@ ContextInfo GrContextFactory::getContextInfoInternal(ContextType type, ContextOv
                     fSentinelGLContext.reset(CreatePlatformGLTestContext(kGLES_GrGLStandard));
                 }
             }
+#endif
             break;
         }
 #endif
diff --git a/third_party/skia/tools/gpu/GrContextFactory.h b/third_party/skia/tools/gpu/GrContextFactory.h
index d9ab850de0706..ea63ff7dcb298 100644
--- a/third_party/skia/tools/gpu/GrContextFactory.h
+++ b/third_party/skia/tools/gpu/GrContextFactory.h
@@ -12,7 +12,11 @@
 #include "include/gpu/GrDirectContext.h"
 
 #include "include/private/SkTArray.h"
+
+#ifdef SK_GL
 #include "tools/gpu/gl/GLTestContext.h"
+#endif
+#include "tools/gpu/TestContext.h"
 
 struct GrVkBackendContext;
 
@@ -165,7 +169,10 @@ class GrContextFactory : SkNoncopyable {
         bool              fAbandoned;
     };
     SkTArray<Context, true>         fContexts;
+#ifdef SK_GL
     std::unique_ptr<GLTestContext>  fSentinelGLContext;
+#endif
+
     const GrContextOptions          fGlobalOptions;
 };
 
diff --git a/third_party/skia/tools/gpu/GrTest.cpp b/third_party/skia/tools/gpu/GrTest.cpp
index e638310be042a..dfc8f83abb542 100644
--- a/third_party/skia/tools/gpu/GrTest.cpp
+++ b/third_party/skia/tools/gpu/GrTest.cpp
@@ -25,7 +25,7 @@
 #include "src/gpu/GrTexture.h"
 #include "src/gpu/SkGr.h"
 #include "src/gpu/text/GrStrikeCache.h"
-#include "src/gpu/text/GrTextBlobCache.h"
+#include "src/gpu/text/GrTextBlobRedrawCoordinator.h"
 #include "src/gpu/v1/SurfaceDrawContext_v1.h"
 #include "src/image/SkImage_Gpu.h"
 
@@ -51,7 +51,6 @@ DRAW_OP_TEST_EXTERN(CircleOp);
 DRAW_OP_TEST_EXTERN(DashOpImpl);
 DRAW_OP_TEST_EXTERN(DefaultPathOp);
 DRAW_OP_TEST_EXTERN(DrawAtlasOp);
-DRAW_OP_TEST_EXTERN(DrawVerticesOp);
 DRAW_OP_TEST_EXTERN(DIEllipseOp);
 DRAW_OP_TEST_EXTERN(EllipseOp);
 DRAW_OP_TEST_EXTERN(FillRectOp);
@@ -82,7 +81,6 @@ void GrDrawRandomOp(SkRandom* random, skgpu::v1::SurfaceDrawContext* sdc, GrPain
             DRAW_OP_TEST_ENTRY(DashOpImpl),
             DRAW_OP_TEST_ENTRY(DefaultPathOp),
             DRAW_OP_TEST_ENTRY(DrawAtlasOp),
-            DRAW_OP_TEST_ENTRY(DrawVerticesOp),
             DRAW_OP_TEST_ENTRY(DIEllipseOp),
             DRAW_OP_TEST_ENTRY(EllipseOp),
             DRAW_OP_TEST_ENTRY(FillRectOp),
diff --git a/third_party/skia/tools/gpu/MemoryCache.cpp b/third_party/skia/tools/gpu/MemoryCache.cpp
index 70fedeaca3939..e5f83216e3d60 100644
--- a/third_party/skia/tools/gpu/MemoryCache.cpp
+++ b/third_party/skia/tools/gpu/MemoryCache.cpp
@@ -93,7 +93,7 @@ void MemoryCache::writeShadersToDisk(const char* path, GrBackendApi api) {
         }
 
         SkSL::Program::Inputs inputsIgnored[kGrShaderTypeCount];
-        SkSL::String shaders[kGrShaderTypeCount];
+        std::string shaders[kGrShaderTypeCount];
         const SkData* data = it->second.fData.get();
         const SkString& description = it->second.fDescription;
         SkReadBuffer reader(data->data(), data->size());
diff --git a/third_party/skia/tools/gpu/ProxyUtils.cpp b/third_party/skia/tools/gpu/ProxyUtils.cpp
index 370494d58fd8f..85450a51a84bc 100644
--- a/third_party/skia/tools/gpu/ProxyUtils.cpp
+++ b/third_party/skia/tools/gpu/ProxyUtils.cpp
@@ -66,7 +66,7 @@ GrSurfaceProxyView MakeTextureProxyViewFromData(GrDirectContext* dContext,
     if (!format.isValid()) {
         return {};
     }
-    GrSwizzle swizzle = caps->getReadSwizzle(format, pixmap.colorType());
+    skgpu::Swizzle swizzle = caps->getReadSwizzle(format, pixmap.colorType());
 
     sk_sp<GrTextureProxy> proxy;
     proxy = dContext->priv().proxyProvider()->createProxy(format,
diff --git a/third_party/skia/tools/gpu/TestOps.cpp b/third_party/skia/tools/gpu/TestOps.cpp
index f600729f3aad1..398b3a735bfba 100644
--- a/third_party/skia/tools/gpu/TestOps.cpp
+++ b/third_party/skia/tools/gpu/TestOps.cpp
@@ -14,6 +14,7 @@
 #include "src/gpu/GrMemoryPool.h"
 #include "src/gpu/GrOpFlushState.h"
 #include "src/gpu/GrProgramInfo.h"
+#include "src/gpu/KeyBuilder.h"
 #include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
 #include "src/gpu/glsl/GrGLSLVarying.h"
 #include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
@@ -26,7 +27,7 @@ class GP : public GrGeometryProcessor {
     GP(const SkMatrix& localMatrix, bool wideColor)
             : GrGeometryProcessor(kTestRectOp_ClassID), fLocalMatrix(localMatrix) {
         fInColor = MakeColorAttribute("color", wideColor);
-        this->setVertexAttributes(&fInPosition, 3);
+        this->setVertexAttributesWithImplicitOffsets(&fInPosition, 3);
     }
 
     const char* name() const override { return "TestRectOp::GP"; }
@@ -45,7 +46,7 @@ class GP : public GrGeometryProcessor {
             void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
                 const auto& gp = args.fGeomProc.cast<GP>();
                 args.fVaryingHandler->emitAttributes(gp);
-                GrGLSLVarying colorVarying(kHalf4_GrSLType);
+                GrGLSLVarying colorVarying(SkSLType::kHalf4);
                 args.fVaryingHandler->addVarying("color", &colorVarying,
                                                  GrGLSLVaryingHandler::Interpolation::kCanBeFlat);
                 args.fVertBuilder->codeAppendf("%s = %s;", colorVarying.vsOut(), gp.fInColor.name());
@@ -68,15 +69,15 @@ class GP : public GrGeometryProcessor {
         return std::make_unique<Impl>();
     }
 
-    void addToKey(const GrShaderCaps& shaderCaps, GrProcessorKeyBuilder* b) const override {
+    void addToKey(const GrShaderCaps& shaderCaps, skgpu::KeyBuilder* b) const override {
         b->add32(ProgramImpl::ComputeMatrixKey(shaderCaps, fLocalMatrix));
     }
 
     bool wideColor() const { return fInColor.cpuType() != kUByte4_norm_GrVertexAttribType; }
 
 private:
-    Attribute fInPosition    = {   "inPosition", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
-    Attribute fInLocalCoords = {"inLocalCoords", kFloat2_GrVertexAttribType, kFloat2_GrSLType};
+    Attribute fInPosition    = {   "inPosition", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
+    Attribute fInLocalCoords = {"inLocalCoords", kFloat2_GrVertexAttribType, SkSLType::kFloat2};
     Attribute fInColor;
 
     SkMatrix fLocalMatrix;
diff --git a/third_party/skia/tools/gpu/dawn/DawnTestContext.cpp b/third_party/skia/tools/gpu/dawn/DawnTestContext.cpp
index 162deaf2a2e21..1c990c89ff9f5 100644
--- a/third_party/skia/tools/gpu/dawn/DawnTestContext.cpp
+++ b/third_party/skia/tools/gpu/dawn/DawnTestContext.cpp
@@ -84,13 +84,15 @@ static void PrintDeviceError(WGPUErrorType, const char* message, void*) {
 class DawnTestContextImpl : public sk_gpu_test::DawnTestContext {
 public:
     static wgpu::Device createDevice(const dawn_native::Instance& instance,
-                                     dawn_native::BackendType type) {
+                                     wgpu::BackendType type) {
         DawnProcTable backendProcs = dawn_native::GetProcs();
         dawnProcSetProcs(&backendProcs);
 
         std::vector<dawn_native::Adapter> adapters = instance.GetAdapters();
         for (dawn_native::Adapter adapter : adapters) {
-            if (adapter.GetBackendType() == type) {
+            wgpu::AdapterProperties properties;
+            adapter.GetProperties(&properties);
+            if (properties.backendType == type) {
                 return wgpu::Device::Acquire(adapter.CreateDevice());
             }
         }
@@ -103,7 +105,7 @@ class DawnTestContextImpl : public sk_gpu_test::DawnTestContext {
         if (sharedContext) {
             device = sharedContext->getDevice();
         } else {
-            dawn_native::BackendType type;
+            wgpu::BackendType type;
 #if USE_OPENGL_BACKEND
             dawn_native::opengl::AdapterDiscoveryOptions adapterOptions;
             adapterOptions.getProc = reinterpret_cast<void*(*)(const char*)>(
@@ -116,15 +118,15 @@ class DawnTestContextImpl : public sk_gpu_test::DawnTestContext {
 #endif
             );
             instance->DiscoverAdapters(&adapterOptions);
-            type = dawn_native::BackendType::OpenGL;
+            type = wgpu::BackendType::OpenGL;
 #else
             instance->DiscoverDefaultAdapters();
 #if defined(SK_BUILD_FOR_MAC)
-            type = dawn_native::BackendType::Metal;
+            type = wgpu::BackendType::Metal;
 #elif defined(SK_BUILD_FOR_WIN)
-            type = dawn_native::BackendType::D3D12;
+            type = wgpu::BackendType::D3D12;
 #elif defined(SK_BUILD_FOR_UNIX)
-            type = dawn_native::BackendType::Vulkan;
+            type = wgpu::BackendType::Vulkan;
 #endif
 #endif
             device = createDevice(*instance, type);
diff --git a/third_party/skia/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp b/third_party/skia/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
index 2a31bb4fe8568..46694f55d6412 100644
--- a/third_party/skia/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
+++ b/third_party/skia/tools/gpu/gl/command_buffer/GLTestContext_command_buffer.cpp
@@ -31,10 +31,10 @@ typedef void (*__eglMustCastToProperFunctionPointerType)(void);
 #define EGL_OPENGL_ES2_BIT 0x0004
 #define EGL_OPENGL_ES3_BIT 0x0040
 #define EGL_CONTEXT_CLIENT_VERSION 0x3098
-#define EGL_NO_SURFACE ((EGLSurface)0)
-#define EGL_NO_DISPLAY ((EGLDisplay)0)
-#define EGL_NO_CONTEXT ((EGLContext)0)
-#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)0)
+#define EGL_NO_SURFACE ((EGLSurface)nullptr)
+#define EGL_NO_DISPLAY ((EGLDisplay)nullptr)
+#define EGL_NO_CONTEXT ((EGLContext)nullptr)
+#define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)nullptr)
 #define EGL_SURFACE_TYPE 0x3033
 #define EGL_PBUFFER_BIT 0x0001
 #define EGL_RENDERABLE_TYPE 0x3040
diff --git a/third_party/skia/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm b/third_party/skia/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
index db334aa3ccaeb..ad045bf718ca8 100644
--- a/third_party/skia/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
+++ b/third_party/skia/tools/gpu/gl/iOS/CreatePlatformGLTestContext_iOS.mm
@@ -59,7 +59,7 @@
     [EAGLContext setCurrentContext:fEAGLContext.get()];
 
     sk_sp<const GrGLInterface> gl(GrGLCreateNativeInterface());
-    if (NULL == gl.get()) {
+    if (nullptr == gl.get()) {
         SkDebugf("Failed to create gl interface");
         this->destroyGLContext();
         return;
diff --git a/third_party/skia/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp b/third_party/skia/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
index 2918e5b917c47..f7fc06d1dcb19 100644
--- a/third_party/skia/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
+++ b/third_party/skia/tools/gpu/gl/win/CreatePlatformGLTestContext_win.cpp
@@ -57,7 +57,7 @@ ATOM WinGLTestContext::gWC = 0;
 WinGLTestContext::WinGLTestContext(GrGLStandard forcedGpuAPI, WinGLTestContext* shareContext)
     : fWindow(nullptr)
     , fDeviceContext(nullptr)
-    , fGlRenderContext(0)
+    , fGlRenderContext(nullptr)
     , fPbufferContext(nullptr) {
     HINSTANCE hInstance = (HINSTANCE)GetModuleHandle(nullptr);
 
@@ -123,9 +123,9 @@ WinGLTestContext::WinGLTestContext(GrGLStandard forcedGpuAPI, WinGLTestContext*
         glrc = fGlRenderContext;
     } else {
         ReleaseDC(fWindow, fDeviceContext);
-        fDeviceContext = 0;
+        fDeviceContext = nullptr;
         DestroyWindow(fWindow);
-        fWindow = 0;
+        fWindow = nullptr;
 
         dc = fPbufferContext->getDC();
         glrc = fPbufferContext->getGLRC();
@@ -170,20 +170,20 @@ void WinGLTestContext::destroyGLContext() {
     if (fGlRenderContext) {
         // This deletes the context immediately even if it is current.
         wglDeleteContext(fGlRenderContext);
-        fGlRenderContext = 0;
+        fGlRenderContext = nullptr;
     }
     if (fWindow && fDeviceContext) {
         ReleaseDC(fWindow, fDeviceContext);
-        fDeviceContext = 0;
+        fDeviceContext = nullptr;
     }
     if (fWindow) {
         DestroyWindow(fWindow);
-        fWindow = 0;
+        fWindow = nullptr;
     }
 }
 
 void WinGLTestContext::onPlatformMakeNotCurrent() const {
-    if (!wglMakeCurrent(NULL, NULL)) {
+    if (!wglMakeCurrent(nullptr, nullptr)) {
         SkDebugf("Could not null out the rendering context.\n");
     }
 }
diff --git a/third_party/skia/tools/gpu/vk/VkTestContext.cpp b/third_party/skia/tools/gpu/vk/VkTestContext.cpp
index 3fa461dd39299..9da5c45f404ac 100644
--- a/third_party/skia/tools/gpu/vk/VkTestContext.cpp
+++ b/third_party/skia/tools/gpu/vk/VkTestContext.cpp
@@ -37,21 +37,14 @@ class VkTestContextImpl : public sk_gpu_test::VkTestContext {
             ownsContext = false;
         } else {
             PFN_vkGetInstanceProcAddr instProc;
-            PFN_vkGetDeviceProcAddr devProc;
-            if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+            if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
                 return nullptr;
             }
-            auto getProc = [instProc, devProc](const char* proc_name,
-                                               VkInstance instance, VkDevice device) {
-                if (device != VK_NULL_HANDLE) {
-                    return devProc(device, proc_name);
-                }
-                return instProc(instance, proc_name);
-            };
+
             extensions = new GrVkExtensions();
             features = new VkPhysicalDeviceFeatures2;
             memset(features, 0, sizeof(VkPhysicalDeviceFeatures2));
-            if (!sk_gpu_test::CreateVkBackendContext(getProc, &backendContext, extensions,
+            if (!sk_gpu_test::CreateVkBackendContext(instProc, &backendContext, extensions,
                                                      features, &debugCallback)) {
                 sk_gpu_test::FreeVulkanFeaturesStructs(features);
                 delete features;
diff --git a/third_party/skia/tools/gpu/vk/VkTestHelper.cpp b/third_party/skia/tools/gpu/vk/VkTestHelper.cpp
index 12c6807475b56..aea196d4eb96d 100644
--- a/third_party/skia/tools/gpu/vk/VkTestHelper.cpp
+++ b/third_party/skia/tools/gpu/vk/VkTestHelper.cpp
@@ -13,16 +13,15 @@
 #include "include/gpu/GrDirectContext.h"
 #include "tools/gpu/vk/VkTestUtils.h"
 
-#define ACQUIRE_INST_VK_PROC(name)                                                           \
-    fVk##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, fBackendContext.fInstance,\
-                                                       VK_NULL_HANDLE));                     \
-    if (fVk##name == nullptr) {                                                              \
-        SkDebugf("Function ptr for vk%s could not be acquired\n", #name);                    \
-        return false;                                                                        \
+#define ACQUIRE_INST_VK_PROC(name)                                                               \
+    fVk##name = reinterpret_cast<PFN_vk##name>(instProc(fBackendContext.fInstance, "vk" #name)); \
+    if (fVk##name == nullptr) {                                                                  \
+        SkDebugf("Function ptr for vk%s could not be acquired\n", #name);                        \
+        return false;                                                                            \
     }
 
 #define ACQUIRE_DEVICE_VK_PROC(name)                                                          \
-    fVk##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, VK_NULL_HANDLE, fDevice)); \
+    fVk##name = reinterpret_cast<PFN_vk##name>(fVkGetDeviceProcAddr(fDevice, "vk" #name));    \
     if (fVk##name == nullptr) {                                                               \
         SkDebugf("Function ptr for vk%s could not be acquired\n", #name);                     \
         return false;                                                                         \
@@ -30,17 +29,9 @@
 
 bool VkTestHelper::init() {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return false;
     }
-    auto getProc = [&instProc, &devProc](const char* proc_name,
-                                         VkInstance instance, VkDevice device) {
-        if (device != VK_NULL_HANDLE) {
-            return devProc(device, proc_name);
-        }
-        return instProc(instance, proc_name);
-    };
 
     fFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
     fFeatures.pNext = nullptr;
@@ -48,7 +39,7 @@ bool VkTestHelper::init() {
     fBackendContext.fInstance = VK_NULL_HANDLE;
     fBackendContext.fDevice = VK_NULL_HANDLE;
 
-    if (!sk_gpu_test::CreateVkBackendContext(getProc, &fBackendContext, &fExtensions,
+    if (!sk_gpu_test::CreateVkBackendContext(instProc, &fBackendContext, &fExtensions,
                                              &fFeatures, &fDebugCallback, nullptr,
                                              sk_gpu_test::CanPresentFn(), fIsProtected)) {
         return false;
@@ -66,6 +57,8 @@ bool VkTestHelper::init() {
     ACQUIRE_INST_VK_PROC(GetPhysicalDeviceFormatProperties)
     ACQUIRE_INST_VK_PROC(GetPhysicalDeviceMemoryProperties)
 
+    ACQUIRE_INST_VK_PROC(GetDeviceProcAddr)
+
     ACQUIRE_DEVICE_VK_PROC(CreateImage)
     ACQUIRE_DEVICE_VK_PROC(DestroyImage)
     ACQUIRE_DEVICE_VK_PROC(GetImageMemoryRequirements)
diff --git a/third_party/skia/tools/gpu/vk/VkTestHelper.h b/third_party/skia/tools/gpu/vk/VkTestHelper.h
index 9fc11e47e9bcc..e053b086aca68 100644
--- a/third_party/skia/tools/gpu/vk/VkTestHelper.h
+++ b/third_party/skia/tools/gpu/vk/VkTestHelper.h
@@ -39,6 +39,7 @@ class VkTestHelper {
     DECLARE_VK_PROC(DestroyInstance);
     DECLARE_VK_PROC(DeviceWaitIdle);
     DECLARE_VK_PROC(DestroyDevice);
+    DECLARE_VK_PROC(GetDeviceProcAddr);
 
     DECLARE_VK_PROC(GetPhysicalDeviceFormatProperties);
     DECLARE_VK_PROC(GetPhysicalDeviceMemoryProperties);
diff --git a/third_party/skia/tools/gpu/vk/VkTestUtils.cpp b/third_party/skia/tools/gpu/vk/VkTestUtils.cpp
index d7a10a2215b9d..9740393657611 100644
--- a/third_party/skia/tools/gpu/vk/VkTestUtils.cpp
+++ b/third_party/skia/tools/gpu/vk/VkTestUtils.cpp
@@ -11,12 +11,17 @@
 
 #ifndef SK_GPU_TOOLS_VK_LIBRARY_NAME
     #if defined _WIN32
-        #define SK_GPU_TOOLS_VK_LIBRARY_NAME "vulkan-1.dll"
+        #define SK_GPU_TOOLS_VK_LIBRARY_NAME vulkan-1.dll
+    #elif defined SK_BUILD_FOR_MAC
+        #define SK_GPU_TOOLS_VK_LIBRARY_NAME libvk_swiftshader.dylib
     #else
-        #define SK_GPU_TOOLS_VK_LIBRARY_NAME "libvulkan.so"
+        #define SK_GPU_TOOLS_VK_LIBRARY_NAME libvulkan.so
     #endif
 #endif
 
+#define STRINGIFY2(S) #S
+#define STRINGIFY(S) STRINGIFY2(S)
+
 #include <algorithm>
 
 #if defined(SK_BUILD_FOR_UNIX)
@@ -33,26 +38,21 @@
 
 namespace sk_gpu_test {
 
-bool LoadVkLibraryAndGetProcAddrFuncs(PFN_vkGetInstanceProcAddr* instProc,
-                                      PFN_vkGetDeviceProcAddr* devProc) {
+bool LoadVkLibraryAndGetProcAddrFuncs(PFN_vkGetInstanceProcAddr* instProc) {
     static void* vkLib = nullptr;
     static PFN_vkGetInstanceProcAddr localInstProc = nullptr;
-    static PFN_vkGetDeviceProcAddr localDevProc = nullptr;
     if (!vkLib) {
-        vkLib = SkLoadDynamicLibrary(SK_GPU_TOOLS_VK_LIBRARY_NAME);
+        vkLib = SkLoadDynamicLibrary(STRINGIFY(SK_GPU_TOOLS_VK_LIBRARY_NAME));
         if (!vkLib) {
             return false;
         }
         localInstProc = (PFN_vkGetInstanceProcAddr) SkGetProcedureAddress(vkLib,
-                                                                        "vkGetInstanceProcAddr");
-        localDevProc = (PFN_vkGetDeviceProcAddr) SkGetProcedureAddress(vkLib,
-                                                                     "vkGetDeviceProcAddr");
+                                                                          "vkGetInstanceProcAddr");
     }
-    if (!localInstProc || !localDevProc) {
+    if (!localInstProc) {
         return false;
     }
     *instProc = localInstProc;
-    *devProc = localDevProc;
     return true;
 }
 
@@ -139,34 +139,37 @@ VKAPI_ATTR VkBool32 VKAPI_CALL DebugReportCallback(
 }
 #endif
 
-#define GET_PROC_LOCAL(F, inst, device) PFN_vk ## F F = (PFN_vk ## F) getProc("vk" #F, inst, device)
+#define ACQUIRE_VK_INST_PROC_LOCAL(name, instance)                                 \
+    PFN_vk##name grVk##name =                                                      \
+        reinterpret_cast<PFN_vk##name>(getInstProc(instance, "vk" #name));         \
+    do {                                                                           \
+        if (grVk##name == nullptr) {                                               \
+            SkDebugf("Function ptr for vk%s could not be acquired\n", #name);      \
+            return false;                                                          \
+        }                                                                          \
+    } while (0)
 
-static bool init_instance_extensions_and_layers(GrVkGetProc getProc,
+static bool init_instance_extensions_and_layers(PFN_vkGetInstanceProcAddr getInstProc,
                                                 uint32_t specVersion,
                                                 SkTArray<VkExtensionProperties>* instanceExtensions,
                                                 SkTArray<VkLayerProperties>* instanceLayers) {
-    if (getProc == nullptr) {
+    if (getInstProc == nullptr) {
         return false;
     }
 
-    GET_PROC_LOCAL(EnumerateInstanceExtensionProperties, VK_NULL_HANDLE, VK_NULL_HANDLE);
-    GET_PROC_LOCAL(EnumerateInstanceLayerProperties, VK_NULL_HANDLE, VK_NULL_HANDLE);
-
-    if (!EnumerateInstanceExtensionProperties ||
-        !EnumerateInstanceLayerProperties) {
-        return false;
-    }
+    ACQUIRE_VK_INST_PROC_LOCAL(EnumerateInstanceExtensionProperties, VK_NULL_HANDLE);
+    ACQUIRE_VK_INST_PROC_LOCAL(EnumerateInstanceLayerProperties, VK_NULL_HANDLE);
 
     VkResult res;
     uint32_t layerCount = 0;
 #ifdef SK_ENABLE_VK_LAYERS
     // instance layers
-    res = EnumerateInstanceLayerProperties(&layerCount, nullptr);
+    res = grVkEnumerateInstanceLayerProperties(&layerCount, nullptr);
     if (VK_SUCCESS != res) {
         return false;
     }
     VkLayerProperties* layers = new VkLayerProperties[layerCount];
-    res = EnumerateInstanceLayerProperties(&layerCount, layers);
+    res = grVkEnumerateInstanceLayerProperties(&layerCount, layers);
     if (VK_SUCCESS != res) {
         delete[] layers;
         return false;
@@ -187,12 +190,12 @@ static bool init_instance_extensions_and_layers(GrVkGetProc getProc,
     // via Vulkan implementation and implicitly enabled layers
     {
         uint32_t extensionCount = 0;
-        res = EnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
+        res = grVkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
         if (VK_SUCCESS != res) {
             return false;
         }
         VkExtensionProperties* extensions = new VkExtensionProperties[extensionCount];
-        res = EnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions);
+        res = grVkEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions);
         if (VK_SUCCESS != res) {
             delete[] extensions;
             return false;
@@ -207,14 +210,14 @@ static bool init_instance_extensions_and_layers(GrVkGetProc getProc,
     layerCount = instanceLayers->count();
     for (uint32_t layerIndex = 0; layerIndex < layerCount; ++layerIndex) {
         uint32_t extensionCount = 0;
-        res = EnumerateInstanceExtensionProperties((*instanceLayers)[layerIndex].layerName,
-                                                   &extensionCount, nullptr);
+        res = grVkEnumerateInstanceExtensionProperties((*instanceLayers)[layerIndex].layerName,
+                                                       &extensionCount, nullptr);
         if (VK_SUCCESS != res) {
             return false;
         }
         VkExtensionProperties* extensions = new VkExtensionProperties[extensionCount];
-        res = EnumerateInstanceExtensionProperties((*instanceLayers)[layerIndex].layerName,
-                                                   &extensionCount, extensions);
+        res = grVkEnumerateInstanceExtensionProperties((*instanceLayers)[layerIndex].layerName,
+                                                       &extensionCount, extensions);
         if (VK_SUCCESS != res) {
             delete[] extensions;
             return false;
@@ -228,6 +231,8 @@ static bool init_instance_extensions_and_layers(GrVkGetProc getProc,
     return true;
 }
 
+#define GET_PROC_LOCAL(F, inst, device) PFN_vk ## F F = (PFN_vk ## F) getProc("vk" #F, inst, device)
+
 static bool init_device_extensions_and_layers(GrVkGetProc getProc, uint32_t specVersion,
                                               VkInstance inst, VkPhysicalDevice physDev,
                                               SkTArray<VkExtensionProperties>* deviceExtensions,
@@ -317,20 +322,36 @@ static bool init_device_extensions_and_layers(GrVkGetProc getProc, uint32_t spec
     return true;
 }
 
+#define ACQUIRE_VK_INST_PROC_NOCHECK(name, instance) \
+    PFN_vk##name grVk##name = reinterpret_cast<PFN_vk##name>(getInstProc(instance, "vk" #name))
+
+#define ACQUIRE_VK_INST_PROC(name, instance) \
+    PFN_vk##name grVk##name =                                                          \
+        reinterpret_cast<PFN_vk##name>(getInstProc(instance, "vk" #name));             \
+    do {                                                                               \
+        if (grVk##name == nullptr) {                                                   \
+            SkDebugf("Function ptr for vk%s could not be acquired\n", #name);          \
+            if (inst != VK_NULL_HANDLE) {                                              \
+                destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension); \
+            }                                                                          \
+            return false;                                                              \
+        }                                                                              \
+    } while (0)
+
 #define ACQUIRE_VK_PROC_NOCHECK(name, instance, device) \
     PFN_vk##name grVk##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device))
 
-#define ACQUIRE_VK_PROC(name, instance, device)                                    \
-    PFN_vk##name grVk##name =                                                      \
-            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device)); \
-    do {                                                                           \
-        if (grVk##name == nullptr) {                                               \
-            SkDebugf("Function ptr for vk%s could not be acquired\n", #name);      \
-            if (device != VK_NULL_HANDLE) {                                        \
-                destroy_instance(getProc, inst, debugCallback, hasDebugExtension); \
-            }                                                                      \
-            return false;                                                          \
-        }                                                                          \
+#define ACQUIRE_VK_PROC(name, instance, device)                                        \
+    PFN_vk##name grVk##name =                                                          \
+            reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device));     \
+    do {                                                                               \
+        if (grVk##name == nullptr) {                                                   \
+            SkDebugf("Function ptr for vk%s could not be acquired\n", #name);          \
+            if (inst != VK_NULL_HANDLE) {                                              \
+                destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension); \
+            }                                                                          \
+            return false;                                                              \
+        }                                                                              \
     } while (0)
 
 #define ACQUIRE_VK_PROC_LOCAL(name, instance, device)                              \
@@ -339,19 +360,19 @@ static bool init_device_extensions_and_layers(GrVkGetProc getProc, uint32_t spec
     do {                                                                           \
         if (grVk##name == nullptr) {                                               \
             SkDebugf("Function ptr for vk%s could not be acquired\n", #name);      \
-            return false;                                                                \
+            return false;                                                          \
         }                                                                          \
     } while (0)
 
-static bool destroy_instance(GrVkGetProc getProc, VkInstance inst,
+static bool destroy_instance(PFN_vkGetInstanceProcAddr getInstProc, VkInstance inst,
                              VkDebugReportCallbackEXT* debugCallback,
                              bool hasDebugExtension) {
     if (hasDebugExtension && *debugCallback != VK_NULL_HANDLE) {
-        ACQUIRE_VK_PROC_LOCAL(DestroyDebugReportCallbackEXT, inst, VK_NULL_HANDLE);
+        ACQUIRE_VK_INST_PROC_LOCAL(DestroyDebugReportCallbackEXT, inst);
         grVkDestroyDebugReportCallbackEXT(inst, *debugCallback, nullptr);
         *debugCallback = VK_NULL_HANDLE;
     }
-    ACQUIRE_VK_PROC_LOCAL(DestroyInstance, inst, VK_NULL_HANDLE);
+    ACQUIRE_VK_INST_PROC_LOCAL(DestroyInstance, inst);
     grVkDestroyInstance(inst, nullptr);
     return true;
 }
@@ -420,7 +441,7 @@ static bool setup_features(GrVkGetProc getProc, VkInstance inst, VkPhysicalDevic
     // If we want to disable any extension features do so here.
 }
 
-bool CreateVkBackendContext(GrVkGetProc getProc,
+bool CreateVkBackendContext(PFN_vkGetInstanceProcAddr getInstProc,
                             GrVkBackendContext* ctx,
                             GrVkExtensions* extensions,
                             VkPhysicalDeviceFeatures2* features,
@@ -430,7 +451,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
                             bool isProtected) {
     VkResult err;
 
-    ACQUIRE_VK_PROC_NOCHECK(EnumerateInstanceVersion, VK_NULL_HANDLE, VK_NULL_HANDLE);
+    ACQUIRE_VK_INST_PROC_NOCHECK(EnumerateInstanceVersion, VK_NULL_HANDLE);
     uint32_t instanceVersion = 0;
     if (!grVkEnumerateInstanceVersion) {
         instanceVersion = VK_MAKE_VERSION(1, 0, 0);
@@ -460,7 +481,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
 
     VkPhysicalDevice physDev;
     VkDevice device;
-    VkInstance inst;
+    VkInstance inst = VK_NULL_HANDLE;
 
     const VkApplicationInfo app_info = {
         VK_STRUCTURE_TYPE_APPLICATION_INFO, // sType
@@ -475,7 +496,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     SkTArray<VkLayerProperties> instanceLayers;
     SkTArray<VkExtensionProperties> instanceExtensions;
 
-    if (!init_instance_extensions_and_layers(getProc, instanceVersion,
+    if (!init_instance_extensions_and_layers(getInstProc, instanceVersion,
                                              &instanceExtensions,
                                              &instanceLayers)) {
         return false;
@@ -505,13 +526,22 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
 
     bool hasDebugExtension = false;
 
-    ACQUIRE_VK_PROC(CreateInstance, VK_NULL_HANDLE, VK_NULL_HANDLE);
+    ACQUIRE_VK_INST_PROC(CreateInstance, VK_NULL_HANDLE);
     err = grVkCreateInstance(&instance_create, nullptr, &inst);
     if (err < 0) {
         SkDebugf("vkCreateInstance failed: %d\n", err);
         return false;
     }
 
+    ACQUIRE_VK_INST_PROC(GetDeviceProcAddr, inst);
+    auto getProc = [getInstProc, grVkGetDeviceProcAddr](const char* proc_name,
+                                                        VkInstance instance, VkDevice device) {
+        if (device != VK_NULL_HANDLE) {
+            return grVkGetDeviceProcAddr(device, proc_name);
+        }
+        return getInstProc(instance, proc_name);
+    };
+
 #ifdef SK_ENABLE_VK_LAYERS
     *debugCallback = VK_NULL_HANDLE;
     for (int i = 0; i < instanceExtensionNames.count() && !hasDebugExtension; ++i) {
@@ -551,12 +581,12 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     err = grVkEnumeratePhysicalDevices(inst, &gpuCount, nullptr);
     if (err) {
         SkDebugf("vkEnumeratePhysicalDevices failed: %d\n", err);
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
     if (!gpuCount) {
         SkDebugf("vkEnumeratePhysicalDevices returned no supported devices.\n");
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
     // Just returning the first physical device instead of getting the whole array.
@@ -566,7 +596,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     // VK_INCOMPLETE is returned when the count we provide is less than the total device count.
     if (err && VK_INCOMPLETE != err) {
         SkDebugf("vkEnumeratePhysicalDevices failed: %d\n", err);
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
@@ -576,7 +606,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
 
     if (isProtected && physDeviceVersion < VK_MAKE_VERSION(1, 1, 0)) {
         SkDebugf("protected requires vk physical device version 1.1\n");
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
@@ -585,7 +615,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     grVkGetPhysicalDeviceQueueFamilyProperties(physDev, &queueCount, nullptr);
     if (!queueCount) {
         SkDebugf("vkGetPhysicalDeviceQueueFamilyProperties returned no queues.\n");
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
@@ -605,7 +635,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     }
     if (graphicsQueueIndex == queueCount) {
         SkDebugf("Could not find any supported graphics queues.\n");
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
@@ -620,7 +650,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
         }
         if (presentQueueIndex == queueCount) {
             SkDebugf("Could not find any supported present queues.\n");
-            destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+            destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
             return false;
         }
         *presentQueueIndexPtr = presentQueueIndex;
@@ -636,7 +666,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
                                            inst, physDev,
                                            &deviceExtensions,
                                            &deviceLayers)) {
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
@@ -695,8 +725,8 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     if (physDeviceVersion >= VK_MAKE_VERSION(1, 1, 0) ||
         extensions->hasExtension(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, 1)) {
         if (!setup_features(getProc, inst, physDev, physDeviceVersion, extensions, features,
-                          isProtected)) {
-            destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+                            isProtected)) {
+            destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
             return false;
         }
 
@@ -758,7 +788,7 @@ bool CreateVkBackendContext(GrVkGetProc getProc,
     }
     if (err) {
         SkDebugf("CreateDevice failed: %d\n", err);
-        destroy_instance(getProc, inst, debugCallback, hasDebugExtension);
+        destroy_instance(getInstProc, inst, debugCallback, hasDebugExtension);
         return false;
     }
 
diff --git a/third_party/skia/tools/gpu/vk/VkTestUtils.h b/third_party/skia/tools/gpu/vk/VkTestUtils.h
index ed7d389dbda31..300fbfbe19509 100644
--- a/third_party/skia/tools/gpu/vk/VkTestUtils.h
+++ b/third_party/skia/tools/gpu/vk/VkTestUtils.h
@@ -21,12 +21,12 @@ class GrVkExtensions;
 struct GrVkBackendContext;
 
 namespace sk_gpu_test {
-    bool LoadVkLibraryAndGetProcAddrFuncs(PFN_vkGetInstanceProcAddr*, PFN_vkGetDeviceProcAddr*);
+    bool LoadVkLibraryAndGetProcAddrFuncs(PFN_vkGetInstanceProcAddr*);
 
     using CanPresentFn = std::function<bool(VkInstance, VkPhysicalDevice,
                                             uint32_t queueFamilyIndex)>;
 
-    bool CreateVkBackendContext(GrVkGetProc getProc,
+    bool CreateVkBackendContext(PFN_vkGetInstanceProcAddr getInstProc,
                                 GrVkBackendContext* ctx,
                                 GrVkExtensions*,
                                 VkPhysicalDeviceFeatures2*,
diff --git a/third_party/skia/tools/graphite/ContextFactory.cpp b/third_party/skia/tools/graphite/ContextFactory.cpp
index d277f3246732d..c88c7379fbf1a 100644
--- a/third_party/skia/tools/graphite/ContextFactory.cpp
+++ b/third_party/skia/tools/graphite/ContextFactory.cpp
@@ -23,21 +23,19 @@ ContextFactory::ContextInfo::ContextInfo(ContextInfo&& other)
 
 ContextFactory::ContextInfo::ContextInfo(ContextFactory::ContextType type,
                                          std::unique_ptr<GraphiteTestContext> testContext,
-                                         sk_sp<skgpu::Context> context)
+                                         std::unique_ptr<skgpu::Context> context)
     : fType(type)
     , fTestContext(std::move(testContext))
     , fContext(std::move(context)) {
 }
 
-sk_sp<skgpu::Context> ContextFactory::ContextInfo::refContext() const { return fContext; }
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-std::tuple<GraphiteTestContext*, sk_sp<skgpu::Context>> ContextFactory::getContextInfo(
+std::tuple<GraphiteTestContext*, skgpu::Context*> ContextFactory::getContextInfo(
         ContextType type) {
 
     for (ContextInfo& c : fContexts) {
         if (c.type() == type) {
-            return { c.testContext(), c.refContext() };
+            return { c.testContext(), c.context() };
         }
     }
 
@@ -58,14 +56,14 @@ std::tuple<GraphiteTestContext*, sk_sp<skgpu::Context>> ContextFactory::getConte
         return {};
     }
 
-    sk_sp<skgpu::Context> context = testCtx->makeContext();
+    std::unique_ptr<skgpu::Context> context = testCtx->makeContext();
     if (!context) {
         return {};
     }
 
     fContexts.push_back({ type, std::move(testCtx), std::move(context) });
 
-    return { fContexts.back().testContext(), fContexts.back().refContext() };
+    return { fContexts.back().testContext(), fContexts.back().context() };
 }
 
 } // namespace skiatest::graphite
diff --git a/third_party/skia/tools/graphite/ContextFactory.h b/third_party/skia/tools/graphite/ContextFactory.h
index 564c878048014..4d238313f5b17 100644
--- a/third_party/skia/tools/graphite/ContextFactory.h
+++ b/third_party/skia/tools/graphite/ContextFactory.h
@@ -37,7 +37,6 @@ class ContextFactory {
         ContextFactory::ContextType type() const { return fType; }
 
         skgpu::Context* context() const { return fContext.get(); }
-        sk_sp<skgpu::Context> refContext() const;
         GraphiteTestContext* testContext() const { return fTestContext.get(); }
 
     private:
@@ -45,11 +44,11 @@ class ContextFactory {
 
         ContextInfo(ContextFactory::ContextType type,
                     std::unique_ptr<GraphiteTestContext> testContext,
-                    sk_sp<skgpu::Context> context);
+                    std::unique_ptr<skgpu::Context> context);
 
         ContextType                          fType = ContextType::kMock;
         std::unique_ptr<GraphiteTestContext> fTestContext;
-        sk_sp<skgpu::Context>                fContext;
+        std::unique_ptr<skgpu::Context>      fContext;
     };
 
     ContextFactory() = default;
@@ -58,7 +57,7 @@ class ContextFactory {
 
     ~ContextFactory() = default;
 
-    std::tuple<GraphiteTestContext*, sk_sp<skgpu::Context>> getContextInfo(ContextType);
+    std::tuple<GraphiteTestContext*, skgpu::Context*> getContextInfo(ContextType);
 
 private:
     std::vector<ContextInfo> fContexts;
diff --git a/third_party/skia/tools/graphite/GraphiteTestContext.h b/third_party/skia/tools/graphite/GraphiteTestContext.h
index 642945ae32826..47e358e4b98e8 100644
--- a/third_party/skia/tools/graphite/GraphiteTestContext.h
+++ b/third_party/skia/tools/graphite/GraphiteTestContext.h
@@ -28,7 +28,7 @@ class GraphiteTestContext {
 
     virtual skgpu::BackendApi backend() = 0;
 
-    virtual sk_sp<skgpu::Context> makeContext() = 0;
+    virtual std::unique_ptr<skgpu::Context> makeContext() = 0;
 
 protected:
     GraphiteTestContext();
diff --git a/third_party/skia/tools/graphite/mtl/GraphiteMtlTestContext.h b/third_party/skia/tools/graphite/mtl/GraphiteMtlTestContext.h
index 5acd2dcd30acb..f12ded4ca146f 100644
--- a/third_party/skia/tools/graphite/mtl/GraphiteMtlTestContext.h
+++ b/third_party/skia/tools/graphite/mtl/GraphiteMtlTestContext.h
@@ -24,7 +24,7 @@ class TestContext : public GraphiteTestContext {
 
     skgpu::BackendApi backend() override { return skgpu::BackendApi::kMetal; }
 
-    sk_sp<skgpu::Context> makeContext() override;
+    std::unique_ptr<skgpu::Context> makeContext() override;
 
     const skgpu::mtl::BackendContext& getBackendContext() const {
         return fMtl;
diff --git a/third_party/skia/tools/graphite/mtl/MtlTestContext.mm b/third_party/skia/tools/graphite/mtl/MtlTestContext.mm
index 60de85a08f6cd..f46790f0c0e62 100644
--- a/third_party/skia/tools/graphite/mtl/MtlTestContext.mm
+++ b/third_party/skia/tools/graphite/mtl/MtlTestContext.mm
@@ -47,7 +47,7 @@
     return std::unique_ptr<GraphiteTestContext>(new TestContext(backendContext));
 }
 
-sk_sp<skgpu::Context> TestContext::makeContext() {
+std::unique_ptr<skgpu::Context> TestContext::makeContext() {
     return skgpu::Context::MakeMetal(fMtl);
 }
 
diff --git a/third_party/skia/tools/remote_demo.cpp b/third_party/skia/tools/remote_demo.cpp
index 23aeb539dc2c7..8367659b421f2 100644
--- a/third_party/skia/tools/remote_demo.cpp
+++ b/third_party/skia/tools/remote_demo.cpp
@@ -18,7 +18,7 @@
 
 #include "include/core/SkGraphics.h"
 #include "include/core/SkSurface.h"
-#include "src/core/SkRemoteGlyphCache.h"
+#include "include/private/chromium/SkChromeRemoteGlyphCache.h"
 #include "src/core/SkScalerContext.h"
 
 static std::string gSkpName;
@@ -37,6 +37,8 @@ class ServerDiscardableManager : public SkStrikeServer::DiscardableHandleManager
     }
     void purgeAll() { lastPurgedHandleId = nextHandleId; }
 
+    bool isHandleDeleted(SkDiscardableHandleId id) override { return false; }
+
 private:
     SkDiscardableHandleId nextHandleId = 0u;
     SkDiscardableHandleId lastPurgedHandleId = 0u;
@@ -62,6 +64,8 @@ class ClientDiscardableManager : public SkStrikeClient::DiscardableHandleManager
 
     bool deleteHandle(SkDiscardableHandleId) override { return allowPurging; }
 
+    void notifyCacheMiss(SkStrikeClient::CacheMissType type, int fontSize) override { }
+
 private:
     bool allowPurging = false;
 };
diff --git a/third_party/skia/tools/run-wasm-gm-tests/Makefile b/third_party/skia/tools/run-wasm-gm-tests/Makefile
index 1989b9815e5c2..cb43d37b1f424 100644
--- a/third_party/skia/tools/run-wasm-gm-tests/Makefile
+++ b/third_party/skia/tools/run-wasm-gm-tests/Makefile
@@ -2,8 +2,8 @@ run_local_debug:
 	rm -rf /tmp/wasm-gmtests/
 	mkdir /tmp/wasm-gmtests/
 	touch /tmp/wasm-gmtests/empty.txt
-	node run-wasm-gm-tests --js_file ../../out/wasm_gm_tests_debug/wasm_gm_tests.js \
-	--wasm_file ../../out/wasm_gm_tests_debug/wasm_gm_tests.wasm \
+	node run-wasm-gm-tests --js_file ../../modules/canvaskit/build/wasm_gm_tests.js \
+	--wasm_file ../../modules/canvaskit/build/wasm_gm_tests.wasm \
 	--resources ../../resources \
 	--known_hashes /tmp/wasm-gmtests/empty.txt \
 	--output /tmp/wasm-gmtests/ \
@@ -14,8 +14,8 @@ run_local:
 	rm -rf /tmp/wasm-gmtests/
 	mkdir /tmp/wasm-gmtests/
 	touch /tmp/wasm-gmtests/empty.txt
-	node run-wasm-gm-tests --js_file ../../out/wasm_gm_tests/wasm_gm_tests.js \
-	--wasm_file ../../out/wasm_gm_tests/wasm_gm_tests.wasm \
+	node run-wasm-gm-tests --js_file ../../modules/canvaskit/build/wasm_gm_tests.js \
+	--wasm_file ../../modules/canvaskit/build/wasm_gm_tests.wasm \
 	--resources ../../resources \
 	--known_hashes /tmp/wasm-gmtests/empty.txt \
 	--output /tmp/wasm-gmtests/ \
diff --git a/third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html b/third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html
index 7fdfb91a570f7..b74d853ac4837 100644
--- a/third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html
+++ b/third_party/skia/tools/run-wasm-gm-tests/run-wasm-gm-tests.html
@@ -85,9 +85,6 @@
     for (let i = 0; i < resourceNames.length; i++) {
       const name = resourceNames[i];
       const buffer = resourceBuffers[i];
-      if (name.includes('mandril')) {
-        console.log(name, new Uint8Array(buffer).slice(0, 20));
-      }
       GM.LoadResource(name, buffer);
     }
   }
@@ -108,7 +105,10 @@
   }
 
   const gmSkipList = new Set([
-    // gm names can be added here to skip, if failing.
+    'exoticformats', // Uses SkFILEStream to load resource.
+     // uses skresources::FileResourceProvider
+    'particles_mandrill',
+    'particles_sprite_frame',
   ]);
 
   async function RunGMs(GM) {
@@ -119,7 +119,11 @@
 
     const names = GM.ListGMs();
     names.sort();
-    for (const name of names) {
+    // When debugging locally, it can be handy to skip to a certain GM by using
+    // names.indexOf here instead of 0.
+    let i = 0;
+    for (; i < names.length; i++) {
+      const name = names[i];
       if (gmSkipList.has(name)) {
         continue;
       }
@@ -172,7 +176,7 @@
     // the instant this test crashes.
 
     // These tests fail when doing a dlopen call
-    // "To use dlopen, you need to use Emscripten's linking support"
+    // 'To use dlopen, you need to use Emscripten's linking support'
     // Some of these appear to hit the default case instead of the GLES case in GrContextFactory.cpp
     // which isn't expected to work. If they had a GLES context, they'd probably pass.
     'AsyncReadPixelsContextShutdown',
@@ -186,6 +190,7 @@
 
     // These tests time out
     'SkTraceMemoryDump_ownedGLRenderTarget',
+    'GrStyledShape',
 
     // wasm doesn't have threading
     'GrContextFactory_executorAndTaskGroup',
@@ -197,9 +202,9 @@
 
     // These tests are crashing for unknown reasons
     'AdvancedBlendTest',
-    'FILEStreamWithOffset',
     'Data',
     'ES2BlendWithNoTexture',
+    'TextureBindingsResetTest',
 
     // keys invalid
     'GrPathKeys',
@@ -213,6 +218,16 @@
     // Apparently fail only on release builds / bots
     'FlushFinishedProcTest',
     'WritePixelsNonTextureMSAA_Gpu',
+
+    // These SkSL tests fail on the Quadro P400s in the Golo
+    'SkSLMatrixFoldingES2_GPU',
+    'SkSLCommaSideEffects_GPU',
+
+    // These tests use files on disk, which is not supported for WASM
+    'Stream',
+    'StreamBuffer',
+    'StreamPeek',
+    'FILEStreamWithOffset',
   ]);
 
   async function RunTests(GM) {
@@ -230,7 +245,9 @@
       const names = GM.ListTests();
       names.sort();
       console.log(names);
-      let testIdx = -1;
+      // When debugging locally, it can be handy to skip to a certain test by using
+      // names.indexOf here instead of 0.
+      let testIdx = 0;
       const nextBatch = () => {
         for (let i = 0; i < 10 && testIdx < names.length; i++) {
           testIdx++;
diff --git a/third_party/skia/tools/sk_app/BUILD.bazel b/third_party/skia/tools/sk_app/BUILD.bazel
index d977eb7e41034..db0424d798b3b 100644
--- a/third_party/skia/tools/sk_app/BUILD.bazel
+++ b/third_party/skia/tools/sk_app/BUILD.bazel
@@ -1,5 +1,25 @@
 load("//bazel:macros.bzl", "generated_cc_atom")
 
+cc_library(
+    name = "sk_app",
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Application_hdr",
+        ":CommandSet_src",
+        ":RasterWindowContext_hdr",
+        ":WindowContext_src",
+        ":GLWindowContext_src",
+        ":Window_src",
+    ] + [
+        # TODO(kjlubick) use a select to set these based on target platform
+        "//tools/sk_app/unix:GLWindowContext_unix_src",
+        "//tools/sk_app/unix:RasterWindowContext_unix_src",
+        "//tools/sk_app/unix:Window_unix_src",
+        "//tools/sk_app/unix:keysym2ucs_src",
+        "//tools/sk_app/unix:main_unix_src",
+    ],
+)
+
 generated_cc_atom(
     name = "Application_hdr",
     hdrs = ["Application.h"],
@@ -24,6 +44,7 @@ generated_cc_atom(
         ":CommandSet_hdr",
         "//include/core:SkCanvas_hdr",
         "//include/core:SkFont_hdr",
+        "//src/core:SkStringUtils_hdr",
     ],
 )
 
@@ -178,6 +199,7 @@ generated_cc_atom(
     deps = [
         ":WindowContext_hdr",
         "//experimental/graphite/include:Context_hdr",
+        "//experimental/graphite/include:Recorder_hdr",
         "//include/gpu:GrDirectContext_hdr",
     ],
 )
diff --git a/third_party/skia/tools/sk_app/DawnWindowContext.cpp b/third_party/skia/tools/sk_app/DawnWindowContext.cpp
index 134842d6a9870..f810923e9068a 100644
--- a/third_party/skia/tools/sk_app/DawnWindowContext.cpp
+++ b/third_party/skia/tools/sk_app/DawnWindowContext.cpp
@@ -106,14 +106,16 @@ void DawnWindowContext::setDisplayParams(const DisplayParams& params) {
     fDisplayParams = params;
 }
 
-wgpu::Device DawnWindowContext::createDevice(dawn_native::BackendType type) {
+wgpu::Device DawnWindowContext::createDevice(wgpu::BackendType type) {
     fInstance->DiscoverDefaultAdapters();
     DawnProcTable backendProcs = dawn_native::GetProcs();
     dawnProcSetProcs(&backendProcs);
 
     std::vector<dawn_native::Adapter> adapters = fInstance->GetAdapters();
     for (dawn_native::Adapter adapter : adapters) {
-        if (adapter.GetBackendType() == type) {
+        wgpu::AdapterProperties properties;
+        adapter.GetProperties(&properties);
+        if (properties.backendType == type) {
             return adapter.CreateDevice();
         }
     }
diff --git a/third_party/skia/tools/sk_app/DawnWindowContext.h b/third_party/skia/tools/sk_app/DawnWindowContext.h
index ef4b717e74a52..a548ca4607ded 100644
--- a/third_party/skia/tools/sk_app/DawnWindowContext.h
+++ b/third_party/skia/tools/sk_app/DawnWindowContext.h
@@ -32,7 +32,7 @@ class DawnWindowContext : public WindowContext {
 protected:
     bool isGpuContext() override { return true; }
     void initializeContext(int width, int height);
-    wgpu::Device createDevice(dawn_native::BackendType type);
+    wgpu::Device createDevice(wgpu::BackendType type);
     virtual wgpu::Device onInitializeContext() = 0;
     virtual void onDestroyContext() = 0;
     virtual void onSwapBuffers() = 0;
diff --git a/third_party/skia/tools/sk_app/GraphiteMetalWindowContext.mm b/third_party/skia/tools/sk_app/GraphiteMetalWindowContext.mm
index f7277e18f87b2..1cc483e662119 100644
--- a/third_party/skia/tools/sk_app/GraphiteMetalWindowContext.mm
+++ b/third_party/skia/tools/sk_app/GraphiteMetalWindowContext.mm
@@ -9,8 +9,13 @@
 #include "src/core/SkMathPriv.h"
 #include "tools/sk_app/GraphiteMetalWindowContext.h"
 
+#include "experimental/graphite/include/BackendTexture.h"
 #include "experimental/graphite/include/Context.h"
+#include "experimental/graphite/include/Recorder.h"
+#include "experimental/graphite/include/Recording.h"
+#include "experimental/graphite/include/SkStuff.h"
 #include "experimental/graphite/include/mtl/MtlBackendContext.h"
+#include "experimental/graphite/include/mtl/MtlTypes.h"
 
 using sk_app::DisplayParams;
 using sk_app::GraphiteMetalWindowContext;
@@ -46,9 +51,10 @@
     fValid = this->onInitializeContext();
 
     skgpu::mtl::BackendContext backendContext = {};
-    backendContext.fDevice.retain((GrMTLHandle)fDevice.get());
-    backendContext.fQueue.retain((GrMTLHandle)fQueue.get());
+    backendContext.fDevice.retain((skgpu::mtl::Handle)fDevice.get());
+    backendContext.fQueue.retain((skgpu::mtl::Handle)fQueue.get());
     fGraphiteContext = skgpu::Context::MakeMetal(backendContext);
+    fGraphiteRecorder = fGraphiteContext->makeRecorder();
     // TODO
 //    if (!fGraphiteContext && fDisplayParams.fMSAASampleCount > 1) {
 //        fDisplayParams.fMSAASampleCount /= 2;
@@ -70,11 +76,6 @@
     fMetalLayer = nil;
     fValid = false;
 
-#if GR_METAL_SDK_VERSION >= 230
-    if (@available(macOS 11.0, iOS 14.0, *)) {
-        [fPipelineArchive release];
-    }
-#endif
     fQueue.reset();
     fDevice.reset();
 }
@@ -83,27 +84,29 @@
     sk_sp<SkSurface> surface;
     id<CAMetalDrawable> currentDrawable = [fMetalLayer nextDrawable];
 
-    // TODO
-//    GrMtlTextureInfo fbInfo;
-//    fbInfo.fTexture.retain(currentDrawable.texture);
-//
-//    GrBackendRenderTarget backendRT(fWidth,
-//                                    fHeight,
-//                                    fSampleCount,
-//                                    fbInfo);
-//
-//    surface = SkSurface::MakeFromBackendRenderTarget(fContext.get(), backendRT,
-//                                                     kTopLeft_GrSurfaceOrigin,
-//                                                     kBGRA_8888_SkColorType,
-//                                                     fDisplayParams.fColorSpace,
-//                                                     &fDisplayParams.fSurfaceProps);
-
-    fDrawableHandle = CFRetain((GrMTLHandle) currentDrawable);
+    skgpu::mtl::TextureInfo mtlInfo((skgpu::mtl::Handle)currentDrawable.texture);
+
+    skgpu::BackendTexture backendTex(this->dimensions(),
+                                     (skgpu::mtl::Handle)currentDrawable.texture);
+
+    surface = MakeGraphiteFromBackendTexture(this->graphiteRecorder(),
+                                             backendTex,
+                                             kBGRA_8888_SkColorType,
+                                             fDisplayParams.fColorSpace,
+                                             &fDisplayParams.fSurfaceProps);
+
+    fDrawableHandle = CFRetain((skgpu::mtl::Handle) currentDrawable);
 
     return surface;
 }
 
 void GraphiteMetalWindowContext::swapBuffers() {
+    // This chunk of code should not be in this class but higher up either in Window or
+    // WindowContext
+    std::unique_ptr<skgpu::Recording> recording = fGraphiteRecorder->snap();
+    fGraphiteContext->insertRecording(std::move(recording));
+    fGraphiteContext->submit(skgpu::SyncToCpu::kNo);
+
     id<CAMetalDrawable> currentDrawable = (id<CAMetalDrawable>)fDrawableHandle;
 
     id<MTLCommandBuffer> commandBuffer([*fQueue commandBuffer]);
diff --git a/third_party/skia/tools/sk_app/VulkanWindowContext.cpp b/third_party/skia/tools/sk_app/VulkanWindowContext.cpp
index d07d5a42744d7..0ba31b5376afa 100644
--- a/third_party/skia/tools/sk_app/VulkanWindowContext.cpp
+++ b/third_party/skia/tools/sk_app/VulkanWindowContext.cpp
@@ -24,16 +24,17 @@
 #undef CreateSemaphore
 #endif
 
-#define GET_PROC(F) f ## F = (PFN_vk ## F) fGetInstanceProcAddr(fInstance, "vk" #F)
-#define GET_DEV_PROC(F) f ## F = (PFN_vk ## F) fGetDeviceProcAddr(fDevice, "vk" #F)
+#define GET_PROC(F) f ## F = \
+    (PFN_vk ## F) backendContext.fGetProc("vk" #F, fInstance, VK_NULL_HANDLE)
+#define GET_DEV_PROC(F) f ## F = \
+    (PFN_vk ## F) backendContext.fGetProc("vk" #F, VK_NULL_HANDLE, fDevice)
 
 namespace sk_app {
 
 VulkanWindowContext::VulkanWindowContext(const DisplayParams& params,
                                          CreateVkSurfaceFn createVkSurface,
                                          CanPresentFn canPresent,
-                                         PFN_vkGetInstanceProcAddr instProc,
-                                         PFN_vkGetDeviceProcAddr devProc)
+                                         PFN_vkGetInstanceProcAddr instProc)
     : WindowContext(params)
     , fCreateVkSurfaceFn(createVkSurface)
     , fCanPresentFn(canPresent)
@@ -44,7 +45,6 @@ VulkanWindowContext::VulkanWindowContext(const DisplayParams& params,
     , fSurfaces(nullptr)
     , fBackbuffers(nullptr) {
     fGetInstanceProcAddr = instProc;
-    fGetDeviceProcAddr = devProc;
     this->initializeContext();
 }
 
@@ -53,19 +53,12 @@ void VulkanWindowContext::initializeContext() {
     // any config code here (particularly for msaa)?
 
     PFN_vkGetInstanceProcAddr getInstanceProc = fGetInstanceProcAddr;
-    PFN_vkGetDeviceProcAddr getDeviceProc = fGetDeviceProcAddr;
-    auto getProc = [getInstanceProc, getDeviceProc](const char* proc_name,
-                                                    VkInstance instance, VkDevice device) {
-        if (device != VK_NULL_HANDLE) {
-            return getDeviceProc(device, proc_name);
-        }
-        return getInstanceProc(instance, proc_name);
-    };
     GrVkBackendContext backendContext;
     GrVkExtensions extensions;
     VkPhysicalDeviceFeatures2 features;
-    if (!sk_gpu_test::CreateVkBackendContext(getProc, &backendContext, &extensions, &features,
-                                             &fDebugCallback, &fPresentQueueIndex, fCanPresentFn)) {
+    if (!sk_gpu_test::CreateVkBackendContext(getInstanceProc, &backendContext, &extensions,
+                                             &features, &fDebugCallback, &fPresentQueueIndex,
+                                             fCanPresentFn)) {
         sk_gpu_test::FreeVulkanFeaturesStructs(&features);
         return;
     }
diff --git a/third_party/skia/tools/sk_app/VulkanWindowContext.h b/third_party/skia/tools/sk_app/VulkanWindowContext.h
index 580dba2733345..1ba293a5ddd3a 100644
--- a/third_party/skia/tools/sk_app/VulkanWindowContext.h
+++ b/third_party/skia/tools/sk_app/VulkanWindowContext.h
@@ -48,7 +48,7 @@ class VulkanWindowContext : public WindowContext {
     using CanPresentFn = sk_gpu_test::CanPresentFn;
 
     VulkanWindowContext(const DisplayParams&, CreateVkSurfaceFn, CanPresentFn,
-                        PFN_vkGetInstanceProcAddr, PFN_vkGetDeviceProcAddr);
+                        PFN_vkGetInstanceProcAddr);
 
 private:
     void initializeContext();
@@ -73,9 +73,7 @@ class VulkanWindowContext : public WindowContext {
     CreateVkSurfaceFn fCreateVkSurfaceFn;
     CanPresentFn      fCanPresentFn;
 
-    // Vulkan GetProcAddr functions
     PFN_vkGetInstanceProcAddr fGetInstanceProcAddr = nullptr;
-    PFN_vkGetDeviceProcAddr fGetDeviceProcAddr = nullptr;
 
     // WSI interface functions
     PFN_vkDestroySurfaceKHR fDestroySurfaceKHR = nullptr;
diff --git a/third_party/skia/tools/sk_app/WindowContext.cpp b/third_party/skia/tools/sk_app/WindowContext.cpp
index 581657a973da9..fdd6e9e012acb 100644
--- a/third_party/skia/tools/sk_app/WindowContext.cpp
+++ b/third_party/skia/tools/sk_app/WindowContext.cpp
@@ -10,6 +10,7 @@
 #include "include/gpu/GrDirectContext.h"
 #ifdef SK_GRAPHITE_ENABLED
 #include "experimental/graphite/include/Context.h"
+#include "experimental/graphite/include/Recorder.h"
 #endif
 
 namespace sk_app {
diff --git a/third_party/skia/tools/sk_app/WindowContext.h b/third_party/skia/tools/sk_app/WindowContext.h
index 79f6d72f3534e..75357495d9371 100644
--- a/third_party/skia/tools/sk_app/WindowContext.h
+++ b/third_party/skia/tools/sk_app/WindowContext.h
@@ -17,6 +17,7 @@ class SkSurface;
 #ifdef SK_GRAPHITE_ENABLED
 namespace skgpu {
 class Context;
+class Recorder;
 }
 #endif
 
@@ -44,10 +45,12 @@ class WindowContext {
     GrDirectContext* directContext() const { return fContext.get(); }
 #ifdef SK_GRAPHITE_ENABLED
     skgpu::Context* graphiteContext() const { return fGraphiteContext.get(); }
+    skgpu::Recorder* graphiteRecorder() const { return fGraphiteRecorder.get(); }
 #endif
 
     int width() const { return fWidth; }
     int height() const { return fHeight; }
+    SkISize dimensions() const { return {fWidth, fHeight}; }
     int sampleCount() const { return fSampleCount; }
     int stencilBits() const { return fStencilBits; }
 
@@ -56,7 +59,8 @@ class WindowContext {
 
     sk_sp<GrDirectContext> fContext;
 #if SK_GRAPHITE_ENABLED
-    sk_sp<skgpu::Context> fGraphiteContext;
+    std::unique_ptr<skgpu::Context> fGraphiteContext;
+    std::unique_ptr<skgpu::Recorder> fGraphiteRecorder;
 #endif
 
     int               fWidth;
diff --git a/third_party/skia/tools/sk_app/android/VulkanWindowContext_android.cpp b/third_party/skia/tools/sk_app/android/VulkanWindowContext_android.cpp
index 90466ad19c6f1..ebe8915c3c97c 100644
--- a/third_party/skia/tools/sk_app/android/VulkanWindowContext_android.cpp
+++ b/third_party/skia/tools/sk_app/android/VulkanWindowContext_android.cpp
@@ -21,8 +21,7 @@ namespace window_context_factory {
 std::unique_ptr<WindowContext> MakeVulkanForAndroid(ANativeWindow* window,
                                                     const DisplayParams& params) {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return nullptr;
     }
 
@@ -50,7 +49,7 @@ std::unique_ptr<WindowContext> MakeVulkanForAndroid(ANativeWindow* window,
     auto canPresent = [](VkInstance, VkPhysicalDevice, uint32_t) { return true; };
 
     std::unique_ptr<WindowContext> ctx(
-            new VulkanWindowContext(params, createVkSurface, canPresent, instProc, devProc));
+            new VulkanWindowContext(params, createVkSurface, canPresent, instProc));
     if (!ctx->isValid()) {
         return nullptr;
     }
diff --git a/third_party/skia/tools/sk_app/android/main_android.cpp b/third_party/skia/tools/sk_app/android/main_android.cpp
index 3eaea2ce2e7ec..2fc693d6aede0 100644
--- a/third_party/skia/tools/sk_app/android/main_android.cpp
+++ b/third_party/skia/tools/sk_app/android/main_android.cpp
@@ -45,11 +45,11 @@ void android_main(struct android_app* state) {
         struct android_poll_source* source;
 
         // block forever waiting for events.
-        while ((ident=ALooper_pollAll(-1, NULL, &events,
+        while ((ident=ALooper_pollAll(-1, nullptr, &events,
                 (void**)&source)) >= 0) {
 
             // Process this event.
-            if (source != NULL) {
+            if (source != nullptr) {
                 source->process(state, source);
             }
 
diff --git a/third_party/skia/tools/sk_app/android/surface_glue_android.cpp b/third_party/skia/tools/sk_app/android/surface_glue_android.cpp
index 840ce5af6279a..b0642764c24a9 100644
--- a/third_party/skia/tools/sk_app/android/surface_glue_android.cpp
+++ b/third_party/skia/tools/sk_app/android/surface_glue_android.cpp
@@ -228,8 +228,6 @@ void* SkiaAndroidApp::pthread_main(void* arg) {
         }
     }
 
-    SkDebugf("pthread_main ends");
-
     return nullptr;
 }
 
diff --git a/third_party/skia/tools/sk_app/mac/DawnMTLWindowContext_mac.mm b/third_party/skia/tools/sk_app/mac/DawnMTLWindowContext_mac.mm
index 0fc2d1b570b1b..67bec74afc338 100644
--- a/third_party/skia/tools/sk_app/mac/DawnMTLWindowContext_mac.mm
+++ b/third_party/skia/tools/sk_app/mac/DawnMTLWindowContext_mac.mm
@@ -119,7 +119,7 @@ DawnSwapChainError Present() {
 }
 
 wgpu::Device DawnMTLWindowContext::onInitializeContext() {
-    wgpu::Device device = this->createDevice(dawn_native::BackendType::Metal);
+    wgpu::Device device = this->createDevice(wgpu::BackendType::Metal);
     if (!device) {
         return nullptr;
     }
diff --git a/third_party/skia/tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp b/third_party/skia/tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp
index aec034ab20e65..f6a5b6fb56a2f 100644
--- a/third_party/skia/tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp
+++ b/third_party/skia/tools/sk_app/unix/DawnVulkanWindowContext_unix.cpp
@@ -58,7 +58,7 @@ DawnSwapChainImplementation DawnVulkanWindowContext_xlib::createSwapChainImpleme
 }
 
 wgpu::Device DawnVulkanWindowContext_xlib::onInitializeContext() {
-    wgpu::Device device = this->createDevice(dawn_native::BackendType::Vulkan);
+    wgpu::Device device = this->createDevice(wgpu::BackendType::Vulkan);
     if (!device) {
         return nullptr;
     }
diff --git a/third_party/skia/tools/sk_app/unix/VulkanWindowContext_unix.cpp b/third_party/skia/tools/sk_app/unix/VulkanWindowContext_unix.cpp
index 34f6640c76307..a7fd09d6e43b6 100644
--- a/third_party/skia/tools/sk_app/unix/VulkanWindowContext_unix.cpp
+++ b/third_party/skia/tools/sk_app/unix/VulkanWindowContext_unix.cpp
@@ -25,8 +25,7 @@ namespace window_context_factory {
 std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info,
                                                  const DisplayParams& displayParams) {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return nullptr;
     }
 
@@ -75,7 +74,7 @@ std::unique_ptr<WindowContext> MakeVulkanForXlib(const XlibWindowInfo& info,
         return (VK_FALSE != check);
     };
     std::unique_ptr<WindowContext> ctx(
-            new VulkanWindowContext(displayParams, createVkSurface, canPresent, instProc, devProc));
+            new VulkanWindowContext(displayParams, createVkSurface, canPresent, instProc));
     if (!ctx->isValid()) {
         return nullptr;
     }
diff --git a/third_party/skia/tools/sk_app/wasm/BUILD.bazel b/third_party/skia/tools/sk_app/wasm/BUILD.bazel
new file mode 100644
index 0000000000000..f30d4d18719dd
--- /dev/null
+++ b/third_party/skia/tools/sk_app/wasm/BUILD.bazel
@@ -0,0 +1,7 @@
+load("//bazel:macros.bzl", "generated_cc_atom")
+
+generated_cc_atom(
+    name = "main_wasm_src",
+    srcs = ["main_wasm.cpp"],
+    visibility = ["//:__subpackages__"],
+)
diff --git a/third_party/skia/tools/sk_app/wasm/main_wasm.cpp b/third_party/skia/tools/sk_app/wasm/main_wasm.cpp
new file mode 100644
index 0000000000000..bf2552949fcca
--- /dev/null
+++ b/third_party/skia/tools/sk_app/wasm/main_wasm.cpp
@@ -0,0 +1,14 @@
+/*
+
+* Copyright 2022 Google LLC
+*
+* Use of this source code is governed by a BSD-style license that can be
+* found in the LICENSE file.
+*/
+
+#include <iostream>
+
+int main(int argc, char**argv) {
+    printf("Hello world\n");
+    // TODO(bsalomon, kjlubick) Make this draw to a Canvas2D, WebGL Canvas, or WebGPU Canvas
+}
diff --git a/third_party/skia/tools/sk_app/win/DawnD3D12WindowContext_win.cpp b/third_party/skia/tools/sk_app/win/DawnD3D12WindowContext_win.cpp
index 30df9815d3ce1..6ceaf0552413c 100644
--- a/third_party/skia/tools/sk_app/win/DawnD3D12WindowContext_win.cpp
+++ b/third_party/skia/tools/sk_app/win/DawnD3D12WindowContext_win.cpp
@@ -46,7 +46,7 @@ DawnSwapChainImplementation DawnD3D12WindowContext::createSwapChainImplementatio
 }
 
 wgpu::Device DawnD3D12WindowContext::onInitializeContext() {
-    return this->createDevice(dawn_native::BackendType::D3D12);
+    return this->createDevice(wgpu::BackendType::D3D12);
 }
 
 void DawnD3D12WindowContext::onDestroyContext() {
diff --git a/third_party/skia/tools/sk_app/win/GLWindowContext_win.cpp b/third_party/skia/tools/sk_app/win/GLWindowContext_win.cpp
index b58efcb828582..b09ac528ca07e 100644
--- a/third_party/skia/tools/sk_app/win/GLWindowContext_win.cpp
+++ b/third_party/skia/tools/sk_app/win/GLWindowContext_win.cpp
@@ -52,7 +52,7 @@ class GLWindowContext_win : public GLWindowContext {
 GLWindowContext_win::GLWindowContext_win(HWND wnd, const DisplayParams& params)
     : INHERITED(params)
     , fHWND(wnd)
-    , fHGLRC(NULL) {
+    , fHGLRC(nullptr) {
 
     // any config code here (particularly for msaa)?
 
@@ -68,7 +68,7 @@ sk_sp<const GrGLInterface> GLWindowContext_win::onInitializeContext() {
 
     fHGLRC = SkCreateWGLContext(dc, fDisplayParams.fMSAASampleCount, false /* deepColor */,
                                 kGLPreferCompatibilityProfile_SkWGLContextRequest);
-    if (NULL == fHGLRC) {
+    if (nullptr == fHGLRC) {
         return nullptr;
     }
 
@@ -86,7 +86,7 @@ sk_sp<const GrGLInterface> GLWindowContext_win::onInitializeContext() {
             wglDeleteContext(fHGLRC);
             fHGLRC = SkCreateWGLContext(dc, fDisplayParams.fMSAASampleCount, false /* deepColor */,
                                         kGLPreferCoreProfile_SkWGLContextRequest);
-            if (NULL == fHGLRC) {
+            if (nullptr == fHGLRC) {
                 return nullptr;
             }
         }
diff --git a/third_party/skia/tools/sk_app/win/VulkanWindowContext_win.cpp b/third_party/skia/tools/sk_app/win/VulkanWindowContext_win.cpp
index 909c96127b603..8875888ebd758 100644
--- a/third_party/skia/tools/sk_app/win/VulkanWindowContext_win.cpp
+++ b/third_party/skia/tools/sk_app/win/VulkanWindowContext_win.cpp
@@ -25,8 +25,7 @@ namespace window_context_factory {
 
 std::unique_ptr<WindowContext> MakeVulkanForWin(HWND hwnd, const DisplayParams& params) {
     PFN_vkGetInstanceProcAddr instProc;
-    PFN_vkGetDeviceProcAddr devProc;
-    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc, &devProc)) {
+    if (!sk_gpu_test::LoadVkLibraryAndGetProcAddrFuncs(&instProc)) {
         return nullptr;
     }
 
@@ -70,7 +69,7 @@ std::unique_ptr<WindowContext> MakeVulkanForWin(HWND hwnd, const DisplayParams&
     };
 
     std::unique_ptr<WindowContext> ctx(
-            new VulkanWindowContext(params, createVkSurface, canPresent, instProc, devProc));
+            new VulkanWindowContext(params, createVkSurface, canPresent, instProc));
     if (!ctx->isValid()) {
         return nullptr;
     }
diff --git a/third_party/skia/tools/sk_app/win/main_win.cpp b/third_party/skia/tools/sk_app/win/main_win.cpp
index 5a7fdc1871b2f..a64b07deea559 100644
--- a/third_party/skia/tools/sk_app/win/main_win.cpp
+++ b/third_party/skia/tools/sk_app/win/main_win.cpp
@@ -17,9 +17,9 @@ using sk_app::Application;
 
 static char* tchar_to_utf8(const TCHAR* str) {
 #ifdef _UNICODE
-    int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), NULL, 0, NULL, NULL);
+    int size = WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), nullptr, 0, nullptr, nullptr);
     char* str8 = (char*)sk_malloc_throw(size + 1);
-    WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), str8, size, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, str, wcslen(str), str8, size, nullptr, nullptr);
     str8[size] = '\0';
     return str8;
 #else
@@ -38,14 +38,14 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
     char* argv[4096];
     int argc = 0;
     TCHAR exename[1024], *next;
-    int exenameLen = GetModuleFileName(NULL, exename, SK_ARRAY_COUNT(exename));
+    int exenameLen = GetModuleFileName(nullptr, exename, SK_ARRAY_COUNT(exename));
     // we're ignoring the possibility that the exe name exceeds the exename buffer
     (void)exenameLen;
     argv[argc++] = tchar_to_utf8(exename);
     TCHAR* arg = _tcstok_s(lpCmdLine, _T(" "), &next);
-    while (arg != NULL) {
+    while (arg != nullptr) {
         argv[argc++] = tchar_to_utf8(arg);
-        arg = _tcstok_s(NULL, _T(" "), &next);
+        arg = _tcstok_s(nullptr, _T(" "), &next);
     }
     int result = main_common(hInstance, nCmdShow, argc, argv);
     for (int i = 0; i < argc; ++i) {
@@ -55,7 +55,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCm
 }
 
 int main(int argc, char**argv) {
-    return main_common(GetModuleHandle(NULL), SW_SHOW, argc, argv);
+    return main_common(GetModuleHandle(nullptr), SW_SHOW, argc, argv);
 }
 
 static int main_common(HINSTANCE hInstance, int show, int argc, char**argv) {
diff --git a/third_party/skia/tools/skdiff/BUILD.bazel b/third_party/skia/tools/skdiff/BUILD.bazel
index a7fe13b227d1e..f9dcf1e07df5a 100644
--- a/third_party/skia/tools/skdiff/BUILD.bazel
+++ b/third_party/skia/tools/skdiff/BUILD.bazel
@@ -9,7 +9,6 @@ cc_binary(
         ":skdiff_src",
         ":skdiff_utils_src",
         "//:skia_core",
-        "//third_party:musl_compat",
         "//third_party:skcms",
         "//tools:Resources_src",
         "//tools:ToolUtils_src",
diff --git a/third_party/skia/tools/skdiff/skdiff.h b/third_party/skia/tools/skdiff/skdiff.h
index 814634c6901a0..3b5ef81c4f220 100644
--- a/third_party/skia/tools/skdiff/skdiff.h
+++ b/third_party/skia/tools/skdiff/skdiff.h
@@ -158,7 +158,7 @@ typedef SkTArray<DiffRecord> RecordArray;
 
 /// A wrapper for any sortProc (comparison routine) which applies a first-order
 /// sort beforehand, and a tiebreaker if the sortProc returns 0.
-template<typename T> static int compare(const void* untyped_lhs, const void* untyped_rhs) {
+template<typename T> int compare(const void* untyped_lhs, const void* untyped_rhs) {
     const DiffRecord* lhs = reinterpret_cast<DiffRecord const *>(untyped_lhs);
     const DiffRecord* rhs = reinterpret_cast<DiffRecord const *>(untyped_rhs);
 
diff --git a/third_party/skia/tools/skottie_ios_app/BUILD.gn b/third_party/skia/tools/skottie_ios_app/BUILD.gn
index ceb9916b035cd..ffb310026e032 100644
--- a/third_party/skia/tools/skottie_ios_app/BUILD.gn
+++ b/third_party/skia/tools/skottie_ios_app/BUILD.gn
@@ -48,7 +48,7 @@ if (is_ios) {
       "../../modules/skottie",
     ]
     cflags_objcc = [
-      "-std=c++14",
+      "-std=c++17",
       "-w",
     ]
     frameworks = [
diff --git a/third_party/skia/tools/skpbench/skpbench.cpp b/third_party/skia/tools/skpbench/skpbench.cpp
index dde9f7d9052e6..27d1a8595e519 100644
--- a/third_party/skia/tools/skpbench/skpbench.cpp
+++ b/third_party/skia/tools/skpbench/skpbench.cpp
@@ -734,6 +734,8 @@ static SkString join(const CommandLineFlags::StringArray& stringArray) {
     return joined;
 }
 
+static void exitf(ExitErr err, const char* format, ...) SK_PRINTF_LIKE(2, 3);
+
 static void exitf(ExitErr err, const char* format, ...) {
     fprintf(stderr, ExitErr::kSoftware == err ? "INTERNAL ERROR: " : "ERROR: ");
     va_list args;
diff --git a/third_party/skia/tools/skqp/BUILD.bazel b/third_party/skia/tools/skqp/BUILD.bazel
deleted file mode 100644
index 761272dd06e33..0000000000000
--- a/third_party/skia/tools/skqp/BUILD.bazel
+++ /dev/null
@@ -1,34 +0,0 @@
-load("//bazel:macros.bzl", "generated_cc_atom")
-
-generated_cc_atom(
-    name = "jitter_gms_src",
-    srcs = ["jitter_gms.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//gm:gm_hdr",
-        "//include/core:SkBitmap_hdr",
-        "//include/core:SkCanvas_hdr",
-        "//include/core:SkColor_hdr",
-        "//include/core:SkExecutor_hdr",
-        "//include/core:SkGraphics_hdr",
-        "//include/core:SkPoint_hdr",
-        "//include/core:SkSize_hdr",
-        "//include/core:SkTypes_hdr",
-        "//include/private:SkSemaphore_hdr",
-        "//tools:Registry_hdr",
-        "//tools/skqp/src:skqp_hdr",
-        "//tools/skqp/src:skqp_model_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "make_skqp_model_src",
-    srcs = ["make_skqp_model.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//include/codec:SkCodec_hdr",
-        "//include/core:SkBitmap_hdr",
-        "//include/encode:SkPngEncoder_hdr",
-        "//src/core:SkOSFile_hdr",
-    ],
-)
diff --git a/third_party/skia/tools/skqp/README_ALGORITHM.md b/third_party/skia/tools/skqp/README_ALGORITHM.md
deleted file mode 100644
index c1eb23bcf9920..0000000000000
--- a/third_party/skia/tools/skqp/README_ALGORITHM.md
+++ /dev/null
@@ -1,96 +0,0 @@
-SkQP Render Test Algorithm
-==========================
-
-The following is a description of the render test validation algorithm that
-will be used by the version of SkQP that will be released for Android Q-release.
-
-There is a global macro constant: `SK_SKQP_GLOBAL_ERROR_TOLERANCE`, which
-reflects the `gn` variable `skia_skqp_global_error_tolerance`.  This is usually
-set to 8.
-
-First, look for a file named `skqp/rendertests.txt` in the
-`platform_tools/android/apps/skqp/src/main/assets` directory.  The format of
-this file is:  each line contains one render test name, followed by a comma,
-followed by an integer.  The integer is the `passing_threshold` for that test.
-
-For each test, we have a `max_image` and a `min_image`.  These are PNG-encoded
-images stored in SkQP's APK's asset directory (in the paths `gmkb/${TEST}/min.png`
-and `gmkb/${TEST}/max.png`).
-
-The test input is a rendered image.  This will be produced by running one of
-the render tests against the either the `vk` (Vulkan) or `gles` (OpenGL ES)
-Skia backend.
-
-Here is psuedocode for the error calculation:
-
-    function calculate_pixel_error(pixel_value, pixel_max, pixel_min):
-        pixel_error = 0
-
-        for color_channel in { red, green, blue, alpha }:
-            value = get_color(pixel_value, color_channel)
-            v_max = get_color(pixel_max,   color_channel)
-            v_min = get_color(pixel_min,   color_channel)
-
-            if value > v_max:
-                channel_error = value - v_max
-            elif value < v_min:
-                channel_error = v_min - value
-            else:
-                channel_error = 0
-            pixel_error = max(pixel_error, channel_error)
-
-        return max(0, pixel_error - SK_SKQP_GLOBAL_ERROR_TOLERANCE);
-
-    function get_error(rendered_image, max_image, min_image):
-        assert(dimensions(rendered_image) == dimensions(max_image))
-        assert(dimensions(rendered_image) == dimensions(min_image))
-
-        max_error = 0
-        bad_pixels = 0
-        total_error = 0
-
-        error_image = allocate_bitmap(dimensions(rendered_image))
-
-        for xy in list_all_pixel_coordinates(rendered_image):
-            pixel_error = calculate_pixel_error(rendered_image(xy),
-                                                max_image(xy),
-                                                min_image(xy))
-            if pixel_error > 0:
-                for neighboring_xy in find_neighbors(xy):
-                    if not inside(neighboring_xy, dimensions(rendered_image)):
-                        continue
-                    pixel_error = min(pixel_error,
-                                      calculate_pixel_error(rendered_image(xy),
-                                                            max_image(neighboring_xy),
-                                                            min_image(neighboring_xy)))
-
-            if pixel_error > 0:
-                max_error = max(max_error, pixel_error)
-                bad_pixels += 1
-                total_error += pixel_error
-
-                error_image(xy) = linear_interpolation(black, red, pixel_error)
-            else:
-                error_image(xy) = white
-
-        return ((total_error, max_error, bad_pixels), error_image)
-
-For each render test, there is a threshold value for `total_error`, :
-`passing_threshold`.
-
-If `passing_threshold >= 0 && total_error > passing_threshold`, then the test
-is a failure and is included in the report.  if `passing_threshold == -1`, then
-the test always passes, but we do execute the test to verify that the driver
-does not crash.
-
-We generate a report with the following information for each test:
-
-    backend_name,render_test_name,max_error,bad_pixels,total_error
-
-in CSV format in the file `out.csv`.  A HTML report of just the failing tests
-is written to the file `report.html`.  This version includes four images for
-each test:  `rendered_image`, `max_image`, `min_image`, and `error_image`, as
-well as the three metrics: `max_error`, `bad_pixels`, and `total_error`.
-
-
-
diff --git a/third_party/skia/tools/skqp/README_GENERATING_MODELS.md b/third_party/skia/tools/skqp/README_GENERATING_MODELS.md
deleted file mode 100644
index 4351909ec1ce2..0000000000000
--- a/third_party/skia/tools/skqp/README_GENERATING_MODELS.md
+++ /dev/null
@@ -1,84 +0,0 @@
-How SkQP Generates Render Test Models
-=====================================
-
-We will, at regular intervals, generate new models from the [main branch of
-Skia][1].  Here is how that process works:
-
-0.  Choose a commit to make the branch from
-
-        COMMIT=origin/main
-
-    Or use the script to find the best one:
-
-        cd SKIA_SOURCE_DIRECTORY
-        git fetch origin
-        COMMIT=$(python tools/skqp/find_commit_with_best_gold_results.py \
-                 origin/main ^origin/skqp/dev)
-
-1.  Get the positively triaged results from Gold and generate models:
-
-        cd SKIA_SOURCE_DIRECTORY
-        git fetch origin
-        git checkout "$COMMIT"
-        python tools/skqp/cut_release.py HEAD~10 HEAD
-
-    This will create the following files:
-
-        platform_tools/android/apps/skqp/src/main/assets/files.checksum
-        platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt
-        platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
-
-    These three files can be commited to Skia to create a new commit.  Make
-    `origin/skqp/dev` a parent of this commit (without merging it in), and
-    push this new commit to `origin/skqp/dev`, using this script:
-
-        sh tools/skqp/branch_skqp_dev.sh
-
-    Review and submit the change:
-
-        git push origin HEAD:refs/for/skqp/dev
-        bin/sysopen https://review.skia.org/$(bin/gerrit-number HEAD)
-
-    (Optional) Make a SkQP APK.
-
-        tools/skqp/docker_build_universal_apk.sh
-
-    (Optional) Test the SkQP APK:
-
-        tools/skqp/test_apk.sh (LOCATION)/skqp-universal-debug.apk
-
-    (Once changes land) Upload the SkQP APK.
-
-        tools/skqp/upload_apk HEAD (LOCATION)/skqp-universal-debug.apk
-
-
-`tools/skqp/cut_release.py`
----------------------------
-
-This tool will call `make_skqp_model` to generate the `m{ax,in}.png` files for
-each render test.
-
-Then it calls `jitter_gms` to see which render tests pass the jitter test.
-`jitter_gms` respects the `bad_gms.txt` file by ignoring the render tests
-enumerated in that file.  Tests which pass the jitter test are enumerated in
-the file `good.txt`, those that fail in the `bad.txt` file.
-
-Next, the `skqp/rendertests.txt` file is created.  This file lists the render
-tests that will be executed by SkQP.  These are the union of the tests
-enumerated in the `good.txt` and `bad.txt` files.  If the render test is found
-in the `good.txt` file and the model exists, its per-test threshold is set
-to 0 (a later CL can manually change this, if needed).  Otherwise, the
-threshold is set to -1; this indicated that the rendertest will be executed (to
-verify that the driver will not crash), but the output will not be compared
-against the model.  Unnecessary models will be removed.
-
-Next, all of the files that represent the models are uploaded to cloud storage.
-A single checksum hash is kept in the  `files.checksum` file.  This is enough
-to re-download those files later, but we don't have to fill the git repository
-with a lot of binary data.
-
-Finally, a list of the current gpu unit tests is created and stored in
-`skqp/unittests.txt`.
-
-[1]: https://skia.googlesource.com/skia/+log/main "Skia Main Branch"
-[2]: https://gold.skia.org/search                 "Skia Gold Search"
diff --git a/third_party/skia/tools/skqp/bad_gms.txt b/third_party/skia/tools/skqp/bad_gms.txt
deleted file mode 100644
index bf0c1f3b67655..0000000000000
--- a/third_party/skia/tools/skqp/bad_gms.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-arcs_as_paths
-bigbitmaprect_i
-bigbitmaprect_s
-blurcircles2
-bug339297_as_clip
-bug6083
-colorfiltershader
-colormatrix
-composeshader_grid
-drawbitmaprect
-drawbitmaprect-imagerect
-etc1
-gradtext
-imageblur2
-imageblurclampmode
-imagefiltersgraph
-largeglyphblur
-megalooper_0x0
-megalooper_1x4
-megalooper_4x1
-orientation
-ovals_as_paths
-p3
-perlinnoise
-radial_gradient_precision
-readpixels
-scaled_tilemodes
-scaledemoji
-scaledemojipos
-skbug1719
-srcmode
-textblob_intercepts
-xfermodes2
-zero_length_paths_aa
diff --git a/third_party/skia/tools/skqp/branch_skqp_dev.sh b/third_party/skia/tools/skqp/branch_skqp_dev.sh
deleted file mode 100755
index 2662c1e34b88e..0000000000000
--- a/third_party/skia/tools/skqp/branch_skqp_dev.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-# Copyright 2018 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-set -xe
-set -- platform_tools/android/apps/skqp/src/main/assets/files.checksum       \
-       platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt \
-       platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
-for arg; do [ -f "$arg" ] || exit 1; done
-MSG="$(printf 'Cut SkQP %s\n\nNo-Try: true' "$(date +%Y-%m-%d)")"
-git merge -s ours origin/skqp/dev -m "$MSG"
-git add "$@"
-git commit --amend --reuse-message=HEAD
diff --git a/third_party/skia/tools/skqp/clean_app.sh b/third_party/skia/tools/skqp/clean_app.sh
index d6b5284d881c3..3a54a9aab0276 100755
--- a/third_party/skia/tools/skqp/clean_app.sh
+++ b/third_party/skia/tools/skqp/clean_app.sh
@@ -11,7 +11,6 @@ set -e
 cd "$(dirname "$0")/../.."
 cd platform_tools/android/apps
 git clean -fxd skqp/build \
-               skqp/src/main/assets/gmkb \
                skqp/src/main/assets/resources \
                skqp/src/main/libs \
                .gradle build viewer/build
diff --git a/third_party/skia/tools/skqp/create_apk.py b/third_party/skia/tools/skqp/create_apk.py
index 27bff792fbae3..fd62393487af0 100755
--- a/third_party/skia/tools/skqp/create_apk.py
+++ b/third_party/skia/tools/skqp/create_apk.py
@@ -39,6 +39,7 @@
 import shutil
 import time
 
+sys.path.append(os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + "../../../gn"))
 import skqp_gn_args
 
 def print_cmd(cmd, o):
@@ -215,7 +216,8 @@ def __init__(self):
         self.debug = bool(os.environ.get('SKQP_DEBUG', ''))
 
     def gn_args(self, arch):
-        return skqp_gn_args.GetGNArgs(arch, self.android_ndk, self.debug, 26)
+        return skqp_gn_args.GetGNArgs(arch=arch, ndk=self.android_ndk, debug=self.debug,
+                                      api_level=26)
 
     def write(self, o):
         for k, v in [('ANDROID_NDK', self.android_ndk),
diff --git a/third_party/skia/tools/skqp/cut_release.py b/third_party/skia/tools/skqp/cut_release.py
deleted file mode 100755
index 584f1b5414dda..0000000000000
--- a/third_party/skia/tools/skqp/cut_release.py
+++ /dev/null
@@ -1,172 +0,0 @@
-#! /usr/bin/env python
-# Copyright 2018 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-import json
-import md5
-import multiprocessing
-import os
-import shutil
-import sys
-import tempfile
-import urllib
-import urllib2
-
-from subprocess import check_call, check_output
-
-assert '/' in [os.sep, os.altsep] and os.pardir == '..'
-
-ASSETS = 'platform_tools/android/apps/skqp/src/main/assets'
-BUCKET = 'skia-skqp-assets'
-
-def urlopen(url):
-    cookie = os.environ.get('SKIA_GOLD_COOKIE', '')
-    return urllib2.urlopen(urllib2.Request(url, headers={'Cookie': cookie}))
-
-def make_skqp_model(arg):
-    name, urls, exe = arg
-    tmp = tempfile.mkdtemp()
-    for url in urls:
-        urllib.urlretrieve(url, tmp + '/' + url[url.rindex('/') + 1:])
-    check_call([exe, tmp, ASSETS + '/gmkb/' + name])
-    shutil.rmtree(tmp)
-    sys.stdout.write(name + ' ')
-    sys.stdout.flush()
-
-def goldgetter(meta, exe):
-    assert os.path.exists(exe)
-    jobs = []
-    for rec in meta:
-        urls = [d['URL'] for d in rec['digests']
-                if d['status'] == 'positive' and
-                (set(d['paramset']['config']) & set(['vk', 'gles']))]
-        if urls:
-            jobs.append((rec['testName'], urls, exe))
-    pool = multiprocessing.Pool(processes=20)
-    pool.map(make_skqp_model, jobs)
-    sys.stdout.write('\n')
-    return set((n for n, _, _ in jobs))
-
-def gold(first_commit, last_commit):
-    c1, c2 = (check_output(['git', 'rev-parse', c]).strip()
-            for c in (first_commit, last_commit))
-    f = urlopen('https://public-gold.skia.org/json/export?' + urllib.urlencode([
-        ('fbegin', c1),
-        ('fend', c2),
-        ('query', 'config=gles&config=vk&source_type=gm'),
-        ('pos', 'true'),
-        ('neg', 'false'),
-        ('unt', 'false')
-    ]))
-    j = json.load(f)
-    f.close()
-    return j
-
-def gset(path):
-    s = set()
-    if os.path.isfile(path):
-        with open(path, 'r') as f:
-            for line in f:
-                s.add(line.strip())
-    return s
-
-def make_rendertest_list(models, good, bad):
-    assert good.isdisjoint(bad)
-    do_score = good & models
-    no_score = bad | (good - models)
-    to_delete = models & bad
-    for d in to_delete:
-        path = ASSETS + '/gmkb/' + d
-        if os.path.isdir(path):
-            shutil.rmtree(path)
-    results = dict()
-    for n in do_score:
-        results[n] = 0
-    for n in no_score:
-        results[n] = -1
-    return ''.join('%s,%d\n' % (n, results[n]) for n in sorted(results))
-
-def get_digest(path):
-    m = md5.new()
-    with open(path, 'r') as f:
-        m.update(f.read())
-    return m.hexdigest()
-
-def upload_cmd(path, digest):
-    return ['gsutil', 'cp', path, 'gs://%s/%s' % (BUCKET, digest)]
-
-def upload_model():
-    bucket_url = 'gs://%s/' % BUCKET
-    extant = set((u.replace(bucket_url, '', 1)
-                  for u in check_output(['gsutil', 'ls', bucket_url]).splitlines() if u))
-    cmds = []
-    filelist = []
-    for dirpath, _, filenames in os.walk(ASSETS + '/gmkb'):
-        for filename in filenames:
-            path = os.path.join(dirpath, filename)
-            digest = get_digest(path)
-            if digest not in extant:
-                cmds.append(upload_cmd(path, digest))
-            filelist.append('%s;%s\n' % (digest, os.path.relpath(path, ASSETS)))
-    tmp = tempfile.mkdtemp()
-    filelist_path = tmp + '/x'
-    with open(filelist_path, 'w') as o:
-        for l in filelist:
-            o.write(l)
-    filelist_digest = get_digest(filelist_path)
-    if filelist_digest not in extant:
-        cmds.append(upload_cmd(filelist_path, filelist_digest))
-
-    pool = multiprocessing.Pool(processes=20)
-    pool.map(check_call, cmds)
-    shutil.rmtree(tmp)
-    return filelist_digest
-
-def remove(x):
-    if os.path.isdir(x) and not os.path.islink(x):
-        shutil.rmtree(x)
-    if os.path.exists(x):
-        os.remove(x)
-
-def main(first_commit, last_commit):
-    check_call(upload_cmd('/dev/null', get_digest('/dev/null')))
-
-    os.chdir(os.path.dirname(__file__) + '/../..')
-    remove(ASSETS + '/files.checksum')
-    for d in [ASSETS + '/gmkb', ASSETS + '/skqp', ]:
-        remove(d)
-        os.mkdir(d)
-
-    check_call([sys.executable, 'tools/git-sync-deps'],
-               env=dict(os.environ, GIT_SYNC_DEPS_QUIET='T'))
-    build = 'out/ndebug'
-    check_call(['bin/gn', 'gen', build,
-                '--args=cc="clang" cxx="clang++" is_debug=false'])
-    check_call(['ninja', '-C', build,
-                'jitter_gms', 'list_gpu_unit_tests', 'make_skqp_model'])
-
-    models = goldgetter(gold(first_commit, last_commit), build + '/make_skqp_model')
-
-    check_call([build + '/jitter_gms', 'tools/skqp/bad_gms.txt'])
-
-    with open(ASSETS + '/skqp/rendertests.txt', 'w') as o:
-        o.write(make_rendertest_list(models, gset('good.txt'), gset('bad.txt')))
-
-    remove('good.txt')
-    remove('bad.txt')
-
-    with open(ASSETS + '/skqp/unittests.txt', 'w') as o:
-        o.write(check_output([build + '/list_gpu_unit_tests']))
-
-    with open(ASSETS + '/files.checksum', 'w') as o:
-        o.write(upload_model() + '\n')
-
-    sys.stdout.write(ASSETS + '/files.checksum\n')
-    sys.stdout.write(ASSETS + '/skqp/rendertests.txt\n')
-    sys.stdout.write(ASSETS + '/skqp/unittests.txt\n')
-
-if __name__ == '__main__':
-    if len(sys.argv) != 3:
-        sys.stderr.write('Usage:\n  %s C1 C2\n\n' % sys.argv[0])
-        sys.exit(1)
-    main(sys.argv[1], sys.argv[2])
diff --git a/third_party/skia/tools/skqp/download_model b/third_party/skia/tools/skqp/download_model
deleted file mode 100755
index 68ef50daae9b1..0000000000000
--- a/third_party/skia/tools/skqp/download_model
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /usr/bin/env python
-# Copyright 2019 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-import download_model
-download_model.main()
diff --git a/third_party/skia/tools/skqp/download_model.py b/third_party/skia/tools/skqp/download_model.py
deleted file mode 100755
index fb0020e4812b1..0000000000000
--- a/third_party/skia/tools/skqp/download_model.py
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright 2018 Google Inc.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import hashlib
-import multiprocessing
-import os
-import shutil
-import sys
-import tempfile
-import urllib2
-
-def checksum(path):
-    if not os.path.exists(path):
-        return None
-    m = hashlib.md5()
-    with open(path, 'rb') as f:
-        while True:
-            buf = f.read(4096)
-            if not buf:
-                return m.hexdigest()
-            m.update(buf)
-
-def download(md5, path):
-    if not md5 == checksum(path):
-        dirname = os.path.dirname(path)
-        if dirname and not os.path.exists(dirname):
-            try:
-                os.makedirs(dirname)
-            except OSError:
-                pass  # ignore race condition
-        url = 'https://storage.googleapis.com/skia-skqp-assets/' + md5
-        with open(path, 'wb') as o:
-            shutil.copyfileobj(urllib2.urlopen(url), o)
-
-def tmp(prefix):
-    fd, path = tempfile.mkstemp(prefix=prefix)
-    os.close(fd)
-    return path
-
-def main():
-    target_dir = os.path.join('platform_tools', 'android', 'apps', 'skqp', 'src', 'main', 'assets')
-    os.chdir(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, target_dir))
-    checksum_path = 'files.checksum'
-    if not os.path.isfile(checksum_path):
-        sys.stderr.write('Error: "%s" is missing.\n' % os.path.join(target_dir, checksum_path))
-        sys.exit(1)
-    file_list_file = tmp('files_')
-    with open(checksum_path, 'r') as f:
-        md5 = f.read().strip()
-        assert(len(md5) == 32)
-        download(md5, file_list_file)
-    with open(file_list_file, 'r') as f:
-        records = []
-        for line in f:
-            md5, path = line.strip().split(';', 1)
-            records.append((md5, path))
-    sys.stderr.write('Downloading %d files.\n' % len(records))
-    pool = multiprocessing.Pool(processes=multiprocessing.cpu_count() * 2)
-    for record in records:
-        pool.apply_async(download, record, callback=lambda x: sys.stderr.write('.'))
-    pool.close()
-    pool.join()
-    sys.stderr.write('\n')
-
-if __name__ == '__main__':
-    main()
diff --git a/third_party/skia/tools/skqp/find_commit_with_best_gold_results.py b/third_party/skia/tools/skqp/find_commit_with_best_gold_results.py
deleted file mode 100755
index be24491aa12eb..0000000000000
--- a/third_party/skia/tools/skqp/find_commit_with_best_gold_results.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /usr/bin/env python
-# Copyright 2019 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import json
-import os
-import re
-import subprocess
-import sys
-import threading
-import urllib
-import urllib2
-
-
-assert '/' in [os.sep, os.altsep]
-
-
-skia_directory = os.path.abspath(os.path.dirname(__file__) + '/../..')
-
-
-def get_jobs():
-    path = skia_directory + '/infra/bots/jobs.json'
-    reg = re.compile('Test-(?P<os>[A-Za-z0-9_]+)-'
-                     '(?P<compiler>[A-Za-z0-9_]+)-'
-                     '(?P<model>[A-Za-z0-9_]+)-GPU-'
-                     '(?P<cpu_or_gpu_value>[A-Za-z0-9_]+)-'
-                     '(?P<arch>[A-Za-z0-9_]+)-'
-                     '(?P<configuration>[A-Za-z0-9_]+)-'
-                     'All(-(?P<extra_config>[A-Za-z0-9_]+)|)')
-    keys = ['os', 'compiler', 'model', 'cpu_or_gpu_value', 'arch',
-            'configuration', 'extra_config']
-    def fmt(s):
-        return s.encode('utf-8') if s is not None else ''
-    with open(path) as f:
-        jobs = json.load(f)
-    for job in jobs:
-        m = reg.match(job)
-        if m is not None:
-            yield [(k, fmt(m.group(k))) for k in keys]
-
-
-def gold_export_url(job, config, first_commit, last_commit):
-    qq = [('source_type', 'gm'), ('config', config)] + job
-    query = [
-        ('fbegin', first_commit),
-        ('fend', last_commit),
-        ('query', urllib.urlencode(qq)),
-        ('pos', 'true'),
-        ('neg', 'false'),
-        ('unt', 'false'),
-        ('head', 'true')
-    ]
-    return 'https://public-gold.skia.org/json/export?' + urllib.urlencode(query)
-
-
-def urlopen(url):
-    cookie = os.environ.get('SKIA_GOLD_COOKIE', '')
-    return urllib2.urlopen(urllib2.Request(url, headers={'Cookie': cookie}))
-
-
-def get_results_for_commit(commit, jobs):
-    sys.stderr.write('%s\n' % commit)
-    sys.stderr.flush()
-    CONFIGS = ['gles', 'vk']
-    passing_tests_for_all_jobs = []
-    def process(url):
-        try:
-            testResults = json.load(urlopen(url))
-        except urllib2.URLError:
-            sys.stderr.write('\nerror "%s":\n' % url)
-            return
-        sys.stderr.write('.')
-        sys.stderr.flush()
-        passing_tests = 0
-        for t in testResults:
-            assert t['digests']
-            passing_tests += 1
-        passing_tests_for_all_jobs.append(passing_tests)
-    all_urls = [gold_export_url(job, config, commit, commit)
-                for job in jobs for config in CONFIGS]
-    threads = [threading.Thread(target=process, args=(url,)) for url in all_urls]
-    for t in threads:
-        t.start()
-    for t in threads:
-        t.join()
-    result = sum(passing_tests_for_all_jobs)
-    sys.stderr.write('\n%d\n' % result)
-    sys.stderr.flush()
-    return result
-
-
-def find_best_commit(commits):
-    jobs = [j for j in get_jobs()]
-    results = []
-    for commit_name in commits:
-        commit_hash = subprocess.check_output(['git', 'rev-parse', commit_name]).strip()
-        results.append((commit_hash, get_results_for_commit(commit_hash, jobs)))
-
-    best_result = max(r for h, r in results)
-    for h, r in results:
-        if r == best_result:
-            return h
-    return None
-
-
-def generate_commit_list(args):
-    return subprocess.check_output(['git', 'log', '--format=%H'] + args).splitlines()
-
-
-def main(args):
-    os.chdir(skia_directory)
-    subprocess.check_call(['git', 'fetch', 'origin'])
-    sys.stderr.write('%s\n' % ' '.join(args))
-    commits = generate_commit_list(args)
-    sys.stderr.write('%d\n' % len(commits))
-    best = find_best_commit(commits)
-    sys.stderr.write('DONE:\n')
-    sys.stderr.flush()
-    sys.stdout.write('%s\n' % best)
-
-
-usage = '''Example usage:
-    python %s origin/main ^origin/skqp/dev < /dev/null > LOG 2>&1 & disown
-'''
-
-if __name__ == '__main__':
-    if len(sys.argv) < 2:
-        sys.stderr.write(usage % sys.argv[0])
-        sys.exit(1)
-    main(sys.argv[1:])
diff --git a/third_party/skia/tools/skqp/gn_to_bp.py b/third_party/skia/tools/skqp/gn_to_bp.py
deleted file mode 100755
index 99b022c567ebf..0000000000000
--- a/third_party/skia/tools/skqp/gn_to_bp.py
+++ /dev/null
@@ -1,206 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2016 Google Inc.
-#
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Generate Android.bp for Skia from GN configuration.
-
-import argparse
-import json
-import os
-import pprint
-import string
-import subprocess
-import sys
-import tempfile
-
-root_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                        os.pardir, os.pardir)
-skia_gn_dir = os.path.join(root_dir, 'gn')
-sys.path.insert(0, skia_gn_dir)
-
-import gn_to_bp_utils
-
-from skqp_gn_args import SkqpGnArgs
-
-# First we start off with a template for Android.bp,
-# with holes for source lists and include directories.
-bp = string.Template('''// This file is autogenerated by tools/skqp/gn_to_bp.py.
-
-cc_library_shared {
-    name: "libskqp_app",
-    sdk_version: "26",
-    stl: "libc++_static",
-    compile_multilib: "both",
-
-    cflags: [
-        $cflags
-        "-Wno-unused-parameter",
-        "-Wno-unused-variable",
-    ],
-
-    cppflags:[
-        $cflags_cc
-    ],
-
-    local_include_dirs: [
-        $local_includes
-    ],
-
-    srcs: [
-        "third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp",
-        $srcs
-    ],
-
-    arch: {
-        arm: {
-            srcs: [
-                $arm_srcs
-            ],
-
-            neon: {
-                srcs: [
-                    $arm_neon_srcs
-                ],
-            },
-        },
-
-        arm64: {
-            srcs: [
-                $arm64_srcs
-            ],
-        },
-
-        mips: {
-            srcs: [
-                $none_srcs
-            ],
-        },
-
-        mips64: {
-            srcs: [
-                $none_srcs
-            ],
-        },
-
-        x86: {
-            srcs: [
-                $x86_srcs
-            ],
-        },
-
-        x86_64: {
-            srcs: [
-                $x86_srcs
-            ],
-        },
-    },
-
-    shared_libs: [
-          "libandroid",
-          "libEGL",
-          "libGLESv2",
-          "liblog",
-          "libvulkan",
-          "libz",
-    ],
-    static_libs: [
-          "libexpat",
-          "libjpeg_static_ndk",
-          "libpng_ndk",
-          "libwebp-decode",
-          "libwebp-encode",
-    ]
-}''')
-
-# We'll run GN to get the main source lists and include directories for Skia.
-gn_args = {
-  'target_cpu': '"none"',
-  'target_os':  '"android"',
-
-  # setup skqp
-  'is_debug':   'false',
-  'ndk_api':    '26',
-
-  # specify that the Android.bp will supply the necessary components
-  'skia_use_system_expat':         'true', # removed this when gn is fixed
-  'skia_use_system_libpng':        'true',
-  'skia_use_system_libwebp':       'true',
-  'skia_use_system_libjpeg_turbo': 'true',
-  'skia_use_system_zlib':          'true',
-}
-
-for k, v in SkqpGnArgs.iteritems():
-    gn_args[k] = v
-
-js = gn_to_bp_utils.GenerateJSONFromGN(gn_args)
-
-def strip_slashes(lst):
-  return {str(p.lstrip('/')) for p in lst}
-
-srcs            = strip_slashes(js['targets']['//:libskqp_app']['sources'])
-cflags          = strip_slashes(js['targets']['//:libskqp_app']['cflags'])
-cflags_cc       = strip_slashes(js['targets']['//:libskqp_app']['cflags_cc'])
-local_includes  = strip_slashes(js['targets']['//:libskqp_app']['include_dirs'])
-defines      = {str(d) for d in js['targets']['//:libskqp_app']['defines']}
-
-defines.update(["SK_ENABLE_DUMP_GPU", "SK_BUILD_FOR_SKQP"])
-cflags_cc.update(['-Wno-extra-semi-stmt'])
-
-# Android does not want -Weverything set, it blocks toolchain updates.
-assert '-Weverything' not in cflags
-
-gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'sources', srcs, None)
-gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'include_dirs',
-                                   local_includes, 'freetype')
-gn_to_bp_utils.GrabDependentValues(js, '//:libskqp_app', 'defines',
-                                   defines, None)
-
-# No need to list headers or other extra flags.
-srcs = {s for s in srcs           if not s.endswith('.h')}
-cflags = gn_to_bp_utils.CleanupCFlags(cflags)
-cflags_cc = gn_to_bp_utils.CleanupCCFlags(cflags_cc)
-
-# We need to add the include path to the vulkan defines and header file set in
-# then skia_vulkan_header gn arg that is used for framework builds.
-local_includes.add("platform_tools/android/vulkan")
-
-# Get architecture specific source files
-defs = gn_to_bp_utils.GetArchSources(os.path.join(skia_gn_dir, 'opts.gni'))
-
-# Add source file until fix lands in
-# https://skia-review.googlesource.com/c/skia/+/101820
-srcs.add("src/ports/SkFontMgr_empty_factory.cpp")
-
-# Turn a list of strings into the style bpfmt outputs.
-def bpfmt(indent, lst, sort=True):
-  if sort:
-    lst = sorted(lst)
-  return ('\n' + ' '*indent).join('"%s",' % v for v in lst)
-
-# Most defines go into SkUserConfig.h, where they're seen by Skia and its users.
-gn_to_bp_utils.WriteUserConfig('include/config/SkUserConfig.h', defines)
-
-# OK!  We have everything to fill in Android.bp...
-with open('Android.bp', 'w') as f:
-  print >>f, bp.substitute({
-    'local_includes': bpfmt(8, local_includes),
-    'srcs':           bpfmt(8, srcs),
-    'cflags':         bpfmt(8, cflags, False),
-    'cflags_cc':      bpfmt(8, cflags_cc),
-
-    'arm_srcs':       bpfmt(16, defs['armv7']),
-    'arm_neon_srcs':  bpfmt(20, defs['neon']),
-    'arm64_srcs':     bpfmt(16, defs['arm64'] +
-                                defs['crc32']),
-    'none_srcs':      bpfmt(16, defs['none']),
-    'x86_srcs':       bpfmt(16, defs['sse2'] +
-                                defs['ssse3'] +
-                                defs['sse41'] +
-                                defs['sse42'] +
-                                defs['avx'] +
-                                defs['hsw']),
-  })
-
diff --git a/third_party/skia/tools/skqp/jitter_gms.cpp b/third_party/skia/tools/skqp/jitter_gms.cpp
deleted file mode 100644
index be26eef226aa2..0000000000000
--- a/third_party/skia/tools/skqp/jitter_gms.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2018 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-// Jitter GMs
-//
-// Re-execute rendering tests with slight translational changes and see if
-// there is a significant change.  Print `1` if the named test has no
-// significant change, `0` otherwise
-
-#include "gm/gm.h"
-#include "include/core/SkBitmap.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkColor.h"
-#include "include/core/SkExecutor.h"
-#include "include/core/SkGraphics.h"
-#include "include/core/SkPoint.h"
-#include "include/core/SkSize.h"
-#include "include/core/SkTypes.h"
-#include "include/private/SkSemaphore.h"
-#include "tools/Registry.h"
-#include "tools/skqp/src/skqp.h"
-#include "tools/skqp/src/skqp_model.h"
-
-#include <math.h>
-#include <algorithm>
-#include <cstdio>
-#include <fstream>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <vector>
-
-// Error tolerance distance in 8888 color space with Manhattan metric on color channel.
-static constexpr uint8_t kSkiaSkqpGlobalErrorTolerance = 8;
-
-// Number of times to jitter the canvas.
-static constexpr int kNumberOfJitters = 7;
-
-// Distance to translate the canvas in each jitter (direction will be different each time).
-static constexpr float kJitterMagnitude = 0.03125f;
-
-// The `kNumberOfJitters` different runs will each go in a different direction.
-// this is the angle (in radians) for the first one.
-static constexpr float kPhase = 0.3f;
-
-static void do_gm(SkBitmap* bm, skiagm::GM* gm, SkPoint jitter) {
-    SkASSERT(bm);
-    SkASSERT(gm);
-    SkASSERT(bm->dimensions() == gm->getISize());
-    SkCanvas canvas(*bm);
-    SkAutoCanvasRestore autoCanvasRestore(&canvas, true);
-    canvas.clear(SK_ColorWHITE);
-    canvas.translate(jitter.x(), jitter.y());
-    gm->draw(&canvas);
-    canvas.flush();
-}
-
-// Return true if passes jitter test.
-static bool test_jitter(skiagm::GM* gm) {
-    SkASSERT(gm);
-    SkISize size = gm->getISize();
-    SkBitmap control, experimental;
-    control.allocN32Pixels(size.width(), size.height());
-    experimental.allocN32Pixels(size.width(), size.height());
-    do_gm(&control, gm, {0, 0});
-    for (int i = 0; i < kNumberOfJitters; ++i) {
-        float angle = i * (6.2831853f / kNumberOfJitters) + kPhase;
-        do_gm(&experimental, gm, SkPoint{kJitterMagnitude * cosf(angle),
-                                         kJitterMagnitude * sinf(angle)});
-        SkQP::RenderOutcome result = skqp::Check(
-                control.pixmap(), control.pixmap(), experimental.pixmap(),
-                kSkiaSkqpGlobalErrorTolerance, nullptr);
-        if (result.fTotalError > 0) {
-            return false;
-        }
-    }
-    return true;
-}
-
-static bool do_this_test(const char* name,
-                    const std::vector<std::string>& doNotRun,
-                    const std::vector<std::string>& testOnlyThese) {
-    for (const std::string& bad : doNotRun) {
-        if (bad == name) {
-            return false;
-        }
-    }
-    for (const std::string& good : testOnlyThese) {
-        if (good == name) {
-            return true;
-        }
-    }
-    return testOnlyThese.empty();
-}
-
-
-int main(int argc, char** argv) {
-    std::vector<std::string> doNotRun;
-    std::vector<std::string> testOnlyThese;
-    if (argc > 1) {
-        std::ifstream ifs(argv[1]);
-        if (ifs.is_open()) {
-            std::string str;
-            while (std::getline(ifs, str)) {
-                doNotRun.push_back(str);
-            }
-        }
-    }
-    if (argc > 2) {
-        for (int i = 2; i < argc; ++i) {
-            testOnlyThese.emplace_back(argv[i]);
-        }
-    }
-    SkGraphics::Init();
-    std::mutex mutex;
-    std::vector<std::string> goodResults;
-    std::vector<std::string> badResults;
-
-    int total = 0;
-    SkSemaphore semaphore;
-    auto executor = SkExecutor::MakeFIFOThreadPool();
-    for (skiagm::GMFactory factory : skiagm::GMRegistry::Range()) {
-        ++total;
-        executor->add([factory, &mutex, &goodResults, &badResults,
-                       &semaphore, &doNotRun, &testOnlyThese](){
-            std::unique_ptr<skiagm::GM> gm(factory());
-            const char* name = gm->getName();
-            if (do_this_test(name, doNotRun, testOnlyThese)) {
-                bool success = test_jitter(gm.get());
-                std::lock_guard<std::mutex> lock(mutex);
-                if (success) {
-                    goodResults.emplace_back(name);
-                } else {
-                    badResults.emplace_back(name);
-                }
-                fputc('.', stderr);
-                fflush(stderr);
-            }
-            semaphore.signal();
-        });
-    }
-    while (total-- > 0) { semaphore.wait(); }
-    fputc('\n', stderr);
-    fflush(stderr);
-    std::sort(goodResults.begin(), goodResults.end());
-    std::sort(badResults.begin(), badResults.end());
-    std::ofstream good("good.txt");
-    std::ofstream bad("bad.txt");
-    for (const std::string& s : goodResults) { good << s << '\n'; }
-    for (const std::string& s : badResults) { bad << s << '\n'; }
-    fprintf(stderr, "good = %u\nbad = %u\n\n",
-            (unsigned)goodResults.size(), (unsigned)badResults.size());
-}
diff --git a/third_party/skia/tools/skqp/make_apk_list.py b/third_party/skia/tools/skqp/make_apk_list.py
deleted file mode 100755
index 00968f455fbba..0000000000000
--- a/third_party/skia/tools/skqp/make_apk_list.py
+++ /dev/null
@@ -1,141 +0,0 @@
-#! /usr/bin/env python
-
-# Copyright 2018 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-from __future__ import print_function
-from subprocess import call, check_output, CalledProcessError
-import os
-import re
-import sys
-import tempfile
-
-
-HEADER = '''<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta charset="utf-8">
-<title>SkQP Pre-built APKs</title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<style>
-body {
-font-family:sans-serif;
-max-width:50em;
-margin:8px auto;
-padding:0 8px;
-}
-table { max-width:100%; border-collapse: collapse; }
-td { padding:12px 8px; vertical-align:top; }
-tr:nth-child(even) {background: #F2F2F2; color:#000;}
-tr:nth-child(odd)  {background: #FFFFFF; color:#000;}
-</style>
-</head>
-<body>
-<h1>SkQP Pre-built APKs</h1>
-'''
-FOOTER = '</body>\n</html>\n'
-
-BUCKET = 'skia-skqp'
-
-NAME_FMT = 'skqp-universal-%s.apk'
-
-
-def get_existing_files():
-    cmd = ['gsutil', 'ls', 'gs://' + BUCKET]
-    try:
-        output = check_output(cmd)
-    except (OSError, CalledProcessError):
-        sys.stderr.write('command: "%s" failed.\n' % ' '.join(cmd))
-        sys.exit(1)
-    result = set()
-    regex = re.compile('gs://%s/%s' % (BUCKET, NAME_FMT % '([0-9a-f]+)'))
-    for line in output.split('\n'):
-        m = regex.match(line.strip())
-        if m is not None:
-            result.add(m.group(1))
-    return result
-
-
-def find(v, extant):
-    l = min(16, len(v))
-    while l > 8:
-        if v[:l] in extant:
-            return v[:l]
-        l -= 1
-    return None
-
-
-def nowrap(s):
-    return (s.replace(' ', u'\u00A0'.encode('utf-8'))
-             .replace('-', u'\u2011'.encode('utf-8')))
-
-
-def rev_parse(arg):
-    if isinstance(arg, tuple):
-        remote_url, branch = arg
-        for remote in check_output(['git', 'remote']).strip().split('\n'):
-            remote = remote.strip()
-            url = check_output(['git', 'remote', 'get-url', remote]).strip()
-            if url == remote_url:
-                arg = remote + '/' + branch
-                break
-    return check_output(['git', 'rev-parse', arg]).strip()
-
-
-def table(o, remote, branch, excludes):
-    env_copy = os.environ.copy()
-    env_copy['TZ'] = ''
-    extant = get_existing_files()
-
-    commits = [rev_parse((remote, branch))]
-    for exclude in excludes:
-        commits.append('^' + rev_parse(exclude))
-
-    o.write('<h2>Remote: %s<br>Branch: %s</h2>\n' % (remote, branch))
-    o.write('<table>\n<tr><th>APK</th><th>Date</th><th>Commit</th></tr>\n')
-    git_cmd = ['git', 'log', '--format=%H;%cd;%<(100,trunc)%s',
-               '--date=format-local:%Y-%m-%d %H:%M:%S %Z'] + commits
-    commits = check_output(git_cmd, env=env_copy)
-    for line in commits.split('\n'):
-        line = line.strip()
-        if not line:
-            continue
-        commit, date, subj = line.split(';', 2)
-        short = find(commit, extant)
-        if short is not None:
-            apk_name =  NAME_FMT % short
-            url = 'https://storage.googleapis.com/%s/%s' % (BUCKET, apk_name)
-        else:
-            apk_name, url =  '', ''
-        commit_url = '%s/+/%s' % (remote, commit)
-        o.write('<tr>\n<td><a href="%s">%s</a></td>\n'
-                '<td>%s</td>\n<td><a href="%s">%s</a></td>\n</tr>\n' %
-                (url, nowrap(apk_name), nowrap(date), commit_url, subj))
-    o.write('</table>\n')
-
-
-def main():
-    origin    = 'https://skia.googlesource.com/skia'
-    aosp_skqp = 'https://android.googlesource.com/platform/external/skqp'
-
-    assert '/' in [os.sep, os.altsep] and '..' == os.pardir
-    os.chdir(os.path.join(os.path.dirname(__file__), '../..'))
-    d = tempfile.mkdtemp()
-    path = os.path.join(d, 'apklist.html')
-    with open(path, 'w') as o:
-        o.write(HEADER)
-        table(o, origin,    'skqp/dev',     [(origin, 'main'), '3e34285f2a0'])
-        table(o, origin,    'skqp/release', [(origin, 'main'), '09ab171c5c0'])
-        table(o, aosp_skqp, 'pie-cts-dev',  ['f084c17322'])
-        o.write(FOOTER)
-    print(path)
-    call([sys.executable, 'bin/sysopen', path])
-    gscmd = 'gsutil -h "Content-Type:text/html" cp "%s" gs://skia-skqp/apklist'
-    print(gscmd % path)
-
-
-if __name__ == '__main__':
-    main()
-
diff --git a/third_party/skia/tools/skqp/make_skqp_model.cpp b/third_party/skia/tools/skqp/make_skqp_model.cpp
deleted file mode 100644
index 574e2e0bdc2b6..0000000000000
--- a/third_party/skia/tools/skqp/make_skqp_model.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2019 Google LLC.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-
-#include "include/codec/SkCodec.h"
-#include "include/core/SkBitmap.h"
-#include "include/encode/SkPngEncoder.h"
-#include "src/core/SkOSFile.h"
-
-static bool update(SkBitmap* maxBitmap, SkBitmap* minBitmap, const SkBitmap& bm) {
-    SkASSERT(!bm.drawsNothing());
-    SkASSERT(4 == bm.bytesPerPixel());
-    if (maxBitmap->drawsNothing()) {
-        maxBitmap->allocPixels(bm.info());
-        maxBitmap->eraseColor(0x00000000);
-        minBitmap->allocPixels(bm.info());
-        minBitmap->eraseColor(0xFFFFFFFF);
-    }
-    if (maxBitmap->dimensions() != bm.dimensions()) {
-        return false;
-    }
-    SkASSERT_RELEASE(maxBitmap->info() == bm.info());
-    const SkPixmap& pmin = minBitmap->pixmap();
-    const SkPixmap& pmax = maxBitmap->pixmap();
-    const SkPixmap& pm = bm.pixmap();
-    for (int y = 0; y < pm.height(); ++y) {
-        for (int x = 0; x < pm.width(); ++x) {
-            uint32_t* minPtr = pmin.writable_addr32(x, y);
-            uint32_t* maxPtr = pmax.writable_addr32(x, y);
-            uint8_t minColor[4], maxColor[4], color[4];
-            memcpy(minColor, minPtr, 4);
-            memcpy(maxColor, maxPtr, 4);
-            memcpy(color, pm.addr32(x, y), 4);
-            for (unsigned i = 0; i < 4; ++i) {
-                minColor[i] = std::min(minColor[i], color[i]);
-                maxColor[i] = std::max(maxColor[i], color[i]);
-            }
-            memcpy(minPtr, minColor, 4);
-            memcpy(maxPtr, maxColor, 4);
-        }
-    }
-    return true;
-}
-
-static SkBitmap decode_to_srgb_8888_unpremul(const char* path) {
-    SkBitmap dst;
-    if (auto codec = SkCodec::MakeFromData(SkData::MakeFromFileName(path))) {
-        SkISize size = codec->getInfo().dimensions();
-        SkASSERT(!size.isEmpty());
-        dst.allocPixels(SkImageInfo::Make(
-                    size.width(), size.height(), kRGBA_8888_SkColorType,
-                    kUnpremul_SkAlphaType, SkColorSpace::MakeSRGB()));
-        if (SkCodec::kSuccess != codec->getPixels(dst.pixmap())) {
-            dst.reset();
-        }
-    }
-    return dst;
-}
-
-bool encode_png(const char* path, const SkPixmap& pixmap) {
-    if (!pixmap.addr()) {
-        return false;
-    }
-    SkPngEncoder::Options encOpts;
-    encOpts.fZLibLevel = 9;  // slow encode;
-    SkFILEWStream o(path);
-    return o.isValid() && SkPngEncoder::Encode(&o, pixmap, encOpts);
-}
-
-int main(int argc, char** argv) {
-    SkASSERT_RELEASE(argc > 2);
-    const char* src_dir = argv[1];
-    const char* dst_dir = argv[2];
-    SkBitmap maxBitmap, minBitmap;
-    SkOSFile::Iter iter(src_dir);
-    SkString name;
-    while (iter.next(&name)) {
-        name.prependf("%s/", src_dir);
-        SkBitmap bm = decode_to_srgb_8888_unpremul(name.c_str());
-        if (bm.drawsNothing()) {
-            SkDebugf("'%s' failed to decode.\n", name.c_str());
-            continue;
-        }
-        if (!update(&maxBitmap, &minBitmap, bm)) {
-            SkDebugf("'%s' has unmatched dimensions.\n", name.c_str());
-            continue;
-        }
-    }
-    SkASSERT_RELEASE(sk_mkdir(dst_dir));
-    if ((maxBitmap.drawsNothing()) || (maxBitmap.drawsNothing())) {
-        SkDebugf("Failure: '%s' '%s'\n", src_dir, dst_dir);
-        return 1;
-    }
-    encode_png(SkStringPrintf("%s/min.png", dst_dir).c_str(), minBitmap.pixmap());
-    encode_png(SkStringPrintf("%s/max.png", dst_dir).c_str(), maxBitmap.pixmap());
-    return 0;
-}
diff --git a/third_party/skia/tools/skqp/make_universal_apk.py b/third_party/skia/tools/skqp/make_universal_apk.py
index bbddeb10b84bb..2cb75de7649da 100755
--- a/third_party/skia/tools/skqp/make_universal_apk.py
+++ b/third_party/skia/tools/skqp/make_universal_apk.py
@@ -32,7 +32,6 @@
 import sys
 
 import create_apk
-import download_model
 
 def make_apk(opts):
     assert '/' in [os.sep, os.altsep]  # 'a/b' over os.path.join('a', 'b')
@@ -40,21 +39,12 @@ def make_apk(opts):
     skia_dir = os.path.dirname(__file__) + '/../..'
     create_apk.makedirs(opts.build_dir)
     assets_dir = skia_dir + '/platform_tools/android/apps/skqp/src/main/assets'
-    gmkb = assets_dir + '/gmkb'
     resources_path = assets_dir + '/resources'
 
-    with create_apk.RemoveFiles(resources_path, gmkb):  # always clean up
-        create_apk.remove(gmkb)
-        create_apk.make_symlinked_subdir(gmkb, opts.build_dir)
-
+    with create_apk.RemoveFiles(resources_path):  # always clean up
         create_apk.remove(resources_path)
         os.symlink('../../../../../../../resources', resources_path)
 
-        if os.path.exists(assets_dir + '/files.checksum'):
-            download_model.main()
-        else:
-            sys.stderr.write(
-                    '\n* * *  Note: SkQP models are missing!  * * *\n\n')
         create_apk.create_apk(opts)
 
 def main():
diff --git a/third_party/skia/tools/skqp/release.sh b/third_party/skia/tools/skqp/release.sh
deleted file mode 100755
index ac898dec76732..0000000000000
--- a/third_party/skia/tools/skqp/release.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# Copyright 2019 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-cd "$(dirname "$0")/../.."
-
-set -e -x
-
-[ -f platform_tools/android/apps/skqp/src/main/assets/files.checksum       ] || exit 1
-[ -f platform_tools/android/apps/skqp/src/main/assets/skqp/rendertests.txt ] || exit 1
-[ -f platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt   ] || exit 1
-
-python tools/skqp/gn_to_bp.py
-python tools/skqp/download_model
-python tools/skqp/setup_resources
-
-touch MODULE_LICENSE_BSD
-
-cat > platform_tools/android/apps/skqp/src/main/Android.mk <<- "EOM"
-	# Copyright 2019 Google LLC.
-	# Use of this source code is governed by a BSD-style license that can be
-	# found in the LICENSE file.
-	LOCAL_PATH:= $(call my-dir)
-	include $(CLEAR_VARS)
-	LOCAL_MODULE_TAGS := tests optional
-	LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-	LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-	LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
-	LOCAL_JNI_SHARED_LIBRARIES := libskqp_app
-	LOCAL_MULTILIB := both
-	LOCAL_USE_AAPT2 := true
-	LOCAL_STATIC_ANDROID_LIBRARIES := android-support-design
-	LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner-axt
-	LOCAL_SRC_FILES := $(call all-java-files-under, java)
-	LOCAL_PACKAGE_NAME := CtsSkQPTestCases
-	LOCAL_SDK_VERSION := test_current
-	include $(BUILD_CTS_PACKAGE)
-EOM
-
-cat > include/config/SkUserConfigManual.h <<- "EOM"
-	// Copyright 2019 Google LLC.
-	// Use of this source code is governed by a BSD-style license that can be
-	// found in the LICENSE file.
-	#ifndef SkUserConfigManual_DEFINED
-	#define SkUserConfigManual_DEFINED
-	// DON'T DEFINE THINGS HERE AS IT WILL RESULT IN DIFFERENCES WITH
-	// THE VERSION OF SKQP PUBLISHED ON SKIA.ORG
-	#endif // SkUserConfigManual_DEFINED
-EOM
-
-cat > platform_tools/android/apps/skqp/src/main/AndroidTest.xml <<- "EOM"
-	<?xml version="1.0" encoding="utf-8"?>
-	<!--
-	Copyright 2019 Google LLC.
-	Use of this source code is governed by a BSD-style license that can be
-	found in the LICENSE file.
-	-->
-	<configuration description="Config for CTS SkQP test cases">
-	<option name="test-suite-tag" value="cts" />
-	<option name="not-shardable" value="true" />
-	<option name="config-descriptor:metadata" key="component" value="uitoolkit" />
-	<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-	<option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
-	<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-	<option name="cleanup-apks" value="true" />
-	<option name="test-file-name" value="CtsSkQPTestCases.apk" />
-	</target_preparer>
-	<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-	<option name="package" value="org.skia.skqp" />
-	<option name="runtime-hint" value="7m" />
-	</test>
-	</configuration>
-EOM
-
-[ -f platform_tools/android/apps/skqp/src/main/assets/.gitignore ] && \
-    git rm platform_tools/android/apps/skqp/src/main/assets/.gitignore
-
-git add                                                       \
-    Android.bp                                                \
-    MODULE_LICENSE_BSD                                        \
-    include/config/SkUserConfig.h                             \
-    include/config/SkUserConfigManual.h                       \
-    platform_tools/android/apps/skqp/src/main/Android.mk      \
-    platform_tools/android/apps/skqp/src/main/AndroidTest.xml \
-    platform_tools/android/apps/skqp/src/main/assets
diff --git a/third_party/skia/tools/skqp/run_apk.sh b/third_party/skia/tools/skqp/run_apk.sh
old mode 100644
new mode 100755
index b35933eb9885d..5529a5cd33a82
--- a/third_party/skia/tools/skqp/run_apk.sh
+++ b/third_party/skia/tools/skqp/run_apk.sh
@@ -20,7 +20,7 @@ printf '\n\nAPK = "%s"\nDST = "%s"\n\n' "$APK" "$DST"
 
 set -x
 
-timeout 60 adb wait-for-device || exit 1
+adb wait-for-device || exit 1
 
 sleep ${SKQP_SLEEP:-0}
 
diff --git a/third_party/skia/tools/skqp/run_skqp_exe b/third_party/skia/tools/skqp/run_skqp_exe
index bebce5ff80af0..f6ae88c270e15 100755
--- a/third_party/skia/tools/skqp/run_skqp_exe
+++ b/third_party/skia/tools/skqp/run_skqp_exe
@@ -24,8 +24,6 @@ def skqp(build):
     adb('push',
         os.path.join(*'platform_tools/android/apps/skqp/src/main/assets/skqp'.split('/')),
         '/data/local/tmp/skqp/skqp_assets')
-    adb('push',
-        os.path.join(*'out/skqp/gmkb'.split('/')), '/data/local/tmp/skqp/skqp_assets')
     adb('push', 'resources', '/data/local/tmp/skqp/skqp_assets')
 
     adb('push', os.path.join(build, 'skqp'), '/data/local/tmp/skqp/skqp')
diff --git a/third_party/skia/tools/skqp/skqp_gn_args.py b/third_party/skia/tools/skqp/skqp_gn_args.py
deleted file mode 100644
index 1f1f05205056d..0000000000000
--- a/third_party/skia/tools/skqp/skqp_gn_args.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-SkqpGnArgs = {
-    'extra_cflags':                     '[ "-DSK_ENABLE_DUMP_GPU", "-DSK_BUILD_FOR_SKQP" ]',
-    'skia_enable_fontmgr_android':      'false',
-    'skia_enable_fontmgr_empty':        'true',
-    'skia_enable_pdf':                  'false',
-    'skia_enable_skottie':              'false',
-    'skia_skqp_global_error_tolerance': '8',
-    'skia_tools_require_resources':     'true',
-    'skia_use_dng_sdk':                 'false',
-    'skia_use_expat':                   'true',
-    'skia_use_icu':                     'false',
-    'skia_use_libheif':                 'false',
-    'skia_use_lua':                     'false',
-    'skia_use_piex':                    'false',
-    'skia_use_vulkan':                  'true',
-}
-
-def GetGNArgs(arch, android_ndk, debug, api_level):
-    def gn_quote(s):
-        return '"%s"' % s
-    gn_args = {
-        'target_cpu':  gn_quote(arch),
-        'ndk':         gn_quote(android_ndk),
-        'is_debug':    'true' if debug else 'false',
-        'ndk_api':     api_level,
-    }
-    gn_args.update(SkqpGnArgs)
-    return gn_args
diff --git a/third_party/skia/tools/skqp/src/BUILD.bazel b/third_party/skia/tools/skqp/src/BUILD.bazel
index 52d08c4867305..420e916df680f 100644
--- a/third_party/skia/tools/skqp/src/BUILD.bazel
+++ b/third_party/skia/tools/skqp/src/BUILD.bazel
@@ -30,37 +30,12 @@ generated_cc_atom(
     ],
 )
 
-generated_cc_atom(
-    name = "skqp_model_hdr",
-    hdrs = ["skqp_model.h"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":skqp_hdr",
-        "//include/core:SkBitmap_hdr",
-    ],
-)
-
-generated_cc_atom(
-    name = "skqp_model_src",
-    srcs = ["skqp_model.cpp"],
-    visibility = ["//:__subpackages__"],
-    deps = [
-        ":skqp_hdr",
-        ":skqp_model_hdr",
-        "//include/codec:SkCodec_hdr",
-        "//include/core:SkBitmap_hdr",
-        "//include/core:SkStream_hdr",
-        "//src/utils:SkOSPath_hdr",
-    ],
-)
-
 generated_cc_atom(
     name = "skqp_src",
     srcs = ["skqp.cpp"],
     visibility = ["//:__subpackages__"],
     deps = [
         ":skqp_hdr",
-        ":skqp_model_hdr",
         "//gm:gm_hdr",
         "//include/core:SkFontStyle_hdr",
         "//include/core:SkGraphics_hdr",
diff --git a/third_party/skia/tools/skqp/src/jni_skqp.cpp b/third_party/skia/tools/skqp/src/jni_skqp.cpp
index e8c7b4e1cf6b2..b4a541dad148c 100644
--- a/third_party/skia/tools/skqp/src/jni_skqp.cpp
+++ b/third_party/skia/tools/skqp/src/jni_skqp.cpp
@@ -72,12 +72,6 @@ static void set_string_array_element(JNIEnv* env, jobjectArray a, const char* s,
 
 ////////////////////////////////////////////////////////////////////////////////
 
-sk_sp<SkData> get_resource(const char* resource) {
-    return open_asset_data((std::string("resources/")  + resource).c_str());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 template <typename T, typename F>
 jobjectArray to_java_string_array(JNIEnv* env,
                                   const std::vector<T>& array,
@@ -105,7 +99,7 @@ void Java_org_skia_skqp_SkQP_nInit(JNIEnv* env, jobject object, jobject assetMan
     jclass SkQP_class = env->GetObjectClass(object);
 
     // tools/Resources
-    gResourceFactory = &get_resource;
+    gResourceFactory = &open_asset_data;
 
     std::string reportDirectory = to_string(env, dataDir);
 
@@ -120,9 +114,7 @@ void Java_org_skia_skqp_SkQP_nInit(JNIEnv* env, jobject object, jobject assetMan
     auto backends = gSkQP.getSupportedBackends();
     jassert(env, backends.size() > 0,);
     auto gms = gSkQP.getGMs();
-    jassert(env, gms.size() > 0,);
     auto unitTests = gSkQP.getUnitTests();
-    jassert(env, unitTests.size() > 0,);
 
     constexpr char kStringArrayType[] = "[Ljava/lang/String;";
     env->SetObjectField(object, env->GetFieldID(SkQP_class, "mBackends", kStringArrayType),
diff --git a/third_party/skia/tools/skqp/src/skqp.cpp b/third_party/skia/tools/skqp/src/skqp.cpp
index 50ed9db01db75..85ec11a239a83 100644
--- a/third_party/skia/tools/skqp/src/skqp.cpp
+++ b/third_party/skia/tools/skqp/src/skqp.cpp
@@ -33,8 +33,17 @@
 #include <algorithm>
 #include <cinttypes>
 #include <sstream>
+#include <regex>
 
-#include "tools/skqp/src/skqp_model.h"
+namespace skqp {
+
+/** Prefered colortype for comparing test outcomes. */
+constexpr SkColorType kColorType = kRGBA_8888_SkColorType;
+
+/** Prefered alphatype for comparing test outcomes. */
+constexpr SkAlphaType kAlphaType = kUnpremul_SkAlphaType;
+
+}
 
 #define IMAGES_DIRECTORY_PATH "images"
 #define PATH_MAX_PNG "max.png"
@@ -65,22 +74,34 @@ static void readlines(const void* data, size_t size, F f) {
     }
 }
 
-static void get_unit_tests(SkQPAssetManager* mgr, std::vector<SkQP::UnitTest>* unitTests) {
-    std::unordered_set<std::string> testset;
-    auto insert = [&testset](const char* s, size_t l) {
+// Parses the unittests.txt file.
+// when exclude is true, all tests are run except those matching lines from the file
+// when exclude is false, only tests matching lines from the file are run.
+// Each line is a regular expression matching test names.
+// Lines may start with # to indicate a comment
+static void get_unit_tests(SkQPAssetManager* mgr, std::vector<SkQP::UnitTest>* unitTests, bool exclude) {
+    std::vector<std::regex> patterns;
+    auto insert = [&patterns](const char* s, size_t l) {
         SkASSERT(l > 1) ;
         if (l > 0 && s[l - 1] == '\n') {  // strip line endings.
             --l;
         }
-        if (l > 0) {  // only add non-empty strings.
-            testset.insert(std::string(s, l));
+        if (l > 0 && s[0] != '#') {  // only add non-empty strings, and ignore comments.
+            patterns.emplace_back(std::string(s, l));
         }
     };
     if (sk_sp<SkData> dat = mgr->open(kUnitTestsPath)) {
         readlines(dat->data(), dat->size(), insert);
     }
     for (const skiatest::Test& test : skiatest::TestRegistry::Range()) {
-        if ((testset.empty() || testset.count(std::string(test.fName)) > 0) && test.fNeedsGpu) {
+        bool matches_one = false;
+        for (const auto& pat : patterns) {
+            if (std::regex_match(std::string(test.fName), pat)) {
+                matches_one = true;
+                continue;
+            }
+        }
+        if (exclude != matches_one && test.fNeedsGpu) {
             unitTests->push_back(&test);
         }
     }
@@ -215,19 +236,6 @@ static void print_backend_info(const char* dstPath,
 #endif
 }
 
-static void encode_png(const SkBitmap& src, const std::string& dst) {
-    SkFILEWStream wStream(dst.c_str());
-    SkPngEncoder::Options options;
-    bool success = wStream.isValid() && SkPngEncoder::Encode(&wStream, src.pixmap(), options);
-    SkASSERT_RELEASE(success);
-}
-
-static void write_to_file(const sk_sp<SkData>& src, const std::string& dst) {
-    SkFILEWStream wStream(dst.c_str());
-    bool success = wStream.isValid() && wStream.write(src->data(), src->size());
-    SkASSERT_RELEASE(success);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 const char* SkQP::GetBackendName(SkQP::SkiaBackend b) {
@@ -261,8 +269,10 @@ void SkQP::init(SkQPAssetManager* am, const char* renderTests, const char* repor
 
     get_render_tests(fAssetManager, renderTests, &fGMs, &fGMThresholds);
     /* If the file "skqp/unittests.txt" does not exist or is empty, run all gpu
-       unit tests.  Otherwise only run tests mentioned in that file.  */
-    get_unit_tests(fAssetManager, &fUnitTests);
+       unit tests.  Otherwise run only tests that do not match a line in that file.
+       The list is checked in at platform_tools/android/apps/skqp/src/main/assets/skqp/unittests.txt
+    */
+    get_unit_tests(fAssetManager, &fUnitTests, true);
     fSupportedBackends = get_backends();
 
     print_backend_info((fReportDirectory + "/grdump.txt").c_str(), fSupportedBackends);
@@ -283,7 +293,6 @@ std::tuple<SkQP::RenderOutcome, std::string> SkQP::evaluateGM(SkQP::SkiaBackend
     SkASSERT(gmFact);
     std::unique_ptr<skiagm::GM> gm(gmFact());
     SkASSERT(gm);
-    const char* const name = gm->getName();
     const SkISize size = gm->getISize();
     const int w = size.width();
     const int h = size.height();
@@ -308,37 +317,8 @@ std::tuple<SkQP::RenderOutcome, std::string> SkQP::evaluateGM(SkQP::SkiaBackend
     if (!surf->readPixels(image.pixmap(), 0, 0)) {
         return std::make_tuple(kError, "Skia Failure: read pixels");
     }
-    int64_t passingThreshold = fGMThresholds.empty() ? -1 : fGMThresholds[std::string(name)];
-
-    if (-1 == passingThreshold) {
-        return std::make_tuple(kPass, "");
-    }
-    skqp::ModelResult modelResult =
-        skqp::CheckAgainstModel(name, image.pixmap(), fAssetManager);
 
-    if (!modelResult.fErrorString.empty()) {
-        return std::make_tuple(kError, std::move(modelResult.fErrorString));
-    }
-    fRenderResults.push_back(SkQP::RenderResult{backend, gmFact, modelResult.fOutcome});
-    if (modelResult.fOutcome.fMaxError <= passingThreshold) {
-        return std::make_tuple(kPass, "");
-    }
-    std::string imagesDirectory = fReportDirectory + "/" IMAGES_DIRECTORY_PATH;
-    if (!sk_mkdir(imagesDirectory.c_str())) {
-        SkDebugf("ERROR: sk_mkdir('%s');\n", imagesDirectory.c_str());
-        return std::make_tuple(modelResult.fOutcome, "");
-    }
-    std::ostringstream tmp;
-    tmp << imagesDirectory << '/' << SkQP::GetBackendName(backend) << '_' << name << '_';
-    std::string imagesPathPrefix1 = tmp.str();
-    tmp = std::ostringstream();
-    tmp << imagesDirectory << '/' << PATH_MODEL << '_' << name << '_';
-    std::string imagesPathPrefix2 = tmp.str();
-    encode_png(image,                  imagesPathPrefix1 + PATH_IMG_PNG);
-    encode_png(modelResult.fErrors,    imagesPathPrefix1 + PATH_ERR_PNG);
-    write_to_file(modelResult.fMaxPng, imagesPathPrefix2 + PATH_MAX_PNG);
-    write_to_file(modelResult.fMinPng, imagesPathPrefix2 + PATH_MIN_PNG);
-    return std::make_tuple(modelResult.fOutcome, "");
+    return std::make_tuple(kPass, "");
 }
 
 std::vector<std::string> SkQP::executeTest(SkQP::UnitTest test) {
diff --git a/third_party/skia/tools/skqp/src/skqp_main.cpp b/third_party/skia/tools/skqp/src/skqp_main.cpp
index a417ebb53c596..f5c7830dda609 100644
--- a/third_party/skia/tools/skqp/src/skqp_main.cpp
+++ b/third_party/skia/tools/skqp/src/skqp_main.cpp
@@ -117,19 +117,19 @@ int main(int argc, char *argv[]) {
             if (should_skip(matchRules, matchRulesCount, testName.c_str())) {
                 continue;
             }
-            out << "Starting: " << testName << std::endl;
+            out << "Starting: " << testName << "  ";
             SkQP::RenderOutcome outcome;
             std::string except;
 
             std::tie(outcome, except) = skqp.evaluateGM(backend, gmFactory);
             if (!except.empty()) {
-                out << "ERROR:    " << testName << " (" << except << ")\n";
+                out << "[ERROR: " << except << "]" << std::endl;
                 ret = 1;
             } else if (outcome.fMaxError != 0) {
-                out << "FAILED:   " << testName << " (" << outcome.fMaxError << ")\n";
+                out << "[FAILED: " << outcome.fMaxError << "]" << std::endl;
                 ret = 1;
             } else {
-                out << "Passed:   " << testName << "\n";
+                out << "[PASSED]" << std::endl;
             }
             out.flush();
         }
@@ -141,16 +141,16 @@ int main(int argc, char *argv[]) {
         if (should_skip(matchRules, matchRulesCount, testName.c_str())) {
             continue;
         }
-        out << "Starting test: " << testName << std::endl;
+        out << "Starting: " << testName << " ";
         std::vector<std::string> errors = skqp.executeTest(test);
         if (!errors.empty()) {
-            out << "TEST FAILED (" << errors.size() << "): " << testName << "\n";
+            out << "[FAILED: " << errors.size() << " error(s)]" << std::endl;
             for (const std::string& error : errors) {
-                out << error << "\n";
+                out << "  " <<  error << std::endl;
             }
             ret = 1;
         } else {
-            out << "Test passed:   " << testName << "\n";
+            out << "[PASSED]" << std::endl;
         }
         out.flush();
     }
diff --git a/third_party/skia/tools/skqp/src/skqp_model.cpp b/third_party/skia/tools/skqp/src/skqp_model.cpp
deleted file mode 100644
index 2a97cd6f06c96..0000000000000
--- a/third_party/skia/tools/skqp/src/skqp_model.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "tools/skqp/src/skqp.h"
-#include "tools/skqp/src/skqp_model.h"
-
-#include "include/codec/SkCodec.h"
-#include "include/core/SkBitmap.h"
-#include "include/core/SkStream.h"
-#include "src/utils/SkOSPath.h"
-
-#include <limits.h>
-
-#ifndef SK_SKQP_GLOBAL_ERROR_TOLERANCE
-#define SK_SKQP_GLOBAL_ERROR_TOLERANCE 0
-#endif
-
-////////////////////////////////////////////////////////////////////////////////
-
-static inline uint32_t color(const SkPixmap& pm, SkIPoint p) {
-    return *pm.addr32(p.x(), p.y());
-}
-
-static inline bool inside(SkIPoint point, SkISize dimensions) {
-    return (unsigned)point.x() < (unsigned)dimensions.width() &&
-           (unsigned)point.y() < (unsigned)dimensions.height();
-}
-
-SkQP::RenderOutcome skqp::Check(const SkPixmap& minImg,
-                                const SkPixmap& maxImg,
-                                const SkPixmap& img,
-                                unsigned tolerance,
-                                SkBitmap* errorOut) {
-    SkQP::RenderOutcome result;
-    SkISize dim = img.info().dimensions();
-    SkASSERT(minImg.info().dimensions() == dim);
-    SkASSERT(maxImg.info().dimensions() == dim);
-    static const SkIPoint kNeighborhood[9] = {
-        { 0,  0}, // ordered by closest pixels first.
-        {-1,  0}, { 1,  0}, { 0, -1}, { 0,  1},
-        {-1, -1}, { 1, -1}, {-1,  1}, { 1,  1},
-    };
-    for (int y = 0; y < dim.height(); ++y) {
-        for (int x = 0; x < dim.width(); ++x) {
-            const SkIPoint xy{x, y};
-            const uint32_t c = color(img, xy);
-            int error = INT_MAX;
-            // loop over neighborhood (halo);
-            for (SkIPoint delta : kNeighborhood) {
-                SkIPoint point = xy + delta;
-                if (inside(point, dim)) {  // skip out of pixmap bounds.
-                    int err = 0;
-                    // loop over four color channels.
-                    // Return Manhattan distance in channel-space.
-                    for (int component : {0, 8, 16, 24}) {
-                        uint8_t v    = (c                    >> component) & 0xFF,
-                                vmin = (color(minImg, point) >> component) & 0xFF,
-                                vmax = (color(maxImg, point) >> component) & 0xFF;
-                        err = std::max(err, std::max((int)v - (int)vmax, (int)vmin - (int)v));
-                    }
-                    error = std::min(error, err);
-                }
-            }
-            if (error > (int)tolerance) {
-                ++result.fBadPixelCount;
-                result.fTotalError += error;
-                result.fMaxError = std::max(error, result.fMaxError);
-                if (errorOut) {
-                    if (!errorOut->getPixels()) {
-                        errorOut->allocPixels(SkImageInfo::Make(
-                                    dim.width(), dim.height(),
-                                    kBGRA_8888_SkColorType,
-                                    kOpaque_SkAlphaType));
-                        errorOut->eraseColor(SK_ColorWHITE);
-                    }
-                    SkASSERT((unsigned)error < 256);
-                    *(errorOut->getAddr32(x, y)) = SkColorSetARGB(0xFF, (uint8_t)error, 0, 0);
-                }
-            }
-        }
-    }
-    return result;
-}
-
-static SkBitmap decode(sk_sp<SkData> data) {
-    SkBitmap bitmap;
-    if (auto codec = SkCodec::MakeFromData(std::move(data))) {
-        SkISize size = codec->getInfo().dimensions();
-        SkASSERT(!size.isEmpty());
-        SkImageInfo info = SkImageInfo::Make(size, skqp::kColorType, skqp::kAlphaType);
-        bitmap.allocPixels(info);
-        if (SkCodec::kSuccess != codec->getPixels(bitmap.pixmap())) {
-            bitmap.reset();
-        }
-    }
-    return bitmap;
-}
-
-skqp::ModelResult skqp::CheckAgainstModel(const char* name,
-                                          const SkPixmap& pm,
-                                          SkQPAssetManager* mgr) {
-    skqp::ModelResult result;
-    if (pm.colorType() != kColorType || pm.alphaType() != kAlphaType) {
-        result.fErrorString = "Model failed: source image format.";
-        return result;
-    }
-    if (pm.info().isEmpty()) {
-        result.fErrorString = "Model failed: empty source image";
-        return result;
-    }
-    constexpr char PATH_ROOT[] = "gmkb";
-    SkString img_path = SkOSPath::Join(PATH_ROOT, name);
-    SkString max_path = SkOSPath::Join(img_path.c_str(), kMaxPngPath);
-    SkString min_path = SkOSPath::Join(img_path.c_str(), kMinPngPath);
-
-    result.fMaxPng = mgr->open(max_path.c_str());
-    result.fMinPng = mgr->open(min_path.c_str());
-
-    SkBitmap max_image = decode(result.fMaxPng);
-    SkBitmap min_image = decode(result.fMinPng);
-
-    if (max_image.isNull() || min_image.isNull()) {
-        result.fErrorString = "Model missing";
-        return result;
-    }
-    if (max_image.info().dimensions() != min_image.info().dimensions()) {
-        result.fErrorString = "Model has mismatched data.";
-        return result;
-    }
-
-    if (max_image.info().dimensions() != pm.info().dimensions()) {
-        result.fErrorString = "Model data does not match source size.";
-        return result;
-    }
-    result.fOutcome = Check(min_image.pixmap(),
-                            max_image.pixmap(),
-                            pm,
-                            SK_SKQP_GLOBAL_ERROR_TOLERANCE,
-                            &result.fErrors);
-    return result;
-}
diff --git a/third_party/skia/tools/skqp/src/skqp_model.h b/third_party/skia/tools/skqp/src/skqp_model.h
deleted file mode 100644
index 745ce63edf068..0000000000000
--- a/third_party/skia/tools/skqp/src/skqp_model.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef skqp_model_DEFINED
-#define skqp_model_DEFINED
-
-#include <cstdint>
-#include <string>
-
-#include "include/core/SkBitmap.h"
-
-#include "tools/skqp/src/skqp.h"
-
-class SkQPAssetManager;
-class SkStreamAsset;
-
-namespace skqp {
-
-/** Prefered colortype for comparing test outcomes. */
-constexpr SkColorType kColorType = kRGBA_8888_SkColorType;
-
-/** Prefered alphatype for comparing test outcomes. */
-constexpr SkAlphaType kAlphaType = kUnpremul_SkAlphaType;
-
-/** Where to find the maximum and minimum of the model. */
-inline constexpr char kMaxPngPath[] = "max.png";
-inline constexpr char kMinPngPath[] = "min.png";
-
-struct ModelResult {
-    SkBitmap fErrors; // Correct pixels are white, failing pixels scale from black
-                      // (1 value off) to red (255 off in some channel).
-    sk_sp<SkData> fMinPng;  // original model data, PNG encoded image.
-    sk_sp<SkData> fMaxPng;  // original model data, PNG encoded image.
-    SkQP::RenderOutcome fOutcome;
-    std::string fErrorString;  // if non-empty, an error occured.
-};
-
-SkQP::RenderOutcome Check(const SkPixmap& minImg,
-                          const SkPixmap& maxImg,
-                          const SkPixmap& img,
-                          unsigned tolerance,
-                          SkBitmap* errorOut);
-
-/** Check if the given test image matches the expected results.
-
-    @param name          the name of the rendering test that produced the image
-    @param image         the image to be tested.  Should be kRGBA_8888_SkColorType
-                         and kUnpremul_SkAlphaType.
-    @param assetManager  provides model data files
-*/
-
-ModelResult CheckAgainstModel(const char* name, const SkPixmap& image,
-                              SkQPAssetManager* assetManager);
-}  // namespace skqp
-#endif  // skqp_model_DEFINED
diff --git a/third_party/skia/tools/skqp/upload_apk b/third_party/skia/tools/skqp/upload_apk
deleted file mode 100755
index 6eb242b6f29e1..0000000000000
--- a/third_party/skia/tools/skqp/upload_apk
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-# Copyright 2018 Google LLC.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-if [ -z "$1" ] || [ -z "$2" ]; then
-    echo usage: $0 COMMIT APK_PATH >&2
-    exit 1;
-fi
-NAME="skia-skqp/skqp-universal-$(git rev-parse "$1" | cut -b 1-16).apk"
-gsutil cp "$2" "gs://$NAME"
-echo "https://storage.googleapis.com/$NAME"
-python tools/skqp/make_apk_list.py
-
diff --git a/third_party/skia/tools/using_skia_and_harfbuzz.cpp b/third_party/skia/tools/using_skia_and_harfbuzz.cpp
index 0b0be5089a977..7f8d593788789 100644
--- a/third_party/skia/tools/using_skia_and_harfbuzz.cpp
+++ b/third_party/skia/tools/using_skia_and_harfbuzz.cpp
@@ -34,9 +34,6 @@ struct BaseOption {
     BaseOption(std::string _selector, std::string _description)
         : selector(_selector), description(_description) {}
 
-    // Required until C++17 copy elision
-    BaseOption(const BaseOption&) = default;
-
     virtual ~BaseOption() {}
 
     static void Init(const std::vector<BaseOption*> &, int argc, char **argv);
diff --git a/third_party/skia/tools/viewer/BUILD.bazel b/third_party/skia/tools/viewer/BUILD.bazel
index 1e6809f102704..f1703240c5195 100644
--- a/third_party/skia/tools/viewer/BUILD.bazel
+++ b/third_party/skia/tools/viewer/BUILD.bazel
@@ -149,6 +149,7 @@ generated_cc_atom(
         ":ImGuiLayer_hdr",
         ":ParticlesSlide_hdr",
         "//include/core:SkCanvas_hdr",
+        "//include/private:SkStringView_hdr",
         "//modules/particles/include:SkParticleEffect_hdr",
         "//modules/particles/include:SkParticleSerialization_hdr",
         "//modules/particles/include:SkReflected_hdr",
@@ -248,6 +249,7 @@ generated_cc_atom(
         "//include/core:SkFont_hdr",
         "//include/effects:SkGradientShader_hdr",
         "//include/effects:SkPerlinNoiseShader_hdr",
+        "//include/sksl:SkSLDebugTrace_hdr",
         "//src/core:SkEnumerate_hdr",
         "//tools:Resources_hdr",
     ],
@@ -434,6 +436,7 @@ generated_cc_atom(
         ":SKPSlide_hdr",
         ":SampleSlide_hdr",
         ":SkRiveSlide_hdr",
+        ":SkSLDebuggerSlide_hdr",
         ":SkSLSlide_hdr",
         ":SkottieSlide_hdr",
         ":SlideDir_hdr",
@@ -450,12 +453,15 @@ generated_cc_atom(
         "//include/private:SkTo_hdr",
         "//include/utils:SkPaintFilterCanvas_hdr",
         "//misc/cpp:imgui_stdlib_hdr",
+        "//src/core:SkAutoPixmapStorage_hdr",
         "//src/core:SkColorSpacePriv_hdr",
+        "//src/core:SkGlyphRun_hdr",
         "//src/core:SkImagePriv_hdr",
         "//src/core:SkMD5_hdr",
         "//src/core:SkOSFile_hdr",
         "//src/core:SkReadBuffer_hdr",
         "//src/core:SkScan_hdr",
+        "//src/core:SkStringUtils_hdr",
         "//src/core:SkSurfacePriv_hdr",
         "//src/core:SkTSort_hdr",
         "//src/core:SkTaskGroup_hdr",
@@ -464,13 +470,13 @@ generated_cc_atom(
         "//src/gpu:GrDirectContextPriv_hdr",
         "//src/gpu:GrGpu_hdr",
         "//src/gpu:GrPersistentCacheUtils_hdr",
-        "//src/gpu:GrShaderUtils_hdr",
         "//src/gpu/ops:AtlasPathRenderer_hdr",
         "//src/gpu/ops:TessellationPathRenderer_hdr",
         "//src/image:SkImage_Base_hdr",
         "//src/sksl:SkSLCompiler_hdr",
         "//src/utils:SkJSONWriter_hdr",
         "//src/utils:SkOSPath_hdr",
+        "//src/utils:SkShaderUtils_hdr",
         "//tools:Resources_hdr",
         "//tools:RuntimeBlendUtils_hdr",
         "//tools:ToolUtils_hdr",
@@ -479,3 +485,25 @@ generated_cc_atom(
         "//tools/trace:EventTracingPriv_hdr",
     ],
 )
+
+generated_cc_atom(
+    name = "SkSLDebuggerSlide_hdr",
+    hdrs = ["SkSLDebuggerSlide.h"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":Slide_hdr",
+        "//src/sksl/tracing:SkVMDebugTracePlayer_hdr",
+        "//src/sksl/tracing:SkVMDebugTrace_hdr",
+    ],
+)
+
+generated_cc_atom(
+    name = "SkSLDebuggerSlide_src",
+    srcs = ["SkSLDebuggerSlide.cpp"],
+    visibility = ["//:__subpackages__"],
+    deps = [
+        ":SkSLDebuggerSlide_hdr",
+        ":Viewer_hdr",
+        "//include/core:SkCanvas_hdr",
+    ],
+)
diff --git a/third_party/skia/tools/viewer/MSKPSlide.cpp b/third_party/skia/tools/viewer/MSKPSlide.cpp
index 1bc5f3a2ce5bb..3d1d974c2af00 100644
--- a/third_party/skia/tools/viewer/MSKPSlide.cpp
+++ b/third_party/skia/tools/viewer/MSKPSlide.cpp
@@ -190,7 +190,11 @@ void MSKPSlide::load(SkScalar, SkScalar) {
 
 void MSKPSlide::unload() { fPlayer.reset(); }
 
-void MSKPSlide::gpuTeardown() { fPlayer->resetLayers(); }
+void MSKPSlide::gpuTeardown() {
+    if (fPlayer) {
+        fPlayer->resetLayers();
+    }
+}
 
 void MSKPSlide::redrawLayers() {
     if (fDrawLayerID >= 0) {
diff --git a/third_party/skia/tools/viewer/ParticlesSlide.cpp b/third_party/skia/tools/viewer/ParticlesSlide.cpp
index 5a091d31cab4c..1ae58bada0da7 100644
--- a/third_party/skia/tools/viewer/ParticlesSlide.cpp
+++ b/third_party/skia/tools/viewer/ParticlesSlide.cpp
@@ -8,6 +8,7 @@
 #include "tools/viewer/ParticlesSlide.h"
 
 #include "include/core/SkCanvas.h"
+#include "include/private/SkStringView.h"
 #include "modules/particles/include/SkParticleEffect.h"
 #include "modules/particles/include/SkParticleSerialization.h"
 #include "modules/particles/include/SkReflected.h"
@@ -333,7 +334,7 @@ void ParticlesSlide::draw(SkCanvas* canvas) {
                     float* vals = data + uni.fSlot;
 
                     // Skip over builtin uniforms, to reduce clutter
-                    if (uni.fName == "dt" || uni.fName.starts_with("effect.")) {
+                    if (uni.fName == "dt" || skstd::starts_with(uni.fName, "effect.")) {
                         continue;
                     }
 
diff --git a/third_party/skia/tools/viewer/SkSLDebuggerSlide.cpp b/third_party/skia/tools/viewer/SkSLDebuggerSlide.cpp
new file mode 100644
index 0000000000000..1979b451d1b5b
--- /dev/null
+++ b/third_party/skia/tools/viewer/SkSLDebuggerSlide.cpp
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "tools/viewer/SkSLDebuggerSlide.h"
+
+#include "include/core/SkCanvas.h"
+#include "tools/viewer/Viewer.h"
+
+#include <algorithm>
+#include <cstdio>
+#include "imgui.h"
+
+using namespace sk_app;
+using LineNumberMap = SkSL::SkVMDebugTracePlayer::LineNumberMap;
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkSLDebuggerSlide::SkSLDebuggerSlide() {
+    fName = "Debugger";
+    fTrace = sk_make_sp<SkSL::SkVMDebugTrace>();
+}
+
+void SkSLDebuggerSlide::load(SkScalar winWidth, SkScalar winHeight) {}
+
+void SkSLDebuggerSlide::unload() {
+    fTrace = sk_make_sp<SkSL::SkVMDebugTrace>();
+    fPlayer.reset(nullptr);
+    fPlayer.setBreakpoints(std::unordered_set<int>{});
+}
+
+void SkSLDebuggerSlide::showLoadTraceGUI() {
+    ImGui::InputText("Trace Path", fTraceFile, SK_ARRAY_COUNT(fTraceFile));
+    bool load = ImGui::Button("Load Debug Trace");
+
+    if (load) {
+        SkFILEStream file(fTraceFile);
+        if (!file.isValid()) {
+            ImGui::OpenPopup("Can't Open Trace");
+        } else if (!fTrace->readTrace(&file)) {
+            ImGui::OpenPopup("Invalid Trace");
+        } else {
+            // Trace loaded successfully. On the next refresh, the user will see the debug UI.
+            fPlayer.reset(fTrace);
+            fPlayer.step();
+            fRefresh = true;
+            return;
+        }
+    }
+
+    if (ImGui::BeginPopupModal("Can't Open Trace", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
+        ImGui::Text("The trace file doesn't exist.");
+        ImGui::Separator();
+        if (ImGui::Button("OK", ImVec2(120, 0))) {
+            ImGui::CloseCurrentPopup();
+        }
+        ImGui::EndPopup();
+    }
+
+    if (ImGui::BeginPopupModal("Invalid Trace", nullptr, ImGuiWindowFlags_AlwaysAutoResize)) {
+        ImGui::Text("The trace data could not be parsed.");
+        ImGui::Separator();
+        if (ImGui::Button("OK", ImVec2(120, 0))) {
+            ImGui::CloseCurrentPopup();
+        }
+        ImGui::EndPopup();
+    }
+}
+
+void SkSLDebuggerSlide::showDebuggerGUI() {
+    if (ImGui::Button("Reset")) {
+        fPlayer.reset(fTrace);
+        fRefresh = true;
+    }
+    ImGui::SameLine(/*offset_from_start_x=*/0, /*spacing=*/100);
+    if (ImGui::Button("Step")) {
+        fPlayer.step();
+        fRefresh = true;
+    }
+    ImGui::SameLine();
+    if (ImGui::Button("Step Over")) {
+        fPlayer.stepOver();
+        fRefresh = true;
+    }
+    ImGui::SameLine();
+    if (ImGui::Button("Step Out")) {
+        fPlayer.stepOut();
+        fRefresh = true;
+    }
+    ImGui::SameLine(/*offset_from_start_x=*/0, /*spacing=*/100);
+    if (ImGui::Button(fPlayer.getBreakpoints().empty() ? "Run" : "Run to Breakpoint")) {
+        fPlayer.run();
+        fRefresh = true;
+    }
+
+    this->showStackTraceTable();
+    this->showVariableTable();
+    this->showCodeTable();
+}
+
+void SkSLDebuggerSlide::showCodeTable() {
+    constexpr ImGuiTableFlags kTableFlags =
+            ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter |
+            ImGuiTableFlags_BordersV;
+    constexpr ImGuiTableColumnFlags kColumnFlags =
+            ImGuiTableColumnFlags_NoResize | ImGuiTableColumnFlags_NoReorder |
+            ImGuiTableColumnFlags_NoHide | ImGuiTableColumnFlags_NoSort |
+            ImGuiTableColumnFlags_NoHeaderLabel;
+
+    ImVec2 contentRect = ImGui::GetContentRegionAvail();
+    ImVec2 codeViewSize = ImVec2(0.0f, contentRect.y);
+    if (ImGui::BeginTable("Code View", /*column=*/2, kTableFlags, codeViewSize)) {
+        ImGui::TableSetupColumn("", kColumnFlags | ImGuiTableColumnFlags_WidthFixed);
+        ImGui::TableSetupColumn("Code", kColumnFlags | ImGuiTableColumnFlags_WidthStretch);
+
+        ImGuiListClipper clipper;
+        clipper.Begin(fTrace->fSource.size());
+        while (clipper.Step()) {
+            for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; row++) {
+                size_t humanReadableLine = row + 1;
+
+                ImGui::TableNextRow();
+                if (fPlayer.getCurrentLine() == (int)humanReadableLine) {
+                    ImGui::TableSetBgColor(
+                            ImGuiTableBgTarget_RowBg1,
+                            ImGui::GetColorU32(ImGui::GetStyleColorVec4(ImGuiCol_TextSelectedBg)));
+                }
+
+                // Show line numbers and breakpoints.
+                ImGui::TableSetColumnIndex(0);
+                const LineNumberMap& lineNumberMap = fPlayer.getLineNumbersReached();
+                LineNumberMap::const_iterator iter = lineNumberMap.find(humanReadableLine);
+                bool reachable = iter != lineNumberMap.end() && iter->second > 0;
+                bool breakpointOn = fPlayer.getBreakpoints().count(humanReadableLine);
+                if (breakpointOn) {
+                    ImGui::PushStyleColor(ImGuiCol_Text,          ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+                    ImGui::PushStyleColor(ImGuiCol_Button,        ImVec4(1.0f, 0.0f, 0.0f, 0.70f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 0.0f, 0.0f, 0.85f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonActive,  ImVec4(1.0f, 0.0f, 0.0f, 1.0f));
+                } else if (reachable) {
+                    ImGui::PushStyleColor(ImGuiCol_Text,          ImVec4(1.0f, 1.0f, 1.0f, 0.75f));
+                    ImGui::PushStyleColor(ImGuiCol_Button,        ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.2f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonActive,  ImVec4(1.0f, 1.0f, 1.0f, 0.4f));
+                } else {
+                    ImGui::PushStyleColor(ImGuiCol_Text,          ImVec4(1.0f, 1.0f, 1.0f, 0.25f));
+                    ImGui::PushStyleColor(ImGuiCol_Button,        ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
+                    ImGui::PushStyleColor(ImGuiCol_ButtonActive,  ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
+                }
+                if (ImGui::SmallButton(SkStringPrintf("%03zu ", humanReadableLine).c_str())) {
+                    if (breakpointOn) {
+                        fPlayer.removeBreakpoint(humanReadableLine);
+                    } else if (reachable) {
+                        fPlayer.addBreakpoint(humanReadableLine);
+                    }
+                }
+                ImGui::PopStyleColor(4);
+
+                // Show lines of code.
+                ImGui::TableSetColumnIndex(1);
+                ImGui::Text("%s", fTrace->fSource[row].c_str());
+            }
+        }
+
+        if (fRefresh) {
+            int linesVisible = contentRect.y / ImGui::GetTextLineHeightWithSpacing();
+            int centerLine = (fPlayer.getCurrentLine() - 1) - (linesVisible / 2);
+            centerLine = std::max(0, centerLine);
+            ImGui::SetScrollY(clipper.ItemsHeight * centerLine);
+            fRefresh = false;
+        }
+
+        ImGui::EndTable();
+    }
+}
+
+void SkSLDebuggerSlide::showStackTraceTable() {
+    constexpr ImGuiTableFlags kTableFlags =
+            ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter |
+            ImGuiTableFlags_BordersV | ImGuiTableFlags_NoHostExtendX;
+    constexpr ImGuiTableColumnFlags kColumnFlags =
+            ImGuiTableColumnFlags_NoReorder | ImGuiTableColumnFlags_NoHide |
+            ImGuiTableColumnFlags_NoSort;
+
+    std::vector<int> callStack = fPlayer.getCallStack();
+
+    ImVec2 contentRect = ImGui::GetContentRegionAvail();
+    ImVec2 stackViewSize = ImVec2(contentRect.x / 3.0f,
+                                  ImGui::GetTextLineHeightWithSpacing() * kNumTopRows);
+    if (ImGui::BeginTable("Call Stack", /*column=*/1, kTableFlags, stackViewSize)) {
+        ImGui::TableSetupColumn("Stack", kColumnFlags);
+        ImGui::TableHeadersRow();
+
+        ImGuiListClipper clipper;
+        clipper.Begin(callStack.size());
+        while (clipper.Step()) {
+            for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; row++) {
+                int funcIdx = callStack.rbegin()[row];
+                SkASSERT(funcIdx >= 0 && (size_t)funcIdx < fTrace->fFuncInfo.size());
+                const SkSL::SkVMFunctionInfo& funcInfo = fTrace->fFuncInfo[funcIdx];
+
+                ImGui::TableNextRow();
+                ImGui::TableSetColumnIndex(0);
+                ImGui::Text("%s", funcInfo.name.c_str());
+            }
+        }
+        ImGui::EndTable();
+    }
+
+    ImGui::SameLine();
+}
+
+void SkSLDebuggerSlide::showVariableTable() {
+    constexpr ImGuiTableFlags kTableFlags =
+            ImGuiTableFlags_ScrollY | ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersOuter |
+            ImGuiTableFlags_BordersV | ImGuiTableFlags_Resizable;
+    constexpr ImGuiTableColumnFlags kColumnFlags =
+            ImGuiTableColumnFlags_NoReorder | ImGuiTableColumnFlags_NoHide |
+            ImGuiTableColumnFlags_NoSort | ImGuiTableColumnFlags_WidthStretch;
+
+    int frame = fPlayer.getStackDepth() - 1;
+    std::vector<SkSL::SkVMDebugTracePlayer::VariableData> vars;
+    if (frame >= 0) {
+        vars = fPlayer.getLocalVariables(frame);
+    } else {
+        vars = fPlayer.getGlobalVariables();
+    }
+    ImVec2 varViewSize = ImVec2(0.0f, ImGui::GetTextLineHeightWithSpacing() * kNumTopRows);
+    if (ImGui::BeginTable("Variables", /*column=*/2, kTableFlags, varViewSize)) {
+        ImGui::TableSetupColumn("Variable", kColumnFlags);
+        ImGui::TableSetupColumn("Value", kColumnFlags);
+        ImGui::TableHeadersRow();
+        if (!vars.empty()) {
+            ImGuiListClipper clipper;
+            clipper.Begin(vars.size());
+            while (clipper.Step()) {
+                for (int row = clipper.DisplayStart; row < clipper.DisplayEnd; row++) {
+                    const SkSL::SkVMDebugTracePlayer::VariableData& var = vars.at(row);
+                    SkASSERT(var.fSlotIndex >= 0);
+                    SkASSERT((size_t)var.fSlotIndex < fTrace->fSlotInfo.size());
+                    const SkSL::SkVMSlotInfo& slotInfo = fTrace->fSlotInfo[var.fSlotIndex];
+
+                    ImGui::TableNextRow();
+                    if (var.fDirty) {
+                        // Highlight recently-changed variables.
+                        ImGui::TableSetBgColor(ImGuiTableBgTarget_RowBg1,
+                                               ImGui::GetColorU32(ImVec4{0.0f, 1.0f, 0.0f, 0.20f}));
+                    }
+                    ImGui::TableSetColumnIndex(0);
+                    ImGui::Text("%s%s", slotInfo.name.c_str(),
+                                        fTrace->getSlotComponentSuffix(var.fSlotIndex).c_str());
+                    ImGui::TableSetColumnIndex(1);
+                    ImGui::Text("%s",
+                                fTrace->slotValueToString(var.fSlotIndex, var.fValue).c_str());
+                }
+            }
+        }
+        ImGui::EndTable();
+    }
+}
+
+void SkSLDebuggerSlide::showRootGUI() {
+    if (fTrace->fSource.empty()) {
+        this->showLoadTraceGUI();
+        return;
+    }
+
+    this->showDebuggerGUI();
+}
+
+void SkSLDebuggerSlide::draw(SkCanvas* canvas) {
+    canvas->clear(SK_ColorWHITE);
+    ImGui::Begin("Debugger", nullptr, ImGuiWindowFlags_AlwaysVerticalScrollbar);
+    this->showRootGUI();
+    ImGui::End();
+}
+
+bool SkSLDebuggerSlide::animate(double nanos) {
+    return true;
+}
diff --git a/third_party/skia/tools/viewer/SkSLDebuggerSlide.h b/third_party/skia/tools/viewer/SkSLDebuggerSlide.h
new file mode 100644
index 0000000000000..b24cad9f705f6
--- /dev/null
+++ b/third_party/skia/tools/viewer/SkSLDebuggerSlide.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkSLDebuggerSlide_DEFINED
+#define SkSLDebuggerSlide_DEFINED
+
+#include "src/sksl/tracing/SkVMDebugTrace.h"
+#include "src/sksl/tracing/SkVMDebugTracePlayer.h"
+#include "tools/viewer/Slide.h"
+
+class SkSLDebuggerSlide : public Slide {
+public:
+    SkSLDebuggerSlide();
+
+    SkISize getDimensions() const override { return SkISize::MakeEmpty(); }
+
+    void draw(SkCanvas* canvas) override;
+    bool animate(double nanos) override;
+
+    void resize(SkScalar winWidth, SkScalar winHeight) override {}
+    void load(SkScalar winWidth, SkScalar winHeight) override;
+    void unload() override;
+
+    bool onMouse(SkScalar x, SkScalar y, skui::InputState state,
+                 skui::ModifierKey modifiers) override { return true; }
+
+private:
+    void showRootGUI();
+    void showLoadTraceGUI();
+    void showDebuggerGUI();
+    void showStackTraceTable();
+    void showVariableTable();
+    void showCodeTable();
+
+    static constexpr int kNumTopRows = 12;
+
+    sk_sp<SkSL::SkVMDebugTrace> fTrace;
+    SkSL::SkVMDebugTracePlayer fPlayer;
+    bool fRefresh = false;
+
+    char fTraceFile[256] = "SkVMDebugTrace.json";
+};
+
+#endif
diff --git a/third_party/skia/tools/viewer/SkSLSlide.cpp b/third_party/skia/tools/viewer/SkSLSlide.cpp
index cfe14fb19a528..b5d8828873f44 100644
--- a/third_party/skia/tools/viewer/SkSLSlide.cpp
+++ b/third_party/skia/tools/viewer/SkSLSlide.cpp
@@ -83,9 +83,12 @@ void SkSLSlide::unload() {
 
 bool SkSLSlide::rebuild() {
     // Some of the standard shadertoy inputs:
-    SkString sksl("uniform float3 iResolution;\n"
-                  "uniform float  iTime;\n"
-                  "uniform float4 iMouse;\n");
+    SkString sksl;
+    if (fShadertoyUniforms) {
+        sksl = "uniform float3 iResolution;\n"
+               "uniform float  iTime;\n"
+               "uniform float4 iMouse;\n";
+    }
     sksl.append(fSkSL);
 
     // It shouldn't happen, but it's possible to assert in the compiler, especially mid-edit.
@@ -132,6 +135,10 @@ void SkSLSlide::draw(SkCanvas* canvas) {
         fCodeIsDirty = true;
     }
 
+    if (ImGui::Checkbox("ShaderToy Uniforms (iResolution/iTime/iMouse)", &fShadertoyUniforms)) {
+        fCodeIsDirty = true;
+    }
+
     if (fCodeIsDirty || !fEffect) {
         this->rebuild();
     }
@@ -256,15 +263,26 @@ void SkSLSlide::draw(SkCanvas* canvas) {
 
     auto inputs = SkData::MakeWithoutCopy(fInputs.get(), fEffect->uniformSize());
 
+    canvas->save();
+
     sk_sp<SkSL::DebugTrace> debugTrace;
-    auto shader = fEffect->makeShader(std::move(inputs), fChildren.data(), fChildren.count(),
-                                      nullptr, false);
+    auto shader = fEffect->makeShader(std::move(inputs), fChildren.data(), fChildren.count());
     if (writeTrace || writeDump) {
         SkIPoint traceCoord = {fTraceCoord[0], fTraceCoord[1]};
         SkRuntimeEffect::TracedShader traced = SkRuntimeEffect::MakeTraced(std::move(shader),
                                                                            traceCoord);
         shader = std::move(traced.shader);
         debugTrace = std::move(traced.debugTrace);
+
+        // Reduce debug trace delay by clipping to a 4x4 rectangle for this paint, centered on the
+        // pixel to trace. A minor complication is that the canvas might have a transform applied to
+        // it, but we want to clip in device space. This can be worked around by resetting the
+        // canvas matrix temporarily.
+        SkM44 canvasMatrix = canvas->getLocalToDevice();
+        canvas->resetMatrix();
+        auto r = SkRect::MakeXYWH(fTraceCoord[0] - 1, fTraceCoord[1] - 1, 4, 4);
+        canvas->clipRect(r, SkClipOp::kIntersect);
+        canvas->setMatrix(canvasMatrix);
     }
     SkPaint p;
     p.setColor4f(gPaintColor);
@@ -292,6 +310,8 @@ void SkSLSlide::draw(SkCanvas* canvas) {
         default: break;
     }
 
+    canvas->restore();
+
     if (debugTrace && writeTrace) {
         SkFILEWStream traceFile("SkVMDebugTrace.json");
         debugTrace->writeTrace(&traceFile);
diff --git a/third_party/skia/tools/viewer/SkSLSlide.h b/third_party/skia/tools/viewer/SkSLSlide.h
index bb6cdc5a45aaa..d6a1de3fd94b8 100644
--- a/third_party/skia/tools/viewer/SkSLSlide.h
+++ b/third_party/skia/tools/viewer/SkSLSlide.h
@@ -52,6 +52,7 @@ class SkSLSlide : public Slide {
     SkV3 fResolution = { 1, 1, 1 };
     SkV4 fMousePos;
     int fTraceCoord[2] = {64, 64};
+    bool fShadertoyUniforms = true;
 
     // Named shaders that can be selected as inputs
     SkTArray<std::pair<const char*, sk_sp<SkShader>>> fShaders;
diff --git a/third_party/skia/tools/viewer/Viewer.cpp b/third_party/skia/tools/viewer/Viewer.cpp
index f05d23c96b603..5ad6d921d8856 100644
--- a/third_party/skia/tools/viewer/Viewer.cpp
+++ b/third_party/skia/tools/viewer/Viewer.cpp
@@ -19,6 +19,7 @@
 #include "include/utils/SkPaintFilterCanvas.h"
 #include "src/core/SkAutoPixmapStorage.h"
 #include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkGlyphRun.h"
 #include "src/core/SkImagePriv.h"
 #include "src/core/SkMD5.h"
 #include "src/core/SkOSFile.h"
@@ -33,11 +34,11 @@
 #include "src/gpu/GrDirectContextPriv.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrPersistentCacheUtils.h"
-#include "src/gpu/GrShaderUtils.h"
 #include "src/image/SkImage_Base.h"
 #include "src/sksl/SkSLCompiler.h"
 #include "src/utils/SkJSONWriter.h"
 #include "src/utils/SkOSPath.h"
+#include "src/utils/SkShaderUtils.h"
 #include "tools/Resources.h"
 #include "tools/RuntimeBlendUtils.h"
 #include "tools/ToolUtils.h"
@@ -51,6 +52,7 @@
 #include "tools/viewer/ParticlesSlide.h"
 #include "tools/viewer/SKPSlide.h"
 #include "tools/viewer/SampleSlide.h"
+#include "tools/viewer/SkSLDebuggerSlide.h"
 #include "tools/viewer/SkSLSlide.h"
 #include "tools/viewer/SlideDir.h"
 #include "tools/viewer/SvgSlide.h"
@@ -165,6 +167,7 @@ static DEFINE_string2(match, m, nullptr,
 #endif
 
 static DEFINE_string(jpgs   , PATH_PREFIX "jpgs"   , "Directory to read jpgs from.");
+static DEFINE_string(jxls   , PATH_PREFIX "jxls"   , "Directory to read jxls from.");
 static DEFINE_string(skps   , PATH_PREFIX "skps"   , "Directory to read skps from.");
 static DEFINE_string(mskps  , PATH_PREFIX "mskps"  , "Directory to read mskps from.");
 static DEFINE_string(lotties, PATH_PREFIX "lotties", "Directory to read (Bodymovin) jsons from.");
@@ -768,6 +771,10 @@ void Viewer::initSlides() {
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
                 return sk_make_sp<ImageSlide>(name, path);}
         },
+        { ".jxl", "jxl-dir", FLAGS_jxls,
+            [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
+                return sk_make_sp<ImageSlide>(name, path);}
+        },
 #if defined(SK_ENABLE_SKOTTIE)
         { ".json", "skottie-dir", FLAGS_lotties,
             [](const SkString& name, const SkString& path) -> sk_sp<Slide> {
@@ -878,6 +885,14 @@ void Viewer::initSlides() {
         }
     }
 
+    // Runtime shader debugger
+    {
+        auto slide = sk_make_sp<SkSLDebuggerSlide>();
+        if (!CommandLineFlags::ShouldSkip(FLAGS_match, slide->getName().c_str())) {
+            fSlides.push_back(std::move(slide));
+        }
+    }
+
     for (const auto& info : gExternalSlidesInfo) {
         for (const auto& flag : info.fFlags) {
             if (SkStrEndsWith(flag.c_str(), info.fExtension)) {
@@ -1369,6 +1384,16 @@ class OveridePaintFilterCanvas : public SkPaintFilterCanvas {
         this->SkPaintFilterCanvas::onDrawTextBlob(
             this->filterTextBlob(paint, blob, &cache), x, y, paint);
     }
+
+    void onDrawGlyphRunList(const SkGlyphRunList& glyphRunList, const SkPaint& paint) override {
+        sk_sp<SkTextBlob> cache;
+        sk_sp<SkTextBlob> blob = glyphRunList.makeBlob();
+        this->filterTextBlob(paint, blob.get(), &cache);
+        SkGlyphRunBuilder builder;
+        const SkGlyphRunList& filtered = builder.blobToGlyphRunList(*cache, glyphRunList.origin());
+        this->SkPaintFilterCanvas::onDrawGlyphRunList(filtered, paint);
+    }
+
     bool filterFont(SkTCopyOnFirstWrite<SkFont>* font) const {
         if (fFontOverrides->fTypeface) {
             font->writable()->setTypeface(fFont->refTypeface());
@@ -1445,7 +1470,7 @@ class OveridePaintFilterCanvas : public SkPaintFilterCanvas {
             paint.setDither(fPaint->isDither());
         }
         if (fPaintOverrides->fForceRuntimeBlend) {
-            if (skstd::optional<SkBlendMode> mode = paint.asBlendMode()) {
+            if (std::optional<SkBlendMode> mode = paint.asBlendMode()) {
                 paint.setBlender(GetRuntimeBlendForBlendMode(*mode));
             }
         }
@@ -1835,12 +1860,12 @@ static bool ImGui_DragQuad(SkPoint* pts) {
     return dc.fDragging;
 }
 
-static SkSL::String build_sksl_highlight_shader() {
-    return SkSL::String("out half4 sk_FragColor;\n"
+static std::string build_sksl_highlight_shader() {
+    return std::string("out half4 sk_FragColor;\n"
                         "void main() { sk_FragColor = half4(1, 0, 1, 0.5); }");
 }
 
-static SkSL::String build_metal_highlight_shader(const SkSL::String& inShader) {
+static std::string build_metal_highlight_shader(const std::string& inShader) {
     // Metal fragment shaders need a lot of non-trivial boilerplate that we don't want to recompute
     // here. So keep all shader code, but right before `return *_out;`, swap out the sk_FragColor.
     size_t pos = inShader.rfind("return *_out;\n");
@@ -1848,19 +1873,19 @@ static SkSL::String build_metal_highlight_shader(const SkSL::String& inShader) {
         return inShader;
     }
 
-    SkSL::String replacementShader = inShader;
+    std::string replacementShader = inShader;
     replacementShader.insert(pos, "_out->sk_FragColor = float4(1.0, 0.0, 1.0, 0.5); ");
     return replacementShader;
 }
 
-static SkSL::String build_glsl_highlight_shader(const GrShaderCaps& shaderCaps) {
+static std::string build_glsl_highlight_shader(const GrShaderCaps& shaderCaps) {
     const char* versionDecl = shaderCaps.versionDeclString();
-    SkSL::String highlight = versionDecl ? versionDecl : "";
+    std::string highlight = versionDecl ? versionDecl : "";
     if (shaderCaps.usesPrecisionModifiers()) {
         highlight.append("precision mediump float;\n");
     }
-    highlight.appendf("out vec4 sk_FragColor;\n"
-                      "void main() { sk_FragColor = vec4(1, 0, 1, 0.5); }");
+    SkSL::String::appendf(&highlight, "out vec4 sk_FragColor;\n"
+                                      "void main() { sk_FragColor = vec4(1, 0, 1, 0.5); }");
     return highlight;
 }
 
@@ -2516,7 +2541,7 @@ void Viewer::drawImGui() {
                         spvtools::SpirvTools tools(SPV_ENV_VULKAN_1_0);
                         for (auto& entry : fCachedShaders) {
                             for (int i = 0; i < kGrShaderTypeCount; ++i) {
-                                const SkSL::String& spirv(entry.fShader[i]);
+                                const std::string& spirv(entry.fShader[i]);
                                 std::string disasm;
                                 tools.Disassemble((const uint32_t*)spirv.c_str(), spirv.size() / 4,
                                                   &disasm);
@@ -2626,11 +2651,11 @@ void Viewer::drawImGui() {
                     fPersistentCache.reset();
                     ctx->priv().getGpu()->resetShaderCacheForTesting();
                     for (auto& entry : fCachedShaders) {
-                        SkSL::String backup = entry.fShader[kFragment_GrShaderType];
+                        std::string backup = entry.fShader[kFragment_GrShaderType];
                         if (entry.fHovered) {
                             // The hovered item (if any) gets a special shader to make it
                             // identifiable.
-                            SkSL::String& fragShader = entry.fShader[kFragment_GrShaderType];
+                            std::string& fragShader = entry.fShader[kFragment_GrShaderType];
                             switch (entry.fShaderType) {
                                 case SkSetFourByteTag('S', 'K', 'S', 'L'): {
                                     fragShader = build_sksl_highlight_shader();
@@ -2746,8 +2771,8 @@ void Viewer::drawImGui() {
         ImGui::Begin("Shader Errors", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
         for (int i = 0; i < gShaderErrorHandler.fErrors.count(); ++i) {
             ImGui::TextWrapped("%s", gShaderErrorHandler.fErrors[i].c_str());
-            SkSL::String sksl(gShaderErrorHandler.fShaders[i].c_str());
-            GrShaderUtils::VisitLineByLine(sksl, [](int lineNumber, const char* lineText) {
+            std::string sksl(gShaderErrorHandler.fShaders[i].c_str());
+            SkShaderUtils::VisitLineByLine(sksl, [](int lineNumber, const char* lineText) {
                 ImGui::TextWrapped("%4i\t%s\n", lineNumber, lineText);
             });
         }
@@ -2868,7 +2893,7 @@ void Viewer::dumpShadersToResources() {
         SkString vertPath = SkStringPrintf("%s/Vertex_%02d.vert", directory.c_str(), index);
         FILE* vertFile = sk_fopen(vertPath.c_str(), kWrite_SkFILE_Flag);
         if (vertFile) {
-            const SkSL::String& vertText = entry->fShader[kVertex_GrShaderType];
+            const std::string& vertText = entry->fShader[kVertex_GrShaderType];
             SkAssertResult(sk_fwrite(vertText.c_str(), vertText.size(), vertFile));
             sk_fclose(vertFile);
         } else {
@@ -2878,7 +2903,7 @@ void Viewer::dumpShadersToResources() {
         SkString fragPath = SkStringPrintf("%s/Fragment_%02d.frag", directory.c_str(), index);
         FILE* fragFile = sk_fopen(fragPath.c_str(), kWrite_SkFILE_Flag);
         if (fragFile) {
-            const SkSL::String& fragText = entry->fShader[kFragment_GrShaderType];
+            const std::string& fragText = entry->fShader[kFragment_GrShaderType];
             SkAssertResult(sk_fwrite(fragText.c_str(), fragText.size(), fragFile));
             sk_fclose(fragFile);
         } else {
diff --git a/third_party/skia/tools/viewer/Viewer.h b/third_party/skia/tools/viewer/Viewer.h
index aa27352440b3e..fe760b33d9c10 100644
--- a/third_party/skia/tools/viewer/Viewer.h
+++ b/third_party/skia/tools/viewer/Viewer.h
@@ -259,7 +259,7 @@ class Viewer : public sk_app::Application, sk_app::Window::Layer {
         SkString            fKeyDescription;
 
         SkFourByteTag         fShaderType;
-        SkSL::String          fShader[kGrShaderTypeCount];
+        std::string           fShader[kGrShaderTypeCount];
         SkSL::Program::Inputs fInputs[kGrShaderTypeCount];
     };
 
diff --git a/third_party/skia/whitespace.txt b/third_party/skia/whitespace.txt
index 850a2f04dc100..ad2eebb91808a 100644
--- a/third_party/skia/whitespace.txt
+++ b/third_party/skia/whitespace.txt
@@ -14,3 +14,4 @@ Yet another line.
 BIOS update 20180917
 Gerrit 10k!!!
 Retry Mac bots.
+push shaders.skia.org